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

refactor: common logic for "at..." triggered abilities (#13045)

Browse source 
* add new common framework for at step triggered abilities

* move postcombat main and second main triggers to it

* update draw step triggers

* refactor BeginningOfCombatTriggeredAbility

* refactor BeginningOfFirstMainTriggeredAbility

* move Pronoun to constants package

* cleanup some cards to use simpler constructors

* package reorganization
This commit is contained in:
xenohedron 2024-10-27 21:03:40 -04:00 • committed by GitHub
parent c9cc398b48
commit eee0fee79e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
329 changed files with 1149 additions and 1331 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Mage/src/main/java/mage/abilities/abilityword/SurvivalAbility.java
View file

@ -1,10 +1,8 @@
package mage.abilities.abilityword;
import mage.abilities.common.BeginningOfSecondMainTriggeredAbility;
import mage.abilities.effects.Effect;
import mage.abilities.triggers.BeginningOfSecondMainTriggeredAbility;
import mage.constants.AbilityWord;
import mage.constants.TargetController;
import mage.constants.Zone;
import mage.game.Game;
import mage.game.permanent.Permanent;
@ -20,7 +18,7 @@ public class SurvivalAbility extends BeginningOfSecondMainTriggeredAbility {
}
public SurvivalAbility(Effect effect, boolean optional) {
super(Zone.BATTLEFIELD, effect, TargetController.YOU, optional, false);
super(effect, optional);
setTriggerPhrase("At the beginning of your second main phase, if {this} is tapped, ");
setAbilityWord(AbilityWord.SURVIVAL);
}

92
Mage/src/main/java/mage/abilities/common/BeginningOfCombatTriggeredAbility.java
View file

@ -1,92 +0,0 @@
package mage.abilities.common;
import mage.abilities.TriggeredAbilityImpl;
import mage.abilities.effects.Effect;
import mage.constants.TargetController;
import mage.constants.Zone;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.target.targetpointer.FixedTarget;
public class BeginningOfCombatTriggeredAbility extends TriggeredAbilityImpl {
private final TargetController targetController;
private final boolean setTargetPointer;
public BeginningOfCombatTriggeredAbility(Effect effect, TargetController targetController, boolean isOptional) {
this(Zone.BATTLEFIELD, effect, targetController, isOptional, false);
}
public BeginningOfCombatTriggeredAbility(Zone zone, Effect effect, TargetController targetController, boolean isOptional, boolean setTargetPointer) {
super(zone, effect, isOptional);
this.targetController = targetController;
this.setTargetPointer = setTargetPointer;
setTriggerPhrase(generateTriggerPhrase());
}
protected BeginningOfCombatTriggeredAbility(final BeginningOfCombatTriggeredAbility ability) {
super(ability);
this.targetController = ability.targetController;
this.setTargetPointer = ability.setTargetPointer;
}
@Override
public BeginningOfCombatTriggeredAbility copy() {
return new BeginningOfCombatTriggeredAbility(this);
}
@Override
public boolean checkEventType(GameEvent event, Game game) {
return event.getType() == GameEvent.EventType.BEGIN_COMBAT_STEP_PRE;
}
@Override
public boolean checkTrigger(GameEvent event, Game game) {
switch (targetController) {
case YOU:
boolean yours = event.getPlayerId().equals(this.controllerId);
if (yours && setTargetPointer) {
if (getTargets().isEmpty()) {
this.getEffects().forEach(effect -> {
effect.setTargetPointer(new FixedTarget(event.getPlayerId()));
});
}
}
return yours;
case OPPONENT:
if (game.getPlayer(this.controllerId).hasOpponent(event.getPlayerId(), game)) {
if (setTargetPointer) {
this.getEffects().forEach(effect -> {
effect.setTargetPointer(new FixedTarget(event.getPlayerId()));
});
}
return true;
}
break;
case EACH_PLAYER:
case ANY:
if (setTargetPointer) {
this.getEffects().forEach(effect -> {
effect.setTargetPointer(new FixedTarget(event.getPlayerId()));
});
}
return true;
}
return false;
}
private String generateTriggerPhrase() {
switch (targetController) {
case YOU:
return "At the beginning of combat on your turn, ";
case OPPONENT:
return "At the beginning of combat on each opponent's turn, ";
case EACH_PLAYER:
return "At the beginning of combat on each player's turn, ";
case ANY:
return "At the beginning of each combat, ";
}
return "";
}
}

120
Mage/src/main/java/mage/abilities/common/BeginningOfDrawTriggeredAbility.java
View file

@ -1,120 +0,0 @@
package mage.abilities.common;
import mage.abilities.TriggeredAbilityImpl;
import mage.abilities.effects.Effect;
import mage.constants.TargetController;
import mage.constants.Zone;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.permanent.Permanent;
import mage.target.targetpointer.FixedTarget;
public class BeginningOfDrawTriggeredAbility extends TriggeredAbilityImpl {
private final TargetController targetController;
/**
* The Ability sets if no target is defined the target pointer to the active
* player of the current draw phase
*/
public BeginningOfDrawTriggeredAbility(Effect effect, TargetController targetController, boolean isOptional) {
this(Zone.BATTLEFIELD, effect, targetController, isOptional);
}
public BeginningOfDrawTriggeredAbility(Zone zone, Effect effect, TargetController targetController, boolean isOptional) {
super(zone, effect, isOptional);
this.targetController = targetController;
setTriggerPhrase(generateTriggerPhrase());
}
protected BeginningOfDrawTriggeredAbility(final BeginningOfDrawTriggeredAbility ability) {
super(ability);
this.targetController = ability.targetController;
}
@Override
public BeginningOfDrawTriggeredAbility copy() {
return new BeginningOfDrawTriggeredAbility(this);
}
@Override
public boolean checkEventType(GameEvent event, Game game) {
return event.getType() == GameEvent.EventType.DRAW_STEP_PRE;
}
@Override
public boolean checkTrigger(GameEvent event, Game game) {
switch (targetController) {
case YOU:
boolean yours = event.getPlayerId().equals(this.controllerId);
if (yours && getTargets().isEmpty()) {
this.getEffects().setTargetPointer(new FixedTarget(event.getPlayerId()));
}
return yours;
case OPPONENT:
if (game.getPlayer(this.controllerId).hasOpponent(event.getPlayerId(), game)) {
if (getTargets().isEmpty()) {
this.getEffects().setTargetPointer(new FixedTarget(event.getPlayerId()));
}
return true;
}
break;
case NOT_YOU:
if (!this.controllerId.equals(event.getPlayerId())) {
if (getTargets().isEmpty()) {
this.getEffects().setTargetPointer(new FixedTarget(event.getPlayerId()));
}
return true;
}
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())) {
if (getTargets().isEmpty()) {
this.getEffects().setTargetPointer(new FixedTarget(event.getPlayerId()));
}
return true;
}
}
break;
case ENCHANTED:
Permanent permanent = getSourcePermanentIfItStillExists(game);
if (permanent == null || !game.isActivePlayer(permanent.getAttachedTo())) {
break;
}
if (getTargets().isEmpty()) {
this.getEffects().setTargetPointer(new FixedTarget(event.getPlayerId()));
}
return true;
case ANY:
case ACTIVE:
if (getTargets().isEmpty()) {
this.getEffects().setTargetPointer(new FixedTarget(event.getPlayerId()));
}
return true;
}
return false;
}
private String generateTriggerPhrase() {
switch (targetController) {
case ACTIVE:
case YOU:
return "At the beginning of your draw step, ";
case OPPONENT:
return "At the beginning of each opponent's draw step, ";
case NOT_YOU:
return "At the beginning of each other player's draw step, ";
case ANY:
return "At the beginning of each player's draw step, ";
case CONTROLLER_ATTACHED_TO:
return "At the beginning of the draw step of enchanted creature's controller, ";
case ENCHANTED:
return "At the beginning of enchanted player's draw step, ";
}
return "";
}
}

