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

- Redirected the two remaining targeting checks to the new function and removed the function canTarget from CardFactoryUtil.

Browse Source
This commit is contained in:
Sloth
2011-11-12 07:08:53 +00:00
parent 1c37bb1b34
commit cc7fc3c327
3 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/forge/Upkeep.java
View File

@@ -508,8 +508,9 @@ public class Upkeep implements java.io.Serializable {
final Ability sacrificeCreature = new Ability(abyss, "") { final Ability sacrificeCreature = new Ability(abyss, "") {
@Override @Override
public void resolve() { public void resolve() {
final CardList targets = abyssGetTargets.getTargetableCards(this);
if (player.isHuman()) { if (player.isHuman()) {
if (abyssGetTargets.getTargetableCards(this).size() > 0) { if (targets.size() > 0) {
AllZone.getInputControl().setInput(new Input() { AllZone.getInputControl().setInput(new Input() {
private static final long serialVersionUID = 4820011040853968644L; private static final long serialVersionUID = 4820011040853968644L;
@@ -524,9 +525,7 @@ public class Upkeep implements java.io.Serializable {
public void selectCard(final Card selected, final PlayerZone zone) { public void selectCard(final Card selected, final PlayerZone zone) {
// probably need to restrict by controller // probably need to restrict by controller
// also // also
if (selected.isCreature() && !selected.isArtifact() if (targets.contains(selected)) {
&& CardFactoryUtil.canTarget(abyss, selected)
&& zone.is(Constant.Zone.Battlefield) && zone.getPlayer().isHuman()) {
AllZone.getGameAction().destroyNoRegeneration(selected); AllZone.getGameAction().destroyNoRegeneration(selected);
this.stop(); this.stop();
} }
@@ -534,7 +533,7 @@ public class Upkeep implements java.io.Serializable {
}); // Input }); // Input
} }
} else { // computer } else { // computer
final CardList targets = abyssGetTargets.getTargetableCards(this);
final CardList indestruct = targets.getKeyword("Indestructible"); final CardList indestruct = targets.getKeyword("Indestructible");
if (indestruct.size() > 0) { if (indestruct.size() > 0) {
AllZone.getGameAction().destroyNoRegeneration(indestruct.get(0)); AllZone.getGameAction().destroyNoRegeneration(indestruct.get(0));

24
src/main/java/forge/card/cardfactory/CardFactoryEquipment.java
View File

@@ -312,6 +312,17 @@ class CardFactoryEquipment {
// *************** START *********** START ************************** // *************** START *********** START **************************
else if (cardName.equals("Piston Sledge")) { else if (cardName.equals("Piston Sledge")) {
final CardList targets = new CardList();
final SpellAbility comesIntoPlayAbility = new Ability(card, "0") {
@Override
public void resolve() {
if (!targets.isEmpty()) {
card.equipCard(targets.get(0));
}
} // resolve()
}; // comesIntoPlayAbility
final Input in = new Input() { final Input in = new Input() {
private static final long serialVersionUID = 1782826197612459365L; private static final long serialVersionUID = 1782826197612459365L;
@@ -331,21 +342,14 @@ class CardFactoryEquipment {
@Override @Override
public void selectCard(final Card c, final PlayerZone z) { public void selectCard(final Card c, final PlayerZone z) {
if (z.is(Constant.Zone.Battlefield, card.getController()) && c.isCreature() if (z.is(Constant.Zone.Battlefield, card.getController()) && c.isCreature()
&& CardFactoryUtil.canTarget(card, c)) { && c.canTarget(comesIntoPlayAbility)) {
card.equipCard(c); targets.add(c);
this.stop(); this.stop();
} }
} }
}; };
final SpellAbility comesIntoPlayAbility = new Ability(card, "0") {
@Override
public void resolve() {
AllZone.getInputControl().setInput(in);
} // resolve()
}; // comesIntoPlayAbility
final Command intoPlay = new Command() { final Command intoPlay = new Command() {
private static final long serialVersionUID = 2985015252466920757L; private static final long serialVersionUID = 2985015252466920757L;
@@ -356,6 +360,8 @@ class CardFactoryEquipment {
sb.append("When Piston Sledge enters the battlefield, "); sb.append("When Piston Sledge enters the battlefield, ");
sb.append("attach it to target creature you control."); sb.append("attach it to target creature you control.");
comesIntoPlayAbility.setStackDescription(sb.toString()); comesIntoPlayAbility.setStackDescription(sb.toString());
AllZone.getInputControl().setInput(in);
AllZone.getStack().addSimultaneousStackEntry(comesIntoPlayAbility); AllZone.getStack().addSimultaneousStackEntry(comesIntoPlayAbility);

4
src/main/java/forge/card/cardfactory/CardFactoryUtil.java
View File

@@ -2409,7 +2409,7 @@ public class CardFactoryUtil {
* a {@link forge.Card} object. * a {@link forge.Card} object.
* @return a boolean. * @return a boolean.
*/ */
public static boolean canTarget(final Card spell, final Card target) { /*public static boolean canTarget(final Card spell, final Card target) {
if (target == null) { if (target == null) {
return true; return true;
} }
@@ -2486,7 +2486,7 @@ public class CardFactoryUtil {
} }
} }
return true; return true;
} }*/
// does "target" have protection from "card"? // does "target" have protection from "card"?
/** /**