External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-22 19:41:59 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Prophet of Kruphix - Fixed that the triggered untap ability was missing.

Browse source
This commit is contained in:
LevelX2 2013-09-20 11:57:24 +02:00
parent fdca147d4d
commit 24baf63cf1
3 changed files with 28 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Mage.Sets/src/mage/sets/odyssey/GracefulAntelope.java
View file

@ -58,7 +58,6 @@ public class GracefulAntelope extends CardImpl<GracefulAntelope> {
// Plainswalk // Plainswalk
this.addAbility(new PlainswalkAbility()); this.addAbility(new PlainswalkAbility());
// Whenever Graceful Antelope deals combat damage to a player, you may have target land become a Plains until Graceful Antelope leaves the battlefield. // Whenever Graceful Antelope deals combat damage to a player, you may have target land become a Plains until Graceful Antelope leaves the battlefield.
//Ability ability = new SimpleTriggeredAbility(Zone.BATTLEFIELD, new BecomesBasicLandTargetEffect(Duration.WhileOnBattlefield), new TapSourceCost());
Ability ability = new DealsCombatDamageToAPlayerTriggeredAbility(new BecomesBasicLandTargetEffect(Duration.WhileOnBattlefield,"Plains"), true); Ability ability = new DealsCombatDamageToAPlayerTriggeredAbility(new BecomesBasicLandTargetEffect(Duration.WhileOnBattlefield,"Plains"), true);
Target target = new TargetLandPermanent(); Target target = new TargetLandPermanent();
target.setRequired(true); target.setRequired(true);

2
Mage.Sets/src/mage/sets/theros/ProphetOfKruphix.java
View file

@ -74,7 +74,7 @@ public class ProphetOfKruphix extends CardImpl<ProphetOfKruphix> {
this.toughness = new MageInt(3); this.toughness = new MageInt(3);
// Untap all creatures and lands you control during each other player's untap step. // Untap all creatures and lands you control during each other player's untap step.
Effect effect = new UntapAllControllerEffect(filter, "Untap all creatures and lands you control during each other player's untap step"); Effect effect = new UntapAllControllerEffect(filter, "Untap all creatures and lands you control");
this.addAbility(new BeginningOfUntapTriggeredAbility(Zone.BATTLEFIELD, effect, TargetController.NOT_YOU, false)); this.addAbility(new BeginningOfUntapTriggeredAbility(Zone.BATTLEFIELD, effect, TargetController.NOT_YOU, false));
// You may cast creature cards as though they had flash. // You may cast creature cards as though they had flash.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ProphetOfKruphixEffect())); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ProphetOfKruphixEffect()));

27
Mage/src/mage/abilities/common/BeginningOfUntapTriggeredAbility.java
View file

@ -10,6 +10,7 @@ import mage.constants.TargetController;
import mage.constants.Zone; import mage.constants.Zone;
import mage.game.Game; import mage.game.Game;
import mage.game.events.GameEvent; import mage.game.events.GameEvent;
import mage.players.Player;
import mage.target.targetpointer.FixedTarget; import mage.target.targetpointer.FixedTarget;
/** /**
@ -53,6 +54,17 @@ public class BeginningOfUntapTriggeredAbility extends TriggeredAbilityImpl<Begin
} }
} }
return yours; return yours;
case NOT_YOU:
Player controller = game.getPlayer(this.getControllerId());
if (controller != null && controller.getInRange().contains(event.getPlayerId()) && !event.getPlayerId().equals(this.getControllerId())) {
if (getTargets().size() == 0) {
for (Effect effect : this.getEffects()) {
effect.setTargetPointer(new FixedTarget(event.getPlayerId()));
}
}
return true;
}
break;
case OPPONENT: case OPPONENT:
if (game.getOpponents(this.controllerId).contains(event.getPlayerId())) { if (game.getOpponents(this.controllerId).contains(event.getPlayerId())) {
if (getTargets().size() == 0) { if (getTargets().size() == 0) {
@ -64,6 +76,8 @@ public class BeginningOfUntapTriggeredAbility extends TriggeredAbilityImpl<Begin
} }
break; break;
case ANY: case ANY:
controller = game.getPlayer(this.getControllerId());
if (controller != null && controller.getInRange().contains(event.getPlayerId())) {
if (getTargets().size() == 0) { if (getTargets().size() == 0) {
for (Effect effect : this.getEffects()) { for (Effect effect : this.getEffects()) {
effect.setTargetPointer(new FixedTarget(event.getPlayerId())); effect.setTargetPointer(new FixedTarget(event.getPlayerId()));
@ -72,20 +86,25 @@ public class BeginningOfUntapTriggeredAbility extends TriggeredAbilityImpl<Begin
return true; return true;
} }
} }
}
return false; return false;
} }
@Override @Override
public String getRule() { public String getRule() {
StringBuilder sb = new StringBuilder();
switch (targetController) { switch (targetController) {
case YOU: case YOU:
return "At the beginning of your untap step, " + generateZoneString() + getEffects().getText(modes.getMode()); return sb.append("At the beginning of your untap step, ").append(generateZoneString()).append(getEffects().getText(modes.getMode())).toString();
case NOT_YOU:
return sb.append(getEffects().getText(modes.getMode())).append(" during each other player's untap step").append(generateZoneString()).toString();
case OPPONENT: case OPPONENT:
return "At the beginning of each opponent's untap step, " + generateZoneString() + getEffects().getText(modes.getMode()); return sb.append("At the beginning of each opponent's untap step, ").append(generateZoneString()).append(getEffects().getText(modes.getMode())).toString();
case ANY: case ANY:
return "At the beginning of each player's untap step, " + generateZoneString() + getEffects().getText(modes.getMode()); return sb.append("At the beginning of each player's untap step, ").append(generateZoneString()).append(getEffects().getText(modes.getMode())).toString();
} }
return ""; return "BeginningOfUntapTriggeredAbility: targetController value not supported";
} }
private String generateZoneString() { private String generateZoneString() {