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

24
Mage/src/main/java/mage/abilities/common/BeginningOfUpkeepTriggeredAbility.java
View file

@ -9,8 +9,6 @@ import mage.game.events.GameEvent;
import mage.game.permanent.Permanent;
import mage.target.targetpointer.FixedTarget;
import java.util.Locale;
/**
* @author Loki
*/
@ -119,30 +117,22 @@ public class BeginningOfUpkeepTriggeredAbility extends TriggeredAbilityImpl {
}
@Override
public String getRule() {
StringBuilder sb = new StringBuilder(super.getRule());
public String getTriggerPhrase() {
if (ruleTrigger != null && !ruleTrigger.isEmpty()) {
return sb.insert(0, ruleTrigger).toString();
return ruleTrigger;
}
switch (targetController) {
case YOU:
if (this.optional) {
if (sb.substring(0, 6).toLowerCase(Locale.ENGLISH).equals("target")) {
sb.insert(0, "you may have ");
} else if (!sb.substring(0, 4).toLowerCase(Locale.ENGLISH).equals("you ")) {
sb.insert(0, "you may ");
}
}
return sb.insert(0, generateZoneString()).insert(0, "At the beginning of your upkeep, ").toString();
return "At the beginning of your upkeep, " + generateZoneString();
case OPPONENT:
return sb.insert(0, generateZoneString()).insert(0, "At the beginning of each opponent's upkeep, ").toString();
return "At the beginning of each opponent's upkeep, " + generateZoneString();
case ANY:
case ACTIVE:
return sb.insert(0, generateZoneString()).insert(0, "At the beginning of each player's upkeep, ").toString();
return "At the beginning of each player's upkeep, " + generateZoneString();
case EACH_PLAYER:
return sb.insert(0, generateZoneString()).insert(0, "At the beginning of each upkeep, ").toString();
return "At the beginning of each upkeep, " + generateZoneString();
case CONTROLLER_ATTACHED_TO:
return sb.insert(0, generateZoneString()).insert(0, "At the beginning of the upkeep of enchanted creature's controller, ").toString();
return "At the beginning of the upkeep of enchanted creature's controller, " + generateZoneString();
}
return "";
}