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

* Roi Elemental - Fixed triggered ability that did not work correctly for copied Roi Elementals (fixes #3214).

Browse source
This commit is contained in:
LevelX2 2017-05-06 10:19:04 +02:00
parent 9ae0c31ee1
commit 795218b030
5 changed files with 102 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Mage.Sets/src/mage/cards/g/GruulRagebeast.java
View file

@ -39,7 +39,6 @@ import mage.constants.Outcome;
import mage.constants.TargetController;
import mage.constants.Zone;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.mageobject.CardIdPredicate;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.game.Game;
import mage.game.events.GameEvent;
@ -63,15 +62,12 @@ public class GruulRagebeast extends CardImpl {
}
public GruulRagebeast(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{R}{G}");
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{5}{R}{G}");
this.subtype.add("Beast");
this.power = new MageInt(6);
this.toughness = new MageInt(6);
FilterCreaturePermanent filter = new FilterCreaturePermanent();
filter.add(new CardIdPredicate(this.getId()));
// Whenever Gruul Ragebeast or another creature enters the battlefield under your control, that creature fights target creature an opponent controls.
Ability ability = new GruulRagebeastTriggeredAbility();

15
Mage.Sets/src/mage/cards/r/RoilElemental.java
View file

@ -33,15 +33,12 @@ import mage.constants.*;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.LandfallAbility;
import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition;
import mage.abilities.condition.common.SourceOnBattlefieldControlUnchangedCondition;
import mage.abilities.decorator.ConditionalContinuousEffect;
import mage.abilities.effects.common.continuous.GainControlTargetEffect;
import mage.abilities.keyword.FlyingAbility;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.filter.FilterPermanent;
import mage.filter.predicate.mageobject.CardIdPredicate;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.target.common.TargetCreaturePermanent;
/**
@ -51,7 +48,7 @@ import mage.target.common.TargetCreaturePermanent;
public class RoilElemental extends CardImpl {
public RoilElemental(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{U}{U}{U}");
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{U}{U}{U}");
this.subtype.add("Elemental");
this.power = new MageInt(3);
@ -59,15 +56,11 @@ public class RoilElemental extends CardImpl {
String rule = "you may gain control of target creature for as long as you control Roil Elemental";
FilterPermanent filter = new FilterPermanent();
filter.add(new ControllerPredicate(TargetController.YOU));
filter.add(new CardIdPredicate(this.getId()));
// Flying
this.addAbility(FlyingAbility.getInstance());
// Landfall - Whenever a land enters the battlefield under your control, you may gain control of target creature for as long as you control Roil Elemental.
ConditionalContinuousEffect effect = new ConditionalContinuousEffect(new GainControlTargetEffect(Duration.Custom), new PermanentsOnTheBattlefieldCondition(filter), rule);
ConditionalContinuousEffect effect = new ConditionalContinuousEffect(new GainControlTargetEffect(Duration.Custom), new SourceOnBattlefieldControlUnchangedCondition(), rule);
Ability ability = new LandfallAbility(Zone.BATTLEFIELD, effect, true);
ability.addTarget(new TargetCreaturePermanent());
this.addAbility(ability);
@ -81,4 +74,4 @@ public class RoilElemental extends CardImpl {
public RoilElemental copy() {
return new RoilElemental(this);
}
}
}

6
Mage.Sets/src/mage/cards/t/ThresherLizard.java
View file

@ -29,11 +29,8 @@ package mage.cards.t;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.condition.Condition;
import mage.abilities.condition.common.HeckbentCondition;
import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition;
import mage.abilities.decorator.ConditionalContinuousEffect;
import mage.abilities.effects.common.continuous.BoostSourceEffect;
import mage.cards.CardImpl;
@ -41,7 +38,6 @@ import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.Zone;
import mage.game.Game;
/**
*
@ -51,7 +47,7 @@ public class ThresherLizard extends CardImpl {
public ThresherLizard(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{R}");
this.subtype.add("Lizard");
this.power = new MageInt(3);
this.toughness = new MageInt(2);

94
Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/CipherTest.java Normal file
View file

@ -0,0 +1,94 @@
/*
* 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 CipherTest extends CardTestPlayerBase {
/**
* Produced a copy of the opponents Roil Elemental with Stolen Identity and
* used Cipher on that same token. The token's landfall ability then did
* trigger normally up to the point where a target creature could be
* selected. The selection was logged by XMage, but the effect simply did
* not work. The original Roil Elemental controlled by the other player
* worked as intended, though.
*
* Edit: Opponent was AI, if that helps.
*/
@Test
public void testStolenIdentity() {
addCard(Zone.BATTLEFIELD, playerA, "Island", 6);
addCard(Zone.HAND, playerA, "Mountain", 1);
// Create a token that's a copy of target artifact or creature.
// Cipher (Then you may exile this spell card encoded on a creature you control. Whenever that creature deals combat damage to a player, its controller may cast a copy of the encoded card without paying its mana cost.)
addCard(Zone.HAND, playerA, "Stolen Identity"); // Sorcery {4}{U}{U}
// Flying
// Landfall - Whenever a land enters the battlefield under your control, you may gain control of target creature for as long as you control Roil Elemental.
addCard(Zone.BATTLEFIELD, playerB, "Roil Elemental");
addCard(Zone.BATTLEFIELD, playerB, "Pillarfield Ox");
addCard(Zone.BATTLEFIELD, playerB, "Silvercoat Lion");
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Stolen Identity", "Roil Elemental");
setChoice(playerA, "Yes");
playLand(3, PhaseStep.PRECOMBAT_MAIN, playerA, "Mountain");
addTarget(playerA, "Silvercoat Lion"); // Triggered ability of copied Roil Elemental to gain control
attack(3, playerA, "Roil Elemental"); // Creature 3/2
addTarget(playerA, "Pillarfield Ox");
setStopAt(3, PhaseStep.POSTCOMBAT_MAIN);
execute();
assertLife(playerB, 17);
assertExileCount(playerA, "Stolen Identity", 1);
assertPermanentCount(playerA, "Mountain", 1);
assertPermanentCount(playerB, "Pillarfield Ox", 1);
assertPermanentCount(playerA, "Pillarfield Ox", 1); // a copy from the cipered Stolen Identity caused by the Roil Elelemtal Attack
assertPermanentCount(playerB, "Silvercoat Lion", 0);
assertPermanentCount(playerA, "Silvercoat Lion", 1); // Gain control from triggered ability of the copied Roil Elemental ????? TARGET ???
assertPermanentCount(playerB, "Roil Elemental", 1);
assertPermanentCount(playerA, "Roil Elemental", 1);
}
}

4
Mage/src/main/java/mage/abilities/effects/common/CipherEffect.java
View file

@ -96,13 +96,13 @@ public class CipherEffect extends OneShotEffect {
Card sourceCard = game.getCard(source.getSourceId());
Permanent targetCreature = game.getPermanent(target.getFirstTarget());
if (targetCreature != null && sourceCard != null) {
String ruleText = new StringBuilder("you may cast a copy of ").append(sourceCard.getLogName()).append(" without paying its mana cost").toString();
String ruleText = "you may cast a copy of " + sourceCard.getLogName() + " without paying its mana cost";
Ability ability = new DealsCombatDamageToAPlayerTriggeredAbility(new CipherStoreEffect(source.getSourceId(), ruleText), true);
ContinuousEffect effect = new GainAbilityTargetEffect(ability, Duration.Custom);
effect.setTargetPointer(new FixedTarget(target.getFirstTarget()));
game.addEffect(effect, source);
if (!game.isSimulation()) {
game.informPlayers(new StringBuilder(sourceCard.getLogName()).append(": Spell ciphered to ").append(targetCreature.getLogName()).toString());
game.informPlayers(sourceCard.getLogName() + ": Spell ciphered to " + targetCreature.getLogName());
}
return controller.moveCards(sourceCard, Zone.EXILED, source, game);
} else {