modified spells' canPlayAi, doTrigger and playFromEffect methods used by AI to include aiPlayer as 1st parameter

.gitattributes

@@ -14698,6 +14698,7 @@ forge-gui/src/main/java/forge/ai/ComputerUtilCard.java -text
 forge-gui/src/main/java/forge/ai/ComputerUtilCombat.java -text
 forge-gui/src/main/java/forge/ai/ComputerUtilCost.java -text
 forge-gui/src/main/java/forge/ai/ComputerUtilMana.java -text
+forge-gui/src/main/java/forge/ai/SpellAbilityAi.java -text
 forge-gui/src/main/java/forge/ai/ability/AddPhaseAi.java -text
 forge-gui/src/main/java/forge/ai/ability/AddTurnAi.java svneol=native#text/plain
 forge-gui/src/main/java/forge/ai/ability/AlwaysPlayAi.java -text
@@ -14848,7 +14849,6 @@ forge-gui/src/main/java/forge/game/ability/AbilityFactory.java svneol=native#tex
 forge-gui/src/main/java/forge/game/ability/AbilityUtils.java -text
 forge-gui/src/main/java/forge/game/ability/ApiType.java -text
 forge-gui/src/main/java/forge/game/ability/SaTargetRoutines.java -text
-forge-gui/src/main/java/forge/game/ability/SpellAbilityAi.java -text
 forge-gui/src/main/java/forge/game/ability/SpellAbilityEffect.java -text
 forge-gui/src/main/java/forge/game/ability/SpellApiBased.java -text
 forge-gui/src/main/java/forge/game/ability/effects/AbandonEffect.java -text

forge-gui/src/main/java/forge/ai/AiController.java

@@ -476,7 +476,7 @@ public class AiController {
             return false;
         }
         //System.out.printf("Ai thinks of %s @ %s >>> ", sa, sa.getActivatingPlayer().getGame().getPhaseHandler().debugPrintState());
