github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-25 11:11:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Garruk, Apex Predator - Fixed the triggered ability of the Emblem given to opponent.

Browse source
This commit is contained in:
LevelX2 2015-07-25 11:33:58 +02:00
parent 4a0d118b7f
commit 7eab956657
2 changed files with 38 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Mage.Sets/src/mage/sets/magic2015/GarrukApexPredator.java
View file

@ -81,7 +81,6 @@ public class GarrukApexPredator extends CardImpl {
this.expansionSetCode = "M15"; this.expansionSetCode = "M15";
this.subtype.add("Garruk"); this.subtype.add("Garruk");
this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.LOYALTY.createInstance(5)), false)); this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.LOYALTY.createInstance(5)), false));
// +1: Destroy another target planeswalker. // +1: Destroy another target planeswalker.
@ -100,7 +99,9 @@ public class GarrukApexPredator extends CardImpl {
this.addAbility(ability); this.addAbility(ability);
// -8: Target opponent gets an emblem with "Whenever a creature attacks you, it gets +5/+5 and gains trample until end of turn." // -8: Target opponent gets an emblem with "Whenever a creature attacks you, it gets +5/+5 and gains trample until end of turn."
ability = new LoyaltyAbility(new GetEmblemTargetPlayerEffect(new GarrukApexPredatorEmblem()), -8); Effect effect = new GetEmblemTargetPlayerEffect(new GarrukApexPredatorEmblem());
effect.setText("Target opponent gets an emblem with \"Whenever a creature attacks you, it gets +5/+5 and gains trample until end of turn.\"");
ability = new LoyaltyAbility(effect, -8);
ability.addTarget(new TargetOpponent()); ability.addTarget(new TargetOpponent());
this.addAbility(ability); this.addAbility(ability);
} }
@ -162,13 +163,14 @@ class GarrukApexPredatorBeastToken extends Token {
} }
/** /**
* Emblem with "Whenever a creature attacks you, it gets +5/+5 and gains trample until end of turn." * Emblem with "Whenever a creature attacks you, it gets +5/+5 and gains trample
* until end of turn."
*/ */
class GarrukApexPredatorEmblem extends Emblem { class GarrukApexPredatorEmblem extends Emblem {
public GarrukApexPredatorEmblem() { public GarrukApexPredatorEmblem() {
setName("EMBLEM: Garruk, Apex Predator"); setName("EMBLEM: Garruk, Apex Predator");
Effect effect = new BoostTargetEffect(5,5,Duration.EndOfTurn); Effect effect = new BoostTargetEffect(5, 5, Duration.EndOfTurn);
effect.setText("it gets +5/+5"); effect.setText("it gets +5/+5");
Ability ability = new AttackedByCreatureTriggeredAbility(Zone.COMMAND, effect, false, SetTargetPointer.PERMANENT); Ability ability = new AttackedByCreatureTriggeredAbility(Zone.COMMAND, effect, false, SetTargetPointer.PERMANENT);
effect = new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn, effect = new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn,
@ -176,4 +178,4 @@ class GarrukApexPredatorEmblem extends Emblem {
ability.addEffect(effect); ability.addEffect(effect);
this.getAbilities().add(ability); this.getAbilities().add(ability);
} }
} }

63
Mage/src/mage/abilities/common/AttackedByCreatureTriggeredAbility.java
View file

@ -1,31 +1,30 @@
/* /*
* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without modification, are * Redistribution and use in source and binary forms, with or without modification, are
* permitted provided that the following conditions are met: * permitted provided that the following conditions are met:
* *
* 1. Redistributions of source code must retain the above copyright notice, this list of * 1. Redistributions of source code must retain the above copyright notice, this list of
* conditions and the following disclaimer. * conditions and the following disclaimer.
* *
* 2. Redistributions in binary form must reproduce the above copyright notice, this list * 2. Redistributions in binary form must reproduce the above copyright notice, this list
* of conditions and the following disclaimer in the documentation and/or other materials * of conditions and the following disclaimer in the documentation and/or other materials
* provided with the distribution. * provided with the distribution.
* *
* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* The views and conclusions contained in the software and documentation are those of the * The views and conclusions contained in the software and documentation are those of the
* authors and should not be interpreted as representing official policies, either expressed * authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com. * or implied, of BetaSteward_at_googlemail.com.
*/ */
package mage.abilities.common; package mage.abilities.common;
import java.util.UUID; import java.util.UUID;
@ -57,13 +56,13 @@ public class AttackedByCreatureTriggeredAbility extends TriggeredAbilityImpl {
public AttackedByCreatureTriggeredAbility(Effect effect, boolean optional, SetTargetPointer setTargetPointer) { public AttackedByCreatureTriggeredAbility(Effect effect, boolean optional, SetTargetPointer setTargetPointer) {
this(Zone.BATTLEFIELD, effect, optional, setTargetPointer); this(Zone.BATTLEFIELD, effect, optional, setTargetPointer);
} }
public AttackedByCreatureTriggeredAbility(Zone zone, Effect effect, boolean optional, SetTargetPointer setTargetPointer) { public AttackedByCreatureTriggeredAbility(Zone zone, Effect effect, boolean optional, SetTargetPointer setTargetPointer) {
super(zone, effect, optional); super(zone, effect, optional);
this.setTargetPointer = setTargetPointer; this.setTargetPointer = setTargetPointer;
} }
public AttackedByCreatureTriggeredAbility(AttackedByCreatureTriggeredAbility ability) { public AttackedByCreatureTriggeredAbility(final AttackedByCreatureTriggeredAbility ability) {
super(ability); super(ability);
this.setTargetPointer = ability.setTargetPointer; this.setTargetPointer = ability.setTargetPointer;
} }
@ -80,9 +79,9 @@ public class AttackedByCreatureTriggeredAbility extends TriggeredAbilityImpl {
if (getControllerId().equals(playerId) && attackingCreature != null) { if (getControllerId().equals(playerId) && attackingCreature != null) {
if (!setTargetPointer.equals(SetTargetPointer.NONE)) { if (!setTargetPointer.equals(SetTargetPointer.NONE)) {
for (Effect effect : this.getEffects()) { for (Effect effect : this.getEffects()) {
switch(setTargetPointer) { switch (setTargetPointer) {
case PERMANENT: case PERMANENT:
effect.setTargetPointer(new FixedTarget(event.getTargetId())); effect.setTargetPointer(new FixedTarget(attackingCreature.getId()));
break; break;
case PLAYER: case PLAYER:
effect.setTargetPointer(new FixedTarget(attackingCreature.getControllerId())); effect.setTargetPointer(new FixedTarget(attackingCreature.getControllerId()));