93
Mage/src/main/java/mage/abilities/common/BeginningOfFirstMainTriggeredAbility.java
View file

@ -1,93 +0,0 @@
package mage.abilities.common;
import mage.abilities.TriggeredAbilityImpl;
import mage.abilities.effects.Effect;
import mage.constants.TargetController;
import mage.constants.Zone;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.target.targetpointer.FixedTarget;
/**
* @author LevelX2
*/
public class BeginningOfFirstMainTriggeredAbility extends TriggeredAbilityImpl {
private final TargetController targetController;
private final boolean setTargetPointer;
public BeginningOfFirstMainTriggeredAbility(Effect effect, TargetController targetController, boolean isOptional) {
this(Zone.BATTLEFIELD, effect, targetController, isOptional, false);
}
public BeginningOfFirstMainTriggeredAbility(Zone zone, Effect effect, TargetController targetController, boolean isOptional, boolean setTargetPointer) {
super(zone, effect, isOptional);
this.targetController = targetController;
this.setTargetPointer = setTargetPointer;
setTriggerPhrase(generateTriggerPhrase());
}
protected BeginningOfFirstMainTriggeredAbility(final BeginningOfFirstMainTriggeredAbility ability) {
super(ability);
this.targetController = ability.targetController;
this.setTargetPointer = ability.setTargetPointer;
}
@Override
public BeginningOfFirstMainTriggeredAbility copy() {
return new BeginningOfFirstMainTriggeredAbility(this);
}
@Override
public boolean checkEventType(GameEvent event, Game game) {
return event.getType() == GameEvent.EventType.PRECOMBAT_MAIN_PHASE_PRE;
}
@Override
public boolean checkTrigger(GameEvent event, Game game) {
switch (targetController) {
case YOU:
boolean yours = event.getPlayerId().equals(this.controllerId);
if (yours && setTargetPointer) {
if (getTargets().isEmpty()) {
for (Effect effect : this.getEffects()) {
effect.setTargetPointer(new FixedTarget(event.getPlayerId()));
}
}
}
return yours;
case OPPONENT:
if (game.getPlayer(this.controllerId).hasOpponent(event.getPlayerId(), game)) {
if (setTargetPointer) {
for (Effect effect : this.getEffects()) {
effect.setTargetPointer(new FixedTarget(event.getPlayerId()));
}
}
return true;
}
break;
case ANY:
if (setTargetPointer) {
for (Effect effect : this.getEffects()) {
effect.setTargetPointer(new FixedTarget(event.getPlayerId()));
}
}
return true;
}
return false;
}
private String generateTriggerPhrase() {
switch (targetController) {
case YOU:
return "At the beginning of your first main phase, ";
case OPPONENT:
return "At the beginning of each opponent's first main phase, ";
case ANY:
return "At the beginning of each player's first main phase, ";
}
return "";
}
}

