Refactored progress battle and adventure code

Signed-off-by: Ole Herman Schumacher Elgesem <oleherman93@gmail.com>
olehermanse · Jun 9, 2019 · a1c0e62 · a1c0e62
1 parent 19bf2e9
commit a1c0e62
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/mrpg/core/game.py b/mrpg/core/game.py
@@ -96,10 +96,12 @@ def battle_menu_choice(self, choice):
         self.battle.b.ai()
         assert self.battle.turn is None
         self.battle.turn = Turn(self.battle)
-        self.progress_battle()
+        self.progress()
 
-    def progress_battle(self):
-        if self.battle.is_over():
+    def progress(self):
+        if self.adventure and not self.battle:
+            self.progress_adventure()
+        elif self.battle.is_over():
             self.end_battle()
         elif self.battle.turn:
             try:
@@ -128,7 +130,7 @@ def end_battle(self):
             self.put_output(out)
 
         if self.adventure:
-            self.progress_adventure()
+            self.progress()
         else:
             self.set_state(State.GAME_MENU)
 

diff --git a/mrpg/gui/controller.py b/mrpg/gui/controller.py
@@ -75,7 +75,7 @@ def progress_to_output(self):
         if output:
             return output
         while self.game.battle and self.game.battle.turn:
-            self.game.progress_battle()
+            self.game.progress()
             output = self.resolve_to_output()
             if output:
                 return output