Feature 3 undo

Assets/Scenes/SampleScene.unity

@@ -218,7 +218,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &101671527
 RectTransform:
   m_ObjectHideFlags: 0
@@ -1453,6 +1453,7 @@ MonoBehaviour:
   EnemyOverlayColor: {r: 1, g: 0, b: 0, a: 0.23529412}
   ActionSelectionOverlayColor: {r: 0, g: 0, b: 1, a: 0.23529412}
   backgroundImage: {fileID: 1331666487}
+  undoButton: {fileID: 101671528}
 --- !u!1 &988327833
 GameObject:
   m_ObjectHideFlags: 0
@@ -1868,8 +1869,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 480, y: -540}
-  m_SizeDelta: {x: 960, y: 1080}
+  m_AnchoredPosition: {x: 480, y: -539.8176}
+  m_SizeDelta: {x: 960, y: 1079.6353}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1242843364
 MonoBehaviour:
@@ -2437,8 +2438,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 1440, y: -540}
-  m_SizeDelta: {x: 960, y: 1080}
+  m_AnchoredPosition: {x: 1440, y: -539.8176}
+  m_SizeDelta: {x: 960, y: 1079.6353}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &1682630444
 GameObject:

Assets/Scripts/Action/Actions/AttackAction.cs

@@ -9,12 +9,14 @@ public class AttackAction : IAction
     {
         private UnitController actorUnit;
         private UnitController targetUnit;
+        private bool isSuccessful;
         public TargetType TargetType => TargetType.Enemy;
 
-        public void PerformAction(UnitController actorUnit, UnitController targetUnit)
+        public void PerformAction(UnitController actorUnit, UnitController targetUnit, bool isSuccessful)
         {
             this.actorUnit = actorUnit;
             this.targetUnit = targetUnit;
+            this.isSuccessful = isSuccessful;
 
             actorUnit.PlayBattleAnimation(ActionType.Attack, CalculateMovePosition(targetUnit), OnActionAnimationCompleted);
         }
@@ -23,14 +25,12 @@ public void OnActionAnimationCompleted()
         {
             PlayAttackSound();
 
-            if (IsSuccessful())
+            if (isSuccessful)
                 targetUnit.TakeDamage(actorUnit.CurrentPower);
             else
                 GameService.Instance.UIService.ActionMissed();
         }
 
-        public bool IsSuccessful() => true;
-
         public Vector3 CalculateMovePosition(UnitController targetUnit) => targetUnit.GetEnemyPosition();
 
         private void PlayAttackSound()

Assets/Scripts/Action/Actions/AttackStanceAction.cs

@@ -9,12 +9,14 @@ public class AttackStanceAction : IAction
     {
         private UnitController actorUnit;
         private UnitController targetUnit;
-        TargetType IAction.TargetType { get => TargetType.Self; }
+        private bool isSuccessful;
+        public TargetType TargetType => TargetType.Enemy;
 
-        public void PerformAction(UnitController actorUnit, UnitController targetUnit)
+        public void PerformAction(UnitController actorUnit, UnitController targetUnit, bool isSuccessful)
         {
             this.actorUnit = actorUnit;
             this.targetUnit = targetUnit;
+            this.isSuccessful = isSuccessful;
 
             actorUnit.PlayBattleAnimation(ActionType.AttackStance, CalculateMovePosition(targetUnit), OnActionAnimationCompleted);
         }
@@ -23,14 +25,12 @@ public void OnActionAnimationCompleted()
         {
             GameService.Instance.SoundService.PlaySoundEffects(Sound.SoundType.ATTACK_STANCE);
 
-            if (IsSuccessful())
+            if (isSuccessful)
                 targetUnit.CurrentPower += (int)(targetUnit.CurrentPower * 0.2f);
             else
                 GameService.Instance.UIService.ActionMissed();
         }
 
-        public bool IsSuccessful() => true;
-
         public Vector3 CalculateMovePosition(UnitController targetUnit) => targetUnit.GetEnemyPosition();
     }
 }

Assets/Scripts/Action/Actions/BerserkAttackAction.cs

@@ -10,12 +10,14 @@ public class BerserkAttackAction : IAction
         private const float hitChance = 0.66f;
         private UnitController actorUnit;
         private UnitController targetUnit;
+        private bool isSuccessful;
         public TargetType TargetType => TargetType.Enemy;
 
-        public void PerformAction(UnitController actorUnit, UnitController targetUnit)
+        public void PerformAction(UnitController actorUnit, UnitController targetUnit, bool isSuccessful)
         {
             this.actorUnit = actorUnit;
             this.targetUnit = targetUnit;
+            this.isSuccessful = isSuccessful;
 
             actorUnit.PlayBattleAnimation(ActionType.BerserkAttack, CalculateMovePosition(targetUnit), OnActionAnimationCompleted);
         }
