diff --git a/Mage.Sets/src/mage/cards/d/DivineVisitation.java b/Mage.Sets/src/mage/cards/d/DivineVisitation.java index f7914a8e972..a503985c70b 100644 --- a/Mage.Sets/src/mage/cards/d/DivineVisitation.java +++ b/Mage.Sets/src/mage/cards/d/DivineVisitation.java @@ -12,6 +12,7 @@ import mage.constants.Duration; import mage.constants.Outcome; import mage.constants.Zone; import mage.game.Game; +import mage.game.events.CreateTokenEvent; import mage.game.events.EntersTheBattlefieldEvent; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -27,7 +28,6 @@ public final class DivineVisitation extends CardImpl { public DivineVisitation(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{W}{W}"); - // TODO: This implementation is not entirely correct, see https://twitter.com/EliShffrn/status/1042145606582591490 // If one or more creature tokens would be created under your control, that many 4/4 white Angel creature tokens with flying and vigilance are created instead. this.addAbility(new SimpleStaticAbility( Zone.BATTLEFIELD, new DivineVisitationEffect() @@ -59,21 +59,17 @@ class DivineVisitationEffect extends ReplacementEffectImpl { @Override public boolean checksEventType(GameEvent event, Game game) { - return event.getType() == GameEvent.EventType.ENTERS_THE_BATTLEFIELD; + return event.getType() == GameEvent.EventType.CREATE_TOKEN; } @Override public boolean applies(GameEvent event, Ability source, Game game) { - Permanent perm = ((EntersTheBattlefieldEvent) event).getTarget(); - return perm != null - && perm.isCreature() - && perm instanceof PermanentToken - && perm.isControlledBy(source.getControllerId()); + return event.getPlayerId().equals(source.getControllerId()); } @Override public boolean replaceEvent(GameEvent event, Ability source, Game game) { - game.addEffect(new CopyEffect(Duration.Custom, new AngelVigilanceToken(), event.getTargetId()), source); + ((CreateTokenEvent) event).setToken(new AngelVigilanceToken()); return false; } diff --git a/Mage.Sets/src/mage/cards/g/GatherSpecimens.java b/Mage.Sets/src/mage/cards/g/GatherSpecimens.java index 9efc66b27bd..241e028bce9 100644 --- a/Mage.Sets/src/mage/cards/g/GatherSpecimens.java +++ b/Mage.Sets/src/mage/cards/g/GatherSpecimens.java @@ -10,6 +10,7 @@ import mage.constants.Duration; import mage.constants.Outcome; import mage.constants.Zone; import mage.game.Game; +import mage.game.events.CreateTokenEvent; import mage.game.events.GameEvent; import mage.game.events.ZoneChangeEvent; import mage.players.Player; @@ -76,7 +77,7 @@ class GatherSpecimensReplacementEffect extends ReplacementEffectImpl { } } } - if (event.getType() == GameEvent.EventType.CREATE_TOKEN && event.getFlag()) { // flag indicates if it's a creature token + if (event.getType() == GameEvent.EventType.CREATE_TOKEN && ((CreateTokenEvent) event).getToken().isCreature()) { Player controller = game.getPlayer(source.getControllerId()); return controller != null && controller.hasOpponent(event.getPlayerId(), game); } diff --git a/Mage/src/main/java/mage/game/events/CreateTokenEvent.java b/Mage/src/main/java/mage/game/events/CreateTokenEvent.java new file mode 100644 index 00000000000..1e5022a3efe --- /dev/null +++ b/Mage/src/main/java/mage/game/events/CreateTokenEvent.java @@ -0,0 +1,23 @@ +package mage.game.events; + +import mage.game.Game; +import mage.game.permanent.token.Token; + +import java.util.UUID; + +public class CreateTokenEvent extends GameEvent { + private Token token; + + public CreateTokenEvent(UUID sourceId, UUID controllerId, int amount, Token token) { + super(EventType.CREATE_TOKEN, null, sourceId, controllerId, amount, false); + this.token = token; + } + + public Token getToken() { + return token; + } + + public void setToken(Token token) { + this.token = token; + } +} diff --git a/Mage/src/main/java/mage/game/permanent/token/TokenImpl.java b/Mage/src/main/java/mage/game/permanent/token/TokenImpl.java index 222b063c816..38c814c2b62 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TokenImpl.java +++ b/Mage/src/main/java/mage/game/permanent/token/TokenImpl.java @@ -2,10 +2,12 @@ package mage.game.permanent.token; import mage.MageObject; import mage.MageObjectImpl; +import mage.MageObjectReference; import mage.abilities.Ability; import mage.cards.Card; import mage.constants.Zone; import mage.game.Game; +import mage.game.events.CreateTokenEvent; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.game.events.ZoneChangeEvent; @@ -31,7 +33,7 @@ public abstract class TokenImpl extends MageObjectImpl implements Token { private boolean expansionSetCodeChecked; private Card copySourceCard; // the card the Token is a copy from - // list of set codes tokene images are available for + // list of set codes token images are available for protected List availableImageSetCodes = new ArrayList<>(); public enum Type { @@ -131,14 +133,7 @@ public abstract class TokenImpl extends MageObjectImpl implements Token { return putOntoBattlefield(amount, game, sourceId, controllerId, tapped, attacking, null); } - @Override - public boolean putOntoBattlefield(int amount, Game game, UUID sourceId, UUID controllerId, boolean tapped, boolean attacking, UUID attackedPlayer) { - Player controller = game.getPlayer(controllerId); - if (controller == null) { - return false; - } - lastAddedTokenIds.clear(); - + private String getSetCode(Game game, UUID sourceId) { // moved here from CreateTokenEffect because not all cards that create tokens use CreateTokenEffect // they use putOntoBattlefield directly // TODO: Check this setCode handling because it makes no sense if token put into play with e.g. "Feldon of the third Path" @@ -156,55 +151,76 @@ public abstract class TokenImpl extends MageObjectImpl implements Token { } } } + if (!expansionSetCodeChecked) { expansionSetCodeChecked = this.updateExpansionSetCode(setCode); } + return setCode; + } - GameEvent event = new GameEvent(EventType.CREATE_TOKEN, null, sourceId, controllerId, amount, this.isCreature()); + @Override + public boolean putOntoBattlefield(int amount, Game game, UUID sourceId, UUID controllerId, boolean tapped, boolean attacking, UUID attackedPlayer) { + Player controller = game.getPlayer(controllerId); + if (controller == null) { + return false; + } + lastAddedTokenIds.clear(); + + CreateTokenEvent event = new CreateTokenEvent(sourceId, controllerId, amount, this); if (!game.replaceEvent(event)) { - amount = event.getAmount(); - - List permanents = new ArrayList<>(); - List permanentsEntered = new ArrayList<>(); - - for (int i = 0; i < amount; i++) { - PermanentToken newToken = new PermanentToken(this, event.getPlayerId(), setCode, game); // use event.getPlayerId() because it can be replaced by replacement effect - game.getState().addCard(newToken); - permanents.add(newToken); - game.getPermanentsEntering().put(newToken.getId(), newToken); - newToken.setTapped(tapped); - } - game.setScopeRelevant(true); - for (Permanent permanent : permanents) { - if (permanent.entersBattlefield(sourceId, game, Zone.OUTSIDE, true)) { - permanentsEntered.add(permanent); - } else { - game.getPermanentsEntering().remove(permanent.getId()); - } - } - game.setScopeRelevant(false); - for (Permanent permanent : permanentsEntered) { - game.addPermanent(permanent); - permanent.setZone(Zone.BATTLEFIELD, game); - game.getPermanentsEntering().remove(permanent.getId()); - - this.lastAddedTokenIds.add(permanent.getId()); - this.lastAddedTokenId = permanent.getId(); - game.addSimultaneousEvent(new ZoneChangeEvent(permanent, permanent.getControllerId(), Zone.OUTSIDE, Zone.BATTLEFIELD)); - if (attacking && game.getCombat() != null && game.getActivePlayerId().equals(permanent.getControllerId())) { - game.getCombat().addAttackingCreature(permanent.getId(), game, attackedPlayer); - } - if (!game.isSimulation()) { - game.informPlayers(controller.getLogName() + " creates a " + permanent.getLogName() + " token"); - } - - } - game.getState().applyEffects(game); // Needed to do it here without LKIReset i.e. do get SwordOfTheMeekTest running correctly. + putOntoBattlefieldHelper(event, game, tapped, attacking, attackedPlayer); return true; } return false; } + private static void putOntoBattlefieldHelper(CreateTokenEvent event, Game game, boolean tapped, boolean attacking, UUID attackedPlayer) { + Player controller = game.getPlayer(event.getPlayerId()); + Token token = event.getToken(); + int amount = event.getAmount(); + + List permanents = new ArrayList<>(); + List permanentsEntered = new ArrayList<>(); + + String setCode = token instanceof TokenImpl ? ((TokenImpl) token).getSetCode(game, event.getSourceId()) : null; + + for (int i = 0; i < amount; i++) { + PermanentToken newToken = new PermanentToken(token, event.getPlayerId(), setCode, game); // use event.getPlayerId() because it can be replaced by replacement effect + game.getState().addCard(newToken); + permanents.add(newToken); + game.getPermanentsEntering().put(newToken.getId(), newToken); + newToken.setTapped(tapped); + } + game.setScopeRelevant(true); + for (Permanent permanent : permanents) { + if (permanent.entersBattlefield(event.getSourceId(), game, Zone.OUTSIDE, true)) { + permanentsEntered.add(permanent); + } else { + game.getPermanentsEntering().remove(permanent.getId()); + } + } + game.setScopeRelevant(false); + for (Permanent permanent : permanentsEntered) { + game.addPermanent(permanent); + permanent.setZone(Zone.BATTLEFIELD, game); + game.getPermanentsEntering().remove(permanent.getId()); + + if (token instanceof TokenImpl) { + ((TokenImpl) token).lastAddedTokenIds.add(permanent.getId()); + ((TokenImpl) token).lastAddedTokenId = permanent.getId(); + } + game.addSimultaneousEvent(new ZoneChangeEvent(permanent, permanent.getControllerId(), Zone.OUTSIDE, Zone.BATTLEFIELD)); + if (attacking && game.getCombat() != null && game.getActivePlayerId().equals(permanent.getControllerId())) { + game.getCombat().addAttackingCreature(permanent.getId(), game, attackedPlayer); + } + if (!game.isSimulation()) { + game.informPlayers(controller.getLogName() + " creates a " + permanent.getLogName() + " token"); + } + + } + game.getState().applyEffects(game); // Needed to do it here without LKIReset i.e. do get SwordOfTheMeekTest running correctly. + } + @Override public void setPower(int power) { this.power.setValue(power);