not clean execution

Author: serg.morozov

NuclearAbilitySystem.Tests/AbilitySystemTests.cs

@@ -20,7 +20,7 @@ public void DoubleStrikeWithOneBully_Full()
             state.AbilityContextHolder.GetContext<ITurnAbilityContext>().NextTurn();
 
             Assert.AreEqual(true, doubleStrikeAbility.CanExecute(null!, null!, state));
-            var result = state.ExecuteAbility(new StringUnitId("A"), 0, new StringUnitId("B"));
+            var result = state.ExecuteAbilityOnClone(new StringUnitId("A"), 0, new StringUnitId("B"));
 
             // Tests
             Assert.AreEqual(6, result.Commands.Count);
@@ -46,11 +46,12 @@ public void DoubleStrikeWithOneBully_OneShot()
                 .WithUnit(new TestUnit("C", 5, 1, new Vector2(0, 0)).WithBullyStatusEffect())
                 .Build();
 
+            state.Connect();
             state.GetUnit(new StringUnitId("A")).GetUnitFeature<IDamageable>()
                 .DealDamage(state.GetUnit(new StringUnitId("B")), 1);
             state.GetUnit(new StringUnitId("A")).GetUnitFeature<IDamageable>()
                 .DealDamage(state.GetUnit(new StringUnitId("B")), 1);
-
+            state.Disconnect();
             var result = state.CommandQueue.CalculateCommandQueue();
             Assert.AreEqual(2, result.Count);
             Assert.AreEqual(new AttackCombatCommand(new StringUnitId("A"), new StringUnitId("B"), 5, 0), result[0]);
@@ -67,10 +68,12 @@ public void DoubleStrikeWithTwoBully_Full()
                 .WithUnit(new TestUnit("D", 5, 1, new Vector2(0, 0)).WithBullyStatusEffect())
                 .Build();
 
+            state.Connect();
             state.GetUnit(new StringUnitId("A")).GetUnitFeature<IDamageable>()
                 .DealDamage(state.GetUnit(new StringUnitId("B")), 1);
             state.GetUnit(new StringUnitId("A")).GetUnitFeature<IDamageable>()
                 .DealDamage(state.GetUnit(new StringUnitId("B")), 1);
+            state.Disconnect();
 
             var result = state.CommandQueue.CalculateCommandQueue();
             Assert.AreEqual(6, result.Count);
@@ -96,8 +99,10 @@ public void SingleStrikeWithOneDefender_Full()
                 .WithUnit(new TestUnit("E", 5, 1, new Vector2(0, 0)).WithDefenderStatusEffect())
                 .Build();
 
+            state.Connect();
             state.GetUnit(new StringUnitId("A")).GetUnitFeature<IDamageable>()
                 .DealDamage(state.GetUnit(new StringUnitId("B")), 1);
+            state.Disconnect();
 
             var result = state.CommandQueue.CalculateCommandQueue();
             Assert.AreEqual(3, result.Count);
@@ -116,8 +121,10 @@ public void SingleStrikeWithOneBullyAndOneDefender()
                 .WithUnit(new TestUnit("D", 5, 1, new Vector2(0, 0)).WithDefenderStatusEffect())
                 .Build();
 
+            state.Connect();
             state.GetUnit(new StringUnitId("A")).GetUnitFeature<IDamageable>()
                 .DealDamage(state.GetUnit(new StringUnitId("B")), 1);
+            state.Disconnect();
 
             var result = state.CommandQueue.CalculateCommandQueue();
             Assert.AreEqual(4, result.Count);
@@ -137,8 +144,8 @@ public void TwoAbilities()
                 .WithUnit(new TestUnit("B", 5, 0, new Vector2(0, 2)))
                 .Build();
 
-             state.ExecuteAbility(new StringUnitId("A"), 0, new StringUnitId("B"));
-            state.ExecuteAbility(new StringUnitId("A"), 0, new StringUnitId("B"));
+            state.ExecuteAbilityOnClone(new StringUnitId("A"), 0, new StringUnitId("B"));
+            state.ExecuteAbilityOnClone(new StringUnitId("A"), 0, new StringUnitId("B"));
         }
     }
 }

NuclearAbilitySystem/CombatEventBus/CombatState.cs

