Merge remote-tracking branch 'upstream/develop' into littleViewImprov…

…ements
Tale152 · Sep 10, 2021 · b9acf8a · b9acf8a
2 parents bd8965c + e0014f2
commit b9acf8a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/src/main/scala/controller/game/subcontroller/BattleController.scala b/src/main/scala/controller/game/subcontroller/BattleController.scala
@@ -154,6 +154,7 @@ object BattleController {
     override def attemptEscape(): Unit = {
       if (escapeCondition){
         battleFirstRound = true
+        storyModel.currentStoryNode.enemy.get.properties.health.currentPS = 0
         battleView.escapeResult()
       } else {
         battleView.escapeResult(false)

diff --git a/src/main/scala/controller/game/subcontroller/InventoryController.scala b/src/main/scala/controller/game/subcontroller/InventoryController.scala
@@ -90,13 +90,17 @@ object InventoryController {
      * Defines the actions to do when the Controller execution is over.
      */
     override def close(): Unit = {
-      if(targets().size == 1) {
-        gameMasterController.executeOperation(OperationType.StoryOperation)
-      } else {
+      if(currentlyInBattle()) {
         gameMasterController.executeOperation(OperationType.BattleOperation)
+      } else {
+        gameMasterController.executeOperation(OperationType.StoryOperation)
       }
     }
 
+    private def currentlyInBattle(): Boolean =
+      targets().size > 1 &&
+        storyModel.currentStoryNode.enemy.get.properties.health.currentPS > 0
+
     /**
      * @return the list of all the possible targets.
      */

diff --git a/src/main/scala/view/inventory/panels/inventoryPanel/InventoryPanelButtons.scala b/src/main/scala/view/inventory/panels/inventoryPanel/InventoryPanelButtons.scala
@@ -42,6 +42,7 @@ private[inventoryPanel] object InventoryPanelButtons {
     SqSwingButton(
       useButtonName,
       useButtonActionListener, item match {
+        case _: EquipItem => inventoryController.targets().size == 1
         case _: KeyItem => false
         case _ => true
       })