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

* Evoke - Fixed that the check if creature came into play with evoke was always true if it came again to play later when it was evoked before.

Browse source
This commit is contained in:
LevelX2 2014-05-10 17:05:52 +02:00
parent 0e34720611
commit 8a4474fadc
21 changed files with 295 additions and 198 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Mage.Sets/src/mage/sets/betrayersofkamigawa/GenjuOfTheFields.java
View file

@ -35,15 +35,19 @@ import mage.constants.Rarity;
import mage.constants.Zone;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.DealsDamageGainLifeSourceTriggeredAbility;
import mage.abilities.common.DiesAttachedTriggeredAbility;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.mana.GenericManaCost;
import mage.abilities.effects.Effect;
import mage.abilities.effects.common.AttachEffect;
import mage.abilities.effects.common.ReturnToHandSourceEffect;
import mage.abilities.effects.common.continious.BecomesCreatureAttachedEffect;
import mage.abilities.effects.common.continious.GainAbilityAttachedEffect;
import mage.abilities.keyword.EnchantAbility;
import mage.abilities.keyword.LifelinkAbility;
import mage.cards.CardImpl;
import mage.constants.AttachmentType;
import mage.constants.Duration;
import mage.filter.common.FilterLandPermanent;
import mage.filter.predicate.mageobject.SubtypePredicate;
@ -79,7 +83,11 @@ public class GenjuOfTheFields extends CardImpl<GenjuOfTheFields> {
this.addAbility(ability);
// {2}: Until end of turn, enchanted Plains becomes a 2/5 white Spirit creature with "Whenever this creature deals damage, its controller gains that much life." It's still a land.
Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureAttachedEffect(new SpiritToken(), "Until end of turn, enchanted Plains becomes a 2/5 white Spirit creature with \"Whenever this creature deals damage, its controller gains that much life.\". It's still a land", Duration.EndOfTurn),new GenericManaCost(2));
Effect effect = new BecomesCreatureAttachedEffect(new SpiritToken(),
"Until end of turn, enchanted Plains becomes a 2/5 white Spirit creature", Duration.EndOfTurn);
Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect,new GenericManaCost(2));
effect = new GainAbilityAttachedEffect(new DealsDamageGainLifeSourceTriggeredAbility(), AttachmentType.AURA, Duration.EndOfTurn);
effect.setText("with \"Whenever this creature deals damage, its controller gains that much life.\". It's still a land");
this.addAbility(ability2);
// When enchanted Plains is put into a graveyard, you may return Genju of the Fields from your graveyard to your hand.
@ -98,13 +106,12 @@ public class GenjuOfTheFields extends CardImpl<GenjuOfTheFields> {
private class SpiritToken extends Token {
SpiritToken() {
super("Spirit", "2/5 white Spirit creature with with \"Whenever this creature deals damage, its controller gains that much life.\"");
super("Spirit", "2/5 white Spirit creature");
cardType.add(CardType.CREATURE);
color.setWhite(true);
subtype.add("Spirit");
power = new MageInt(2);
toughness = new MageInt(5);
addAbility(LifelinkAbility.getInstance());
}
}
}

78
Mage.Sets/src/mage/sets/guildpact/MourningThrull.java
View file