104
Mage/src/main/java/mage/abilities/common/BeginningOfPostCombatMainTriggeredAbility.java
View file

@ -1,104 +0,0 @@
package mage.abilities.common;
import mage.abilities.TriggeredAbilityImpl;
import mage.abilities.effects.Effect;
import mage.constants.TargetController;
import mage.constants.Zone;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.permanent.Permanent;
import mage.target.targetpointer.FixedTarget;
/**
* @author LevelX2
*/
public class BeginningOfPostCombatMainTriggeredAbility extends TriggeredAbilityImpl {
private final TargetController targetController;
private final boolean setTargetPointer;
public BeginningOfPostCombatMainTriggeredAbility(Effect effect, TargetController targetController, boolean isOptional) {
this(Zone.BATTLEFIELD, effect, targetController, isOptional, false);
}
public BeginningOfPostCombatMainTriggeredAbility(Zone zone, Effect effect, TargetController targetController, boolean isOptional, boolean setTargetPointer) {
super(zone, effect, isOptional);
this.targetController = targetController;
this.setTargetPointer = setTargetPointer;
setTriggerPhrase(generateTriggerPhrase());
}
protected BeginningOfPostCombatMainTriggeredAbility(final BeginningOfPostCombatMainTriggeredAbility ability) {
super(ability);
this.targetController = ability.targetController;
this.setTargetPointer = ability.setTargetPointer;
}
@Override
public BeginningOfPostCombatMainTriggeredAbility copy() {
return new BeginningOfPostCombatMainTriggeredAbility(this);
}
@Override
public boolean checkEventType(GameEvent event, Game game) {
return event.getType() == GameEvent.EventType.POSTCOMBAT_MAIN_PHASE_PRE;
}
@Override
public boolean checkTrigger(GameEvent event, Game game) {
switch (targetController) {
case YOU:
if (!isControlledBy(event.getPlayerId())) {
return false;
}
if (setTargetPointer && getTargets().isEmpty()) {
for (Effect effect : this.getEffects()) {
effect.setTargetPointer(new FixedTarget(event.getPlayerId()));
}
}
return true;
case OPPONENT:
if (!game.getOpponents(this.controllerId).contains(event.getPlayerId())) {
return false;
}
if (setTargetPointer) {
for (Effect effect : this.getEffects()) {
effect.setTargetPointer(new FixedTarget(event.getPlayerId()));
}
}
return true;
case ANY:
if (setTargetPointer) {
for (Effect effect : this.getEffects()) {
effect.setTargetPointer(new FixedTarget(event.getPlayerId()));
}
}
return true;
case ENCHANTED:
Permanent permanent = getSourcePermanentIfItStillExists(game);
if (permanent == null || !game.isActivePlayer(permanent.getAttachedTo())) {
return false;
}
if (getTargets().isEmpty()) {
this.getEffects().setTargetPointer(new FixedTarget(event.getPlayerId()));
}
return true;
}
return false;
}
private String generateTriggerPhrase() {
switch (targetController) {
case YOU:
return "At the beginning of each of your postcombat main phases, ";
case OPPONENT:
return "At the beginning of each of your opponent's postcombat main phases, ";
case ANY:
return "At the beginning of each postcombat main phase, ";
case ENCHANTED:
return "At the beginning of each of enchanted player's postcombat main phases, ";
}
return "";
}
}

146
Mage/src/main/java/mage/abilities/common/BeginningOfSecondMainTriggeredAbility.java
View file