-        if (!sa.canPlayAI()) {
+        if (!sa.canPlayAI(player)) {
             return false;
         }
         //System.out.printf("wouldPlay: %s, canPay: %s%n", aiWouldPlay, canPay);
@@ -713,11 +713,11 @@ public class AiController {
             sa.setActivatingPlayer(player);
             //Spells
             if (sa instanceof Spell) {
-                if (!((Spell) sa).canPlayFromEffectAI(mandatory, withoutPayingManaCost)) {
+                if (!((Spell) sa).canPlayFromEffectAI(player, mandatory, withoutPayingManaCost)) {
                     continue;
                 }
             } else {
-                if (sa.canPlayAI()) {
+                if (sa.canPlayAI(player)) {
                     continue;
                 }
             }

forge-gui/src/main/java/forge/ai/SpellAbilityAi.java

@@ -1,4 +1,4 @@
-package forge.game.ability;
+package forge.ai;
 
 
 import java.util.Collection;
@@ -6,8 +6,7 @@ import java.util.List;
 
 import com.google.common.collect.Iterables;
 
-import forge.ai.ComputerUtil;
-import forge.ai.ComputerUtilCost;
+import forge.game.ability.SaTargetRoutines;
 import forge.game.card.Card;
 import forge.game.phase.PhaseHandler;
 import forge.game.phase.PhaseType;

forge-gui/src/main/java/forge/ai/ability/AddPhaseAi.java

@@ -1,6 +1,6 @@
 package forge.ai.ability;
 
-import forge.game.ability.SpellAbilityAi;
+import forge.ai.SpellAbilityAi;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 

forge-gui/src/main/java/forge/ai/ability/AddTurnAi.java

@@ -19,8 +19,8 @@ package forge.ai.ability;
 
 import java.util.List;
 
+import forge.ai.SpellAbilityAi;
 import forge.game.ability.AbilityUtils;
-import forge.game.ability.SpellAbilityAi;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 

forge-gui/src/main/java/forge/ai/ability/AlwaysPlayAi.java

@@ -1,7 +1,7 @@
 package forge.ai.ability;
 
 
-import forge.game.ability.SpellAbilityAi;
+import forge.ai.SpellAbilityAi;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 

forge-gui/src/main/java/forge/ai/ability/AnimateAi.java

@@ -4,9 +4,9 @@ import java.util.List;
 
 import com.google.common.collect.Iterables;
 
+import forge.ai.SpellAbilityAi;
 import forge.game.Game;
 import forge.game.ability.AbilityUtils;
-import forge.game.ability.SpellAbilityAi;
 import forge.game.card.Card;
 import forge.game.card.CardPredicates;
 import forge.game.phase.PhaseHandler;

forge-gui/src/main/java/forge/ai/ability/AnimateAllAi.java

@@ -1,6 +1,6 @@
 package forge.ai.ability;
 
-import forge.game.ability.SpellAbilityAi;
+import forge.ai.SpellAbilityAi;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 

forge-gui/src/main/java/forge/ai/ability/AttachAi.java

@@ -15,10 +15,10 @@ import forge.ai.ComputerUtil;
 import forge.ai.ComputerUtilCard;
 import forge.ai.ComputerUtilCost;
 import forge.ai.ComputerUtilMana;
+import forge.ai.SpellAbilityAi;
 import forge.game.GameObject;
 import forge.game.ability.AbilityUtils;
 import forge.game.ability.ApiType;
-import forge.game.ability.SpellAbilityAi;
 import forge.game.card.Card;
 import forge.game.card.CardFactoryUtil;
 import forge.game.card.CardLists;

forge-gui/src/main/java/forge/ai/ability/BalanceAi.java

@@ -2,7 +2,7 @@ package forge.ai.ability;
 
 import java.util.List;
 
-import forge.game.ability.SpellAbilityAi;
+import forge.ai.SpellAbilityAi;
 import forge.game.card.Card;
 import forge.game.card.CardLists;
 import forge.game.card.CardPredicates;

forge-gui/src/main/java/forge/ai/ability/BecomesBlockedAi.java

@@ -4,8 +4,8 @@ package forge.ai.ability;
 import java.util.List;
 
 import forge.ai.ComputerUtilCard;
+import forge.ai.SpellAbilityAi;
 import forge.game.Game;
-import forge.game.ability.SpellAbilityAi;
 import forge.game.card.Card;
 import forge.game.card.CardLists;
 import forge.game.phase.PhaseType;

forge-gui/src/main/java/forge/ai/ability/BondAi.java

@@ -20,7 +20,7 @@ package forge.ai.ability;
 import java.util.Collection;
 
 import forge.ai.ComputerUtilCard;
-import forge.game.ability.SpellAbilityAi;
+import forge.ai.SpellAbilityAi;
 import forge.game.card.Card;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;

forge-gui/src/main/java/forge/ai/ability/CanPlayAsDrawbackAi.java

@@ -3,7 +3,7 @@ package forge.ai.ability;
 
 import java.util.List;
 
-import forge.game.ability.SpellAbilityAi;
+import forge.ai.SpellAbilityAi;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 

forge-gui/src/main/java/forge/ai/ability/CannotPlayAi.java

@@ -1,7 +1,7 @@
 package forge.ai.ability;
 
 
-import forge.game.ability.SpellAbilityAi;
+import forge.ai.SpellAbilityAi;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 

forge-gui/src/main/java/forge/ai/ability/ChangeTargetsAi.java

@@ -1,6 +1,6 @@
 package forge.ai.ability;
 
-import forge.game.ability.SpellAbilityAi;
+import forge.ai.SpellAbilityAi;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 

forge-gui/src/main/java/forge/ai/ability/ChangeZoneAi.java

@@ -17,6 +17,7 @@ import forge.ai.ComputerUtilCard;
 import forge.ai.ComputerUtilCombat;
 import forge.ai.ComputerUtilCost;
 import forge.ai.ComputerUtilMana;
+import forge.ai.SpellAbilityAi;
 import forge.card.CardCharacteristicName;
 import forge.card.MagicColor;
 import forge.game.Game;
@@ -25,7 +26,6 @@ import forge.game.GameObject;
 import forge.game.GlobalRuleChange;
 import forge.game.ability.AbilityUtils;
 import forge.game.ability.ApiType;
-import forge.game.ability.SpellAbilityAi;
 import forge.game.ability.effects.AttachEffect;
 import forge.game.card.Card;
 import forge.game.card.CardLists;

forge-gui/src/main/java/forge/ai/ability/ChangeZoneAllAi.java

@@ -5,8 +5,8 @@ import java.util.Random;
 
 import forge.ai.ComputerUtilCard;
 import forge.ai.ComputerUtilCost;
+import forge.ai.SpellAbilityAi;
 import forge.game.ability.AbilityUtils;
-import forge.game.ability.SpellAbilityAi;
 import forge.game.card.Card;
 import forge.game.card.CardLists;
 import forge.game.cost.Cost;

forge-gui/src/main/java/forge/ai/ability/CharmAi.java

@@ -4,7 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
 
-import forge.game.ability.SpellAbilityAi;
+import forge.ai.SpellAbilityAi;
 import forge.game.ability.effects.CharmEffect;
 import forge.game.player.Player;
 import forge.game.spellability.AbilitySub;
@@ -49,7 +49,7 @@ public class CharmAi extends SpellAbilityAi {
             AbilitySub thisPick = null;
             for (SpellAbility sub : choices) {
                 sub.setActivatingPlayer(ai);
-                if (!playNow && sub.canPlayAI()) {
+                if (!playNow && sub.canPlayAI(ai)) {
                     thisPick = (AbilitySub) sub;
                     choices.remove(sub);
                     playNow = true;

forge-gui/src/main/java/forge/ai/ability/ChooseCardAi.java

@@ -8,8 +8,8 @@ import com.google.common.base.Predicate;
 
 import forge.ai.ComputerUtilCard;
 import forge.ai.ComputerUtilCombat;
+import forge.ai.SpellAbilityAi;
 import forge.game.Game;
-import forge.game.ability.SpellAbilityAi;
 import forge.game.card.Card;
 import forge.game.card.CardLists;
 import forge.game.card.CardPredicates.Presets;

forge-gui/src/main/java/forge/ai/ability/ChooseCardNameAi.java

@@ -2,7 +2,7 @@ package forge.ai.ability;
 
 import forge.ai.ComputerUtil;
 import forge.ai.ComputerUtilMana;
-import forge.game.ability.SpellAbilityAi;
+import forge.ai.SpellAbilityAi;
 import forge.game.card.Card;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;

forge-gui/src/main/java/forge/ai/ability/ChooseColorAi.java

@@ -1,6 +1,6 @@
 package forge.ai.ability;
 
-import forge.game.ability.SpellAbilityAi;
+import forge.ai.SpellAbilityAi;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 import forge.util.MyRandom;

forge-gui/src/main/java/forge/ai/ability/ChoosePlayerAi.java

@@ -3,7 +3,7 @@ package forge.ai.ability;
 import java.util.List;
 
 import forge.ai.ComputerUtil;
-import forge.game.ability.SpellAbilityAi;
+import forge.ai.SpellAbilityAi;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;

forge-gui/src/main/java/forge/ai/ability/ChooseSourceAi.java

@@ -6,11 +6,11 @@ import com.google.common.base.Predicate;
 
 import forge.ai.ComputerUtilCombat;
 import forge.ai.ComputerUtilCost;
+import forge.ai.SpellAbilityAi;
 import forge.game.Game;
 import forge.game.GameObject;
 import forge.game.ability.AbilityUtils;
 import forge.game.ability.ApiType;
-import forge.game.ability.SpellAbilityAi;
 import forge.game.card.Card;
 import forge.game.card.CardLists;
 import forge.game.combat.Combat;

forge-gui/src/main/java/forge/ai/ability/ChooseTypeAi.java

@@ -1,7 +1,7 @@
 package forge.ai.ability;
 
+import forge.ai.SpellAbilityAi;
 import forge.game.ability.AbilityUtils;
-import forge.game.ability.SpellAbilityAi;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 

forge-gui/src/main/java/forge/ai/ability/ClashAi.java

@@ -1,7 +1,7 @@
 package forge.ai.ability;
 
 
-import forge.game.ability.SpellAbilityAi;
+import forge.ai.SpellAbilityAi;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 import forge.game.spellability.TargetRestrictions;

forge-gui/src/main/java/forge/ai/ability/CloneAi.java

@@ -2,9 +2,9 @@ package forge.ai.ability;
 
 import java.util.List;
 
+import forge.ai.SpellAbilityAi;
 import forge.game.Game;
 import forge.game.ability.AbilityUtils;
-import forge.game.ability.SpellAbilityAi;
 import forge.game.card.Card;
 import forge.game.phase.PhaseHandler;
 import forge.game.phase.PhaseType;

forge-gui/src/main/java/forge/ai/ability/ControlExchangeAi.java

@@ -6,8 +6,8 @@ import java.util.Map;
 import com.google.common.base.Predicate;
 
 import forge.ai.ComputerUtilCard;
+import forge.ai.SpellAbilityAi;
 import forge.game.ability.AbilityUtils;
-import forge.game.ability.SpellAbilityAi;
 import forge.game.card.Card;
 import forge.game.card.CardLists;
 import forge.game.player.Player;

forge-gui/src/main/java/forge/ai/ability/ControlGainAi.java

@@ -24,9 +24,9 @@ import java.util.Map;
 import com.google.common.base.Predicate;
 
 import forge.ai.ComputerUtilCard;
+import forge.ai.SpellAbilityAi;
 import forge.game.Game;
 import forge.game.ability.AbilityUtils;
-import forge.game.ability.SpellAbilityAi;
 import forge.game.card.Card;
 import forge.game.card.CardLists;
 import forge.game.combat.CombatUtil;

forge-gui/src/main/java/forge/ai/ability/CopyPermanentAi.java

@@ -8,7 +8,7 @@ import java.util.Random;
 import com.google.common.base.Predicate;
 
 import forge.ai.ComputerUtilCard;
-import forge.game.ability.SpellAbilityAi;
+import forge.ai.SpellAbilityAi;
 import forge.game.card.Card;
 import forge.game.card.CardLists;
 import forge.game.card.CardPredicates.Presets;

forge-gui/src/main/java/forge/ai/ability/CounterAi.java

@@ -2,9 +2,9 @@ package forge.ai.ability;
 
 import forge.ai.ComputerUtilCost;
 import forge.ai.ComputerUtilMana;
+import forge.ai.SpellAbilityAi;
 import forge.game.Game;
 import forge.game.ability.AbilityUtils;
-import forge.game.ability.SpellAbilityAi;
 import forge.game.card.Card;
 import forge.game.card.CardFactoryUtil;
 import forge.game.cost.Cost;

forge-gui/src/main/java/forge/ai/ability/CountersMoveAi.java

@@ -4,8 +4,8 @@ import java.util.List;
 import java.util.Random;
 
 import forge.ai.ComputerUtilCard;
+import forge.ai.SpellAbilityAi;
 import forge.game.ability.AbilityUtils;
-import forge.game.ability.SpellAbilityAi;
 import forge.game.card.Card;
 import forge.game.card.CardLists;
 import forge.game.card.CounterType;

forge-gui/src/main/java/forge/ai/ability/CountersProliferateAi.java

@@ -5,7 +5,7 @@ import java.util.List;
 import com.google.common.base.Predicate;
 
 import forge.ai.ComputerUtil;
-import forge.game.ability.SpellAbilityAi;
+import forge.ai.SpellAbilityAi;
 import forge.game.card.Card;
 import forge.game.card.CardLists;
 import forge.game.card.CounterType;

forge-gui/src/main/java/forge/ai/ability/CountersPutAi.java

@@ -10,8 +10,8 @@ import forge.ai.ComputerUtil;
 import forge.ai.ComputerUtilCard;
 import forge.ai.ComputerUtilCost;
 import forge.ai.ComputerUtilMana;
+import forge.ai.SpellAbilityAi;
 import forge.game.ability.AbilityUtils;
-import forge.game.ability.SpellAbilityAi;
 import forge.game.card.Card;
 import forge.game.card.CardLists;
 import forge.game.card.CounterType;

forge-gui/src/main/java/forge/ai/ability/CountersPutAllAi.java

@@ -7,8 +7,8 @@ import com.google.common.base.Predicate;
 
 import forge.ai.ComputerUtilCost;
 import forge.ai.ComputerUtilMana;
+import forge.ai.SpellAbilityAi;
 import forge.game.ability.AbilityUtils;
-import forge.game.ability.SpellAbilityAi;
 import forge.game.card.Card;
 import forge.game.card.CardLists;
 import forge.game.cost.Cost;

forge-gui/src/main/java/forge/ai/ability/CountersPutOrRemoveAi.java

@@ -21,7 +21,7 @@ import java.util.List;
 
 import com.google.common.base.Predicate;
 
-import forge.game.ability.SpellAbilityAi;
+import forge.ai.SpellAbilityAi;
 import forge.game.card.Card;
 import forge.game.card.CardLists;
 import forge.game.player.Player;

forge-gui/src/main/java/forge/ai/ability/CountersRemoveAi.java

@@ -2,7 +2,7 @@ package forge.ai.ability;
 
 import forge.ai.ComputerUtil;
 import forge.ai.ComputerUtilCost;
-import forge.game.ability.SpellAbilityAi;
+import forge.ai.SpellAbilityAi;
 import forge.game.card.Card;
 import forge.game.card.CounterType;
 import forge.game.cost.Cost;

forge-gui/src/main/java/forge/ai/ability/DamageAiBase.java

@@ -5,8 +5,8 @@ import java.util.List;
 import com.google.common.collect.Iterables;
 
 import forge.ai.ComputerUtilCombat;
+import forge.ai.SpellAbilityAi;
 import forge.game.Game;
-import forge.game.ability.SpellAbilityAi;
 import forge.game.card.Card;
 import forge.game.card.CardPredicates;
 import forge.game.phase.PhaseType;

forge-gui/src/main/java/forge/ai/ability/DamageAllAi.java

@@ -10,8 +10,8 @@ import forge.ai.ComputerUtilCard;
 import forge.ai.ComputerUtilCombat;
 import forge.ai.ComputerUtilCost;
 import forge.ai.ComputerUtilMana;
+import forge.ai.SpellAbilityAi;
 import forge.game.ability.AbilityUtils;
-import forge.game.ability.SpellAbilityAi;
 import forge.game.card.Card;
 import forge.game.card.CardLists;
 import forge.game.cost.Cost;

forge-gui/src/main/java/forge/ai/ability/DamageDealAi.java

@@ -11,10 +11,10 @@ import forge.ai.ComputerUtilCard;
 import forge.ai.ComputerUtilCombat;
 import forge.ai.ComputerUtilCost;
 import forge.ai.ComputerUtilMana;
+import forge.ai.SpellAbilityAi;
 import forge.game.Game;
 import forge.game.GameObject;
 import forge.game.ability.AbilityUtils;
-import forge.game.ability.SpellAbilityAi;
 import forge.game.card.Card;
 import forge.game.card.CardLists;
 import forge.game.card.CardPredicates;

forge-gui/src/main/java/forge/ai/ability/DamagePreventAi.java

@@ -7,10 +7,10 @@ import forge.ai.ComputerUtil;
 import forge.ai.ComputerUtilCard;
 import forge.ai.ComputerUtilCombat;
 import forge.ai.ComputerUtilCost;
+import forge.ai.SpellAbilityAi;
 import forge.game.Game;
 import forge.game.GameObject;
 import forge.game.ability.AbilityUtils;
-import forge.game.ability.SpellAbilityAi;
 import forge.game.card.Card;
 import forge.game.card.CardLists;
 import forge.game.card.CardPredicates;

forge-gui/src/main/java/forge/ai/ability/DamagePreventAllAi.java

@@ -2,7 +2,7 @@ package forge.ai.ability;
 
 
 import forge.ai.ComputerUtilCost;
-import forge.game.ability.SpellAbilityAi;
+import forge.ai.SpellAbilityAi;
 import forge.game.card.Card;
 import forge.game.cost.Cost;
 import forge.game.phase.PhaseType;

forge-gui/src/main/java/forge/ai/ability/DebuffAi.java

@@ -10,9 +10,9 @@ import com.google.common.collect.Lists;
 
 import forge.ai.ComputerUtilCard;
 import forge.ai.ComputerUtilCost;
+import forge.ai.SpellAbilityAi;
 import forge.game.Game;
 import forge.game.ability.AbilityUtils;
-import forge.game.ability.SpellAbilityAi;
 import forge.game.card.Card;
 import forge.game.card.CardLists;
 import forge.game.combat.Combat;

forge-gui/src/main/java/forge/ai/ability/DebuffAllAi.java

@@ -5,7 +5,7 @@ import java.util.Random;
 
 import com.google.common.base.Predicate;
 
-import forge.game.ability.SpellAbilityAi;
+import forge.ai.SpellAbilityAi;
 import forge.game.card.Card;
 import forge.game.card.CardLists;
 import forge.game.combat.CombatUtil;

forge-gui/src/main/java/forge/ai/ability/DelayedTriggerAi.java

@@ -1,7 +1,7 @@
 package forge.ai.ability;
 
+import forge.ai.SpellAbilityAi;
 import forge.game.ability.AbilityFactory;
-import forge.game.ability.SpellAbilityAi;
 import forge.game.player.Player;
 import forge.game.spellability.AbilitySub;
 import forge.game.spellability.SpellAbility;
@@ -17,7 +17,7 @@ public class DelayedTriggerAi extends SpellAbilityAi {
         if (trigsa instanceof AbilitySub) {
             return ((AbilitySub) trigsa).getAi().chkDrawbackWithSubs(ai, (AbilitySub)trigsa);
         } else {
-            return trigsa.canPlayAI();
+            return trigsa.canPlayAI(ai);
         }
     }
 
@@ -39,7 +39,7 @@ public class DelayedTriggerAi extends SpellAbilityAi {
         final String svarName = sa.getParam("Execute");
         final SpellAbility trigsa = AbilityFactory.getAbility(sa.getSourceCard().getSVar(svarName), sa.getSourceCard());
         trigsa.setActivatingPlayer(ai);
-        return trigsa.canPlayAI();
+        return trigsa.canPlayAI(ai);
     }
 
 }

forge-gui/src/main/java/forge/ai/ability/DestroyAi.java

@@ -9,8 +9,8 @@ import com.google.common.base.Predicate;
 import forge.ai.ComputerUtil;
 import forge.ai.ComputerUtilCard;
 import forge.ai.ComputerUtilCost;
+import forge.ai.SpellAbilityAi;
 import forge.game.ability.AbilityUtils;
-import forge.game.ability.SpellAbilityAi;
 import forge.game.card.Card;
 import forge.game.card.CardLists;
 import forge.game.card.CounterType;

forge-gui/src/main/java/forge/ai/ability/DestroyAllAi.java

@@ -8,7 +8,7 @@ import com.google.common.base.Predicate;
 import forge.ai.ComputerUtilCard;
 import forge.ai.ComputerUtilCost;
 import forge.ai.ComputerUtilMana;
-import forge.game.ability.SpellAbilityAi;
+import forge.ai.SpellAbilityAi;
 import forge.game.card.Card;
 import forge.game.card.CardLists;
 import forge.game.cost.Cost;

forge-gui/src/main/java/forge/ai/ability/DigAi.java

@@ -3,8 +3,8 @@ package forge.ai.ability;
 import java.util.Random;
 
 import forge.ai.ComputerUtil;
+import forge.ai.SpellAbilityAi;
 import forge.game.ability.AbilityUtils;
-import forge.game.ability.SpellAbilityAi;
 import forge.game.card.Card;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;

forge-gui/src/main/java/forge/ai/ability/DigUntilAi.java

@@ -4,7 +4,7 @@ import java.util.List;
 import java.util.Random;
 
 import forge.ai.ComputerUtilMana;
-import forge.game.ability.SpellAbilityAi;
+import forge.ai.SpellAbilityAi;
 import forge.game.card.Card;
 import forge.game.card.CardLists;
 import forge.game.card.CardPredicates;

forge-gui/src/main/java/forge/ai/ability/DiscardAi.java

@@ -6,8 +6,8 @@ import java.util.Random;
 import forge.ai.ComputerUtil;
 import forge.ai.ComputerUtilCost;
 import forge.ai.ComputerUtilMana;
+import forge.ai.SpellAbilityAi;
 import forge.game.ability.AbilityUtils;
-import forge.game.ability.SpellAbilityAi;
 import forge.game.card.Card;
 import forge.game.cost.Cost;
 import forge.game.phase.PhaseType;

forge-gui/src/main/java/forge/ai/ability/DrainManaAi.java

@@ -3,8 +3,8 @@ package forge.ai.ability;
 import java.util.List;
 import java.util.Random;
 
+import forge.ai.SpellAbilityAi;
 import forge.game.ability.AbilityUtils;
-import forge.game.ability.SpellAbilityAi;
 import forge.game.card.Card;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;

forge-gui/src/main/java/forge/ai/ability/DrawAi.java

@@ -21,9 +21,9 @@ package forge.ai.ability;
 import forge.ai.ComputerUtil;
 import forge.ai.ComputerUtilCost;
 import forge.ai.ComputerUtilMana;
+import forge.ai.SpellAbilityAi;
 import forge.game.Game;
 import forge.game.ability.AbilityUtils;
-import forge.game.ability.SpellAbilityAi;
 import forge.game.card.Card;
 import forge.game.cost.Cost;
 import forge.game.cost.CostDiscard;

forge-gui/src/main/java/forge/ai/ability/EffectAi.java

@@ -8,9 +8,9 @@ import com.google.common.collect.Iterables;
 
 import forge.ai.ComputerUtilCard;
 import forge.ai.ComputerUtilCombat;
+import forge.ai.SpellAbilityAi;
 import forge.game.Game;
 import forge.game.ability.ApiType;
-import forge.game.ability.SpellAbilityAi;
 import forge.game.card.Card;
 import forge.game.card.CardLists;
 import forge.game.combat.CombatUtil;

forge-gui/src/main/java/forge/ai/ability/EncodeAi.java

@@ -23,7 +23,7 @@ import java.util.List;
 import com.google.common.base.Predicate;
 
 import forge.ai.ComputerUtilCard;
-import forge.game.ability.SpellAbilityAi;
+import forge.ai.SpellAbilityAi;
 import forge.game.card.Card;
 import forge.game.card.CardLists;
 import forge.game.combat.CombatUtil;

forge-gui/src/main/java/forge/ai/ability/EndTurnAi.java

@@ -1,7 +1,7 @@
 package forge.ai.ability;
 
 
-import forge.game.ability.SpellAbilityAi;
+import forge.ai.SpellAbilityAi;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 

forge-gui/src/main/java/forge/ai/ability/FightAi.java

@@ -6,8 +6,8 @@ import java.util.Random;
 import forge.ai.ComputerUtil;
 import forge.ai.ComputerUtilCard;
 import forge.ai.ComputerUtilCombat;
+import forge.ai.SpellAbilityAi;
 import forge.game.ability.AbilityUtils;
-import forge.game.ability.SpellAbilityAi;
 import forge.game.card.Card;
 import forge.game.card.CardLists;
 import forge.game.player.Player;

forge-gui/src/main/java/forge/ai/ability/FlipACoinAi.java

@@ -1,6 +1,6 @@
 package forge.ai.ability;
 
-import forge.game.ability.SpellAbilityAi;
+import forge.ai.SpellAbilityAi;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 

forge-gui/src/main/java/forge/ai/ability/FogAi.java

@@ -2,8 +2,8 @@ package forge.ai.ability;
 
 
 import forge.ai.ComputerUtilCombat;
+import forge.ai.SpellAbilityAi;
 import forge.game.Game;
-import forge.game.ability.SpellAbilityAi;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;

forge-gui/src/main/java/forge/ai/ability/GameLossAi.java

@@ -1,6 +1,6 @@
 package forge.ai.ability;
 
-import forge.game.ability.SpellAbilityAi;
+import forge.ai.SpellAbilityAi;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 import forge.game.spellability.TargetRestrictions;

forge-gui/src/main/java/forge/ai/ability/GameWinAi.java

@@ -1,7 +1,7 @@
 package forge.ai.ability;
 
 
-import forge.game.ability.SpellAbilityAi;
+import forge.ai.SpellAbilityAi;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 

forge-gui/src/main/java/forge/ai/ability/LegendaryRuleAi.java

@@ -4,7 +4,7 @@ import java.util.Collection;
 
 import com.google.common.collect.Iterables;
 
-import forge.game.ability.SpellAbilityAi;
+import forge.ai.SpellAbilityAi;
 import forge.game.card.Card;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;

forge-gui/src/main/java/forge/ai/ability/LifeExchangeAi.java

@@ -2,7 +2,7 @@ package forge.ai.ability;
 
 import java.util.Random;
 
-import forge.game.ability.SpellAbilityAi;
+import forge.ai.SpellAbilityAi;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 import forge.game.spellability.TargetRestrictions;

forge-gui/src/main/java/forge/ai/ability/LifeGainAi.java

@@ -4,9 +4,9 @@ import forge.ai.ComputerUtil;
 import forge.ai.ComputerUtilCombat;
 import forge.ai.ComputerUtilCost;
 import forge.ai.ComputerUtilMana;
+import forge.ai.SpellAbilityAi;
 import forge.game.Game;
 import forge.game.ability.AbilityUtils;
-import forge.game.ability.SpellAbilityAi;
 import forge.game.card.Card;
 import forge.game.cost.Cost;
 import forge.game.phase.PhaseType;

forge-gui/src/main/java/forge/ai/ability/LifeLoseAi.java

@@ -5,8 +5,8 @@ import java.util.List;
 import forge.ai.ComputerUtil;
 import forge.ai.ComputerUtilCost;
 import forge.ai.ComputerUtilMana;
+import forge.ai.SpellAbilityAi;
 import forge.game.ability.AbilityUtils;
-import forge.game.ability.SpellAbilityAi;
 import forge.game.card.Card;
 import forge.game.cost.Cost;
 import forge.game.phase.PhaseType;

forge-gui/src/main/java/forge/ai/ability/LifeSetAi.java

@@ -3,8 +3,8 @@ package forge.ai.ability;
 import java.util.Random;
 
 import forge.ai.ComputerUtilMana;
+import forge.ai.SpellAbilityAi;
 import forge.game.ability.AbilityUtils;
-import forge.game.ability.SpellAbilityAi;
 import forge.game.card.Card;
 import forge.game.card.CounterType;
 import forge.game.phase.PhaseType;

forge-gui/src/main/java/forge/ai/ability/ManaEffectAi.java

@@ -2,7 +2,7 @@ package forge.ai.ability;
 
 
 import forge.ai.ComputerUtil;
-import forge.game.ability.SpellAbilityAi;
+import forge.ai.SpellAbilityAi;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;

forge-gui/src/main/java/forge/ai/ability/MillAi.java

@@ -5,8 +5,8 @@ import java.util.List;
 import forge.ai.ComputerUtil;
 import forge.ai.ComputerUtilCost;
 import forge.ai.ComputerUtilMana;
+import forge.ai.SpellAbilityAi;
 import forge.game.ability.AbilityUtils;
-import forge.game.ability.SpellAbilityAi;
 import forge.game.card.Card;
 import forge.game.cost.Cost;
 import forge.game.phase.PhaseType;

forge-gui/src/main/java/forge/ai/ability/MustAttackAi.java

@@ -1,7 +1,7 @@
 package forge.ai.ability;
 
 
-import forge.game.ability.SpellAbilityAi;
+import forge.ai.SpellAbilityAi;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 

forge-gui/src/main/java/forge/ai/ability/MustBlockAi.java

@@ -6,8 +6,8 @@ import com.google.common.base.Predicate;
 
 import forge.ai.ComputerUtilCard;
 import forge.ai.ComputerUtilCombat;
+import forge.ai.SpellAbilityAi;
 import forge.game.ability.AbilityUtils;
-import forge.game.ability.SpellAbilityAi;
 import forge.game.card.Card;
 import forge.game.card.CardLists;
 import forge.game.card.CardPredicates;

forge-gui/src/main/java/forge/ai/ability/PeekAndRevealAi.java

@@ -1,6 +1,6 @@
 package forge.ai.ability;
 
-import forge.game.ability.SpellAbilityAi;
+import forge.ai.SpellAbilityAi;
 import forge.game.player.Player;
 import forge.game.player.PlayerActionConfirmMode;
 import forge.game.spellability.AbilitySub;

forge-gui/src/main/java/forge/ai/ability/PermanentCreatureAi.java

@@ -6,8 +6,8 @@ import com.google.common.base.Predicates;
 import com.google.common.collect.Iterables;
 
 import forge.ai.ComputerUtil;
+import forge.ai.SpellAbilityAi;
 import forge.game.Game;
-import forge.game.ability.SpellAbilityAi;
 import forge.game.card.Card;
 import forge.game.card.CardPredicates;
 import forge.game.phase.PhaseType;

forge-gui/src/main/java/forge/ai/ability/PermanentNoncreatureAi.java

@@ -1,7 +1,7 @@
 package forge.ai.ability;
 
 import forge.ai.ComputerUtil;
-import forge.game.ability.SpellAbilityAi;
+import forge.ai.SpellAbilityAi;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;

forge-gui/src/main/java/forge/ai/ability/PhasesAi.java

@@ -3,9 +3,9 @@ package forge.ai.ability;
 import java.util.List;
 import java.util.Random;
 
+import forge.ai.SpellAbilityAi;
 import forge.game.Game;
 import forge.game.ability.AbilityUtils;
-import forge.game.ability.SpellAbilityAi;
 import forge.game.card.Card;
 import forge.game.card.CardLists;
 import forge.game.player.Player;

forge-gui/src/main/java/forge/ai/ability/PlayAi.java

@@ -9,8 +9,8 @@ import com.google.common.base.Predicate;
 
 import forge.ai.ComputerUtilCard;
 import forge.ai.ComputerUtilCost;
+import forge.ai.SpellAbilityAi;
 import forge.game.ability.AbilityUtils;
-import forge.game.ability.SpellAbilityAi;
 import forge.game.card.Card;
 import forge.game.card.CardLists;
 import forge.game.cost.Cost;
@@ -121,7 +121,7 @@ public class PlayAi extends SpellAbilityAi {
                     Spell spell = (Spell) s;
                     s.setActivatingPlayer(ai);
                     // timing restrictions still apply
-                    if (s.getRestrictions().checkTimingRestrictions(c, s) && spell.canPlayFromEffectAI(false, true)) {
+                    if (s.getRestrictions().checkTimingRestrictions(c, s) && spell.canPlayFromEffectAI(ai, false, true)) {
                         return true;
                     }
                 }

forge-gui/src/main/java/forge/ai/ability/PoisonAi.java

@@ -4,8 +4,8 @@ import java.util.List;
 
 import forge.ai.ComputerUtil;
 import forge.ai.ComputerUtilCost;
+import forge.ai.SpellAbilityAi;
 import forge.game.ability.AbilityUtils;
-import forge.game.ability.SpellAbilityAi;
 import forge.game.card.Card;
 import forge.game.cost.Cost;
 import forge.game.phase.PhaseType;

forge-gui/src/main/java/forge/ai/ability/PowerExchangeAi.java

@@ -7,8 +7,8 @@ import java.util.Map;
 import com.google.common.base.Predicate;
 
 import forge.ai.ComputerUtilCard;
+import forge.ai.SpellAbilityAi;
 import forge.game.ability.AbilityUtils;
-import forge.game.ability.SpellAbilityAi;
 import forge.game.card.Card;
 import forge.game.card.CardLists;
 import forge.game.player.Player;

forge-gui/src/main/java/forge/ai/ability/ProtectAi.java

@@ -9,10 +9,10 @@ import forge.ai.ComputerUtil;
 import forge.ai.ComputerUtilCard;
 import forge.ai.ComputerUtilCombat;
 import forge.ai.ComputerUtilCost;
+import forge.ai.SpellAbilityAi;
 import forge.card.MagicColor;
 import forge.game.Game;
 import forge.game.ability.AbilityUtils;
-import forge.game.ability.SpellAbilityAi;
 import forge.game.ability.effects.ProtectEffect;
 import forge.game.card.Card;
 import forge.game.card.CardLists;

forge-gui/src/main/java/forge/ai/ability/ProtectAllAi.java

@@ -2,7 +2,7 @@ package forge.ai.ability;
 
 
 import forge.ai.ComputerUtilCost;
-import forge.game.ability.SpellAbilityAi;
+import forge.ai.SpellAbilityAi;
 import forge.game.card.Card;
 import forge.game.cost.Cost;
 import forge.game.player.Player;

forge-gui/src/main/java/forge/ai/ability/PumpAi.java

@@ -8,9 +8,9 @@ import forge.ai.ComputerUtil;
 import forge.ai.ComputerUtilCard;
 import forge.ai.ComputerUtilCost;
 import forge.ai.ComputerUtilMana;
+import forge.ai.SpellAbilityAi;
 import forge.game.Game;
 import forge.game.ability.AbilityUtils;
-import forge.game.ability.SpellAbilityAi;
 import forge.game.card.Card;
 import forge.game.card.CardLists;
 import forge.game.card.CardPredicates.Presets;

forge-gui/src/main/java/forge/ai/ability/PumpAiBase.java

@@ -10,8 +10,8 @@ import com.google.common.collect.Iterables;
 import forge.ai.ComputerUtil;
 import forge.ai.ComputerUtilCard;
 import forge.ai.ComputerUtilCombat;
+import forge.ai.SpellAbilityAi;
 import forge.game.Game;
-import forge.game.ability.SpellAbilityAi;
 import forge.game.card.Card;
 import forge.game.card.CardLists;
 import forge.game.card.CardPredicates;

forge-gui/src/main/java/forge/ai/ability/RearrangeTopOfLibraryAi.java

@@ -1,7 +1,7 @@
 package forge.ai.ability;
 
 
-import forge.game.ability.SpellAbilityAi;
+import forge.ai.SpellAbilityAi;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 import forge.game.spellability.TargetRestrictions;

forge-gui/src/main/java/forge/ai/ability/RegenerateAi.java

@@ -24,10 +24,10 @@ import forge.ai.ComputerUtil;
 import forge.ai.ComputerUtilCard;
 import forge.ai.ComputerUtilCombat;
 import forge.ai.ComputerUtilCost;
+import forge.ai.SpellAbilityAi;
 import forge.game.Game;
 import forge.game.GameObject;
 import forge.game.ability.AbilityUtils;
-import forge.game.ability.SpellAbilityAi;
 import forge.game.card.Card;
 import forge.game.card.CardLists;
 import forge.game.card.CardPredicates;

forge-gui/src/main/java/forge/ai/ability/RegenerateAllAi.java

@@ -5,9 +5,9 @@ import java.util.List;
 import forge.ai.ComputerUtil;
 import forge.ai.ComputerUtilCombat;
 import forge.ai.ComputerUtilCost;
+import forge.ai.SpellAbilityAi;
 import forge.game.Game;
 import forge.game.GameObject;
-import forge.game.ability.SpellAbilityAi;
 import forge.game.card.Card;
 import forge.game.card.CardLists;
 import forge.game.card.CardPredicates;

forge-gui/src/main/java/forge/ai/ability/RemoveFromCombatAi.java

@@ -1,7 +1,7 @@
 package forge.ai.ability;
 
 
-import forge.game.ability.SpellAbilityAi;
+import forge.ai.SpellAbilityAi;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 

forge-gui/src/main/java/forge/ai/ability/RepeatAi.java

@@ -1,8 +1,8 @@
 package forge.ai.ability;
 
 
+import forge.ai.SpellAbilityAi;
 import forge.game.ability.AbilityFactory;
-import forge.game.ability.SpellAbilityAi;
 import forge.game.player.Player;
 import forge.game.player.PlayerActionConfirmMode;
 import forge.game.spellability.AbilitySub;

forge-gui/src/main/java/forge/ai/ability/RepeatEachAi.java

@@ -5,7 +5,7 @@ import java.util.List;
 
 import com.google.common.base.Predicate;
 
-import forge.game.ability.SpellAbilityAi;
+import forge.ai.SpellAbilityAi;
 import forge.game.card.Card;
 import forge.game.card.CardLists;
 import forge.game.card.CounterType;

forge-gui/src/main/java/forge/ai/ability/RestartGameAi.java

@@ -1,6 +1,6 @@
 package forge.ai.ability;
 
-import forge.game.ability.SpellAbilityAi;
+import forge.ai.SpellAbilityAi;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 

forge-gui/src/main/java/forge/ai/ability/RevealAi.java

@@ -3,7 +3,7 @@ package forge.ai.ability;
 import java.util.Random;
 
 import forge.ai.ComputerUtilCost;
-import forge.game.ability.SpellAbilityAi;
+import forge.ai.SpellAbilityAi;
 import forge.game.card.Card;
 import forge.game.cost.Cost;
 import forge.game.player.Player;

forge-gui/src/main/java/forge/ai/ability/RevealAiBase.java

@@ -1,7 +1,7 @@
 package forge.ai.ability;
 
 
-import forge.game.ability.SpellAbilityAi;
+import forge.ai.SpellAbilityAi;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 import forge.game.spellability.TargetRestrictions;

forge-gui/src/main/java/forge/ai/ability/RevealHandAi.java

@@ -3,7 +3,7 @@ package forge.ai.ability;
 import java.util.Random;
 
 import forge.ai.ComputerUtilCost;
-import forge.game.ability.SpellAbilityAi;
+import forge.ai.SpellAbilityAi;
 import forge.game.card.Card;
 import forge.game.cost.Cost;
 import forge.game.player.Player;

forge-gui/src/main/java/forge/ai/ability/RollPlanarDiceAi.java

@@ -2,7 +2,7 @@ package forge.ai.ability;
 
 
 import forge.ai.AiController;
-import forge.game.ability.SpellAbilityAi;
+import forge.ai.SpellAbilityAi;
 import forge.game.ai.AiProps;
 import forge.game.card.Card;
 import forge.game.phase.PhaseType;

forge-gui/src/main/java/forge/ai/ability/SacrificeAi.java

@@ -4,8 +4,8 @@ import java.util.List;
 
 import forge.ai.ComputerUtilCard;
 import forge.ai.ComputerUtilMana;
+import forge.ai.SpellAbilityAi;
 import forge.game.ability.AbilityUtils;
-import forge.game.ability.SpellAbilityAi;
 import forge.game.card.Card;
 import forge.game.card.CardLists;
 import forge.game.card.CardPredicates;

forge-gui/src/main/java/forge/ai/ability/SacrificeAllAi.java

@@ -6,7 +6,7 @@ import java.util.Random;
 import forge.ai.ComputerUtilCard;
 import forge.ai.ComputerUtilCost;
 import forge.ai.ComputerUtilMana;
-import forge.game.ability.SpellAbilityAi;
+import forge.ai.SpellAbilityAi;
 import forge.game.card.Card;
 import forge.game.card.CardLists;
 import forge.game.cost.Cost;

forge-gui/src/main/java/forge/ai/ability/ScryAi.java

@@ -2,7 +2,7 @@ package forge.ai.ability;
 
 import java.util.Random;
 
-import forge.game.ability.SpellAbilityAi;
+import forge.ai.SpellAbilityAi;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 import forge.game.spellability.TargetRestrictions;

forge-gui/src/main/java/forge/ai/ability/SetStateAi.java

@@ -1,7 +1,7 @@
 package forge.ai.ability;
 
 
-import forge.game.ability.SpellAbilityAi;
+import forge.ai.SpellAbilityAi;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 

forge-gui/src/main/java/forge/ai/ability/ShuffleAi.java

@@ -1,6 +1,6 @@
 package forge.ai.ability;
 
-import forge.game.ability.SpellAbilityAi;
+import forge.ai.SpellAbilityAi;
 import forge.game.player.Player;
 import forge.game.player.PlayerActionConfirmMode;
 import forge.game.spellability.SpellAbility;

forge-gui/src/main/java/forge/ai/ability/StoreSVarAi.java

@@ -6,8 +6,8 @@ import java.util.List;
 import forge.ai.ComputerUtil;
 import forge.ai.ComputerUtilCombat;
 import forge.ai.ComputerUtilMana;
+import forge.ai.SpellAbilityAi;
 import forge.game.Game;
-import forge.game.ability.SpellAbilityAi;
 import forge.game.card.Card;
 import forge.game.card.CardLists;
 import forge.game.card.CardPredicates.Presets;

forge-gui/src/main/java/forge/ai/ability/TapAi.java

@@ -3,8 +3,8 @@ package forge.ai.ability;
 import java.util.List;
 
 import forge.ai.ComputerUtil;
+import forge.ai.SpellAbilityAi;
 import forge.game.ability.AbilityUtils;
-import forge.game.ability.SpellAbilityAi;
 import forge.game.card.Card;
 import forge.game.phase.PhaseHandler;
 import forge.game.phase.PhaseType;

forge-gui/src/main/java/forge/ai/ability/TapAiBase.java

@@ -7,8 +7,8 @@ import com.google.common.collect.Iterables;
 
 import forge.ai.ComputerUtil;
 import forge.ai.ComputerUtilCard;
+import forge.ai.SpellAbilityAi;
 import forge.game.Game;
-import forge.game.ability.SpellAbilityAi;
 import forge.game.card.Card;
 import forge.game.card.CardLists;
 import forge.game.card.CardPredicates;

forge-gui/src/main/java/forge/ai/ability/TapAllAi.java

@@ -6,8 +6,8 @@ import java.util.Random;
 import com.google.common.base.Predicate;
 import com.google.common.collect.Iterables;
 
+import forge.ai.SpellAbilityAi;
 import forge.game.Game;
-import forge.game.ability.SpellAbilityAi;
 import forge.game.card.Card;
 import forge.game.card.CardLists;
 import forge.game.card.CardPredicates.Presets;

forge-gui/src/main/java/forge/ai/ability/TapOrUntapAllAi.java

@@ -1,6 +1,6 @@
 package forge.ai.ability;
 
-import forge.game.ability.SpellAbilityAi;
+import forge.ai.SpellAbilityAi;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;