@ -29,19 +29,11 @@ package mage.sets.guildpact;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.TriggeredAbilityImpl;
import mage.abilities.effects.Effect;
import mage.abilities.effects.OneShotEffect;
import mage.abilities.common.DealsDamageGainLifeSourceTriggeredAbility;
import mage.abilities.keyword.FlyingAbility;
import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Outcome;
import mage.constants.Rarity;
import mage.constants.Zone;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.players.Player;
/**
*
@ -62,7 +54,7 @@ public class MourningThrull extends CardImpl<MourningThrull> {
// Flying
this.addAbility(FlyingAbility.getInstance());
// Whenever Mourning Thrull deals damage, you gain that much life.
this.addAbility(new MourningThrullTriggeredAbility());
this.addAbility(new DealsDamageGainLifeSourceTriggeredAbility());
}
public MourningThrull(final MourningThrull card) {
@ -74,69 +66,3 @@ public class MourningThrull extends CardImpl<MourningThrull> {
return new MourningThrull(this);
}
}
class MourningThrullTriggeredAbility extends TriggeredAbilityImpl<MourningThrullTriggeredAbility> {
public MourningThrullTriggeredAbility() {
super(Zone.BATTLEFIELD, new MourningThrullEffect(), false);
}
public MourningThrullTriggeredAbility(final MourningThrullTriggeredAbility ability) {
super(ability);
}
@Override
public MourningThrullTriggeredAbility copy() {
return new MourningThrullTriggeredAbility(this);
}
@Override
public boolean checkTrigger(GameEvent event, Game game) {
if (event.getType().equals(GameEvent.EventType.DAMAGED_CREATURE)
|| event.getType().equals(GameEvent.EventType.DAMAGED_PLAYER)
|| event.getType().equals(GameEvent.EventType.DAMAGED_PLANESWALKER)) {
if (event.getSourceId().equals(this.getSourceId())) {
for (Effect effect : this.getEffects()) {
effect.setValue("damage", event.getAmount());
}
return true;
}
}
return false;
}
@Override
public String getRule() {
return "Whenever {this} deals damage, " + super.getRule();
}
}
class MourningThrullEffect extends OneShotEffect<MourningThrullEffect> {
public MourningThrullEffect() {
super(Outcome.GainLife);
this.staticText = "you gain that much life";
}
public MourningThrullEffect(final MourningThrullEffect effect) {
super(effect);
}
@Override
public MourningThrullEffect copy() {
return new MourningThrullEffect(this);
}
@Override
public boolean apply(Game game, Ability source) {
int amount = (Integer) getValue("damage");
if (amount > 0) {
Player controller = game.getPlayer(source.getControllerId());
if (controller != null) {
controller.gainLife(amount, game);
return true;
}
}
return false;
}
}

80
Mage.Sets/src/mage/sets/modernmasters/StirThePride.java
View file

@ -28,24 +28,16 @@
package mage.sets.modernmasters;
import java.util.UUID;
import mage.abilities.Ability;
import mage.abilities.Mode;
import mage.abilities.TriggeredAbilityImpl;
import mage.abilities.common.DealsDamageGainLifeSourceTriggeredAbility;
import mage.abilities.effects.Effect;
import mage.abilities.effects.OneShotEffect;
import mage.abilities.effects.common.continious.BoostControlledEffect;
import mage.abilities.effects.common.continious.GainAbilityControlledEffect;
import mage.abilities.keyword.EntwineAbility;
import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.Outcome;
import mage.constants.Rarity;
import mage.constants.Zone;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.events.GameEvent.EventType;
import mage.players.Player;
/**
*
@ -66,7 +58,7 @@ public class StirThePride extends CardImpl<StirThePride> {
this.getSpellAbility().addEffect(new BoostControlledEffect(2,2, Duration.EndOfTurn));
// or until end of turn, creatures you control gain "Whenever this creature deals damage, you gain that much life."
Mode mode = new Mode();
Effect effect = new GainAbilityControlledEffect(new StirThePrideTriggeredAbility(), Duration.EndOfTurn);
Effect effect = new GainAbilityControlledEffect(new DealsDamageGainLifeSourceTriggeredAbility(), Duration.EndOfTurn);
effect.setText("until end of turn, creatures you control gain \"Whenever this creature deals damage, you gain that much life.\"");
mode.getEffects().add(effect);
this.getSpellAbility().getModes().addMode(mode);
@ -85,71 +77,3 @@ public class StirThePride extends CardImpl<StirThePride> {
return new StirThePride(this);
}
}
class StirThePrideTriggeredAbility extends TriggeredAbilityImpl<StirThePrideTriggeredAbility> {
public StirThePrideTriggeredAbility() {
super(Zone.BATTLEFIELD, new StirThePrideGainLifeEffect(), false);
}
public StirThePrideTriggeredAbility(final StirThePrideTriggeredAbility ability) {
super(ability);
}
@Override
public StirThePrideTriggeredAbility copy() {
return new StirThePrideTriggeredAbility(this);
}
@Override
public boolean checkTrigger(GameEvent event, Game game) {
if (event.getType().equals(EventType.DAMAGED_CREATURE)
|| event.getType().equals(GameEvent.EventType.DAMAGED_PLAYER)
|| event.getType().equals(GameEvent.EventType.DAMAGED_PLANESWALKER)) {
if (event.getSourceId().equals(this.getSourceId())) {
for (Effect effect : this.getEffects()) {
effect.setValue("damage", event.getAmount());
}
return true;
}
}
return false;
}
@Override
public String getRule() {
return "Whenever {this} deals damage, " + super.getRule();
}
}
class StirThePrideGainLifeEffect extends OneShotEffect<StirThePrideGainLifeEffect> {
public StirThePrideGainLifeEffect() {
super(Outcome.GainLife);
this.staticText = "you gain that much life";
}
public StirThePrideGainLifeEffect(final StirThePrideGainLifeEffect effect) {
super(effect);
}
@Override
public StirThePrideGainLifeEffect copy() {
return new StirThePrideGainLifeEffect(this);
}
@Override
public boolean apply(Game game, Ability source) {
int amount = (Integer) getValue("damage");
if (amount > 0) {
Player controller = game.getPlayer(source.getControllerId());
if (controller != null) {
controller.gainLife(amount, game);
return true;
}
}
return false;
}
}

2
Mage.Sets/src/mage/sets/timeshifted/EssenceSliver.java
View file

@ -73,7 +73,7 @@ public class EssenceSliver extends CardImpl<EssenceSliver> {
class DealsDamageTriggeredAbility extends TriggeredAbilityImpl<DealsDamageTriggeredAbility> {
private boolean setTargetPointer;
private final boolean setTargetPointer;
public DealsDamageTriggeredAbility(Effect effect, boolean optional, boolean setTargetPointer) {
super(Zone.BATTLEFIELD, effect, optional);

20
Mage.Sets/src/mage/sets/worldwake/RagingRavine.java
View file

@ -34,11 +34,14 @@ import mage.constants.Duration;
import mage.constants.Rarity;
import mage.constants.Zone;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.AttacksTriggeredAbility;
import mage.abilities.common.EntersBattlefieldTappedAbility;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.mana.ManaCostsImpl;
import mage.abilities.effects.Effect;
import mage.abilities.effects.common.continious.BecomesCreatureSourceEffect;
import mage.abilities.effects.common.continious.GainAbilitySourceEffect;
import mage.abilities.effects.common.counter.AddCountersSourceEffect;
import mage.abilities.mana.GreenManaAbility;
import mage.abilities.mana.RedManaAbility;
@ -55,10 +58,20 @@ public class RagingRavine extends CardImpl<RagingRavine> {
public RagingRavine(UUID ownerId) {
super(ownerId, 141, "Raging Ravine", Rarity.RARE, new CardType[]{CardType.LAND}, null);
this.expansionSetCode = "WWK";
// Raging Ravine enters the battlefield tapped.
this.addAbility(new EntersBattlefieldTappedAbility());
// Tap: Add Red or Green to your mana pool.
this.addAbility(new GreenManaAbility());
this.addAbility(new RedManaAbility());
this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new RagingRavineToken(), "land", Duration.EndOfTurn), new ManaCostsImpl("{2}{R}{G}")));
Effect effect = new BecomesCreatureSourceEffect(new RagingRavineToken(), "land", Duration.EndOfTurn);
effect.setText("Until end of turn, {this} becomes a 3/3 red and green Elemental creature");
// {2}{R}{G}: Until end of turn, Raging Ravine becomes a 3/3 red and green Elemental creature with "Whenever this creature attacks, put a +1/+1 counter on it." It's still a land.
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{2}{R}{G}"));
effect = new GainAbilitySourceEffect(new AttacksTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), false), Duration.EndOfTurn);
effect.setText("with \"Whenever this creature attacks, put a +1/+1 counter on it.\" It's still a land");
ability.addEffect(effect);
this.addAbility(ability);
}
public RagingRavine(final RagingRavine card) {
@ -75,13 +88,12 @@ public class RagingRavine extends CardImpl<RagingRavine> {
class RagingRavineToken extends Token {
public RagingRavineToken() {
super("", "3/3 red and green Elemental creature with \"Whenever this creature attacks, put a +1/+1 counter on it.\"");
super("", "3/3 red and green Elemental creature");
cardType.add(CardType.CREATURE);
subtype.add("Elemental");
color.setRed(true);
color.setGreen(true);
power = new MageInt(3);
toughness = new MageInt(3);
addAbility(new AttacksTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), false));
toughness = new MageInt(3);
}
}

85
Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/EvokeTest.java Normal file
View file

@ -0,0 +1,85 @@
/*
* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification, are
* permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this list of
* conditions and the following disclaimer.
*
* 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
* provided with the distribution.
*
* 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
* 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
* 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
* 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
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* 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
* or implied, of BetaSteward_at_googlemail.com.
*/
package org.mage.test.cards.abilities.keywords;
import mage.constants.PhaseStep;
import mage.constants.Zone;
import org.junit.Test;
import org.mage.test.serverside.base.CardTestPlayerBase;
/**
*
* @author LevelX2
*/
public class EvokeTest extends CardTestPlayerBase {
/*
* Shriekmaw {4}{B}
* Creature — Elemental
* 3/2
* Fear (This creature can't be blocked except by artifact creatures and/or black creatures.)
* When Shriekmaw enters the battlefield, destroy target nonartifact, nonblack creature.
* Evoke {1}{B} (You may cast this spell for its evoke cost. If you do, it's sacrificed when it enters the battlefield.)
Exhume {1}{B}
Sorcery
Each player puts a creature card from his or her graveyard onto the battlefield.
*/
@Test
public void testCreatureComesIntoPlay() {
// Check that Lion goes to graveyard from evoke ability
// Check that evoke does not trigger again to sacrifice Shriekmaw if it's exhumed
addCard(Zone.BATTLEFIELD, playerA, "Swamp", 5);
addCard(Zone.HAND, playerA, "Shriekmaw");
addCard(Zone.HAND, playerA, "Exhume");
addCard(Zone.BATTLEFIELD, playerB, "Silvercoat Lion", 1);
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Shriekmaw");
setChoice(playerA, "Yes");
addTarget(playerA, "Silvercoat Lion");
castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Exhume");
setStopAt(1, PhaseStep.END_TURN);
execute();
assertLife(playerA, 20);
assertLife(playerB, 20);
assertGraveyardCount(playerA, "Exhume", 1);
assertGraveyardCount(playerB, "Silvercoat Lion", 1); // went again to graveyard from shriekmaw's triggered ability
assertPermanentCount(playerA, "Shriekmaw", 1);
}
}