@ -1,146 +0,0 @@
package mage.abilities.common;
import mage.abilities.TriggeredAbilityImpl;
import mage.abilities.effects.Effect;
import mage.constants.TargetController;
import mage.constants.WatcherScope;
import mage.constants.Zone;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.permanent.Permanent;
import mage.target.targetpointer.FixedTarget;
import mage.watchers.Watcher;
/**
* @author TheElk801
*/
public class BeginningOfSecondMainTriggeredAbility extends TriggeredAbilityImpl {
private final TargetController targetController;
private final boolean setTargetPointer;
public BeginningOfSecondMainTriggeredAbility(Effect effect, TargetController targetController, boolean isOptional) {
this(Zone.BATTLEFIELD, effect, targetController, isOptional, false);
}
public BeginningOfSecondMainTriggeredAbility(Zone zone, Effect effect, TargetController targetController, boolean isOptional, boolean setTargetPointer) {
super(zone, effect, isOptional);
this.targetController = targetController;
this.setTargetPointer = setTargetPointer;
setTriggerPhrase(generateTriggerPhrase());
this.addWatcher(new MainPhaseWatcher());
}
protected BeginningOfSecondMainTriggeredAbility(final BeginningOfSecondMainTriggeredAbility ability) {
super(ability);
this.targetController = ability.targetController;
this.setTargetPointer = ability.setTargetPointer;
}
@Override
public BeginningOfSecondMainTriggeredAbility copy() {
return new BeginningOfSecondMainTriggeredAbility(this);
}
@Override
public boolean checkEventType(GameEvent event, Game game) {
switch (event.getType()) {
case PRECOMBAT_MAIN_PHASE_PRE:
case POSTCOMBAT_MAIN_PHASE_PRE:
return true;
}
return false;
}
@Override
public boolean checkTrigger(GameEvent event, Game game) {
if (!MainPhaseWatcher.checkCount(game)) {
return false;
}
switch (targetController) {
case YOU:
if (!isControlledBy(event.getPlayerId())) {
return false;
}
if (setTargetPointer && getTargets().isEmpty()) {
for (Effect effect : this.getEffects()) {
effect.setTargetPointer(new FixedTarget(event.getPlayerId()));
}
}
return true;
case OPPONENT:
if (!game.getOpponents(this.controllerId).contains(event.getPlayerId())) {
return false;
}
if (setTargetPointer) {
for (Effect effect : this.getEffects()) {
effect.setTargetPointer(new FixedTarget(event.getPlayerId()));
}
}
return true;
case ANY:
if (setTargetPointer) {
for (Effect effect : this.getEffects()) {
effect.setTargetPointer(new FixedTarget(event.getPlayerId()));
}
}
return true;
case ENCHANTED:
Permanent permanent = getSourcePermanentIfItStillExists(game);
if (permanent == null || !game.isActivePlayer(permanent.getAttachedTo())) {
return false;
}
if (getTargets().isEmpty()) {
this.getEffects().setTargetPointer(new FixedTarget(event.getPlayerId()));
}
return true;
}
return false;
}
private String generateTriggerPhrase() {
switch (targetController) {
case YOU:
return "At the beginning of your second main phase, ";
case OPPONENT:
return "At the beginning of each opponent's second main phase, ";
case ANY:
return "At the beginning of each player's second main phase, ";
case ENCHANTED:
return "At the beginning of enchanted player's second main phase, ";
}
return "";
}
}
class MainPhaseWatcher extends Watcher {
private int mainPhaseCount = 0;
MainPhaseWatcher() {
super(WatcherScope.GAME);
}
@Override
public void watch(GameEvent event, Game game) {
switch (event.getType()) {
case PRECOMBAT_MAIN_PHASE_PRE:
case POSTCOMBAT_MAIN_PHASE_PRE:
mainPhaseCount++;
}
}
@Override
public void reset() {
super.reset();
this.mainPhaseCount = 0;
}
static boolean checkCount(Game game) {
return game
.getState()
.getWatcher(MainPhaseWatcher.class)
.mainPhaseCount == 2;
}
}

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

@ -2,7 +2,7 @@ package mage.abilities.effects.common;
import mage.abilities.Ability;
import mage.abilities.Mode;
import mage.abilities.Pronoun;
import mage.constants.Pronoun;
import mage.abilities.effects.ContinuousEffect;
import mage.abilities.effects.Effect;
import mage.abilities.effects.OneShotEffect;

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

@ -1,6 +1,6 @@
package mage.abilities.effects.common;
import mage.abilities.Pronoun;
import mage.constants.Pronoun;
import mage.constants.PutCards;
/**

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

@ -1,6 +1,6 @@
package mage.abilities.effects.common;
import mage.abilities.Pronoun;
import mage.constants.Pronoun;
import mage.constants.PutCards;
/**

95
Mage/src/main/java/mage/abilities/triggers/AtStepTriggeredAbility.java Normal file
View file

@ -0,0 +1,95 @@
package mage.abilities.triggers;
import mage.abilities.TriggeredAbilityImpl;
import mage.abilities.effects.Effect;
import mage.constants.TargetController;
import mage.constants.Zone;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.permanent.Permanent;
import mage.players.Player;
import mage.target.targetpointer.FixedTarget;
import java.util.UUID;
/**
* @author xenohedron
*/
public abstract class AtStepTriggeredAbility extends TriggeredAbilityImpl {
protected final TargetController targetController;
private Boolean setTargetPointer; // null for default behavior (set target pointer if no targets)
protected AtStepTriggeredAbility(Zone zone, TargetController targetController, Effect effect, boolean optional) {
super(zone, effect, optional);
this.targetController = targetController;
setTriggerPhrase(generateTriggerPhrase());
}
protected AtStepTriggeredAbility(final AtStepTriggeredAbility ability) {
super(ability);
this.targetController = ability.targetController;
this.setTargetPointer = ability.setTargetPointer;
}
// implementing classes must add copy constructor
// implementing classes must override checksEventType
@Override
public boolean checkTrigger(GameEvent event, Game game) {
if (checkTargetController(event, game)) {
setTargetPointerIfNeeded(event.getPlayerId());
return true;
}
return false;
}
private boolean checkTargetController(GameEvent event, Game game) {
switch (targetController) {
case YOU:
return isControlledBy(event.getPlayerId());
case NOT_YOU:
return !isControlledBy(event.getPlayerId());
case ANY:
case ACTIVE:
case NEXT:
case EACH_PLAYER:
return true;
case OPPONENT:
Player player = game.getPlayer(getControllerId());
return player != null && player.hasOpponent(event.getPlayerId(), game);
case ENCHANTED:
Permanent permanent = getSourcePermanentIfItStillExists(game);
return permanent != null && game.isActivePlayer(permanent.getAttachedTo());
case CONTROLLER_ATTACHED_TO:
Permanent attachment = getSourcePermanentIfItStillExists(game);
if (attachment == null) {
return false;
}
Permanent attachedTo = game.getPermanent(attachment.getAttachedTo());
return attachedTo != null && game.isActivePlayer(attachedTo.getControllerId());
case MONARCH:
return event.getPlayerId().equals(game.getMonarchId());
default:
throw new UnsupportedOperationException("Unsupported TargetController in AtStepTriggeredAbility: " + targetController);
}
}
/**
* In rare cases, if the default behavior (of setting the target pointer to the active player id
* if and only if there are no targets) is not adequate, manually specify whether target pointer should be set
*/
public AtStepTriggeredAbility withTargetPointerSet(boolean setTargetPointer) {
this.setTargetPointer = setTargetPointer;
return this;
}
private void setTargetPointerIfNeeded(UUID playerId) {
if (Boolean.TRUE.equals(setTargetPointer) || (setTargetPointer == null && getTargets().isEmpty())) {
this.getEffects().setTargetPointer(new FixedTarget(playerId));
}
}
protected abstract String generateTriggerPhrase();
}

