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

- Bugfixes for Adarkar Valkyrie targeting.

Browse Source
This commit is contained in:
jendave
2011-08-06 13:04:23 +00:00
parent e214395585
commit 302f57586f
1 changed files with 11 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/forge/CardFactory_Creatures.java
View File

@@ -5850,12 +5850,13 @@ public class CardFactory_Creatures {
private static final long serialVersionUID = -2433442359225521472L; private static final long serialVersionUID = -2433442359225521472L;
public void execute() { public void execute() {
AllZone.Stack.add(new Ability(card, "0", "Return " + target[0] + " from graveyard to play") { AllZone.Stack.add(new Ability(card, "0", "Adarkar Valkyrie - Return " + target[0] + " from graveyard to play") {
@Override @Override
public void resolve() { public void resolve() {
PlayerZone grave = AllZone.getZone(target[0]); PlayerZone grave = AllZone.getZone(target[0]);
//checks to see if card is still in the graveyard //checks to see if card is still in the graveyard
if(AllZone.GameAction.isCardInZone(target[0], grave)) {
if(grave != null && AllZone.GameAction.isCardInZone(target[0], grave)) {
PlayerZone play = AllZone.getZone(Constant.Zone.Play, card.getController()); PlayerZone play = AllZone.getZone(Constant.Zone.Play, card.getController());
target[0].setController(card.getController()); target[0].setController(card.getController());
AllZone.GameAction.moveTo(play, target[0]); AllZone.GameAction.moveTo(play, target[0]);
@@ -5870,24 +5871,24 @@ public class CardFactory_Creatures {
public void execute() { public void execute() {
//resets the Card destroy Command //resets the Card destroy Command
//target[0].addDestroy(Command.Blank);
target[0].removeDestroyCommand(destroy); target[0].removeDestroyCommand(destroy);
} }
}; };
final Ability_Tap ability = new Ability_Tap(card) { Ability_Cost abCost = new Ability_Cost("T", cardName, true);
Target tgt = new Target("Target creature other than "+cardName, "Creature.Other".split(","));
final Ability_Activated ability = new Ability_Activated(card, abCost, tgt){
private static final long serialVersionUID = -8454685126878522607L; private static final long serialVersionUID = -8454685126878522607L;
@Override @Override
public void resolve() { public void resolve() {
if(AllZone.GameAction.isCardInPlay(getTargetCard())) { if(AllZone.GameAction.isCardInPlay(getTargetCard())) {
target[0] = getTargetCard(); target[0] = getTargetCard();
AllZone.EndOfTurn.addUntil(untilEOT);
//when destroyed, return to play if (!target[0].isToken()){ // not necessary, but will help speed up stack resolution
//add triggered ability to target card AllZone.EndOfTurn.addUntil(untilEOT);
target[0].addDestroyCommand(destroy); target[0].addDestroyCommand(destroy);
}
}//if }//if
}//resolve() }//resolve()
@@ -5897,38 +5898,12 @@ public class CardFactory_Creatures {
} }
};//SpellAbility };//SpellAbility
Input targetInput = new Input() {
private static final long serialVersionUID = 913860087744941946L;
@Override
public void showMessage() {
AllZone.Display.showMessage("Select target non-token creature other than this card");
ButtonUtil.enableOnlyCancel();
}
@Override
public void selectButtonCancel() {
stop();
}
@Override
public void selectCard(Card c, PlayerZone zone) {
//must target non-token creature, and cannot target itself
if(c.isCreature() && (!c.isToken()) && (!c.equals(card))) {
ability.setTargetCard(c);
stopSetNext(new Input_NoCost_TapAbility(ability));
}
}
};
card.addSpellAbility(ability); card.addSpellAbility(ability);
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
sb.append("tap: When target creature other than Adarkar Valkyrie is put into a "); sb.append("tap: When target creature other than Adarkar Valkyrie is put into a ");
sb.append("graveyard this turn, return that card to play under your control."); sb.append("graveyard this turn, return that card to play under your control.");
ability.setDescription(sb.toString()); ability.setDescription(sb.toString());
ability.setBeforePayMana(targetInput);
}//*************** END ************ END ************************** }//*************** END ************ END **************************