Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

refactor: clean up triggered abilities from graveyard (#13044)

Browse source 
* some improvements to counter removing triggers

* fix Zone.GRAVEYARD text/conditions for beginning of upkeep triggers

* remaining refactors

* add condition text

* text corrections

* remove remaining generateZoneString

* remove superfluous hardcoded rules text param
This commit is contained in:
xenohedron 2024-10-27 15:23:54 -04:00 • committed by GitHub
parent 90623b6a0e
commit aa7a610db2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
49 changed files with 331 additions and 737 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Mage/src/main/java/mage/abilities/common/BeginningOfCombatTriggeredAbility.java
View file

@ -78,21 +78,15 @@ public class BeginningOfCombatTriggeredAbility extends TriggeredAbilityImpl {
private String generateTriggerPhrase() {
switch (targetController) {
case YOU:
return "At the beginning of combat on your turn, " + generateZoneString();
return "At the beginning of combat on your turn, ";
case OPPONENT:
return "At the beginning of combat on each opponent's turn, " + generateZoneString();
return "At the beginning of combat on each opponent's turn, ";
case EACH_PLAYER:
return "At the beginning of combat on each player's turn, " + generateZoneString();
return "At the beginning of combat on each player's turn, ";
case ANY:
return "At the beginning of each combat, " + generateZoneString();
return "At the beginning of each combat, ";
}
return "";
}
private String generateZoneString() {
if (getZone() == Zone.GRAVEYARD) {
return "if {this} is in your graveyard, ";
}
return "";
}
}