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

[STX] Simplify Strict Proctor trigger check

Browse source
This commit is contained in:
Alex W. Jackson 2022-11-05 04:48:23 -04:00
parent a9cf4154e5
commit ff777c5687
3 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
Mage.Sets/src/mage/cards/s/StrictProctor.java
View file

@ -1,6 +1,8 @@
package mage.cards.s;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.TriggeredAbility;
import mage.abilities.TriggeredAbilityImpl;
import mage.abilities.costs.mana.GenericManaCost;
import mage.abilities.effects.common.CounterUnlessPaysEffect;
@ -12,10 +14,10 @@ import mage.constants.SubType;
import mage.constants.Zone;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.stack.StackObject;
import mage.target.targetpointer.FixedTarget;
import java.util.UUID;
import mage.game.stack.StackAbility;
/**
* @author TheElk801
@ -25,8 +27,7 @@ public final class StrictProctor extends CardImpl {
public StrictProctor(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{W}");
this.subtype.add(SubType.SPIRIT);
this.subtype.add(SubType.CLERIC);
this.subtype.add(SubType.SPIRIT, SubType.CLERIC);
this.power = new MageInt(1);
this.toughness = new MageInt(3);
@ -64,16 +65,16 @@ class StrictProctorTriggeredAbility extends TriggeredAbilityImpl {
@Override
public boolean checkTrigger(GameEvent event, Game game) {
// retrieve the event that led to the trigger triggering
// verify that it is a ETB event
StackAbility stackAbilityOfTriggeredAbility = (StackAbility) game.getObject(event.getTargetId());
if (stackAbilityOfTriggeredAbility == null
|| stackAbilityOfTriggeredAbility.getSourceId() == null) {
StackObject stackObject = game.getStack().getStackObject(event.getTargetId());
if (stackObject == null) {
return false;
}
GameEvent triggeringEvent = (GameEvent) game.getState().getValue("triggeringEvent" + stackAbilityOfTriggeredAbility.getSourceId());
if (triggeringEvent == null
|| triggeringEvent.getType() != GameEvent.EventType.ENTERS_THE_BATTLEFIELD) {
Ability ability = stackObject.getStackAbility();
if (!(ability instanceof TriggeredAbility)) {
return false;
}
GameEvent triggerEvent = ((TriggeredAbility) ability).getTriggerEvent();
if (triggerEvent == null || triggerEvent.getType() != GameEvent.EventType.ENTERS_THE_BATTLEFIELD) {
return false;
}
// set the target to the ability that gets triggered from the enter the battlefield trigger

3
Mage/src/main/java/mage/abilities/TriggeredAbilities.java
View file

@ -93,9 +93,6 @@ public class TriggeredAbilities extends ConcurrentHashMap<String, TriggeredAbili
if (ability.checkTrigger(event, game) && ability.checkTriggeredAlready(game) && ability.checkUsedAlready(game)) {
NumberOfTriggersEvent numberOfTriggersEvent = new NumberOfTriggersEvent(ability, event);
// store the event that led to the triggered event (Strict Proctor)
// numberOfTriggerers event is only checked in replacement effects
game.getState().setValue("triggeringEvent" + ability.getSourceId(), event);
if (!game.replaceEvent(numberOfTriggersEvent)) {
for (int i = 0; i < numberOfTriggersEvent.getAmount(); i++) {
ability.trigger(game, ability.getControllerId(), event);

1
Mage/src/main/java/mage/abilities/TriggeredAbilityImpl.java
View file

@ -54,6 +54,7 @@ public abstract class TriggeredAbilityImpl extends AbilityImpl implements Trigge
this.leavesTheBattlefieldTrigger = ability.leavesTheBattlefieldTrigger;
this.triggersOnce = ability.triggersOnce;
this.doOnlyOnce = ability.doOnlyOnce;
this.triggerEvent = ability.triggerEvent;
this.triggerPhrase = ability.triggerPhrase;
}