56
Mage/src/main/java/mage/abilities/triggers/BeginningOfCombatTriggeredAbility.java Normal file
View file

@ -0,0 +1,56 @@
package mage.abilities.triggers;
import mage.abilities.effects.Effect;
import mage.constants.TargetController;
import mage.constants.Zone;
import mage.game.Game;
import mage.game.events.GameEvent;
public class BeginningOfCombatTriggeredAbility extends AtStepTriggeredAbility {
/**
* At the beginning of combat on your turn
*/
public BeginningOfCombatTriggeredAbility(Effect effect, boolean optional) {
this(TargetController.YOU, effect, optional);
}
public BeginningOfCombatTriggeredAbility(TargetController targetController, Effect effect, boolean optional) {
this(Zone.BATTLEFIELD, targetController, effect, optional);
}
public BeginningOfCombatTriggeredAbility(Zone zone, TargetController targetController, Effect effect, boolean optional) {
super(zone, targetController, effect, optional);
}
protected BeginningOfCombatTriggeredAbility(final BeginningOfCombatTriggeredAbility ability) {
super(ability);
}
@Override
public BeginningOfCombatTriggeredAbility copy() {
return new BeginningOfCombatTriggeredAbility(this);
}
@Override
public boolean checkEventType(GameEvent event, Game game) {
return event.getType() == GameEvent.EventType.BEGIN_COMBAT_STEP_PRE;
}
@Override
protected String generateTriggerPhrase() {
switch (targetController) {
case YOU:
return "At the beginning of combat on your turn, ";
case OPPONENT:
return "At the beginning of combat on each opponent's turn, ";
case EACH_PLAYER:
return "At the beginning of combat on each player's turn, ";
case ANY:
return "At the beginning of each combat, ";
default:
throw new UnsupportedOperationException("Unsupported TargetController in BeginningOfCombatTriggeredAbility: " + targetController);
}
}
}

60
Mage/src/main/java/mage/abilities/triggers/BeginningOfDrawTriggeredAbility.java Normal file
View file

@ -0,0 +1,60 @@
package mage.abilities.triggers;
import mage.abilities.effects.Effect;
import mage.constants.TargetController;
import mage.constants.Zone;
import mage.game.Game;
import mage.game.events.GameEvent;
public class BeginningOfDrawTriggeredAbility extends AtStepTriggeredAbility {
/**
* At the beginning of your draw step
*/
public BeginningOfDrawTriggeredAbility(Effect effect, boolean optional) {
this(TargetController.YOU, effect, optional);
}
public BeginningOfDrawTriggeredAbility(TargetController targetController, Effect effect, boolean optional) {
this(Zone.BATTLEFIELD, targetController, effect, optional);
}
public BeginningOfDrawTriggeredAbility(Zone zone, TargetController targetController, Effect effect, boolean optional) {
super(zone, targetController, effect, optional);
}
protected BeginningOfDrawTriggeredAbility(final BeginningOfDrawTriggeredAbility ability) {
super(ability);
}
@Override
public BeginningOfDrawTriggeredAbility copy() {
return new BeginningOfDrawTriggeredAbility(this);
}
@Override
public boolean checkEventType(GameEvent event, Game game) {
return event.getType() == GameEvent.EventType.DRAW_STEP_PRE;
}
@Override
protected String generateTriggerPhrase() {
switch (targetController) {
case YOU:
return "At the beginning of your draw step, ";
case OPPONENT:
return "At the beginning of each opponent's draw step, ";
case NOT_YOU:
return "At the beginning of each other player's draw step, ";
case EACH_PLAYER:
return "At the beginning of each player's draw step, ";
case CONTROLLER_ATTACHED_TO:
return "At the beginning of the draw step of enchanted creature's controller, ";
case ENCHANTED:
return "At the beginning of enchanted player's draw step, ";
default:
throw new UnsupportedOperationException("Unsupported TargetController in BeginningOfDrawTriggeredAbility: " + targetController);
}
}
}

55
Mage/src/main/java/mage/abilities/triggers/BeginningOfFirstMainTriggeredAbility.java Normal file
View file

