summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2021-08-07 18:37:05 -0300
committerJesusaves <cpntb1@ymail.com>2021-08-07 18:37:05 -0300
commit458a6598426d1f9fa06cb028fb2c738141c7f4ea (patch)
treecfc16adc6ea5fef609e5ce785cfde05dd19a0b4d
parent3296617c04cbb1ce367394862895b97fecd75296 (diff)
downloadserver-458a6598426d1f9fa06cb028fb2c738141c7f4ea.tar.gz
server-458a6598426d1f9fa06cb028fb2c738141c7f4ea.tar.bz2
server-458a6598426d1f9fa06cb028fb2c738141c7f4ea.tar.xz
server-458a6598426d1f9fa06cb028fb2c738141c7f4ea.zip
Apart for the terrible balancing - fix typos and bugs.
-rw-r--r--battle/common.py8
-rw-r--r--story.json7
-rw-r--r--world.json2
3 files changed, 13 insertions, 4 deletions
diff --git a/battle/common.py b/battle/common.py
index ba3361c..dadc49d 100644
--- a/battle/common.py
+++ b/battle/common.py
@@ -16,7 +16,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
########################################################################################
# Battle Module - Common functions
-from utils import stdout, Battle, compress, dl_search
+from utils import stdout, Battle, compress, dl_search, allquests, Player
from consts import (SC_ATKUP, SC_DEFDOWN, SC_DEFUP, SC_ATKDOWN,
Ele_Fire, Ele_Water, Ele_Nature, Ele_Light, Ele_Shadow,
ST_TOWN,
@@ -391,3 +391,9 @@ def battle_endturn(token, spheres):
return sjson
+#################################################
+# Handles CI false positives in a lame way
+def pyflakes():
+ return allquests, Player
+
+
diff --git a/story.json b/story.json
index 243b5f9..f5faf7c 100644
--- a/story.json
+++ b/story.json
@@ -67,7 +67,10 @@
},
{
"quest_id": 6,
- "pre_dialog": "SQ00006_pre",
- "post_dialog": "SQ00006_post"
+ "pre_dialog": "SQ00006_pre"
+ },
+ {
+ "quest_id": 10,
+ "post_dialog": "SQ00010_post"
}
]
diff --git a/world.json b/world.json
index dd681c7..e74c81d 100644
--- a/world.json
+++ b/world.json
@@ -26,7 +26,7 @@
}
],
[
- "The Capital",
+ "The Stronghold",
5,
"bgm02",
{