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

refactor: add new simpler technique for intervening if conditions on triggered abilities (#13037)

Browse source 
too many usages to fix all at once, plus condition text needs updating, but this will give a cleaner option for new implementations
This commit is contained in:
xenohedron 2024-10-27 00:19:57 -04:00 • committed by GitHub
parent fb71ce8c85
commit 8a8773971d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
19 changed files with 153 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,7 @@
package mage.abilities;
import mage.MageObject;
import mage.abilities.condition.Condition;
import mage.abilities.effects.Effect;
import mage.abilities.effects.common.*;
import mage.constants.AbilityType;
@ -25,6 +26,7 @@ import java.util.UUID;
public abstract class TriggeredAbilityImpl extends AbilityImpl implements TriggeredAbility {
private boolean optional;
private Condition interveningIfCondition;
private boolean leavesTheBattlefieldTrigger;
private int triggerLimitEachTurn = Integer.MAX_VALUE; // for "triggers only once|twice each turn"
private boolean doOnlyOnceEachTurn = false;
@ -54,6 +56,7 @@ public abstract class TriggeredAbilityImpl extends AbilityImpl implements Trigge
protected TriggeredAbilityImpl(final TriggeredAbilityImpl ability) {
super(ability);
this.optional = ability.optional;
this.interveningIfCondition = ability.interveningIfCondition;
this.leavesTheBattlefieldTrigger = ability.leavesTheBattlefieldTrigger;
this.triggerLimitEachTurn = ability.triggerLimitEachTurn;
this.doOnlyOnceEachTurn = ability.doOnlyOnceEachTurn;
@ -174,9 +177,15 @@ public abstract class TriggeredAbilityImpl extends AbilityImpl implements Trigge
return this;
}
@Override
public TriggeredAbility withInterveningIf(Condition interveningIfCondition) {
this.interveningIfCondition = interveningIfCondition;
return this;
}
@Override
public boolean checkInterveningIfClause(Game game) {
return true;
return interveningIfCondition == null || interveningIfCondition.apply(game, this);
}
@Override
@ -239,6 +248,17 @@ public abstract class TriggeredAbilityImpl extends AbilityImpl implements Trigge
sb.append(triggerPhrase == null ? "" : triggerPhrase);
if (interveningIfCondition != null) {
String conditionText = interveningIfCondition.toString();
if (replaceRuleText && triggerPhrase != null && triggerPhrase.contains("{this}")) {
conditionText = conditionText.replace("{this}", "it");
}
if (!conditionText.startsWith("if ")) {
sb.append("if ");
}
sb.append(conditionText).append(", ");
}
String superRule = super.getRule(true);
if (!superRule.isEmpty()) {
String ruleLow = superRule.toLowerCase(Locale.ENGLISH);
@ -273,7 +293,7 @@ public abstract class TriggeredAbilityImpl extends AbilityImpl implements Trigge
break;
default:
// No card with that behavior yet, so feel free to change the text once one exist
sb.append(CardUtil.numberToText(triggerLimitEachTurn) + " times");
sb.append(CardUtil.numberToText(triggerLimitEachTurn)).append(" times");
}
sb.append(" each turn.");
}