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

15
Mage/src/main/java/mage/abilities/meta/OrTriggeredAbility.java
View file

@ -1,9 +1,5 @@
package mage.abilities.meta;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import java.util.UUID;
import mage.abilities.TriggeredAbility;
import mage.abilities.TriggeredAbilityImpl;
import mage.abilities.effects.Effect;
@ -12,6 +8,11 @@ import mage.game.Game;
import mage.game.events.GameEvent;
import mage.watchers.Watcher;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import java.util.UUID;
/**
* A triggered ability that combines several others and triggers whenever one or
* more of them would. The abilities passed in should have null as their effect,
@ -81,9 +82,9 @@ public class OrTriggeredAbility extends TriggeredAbilityImpl {
}
@Override
public String getRule() {
public String getTriggerPhrase() {
if (ruleTrigger != null && !ruleTrigger.isEmpty()) {
return ruleTrigger + super.getRule();
return ruleTrigger;
}
StringBuilder sb = new StringBuilder();
if (triggeredAbilities[0].getRule().length() > 0) {
@ -96,7 +97,7 @@ public class OrTriggeredAbility extends TriggeredAbilityImpl {
}
sb.append(" or ").append(triggeredAbilities[triggeredAbilities.length - 1].getRule().toLowerCase(Locale.ENGLISH));
return sb.toString() + super.getRule();
return sb.toString();
}
@Override