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

Reworking triggered ability text generation to allow for ability words and flavor words to be added more easily (#8010)

Browse source 
* refactor all instances of getRule in triggered abilities using new getTriggerPrefix method

* updated triggered ability rules generation

* renamed method

* fixed a test failure

* some more refactoring

* simplified some instances of ability word usage
This commit is contained in:
Evan Kranzler 2021-07-15 07:46:38 -04:00 • committed by GitHub
parent 0a31110164
commit ca80806400
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
398 changed files with 946 additions and 989 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Mage/src/main/java/mage/abilities/common/DealtDamageToSourceTriggeredAbility.java
View file

@ -3,6 +3,7 @@ package mage.abilities.common;
import mage.abilities.TriggeredAbilityImpl;
import mage.abilities.effects.Effect;
import mage.constants.AbilityWord;
import mage.constants.Zone;
import mage.game.Game;
import mage.game.events.DamagedEvent;
@ -13,7 +14,6 @@ import mage.game.events.GameEvent;
*/
public class DealtDamageToSourceTriggeredAbility extends TriggeredAbilityImpl {
private final boolean enrage;
private final boolean useValue;
private boolean usedForCombatDamageStep;
@ -27,14 +27,15 @@ public class DealtDamageToSourceTriggeredAbility extends TriggeredAbilityImpl {
public DealtDamageToSourceTriggeredAbility(Effect effect, boolean optional, boolean enrage, boolean useValue) {
super(Zone.BATTLEFIELD, effect, optional);
this.enrage = enrage;
this.useValue = useValue;
this.usedForCombatDamageStep = false;
if (enrage) {
this.setAbilityWord(AbilityWord.ENRAGE);
}
}
public DealtDamageToSourceTriggeredAbility(final DealtDamageToSourceTriggeredAbility ability) {
super(ability);
this.enrage = ability.enrage;
this.useValue = ability.useValue;
this.usedForCombatDamageStep = ability.usedForCombatDamageStep;
}
@ -75,7 +76,7 @@ public class DealtDamageToSourceTriggeredAbility extends TriggeredAbilityImpl {
}
@Override
public String getRule() {
return (enrage ? "<i>Enrage</i> &mdash; " : "") + "Whenever {this} is dealt damage, " + super.getRule();
public String getTriggerPhrase() {
return "Whenever {this} is dealt damage, ";
}
}