external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 04:38:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix several places in AFs where compy wouldn't activate because it was checking the wrong param

Browse Source
This commit is contained in:
slapshot5
2011-10-09 16:56:43 +00:00
parent b849c0c5aa
commit 26cfaaaba2
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/forge/card/abilityFactory/AbilityFactory_AlterLife.java
View File

@@ -222,7 +222,7 @@ public class AbilityFactory_AlterLife {
return false; return false;
//Don't use lifegain before main 2 if possible //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; return false;
//Don't tap creatures that may be able to block //Don't tap creatures that may be able to block
@@ -521,7 +521,7 @@ public class AbilityFactory_AlterLife {
return false; return false;
//Don't use loselife before main 2 if possible //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; return false;
//Don't tap creatures that may be able to block //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 //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; return false;
//Don't tap creatures that may be able to block //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 //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; return false;
} }

2
src/main/java/forge/card/abilityFactory/AbilityFactory_Animate.java
View File

@@ -291,7 +291,7 @@ public final class AbilityFactory_Animate {
//don't use instant speed animate abilities outside computers Combat_Begin step //don't use instant speed animate abilities outside computers Combat_Begin step
if (!AllZone.getPhase().is(Constant.Phase.Combat_Begin) if (!AllZone.getPhase().is(Constant.Phase.Combat_Begin)
&& AllZone.getPhase().isPlayerTurn(AllZone.getComputerPlayer()) && AllZone.getPhase().isPlayerTurn(AllZone.getComputerPlayer())
&& !AbilityFactory.isSorcerySpeed(sa) && !params.containsKey("ActivatingPhases") && !AbilityFactory.isSorcerySpeed(sa) && !params.containsKey("ActivationPhases")
&& !params.containsKey("Permanent")) { && !params.containsKey("Permanent")) {
return false; return false;
} }

2
src/main/java/forge/card/abilityFactory/AbilityFactory_ChangeZone.java
View File

@@ -361,7 +361,7 @@ public final class AbilityFactory_ChangeZone {
} }
//don't use fetching to top of library/graveyard before main2 //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")) { && !destination.equals("Battlefield") && !destination.equals("Hand")) {
return false; return false;
} }

2
src/main/java/forge/card/abilityFactory/AbilityFactory_Counters.java
View File

@@ -319,7 +319,7 @@ public class AbilityFactory_Counters {
} }
//Don't use non P1P1/M1M1 counters before main 2 if possible //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"))) && !(type.equals("P1P1") || type.equals("M1M1")))
{ {
return false; return false;

6
src/main/java/forge/card/abilityFactory/AbilityFactory_ZoneAffecting.java
View File

@@ -221,7 +221,7 @@ public class AbilityFactory_ZoneAffecting {
} }
//Don't use draw abilities before main 2 if possible //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; return false;
//Don't tap creatures that may be able to block //Don't tap creatures that may be able to block
@@ -634,7 +634,7 @@ public class AbilityFactory_ZoneAffecting {
Random r = MyRandom.random; Random r = MyRandom.random;
//Don't use draw abilities before main 2 if possible //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; return false;
//Don't tap creatures that may be able to block //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 //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; return false;
//Don't tap creatures that may be able to block //Don't tap creatures that may be able to block