IBattleEffectResolver takes in the effects as params

Assets/Battle/BattleController.cs

@@ -186,24 +186,39 @@ public class BattleController : MonoBehaviour, IBattleEffectApplier, IBattleEffe
         return this.playArea;
     }
 
+    private void EnqueueActivatedTrigger(Trigger trigger) {
+        this.activatedTriggers.Add(trigger);
+    }
+
+    private void RunActivatedTriggers() {
+        foreach (Trigger t in this.activatedTriggers) {
+            t.Run(this);
+        }
+        this.activatedTriggers.Clear();
+
+        // Cleanup expired triggers
+        this.damageTriggers.RemoveAll(t => t.Expired);
+    }
+
     // IBattleEffectApplier
     public void Apply(IBattleEffect effect) {
         effect.Apply(this);
     }
 
     // IBattleEffectResolver
-    public void IncreaseHeroMaxEnergy(int delta) {
+    public void IncreaseHeroMaxEnergy(IncreaseMaxEnergyEffect effect) {
-        this.maxEnergy += delta;
+        this.maxEnergy += effect.Amount;
     }
 
     public void IncreaseMaxHP(IncreaseMaxHPEffect effect) {
         effect.Target.IncreaseMaxHP(effect.Amount);
     }
 
-    public void AcquireHeroCards(CardId[] cardIds, BattleZone zone, BattleHero owner) {
+    public void AcquireHeroCards(AcquireCardsEffect effect) {
-        foreach (CardId cardId in cardIds) {
+        BattleHero hero = (BattleHero) effect.Participant;
-            BaseCard acquiredCard = CardDatabase.CreateCard(cardId, owner);
+        foreach (CardId cardId in effect.CardIds) {
-            switch (zone) {
+            BaseCard acquiredCard = CardDatabase.CreateCard(cardId, hero);
+            switch (effect.Zone) {
                 case BattleZone.DrawPile:
                     this.GetHeroDeck().PutCardOnTopOfDrawPile(acquiredCard);
                     break;
@@ -212,7 +227,7 @@ public class BattleController : MonoBehaviour, IBattleEffectApplier, IBattleEffe
             }
         }
 
-        if (zone == BattleZone.DrawPile) {
+        if (effect.Zone == BattleZone.DrawPile) {
             this.GetHeroDeck().ShuffleDrawPile();
         }
     }
@@ -239,28 +254,14 @@ public class BattleController : MonoBehaviour, IBattleEffectApplier, IBattleEffe
         return healedAmount;
     }
 
-    public void AddBlock(BattleParticipant target, int amount) {
+    public void AddBlock(BlockEffect effect) {
-        target.AddBlock(amount);
+        effect.Target.AddBlock(effect.Amount);
     }
 
     public void ArmDamageTrigger(DamageTrigger damageTrigger) {
         this.damageTriggers.Add(damageTrigger);
     }
 
-    private void EnqueueActivatedTrigger(Trigger trigger) {
-        this.activatedTriggers.Add(trigger);
-    }
-
-    private void RunActivatedTriggers() {
-        foreach (Trigger t in this.activatedTriggers) {
-            t.Run(this);
-        }
-        this.activatedTriggers.Clear();
-
-        // Cleanup expired triggers
-        this.damageTriggers.RemoveAll(t => t.Expired);
-    }
-
     // MonsterViewpoint
     public BattleHero[] Heroes {get => this.heroes;}
 }

Assets/Battle/Effects/AcquireCardsEffect.cs

@@ -16,9 +16,13 @@ public class AcquireCardsEffect : IBattleEffect
 
     public void Apply(IBattleEffectResolver resolver) {
         if (this.participant.IsHero()) {
-            resolver.AcquireHeroCards(this.cardIds, this.zone, (BattleHero) this.participant);
+            resolver.AcquireHeroCards(this);
         } else {
             throw new System.NotImplementedException();
         }
     }
+
+    public CardId[] CardIds {get => this.cardIds;}
+    public BattleZone Zone {get => this.zone;}
+    public BattleParticipant Participant {get => this.participant;}
 }

Assets/Battle/Effects/BlockEffect.cs

@@ -13,6 +13,9 @@ public class BlockEffect : IBattleEffect
     }
 
     public void Apply(IBattleEffectResolver resolver) {
-        resolver.AddBlock(this.target, this.amount);
+        resolver.AddBlock(this);
     }
+
+    public BattleParticipant Target  {get => this.target;}
+    public int Amount {get => this.amount;}
 }

Assets/Battle/Effects/IncreaseMaxEnergyEffect.cs

@@ -4,13 +4,15 @@ using UnityEngine;
 
 public class IncreaseMaxEnergyEffect : IBattleEffect
 {
-    private int delta;
+    private int amount;
 
-    public IncreaseMaxEnergyEffect(int delta) {
+    public IncreaseMaxEnergyEffect(int amount) {
-        this.delta = delta;
+        this.amount = amount;
     }
 
     public void Apply(IBattleEffectResolver resolver) {
-        resolver.IncreaseHeroMaxEnergy(this.delta);
+        resolver.IncreaseHeroMaxEnergy(this);
     }
+
+    public int Amount {get => this.amount;}
 }

Assets/Battle/IBattleEffectResolver.cs

@@ -5,9 +5,10 @@ using UnityEngine;
 public interface IBattleEffectResolver {
     int DealDamage(DealDamageEffect effect);
     int Heal(HealEffect effect);
-    void AddBlock(BattleParticipant target, int amount);
+    void AddBlock(BlockEffect effect);
-    void IncreaseHeroMaxEnergy(int delta);
+    void IncreaseHeroMaxEnergy(IncreaseMaxEnergyEffect delta);
     void IncreaseMaxHP(IncreaseMaxHPEffect effect);
-    void AcquireHeroCards(CardId[] cardIds, BattleZone zone, BattleHero owner);
+    void AcquireHeroCards(AcquireCardsEffect effect);
+    
     void ArmDamageTrigger(DamageTrigger damageTrigger);
 }

TODO.txt

@@ -1,4 +1,3 @@
-- Make API of IBattleEffectResolver take in effects instead of params
 - Control flow of battle with state machine or coroutines
 - Make battle end
 - Do not allow dead heroes to act