Roopesh - Bonus solution

.gitignore

@@ -71,3 +71,6 @@ crashlytics-build.properties
 # Temporary auto-generated Android Assets
 /[Aa]ssets/[Ss]treamingAssets/aa.meta
 /[Aa]ssets/[Ss]treamingAssets/aa/*
+.idea/.idea.AGD_CommandPattern/.idea
+*.meta
+*.zip

Assets/Resources/Battle/Battle 3.asset

@@ -13,6 +13,6 @@ MonoBehaviour:
   m_Name: Battle 3
   m_EditorClassIdentifier: 
   BattleID: 3
-  BattleBackgroundImage: {fileID: 1144033053, guid: 53ddd195ebcffd74cba8e68bd465b5b3, type: 3}
+  BattleBackgroundImage: {fileID: 1039436393, guid: 53ddd195ebcffd74cba8e68bd465b5b3, type: 3}
   Player1Data: {fileID: 11400000, guid: 54c708d0404a70248a7953a3b2b83d35, type: 2}
   Player2Data: {fileID: 11400000, guid: 373f3a8c5b7afe145ba9ec6ed8c88612, type: 2}

Assets/Resources/Battle/Battle 4.asset

@@ -0,0 +1,18 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 15700b09dee7b504c8b8f273851c4fcf, type: 3}
+  m_Name: Battle 4
+  m_EditorClassIdentifier: 
+  BattleID: 4
+  BattleBackgroundImage: {fileID: -717732176, guid: 53ddd195ebcffd74cba8e68bd465b5b3, type: 3}
+  Player1Data: {fileID: 11400000, guid: 996fcce034046194db9c6bd9601b7408, type: 2}
+  Player2Data: {fileID: 11400000, guid: d0205d5e036b8bc4fa73d5c5df43022b, type: 2}

Assets/Resources/Player/Battle 4/Player 4-1.asset

@@ -0,0 +1,25 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 053d310f426c4b8459cd32f46e3491d4, type: 3}
+  m_Name: Player 4-1
+  m_EditorClassIdentifier: 
+  PlayerID: 1
+  UnitData:
+  - {fileID: 11400000, guid: 46887c785e3822641a4fd79c553bda84, type: 2}
+  - {fileID: 11400000, guid: 069734e5b96bc064e8178d914cdae626, type: 2}
+  - {fileID: 11400000, guid: f016d481b03f2a04d86423fcbc9490f6, type: 2}
+  - {fileID: 11400000, guid: 7ab14eabf1920bc4a84647022949a215, type: 2}
+  UnitPositions:
+  - {x: -6, y: 2, z: 0}
+  - {x: -3, y: 1.2, z: 0}
+  - {x: -3, y: -1.2, z: 0}
+  - {x: -6, y: -2, z: 0}

Assets/Resources/Player/Battle 4/Player 4-2.asset

@@ -0,0 +1,25 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 053d310f426c4b8459cd32f46e3491d4, type: 3}
+  m_Name: Player 4-2
+  m_EditorClassIdentifier: 
+  PlayerID: 2
+  UnitData:
+  - {fileID: 11400000, guid: 62c3582c913eb5248a8469ef1883da78, type: 2}
+  - {fileID: 11400000, guid: 30d0684e24d795a42867d64014aece86, type: 2}
+  - {fileID: 11400000, guid: 14e444cabb3ddd34fbdfcb9fce6e5331, type: 2}
+  - {fileID: 11400000, guid: d2d35ed629463e646a7614dd021a47a2, type: 2}
+  UnitPositions:
+  - {x: 4, y: 2, z: 0}
+  - {x: 6, y: 1.2, z: 0}
+  - {x: 6, y: -1.2, z: 0}
+  - {x: 4, y: -2, z: 0}

Assets/Resources/Player/Battle 4/Units/Unit 1-1.asset

@@ -0,0 +1,22 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 66518e3bb2dd340478171f97ec326357, type: 3}
+  m_Name: Unit 1-1
+  m_EditorClassIdentifier: 
+  UnitID: 1
+  UnitType: 1
+  UnitPrefab: {fileID: 7170176875333329667, guid: 94eb109406780014b814de72f826ea1e, type: 3}
+  MaxHealth: 10
+  Power: 5
+  executableCommands: 010000000300000002000000
+  EnemyBattlePositionOffset: {x: 3, y: 0, z: 0}
+  MovementSpeed: 20

Assets/Resources/Player/Battle 4/Units/Unit 1-2.asset

@@ -0,0 +1,22 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 66518e3bb2dd340478171f97ec326357, type: 3}
+  m_Name: Unit 1-2
+  m_EditorClassIdentifier: 
+  UnitID: 2
+  UnitType: 2
+  UnitPrefab: {fileID: 7170176875333329667, guid: 696c0c4f156c7a94ba075ee5549f46d9, type: 3}
+  MaxHealth: 10
+  Power: 5
+  executableCommands: 020000000400000002000000
+  EnemyBattlePositionOffset: {x: 3, y: 0, z: 0}
+  MovementSpeed: 20

Assets/Resources/Player/Battle 4/Units/Unit 1-3.asset

@@ -0,0 +1,22 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 66518e3bb2dd340478171f97ec326357, type: 3}
+  m_Name: Unit 1-3
+  m_EditorClassIdentifier: 
+  UnitID: 3
+  UnitType: 3
+  UnitPrefab: {fileID: 7170176875333329667, guid: 8346e216771ef4d4d91d50605efc7328, type: 3}
+  MaxHealth: 10
+  Power: 5
+  executableCommands: 010000000500000002000000
+  EnemyBattlePositionOffset: {x: 3, y: 0, z: 0}
+  MovementSpeed: 20

Assets/Resources/Player/Battle 4/Units/Unit 1-4.asset

@@ -0,0 +1,22 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 66518e3bb2dd340478171f97ec326357, type: 3}
+  m_Name: Unit 1-4
+  m_EditorClassIdentifier: 
+  UnitID: 4
+  UnitType: 4
+  UnitPrefab: {fileID: 7170176875333329667, guid: 51727404ff102f747bbef208e93b2b3e, type: 3}
+  MaxHealth: 10
+  Power: 5
+  executableCommands: 010000000600000002000000
+  EnemyBattlePositionOffset: {x: 3, y: 0, z: 0}
+  MovementSpeed: 20

Assets/Resources/Player/Battle 4/Units/Unit 2-1.asset

@@ -0,0 +1,22 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 66518e3bb2dd340478171f97ec326357, type: 3}
+  m_Name: Unit 2-1
+  m_EditorClassIdentifier: 
+  UnitID: 1
+  UnitType: 1
+  UnitPrefab: {fileID: 3287956947383386545, guid: cc31d5544f3c02f48b8687eff615d8b4, type: 3}
+  MaxHealth: 10
+  Power: 5
+  executableCommands: 010000000300000002000000
+  EnemyBattlePositionOffset: {x: 3, y: 0, z: 0}
+  MovementSpeed: 20

Assets/Resources/Player/Battle 4/Units/Unit 2-2.asset

@@ -0,0 +1,22 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 66518e3bb2dd340478171f97ec326357, type: 3}
+  m_Name: Unit 2-2
+  m_EditorClassIdentifier: 
+  UnitID: 2
+  UnitType: 2
+  UnitPrefab: {fileID: 3287956947383386545, guid: 5063a7765cfdaa74e81c7cba7436cd7b, type: 3}
+  MaxHealth: 10
+  Power: 5
+  executableCommands: 020000000400000002000000
+  EnemyBattlePositionOffset: {x: 3, y: 0, z: 0}
+  MovementSpeed: 20

Assets/Resources/Player/Battle 4/Units/Unit 2-3.asset

@@ -0,0 +1,22 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 66518e3bb2dd340478171f97ec326357, type: 3}
+  m_Name: Unit 2-3
+  m_EditorClassIdentifier: 
+  UnitID: 3
+  UnitType: 3
+  UnitPrefab: {fileID: 3287956947383386545, guid: 81e11e62b52cbc74dbd90ed212f91beb, type: 3}
+  MaxHealth: 10
+  Power: 5
+  executableCommands: 010000000500000002000000
+  EnemyBattlePositionOffset: {x: 3, y: 0, z: 0}
+  MovementSpeed: 20

Assets/Resources/Player/Battle 4/Units/Unit 2-4.asset

@@ -0,0 +1,22 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 66518e3bb2dd340478171f97ec326357, type: 3}
+  m_Name: Unit 2-4
+  m_EditorClassIdentifier: 
+  UnitID: 4
+  UnitType: 4
+  UnitPrefab: {fileID: 3287956947383386545, guid: 601934b181c76164cb9dc247b665588e, type: 3}
+  MaxHealth: 10
+  Power: 5
+  executableCommands: 010000000600000002000000
+  EnemyBattlePositionOffset: {x: 3, y: 0, z: 0}
+  MovementSpeed: 20

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
@@ -1445,6 +1445,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 53b82781cf2fb9a4aa3b0d3e0a71f056, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  undoButton: {fileID: 101671528}
   turnText: {fileID: 144807538}
   missedText: {fileID: 1222372628}
   Player1BackgroundOverlay: {fileID: 1242843364}
@@ -1471,7 +1472,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &988327834
 RectTransform:
   m_ObjectHideFlags: 0
@@ -1885,7 +1886,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 0.23529412}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -1947,7 +1948,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &1260659848
 RectTransform:
   m_ObjectHideFlags: 0
@@ -2233,6 +2234,7 @@ MonoBehaviour:
   - {fileID: 11400000, guid: f9f1d2cf049ff604aab41d149ba596e9, type: 2}
   - {fileID: 11400000, guid: 32addf10f4370374993da88ffd77ac5c, type: 2}
   - {fileID: 11400000, guid: f6b3f84e1bf293a4d847b3c8ba69cb3f, type: 2}
+  - {fileID: 11400000, guid: 641b40954bf84b04aa75aad904451f0b, type: 2}
   sfxSource: {fileID: 363944623}
   bgMusicSource: {fileID: 927446004}
 --- !u!4 &1409757741
@@ -2376,7 +2378,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 0.23529412}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -2613,7 +2615,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 71}
-  m_SizeDelta: {x: 400, y: 32}
+  m_SizeDelta: {x: 400, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1861826650
 MonoBehaviour:
@@ -2787,6 +2789,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   resultText: {fileID: 1682630446}
   homeButton: {fileID: 799045267}
+  replayButton: {fileID: 988327835}
 --- !u!1 &2089575972
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scripts/Action/ActionService.cs

@@ -1,34 +1,35 @@
 using Command.Input;
+using Command.Commands;
 using System.Collections.Generic;
 
 namespace Command.Actions
 {
     public class ActionService
     {
-        private Dictionary<ActionType, IAction> actions;
+        private Dictionary<CommandType, IAction> actions;
 
         public ActionService() => CreateActions();
 
         private void CreateActions()
         {
-            actions = new Dictionary<ActionType, IAction>();
-            actions.Add(ActionType.Attack, new AttackAction());
-            actions.Add(ActionType.Heal, new HealAction());
-            actions.Add(ActionType.AttackStance, new AttackStanceAction());
-            actions.Add(ActionType.Cleanse, new CleanseAction());
-            actions.Add(ActionType.Meditate, new MeditateAction());
-            actions.Add(ActionType.BerserkAttack, new BerserkAttackAction());
-            actions.Add(ActionType.ThirdEye, new ThirdEyeAction());
+            actions = new Dictionary<CommandType, IAction>();
+            actions.Add(CommandType.Attack, new AttackAction());
+            actions.Add(CommandType.Heal, new HealAction());
+            actions.Add(CommandType.AttackStance, new AttackStanceAction());
+            actions.Add(CommandType.Cleanse, new CleanseAction());
+            actions.Add(CommandType.Meditate, new MeditateAction());
+            actions.Add(CommandType.BerserkAttack, new BerserkAttackAction());
+            actions.Add(CommandType.ThirdEye, new ThirdEyeAction());
         }
 
-        public IAction GetActionByType(ActionType type)
+        public IAction GetActionByType(CommandType type)
         {
             if (actions.ContainsKey(type))
                 return actions[type];
             else
                 throw new System.Exception($"No Action found for the type {type} in the dictionary");
         }
 
-        public TargetType GetTargetTypeForAction(ActionType actionType) => actions[actionType].TargetType;
+        public TargetType GetTargetTypeForAction(CommandType actionType) => actions[actionType].TargetType;
     }
 }