@@ -20,20 +20,22 @@ public CombatState(List<IUnitMutable> units, IAbilityContextHolderMutable abilit
         }
 
         public IAbilityContextHolder AbilityContextHolder => _abilityContextHolder;
-        public IAbilityExecutionResult ExecuteAbility(UnitId sourceId, int abilityIndex, UnitId? targetId)
+        public IAbilityExecutionResult ExecuteAbilityOnClone(UnitId sourceId, int abilityIndex, UnitId? targetId)
         {
             var resultState = DeepClone();
             resultState.Connect();
-            
-            resultState.GetUnit(sourceId)
+            var result =  resultState.ExecuteAbility(sourceId, abilityIndex, targetId);
+            resultState.Disconnect();
+            return result;
+        }
+
+        public IAbilityExecutionResult ExecuteAbility(UnitId sourceId, int abilityIndex, UnitId? targetId)
+        {
+            GetUnit(sourceId)
                 .GetUnitFeature<IAbilitiesHolder>()
                 .Abilities[abilityIndex]
-                .Execute(sourceId, targetId, resultState);
-            
-            resultState.Disconnect();
-            var commands = resultState.CommandQueue.CalculateCommandQueue();
-            
-            return new AbilityExecutionResult(commands, resultState);
+                .Execute(sourceId, targetId, this);
+            return new AbilityExecutionResult(CommandQueue.CalculateCommandQueue(), this);
         }
 
         public ICombatEventBus CombatEventBus => _combatEventBus;
@@ -46,19 +48,19 @@ public IUnit GetUnit(UnitId unitId)
 
         public ReadOnlyCollection<IUnit> GetUnits() => _units.OfType<IUnit>().ToList().AsReadOnly();
 
-        private void Connect()
+        public void Connect()
         {
             _units.ForEach(u => u.Connect(this));
             _abilityContextHolder.Connect(this);
         }
 
-        private void Disconnect()
+        public void Disconnect()
         {
             _units.ForEach(u => u.Disconnect());
             _abilityContextHolder.Disconnect();
         }
 
-        private CombatState DeepClone()
+        public ICombatStateMutable DeepClone()
         {
             return new CombatState(_units.Select(u => u.DeepClone()).ToList(),
                 _abilityContextHolder.DeepClone());

NuclearAbilitySystem/CombatEventBus/IAbilityExecutionResult.cs

@@ -5,10 +5,10 @@ namespace Nuclear.AbilitySystem
     public interface IAbilityExecutionResult
     {
         ReadOnlyCollection<ICombatCommand> Commands { get; }
-        ICombatState ResultState { get; }
+        ICombatStateMutable ResultState { get; }
     }
 
-    public record AbilityExecutionResult(ReadOnlyCollection<ICombatCommand> Commands, ICombatState ResultState)
+    public record AbilityExecutionResult(ReadOnlyCollection<ICombatCommand> Commands, ICombatStateMutable ResultState)
         : IAbilityExecutionResult;
 
 }

NuclearAbilitySystem/CombatEventBus/ICombatState.cs

@@ -7,12 +7,16 @@ public interface ICombatState
         IUnit GetUnit(UnitId unitId);
         ReadOnlyCollection<IUnit> GetUnits();
         IAbilityContextHolder AbilityContextHolder { get; }
-        IAbilityExecutionResult ExecuteAbility(UnitId sourceId, int abilityIndex, UnitId? targetId);
+        IAbilityExecutionResult ExecuteAbilityOnClone(UnitId sourceId, int abilityIndex, UnitId? targetId);
     }
 
     public interface ICombatStateMutable : ICombatState
     {
         ICombatEventBus CombatEventBus { get; }
         ICommandQueue CommandQueue { get; }
+        void Connect();
+        void Disconnect();
+        IAbilityExecutionResult ExecuteAbility(UnitId sourceId, int abilityIndex, UnitId? targetId);
+        ICombatStateMutable DeepClone();
     }
 }

NuclearAbilitySystem/NuclearAbilitySystem.csproj

@@ -9,7 +9,7 @@
     <Platforms>AnyCPU</Platforms>
     <IsPackable>true</IsPackable>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>0.2.0</Version>
+    <Version>0.2.1</Version>
     <Title>NuclearAbilitySystem</Title>
     <Authors>NuclearBand</Authors>
     <Description>A flexible ability system that allows creating, configuring, and executing abilities in games</Description>