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

@ -13,7 +13,6 @@ import mage.game.events.GameEvent;
import mage.target.targetpointer.FixedTarget;
/**
*
* @author LevelX2
*/
@ -70,7 +69,7 @@ public class BeginningOfPreCombatMainTriggeredAbility extends TriggeredAbilityIm
}
return true;
}
break;
break;
case ANY:
if (setTargetPointer) {
for (Effect effect : this.getEffects()) {
@ -83,14 +82,14 @@ public class BeginningOfPreCombatMainTriggeredAbility extends TriggeredAbilityIm
}
@Override
public String getRule() {
public String getTriggerPhrase() {
switch (targetController) {
case YOU:
return "At the beginning of your precombat main phase, " + generateZoneString() + getEffects().getText(modes.getMode());
return "At the beginning of your precombat main phase, " + generateZoneString();
case OPPONENT:
return "At the beginning of each opponent's precombat main phase, " + generateZoneString() + getEffects().getText(modes.getMode());
return "At the beginning of each opponent's precombat main phase, " + generateZoneString();
case ANY:
return "At the beginning of each player's precombat main phase, " + generateZoneString() + getEffects().getText(modes.getMode());
return "At the beginning of each player's precombat main phase, " + generateZoneString();
}
return "";
}