external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 11:18:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Announce menu titles for more complex cards

Browse Source
This commit is contained in:
Tim Mocny
2022-03-26 00:36:50 +00:00
committed by Anthony Calosa
parent bd4e3b56ac
commit 4cbdd8fb9b
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-gui/res/cardsfolder/l/leyline_tyrant.txt
View File

@@ -5,7 +5,7 @@ PT:4/4
K:Flying K:Flying
S:Mode$ UnspentMana | ValidPlayer$ You | ManaType$ Red | Description$ You don't lose unspent red mana as steps and phases end. S:Mode$ UnspentMana | ValidPlayer$ You | ManaType$ Red | Description$ You don't lose unspent red mana as steps and phases end.
T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigImmediateTrig | TriggerDescription$ When CARDNAME dies, you may pay any amount of {R}. When you do, it deals that much damage to any target. T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigImmediateTrig | TriggerDescription$ When CARDNAME dies, you may pay any amount of {R}. When you do, it deals that much damage to any target.
SVar:TrigImmediateTrig:AB$ ImmediateTrigger | Cost$ X | XColor$ R | AnnounceTitle$ any amount of red mana to pay | Execute$ TrigDamage | TriggerDescription$ When you do, CARDNAME deals that much damage to any target. SVar:TrigImmediateTrig:AB$ ImmediateTrigger | Cost$ X | XColor$ R | XAnnounceTitle$ any amount of red mana to pay | Execute$ TrigDamage | TriggerDescription$ When you do, CARDNAME deals that much damage to any target.
SVar:TrigDamage:DB$ DealDamage | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ X SVar:TrigDamage:DB$ DealDamage | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ X
SVar:X:Count$xPaid SVar:X:Count$xPaid
Oracle:Flying\nYou don't lose unspent red mana as steps and phases end.\nWhen Leyline Tyrant dies, you may pay any amount of {R}. When you do, it deals that much damage to any target. Oracle:Flying\nYou don't lose unspent red mana as steps and phases end.\nWhen Leyline Tyrant dies, you may pay any amount of {R}. When you do, it deals that much damage to any target.

3
forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
View File

@@ -460,7 +460,8 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
return null; return null;
} }
String announceTitle = ability.getParamOrDefault("AnnounceTitle", announce); String announceTitle = "X".equals(announce) ? ability.getParamOrDefault("XAnnounceTitle", announce) :
ability.getParamOrDefault("AnnounceTitle", announce);
if (cost.isMandatory()) { if (cost.isMandatory()) {
return chooseNumber(ability, localizer.getMessage("lblChooseAnnounceForCard", announceTitle, return chooseNumber(ability, localizer.getMessage("lblChooseAnnounceForCard", announceTitle,
CardTranslation.getTranslatedName(ability.getHostCard().getName())) , min, max); CardTranslation.getTranslatedName(ability.getHostCard().getName())) , min, max);