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

Fixing Firion (#7633)

Browse Source
This commit is contained in:
Renato Filipe Vidal Santos
2025-05-21 15:23:56 +01:00
committed by GitHub
parent bb7ae64ef8
commit fe37a8358b
5 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java
View File

@@ -356,6 +356,7 @@ public abstract class SpellAbilityEffect {
boolean intrinsic = sa.isIntrinsic();
boolean your = location.startsWith("Your");
boolean combat = location.endsWith("Combat");
boolean upkeep = location.endsWith("Upkeep");
String desc = sa.getParamOrDefault("AtEOTDesc", "");
@@ -365,6 +366,9 @@ public abstract class SpellAbilityEffect {
if (combat) {
location = location.substring(0, location.length() - "Combat".length());
}
if (upkeep) {
location = location.substring(0, location.length() - "Upkeep".length());
}
if (desc.isEmpty()) {
StringBuilder sb = new StringBuilder();
@@ -389,14 +393,18 @@ public abstract class SpellAbilityEffect {
} else {
sb.append("beginning of ");
sb.append(your ? "your" : "the");
sb.append(" next end step.");
if (upkeep) {
sb.append(" next upkeep.");
} else {
sb.append(" next end step.");
}
}
desc = sb.toString();
}
StringBuilder delTrig = new StringBuilder();
delTrig.append("Mode$ Phase | Phase$ ");
delTrig.append(combat ? "EndCombat " : "End Of Turn ");
delTrig.append(combat ? "EndCombat " : upkeep ? "Upkeep" : "End Of Turn ");
if (your) {
delTrig.append("| ValidPlayer$ You ");

4
forge-game/src/main/java/forge/game/ability/effects/ChangeZoneAllEffect.java
View File

@@ -186,6 +186,10 @@ public class ChangeZoneAllEffect extends SpellAbilityEffect {
triggerList.triggerChangesZoneAll(game, sa);
if (sa.hasParam("AtEOT") && !triggerList.isEmpty()) {
registerDelayedTrigger(sa, sa.getParam("AtEOT"), triggerList.allCards());
}
changeZoneUntilCommand(triggerList, sa);
// CR 701.20d If an effect would cause a player to shuffle a set of objects into a library,

5
forge-gui/res/cardsfolder/f/force_of_rage.txt
View File

@@ -2,9 +2,6 @@ Name:Force of Rage
ManaCost:1 R R
Types:Instant
S:Mode$ AlternativeCost | ValidSA$ Spell.Self | EffectZone$ All | Cost$ ExileFromHand<1/Card.Red+Other> | Condition$ NotPlayerTurn | Description$ If it's not your turn, you may exile a red card from your hand rather than pay this spell's mana cost.
A:SP$ Token | TokenAmount$ 2 | TokenScript$ r_3_1_elemental_trample_haste | TokenOwner$ You | SubAbility$ DelayedSac | RememberTokens$ True | SpellDescription$ Create two 3/1 red Elemental creature tokens with trample and haste. Sacrifice those tokens at the beginning of your next upkeep.
SVar:DelayedSac:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ DBSacToken | RememberObjects$ Remembered | SubAbility$ DBCleanup | TriggerDescription$ Sacrifice those tokens at the beginning of your next upkeep.
SVar:DBSacToken:DB$ SacrificeAll | Defined$ DelayTriggerRememberedLKI | Controller$ You
SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
A:SP$ Token | TokenAmount$ 2 | TokenScript$ r_3_1_elemental_trample_haste | TokenOwner$ You | AtEOT$ YourSacrificeUpkeep | SpellDescription$ Create two 3/1 red Elemental creature tokens with trample and haste. Sacrifice those tokens at the beginning of your next upkeep.
DeckHas:Ability$Token
Oracle:If it's not your turn, you may exile a red card from your hand rather than pay this spell's mana cost.\nCreate two 3/1 red Elemental creature tokens with trample and haste. Sacrifice those tokens at the beginning of your next upkeep.

7
forge-gui/res/cardsfolder/r/rally_the_ancestors.txt
View File

@@ -1,11 +1,8 @@
Name:Rally the Ancestors
ManaCost:X W W
Types:Instant
A:SP$ ChangeZoneAll | Origin$ Graveyard | Destination$ Battlefield | ChangeType$ Creature.YouOwn+cmcLEX | RememberChanged$ True | SubAbility$ DBDelTrig | SpellDescription$ Return each creature card with mana value X or less from your graveyard to the battlefield. Exile those creatures at the beginning of your next upkeep. Exile CARDNAME.
SVar:DBDelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigExile | RememberObjects$ RememberedLKI | SubAbility$ ExileSelf | TriggerDescription$ Exile those creatures at the beginning of your next upkeep.
SVar:TrigExile:DB$ ChangeZone | Defined$ DelayTriggerRememberedLKI | Origin$ Battlefield | Destination$ Exile
SVar:ExileSelf:DB$ ChangeZone | Origin$ Stack | Destination$ Exile | SubAbility$ DBCleanup
SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
A:SP$ ChangeZoneAll | Origin$ Graveyard | Destination$ Battlefield | ChangeType$ Creature.YouOwn+cmcLEX | AtEOT$ YourExileUpkeep | SubAbility$ ExileSelf | SpellDescription$ Return each creature card with mana value X or less from your graveyard to the battlefield. Exile those creatures at the beginning of your next upkeep. Exile CARDNAME.
SVar:ExileSelf:DB$ ChangeZone | Origin$ Stack | Destination$ Exile
SVar:X:Count$xPaid
AI:RemoveDeck:All
Oracle:Return each creature card with mana value X or less from your graveyard to the battlefield. Exile those creatures at the beginning of your next upkeep. Exile Rally the Ancestors.

5
forge-gui/res/cardsfolder/upcoming/firion_wild_rose_warrior.txt
View File

@@ -4,11 +4,8 @@ Types:Legendary Creature Human Rebel Warrior
PT:3/3
S:Mode$ Continuous | Affected$ Creature.YouCtrl+equipped | AddKeyword$ Haste | Description$ Equipped creatures you control have haste.
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Equipment.YouCtrl+!token+Other | TriggerZones$ Battlefield | Execute$ TrigCopy | TriggerDescription$ Whenever a nontoken Equipment you control enters, create a token that's a copy of it, except it has "This Equipment's equip abilities cost {2} less to activate." Sacrifice that token at the beginning of the next upkeep.
SVar:TrigCopy:DB$ CopyPermanent | Defined$ TriggeredCardLKICopy | AddStaticAbilities$ EquipReduce | RememberTokens$ True | SubAbility$ TrigDelay
SVar:TrigCopy:DB$ CopyPermanent | Defined$ TriggeredCardLKICopy | AddStaticAbilities$ EquipReduce | AtEOT$ SacrificeUpkeep
SVar:EquipReduce:Mode$ ReduceCost | ValidCard$ Card.Self | ValidSpell$ Activated.Equip | Amount$ 2 | Description$ This Equipment's equip abilities cost {2} less to activate.
SVar:TrigDelay:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | RememberObjects$ RememberedLKI | Execute$ TrigSac | SubAbility$ DBCleanup | TriggerDescription$ Sacrifice that token at the beginning of the next upkeep.
SVar:TrigSac:DB$ Sacrifice | Defined$ DelayTriggerRememberedLKI
SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
DeckHas:Ability$Token
DeckNeeds:Type$Equipment
Oracle:Equipped creatures you control have haste.\nWhenever a nontoken Equipment you control enters, create a token that's a copy of it, except it has "This Equipment's equip abilities cost {2} less to activate." Sacrifice that token at the beginning of the next upkeep.