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

16
Mage/src/main/java/mage/abilities/common/EntersBattlefieldTriggeredAbility.java
View file

@ -1,6 +1,5 @@
package mage.abilities.common;
import mage.abilities.Ability;
import mage.abilities.TriggeredAbilityImpl;
import mage.abilities.effects.Effect;
import mage.constants.Zone;
@ -49,20 +48,13 @@ public class EntersBattlefieldTriggeredAbility extends TriggeredAbilityImpl {
}
@Override
public Ability withFlavorWord(String flavorWord) {
// must put flavor word before auto-generated rules, so keep it in etb place
super.withFlavorWord(null);
this.etbFlavorWord = flavorWord;
return this;
public String getRule() {
return super.getRule();
}
@Override
public String getRule() {
if (ignoreRulesGeneration) {
return super.getRule();
}
return (this.etbFlavorWord == null ? "" : "<i>" + this.etbFlavorWord + "</i> &mdash; ")
+ "When {this} enters the battlefield, " + super.getRule();
public String getTriggerPhrase() {
return "When {this} enters the battlefield, ";
}
@Override