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

*Separated targeted cards to pump from untargeted cards to pump. Fixes the example where a black creature with Prot White doesn't get pumped when Wojek Siren targets another black creature. I will attempt to insert this basic structure into the other AFs that Radiance cards can use.

Browse Source
This commit is contained in:
Hellfish
2011-09-21 07:49:37 +00:00
parent 33c7b0666b
commit 676e60cfa7
1 changed files with 50 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
src/main/java/forge/card/abilityFactory/AbilityFactory_Pump.java
View File

@@ -696,8 +696,8 @@ public class AbilityFactory_Pump {
* @param sa a {@link forge.card.spellability.SpellAbility} object. * @param sa a {@link forge.card.spellability.SpellAbility} object.
*/ */
private void pumpResolve(SpellAbility sa) { private void pumpResolve(SpellAbility sa) {
Player activator = sa.getActivatingPlayer();
ArrayList<Card> tgtCards; ArrayList<Card> tgtCards;
ArrayList<Card> untargetedCards = new ArrayList<Card>();
Target tgt = AF.getAbTgt(); Target tgt = AF.getAbTgt();
if (tgt != null) if (tgt != null)
tgtCards = tgt.getTargetCards(); tgtCards = tgt.getTargetCards();
@@ -706,7 +706,7 @@ public class AbilityFactory_Pump {
if(params.containsKey("Radiance")) { if(params.containsKey("Radiance")) {
for(Card c : CardUtil.getRadiance(hostCard, tgtCards.get(0), params.get("ValidTgts").split(","))) { for(Card c : CardUtil.getRadiance(hostCard, tgtCards.get(0), params.get("ValidTgts").split(","))) {
tgtCards.add(c); untargetedCards.add(c);
} }
} }
@@ -722,43 +722,56 @@ public class AbilityFactory_Pump {
if (tgt != null && !CardFactoryUtil.canTarget(AF.getHostCard(), tgtC)) if (tgt != null && !CardFactoryUtil.canTarget(AF.getHostCard(), tgtC))
continue; continue;
final int a = getNumAttack(sa);
final int d = getNumDefense(sa); applyPump(sa,tgtC);
}
tgtC.addTempAttackBoost(a);
tgtC.addTempDefenseBoost(d); for(int i=0;i<untargetedCards.size();i++) {
final Card tgtC = untargetedCards.get(i);
for (int i = 0; i < Keywords.size(); i++) { if(!AllZoneUtil.isCardInPlay(tgtC))
if (!Keywords.get(i).equals("none")) continue;
tgtC.addExtrinsicKeyword(Keywords.get(i));
} applyPump(sa,tgtC);
if (!params.containsKey("Permanent")) {
// If not Permanent, remove Pumped at EOT
final Command untilEOT = new Command() {
private static final long serialVersionUID = -42244224L;
public void execute() {
if (AllZoneUtil.isCardInPlay(tgtC)) {
tgtC.addTempAttackBoost(-1 * a);
tgtC.addTempDefenseBoost(-1 * d);
if (Keywords.size() > 0) {
for (int i = 0; i < Keywords.size(); i++) {
if (!Keywords.get(i).equals("none"))
tgtC.removeExtrinsicKeyword(Keywords.get(i));
}
}
}
}
};
if (params.containsKey("UntilEndOfCombat")) AllZone.getEndOfCombat().addUntil(untilEOT);
else if(params.containsKey("UntilYourNextUpkeep")) AllZone.getUpkeep().addUntil(activator, untilEOT);
else AllZone.getEndOfTurn().addUntil(untilEOT);
}
} }
}//pumpResolve() }//pumpResolve()
private void applyPump(final SpellAbility sa,final Card applyTo) {
final int a = getNumAttack(sa);
final int d = getNumDefense(sa);
applyTo.addTempAttackBoost(a);
applyTo.addTempDefenseBoost(d);
for (int i = 0; i < Keywords.size(); i++) {
if (!Keywords.get(i).equals("none"))
applyTo.addExtrinsicKeyword(Keywords.get(i));
}
if (!params.containsKey("Permanent")) {
// If not Permanent, remove Pumped at EOT
final Command untilEOT = new Command() {
private static final long serialVersionUID = -42244224L;
public void execute() {
if (AllZoneUtil.isCardInPlay(applyTo)) {
applyTo.addTempAttackBoost(-1 * a);
applyTo.addTempDefenseBoost(-1 * d);
if (Keywords.size() > 0) {
for (int i = 0; i < Keywords.size(); i++) {
if (!Keywords.get(i).equals("none"))
applyTo.removeExtrinsicKeyword(Keywords.get(i));
}
}
}
}
};
if (params.containsKey("UntilEndOfCombat")) AllZone.getEndOfCombat().addUntil(untilEOT);
else if(params.containsKey("UntilYourNextUpkeep")) AllZone.getUpkeep().addUntil(sa.getActivatingPlayer(), untilEOT);
else AllZone.getEndOfTurn().addUntil(untilEOT);
}
}
///////////////////////////////////// /////////////////////////////////////