github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-04-03 17:00:16 -09:00
Code Issues Projects Releases Packages Wiki Activity

* Copy Enchantment - Fixed a bug that it could not copy non aura enchantments.

Browse source
This commit is contained in:
LevelX2 2014-10-26 09:08:17 +01:00
parent 82ba4a83e8
commit 9905b0c4ab
3 changed files with 122 additions and 26 deletions
Mage.Sets/src/mage/sets/ravnika
CopyEnchantment.java
Mage.Tests/src/test/java/org/mage/test/cards/copy
CopyEnchantmentTest.java
Mage/src/mage/abilities/effects/common
CopyPermanentEffect.java

52
Mage.Sets/src/mage/sets/ravnika/CopyEnchantment.java
View file

@ -31,10 +31,8 @@ import java.util.UUID;
import mage.abilities.Ability;
import mage.abilities.SpellAbility;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.effects.AuraReplacementEffect;
import mage.abilities.effects.Effect;
import mage.abilities.effects.EntersBattlefieldEffect;
import mage.abilities.effects.ReplacementEffect;
import mage.abilities.effects.common.AttachEffect;
import mage.abilities.effects.common.CopyPermanentEffect;
import mage.cards.CardImpl;
@ -45,7 +43,6 @@ import mage.constants.Zone;
import mage.filter.FilterPermanent;
import mage.filter.common.FilterEnchantmentPermanent;
import mage.game.Game;
import mage.game.events.ZoneChangeEvent;
import mage.game.permanent.Permanent;
import mage.players.Player;
import mage.target.Target;
@ -97,31 +94,36 @@ class CopyEnchantmentEffect extends CopyPermanentEffect {
Permanent sourcePermanent = game.getPermanent(source.getSourceId());
if (controller != null && sourcePermanent != null) {
if (super.apply(game, source)) {
Target target = getBluePrintPermanent().getSpellAbility().getTargets().get(0);
Outcome auraOutcome = Outcome.BoostCreature;
Ability: for (Ability ability: getBluePrintPermanent().getAbilities()) {
if (ability instanceof SpellAbility) {
for (Effect effect: ability.getEffects()) {
if (effect instanceof AttachEffect) {
auraOutcome = effect.getOutcome();
break Ability;
Permanent permanentToCopy = getBluePrintPermanent();
if (permanentToCopy != null) {
if (permanentToCopy.getSubtype().contains("Aura")) {
Target target = getBluePrintPermanent().getSpellAbility().getTargets().get(0);
Outcome auraOutcome = Outcome.BoostCreature;
Ability: for (Ability ability: getBluePrintPermanent().getAbilities()) {
if (ability instanceof SpellAbility) {
for (Effect effect: ability.getEffects()) {
if (effect instanceof AttachEffect) {
auraOutcome = effect.getOutcome();
break Ability;
}
}
}
}
if (controller.choose(auraOutcome, target, source.getSourceId(), game)) {
UUID targetId = target.getFirstTarget();
Permanent targetPermanent = game.getPermanent(targetId);
Player targetPlayer = game.getPlayer(targetId);
if (targetPermanent != null) {
targetPermanent.addAttachment(sourcePermanent.getId(), game);
} else if (targetPlayer != null) {
targetPlayer.addAttachment(sourcePermanent.getId(), game);
} else {
return false;
}
}
}
return true;
}
if (controller.choose(auraOutcome, target, source.getSourceId(), game)) {
UUID targetId = target.getFirstTarget();
Permanent targetPermanent = game.getPermanent(targetId);
Player targetPlayer = game.getPlayer(targetId);
if (targetPermanent != null) {
targetPermanent.addAttachment(sourcePermanent.getId(), game);
} else if (targetPlayer != null) {
targetPlayer.addAttachment(sourcePermanent.getId(), game);
} else {
return false;
}
}
return true;
}
}
return false;
@ -132,4 +134,4 @@ class CopyEnchantmentEffect extends CopyPermanentEffect {
return new CopyEnchantmentEffect(this);
}
}
}

94
Mage.Tests/src/test/java/org/mage/test/cards/copy/CopyEnchantmentTest.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.copy;
import mage.constants.PhaseStep;
import mage.constants.Zone;
import org.junit.Test;
import org.mage.test.serverside.base.CardTestPlayerBase;
/**
*
* @author LevelX2
*/
public class CopyEnchantmentTest extends CardTestPlayerBase {
@Test
public void copyNonAuraEnchantment() {
addCard(Zone.HAND, playerA, "Copy Enchantment", 1);
addCard(Zone.BATTLEFIELD, playerA, "Island", 3);
// Creature - Dragon 2/2
// Flying
// {R}: Furnace Whelp gets +1/+0 until end of turn.
addCard(Zone.BATTLEFIELD, playerA, "Furnace Whelp", 3);
// Dragon creatures you control get +3/+3.
addCard(Zone.BATTLEFIELD, playerB, "Crucible of Fire", 1);
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Copy Enchantment");
setChoice(playerA, "Crucible of Fire");
setStopAt(1, PhaseStep.BEGIN_COMBAT);
execute();
assertLife(playerA, 20);
assertLife(playerB, 20);
assertGraveyardCount(playerA, "Copy Enchantment",0);
assertPermanentCount(playerA, "Crucible of Fire", 1);
assertPowerToughness(playerA, "Furnace Whelp", 5,5);
}
@Test
public void copyAuraEnchantment() {
addCard(Zone.HAND, playerA, "Inferno Fist", 1);
addCard(Zone.BATTLEFIELD, playerA, "Mountain", 3);
// 3/1 Flying
addCard(Zone.BATTLEFIELD, playerA, "Geist of the Moors", 1);
addCard(Zone.HAND, playerB, "Copy Enchantment", 1);
addCard(Zone.BATTLEFIELD, playerB, "Island", 3);
// 2/2
addCard(Zone.BATTLEFIELD, playerB, "Silvercoat Lion", 3);
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Inferno Fist", "Geist of the Moors");
castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Copy Enchantment");
setStopAt(2, PhaseStep.BEGIN_COMBAT);
execute();
assertLife(playerA, 20);
assertLife(playerB, 20);
assertHandCount(playerA, "Inferno Fist", 0);
assertGraveyardCount(playerB, "Copy Enchantment",0);
assertPermanentCount(playerA, "Inferno Fist", 1);
assertPermanentCount(playerB, "Inferno Fist", 1);
assertPowerToughness(playerA, "Geist of the Moors", 5,1);
assertPowerToughness(playerB, "Silvercoat Lion", 4,2);
}
}

2
Mage/src/mage/abilities/effects/common/CopyPermanentEffect.java
View file

@ -27,9 +27,9 @@
*/
package mage.abilities.effects.common;
import mage.constants.Outcome;
import mage.abilities.Ability;
import mage.abilities.effects.OneShotEffect;
import mage.constants.Outcome;
import mage.filter.FilterPermanent;
import mage.filter.common.FilterCreaturePermanent;
import mage.game.Game;