- Some Checkstyle fixes in SA_Restriction

This commit is contained in:
Sol
2011-10-24 02:59:35 +00:00
parent c69a27e345
commit 6ec0d8839b

View File

@@ -51,30 +51,37 @@ public class SpellAbility_Restriction extends SpellAbility_Variables {
} }
} }
if (params.containsKey("ActivationZone")) if (params.containsKey("ActivationZone")) {
setZone(Zone.smartValueOf(params.get("ActivationZone"))); setZone(Zone.smartValueOf(params.get("ActivationZone")));
}
if (params.containsKey("Flashback")) { if (params.containsKey("Flashback")) {
setZone(Zone.Graveyard); setZone(Zone.Graveyard);
} }
if (params.containsKey("SorcerySpeed")) if (params.containsKey("SorcerySpeed")) {
setSorcerySpeed(true); setSorcerySpeed(true);
}
if (params.containsKey("PlayerTurn")) if (params.containsKey("PlayerTurn")) {
setPlayerTurn(true); setPlayerTurn(true);
}
if (params.containsKey("OpponentTurn")) if (params.containsKey("OpponentTurn")) {
setOpponentTurn(true); setOpponentTurn(true);
}
if (params.containsKey("AnyPlayer")) if (params.containsKey("AnyPlayer")) {
setAnyPlayer(true); setAnyPlayer(true);
}
if (params.containsKey("ActivationLimit")) if (params.containsKey("ActivationLimit")) {
setActivationLimit(Integer.parseInt(params.get("ActivationLimit"))); setActivationLimit(Integer.parseInt(params.get("ActivationLimit")));
}
if (params.containsKey("ActivationNumberSacrifice")) if (params.containsKey("ActivationNumberSacrifice")) {
setActivationNumberSacrifice(Integer.parseInt(params.get("ActivationNumberSacrifice"))); setActivationNumberSacrifice(Integer.parseInt(params.get("ActivationNumberSacrifice")));
}
if (params.containsKey("ActivationPhases")) { if (params.containsKey("ActivationPhases")) {
String phases = params.get("ActivationPhases"); String phases = params.get("ActivationPhases");
@@ -92,19 +99,23 @@ public class SpellAbility_Restriction extends SpellAbility_Variables {
setPhases(phases); setPhases(phases);
} }
if (params.containsKey("ActivationCardsInHand")) if (params.containsKey("ActivationCardsInHand")) {
setActivateCardsInHand(Integer.parseInt(params.get("ActivationCardsInHand"))); setActivateCardsInHand(Integer.parseInt(params.get("ActivationCardsInHand")));
}
if (params.containsKey("Planeswalker")) if (params.containsKey("Planeswalker")) {
setPlaneswalker(true); setPlaneswalker(true);
}
if (params.containsKey("IsPresent")) { if (params.containsKey("IsPresent")) {
setIsPresent(params.get("IsPresent")); setIsPresent(params.get("IsPresent"));
if (params.containsKey("PresentCompare")) if (params.containsKey("PresentCompare")) {
setPresentCompare(params.get("PresentCompare")); setPresentCompare(params.get("PresentCompare"));
if (params.containsKey("PresentZone")) }
if (params.containsKey("PresentZone")) {
setPresentZone(Zone.smartValueOf(params.get("PresentZone"))); setPresentZone(Zone.smartValueOf(params.get("PresentZone")));
} }
}
if (params.containsKey("IsNotPresent")) { if (params.containsKey("IsNotPresent")) {
setIsPresent(params.get("IsNotPresent")); setIsPresent(params.get("IsNotPresent"));
@@ -145,20 +156,25 @@ public class SpellAbility_Restriction extends SpellAbility_Variables {
System.out.println(c.getName() + " Did not have activator set in SpellAbility_Restriction.canPlay()"); System.out.println(c.getName() + " Did not have activator set in SpellAbility_Restriction.canPlay()");
} }
if (bSorcerySpeed && !Phase.canCastSorcery(activator)) if (bSorcerySpeed && !Phase.canCastSorcery(activator)) {
return false; return false;
}
if (bPlayerTurn && !AllZone.getPhase().isPlayerTurn(activator)) if (bPlayerTurn && !AllZone.getPhase().isPlayerTurn(activator)) {
return false; return false;
}
if (bOpponentTurn && AllZone.getPhase().isPlayerTurn(activator)) if (bOpponentTurn && AllZone.getPhase().isPlayerTurn(activator)) {
return false; return false;
}
if (!bAnyPlayer && !activator.equals(c.getController())) if (!bAnyPlayer && !activator.equals(c.getController())) {
return false; return false;
}
if (activationLimit != -1 && numberTurnActivations >= activationLimit) if (activationLimit != -1 && numberTurnActivations >= activationLimit) {
return false; return false;
}
if (phases.size() > 0) { if (phases.size() > 0) {
boolean isPhase = false; boolean isPhase = false;
@@ -170,26 +186,31 @@ public class SpellAbility_Restriction extends SpellAbility_Variables {
} }
} }
if (!isPhase) if (!isPhase) {
return false; return false;
} }
}
if (nCardsInHand != -1) { if (nCardsInHand != -1) {
if (activator.getCardsIn(Zone.Hand).size() != nCardsInHand) if (activator.getCardsIn(Zone.Hand).size() != nCardsInHand) {
return false; return false;
} }
}
if (hellbent) { if (hellbent) {
if (!activator.hasHellbent()) if (!activator.hasHellbent()) {
return false; return false;
} }
}
if (threshold) { if (threshold) {
if (!activator.hasThreshold()) if (!activator.hasThreshold()) {
return false; return false;
} }
}
if (metalcraft) { if (metalcraft) {
if (!activator.hasMetalcraft()) if (!activator.hasMetalcraft()) {
return false; return false;
} }
}
if (prowl != null) { if (prowl != null) {
//only true if the activating player has damaged the opponent with one of the specified types //only true if the activating player has damaged the opponent with one of the specified types
boolean prowlFlag = false; boolean prowlFlag = false;
@@ -216,9 +237,10 @@ public class SpellAbility_Restriction extends SpellAbility_Variables {
} }
int left = list.size(); int left = list.size();
if (!AllZoneUtil.compare(left, presentCompare, right)) if (!AllZoneUtil.compare(left, presentCompare, right)) {
return false; return false;
} }
}
if (lifeTotal != null) { if (lifeTotal != null) {
int life = 1; int life = 1;
@@ -244,23 +266,26 @@ public class SpellAbility_Restriction extends SpellAbility_Variables {
if (pwAbility) { if (pwAbility) {
// Planeswalker abilities can only be activated as Sorceries // Planeswalker abilities can only be activated as Sorceries
if (!Phase.canCastSorcery(activator)) if (!Phase.canCastSorcery(activator)) {
return false; return false;
}
for (SpellAbility pwAbs : c.getSpellAbility()) { for (SpellAbility pwAbs : c.getSpellAbility()) {
// check all abilities on card that have their planeswalker restriction set to confirm they haven't been activated // check all abilities on card that have their planeswalker restriction set to confirm they haven't been activated
SpellAbility_Restriction restrict = pwAbs.getRestrictions(); SpellAbility_Restriction restrict = pwAbs.getRestrictions();
if (restrict.getPlaneswalker() && restrict.getNumberTurnActivations() > 0) if (restrict.getPlaneswalker() && restrict.getNumberTurnActivations() > 0) {
return false; return false;
} }
} }
}
if (svarToCheck != null) { if (svarToCheck != null) {
int svarValue = AbilityFactory.calculateAmount(c, svarToCheck, sa); int svarValue = AbilityFactory.calculateAmount(c, svarToCheck, sa);
int operandValue = AbilityFactory.calculateAmount(c, svarOperand, sa); int operandValue = AbilityFactory.calculateAmount(c, svarOperand, sa);
if (!AllZoneUtil.compare(svarValue, svarOperator, operandValue)) if (!AllZoneUtil.compare(svarValue, svarOperator, operandValue)) {
return false; return false;
}
} }