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

Some changes to effect handling to fix failing tests.

Browse source
This commit is contained in:
LevelX2 2015-04-15 15:21:47 +02:00
parent 9aa02f3d6f
commit 77f3035443
10 changed files with 25 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Sets/src/mage/sets/gatecrash/MurderInvestigation.java
View file

@ -86,7 +86,7 @@ class AttachedPermanentPowerCount implements DynamicValue {
public int calculate(Game game, Ability sourceAbility, Effect effect) {
Permanent attachmentPermanent = game.getPermanent(sourceAbility.getSourceId());
if (attachmentPermanent == null) {
attachmentPermanent = (Permanent) game.getLastKnownInformation(sourceAbility.getSourceId(), Zone.BATTLEFIELD);
attachmentPermanent = (Permanent) game.getLastKnownInformation(sourceAbility.getSourceId(), Zone.BATTLEFIELD, sourceAbility.getSourceObjectZoneChangeCounter());
}
if (attachmentPermanent != null && attachmentPermanent.getAttachedTo() != null) {
if (effect.getValue("attachedTo") != null) {

2
Mage.Tests/src/test/java/org/mage/test/lki/LastKnownInformationTest.java
View file

@ -22,7 +22,7 @@ public class LastKnownInformationTest extends CardTestPlayerBase {
* http://www.slightlymagic.net/forum/viewtopic.php?f=116&t=14516
*
* Tests Safehold Elite with persist returns to battlefield with -1/-1 counter
* Murder Investigation puts 2 tokens onto battlefield because enchanted Safehold Elite
* Murder Investigation has to put 2 tokens onto battlefield because enchanted Safehold Elite
* was 2/2
*
* @author LevelX

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

@ -901,6 +901,10 @@ public abstract class AbilityImpl implements Ability {
}
}
}
// check agains shortLKI for effects that move multiple object at the same time (e.g. destroy all)
if (game.getShortLivingLKI(getSourceId(), getZone())) {
return true;
}
// check against current state
Zone test = game.getState().getZone(parameterSourceId);
return test != null && zone.match(test);

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

@ -26,7 +26,7 @@ public class DiesAttachedTriggeredAbility extends TriggeredAbilityImpl {
}
public DiesAttachedTriggeredAbility(Effect effect, String attachedDescription, boolean optional, boolean diesRuleText) {
super(Zone.BATTLEFIELD, effect, optional);
super(Zone.ALL, effect, optional); // because the trigger only triggers if the object was attached, it doesn't matter where the Attachment was moved to (e.g. by replacement effect) after the trigger triggered, so Zone.all
this.attachedDescription = attachedDescription;
this.diesRuleText = diesRuleText;
}
@ -51,10 +51,10 @@ public class DiesAttachedTriggeredAbility extends TriggeredAbilityImpl {
@Override
public boolean checkTrigger(GameEvent event, Game game) {
if (((ZoneChangeEvent)event).isDiesEvent()) {
Permanent p = (Permanent) game.getLastKnownInformation(event.getTargetId(), Zone.BATTLEFIELD);
if (p.getAttachments().contains(this.getSourceId())) {
ZoneChangeEvent zEvent = (ZoneChangeEvent) event;
if (zEvent.getTarget().getAttachments().contains(this.getSourceId())) {
for (Effect effect : getEffects()) {
effect.setValue("attachedTo", p);
effect.setValue("attachedTo", zEvent.getTarget());
}
return true;
}

4
Mage/src/mage/abilities/common/DiesCreatureTriggeredAbility.java
View file

@ -8,7 +8,6 @@ import mage.filter.predicate.permanent.AnotherPredicate;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.events.ZoneChangeEvent;
import mage.game.permanent.Permanent;
import mage.target.targetpointer.FixedTarget;
/**
@ -64,8 +63,7 @@ public class DiesCreatureTriggeredAbility extends TriggeredAbilityImpl {
public boolean checkTrigger(GameEvent event, Game game) {
ZoneChangeEvent zEvent = (ZoneChangeEvent) event;
if (zEvent.getFromZone().equals(Zone.BATTLEFIELD) && zEvent.getToZone().equals(Zone.GRAVEYARD)) {
Permanent permanent = (Permanent) game.getLastKnownInformation(event.getTargetId(), Zone.BATTLEFIELD);
if (permanent != null && filter.match(permanent, sourceId, controllerId, game)) {
if (filter.match(zEvent.getTarget(), sourceId, controllerId, game)) {
if (setTargetPointer) {
for (Effect effect : this.getEffects()) {
effect.setTargetPointer(new FixedTarget(event.getTargetId()));

2
Mage/src/mage/abilities/common/DiesTriggeredAbility.java
View file

@ -57,7 +57,7 @@ public class DiesTriggeredAbility extends ZoneChangeTriggeredAbility {
@Override
public boolean isInUseableZone(Game game, MageObject source, GameEvent event) {
// check it was previously on battlefield
Permanent before = (Permanent) game.getLastKnownInformation(sourceId, Zone.BATTLEFIELD);
Permanent before = ((ZoneChangeEvent) event).getTarget();
// check now it is in graveyard
Zone after = game.getState().getZone(sourceId);
return before != null && after != null && Zone.GRAVEYARD.match(after);

8
Mage/src/mage/game/GameImpl.java
View file

@ -684,8 +684,9 @@ public abstract class GameImpl implements Game, Serializable {
if (extraPlayer != null && extraPlayer.isInGame()) {
state.setExtraTurn(true);
state.setTurnId(extraTurn.getId());
if (!this.isSimulation())
if (!this.isSimulation()) {
informPlayers(extraPlayer.getName() + " takes an extra turn");
}
playTurn(extraPlayer);
state.setTurnNum(state.getTurnNum() + 1);
}
@ -1705,9 +1706,10 @@ public abstract class GameImpl implements Game, Serializable {
private boolean movePermanentToGraveyardWithInfo(Permanent permanent) {
boolean result = false;
if (permanent.moveToZone(Zone.GRAVEYARD, null, this, false)) {
if (!this.isSimulation())
if (!this.isSimulation()) {
this.informPlayers(new StringBuilder(permanent.getLogName())
.append(" is put into graveyard from battlefield").toString());
.append(" is put into graveyard from battlefield").toString());
}
result = true;
}
return result;

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

@ -262,6 +262,11 @@ public abstract class PermanentImpl extends CardImpl implements Permanent {
throw new UnsupportedOperationException("Unsupported operation: use addAbility(Ability ability, Game game) instead");
}
/**
*
* @param ability
* @param game
*/
@Override
public void addAbility(Ability ability, Game game) {
if (!abilities.containsKey(ability.getId())) {

4
Mage/src/mage/game/permanent/PermanentToken.java
View file

@ -95,8 +95,8 @@ public class PermanentToken extends PermanentImpl {
game.rememberLKI(objectId, Zone.BATTLEFIELD, this);
if (game.getPlayer(controllerId).removeFromBattlefield(this, game)) {
game.setZone(objectId, zone); // needed for triggered dies abilities
game.fireEvent(new ZoneChangeEvent(this, this.getControllerId(), Zone.BATTLEFIELD, zone));
game.getState().removeTriggersOfSourceId(this.getId());// if token is gone endless triggered abilities have to be removed
game.addSimultaneousEvent(new ZoneChangeEvent(this, this.getControllerId(), Zone.BATTLEFIELD, zone)); // causes maybe a problem with Dies trigger of Tokens
// game.getState().removeTriggersOfSourceId(this.getId());// if token is gone endless triggered abilities have to be removed
return true;
}
}

1
Mage/src/mage/game/stack/Spell.java
View file

@ -198,6 +198,7 @@ public class Spell implements StackObject, Card {
result |= spellAbility.resolve(game);
}
}
game.getState().handleSimultaneousEvent(game);
game.resetShortLivingLKI();
index++;
}