@@ -24,7 +26,7 @@ public void OnActionAnimationCompleted()
         {
             GameService.Instance.SoundService.PlaySoundEffects(Sound.SoundType.BERSERK_ATTACK);
 
-            if (IsSuccessful())
+            if (isSuccessful)
                 targetUnit.TakeDamage(actorUnit.CurrentPower * 2);
             else
             {
@@ -33,7 +35,6 @@ public void OnActionAnimationCompleted()
             }
         }
 
-        public bool IsSuccessful() => Random.Range(0f, 1f) < hitChance;
 
         public Vector3 CalculateMovePosition(UnitController targetUnit) => targetUnit.GetEnemyPosition();
     }

Assets/Scripts/Action/Actions/CleanseAction.cs

@@ -10,12 +10,14 @@ public class CleanseAction : IAction
         private const float hitChance = 0.2f;
         private UnitController actorUnit;
         private UnitController targetUnit;
-        public TargetType TargetType  => TargetType.Enemy;
+        private bool isSuccessful;
+        public TargetType TargetType => TargetType.Enemy;
 
-        public void PerformAction(UnitController actorUnit, UnitController targetUnit)
+        public void PerformAction(UnitController actorUnit, UnitController targetUnit, bool isSuccessful)
         {
             this.actorUnit = actorUnit;
             this.targetUnit = targetUnit;
+            this.isSuccessful = isSuccessful;
 
             actorUnit.PlayBattleAnimation(ActionType.Cleanse, CalculateMovePosition(targetUnit), OnActionAnimationCompleted);
         }
@@ -24,14 +26,12 @@ public void OnActionAnimationCompleted()
         {
             GameService.Instance.SoundService.PlaySoundEffects(Sound.SoundType.CLEANSE);
 
-            if (IsSuccessful())
+            if (isSuccessful)
                 targetUnit.ResetStats();
             else
                 GameService.Instance.UIService.ActionMissed();
         }
 
-        public bool IsSuccessful() => Random.Range(0f, 1f) < hitChance;
-
         public Vector3 CalculateMovePosition(UnitController targetUnit) => targetUnit.GetEnemyPosition();
     }
 }

Assets/Scripts/Action/Actions/HealAction.cs

@@ -9,12 +9,14 @@ public class HealAction : IAction
     {
         private UnitController actorUnit;
         private UnitController targetUnit;
+        private bool isSuccessful;
         public TargetType TargetType => TargetType.Friendly;
 
-        public void PerformAction(UnitController actorUnit, UnitController targetUnit)
+        public void PerformAction(UnitController actorUnit, UnitController targetUnit, bool isSuccessful)
         {
             this.actorUnit = actorUnit;
             this.targetUnit = targetUnit;
+            this.isSuccessful = isSuccessful;
 
             actorUnit.PlayBattleAnimation(ActionType.Heal, CalculateMovePosition(targetUnit), OnActionAnimationCompleted);
         }
@@ -23,12 +25,10 @@ public void OnActionAnimationCompleted()
         {
             GameService.Instance.SoundService.PlaySoundEffects(Sound.SoundType.HEAL);
 
-            if (IsSuccessful())
+            if (isSuccessful)
                 targetUnit.RestoreHealth(actorUnit.CurrentPower);
         }
 
-        public bool IsSuccessful() => true;
-
         public Vector3 CalculateMovePosition(UnitController targetUnit) => targetUnit.GetEnemyPosition();
     }
 }

Assets/Scripts/Action/Actions/MeditateAction.cs

