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/keyword/HeroicAbility.java
View file

@ -5,6 +5,7 @@ import mage.abilities.Mode;
import mage.abilities.SpellAbility;
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.GameEvent;
@ -20,7 +21,6 @@ import java.util.UUID;
*/
public class HeroicAbility extends TriggeredAbilityImpl {
private final boolean isHeroic;
public HeroicAbility(Effect effect) {
this(effect, false);
@ -32,12 +32,13 @@ public class HeroicAbility extends TriggeredAbilityImpl {
public HeroicAbility(Effect effect, boolean optional, boolean isHeroic) {
super(Zone.BATTLEFIELD, effect, optional);
this.isHeroic = isHeroic;
if (isHeroic) {
this.setAbilityWord(AbilityWord.HEROIC);
}
}
public HeroicAbility(final HeroicAbility ability) {
super(ability);
this.isHeroic = ability.isHeroic;
}
@Override
@ -84,7 +85,7 @@ public class HeroicAbility extends TriggeredAbilityImpl {
}
@Override
public String getRule() {
return (isHeroic ? "<i>Heroic</i> &mdash; " : "") + "Whenever you cast a spell that targets {this}, " + super.getRule();
public String getTriggerPhrase() {
return "Whenever you cast a spell that targets {this}, ";
}
}