summaryrefslogtreecommitdiff
path: root/game/battle.rpy
diff options
context:
space:
mode:
Diffstat (limited to 'game/battle.rpy')
-rw-r--r--game/battle.rpy13
1 files changed, 9 insertions, 4 deletions
diff --git a/game/battle.rpy b/game/battle.rpy
index bf7d8e9..2e9dd18 100644
--- a/game/battle.rpy
+++ b/game/battle.rpy
@@ -64,17 +64,20 @@ label combat:
en1=Battle["enemy"][0]
show_img("mob_"+str(en1["unit_id"]), False) # Validate
except:
- en1={"hp": 0}
+ en1=copy.copy(ERR_MOBSTRUCT)
try:
en2=Battle["enemy"][1]
show_img("mob_"+str(en2["unit_id"]), False) # Validate
except:
- en2={"hp": 0}
+ en2=copy.copy(ERR_MOBSTRUCT)
try:
en3=Battle["enemy"][2]
show_img("mob_"+str(en3["unit_id"]), False) # Validate
except:
- en3={"hp": 0}
+ en3=copy.copy(ERR_MOBSTRUCT)
+
+ while len(Battle["party"]) < 4:
+ Battle["party"].append(copy.copy(ERR_PLAYERSTRUCT))
$stdout("================= call begin")
# TODO: Swap units support
@@ -87,7 +90,9 @@ label combat:
except:
traceback.print_exc()
stdout("FAILED to render battle screen, trying again...")
- sdelay(0.5)
+ renpy.hide_screen("battle")
+ sdelay(1.5)
+ raise
renpy.jump("combat")
stdout("================= call ended")