@ -0,0 +1,55 @@
package mage.abilities.triggers;
import mage.abilities.effects.Effect;
import mage.constants.TargetController;
import mage.constants.Zone;
import mage.game.Game;
import mage.game.events.GameEvent;
/**
* @author LevelX2
*/
public class BeginningOfFirstMainTriggeredAbility extends AtStepTriggeredAbility {
/**
* At the beginning of your first main phase
*/
public BeginningOfFirstMainTriggeredAbility(Effect effect, boolean optional) {
this(TargetController.YOU, effect, optional);
}
public BeginningOfFirstMainTriggeredAbility(TargetController targetController, Effect effect, boolean optional) {
this(Zone.BATTLEFIELD, targetController, effect, optional);
}
public BeginningOfFirstMainTriggeredAbility(Zone zone, TargetController targetController, Effect effect, boolean optional) {
super(zone, targetController, effect, optional);
}
protected BeginningOfFirstMainTriggeredAbility(final BeginningOfFirstMainTriggeredAbility ability) {
super(ability);
}
@Override
public BeginningOfFirstMainTriggeredAbility copy() {
return new BeginningOfFirstMainTriggeredAbility(this);
}
@Override
public boolean checkEventType(GameEvent event, Game game) {
return event.getType() == GameEvent.EventType.PRECOMBAT_MAIN_PHASE_PRE;
}
@Override
protected String generateTriggerPhrase() {
switch (targetController) {
case YOU:
return "At the beginning of your first main phase, ";
case EACH_PLAYER:
return "At the beginning of each player's first main phase, ";
default:
throw new UnsupportedOperationException("Unsupported TargetController in BeginningOfFirstMainTriggeredAbility: " + targetController);
}
}
}

56
Mage/src/main/java/mage/abilities/triggers/BeginningOfPostcombatMainTriggeredAbility.java Normal file
View file

@ -0,0 +1,56 @@
package mage.abilities.triggers;
import mage.abilities.effects.Effect;
import mage.constants.TargetController;
import mage.constants.Zone;
import mage.game.Game;
import mage.game.events.GameEvent;
/**
* @author LevelX2
*/
public class BeginningOfPostcombatMainTriggeredAbility extends AtStepTriggeredAbility {
/**
* At the beginning of your postcombat main phase
*/
public BeginningOfPostcombatMainTriggeredAbility(Effect effect, boolean optional) {
this(TargetController.YOU, effect, optional);
}
// Note: new card implementations probably use BeginningOfSecondMainTriggeredAbility instead
public BeginningOfPostcombatMainTriggeredAbility(TargetController targetController, Effect effect, boolean optional) {
super(Zone.BATTLEFIELD, targetController, effect, optional);
}
protected BeginningOfPostcombatMainTriggeredAbility(final BeginningOfPostcombatMainTriggeredAbility ability) {
super(ability);
}
@Override
public BeginningOfPostcombatMainTriggeredAbility copy() {
return new BeginningOfPostcombatMainTriggeredAbility(this);
}
@Override
public boolean checkEventType(GameEvent event, Game game) {
return event.getType() == GameEvent.EventType.POSTCOMBAT_MAIN_PHASE_PRE;
}
@Override
protected String generateTriggerPhrase() {
switch (targetController) {
case YOU:
return "At the beginning of each of your postcombat main phases, ";
case OPPONENT:
return "At the beginning of each of your opponent's postcombat main phases, ";
case ANY:
return "At the beginning of each postcombat main phase, ";
case ENCHANTED:
return "At the beginning of each of enchanted player's postcombat main phases, ";
default:
throw new UnsupportedOperationException("Unsupported TargetController in BeginningOfPostCombatMainTriggeredAbility: " + targetController);
}
}
}

101
Mage/src/main/java/mage/abilities/triggers/BeginningOfSecondMainTriggeredAbility.java Normal file
View file

@ -0,0 +1,101 @@
package mage.abilities.triggers;
import mage.abilities.effects.Effect;
import mage.constants.TargetController;
import mage.constants.WatcherScope;
import mage.constants.Zone;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.watchers.Watcher;
/**
* @author TheElk801
*/
public class BeginningOfSecondMainTriggeredAbility extends AtStepTriggeredAbility {
/**
* At the beginning of your second main phase
*/
public BeginningOfSecondMainTriggeredAbility(Effect effect, boolean optional) {
this(Zone.BATTLEFIELD, TargetController.YOU, effect, optional);
}
public BeginningOfSecondMainTriggeredAbility(Zone zone, TargetController targetController, Effect effect, boolean optional) {
super(zone, targetController, effect, optional);
setTriggerPhrase(generateTriggerPhrase());
this.addWatcher(new MainPhaseWatcher());
}
protected BeginningOfSecondMainTriggeredAbility(final BeginningOfSecondMainTriggeredAbility ability) {
super(ability);
}
@Override
public BeginningOfSecondMainTriggeredAbility copy() {
return new BeginningOfSecondMainTriggeredAbility(this);
}
@Override
public boolean checkEventType(GameEvent event, Game game) {
switch (event.getType()) {
case PRECOMBAT_MAIN_PHASE_PRE:
case POSTCOMBAT_MAIN_PHASE_PRE:
return true;
default:
return false;
}
}
@Override
public boolean checkTrigger(GameEvent event, Game game) {
return MainPhaseWatcher.checkCount(game) && super.checkTrigger(event, game);
}
@Override
protected String generateTriggerPhrase() {
switch (targetController) {
case YOU:
return "At the beginning of your second main phase, ";
case OPPONENT:
return "At the beginning of each opponent's second main phase, ";
case ANY:
return "At the beginning of each player's second main phase, ";
case ENCHANTED:
return "At the beginning of enchanted player's second main phase, ";
default:
throw new UnsupportedOperationException("Unsupported TargetController in BeginningOfSecondMainTriggeredAbility: " + targetController);
}
}
}
class MainPhaseWatcher extends Watcher {
private int mainPhaseCount = 0;
MainPhaseWatcher() {
super(WatcherScope.GAME);
}
@Override
public void watch(GameEvent event, Game game) {
switch (event.getType()) {
case PRECOMBAT_MAIN_PHASE_PRE:
case POSTCOMBAT_MAIN_PHASE_PRE:
mainPhaseCount++;
}
}
@Override
public void reset() {
super.reset();
this.mainPhaseCount = 0;
}
static boolean checkCount(Game game) {
return game
.getState()
.getWatcher(MainPhaseWatcher.class)
.mainPhaseCount == 2;
}
}

