From 26cfaaaba2ae197cbe20c2ba618380cc5a73f6a2 Mon Sep 17 00:00:00 2001 From: slapshot5 Date: Sun, 9 Oct 2011 16:56:43 +0000 Subject: [PATCH] fix several places in AFs where compy wouldn't activate because it was checking the wrong param --- .../card/abilityFactory/AbilityFactory_AlterLife.java | 8 ++++---- .../forge/card/abilityFactory/AbilityFactory_Animate.java | 2 +- .../card/abilityFactory/AbilityFactory_ChangeZone.java | 2 +- .../card/abilityFactory/AbilityFactory_Counters.java | 2 +- .../card/abilityFactory/AbilityFactory_ZoneAffecting.java | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactory_AlterLife.java b/src/main/java/forge/card/abilityFactory/AbilityFactory_AlterLife.java index 21fc434ef0d..6449e62b7b5 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactory_AlterLife.java +++ b/src/main/java/forge/card/abilityFactory/AbilityFactory_AlterLife.java @@ -222,7 +222,7 @@ public class AbilityFactory_AlterLife { return false; //Don't use lifegain before main 2 if possible - if (AllZone.getPhase().isBefore(Constant.Phase.Main2) && !params.containsKey("ActivatingPhases")) + if (AllZone.getPhase().isBefore(Constant.Phase.Main2) && !params.containsKey("ActivationPhases")) return false; //Don't tap creatures that may be able to block @@ -521,7 +521,7 @@ public class AbilityFactory_AlterLife { return false; //Don't use loselife before main 2 if possible - if (AllZone.getPhase().isBefore(Constant.Phase.Main2) && !params.containsKey("ActivatingPhases")) + if (AllZone.getPhase().isBefore(Constant.Phase.Main2) && !params.containsKey("ActivationPhases")) return false; //Don't tap creatures that may be able to block @@ -881,7 +881,7 @@ public class AbilityFactory_AlterLife { } //Don't use poison before main 2 if possible - if (AllZone.getPhase().isBefore(Constant.Phase.Main2) && !params.containsKey("ActivatingPhases")) + if (AllZone.getPhase().isBefore(Constant.Phase.Main2) && !params.containsKey("ActivationPhases")) return false; //Don't tap creatures that may be able to block @@ -1078,7 +1078,7 @@ public class AbilityFactory_AlterLife { } //Don't use setLife before main 2 if possible - if (AllZone.getPhase().isBefore(Constant.Phase.Main2) && !params.containsKey("ActivatingPhases")) { + if (AllZone.getPhase().isBefore(Constant.Phase.Main2) && !params.containsKey("ActivationPhases")) { return false; } diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactory_Animate.java b/src/main/java/forge/card/abilityFactory/AbilityFactory_Animate.java index f556266c497..ce58d54a62f 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactory_Animate.java +++ b/src/main/java/forge/card/abilityFactory/AbilityFactory_Animate.java @@ -291,7 +291,7 @@ public final class AbilityFactory_Animate { //don't use instant speed animate abilities outside computers Combat_Begin step if (!AllZone.getPhase().is(Constant.Phase.Combat_Begin) && AllZone.getPhase().isPlayerTurn(AllZone.getComputerPlayer()) - && !AbilityFactory.isSorcerySpeed(sa) && !params.containsKey("ActivatingPhases") + && !AbilityFactory.isSorcerySpeed(sa) && !params.containsKey("ActivationPhases") && !params.containsKey("Permanent")) { return false; } diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactory_ChangeZone.java b/src/main/java/forge/card/abilityFactory/AbilityFactory_ChangeZone.java index 312fa7b88e7..1dbdccb1ffe 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactory_ChangeZone.java +++ b/src/main/java/forge/card/abilityFactory/AbilityFactory_ChangeZone.java @@ -361,7 +361,7 @@ public final class AbilityFactory_ChangeZone { } //don't use fetching to top of library/graveyard before main2 - if(AllZone.getPhase().isBefore(Constant.Phase.Main2) && !params.containsKey("ActivatingPhases") + if(AllZone.getPhase().isBefore(Constant.Phase.Main2) && !params.containsKey("ActivationPhases") && !destination.equals("Battlefield") && !destination.equals("Hand")) { return false; } diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactory_Counters.java b/src/main/java/forge/card/abilityFactory/AbilityFactory_Counters.java index 1970958ae7e..8cc03bf685e 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactory_Counters.java +++ b/src/main/java/forge/card/abilityFactory/AbilityFactory_Counters.java @@ -319,7 +319,7 @@ public class AbilityFactory_Counters { } //Don't use non P1P1/M1M1 counters before main 2 if possible - if (AllZone.getPhase().isBefore(Constant.Phase.Main2) && !params.containsKey("ActivatingPhases") + if (AllZone.getPhase().isBefore(Constant.Phase.Main2) && !params.containsKey("ActivationPhases") && !(type.equals("P1P1") || type.equals("M1M1"))) { return false; diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactory_ZoneAffecting.java b/src/main/java/forge/card/abilityFactory/AbilityFactory_ZoneAffecting.java index e912f478b79..922876f212a 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactory_ZoneAffecting.java +++ b/src/main/java/forge/card/abilityFactory/AbilityFactory_ZoneAffecting.java @@ -221,7 +221,7 @@ public class AbilityFactory_ZoneAffecting { } //Don't use draw abilities before main 2 if possible - if (AllZone.getPhase().isBefore(Constant.Phase.Main2) && !params.containsKey("ActivatingPhases")) + if (AllZone.getPhase().isBefore(Constant.Phase.Main2) && !params.containsKey("ActivationPhases")) return false; //Don't tap creatures that may be able to block @@ -634,7 +634,7 @@ public class AbilityFactory_ZoneAffecting { Random r = MyRandom.random; //Don't use draw abilities before main 2 if possible - if (AllZone.getPhase().isBefore(Constant.Phase.Main2) && !params.containsKey("ActivatingPhases")) + if (AllZone.getPhase().isBefore(Constant.Phase.Main2) && !params.containsKey("ActivationPhases")) return false; //Don't tap creatures that may be able to block @@ -1177,7 +1177,7 @@ public class AbilityFactory_ZoneAffecting { } //Don't use draw abilities before main 2 if possible - if (AllZone.getPhase().isBefore(Constant.Phase.Main2) && !params.containsKey("ActivatingPhases")) + if (AllZone.getPhase().isBefore(Constant.Phase.Main2) && !params.containsKey("ActivationPhases")) return false; //Don't tap creatures that may be able to block