6
Mage.Tests/src/test/java/org/mage/test/cards/single/TurnToFrogTest.java
View file

@ -23,7 +23,7 @@ public class TurnToFrogTest extends CardTestPlayerBase {
addCard(Zone.BATTLEFIELD, playerB, "Island", 2);
addCard(Zone.HAND, playerB, "Turn to Frog");
activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{2}{R}{G}: Until end of turn {this} becomes a 3/3 red and green Elemental creature with \"Whenever this creature attacks, put a +1/+1 counter on it.\" that's still a land.");
activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{2}{R}{G}: Until end of turn, {this} becomes a 3/3 red and green Elemental creature with \"Whenever this creature attacks, put a +1/+1 counter on it.\" It's still a land.");
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Turn to Frog", "Raging Ravine");
attack(1, playerA, "Raging Ravine");
@ -44,10 +44,10 @@ public class TurnToFrogTest extends CardTestPlayerBase {
addCard(Zone.BATTLEFIELD, playerB, "Island", 2);
addCard(Zone.HAND, playerB, "Turn to Frog");
activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{2}{R}{G}: Until end of turn {this} becomes a 3/3 red and green Elemental creature with \"Whenever this creature attacks, put a +1/+1 counter on it.\" that's still a land.");
activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{2}{R}{G}: Until end of turn, {this} becomes a 3/3 red and green Elemental creature with \"Whenever this creature attacks, put a +1/+1 counter on it.\" It's still a land.");
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerB, "Turn to Frog", "Raging Ravine");
activateAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "{2}{R}{G}: Until end of turn {this} becomes a 3/3 red and green Elemental creature with \"Whenever this creature attacks, put a +1/+1 counter on it.\" that's still a land.");
activateAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "{2}{R}{G}: Until end of turn, {this} becomes a 3/3 red and green Elemental creature with \"Whenever this creature attacks, put a +1/+1 counter on it.\" It's still a land.");
attack(3, playerA, "Raging Ravine");
setStopAt(3, PhaseStep.END_COMBAT);

