diff options
| -rw-r--r-- | game/gui/battle.rpy | 82 |
1 files changed, 45 insertions, 37 deletions
diff --git a/game/gui/battle.rpy b/game/gui/battle.rpy index a22a515..a909abb 100644 --- a/game/gui/battle.rpy +++ b/game/gui/battle.rpy @@ -126,42 +126,7 @@ screen battle_mobs(): bar value en3["hp"] range en3["max_hp"] ############################################################################# -screen battle(): - # Background - add "bg battle" - use battle_mobs - - #################################################### - # Render HUD - frame: - xalign 0.0 - yalign 0.0 - xfill True - ymaximum 60 - yfill True - background Frame("gui/frame.png", 0, 0) - fixed: - ymaximum 60 - hbox: - xalign 0.0 - yalign 0.0 - # Preferences button - null width 20 - imagebutton auto "gfx/gui/cog_%s.png" action ShowMenu('preferences') - #textbutton _("Party") action Function(blayout) - null width 20 - text "%d " % (Battle["turn"]) - text _(" Turn") - hbox: - xalign 0.5 - yalign 0.0 - text _("Wave %d/%d" % (Battle["wave"], Battle["max_wave"])) - showif not btl_ready: - hbox: - xalign 1.0 - yalign 0.0 - textbutton _("I'm ready") action Return() - +screen battle_core(): #################################################### # Render allies # TODO: Gray out and unmovable if dead @@ -335,7 +300,8 @@ screen battle(): if (fx4 and Battle["party"][3]["hp"] <= 0): add At("gfx/off.png", party4) - +############################################################################# +screen battle_bars(): #################################################### # Render HPBARs fixed: @@ -379,6 +345,48 @@ screen battle(): xmaximum 256 bar value Battle["party"][3]["hp"] range Battle["party"][3]["max_hp"] xmaximum 256 +############################################################################# +screen battle(): + # Background and append all three battle sub-screens + # FIXME Our custom displayables are not 100.00% reliable + add "bg battle" + use battle_mobs + use battle_core + use battle_bars + + #################################################### + # Render HUD + frame: + xalign 0.0 + yalign 0.0 + xfill True + ymaximum 60 + yfill True + background Frame("gui/frame.png", 0, 0) + fixed: + ymaximum 60 + hbox: + xalign 0.0 + yalign 0.0 + # Preferences button + null width 20 + imagebutton auto "gfx/gui/cog_%s.png" action ShowMenu('preferences') + #textbutton _("Party") action Function(blayout) + null width 20 + text "%d " % (Battle["turn"]) + text _(" Turn") + hbox: + xalign 0.5 + yalign 0.0 + text _("Wave %d/%d" % (Battle["wave"], Battle["max_wave"])) + showif not btl_ready: + hbox: + xalign 1.0 + yalign 0.0 + textbutton _("I'm ready") action Return() + + + screen battle_layout(lb="Select unit"): vbox: xalign 0.5 |