diff options
| -rw-r--r-- | game/gui/battle.rpy | 12 | ||||
| -rw-r--r-- | game/quest.rpy | 6 |
2 files changed, 13 insertions, 5 deletions
diff --git a/game/gui/battle.rpy b/game/gui/battle.rpy index 0142842..872dec8 100644 --- a/game/gui/battle.rpy +++ b/game/gui/battle.rpy @@ -141,16 +141,24 @@ screen battle(): ymaximum 60 yfill True background Frame("gui/frame.png", 0, 0) + fixed: + ymaximum 60 hbox: + xalign 0.0 + yalign 0.0 # Preferences button imagebutton auto "gfx/gui/cog_%s.png" action ShowMenu('preferences') textbutton _("Party") action Function(blayout) null width 20 text "%d " % (Battle["turn"]) text _(" Turn") - null width 300 + hbox: + xalign 0.5 + yalign 0.0 text _("Wave %d/%d" % (Battle["wave"], Battle["max_wave"])) - null width 300 + hbox: + xalign 1.0 + yalign 0.0 textbutton _("I'm ready") action Return() #################################################### diff --git a/game/quest.rpy b/game/quest.rpy index 76b89ce..9e96400 100644 --- a/game/quest.rpy +++ b/game/quest.rpy @@ -44,11 +44,10 @@ label quest_select: scene bg battle2 play music MUSIC_WORLDMAP.id() fadein 0.5 python: - from copy import copy worldmap=[] areamap=[] for arx in allworld: - arena=copy(arx) + arena=copy.copy(arx) name=arena.pop(0) req=arena.pop(0) if Player["quest"] >= req: @@ -63,7 +62,7 @@ label quest_select: # Now we have the mapselected array, with dict for arx in mapselected: - quest=copy(arx) + quest=copy.copy(arx) name=quest["name"] qid=quest["quest_id"] @@ -163,4 +162,5 @@ label quest_selected: play music MUSIC_BATTLE.id() fadein 0.5 $ renpy.free_memory() window hide + jump combat |