diff --git a/forge-ai/src/main/java/forge/ai/ComputerUtilAbility.java b/forge-ai/src/main/java/forge/ai/ComputerUtilAbility.java index bfcad761181..4611e768c8d 100644 --- a/forge-ai/src/main/java/forge/ai/ComputerUtilAbility.java +++ b/forge-ai/src/main/java/forge/ai/ComputerUtilAbility.java @@ -115,7 +115,7 @@ public class ComputerUtilAbility { newAbilities.add(sa); newAbilities.addAll(otherAltSa); } - + final List result = Lists.newArrayList(); for (SpellAbility sa : newAbilities) { sa.setActivatingPlayer(player); diff --git a/forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java b/forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java index 2fd7291fa80..9e959565bc4 100644 --- a/forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java +++ b/forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java @@ -953,7 +953,6 @@ public final class StaticAbilityContinuous { } else if (additional) { final String regCost = affectedCard.getManaCost().getShortString(); mayPlayAltCost = mayPlayAltManaCost.replace("RegularCost", regCost); - } } diff --git a/forge-gui/res/cardsfolder/h/helm_of_the_host.txt b/forge-gui/res/cardsfolder/h/helm_of_the_host.txt index de8c52d8a3a..75f56315a35 100644 --- a/forge-gui/res/cardsfolder/h/helm_of_the_host.txt +++ b/forge-gui/res/cardsfolder/h/helm_of_the_host.txt @@ -3,6 +3,6 @@ ManaCost:4 Types:Legendary Artifact Equipment K:Equip:5 T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | Execute$ TrigCopy | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of combat on your turn, create a token that's a copy of equipped creature, except the token isn't legendary if equipped creature is legendary. That token gains haste. -SVar:TrigCopy:DB$ CopyPermanent | Defined$ Equipped | AddKeywords$ Haste | NonLegendary$ True +SVar:TrigCopy:DB$ CopyPermanent | Defined$ Equipped | PumpKeywords$ Haste | NonLegendary$ True DeckHas:Ability$Token Oracle:At the beginning of combat on your turn, create a token that's a copy of equipped creature, except the token isn't legendary if equipped creature is legendary. That token gains haste.\nEquip {5} diff --git a/forge-gui/res/cardsfolder/j/jaxis_the_troublemaker.txt b/forge-gui/res/cardsfolder/j/jaxis_the_troublemaker.txt index 3c574f77ab7..cea9c4b463f 100644 --- a/forge-gui/res/cardsfolder/j/jaxis_the_troublemaker.txt +++ b/forge-gui/res/cardsfolder/j/jaxis_the_troublemaker.txt @@ -2,7 +2,9 @@ Name:Jaxis, the Troublemaker ManaCost:3 R Types:Legendary Creature Human Warrior PT:2/3 -A:AB$ CopyPermanent | Cost$ R T Discard<1/Card> | ValidTgts$ Creature.Other+YouCtrl | TgtPrompt$ Select another target creature you control | AddKeywords$ Haste | AddTriggers$ Dies | AddSVars$ TrigDraw | AtEOT$ Sacrifice | SorcerySpeed$ True | SpellDescription$ Create a token that's a copy of another target creature you control. It gains haste and "When this creature dies, draw a card." Sacrifice it at the beginning of the next end step. Activate only as a sorcery. +A:AB$ CopyPermanent | Cost$ R T Discard<1/Card> | ValidTgts$ Creature.Other+YouCtrl | TgtPrompt$ Select another target creature you control | PumpKeywords$ Haste | AtEOT$ Sacrifice | SorcerySpeed$ True | RememberTokens$ True | SubAbility$ DBAnimate | SpellDescription$ Create a token that's a copy of another target creature you control. It gains haste and "When this creature dies, draw a card." Sacrifice it at the beginning of the next end step. Activate only as a sorcery. +SVar:DBAnimate:DB$ Animate | Defined$ Remembered | Triggers$ Dies | SubAbility$ DBCleanup +SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True SVar:Dies:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When this creature dies, draw a card. SVar:TrigDraw:DB$ Draw | NumCards$ 1 K:Blitz:1 R diff --git a/forge-gui/res/cardsfolder/k/kindred_charge.txt b/forge-gui/res/cardsfolder/k/kindred_charge.txt index 2b1e2416e53..5aea55dbffd 100644 --- a/forge-gui/res/cardsfolder/k/kindred_charge.txt +++ b/forge-gui/res/cardsfolder/k/kindred_charge.txt @@ -2,7 +2,7 @@ Name:Kindred Charge ManaCost:4 R R Types:Sorcery A:SP$ ChooseType | Cost$ 4 R R | Defined$ You | Type$ Creature | SubAbility$ DBClone | AILogic$ MostProminentComputerControls | SpellDescription$ Choose a creature type. For each creature you control of the chosen type, create a token that's a copy of that creature. Those tokens gain haste. Exile them at the beginning of the next end step. -SVar:DBClone:DB$ CopyPermanent | Defined$ Valid Creature.ChosenType+YouCtrl | AddKeywords$ Haste | NumCopies$ 1 | AtEOT$ Exile +SVar:DBClone:DB$ CopyPermanent | Defined$ Valid Creature.ChosenType+YouCtrl | PumpKeywords$ Haste | NumCopies$ 1 | AtEOT$ Exile SVar:NeedsToPlayVar:Z GE2 SVar:Z:Count$Valid Creature.YouCtrl Oracle:Choose a creature type. For each creature you control of the chosen type, create a token that's a copy of that creature. Those tokens gain haste. Exile them at the beginning of the next end step. diff --git a/forge-gui/res/cardsfolder/r/rionya_fire_dancer.txt b/forge-gui/res/cardsfolder/r/rionya_fire_dancer.txt index 506dc1f9469..c48c88ff44a 100644 --- a/forge-gui/res/cardsfolder/r/rionya_fire_dancer.txt +++ b/forge-gui/res/cardsfolder/r/rionya_fire_dancer.txt @@ -3,7 +3,7 @@ ManaCost:3 R R Types:Legendary Creature Human Wizard PT:3/4 T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | Execute$ TrigCopy | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of combat on your turn, create X tokens that are copies of another target creature you control, where X is one plus the number of instant and sorcery spells you've cast this turn. They gain haste. Exile them at the beginning of the next end step. -SVar:TrigCopy:DB$ CopyPermanent | NumCopies$ X | ValidTgts$ Creature.YouCtrl+Other | TgtPrompt$ Select another target creature you control | AddKeywords$ Haste | AtEOT$ Exile +SVar:TrigCopy:DB$ CopyPermanent | NumCopies$ X | ValidTgts$ Creature.YouCtrl+Other | TgtPrompt$ Select another target creature you control | PumpKeywords$ Haste | AtEOT$ Exile SVar:X:Count$ThisTurnCast_Instant.YouCtrl,Sorcery.YouCtrl/Plus.1 DeckNeeds:Type$Instant|Sorcery DeckHas:Ability$Token diff --git a/forge-gui/res/cardsfolder/s/saheeli_the_gifted.txt b/forge-gui/res/cardsfolder/s/saheeli_the_gifted.txt index de6bffc6b2d..2b44bd4e965 100644 --- a/forge-gui/res/cardsfolder/s/saheeli_the_gifted.txt +++ b/forge-gui/res/cardsfolder/s/saheeli_the_gifted.txt @@ -8,6 +8,6 @@ SVar:HBReduceCost:Mode$ ReduceCost | EffectZone$ Command | Type$ Spell | ValidCa SVar:TrigCastSpell:Mode$ SpellCast | ValidActivatingPlayer$ You | TriggerZones$ Command | Execute$ RemoveEffect | Static$ True SVar:RemoveEffect:DB$ ChangeZone | Origin$ Command | Destination$ Exile SVar:X:Count$Valid Artifact.YouCtrl -A:AB$ CopyPermanent | Cost$ SubCounter<7/LOYALTY> | Planeswalker$ True | Ultimate$ True | Defined$ Valid Artifact.YouCtrl | AddKeywords$ Haste | AtEOT$ Exile | AILogic$ DuplicatePerms | SpellDescription$ For each artifact you control, create a token that's a copy of it. Those tokens gain haste. Exile those tokens at the beginning of the next end step. +A:AB$ CopyPermanent | Cost$ SubCounter<7/LOYALTY> | Planeswalker$ True | Ultimate$ True | Defined$ Valid Artifact.YouCtrl | PumpKeywords$ Haste | AtEOT$ Exile | AILogic$ DuplicatePerms | SpellDescription$ For each artifact you control, create a token that's a copy of it. Those tokens gain haste. Exile those tokens at the beginning of the next end step. K:CARDNAME can be your commander. Oracle:[+1]: Create a 1/1 colorless Servo artifact creature token.\n[+1]: The next spell you cast this turn costs {1} less to cast for each artifact you control as you cast it.\n[-7]: For each artifact you control, create a token that's a copy of it. Those tokens gain haste. Exile those tokens at the beginning of the next end step.\nSaheeli, the Gifted can be your commander.