feat: removed base effect

Chillu1 · Jul 29, 2023 · 7455532 · 7455532
1 parent 6535f0e
commit 7455532
Show file tree

Hide file tree

Showing 15 changed files with 32 additions and 44 deletions.
diff --git a/ModiBuff/Assets/Examples/SimpleSolo/BlockEffect.cs b/ModiBuff/Assets/Examples/SimpleSolo/BlockEffect.cs
@@ -6,13 +6,13 @@ namespace ModiBuff.Examples.SimpleSolo
 	/// <summary>
 	///		Example simple custom effect implementation
 	/// </summary>
-	public sealed class BlockEffect : BaseEffect
+	public sealed class BlockEffect : IEffect
 	{
 		private readonly int _blockAmount;
 
 		public BlockEffect(int blockAmount) => _blockAmount = blockAmount;
 
-		public override void Effect(IUnit target, IUnit source)
+		public void Effect(IUnit target, IUnit source)
 		{
 #if DEBUG
 			if (target is not IBlockOwner)

diff --git a/ModiBuff/Assets/Examples/SimpleSolo/FullBlockEffect.cs b/ModiBuff/Assets/Examples/SimpleSolo/FullBlockEffect.cs
@@ -6,7 +6,7 @@ namespace ModiBuff.Examples.SimpleSolo
 	/// <summary>
 	///		Full example of a custom effect implementation
 	/// </summary>
-	public sealed class FullBlockEffect : BaseEffect, ITargetEffect, IEventTrigger, IStackEffect, IStateEffect
+	public sealed class FullBlockEffect : IEffect, ITargetEffect, IEventTrigger, IStackEffect, IStateEffect
 	{
 		private readonly int _baseBlock;
 		private readonly StackBlockEffectType _stackEffect;
@@ -31,7 +31,7 @@ private FullBlockEffect(int block, StackBlockEffectType stackEffect, Targeting t
 		public void SetTargeting(Targeting targeting) => _targeting = targeting;
 		public void SetEventBased() => _isEventBased = true;
 
-		public override void Effect(IUnit target, IUnit source)
+		public void Effect(IUnit target, IUnit source)
 		{
 #if DEBUG && !MODIBUFF_PROFILE
 			if (target is not IBlockOwner)

diff --git a/ModiBuff/Assets/Scripts/Core/Components/Effect/Effects/Actions/AttackActionEffect.cs b/ModiBuff/Assets/Scripts/Core/Components/Effect/Effects/Actions/AttackActionEffect.cs
@@ -1,12 +1,12 @@
 namespace ModiBuff.Core
 {
-	public sealed class AttackActionEffect : BaseEffect, IEventTrigger, IEffect
+	public sealed class AttackActionEffect : IEventTrigger, IEffect
 	{
 		private bool _isEventBased;
 
 		public void SetEventBased() => _isEventBased = true;
 
-		public override void Effect(IUnit target, IUnit source)
+		public void Effect(IUnit target, IUnit source)
 		{
 			((IAttacker)source).Attack(target, !_isEventBased);
 		}

diff --git a/ModiBuff/Assets/Scripts/Core/Components/Effect/Effects/Actions/HealActionEffect.cs b/ModiBuff/Assets/Scripts/Core/Components/Effect/Effects/Actions/HealActionEffect.cs
@@ -1,12 +1,12 @@
 namespace ModiBuff.Core
 {
-	public sealed class HealActionEffect : BaseEffect, IEventTrigger, IEffect
+	public sealed class HealActionEffect : IEventTrigger, IEffect
 	{
 		private bool _isEventBased;
 
 		public void SetEventBased() => _isEventBased = true;
 
-		public override void Effect(IUnit target, IUnit source)
+		public void Effect(IUnit target, IUnit source)
 		{
 			((IHealer)source).Heal((IHealable)target, !_isEventBased);
 		}

diff --git a/ModiBuff/Assets/Scripts/Core/Components/Effect/Effects/Actions/SelfAttackActionEffect.cs b/ModiBuff/Assets/Scripts/Core/Components/Effect/Effects/Actions/SelfAttackActionEffect.cs
@@ -1,12 +1,12 @@
 namespace ModiBuff.Core
 {
-	public sealed class SelfAttackActionEffect : BaseEffect, IEventTrigger, IEffect
+	public sealed class SelfAttackActionEffect : IEventTrigger, IEffect
 	{
 		private bool _isEventBased;
 
 		public void SetEventBased() => _isEventBased = true;
 
-		public override void Effect(IUnit target, IUnit source)
+		public void Effect(IUnit target, IUnit source)
 		{
 			((IAttacker)target).Attack(target, !_isEventBased);
 		}

diff --git a/ModiBuff/Assets/Scripts/Core/Components/Effect/Effects/AddDamageEffect.cs b/ModiBuff/Assets/Scripts/Core/Components/Effect/Effects/AddDamageEffect.cs
@@ -3,7 +3,7 @@
 
 namespace ModiBuff.Core
 {
-	public sealed class AddDamageEffect : BaseEffect, ITargetEffect, IStackEffect, IStateEffect, IRevertEffect, IEffect
+	public sealed class AddDamageEffect : ITargetEffect, IStackEffect, IStateEffect, IRevertEffect, IEffect
 	{
 		public bool IsRevertible { get; }
 
@@ -29,7 +29,7 @@ private AddDamageEffect(float damage, bool revertible, StackEffectType stackEffe
 
 		public void SetTargeting(Targeting targeting) => _targeting = targeting;
 
-		public override void Effect(IUnit target, IUnit source)
+		public void Effect(IUnit target, IUnit source)
 		{
 			if (IsRevertible)
 				_totalAddedDamage += _damage + _extraDamage;

diff --git a/ModiBuff/Assets/Scripts/Core/Components/Effect/Effects/ApplierEffect.cs b/ModiBuff/Assets/Scripts/Core/Components/Effect/Effects/ApplierEffect.cs
@@ -4,7 +4,7 @@
 
 namespace ModiBuff.Core
 {
-	public sealed class ApplierEffect : BaseEffect, ITargetEffect, IEffect, IStackEffect
+	public sealed class ApplierEffect : ITargetEffect, IStackEffect, IEffect
 	{
 		private readonly int _modifierId;
 		private Targeting _targeting;
@@ -25,7 +25,7 @@ public ApplierEffect(string modifierName)
 
 		public void SetTargeting(Targeting targeting) => _targeting = targeting;
 
-		public override void Effect(IUnit target, IUnit source)
+		public void Effect(IUnit target, IUnit source)
 		{
 			switch (_targeting)
 			{

diff --git a/ModiBuff/Assets/Scripts/Core/Components/Effect/Effects/BaseEffect.cs b/ModiBuff/Assets/Scripts/Core/Components/Effect/Effects/BaseEffect.cs
diff --git a/ModiBuff/Assets/Scripts/Core/Components/Effect/Effects/BaseEffect.cs.meta b/ModiBuff/Assets/Scripts/Core/Components/Effect/Effects/BaseEffect.cs.meta
diff --git a/ModiBuff/Assets/Scripts/Core/Components/Effect/Effects/DamageEffect.cs b/ModiBuff/Assets/Scripts/Core/Components/Effect/Effects/DamageEffect.cs
@@ -2,7 +2,7 @@
 
 namespace ModiBuff.Core
 {
-	public sealed class DamageEffect : BaseEffect, ITargetEffect, IEventTrigger, IStackEffect, IStateEffect, IEffect
+	public sealed class DamageEffect : ITargetEffect, IEventTrigger, IStackEffect, IStateEffect, IEffect
 	{
 		private readonly float _baseDamage;
 		private readonly StackEffectType _stackEffect;
@@ -27,7 +27,7 @@ private DamageEffect(float damage, StackEffectType stackEffect, Targeting target
 		public void SetTargeting(Targeting targeting) => _targeting = targeting;
 		public void SetEventBased() => _isEventBased = true;
 
-		public override void Effect(IUnit target, IUnit source)
+		public void Effect(IUnit target, IUnit source)
 		{
 #if DEBUG && !MODIBUFF_PROFILE
 			if (target is not IDamagable)

diff --git a/ModiBuff/Assets/Scripts/Core/Components/Effect/Effects/EventEffect.cs b/ModiBuff/Assets/Scripts/Core/Components/Effect/Effects/EventEffect.cs
@@ -1,6 +1,6 @@
 namespace ModiBuff.Core
 {
-	public sealed class EventEffect : BaseEffect, IRevertEffect, IEffect
+	public sealed class EventEffect : IRevertEffect, IEffect
 	{
 		//Always revert event effect?
 		public bool IsRevertible => true;
@@ -22,7 +22,7 @@ public EventEffect(IEffect[] effects, EffectOnEvent effectOnEvent)
 			_effectOnEvent = effectOnEvent;
 		}
 
-		public override void Effect(IUnit target, IUnit source)
+		public void Effect(IUnit target, IUnit source)
 		{
 			var eventOwner = (IEventOwner)target;
 			for (int i = 0; i < _effects.Length; i++)

diff --git a/ModiBuff/Assets/Scripts/Core/Components/Effect/Effects/HealEffect.cs b/ModiBuff/Assets/Scripts/Core/Components/Effect/Effects/HealEffect.cs
@@ -3,7 +3,7 @@
 
 namespace ModiBuff.Core
 {
-	public sealed class HealEffect : BaseEffect, ITargetEffect, IEventTrigger, IStateEffect, IStackEffect, IRevertEffect, IEffect
+	public sealed class HealEffect : ITargetEffect, IEventTrigger, IStateEffect, IStackEffect, IRevertEffect, IEffect
 	{
 		public bool IsRevertible { get; }
 
@@ -31,7 +31,7 @@ private HealEffect(float heal, bool revertible, StackEffectType stack, Targeting
 		public void SetTargeting(Targeting targeting) => _targeting = targeting;
 		public void SetEventBased() => _isEventBased = true;
 
-		public override void Effect(IUnit target, IUnit source)
+		public void Effect(IUnit target, IUnit source)
 		{
 			if (IsRevertible)
 				_totalHeal = _heal + _extraHeal;

diff --git a/ModiBuff/Assets/Scripts/Core/Components/Effect/Effects/RemoveEffect.cs b/ModiBuff/Assets/Scripts/Core/Components/Effect/Effects/RemoveEffect.cs
@@ -1,6 +1,6 @@
 namespace ModiBuff.Core
 {
-	public class RemoveEffect : BaseEffect, IRemoveEffect, IModifierIdOwner, IShallowClone<RemoveEffect>
+	public sealed class RemoveEffect : IRemoveEffect, IModifierIdOwner, IShallowClone<RemoveEffect>
 	{
 		private IRevertEffect[] _revertibleEffects;
 		private int _id;
@@ -18,7 +18,7 @@ public void SetRevertibleEffects(IRevertEffect[] revertibleEffects)
 			_revertibleEffects = revertibleEffects;
 		}
 
-		public override void Effect(IUnit target, IUnit source)
+		public void Effect(IUnit target, IUnit source)
 		{
 			//Debug.Log("RemoveEffect Effect, modifier id: " + _modifier.Id);
 			for (int i = 0; i < _revertibleEffects.Length; i++)

diff --git a/ModiBuff/Assets/Scripts/Core/Components/Effect/Effects/StatusEffectEffect.cs b/ModiBuff/Assets/Scripts/Core/Components/Effect/Effects/StatusEffectEffect.cs
@@ -1,6 +1,6 @@
 namespace ModiBuff.Core
 {
-	public sealed class StatusEffectEffect : BaseEffect, IStateEffect, IStackEffect, IRevertEffect, IEffect
+	public sealed class StatusEffectEffect : IStateEffect, IStackEffect, IRevertEffect, IEffect
 	{
 		public bool IsRevertible { get; }
 
@@ -20,7 +20,7 @@ public StatusEffectEffect(StatusEffectType statusEffectType, float duration, boo
 			_stackEffect = stackEffect;
 		}
 
-		public override void Effect(IUnit target, IUnit source)
+		public void Effect(IUnit target, IUnit source)
 		{
 			if (IsRevertible)
 				_totalDuration = _duration + _extraDuration;

diff --git a/ModiBuff/Assets/Scripts/Core/Components/Effect/Interfaces/IEffect.cs b/ModiBuff/Assets/Scripts/Core/Components/Effect/Interfaces/IEffect.cs
@@ -6,7 +6,14 @@ public interface IEffect
 	{
 		/// <param name="source">owner/acter</param>
 		void Effect(IUnit target, IUnit source);
+	}
 
-		void Effect(IList<IUnit> targets, IUnit source);
+	public static class EffectExtensions
+	{
+		public static void Effect(this IEffect effect, IList<IUnit> targets, IUnit source)
+		{
+			for (int i = 0; i < targets.Count; i++)
+				effect.Effect(targets[i], source);
+		}
 	}
 }