worldheart_phoenix - do not create custom requirements please, use built-in value calculation

This commit is contained in:
Maxmtg
2013-04-17 05:44:34 +00:00
parent 999c785f86
commit 1d582a48b1
3 changed files with 9 additions and 12 deletions

View File

@@ -12,7 +12,6 @@ import forge.GameEntity;
import forge.Singletons;
import forge.card.ability.AbilityUtils;
import forge.card.cardfactory.CardFactoryUtil;
import forge.card.spellability.OptionalCost;
import forge.card.spellability.SpellAbility;
import forge.game.player.Player;
import forge.game.zone.Zone;
@@ -301,19 +300,19 @@ public abstract class TriggerReplacementBase {
return false;
}
}
if (params.containsKey("ManaNotSpent")) {
if (this.getHostCard().getColorsPaid().contains(params.get("ManaNotSpent"))) {
return false;
}
}
if (params.containsKey("WerewolfTransformCondition")) {
if (CardUtil.getLastTurnCast("Card", this.getHostCard()).size() > 0) {
return false;
}
}
if (params.containsKey("WerewolfUntransformCondition")) {
final List<Card> you = CardUtil.getLastTurnCast("Card.YouCtrl", this.getHostCard());
final List<Card> opp = CardUtil.getLastTurnCast("Card.YouDontCtrl", this.getHostCard());
@@ -321,12 +320,6 @@ public abstract class TriggerReplacementBase {
return false;
}
}
if (params.containsKey("AltCost")) {
if (!this.getHostCard().isOptionalCostPaid(OptionalCost.AltCost)) {
return false;
}
}
return true;
}
}

View File

@@ -1560,7 +1560,10 @@ public class CardFactoryUtil {
int ix = c.getKickerMagnitude() > 0 ? 1 : 2;
return CardFactoryUtil.doXMath(Integer.parseInt(sq[ix]), m, c);
}
if (sq[0].startsWith("AltCost")) {
int ix = c.isOptionalCostPaid(OptionalCost.AltCost) ? 1 : 2;
return CardFactoryUtil.doXMath(Integer.parseInt(sq[ix]), m, c);
}
if (sq[0].contains("GraveyardWithGE20Cards")) {
if (Aggregates.max(Singletons.getModel().getGame().getPlayers(), Player.Accessors.countCardsInZone(ZoneType.Graveyard)) >= 20) {
return CardFactoryUtil.doXMath(Integer.parseInt(sq[1]), m, c);