@@ -9,12 +9,14 @@ public class MeditateAction : IAction
     {
         private UnitController actorUnit;
         private UnitController targetUnit;
+        private bool isSuccessful;
         public TargetType TargetType => TargetType.Self;
 
-        public void PerformAction(UnitController actorUnit, UnitController targetUnit)
+        public void PerformAction(UnitController actorUnit, UnitController targetUnit, bool isSuccessful)
         {
             this.actorUnit = actorUnit;
             this.targetUnit = targetUnit;
+            this.isSuccessful = isSuccessful;
 
             actorUnit.PlayBattleAnimation(ActionType.Meditate, CalculateMovePosition(targetUnit), OnActionAnimationCompleted);
         }
@@ -23,7 +25,7 @@ public void OnActionAnimationCompleted()
         {
             GameService.Instance.SoundService.PlaySoundEffects(Sound.SoundType.MEDITATE);
 
-            if (IsSuccessful())
+            if (isSuccessful)
             {
                 var healthToIncrease = (int)(targetUnit.CurrentMaxHealth * 0.2f);
                 targetUnit.CurrentMaxHealth += healthToIncrease;
@@ -33,7 +35,6 @@ public void OnActionAnimationCompleted()
                 GameService.Instance.UIService.ActionMissed();
         }
 
-        public bool IsSuccessful() => true;
 
         public Vector3 CalculateMovePosition(UnitController targetUnit) => targetUnit.GetEnemyPosition();
     }

Assets/Scripts/Action/Actions/ThirdEyeAction.cs

@@ -9,19 +9,21 @@ public class ThirdEyeAction : IAction
     {
         private UnitController actorUnit;
         private UnitController targetUnit;
+        private bool isSuccessful;
         public TargetType TargetType => TargetType.Self;
 
-        public void PerformAction(UnitController actorUnit, UnitController targetUnit)
+        public void PerformAction(UnitController actorUnit, UnitController targetUnit, bool isSuccessful)
         {
             this.actorUnit = actorUnit;
             this.targetUnit = targetUnit;
+            this.isSuccessful = isSuccessful;
 
             actorUnit.PlayBattleAnimation(ActionType.BerserkAttack, CalculateMovePosition(targetUnit), OnActionAnimationCompleted);
         }
 
         public void OnActionAnimationCompleted()
         {
-            if (IsSuccessful())
+            if (isSuccessful)
             {
                 int healthToConvert = (int)(targetUnit.CurrentHealth * 0.25f);
                 targetUnit.TakeDamage(healthToConvert);
@@ -31,8 +33,6 @@ public void OnActionAnimationCompleted()
                 GameService.Instance.UIService.ActionMissed();
         }
 
-        public bool IsSuccessful() => true;
-
         public Vector3 CalculateMovePosition(UnitController targetUnit) => targetUnit.GetEnemyPosition();
     }
 }

Assets/Scripts/Action/IAction.cs

@@ -11,10 +11,8 @@ public interface IAction
     {
         public TargetType TargetType { get; }
 
-        public void PerformAction(UnitController actorUnit, UnitController targetUnit);
-
-        public bool IsSuccessful();
+        public void PerformAction(UnitController actorUnit, UnitController targetUnit, bool isSuccessful);
 
         public Vector3 CalculateMovePosition(UnitController targetUnit);
-    } 
+    }
 }

Assets/Scripts/Command/CommandData.cs

@@ -0,0 +1,15 @@
+public struct CommandData
+{
+    public int ActorUnitID;
+    public int TargetUnitID;
+    public int ActorPlayerID;
+    public int TargetPlayerID;
+
+    public CommandData(int ActorUnitID, int TargetUnitID, int ActorPlayerID, int TargetPlayerID)
+    {
+        this.ActorUnitID = ActorUnitID;
+        this.TargetUnitID = TargetUnitID;
+        this.ActorPlayerID = ActorPlayerID;
+        this.TargetPlayerID = TargetPlayerID;
+    }
+}

Assets/Scripts/Command/CommandInvoker.cs

@@ -0,0 +1,46 @@
+using Command.Main;
+using System.Collections.Generic;
+
+/// <summary>
+/// A class responsible for invoking and managing commands.
+/// </summary>
+public class CommandInvoker
+{
+    // A stack to keep track of executed commands.
+    private Stack<ICommand> commandRegistry = new Stack<ICommand>();
+
+    /// <summary>
+    /// Process a command, which involves both executing it and registering it.
+    /// </summary>
+    /// <param name="commandToProcess">The command to be processed.</param>
+    public void ProcessCommand(ICommand commandToProcess)
+    {
+        ExecuteCommand(commandToProcess);
+        RegisterCommand(commandToProcess);
+    }
+
+    /// <summary>
+    /// Execute a command, invoking its associated action.
+    /// </summary>
+    /// <param name="commandToExecute">The command to be executed.</param>
+    public void ExecuteCommand(ICommand commandToExecute) => commandToExecute.Execute();
+
+    /// <summary>
+    /// Register a command by adding it to the command registry stack.
+    /// </summary>
+    /// <param name="commandToRegister">The command to be registered.</param>
+    public void RegisterCommand(ICommand commandToRegister) => commandRegistry.Push(commandToRegister);
+
+    private bool RegistryEmpty() => commandRegistry.Count == 0;
+
+    private bool CommandBelongsToActivePlayer()
+    {
+        return (commandRegistry.Peek() as UnitCommand).commandData.ActorPlayerID == GameService.Instance.PlayerService.ActivePlayerID;
+    }
+
+    public void Undo()
+    {
+        if (!RegistryEmpty() && CommandBelongsToActivePlayer())
+            commandRegistry.Pop().Undo();
+    }
+}