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

* Fixed check of dies attched triggered abilities not always triggering if attachment and attached object went to graveyard at the same time.

Browse source
This commit is contained in:
LevelX2 2015-10-03 19:23:58 +02:00
parent 85f0cc6bb3
commit f24a1b3898
4 changed files with 116 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

88
Mage.Tests/src/test/java/org/mage/test/cards/enchantments/SkullclampTest.java Normal file
View file

@ -0,0 +1,88 @@
/*
* 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.enchantments;
import mage.constants.PhaseStep;
import mage.constants.Zone;
import org.junit.Test;
import org.mage.test.serverside.base.CardTestPlayerBase;
/**
*
* @author LevelX2
*/
public class SkullclampTest extends CardTestPlayerBase {
/**
* Skullclamp and the creature it's attached to are destroyed by same
* Pernicious Deed activation. AFAIK Skullclamp should trigger, but it
* doesn't.
*
* 400.7e Abilities of Auras that trigger when the enchanted permanent
* leaves the battlefield can find the new object that Aura became in its
* owners graveyard if it was put into that graveyard at the same time the
* enchanted permanent left the battlefield. It can also find the new object
* that Aura became in its owners graveyard as a result of being put there
* as a state-based action for not being attached to a permanent. (See rule
* 704.5n.)
*
*/
@Test
public void testPerniciousDeed() {
// Equipped creature gets +1/-1.
// Whenever equipped creature dies, draw two cards.
// Equip {1}
addCard(Zone.BATTLEFIELD, playerA, "Skullclamp", 1);
addCard(Zone.BATTLEFIELD, playerA, "Silvercoat Lion", 1);
addCard(Zone.BATTLEFIELD, playerA, "Pillarfield Ox", 1);
addCard(Zone.BATTLEFIELD, playerA, "Island", 1);
addCard(Zone.BATTLEFIELD, playerB, "Swamp", 2);
// {X}, Sacrifice Pernicious Deed: Destroy each artifact, creature, and enchantment with converted mana cost X or less.
addCard(Zone.BATTLEFIELD, playerB, "Pernicious Deed"); // Enchantment
activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Equip", "Silvercoat Lion");
activateAbility(1, PhaseStep.POSTCOMBAT_MAIN, playerB, "{X},Sacrifice");
setChoice(playerB, "X=2");
setStopAt(1, PhaseStep.END_TURN);
execute();
assertGraveyardCount(playerA, "Skullclamp", 1);
assertGraveyardCount(playerA, "Silvercoat Lion", 1);
assertGraveyardCount(playerB, "Pernicious Deed", 1);
assertPermanentCount(playerA, "Pillarfield Ox", 1);
assertHandCount(playerA, 2);
}
}

19
Mage/src/mage/abilities/common/DiesAttachedTriggeredAbility.java
View file

@ -1,14 +1,16 @@
package mage.abilities.common;
import mage.constants.Zone;
import mage.abilities.TriggeredAbilityImpl;
import mage.abilities.effects.Effect;
import mage.constants.Zone;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.events.ZoneChangeEvent;
import mage.game.permanent.Permanent;
/**
* "When enchanted/equipped creature dies" triggered ability
*
* @author Loki
*/
public class DiesAttachedTriggeredAbility extends TriggeredAbilityImpl {
@ -30,7 +32,6 @@ public class DiesAttachedTriggeredAbility extends TriggeredAbilityImpl {
this.diesRuleText = diesRuleText;
}
public DiesAttachedTriggeredAbility(final DiesAttachedTriggeredAbility ability) {
super(ability);
this.attachedDescription = ability.attachedDescription;
@ -49,9 +50,21 @@ public class DiesAttachedTriggeredAbility extends TriggeredAbilityImpl {
@Override
public boolean checkTrigger(GameEvent event, Game game) {
if (((ZoneChangeEvent)event).isDiesEvent()) {
if (((ZoneChangeEvent) event).isDiesEvent()) {
ZoneChangeEvent zEvent = (ZoneChangeEvent) event;
boolean triggered = false;
if (zEvent.getTarget().getAttachments().contains(this.getSourceId())) {
triggered = true;
} else {
// If both (attachment and attached went to graveyard at the same time, the attachemnets can be already removed from the attached object.)
// So check here with the LKI of the enchantment
Permanent attachment = game.getPermanentOrLKIBattlefield(getSourceId());
if (attachment != null && attachment.getAttachedTo().equals(zEvent.getTargetId())
&& attachment.getAttachedToZoneChangeCounter() == zEvent.getTarget().getZoneChangeCounter(game)) {
triggered = true;
}
}
if (triggered) {
for (Effect effect : getEffects()) {
effect.setValue("attachedTo", zEvent.getTarget());
}

2
Mage/src/mage/game/permanent/Permanent.java
View file

@ -109,6 +109,8 @@ public interface Permanent extends Card, Controllable {
UUID getAttachedTo();
int getAttachedToZoneChangeCounter();
void attachTo(UUID permanentId, Game game);
boolean addAttachment(UUID permanentId, Game game);

8
Mage/src/mage/game/permanent/PermanentImpl.java
View file

@ -115,6 +115,7 @@ public abstract class PermanentImpl extends CardImpl implements Permanent {
protected Map<String, List<UUID>> connectedCards = new HashMap<>();
protected HashSet<MageObjectReference> dealtDamageByThisTurn;
protected UUID attachedTo;
protected int attachedToZoneChangeCounter;
protected UUID pairedCard;
protected Counters counters;
protected List<Counter> markedDamage;
@ -172,6 +173,7 @@ public abstract class PermanentImpl extends CardImpl implements Permanent {
}
this.counters = permanent.counters.copy();
this.attachedTo = permanent.attachedTo;
this.attachedToZoneChangeCounter = permanent.attachedToZoneChangeCounter;
this.minBlockedBy = permanent.minBlockedBy;
this.maxBlockedBy = permanent.maxBlockedBy;
this.transformed = permanent.transformed;
@ -676,6 +678,11 @@ public abstract class PermanentImpl extends CardImpl implements Permanent {
return attachedTo;
}
@Override
public int getAttachedToZoneChangeCounter() {
return attachedToZoneChangeCounter;
}
@Override
public void addConnectedCard(String key, UUID connectedCard) {
if (this.connectedCards.containsKey(key)) {
@ -712,6 +719,7 @@ public abstract class PermanentImpl extends CardImpl implements Permanent {
}
}
this.attachedTo = permanentId;
this.attachedToZoneChangeCounter = game.getState().getZoneChangeCounter(permanentId);
for (Ability ability : this.getAbilities()) {
for (Iterator<Effect> ite = ability.getEffects(game, EffectType.CONTINUOUS).iterator(); ite.hasNext();) {
ContinuousEffect effect = (ContinuousEffect) ite.next();