2
Mage/src/main/java/mage/abilities/Pronoun.java → Mage/src/main/java/mage/constants/Pronoun.java
View file

@ -1,4 +1,4 @@
package mage.abilities;
package mage.constants;
/**
* Created by IGOUDT on 5-3-2017.

10
Mage/src/main/java/mage/filter/predicate/permanent/ControllerIsActivePlayerPredicate.java
View file

@ -1,21 +1,17 @@
package mage.filter.predicate.permanent;
import mage.filter.predicate.Predicate;
import mage.game.Game;
import mage.game.permanent.Permanent;
/**
*
* @author North
*/
public class ControllerIsActivePlayerPredicate implements Predicate<Permanent> {
public enum ControllerIsActivePlayerPredicate implements Predicate<Permanent> {
instance;
@Override
public boolean apply(Permanent input, Game game) {
if(input.getControllerId() == null){
return false;
}
return game.isActivePlayer(input.getControllerId());
}

6
Mage/src/main/java/mage/game/command/emblems/BasriKetEmblem.java
View file

@ -1,7 +1,7 @@
package mage.game.command.emblems;
import mage.abilities.Ability;
import mage.abilities.common.BeginningOfCombatTriggeredAbility;
import mage.abilities.triggers.BeginningOfCombatTriggeredAbility;
import mage.abilities.effects.common.CreateTokenEffect;
import mage.abilities.effects.common.counter.AddCountersAllEffect;
import mage.constants.TargetController;
@ -20,8 +20,8 @@ public final class BasriKetEmblem extends Emblem {
super("Emblem Basri");
Ability ability = new BeginningOfCombatTriggeredAbility(
Zone.COMMAND,
new CreateTokenEffect(new SoldierToken()),
TargetController.YOU, false, false);
TargetController.YOU, new CreateTokenEffect(new SoldierToken()),
false);
ability.addEffect(
new AddCountersAllEffect(CounterType.P1P1.createInstance(), StaticFilters.FILTER_PERMANENT_CREATURE_CONTROLLED)
.setText(", then put a +1/+1 counter on each creature you control")

6
Mage/src/main/java/mage/game/command/emblems/LilianaWakerOfTheDeadEmblem.java
View file

@ -1,7 +1,7 @@
package mage.game.command.emblems;
import mage.abilities.Ability;
import mage.abilities.common.BeginningOfCombatTriggeredAbility;
import mage.abilities.triggers.BeginningOfCombatTriggeredAbility;
import mage.abilities.effects.common.ReturnCreatureFromGraveyardToBattlefieldAndGainHasteEffect;
import mage.constants.TargetController;
import mage.constants.Zone;
@ -18,8 +18,8 @@ public final class LilianaWakerOfTheDeadEmblem extends Emblem {
super("Emblem Liliana");
Ability ability = new BeginningOfCombatTriggeredAbility(
Zone.COMMAND,
new ReturnCreatureFromGraveyardToBattlefieldAndGainHasteEffect(),
TargetController.YOU, false, false);
TargetController.YOU, new ReturnCreatureFromGraveyardToBattlefieldAndGainHasteEffect(),
false);
ability.addTarget(new TargetCardInGraveyard(StaticFilters.FILTER_CARD_CREATURE));
this.getAbilities().add(ability);
}

4
Mage/src/main/java/mage/game/command/emblems/RadiationEmblem.java
View file

@ -1,7 +1,7 @@
package mage.game.command.emblems;
import mage.abilities.Ability;
import mage.abilities.common.BeginningOfFirstMainTriggeredAbility;
import mage.abilities.triggers.BeginningOfFirstMainTriggeredAbility;
import mage.abilities.condition.Condition;
import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility;
import mage.abilities.effects.OneShotEffect;
@ -31,7 +31,7 @@ public class RadiationEmblem extends Emblem {
this.frameStyle = FrameStyle.M15_NORMAL;
this.getAbilities().add(new ConditionalInterveningIfTriggeredAbility(
new BeginningOfFirstMainTriggeredAbility(Zone.ALL, new RadiationEffect(), TargetController.YOU, false, false),
new BeginningOfFirstMainTriggeredAbility(Zone.ALL, TargetController.YOU, new RadiationEffect(), false),
RadiationCondition.instance,
"At the beginning of your precombat main phase, if you have any rad counters, "
+ "mill that many cards. For each nonland card milled this way, you lose 1 life and a rad counter."

4
Mage/src/main/java/mage/game/command/emblems/SarkhanTheDragonspeakerEmblem.java
View file

@ -1,6 +1,6 @@
package mage.game.command.emblems;
import mage.abilities.common.BeginningOfDrawTriggeredAbility;
import mage.abilities.triggers.BeginningOfDrawTriggeredAbility;
import mage.abilities.common.BeginningOfEndStepTriggeredAbility;
import mage.abilities.effects.common.DrawCardSourceControllerEffect;
import mage.abilities.effects.common.discard.DiscardHandControllerEffect;
@ -16,7 +16,7 @@ public final class SarkhanTheDragonspeakerEmblem extends Emblem {
public SarkhanTheDragonspeakerEmblem() {
super("Emblem Sarkhan");
this.getAbilities().add(new BeginningOfDrawTriggeredAbility(Zone.COMMAND, new DrawCardSourceControllerEffect(2).setText("draw two additional cards"), TargetController.YOU, false));
this.getAbilities().add(new BeginningOfDrawTriggeredAbility(Zone.COMMAND, TargetController.YOU, new DrawCardSourceControllerEffect(2).setText("draw two additional cards"), false));
this.getAbilities().add(new BeginningOfEndStepTriggeredAbility(Zone.COMMAND, new DiscardHandControllerEffect(), TargetController.YOU, null, false));
}

4
Mage/src/main/java/mage/game/command/emblems/TezzeretTheSchemerEmblem.java
View file

@ -1,7 +1,7 @@
package mage.game.command.emblems;
import mage.abilities.Ability;
import mage.abilities.common.BeginningOfCombatTriggeredAbility;
import mage.abilities.triggers.BeginningOfCombatTriggeredAbility;
import mage.abilities.effects.Effect;
import mage.abilities.effects.common.continuous.AddCardTypeTargetEffect;
import mage.abilities.effects.common.continuous.SetBasePowerToughnessTargetEffect;
@ -23,7 +23,7 @@ public final class TezzeretTheSchemerEmblem extends Emblem {
Effect effect = new AddCardTypeTargetEffect(Duration.EndOfGame, CardType.ARTIFACT, CardType.CREATURE);
effect.setText("target artifact you control becomes an artifact creature");
Ability ability = new BeginningOfCombatTriggeredAbility(Zone.COMMAND, effect, TargetController.YOU, false, true);
Ability ability = new BeginningOfCombatTriggeredAbility(Zone.COMMAND, TargetController.YOU, effect, false);
effect = new SetBasePowerToughnessTargetEffect(5, 5, Duration.EndOfGame);
effect.setText("with base power and toughness 5/5");
ability.addEffect(effect);

4
Mage/src/main/java/mage/game/command/planes/PanopticonPlane.java
View file

@ -3,7 +3,7 @@ package mage.game.command.planes;
import mage.abilities.Ability;
import mage.abilities.TriggeredAbilityImpl;
import mage.abilities.common.ActivateIfConditionActivatedAbility;
import mage.abilities.common.BeginningOfDrawTriggeredAbility;
import mage.abilities.triggers.BeginningOfDrawTriggeredAbility;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.condition.common.MainPhaseStackEmptyCondition;
import mage.abilities.costs.mana.GenericManaCost;
@ -41,7 +41,7 @@ public class PanopticonPlane extends Plane {
this.getAbilities().add(pwability);
// At the beginning of your draw step, draw an additional card.
Ability ability = new BeginningOfDrawTriggeredAbility(Zone.COMMAND, new DrawCardTargetEffect(1), TargetController.ACTIVE, false);
Ability ability = new BeginningOfDrawTriggeredAbility(Zone.COMMAND, TargetController.YOU, new DrawCardTargetEffect(1), false);
this.getAbilities().add(ability);
// Active player can roll the planar die: Whenever you roll {CHAOS}, draw a card

3
Mage/src/main/java/mage/game/permanent/token/AshiokWickedManipulatorNightmareToken.java
View file

@ -1,7 +1,7 @@
package mage.game.permanent.token;
import mage.MageInt;
import mage.abilities.common.BeginningOfCombatTriggeredAbility;
import mage.abilities.triggers.BeginningOfCombatTriggeredAbility;
import mage.abilities.condition.common.WasCardExiledThisTurnCondition;
import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility;
import mage.abilities.effects.common.counter.AddCountersSourceEffect;
@ -33,7 +33,6 @@ public final class AshiokWickedManipulatorNightmareToken extends TokenImpl {
this.addAbility(new ConditionalInterveningIfTriggeredAbility(
new BeginningOfCombatTriggeredAbility(
new AddCountersSourceEffect(CounterType.P1P1.createInstance()),
TargetController.YOU,
false
),
WasCardExiledThisTurnCondition.instance,