summaryrefslogtreecommitdiff
path: root/game/battle.rpy
diff options
context:
space:
mode:
Diffstat (limited to 'game/battle.rpy')
-rw-r--r--game/battle.rpy12
1 files changed, 10 insertions, 2 deletions
diff --git a/game/battle.rpy b/game/battle.rpy
index f41886c..44a3aba 100644
--- a/game/battle.rpy
+++ b/game/battle.rpy
@@ -38,6 +38,7 @@ label combat:
# TODO: Swap units support
# TODO: Display Spheres in the right place
$ use_sphere=[AP_NONE, AP_NONE, AP_NONE, AP_NONE, AP_NONE]
+ $ btl_ready = False
python:
try:
renpy.call_screen("battle")
@@ -47,7 +48,10 @@ label combat:
sdelay(0.5)
renpy.jump("combat")
- $stdout("================= call ended")
+ stdout("================= call ended")
+ btl_ready=True
+ renpy.show_screen("battle")
+
# TODO: Send to server new arrangement of units
# Update Battle with server response
@@ -81,7 +85,6 @@ label combat:
# Fight continues
# TODO this is suboptimal, and the loops are also wrong
# Maybe we should get info about what was used and whatnot?
- show screen battle
python:
# TODO: Render sphere usage
# Render enemy damage
@@ -188,6 +191,11 @@ label results:
story=dl_search(allstory, "quest_id", qid)
if (story != ERR_INVALID):
+ try:
+ renpy.hide_screen("battle")
+ except:
+ stdout("Failed to hide screen battle D:")
+ pass
hud_story()
print ".:: Story logs (%d) ::." % qid