Merge pull request 'Connect farming and fighting by making them codependent' (#44) from feature/farm_fight_loop into develop

Reviewed-on: #44

scripts/CSharp/Common/Fight/FightHappening.cs

@@ -222,9 +222,9 @@ public partial class FightHappening : Node
             case FightState.ActionCheckDetails:
                 RequireNotNull(HappeningData.actionStaging);
 
-                if (ActionAbort())
+                if (ShouldActionAbort())
                     ChangeState(FightState.InputActionSelect);
-                else if (ActionNeededDetail())
+                else if (DoesActionNeededDetail())
                     ChangeState(FightState.InputActionDetail);
                 else
                     ChangeState(FightState.ActionExecute);
@@ -333,13 +333,13 @@ public partial class FightHappening : Node
         return HappeningData.actionStaging.GetAnimationEnd();
     }
 
-    private bool ActionAbort()
+    private bool ShouldActionAbort()
     {
         Debug.Assert(HappeningData.actionStaging != null);
-        return HappeningData.actionStaging.MarkedForAbort();
+        return HappeningData.actionStaging.ShouldAbort();
     }
 
-    private bool ActionNeededDetail()
+    private bool DoesActionNeededDetail()
     {
         Debug.Assert(HappeningData.actionStaging != null);
         return HappeningData.actionStaging.NextDetail();
@@ -349,7 +349,7 @@ public partial class FightHappening : Node
     private void ReviveVesna()
     {
         var vesnaFighter = FightWorld.Instance.allyFighters.vesnaFighter;
-        vesnaFighter.health = vesnaFighter.maxHealth;
+        vesnaFighter.Health = vesnaFighter.maxHealth;
         GD.Print("Vesna has been revived. This is for the current prototype only");
     }