2
Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java
View file

@ -360,7 +360,7 @@ public class TestPlayer extends ComputerPlayer<TestPlayer> {
}
} else {
if (ability.getTargets().size() == 0) {
throw new AssertionError("Ability has no targets.");
throw new AssertionError("Ability has no targets. " + ability.toString());
}
for (UUID id: ability.getTargets().get(0).possibleTargets(ability.getSourceId(), ability.getControllerId(), game)) {
MageObject object = game.getObject(id);

4
Mage/src/mage/abilities/AbilityImpl.java
View file

@ -920,8 +920,8 @@ public abstract class AbilityImpl<T extends AbilityImpl<T>> implements Ability {
if (ability instanceof OptionalAdditionalSourceCosts) {
sb.append(((OptionalAdditionalSourceCosts) ability).getCastMessageSuffix());
}
if (ability instanceof AlternativeSourceCosts && ((AlternativeSourceCosts) ability).isActivated()) {
sb.append(((AlternativeSourceCosts) ability).getCastMessageSuffix());
if (ability instanceof AlternativeSourceCosts && ((AlternativeSourceCosts) ability).isActivated(this, game)) {
sb.append(((AlternativeSourceCosts) ability).getCastMessageSuffix(game));
}
}
return sb.toString();

112
Mage/src/mage/abilities/common/DealsDamageGainLifeSourceTriggeredAbility.java Normal file
View file

@ -0,0 +1,112 @@
/*
* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification, are
* permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this list of
* conditions and the following disclaimer.
*
* 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
* provided with the distribution.
*
* 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
* 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
* 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
* 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
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* 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
* or implied, of BetaSteward_at_googlemail.com.
*/
package mage.abilities.common;
import static javax.xml.bind.JAXBIntrospector.getValue;
import mage.abilities.Ability;
import mage.abilities.TriggeredAbilityImpl;
import mage.abilities.effects.Effect;
import mage.abilities.effects.OneShotEffect;
import mage.constants.Outcome;
import mage.constants.Zone;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.players.Player;
/**
*
* @author LevelX2
*/
public class DealsDamageGainLifeSourceTriggeredAbility extends TriggeredAbilityImpl<DealsDamageGainLifeSourceTriggeredAbility> {
public DealsDamageGainLifeSourceTriggeredAbility() {
super(Zone.BATTLEFIELD, new GainThatMuchLifeEffect(), false);
}
public DealsDamageGainLifeSourceTriggeredAbility(final DealsDamageGainLifeSourceTriggeredAbility ability) {
super(ability);
}
@Override
public DealsDamageGainLifeSourceTriggeredAbility copy() {
return new DealsDamageGainLifeSourceTriggeredAbility(this);
}
@Override
public boolean checkTrigger(GameEvent event, Game game) {
if (event.getType().equals(GameEvent.EventType.DAMAGED_CREATURE)
|| event.getType().equals(GameEvent.EventType.DAMAGED_PLAYER)
|| event.getType().equals(GameEvent.EventType.DAMAGED_PLANESWALKER)) {
if (event.getSourceId().equals(this.getSourceId())) {
for (Effect effect : this.getEffects()) {
effect.setValue("damage", event.getAmount());
}
return true;
}
}
return false;
}
@Override
public String getRule() {
return "Whenever {this} deals damage, " + super.getRule();
}
}
class GainThatMuchLifeEffect extends OneShotEffect<GainThatMuchLifeEffect> {
public GainThatMuchLifeEffect() {
super(Outcome.GainLife);
this.staticText = "you gain that much life";
}
public GainThatMuchLifeEffect(final GainThatMuchLifeEffect effect) {
super(effect);
}
@Override
public GainThatMuchLifeEffect copy() {
return new GainThatMuchLifeEffect(this);
}
@Override
public boolean apply(Game game, Ability source) {
Player controller = game.getPlayer(source.getControllerId());
if (controller != null) {
int amount = (Integer) getValue("damage");
if (amount > 0) {
controller.gainLife(amount, game);
}
return true;
}
return false;
}
}

2
Mage/src/mage/abilities/condition/common/EvokedCondition.java
View file

@ -59,7 +59,7 @@ public class EvokedCondition implements Condition {
if (card != null) {
for (Ability ability: card.getAbilities()) {
if (ability instanceof EvokeAbility) {
if(((EvokeAbility) ability).isActivated()) {
if(((EvokeAbility) ability).isActivated(source, game)) {
return true;
}
}

2
Mage/src/mage/abilities/condition/common/ProwlCondition.java
View file

@ -59,7 +59,7 @@ public class ProwlCondition implements Condition {
if (card != null) {
for (Ability ability: card.getAbilities()) {
if (ability instanceof ProwlAbility) {
if(((ProwlAbility) ability).isActivated()) {
if(((ProwlAbility) ability).isActivated(source, game)) {
return true;
}
}

5
Mage/src/mage/abilities/costs/AlternativeCost2.java
View file

@ -27,6 +27,8 @@
*/
package mage.abilities.costs;
import mage.game.Game;
/**
*
* @author LevelX2
@ -78,9 +80,10 @@ public interface AlternativeCost2 extends Cost {
/**
* Returns if the cost was activated
*
* @param game
* @return
*/
boolean isActivated();
boolean isActivated(Game game);
Cost getCost();

5
Mage/src/mage/abilities/costs/AlternativeCost2Impl.java
View file

@ -28,6 +28,8 @@
package mage.abilities.costs;
import mage.game.Game;
/**
* Alternative costs
*
@ -136,10 +138,11 @@ public class AlternativeCost2Impl <T extends AlternativeCost2Impl<T>> extends Co
/**
* Returns if the cost was activated
*
* @param game
* @return
*/
@Override
public boolean isActivated(){
public boolean isActivated(Game game){
return activated;
};

8
Mage/src/mage/abilities/costs/AlternativeCostSourceAbility.java
View file

@ -124,13 +124,13 @@ public class AlternativeCostSourceAbility extends StaticAbility<AlternativeCostS
}
}
}
return isActivated();
return isActivated(ability, game);
}
@Override
public boolean isActivated() {
public boolean isActivated(Ability source, Game game) {
for (AlternativeCost2 cost : alternateCosts) {
if (cost.isActivated()) {
if (cost.isActivated(game)) {
return true;
}
}
@ -138,7 +138,7 @@ public class AlternativeCostSourceAbility extends StaticAbility<AlternativeCostS
}
@Override
public String getCastMessageSuffix() {
public String getCastMessageSuffix(Game game) {
return alternateCosts.isEmpty() ? " without paying it's mana costs":" using alternative casting costs";
}

8
Mage/src/mage/abilities/costs/AlternativeSourceCosts.java
View file

@ -59,13 +59,17 @@ public interface AlternativeSourceCosts {
/**
* Was the alternative cost activated
* @param game
* @param source
* @return
*/
boolean isActivated();
boolean isActivated(Ability source, Game game);
/**
* Suffix string to use for game log
* @param game
* @return
*/
String getCastMessageSuffix();
String getCastMessageSuffix(Game game);
}

2
Mage/src/mage/abilities/effects/Effects.java
View file

@ -63,7 +63,7 @@ public class Effects extends ArrayList<Effect> {
}
rule = effect.getText(mode);
if (rule != null) {
if (rule.startsWith("and ")) {
if (rule.startsWith("and ") || rule.startsWith("with ")) {
endString = " ";
} else if (rule.startsWith(",")) {
endString = "";

43
Mage/src/mage/abilities/keyword/EvokeAbility.java
View file

@ -31,8 +31,6 @@ package mage.abilities.keyword;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import mage.constants.Zone;
import mage.abilities.Ability;
import mage.abilities.SpellAbility;
import mage.abilities.StaticAbility;
@ -48,6 +46,7 @@ import mage.abilities.decorator.ConditionalTriggeredAbility;
import mage.abilities.effects.common.SacrificeSourceEffect;
import mage.cards.Card;
import mage.constants.Outcome;
import mage.constants.Zone;
import mage.game.Game;
import mage.players.Player;
@ -61,7 +60,10 @@ public class EvokeAbility extends StaticAbility<EvokeAbility> implements Alterna
protected static final String EVOKE_KEYWORD = "Evoke";
protected static final String REMINDER_TEXT = "(You may cast this spell for its evoke cost. If you do, it's sacrificed when it enters the battlefield.)";
protected List<AlternativeCost2> evokeCosts = new LinkedList<AlternativeCost2>();
protected List<AlternativeCost2> evokeCosts = new LinkedList<>();
// needed to check activation status, if card changes zone after casting it
private int zoneChangeCounter = 0;
public EvokeAbility(Card card, String manaString) {
super(Zone.ALL, null);
@ -76,6 +78,7 @@ public class EvokeAbility extends StaticAbility<EvokeAbility> implements Alterna
public EvokeAbility(final EvokeAbility ability) {
super(ability);
this.evokeCosts.addAll(ability.evokeCosts);
this.zoneChangeCounter = ability.zoneChangeCounter;
}
@Override
@ -93,12 +96,17 @@ public class EvokeAbility extends StaticAbility<EvokeAbility> implements Alterna
for (AlternativeCost2 cost: evokeCosts) {
cost.reset();
}
zoneChangeCounter = 0;
}
@Override
public boolean isActivated() {
for (AlternativeCost2 cost: evokeCosts) {
if(cost.isActivated()) {
return true;
public boolean isActivated(Ability ability, Game game) {
Card card = game.getCard(sourceId);
if (card != null && card.getZoneChangeCounter() <= zoneChangeCounter +1) {
for (AlternativeCost2 cost: evokeCosts) {
if(cost.isActivated(game)) {
return true;
}
}
}
return false;
@ -118,7 +126,7 @@ public class EvokeAbility extends StaticAbility<EvokeAbility> implements Alterna
for (AlternativeCost2 evokeCost: evokeCosts) {
if (evokeCost.canPay(sourceId, controllerId, game) &&
player.chooseUse(Outcome.Benefit, new StringBuilder(EVOKE_KEYWORD).append(" the creature for ").append(evokeCost.getText(true)).append(" ?").toString(), game)) {
evokeCost.activate();
activateEvoke(evokeCost, game);
ability.getManaCostsToPay().clear();
ability.getCosts().clear();
for (Iterator it = ((Costs) evokeCost).iterator(); it.hasNext();) {
@ -133,7 +141,20 @@ public class EvokeAbility extends StaticAbility<EvokeAbility> implements Alterna
}
}
}
return isActivated();
return isActivated(ability, game);
}
private void activateEvoke(AlternativeCost2 cost, Game game) {
cost.activate();
// remember zone change counter
if (zoneChangeCounter == 0) {
Card card = game.getCard(getSourceId());
if (card != null) {
zoneChangeCounter = card.getZoneChangeCounter();
} else {
throw new IllegalArgumentException("Evoke source card not found");
}
}
}
@Override
@ -158,11 +179,11 @@ public class EvokeAbility extends StaticAbility<EvokeAbility> implements Alterna
}
@Override
public String getCastMessageSuffix() {
public String getCastMessageSuffix(Game game) {
StringBuilder sb = new StringBuilder();
int position = 0;
for (AlternativeCost2 cost : evokeCosts) {
if (cost.isActivated()) {
if (cost.isActivated(game)) {
sb.append(cost.getCastSuffixMessage(position));
++position;
}

3
Mage/src/mage/abilities/keyword/KickerAbility.java
View file

@ -43,7 +43,6 @@ import mage.abilities.costs.mana.GenericManaCost;
import mage.abilities.costs.mana.ManaCostsImpl;
import mage.abilities.costs.mana.VariableManaCost;
import mage.cards.Card;
import mage.constants.CardType;
import mage.constants.Outcome;
import mage.constants.Zone;
import mage.game.Game;
@ -185,7 +184,7 @@ public class KickerAbility extends StaticAbility<KickerAbility> implements Optio
kickerCost.activate();
// remember zone change counter
if (zoneChangeCounter == 0) {
Card card = game.getCard(sourceId);
Card card = game.getCard(getSourceId());
if (card != null) {
zoneChangeCounter = card.getZoneChangeCounter();
} else {

11
Mage/src/mage/abilities/keyword/ProwlAbility.java
View file

@ -97,10 +97,11 @@ public class ProwlAbility extends StaticAbility<ProwlAbility> implements Alterna
cost.reset();
}
}
@Override
public boolean isActivated() {
public boolean isActivated(Ability ability, Game game) {
for (AlternativeCost2 cost: prowlCosts) {
if(cost.isActivated()) {
if(cost.isActivated(game)) {
return true;
}
}
@ -148,7 +149,7 @@ public class ProwlAbility extends StaticAbility<ProwlAbility> implements Alterna
}
}
}
return isActivated();
return isActivated(ability, game);
}
@Override
@ -173,11 +174,11 @@ public class ProwlAbility extends StaticAbility<ProwlAbility> implements Alterna
}
@Override
public String getCastMessageSuffix() {
public String getCastMessageSuffix(Game game) {
StringBuilder sb = new StringBuilder();
int position = 0;
for (AlternativeCost2 cost : prowlCosts) {
if (cost.isActivated()) {
if (cost.isActivated(game)) {
sb.append(cost.getCastSuffixMessage(position));
++position;
}

2
Mage/src/mage/cards/repository/CardRepository.java
View file

@ -55,7 +55,7 @@ public enum CardRepository {
private static final String JDBC_URL = "jdbc:sqlite:db/cards.db";
private static final String VERSION_ENTITY_NAME = "card";
private static final long CARD_DB_VERSION = 31;
private static final long CARD_DB_VERSION = 32;
private final Random random = new Random();
private Dao<CardInfo, Object> cardDao;