External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-26 05:22:02 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

[BOK] reworked implementation of Shirei, Shizo's Caretaker and added test

Browse source
This commit is contained in:
Evan Kranzler 2022-02-24 17:25:17 -05:00
parent 2a00609918
commit 3cbfe4d623
13 changed files with 140 additions and 176 deletions
Download patch file Download diff file Expand all files Collapse all files

66
Mage/src/main/java/mage/abilities/common/delayed/AtTheBeginOfNextEndStepDelayedTriggeredAbility.java
View file

@ -1,4 +1,3 @@
package mage.abilities.common.delayed;
import mage.abilities.DelayedTriggeredAbility;
@ -6,34 +5,32 @@ import mage.abilities.condition.Condition;
import mage.abilities.effects.Effect;
import mage.constants.Duration;
import mage.constants.TargetController;
import mage.constants.Zone;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.permanent.Permanent;
/**
*
* @author North
*/
public class AtTheBeginOfNextEndStepDelayedTriggeredAbility extends DelayedTriggeredAbility {
private TargetController targetController;
private Condition condition;
private final TargetController targetController;
private final Condition condition;
public AtTheBeginOfNextEndStepDelayedTriggeredAbility(Effect effect) {
this(effect, TargetController.ANY);
}
public AtTheBeginOfNextEndStepDelayedTriggeredAbility(Effect effect, TargetController targetController) {
this(Zone.ALL, effect, targetController);
this(effect, targetController, null);
}
public AtTheBeginOfNextEndStepDelayedTriggeredAbility(Zone zone, Effect effect, TargetController targetController) {
this(zone, effect, targetController, null);
public AtTheBeginOfNextEndStepDelayedTriggeredAbility(Effect effect, TargetController targetController, Condition condition) {
this(effect, targetController, condition, false);
}
public AtTheBeginOfNextEndStepDelayedTriggeredAbility(Zone zone, Effect effect, TargetController targetController, Condition condition) {
super(effect, Duration.Custom);
public AtTheBeginOfNextEndStepDelayedTriggeredAbility(Effect effect, TargetController targetController, Condition condition, boolean optional) {
super(effect, Duration.Custom, true, optional);
this.zone = zone;
this.targetController = targetController;
this.condition = condition;
@ -52,32 +49,33 @@ public class AtTheBeginOfNextEndStepDelayedTriggeredAbility extends DelayedTrigg
@Override
public boolean checkTrigger(GameEvent event, Game game) {
boolean correctEndPhase = false;
switch (targetController) {
case ANY:
correctEndPhase = true;
break;
case YOU:
correctEndPhase = event.getPlayerId().equals(this.controllerId);
if (!isControlledBy(event.getPlayerId())) {
return false;
}
break;
case OPPONENT:
if (game.getPlayer(this.getControllerId()).hasOpponent(event.getPlayerId(), game)) {
correctEndPhase = true;
if (!game.getOpponents(this.getControllerId()).contains(event.getPlayerId())) {
return false;
}
break;
case CONTROLLER_ATTACHED_TO:
Permanent attachment = game.getPermanent(sourceId);
if (attachment != null && attachment.getAttachedTo() != null) {
Permanent attachedTo = game.getPermanent(attachment.getAttachedTo());
if (attachedTo != null && attachedTo.isControlledBy(event.getPlayerId())) {
correctEndPhase = true;
}
Permanent attachment = game.getPermanent(getSourceId());
if (attachment == null || attachment.getAttachedTo() == null) {
return false;
}
Permanent attachedTo = game.getPermanent(attachment.getAttachedTo());
if (attachedTo == null || !attachedTo.isControlledBy(event.getPlayerId())) {
return false;
}
break;
default:
throw new UnsupportedOperationException("TargetController not supported");
}
if (correctEndPhase) {
return !(condition != null && !condition.apply(game, this));
}
return false;
return condition == null || condition.apply(game, this);
}
@Override
@ -86,23 +84,17 @@ public class AtTheBeginOfNextEndStepDelayedTriggeredAbility extends DelayedTrigg
}
@Override
public String getRule() {
StringBuilder sb = new StringBuilder();
public String getTriggerPhrase() {
switch (targetController) {
case YOU:
sb.append("At the beginning of your next end step, ");
break;
return "At the beginning of your next end step, ";
case OPPONENT:
sb.append("At the beginning of an opponent's next end step, ");
break;
return "At the beginning of an opponent's next end step, ";
case ANY:
sb.append("At the beginning of the next end step, ");
break;
return "At the beginning of the next end step, ";
case CONTROLLER_ATTACHED_TO:
sb.append("At the beginning of the next end step of enchanted creature's controller, ");
break;
return "At the beginning of the next end step of enchanted creature's controller, ";
}
sb.append(getEffects().getText(modes.getMode()));
return sb.toString();
throw new UnsupportedOperationException("TargetController not supported");
}
}

9
Mage/src/main/java/mage/abilities/condition/common/SourceOnBattlefieldCondition.java
View file

@ -1,11 +1,9 @@
package mage.abilities.condition.common;
import mage.abilities.Ability;
import mage.abilities.condition.Condition;
import mage.game.Game;
/**
* As long as the sourceId permanent is
* on the battlefield, the condition is true.
@ -13,18 +11,15 @@ import mage.game.Game;
* @author LevelX2
*/
public enum SourceOnBattlefieldCondition implements Condition {
instance;
@Override
public boolean apply(Game game, Ability source) {
return (game.getPermanent(source.getSourceId()) != null);
return source.getSourcePermanentIfItStillExists(game) != null;
}
@Override
public String toString() {
return "if {this} is on the battlefield";
}
}

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

@ -48,9 +48,7 @@ public class CreateDelayedTriggeredAbilityEffect extends OneShotEffect {
DelayedTriggeredAbility delayedAbility = ability.copy();
if (this.copyTargets) {
if (source.getTargets().isEmpty()) {
for (Effect effect : delayedAbility.getEffects()) {
effect.setTargetPointer(targetPointer);
}
delayedAbility.getEffects().setTargetPointer(targetPointer);
} else {
delayedAbility.getTargets().addAll(source.getTargets());
for (Effect effect : delayedAbility.getEffects()) {

2
Mage/src/main/java/mage/game/command/emblems/DarettiScrapSavantEmblem.java
View file

@ -93,7 +93,7 @@ class DarettiScrapSavantEffect extends OneShotEffect {
Effect effect = new ReturnFromGraveyardToBattlefieldTargetEffect();
effect.setTargetPointer(new FixedTarget(card, game));
effect.setText("return that card to the battlefield at the beginning of the next end step");
game.addDelayedTriggeredAbility(new AtTheBeginOfNextEndStepDelayedTriggeredAbility(Zone.COMMAND, effect, TargetController.ANY), source);
game.addDelayedTriggeredAbility(new AtTheBeginOfNextEndStepDelayedTriggeredAbility(effect, TargetController.ANY), source);
return true;
}
return false;

2
Mage/src/main/java/mage/game/command/emblems/LilianaDefiantNecromancerEmblem.java
View file

@ -53,7 +53,7 @@ class LilianaDefiantNecromancerEmblemEffect extends OneShotEffect {
Effect effect = new ReturnFromGraveyardToBattlefieldTargetEffect();
effect.setTargetPointer(new FixedTarget(card, game));
effect.setText("return that card to the battlefield at the beginning of the next end step");
game.addDelayedTriggeredAbility(new AtTheBeginOfNextEndStepDelayedTriggeredAbility(Zone.COMMAND, effect, TargetController.ANY), source);
game.addDelayedTriggeredAbility(new AtTheBeginOfNextEndStepDelayedTriggeredAbility(effect, TargetController.ANY), source);
return true;
}
return false;