summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--game/battle.rpy2
-rw-r--r--game/screens.rpy3
2 files changed, 4 insertions, 1 deletions
diff --git a/game/battle.rpy b/game/battle.rpy
index a0e96f5..fa93370 100644
--- a/game/battle.rpy
+++ b/game/battle.rpy
@@ -99,6 +99,7 @@ init python:
label combat:
# Implement combat view
$stdout("================= prepare for combat")
+ $ battle_mode = True
$ hud_clear()
$ show_img("bg %s" % TMP_BACKG, False)
scene bg battle
@@ -274,6 +275,7 @@ label combat:
jump combat
label results:
+ $ battle_mode = False
$ Player["status"]=ST_TOWN
if (response["result"] == "DEFEAT"):
$ renpy.call_screen("msgbox", "Result:\n%s" % _("DEFEAT"))
diff --git a/game/screens.rpy b/game/screens.rpy
index f5ffd9e..270c8bf 100644
--- a/game/screens.rpy
+++ b/game/screens.rpy
@@ -352,6 +352,7 @@ init python:
#default quick_menu = True
default tr_loading = False
default story_mode = False
+default battle_mode = False
default hud_interface = False
style quick_button is default
@@ -401,7 +402,7 @@ screen navigation():
textbutton _("Help") action ShowMenu("help")
- if not (main_menu or story_mode or hud_interface): # FIXME
+ if battle_mode: # FIXME
if Player["quest"] >= 5:
textbutton _("Summons") action ShowMenu("sumconf")