Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

rework batch events (#13066)

Browse source 
* add new framework for batch triggers

apply for tapped, untapped, sacrificed, milled

simplify Ob Nixilis, Captive Kingpin

* add a verify check

* fix mistakes

* add simple tests

* another test

* zone change - enters battlefield

* zone change: not battlefield

* zone change - leaves battlefield

* fix Kaya Spirit's Justice

* rename OneOrMoreCombatDamagePlayerTriggeredAbility

* refactor OneOrMoreDamagePlayerTriggeredAbility

* new YoureDealtDamageTriggeredAbility

* new OpponentDealtNoncombatDamageTriggeredAbility

* rework Risona, Asari Commander

* simplify War Elemental

* Add damage batch by source

rework some delayed triggered abilities

* fix Mindblade Render

* rework Initiative and a few others

* [temp] initiative test

* refactor: common style for DealsDamageSourceTriggeredAbility

* refactor cards to use common DealsDamageSourceTriggeredAbility

* update damage players batch triggers

* fix mistake in initiative

* new DealtDamageAnyTriggeredAbility

* new DealtCombatDamageToSourceTriggeredAbility

* update dealt damage to permanent batch triggered abilities

* refactor Hot Soup and param in DealtDamageAttachedTriggeredAbility

* a few more permanent batch triggered abilities

* fix mistake

* update some more damage batch triggers

* add test for Phyrexian Negator

* update Felix Five-Boots and enable test

update Wayta, Trainer Prodigy to align

* update damage batch by source triggers

* undo mistaken change

* fix verify

* cleanup unused methods

* Revert "[temp] initiative test"

This reverts commit 11ed19295fb4f54f5e0870acd4d3d515b54761f1.

* Revert "add a verify check"

This reverts commit e7de47a6562f13c127fdc4c29a7735a08f8da9ea.

* fixes from checking text discrepancies

* fix Shriekwood Devourer

* merge fix

---------

Co-authored-by: Susucre <34709007+Susucre@users.noreply.github.com>
This commit is contained in:
xenohedron 2024-11-19 21:23:08 -05:00 • committed by GitHub
parent cef2a1edc8
commit d06d594934
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
192 changed files with 2411 additions and 3363 deletions
Download patch file Download diff file Expand all files Collapse all files

80
Mage/src/main/java/mage/abilities/common/CombatDamageDealtToYouTriggeredAbility.java
View file

@ -1,17 +1,15 @@
package mage.abilities.common;
import mage.abilities.BatchTriggeredAbility;
import mage.abilities.TriggeredAbilityImpl;
import mage.abilities.effects.Effect;
import mage.constants.Zone;
import mage.game.Game;
import mage.game.events.DamagedBatchForPlayersEvent;
import mage.game.events.DamagedEvent;
import mage.game.events.DamagedBatchForOnePlayerEvent;
import mage.game.events.DamagedPlayerEvent;
import mage.game.events.GameEvent;
import mage.game.permanent.Permanent;
import mage.target.targetpointer.FixedTarget;
import java.util.UUID;
/**
* A triggered ability for whenever one or more creatures deal combat damage to
* you. Has an optional component for setting the target pointer to the opponent
@ -19,87 +17,47 @@ import java.util.UUID;
*
* @author alexander-novo
*/
public class CombatDamageDealtToYouTriggeredAbility extends TriggeredAbilityImpl {
public class CombatDamageDealtToYouTriggeredAbility extends TriggeredAbilityImpl implements BatchTriggeredAbility<DamagedPlayerEvent> {
// Whether the ability should set a target targetting the opponent who
// Whether the ability should set a target targeting the opponent who
// controls the creatures who dealt damage to you
private final boolean setTarget;
private final boolean setTargetPointer;
/**
* @param effect The effect that should happen when the ability resolves
*/
public CombatDamageDealtToYouTriggeredAbility(Effect effect) {
this(effect, false);
this(Zone.BATTLEFIELD, effect, false, false);
}
/**
* @param effect The effect that should happen when the ability resolves
* @param setTarget Whether or not the ability should set a target targetting
* the opponent who controls the creatures who dealt damage to
* you
*/
public CombatDamageDealtToYouTriggeredAbility(Effect effect, boolean setTarget) {
this(Zone.BATTLEFIELD, effect, setTarget, false);
}
/**
* @param zone Which zone the ability shoudl take effect in
* @param effect The effect that should happen when the ability resolves
* @param setTarget Whether or not the ability should set a target targetting
* the opponent who controls the creatures who dealt damage to
* you
* @param optional Whether or not the ability is optional
*/
public CombatDamageDealtToYouTriggeredAbility(Zone zone, Effect effect, boolean setTarget,
boolean optional) {
public CombatDamageDealtToYouTriggeredAbility(Zone zone, Effect effect, boolean setTargetPointer, boolean optional) {
super(zone, effect, optional);
this.setTarget = setTarget;
this.setTargetPointer = setTargetPointer;
setTriggerPhrase(generateTriggerPhrase());
}
private CombatDamageDealtToYouTriggeredAbility(final CombatDamageDealtToYouTriggeredAbility ability) {
super(ability);
this.setTarget = ability.setTarget;
this.setTargetPointer = ability.setTargetPointer;
}
@Override
public boolean checkEventType(GameEvent event, Game game) {
return event.getType() == GameEvent.EventType.DAMAGED_BATCH_FOR_PLAYERS;
return event.getType() == GameEvent.EventType.DAMAGED_BATCH_FOR_ONE_PLAYER;
}
@Override
public boolean checkTrigger(GameEvent event, Game game) {
DamagedBatchForPlayersEvent dEvent = (DamagedBatchForPlayersEvent) event;
boolean isDamaged = false;
UUID damageSourceControllerID = null;
for (DamagedEvent damagedEvent : dEvent.getEvents()) {
if (damagedEvent.isCombatDamage() && damagedEvent.getPlayerId() == this.controllerId) {
isDamaged = true;
// TODO: current code support only one controller
// (it's can be potentially bugged in team mode with multiple attack players)
Permanent damageSource = game.getPermanent(damagedEvent.getSourceId());
if (damageSource != null) {
damageSourceControllerID = damageSource.getControllerId();
}
}
if (!isControlledBy(event.getTargetId()) || !((DamagedBatchForOnePlayerEvent) event).isCombatDamage()) {
return false;
}
if (isDamaged) {
if (this.setTarget && damageSourceControllerID != null) {
this.getEffects().setTargetPointer(new FixedTarget(damageSourceControllerID));
}
return true;
if (setTargetPointer) {
// attacking player is active player
this.getEffects().setTargetPointer(new FixedTarget(game.getActivePlayerId()));
}
return true;
return false;
}
private String generateTriggerPhrase() {
if (setTarget) {
if (setTargetPointer) {
return "Whenever one or more creatures an opponent controls deal combat damage to you, ";
} else {
return "Whenever one or more creatures deal combat damage to you, ";
@ -110,4 +68,4 @@ public class CombatDamageDealtToYouTriggeredAbility extends TriggeredAbilityImpl
public CombatDamageDealtToYouTriggeredAbility copy() {
return new CombatDamageDealtToYouTriggeredAbility(this);
}
}
}