refactor Max Speed round 1

forge-game/src/main/java/forge/game/event/GameEventSpeedUp.java

@@ -1,7 +1,15 @@
 package forge.game.event;
 
+import forge.game.player.Player;
+
 public class GameEventSpeedUp extends GameEvent {
 
+    public final Player player;
+
+    public GameEventSpeedUp(Player affected) {
+        player = affected;
+    }
+
     @Override
     public <T> T visit(IGameEventVisitor<T> visitor) {
         return visitor.visit(this);

forge-game/src/main/java/forge/game/player/Player.java

@@ -1974,7 +1974,7 @@ public final void increaseSpeed() {
         if (!maxSpeed()) { // can't increase past 4
             speed++;
             view.updateSpeed(this);
-            game.fireEvent(new GameEventSpeedUp()); //play sound effect
+            game.fireEvent(new GameEventSpeedUp(this)); //play sound effect
         }
     }
     public final void decreaseSpeed() {

forge-gui/res/cardsfolder/upcoming/aether_syphon.txt

@@ -3,6 +3,7 @@ ManaCost:1 U U
 Types:Artifact
 K:Start your engines
 A:AB$ Draw | Cost$ 2 T | SpellDescription$ Draw a card.
-T:Mode$ Drawn | ValidCard$ Card.YouCtrl | TriggerZones$ Battlefield | MaxSpeed$ True | Execute$ TrigMill | TriggerDescription$ Max speed — Whenever you draw a card, each opponent mills two cards.
+S:Mode$ Continuous | CharacteristicDefining$ True | Affected$ Card.Self | Condition$ MaxSpeed | AddTrigger$ DrawTrig | Description$ Max speed — Whenever you draw a card, each opponent mills two cards. (Each opponent puts the top two cards of their library into their graveyard.)
+SVar:DrawTrig:Mode$ Drawn | ValidCard$ Card.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigMill | Secondary$ True | TriggerDescription$ Max speed — Whenever you draw a card, each opponent mills two cards.
 SVar:TrigMill:DB$ Mill | Defined$ Opponent | NumCards$ 2
 Oracle:Start your engines! (If you have no speed, it starts at 1. It increases once on each of your turns when an opponent loses life. Max speed is 4.)\n{2}, {T}: Draw a card.\nMax speed — Whenever you draw a card, each opponent mills two cards. (Each opponent puts the top two cards of their library into their graveyard.)

forge-gui/res/cardsfolder/upcoming/amonkhet_raceway.txt

@@ -3,5 +3,6 @@ ManaCost:no cost
 Types:Land
 K:Start your engines
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
-A:AB$ Pump | PrecostDesc$ Max speed — | Cost$ T | Activation$ MaxSpeed | ValidTgts$ Creature | KW$ Haste | SpellDescription$ Target creature gains haste until end of turn.
+S:Mode$ Continuous | CharacteristicDefining$ True | Affected$ Card.Self | Condition$ MaxSpeed | AddAbility$ ABPump | Description$ Max speed — {T}: Target creature gains haste until end of turn.
+SVar:ABPump:AB$ Pump | Secondary$ True | PrecostDesc$ Max speed — | Cost$ T | ValidTgts$ Creature | KW$ Haste | SpellDescription$ Target creature gains haste until end of turn.
 Oracle:Start your engines! (If you have no speed, it starts at 1. It increases once on each of your turns when an opponent loses life. Max speed is 4.)\n{T}: Add {C}.\nMax speed — {T}: Target creature gains haste until end of turn.

forge-gui/res/cardsfolder/upcoming/avishkar_raceway.txt

@@ -3,6 +3,7 @@ ManaCost:no cost
 Types:Land
 K:Start your engines
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
-A:AB$ Draw | PrecostDesc$ Max speed — | Cost$ 3 T Discard<1/Card> | Activation$ MaxSpeed | SpellDescription$ Draw a card.
+S:Mode$ Continuous | CharacteristicDefining$ True | Affected$ Card.Self | Condition$ MaxSpeed | AddAbility$ ABDraw | Description$ Max speed — {3}, {T}, Discard a card: Draw a card.
+SVar:ABDraw:AB$ Draw | PrecostDesc$ Max speed — | Cost$ 3 T Discard<1/Card> | Secondary$ True | SpellDescription$ Draw a card.
 DeckHas:Ability$Discard
 Oracle:Start your engines! (If you have no speed, it starts at 1. It increases once on each of your turns when an opponent loses life. Max speed is 4.)\n{T}: Add {C}.\nMax speed — {3}, {T}, Discard a card: Draw a card.

forge-gui/res/cardsfolder/upcoming/burnout_bashtronaut.txt

@@ -5,5 +5,6 @@ PT:1/1
 K:Menace
 K:Start your engines
 A:AB$ Pump | Cost$ 2 | NumAtt$ +1 | SpellDescription$ This creature gets +1/+0 until end of turn.
-S:Mode$ Continuous | Condition$ MaxSpeed | Affected$ Card.Self | AddKeyword$ Double Strike | Description$ Max speed — This creature has double strike.
+S:Mode$ Continuous | CharacteristicDefining$ True | Affected$ Card.Self | Condition$ MaxSpeed | AddStaticAbility$ MaxSpeedStatic | Description$ Max speed — This creature has double strike.
+SVar:MaxSpeedStatic:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Double Strike | Secondary$ True | Description$ Max speed — This creature has double strike.
 Oracle:Menace\nStart your engines! (If you have no speed, it starts at 1. It increases once on each of your turns when an opponent loses life. Max speed is 4.)\n{2}: This creature gets +1/+0 until end of turn.\nMax speed — This creature has double strike.

forge-gui/res/cardsfolder/upcoming/embalmed_ascendant.txt

@@ -5,8 +5,9 @@ PT:1/2
 K:Start your engines
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When this creature enters, create a 2/2 black Zombie creature token.
 SVar:TrigToken:DB$ Token | TokenScript$ b_2_2_zombie
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigLoseLife | MaxSpeed$ True | TriggerDescription$ Max speed — Whenever a creature you control dies, each opponent loses 1 life and you gain 1 life.
+S:Mode$ Continuous | CharacteristicDefining$ True | Affected$ Card.Self | Condition$ MaxSpeed | AddTrigger$ DiesTrig | Description$ Max speed — Whenever a creature you control dies, each opponent loses 1 life and you gain 1 life.
+SVar:DiesTrig:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigLoseLife | Secondary$ True | TriggerDescription$ Max speed — Whenever a creature you control dies, each opponent loses 1 life and you gain 1 life.
 SVar:TrigLoseLife:DB$ LoseLife | Defined$ Opponent | LifeAmount$ 1 | SubAbility$ DBGainLife
 SVar:DBGainLife:DB$ GainLife | LifeAmount$ 1
-DeckHas:Ability$LifeGain
+DeckHas:Ability$LifeGain|Token
 Oracle:Start your engines! (If you have no speed, it starts at 1. It increases once on each of your turns when an opponent loses life. Max speed is 4.)\nWhen this creature enters, create a 2/2 black Zombie creature token.\nMax speed — Whenever a creature you control dies, each opponent loses 1 life and you gain 1 life.

forge-gui/res/cardsfolder/upcoming/endrider_catalyzer.txt

@@ -3,5 +3,6 @@ ManaCost:1 R
 Types:Creature Human Warrior
 PT:3/1
 K:Start your engines
-A:AB$ Mana | PrecostDesc$ Max speed — | Cost$ T | Produced$ R R | Activation$ MaxSpeed | SpellDescription$ Add {R}{R}.
+S:Mode$ Continuous | CharacteristicDefining$ True | Affected$ Card.Self | Condition$ MaxSpeed | AddAbility$ ABMana | Description$ Max speed — {T}: Add {R}{R}.
+SVar:ABMana:AB$ Mana | PrecostDesc$ Max speed — | Cost$ T | Produced$ R R | Secondary$ True | SpellDescription$ Add {R}{R}.
 Oracle:Start your engines! (If you have no speed, it starts at 1. It increases once on each of your turns when an opponent loses life. Max speed is 4.)\nMax speed — {T}: Add {R}{R}.

forge-gui/res/cardsfolder/upcoming/endrider_spikespitter.txt

@@ -4,9 +4,10 @@ Types:Creature Human Mercenary
 PT:3/4
 K:Reach
 K:Start your engines
-T:Mode$ Phase | Phase$ Upkeep | TriggerZones$ Battlefield | ValidPlayer$ You | MaxSpeed$ True | Execute$ TrigExile | TriggerDescription$ Max speed — At the beginning of your upkeep, exile the top card of your library. You may play that card this turn.
-SVar:TrigExile:DB$ Dig | Defined$ You | DigNum$ 1 | ChangeNum$ All | DestinationZone$ Exile | RememberChanged$ True | SubAbility$ DBEffectYou
-SVar:DBEffectYou:DB$ Effect | RememberObjects$ RememberedCard | StaticAbilities$ Play | SubAbility$ DBCleanup | ExileOnMoved$ Exile
+S:Mode$ Continuous | CharacteristicDefining$ True | Affected$ Card.Self | Condition$ MaxSpeed | AddTrigger$ PhaseTrig | Description$ Max speed — At the beginning of your upkeep, exile the top card of your library. You may play that card this turn.
+SVar:PhaseTrig:Mode$ Phase | Phase$ Upkeep | TriggerZones$ Battlefield | ValidPlayer$ You | Secondary$ True | Execute$ TrigExile | TriggerDescription$ Max speed — At the beginning of your upkeep, exile the top card of your library. You may play that card this turn.
+SVar:TrigExile:DB$ Dig | Defined$ You | DigNum$ 1 | ChangeNum$ All | DestinationZone$ Exile | RememberChanged$ True | SubAbility$ DBEffect
+SVar:DBEffect:DB$ Effect | RememberObjects$ RememberedCard | StaticAbilities$ Play | SubAbility$ DBCleanup | ExileOnMoved$ Exile
 SVar:Play:Mode$ Continuous | MayPlay$ True | EffectZone$ Command | Affected$ Card.IsRemembered | AffectedZone$ Exile | Description$ You may play the exiled card this turn.
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-Oracle:Reach\nStart your engines! (If you have no speed, it starts at 1. It increases once on each of your turns when an opponent loses life. Max speed is 4.)\nMax speed — At the beginning of your upkeep, exile the top card of your library. You may play that card this turn.
+Oracle:Reach\nStart your engines! (If you have no speed, it starts at 1. It increases once on each of your turns when an opponent loses life. Max speed is 4.)\nMax speed — At the beginning of your upkeep, exile the top card of your library. You may play that card this turn.

forge-gui/res/cardsfolder/upcoming/far_fortune_end_boss.txt

@@ -5,6 +5,7 @@ PT:4/5
 K:Start your engines
 T:Mode$ AttackersDeclared | AttackingPlayer$ You | Execute$ TrigDamage | TriggerZones$ Battlefield | TriggerDescription$ Whenever you attack, NICKNAME deals 1 damage to each opponent.
 SVar:TrigDamage:DB$ DealDamage | NumDmg$ 1 | Defined$ Opponent
-R:Event$ DamageDone | MaxSpeed$ True | ActiveZones$ Battlefield | ValidSource$ Card.YouCtrl | ValidTarget$ Player.Opponent,Permanent.OppCtrl | ReplaceWith$ DmgPlus | Description$ Max speed — If a source you control would deal damage to an opponent or a permanent an opponent controls, it deals that much damage plus 1 instead.
+S:Mode$ Continuous | CharacteristicDefining$ True | Affected$ Card.Self | Condition$ MaxSpeed | AddReplacementEffect$ DamageRep | Description$ Max speed — If a source you control would deal damage to an opponent or a permanent an opponent controls, it deals that much damage plus 1 instead.
+SVar:DamageRep:Event$ DamageDone | MaxSpeed$ True | ActiveZones$ Battlefield | ValidSource$ Card.YouCtrl | ValidTarget$ Player.Opponent,Permanent.OppCtrl | ReplaceWith$ DmgPlus | Secondary$ True | Description$ Max speed — If a source you control would deal damage to an opponent or a permanent an opponent controls, it deals that much damage plus 1 instead.
 SVar:DmgPlus:DB$ ReplaceEffect | VarName$ DamageAmount | VarValue$ ReplaceCount$DamageAmount/Plus.1
 Oracle:Start your engines! (If you have no speed, it starts at 1. It increases once on each of your turns when an opponent loses life. Max speed is 4.)\nWhenever you attack, Far Fortune deals 1 damage to each opponent.\nMax speed — If a source you control would deal damage to an opponent or a permanent an opponent controls, it deals that much damage plus 1 instead.

forge-gui/res/cardsfolder/upcoming/gas_guzzler.txt

@@ -5,6 +5,7 @@ PT:2/1
 K:Start your engines
 R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplacementResult$ Updated | ReplaceWith$ ETBTapped | Description$ This creature enters tapped.
 SVar:ETBTapped:DB$ Tap | Defined$ Self | ETB$ True
-A:AB$ Draw | PrecostDesc$ Max speed — | Cost$ B Sac<1/Vehicle.Other;Creature.Other/another creature or Vehicle> | Activation$ MaxSpeed | SpellDescription$ Draw a card.
+S:Mode$ Continuous | CharacteristicDefining$ True | Affected$ Card.Self | Condition$ MaxSpeed | AddAbility$ ABDraw | Description$ Max speed — {B}, Sacrifice another creature or Vehicle: Draw a card.
+SVar:ABDraw:AB$ Draw | PrecostDesc$ Max speed — | Cost$ B Sac<1/Vehicle.Other;Creature.Other/another creature or Vehicle> | Secondary$ True | SpellDescription$ Draw a card.
 DeckHas:Ability$Sacrifice
 Oracle:Start your engines! (If you have no speed, it starts at 1. It increases once on each of your turns when an opponent loses life. Max speed is 4.)\nThis creature enters tapped.\nMax speed — {B}, Sacrifice another creature or Vehicle: Draw a card.

forge-gui/res/cardsfolder/upcoming/gastal_raider.txt

@@ -5,5 +5,6 @@ PT:2/1
 K:Start your engines
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDiscard | TriggerDescription$ When this creature enters, target opponent reveals their hand. You choose an instant or sorcery card from it. That player discards that card.
 SVar:TrigDiscard:DB$ Discard | ValidTgts$ Opponent | NumCards$ 1 | Mode$ RevealYouChoose | DiscardValid$ Instant,Sorcery
-S:Mode$ Continuous | Condition$ MaxSpeed | Affected$ Card.Self | AddPower$ 1 | AddToughness$ 1 | AddKeyword$ Menace | Description$ Max speed — This creature gets +1/+1 and has menace.
-Oracle:Start your engines!\nWhen this creature enters, target opponent reveals their hand. You choose an instant or sorcery card from it. That player discards that card.\nMax speed — This creature gets +1/+1 and has menace.
+S:Mode$ Continuous | CharacteristicDefining$ True | Affected$ Card.Self | Condition$ MaxSpeed | AddStaticAbility$ MaxSpeedStatic | Description$ Max speed — This creature gets +1/+1 and has menace.
+SVar:MaxSpeedStatic:Mode$ Continuous | Secondary$ True | Affected$ Card.Self | AddPower$ 1 | AddToughness$ 1 | AddKeyword$ Menace | Description$ Max speed — This creature gets +1/+1 and has menace.
+Oracle:Start your engines!\nWhen this creature enters, target opponent reveals their hand. You choose an instant or sorcery card from it. That player discards that card.\nMax speed — This creature gets +1/+1 and has menace.

forge-gui/res/cardsfolder/upcoming/gastal_thrillseeker.txt

@@ -6,5 +6,7 @@ K:Start your engines
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDealDamage | TriggerDescription$ When this creature enters, it deals 1 damage to target opponent and you gain 1 life.
 SVar:TrigDealDamage:DB$ DealDamage | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | NumDmg$ 1 | SubAbility$ DBGainLife
 SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 1
-S:Mode$ Continuous | Condition$ MaxSpeed | Affected$ Card.Self | AddKeyword$ Deathtouch & Haste | Description$ Max speed — This creature has deathtouch and haste.
-Oracle:Start your engines! (If you have no speed, it starts at 1. It increases once on each of your turns when an opponent loses life. Max speed is 4.)\nWhen this creature enters, it deals 1 damage to target opponent and you gain 1 life.\nMax speed — This creature has deathtouch and haste.
+S:Mode$ Continuous | CharacteristicDefining$ True | Affected$ Card.Self | Condition$ MaxSpeed | AddStaticAbility$ MaxSpeedStatic | Description$ Max speed — This creature has deathtouch and haste.
+SVar:MaxSpeedStatic:Mode$ Continuous | Secondary$ True | Affected$ Card.Self | AddKeyword$ Deathtouch & Haste | Description$ Max speed — This creature has deathtouch and haste.
+DeckHas:Ability$LifeGain
+Oracle:Start your engines! (If you have no speed, it starts at 1. It increases once on each of your turns when an opponent loses life. Max speed is 4.)\nWhen this creature enters, it deals 1 damage to target opponent and you gain 1 life.\nMax speed — This creature has deathtouch and haste.

forge-gui/res/cardsfolder/upcoming/glitch_ghost_surveyor.txt

@@ -4,5 +4,6 @@ Types:Creature Spirit Scout
 PT:2/2
 K:Flying
 K:Start your engines
-A:AB$ Draw | Cost$ 3 ExileFromGrave<1/CARDNAME> | ActivationZone$ Graveyard | Activation$ MaxSpeed | PrecostDesc$ Max speed — | SpellDescription$ Draw a card.
-Oracle:Flying\nStart your engines! (If you have no speed, it starts at 1. It increases once on each of your turns when an opponent loses life. Max speed is 4.)\nMax speed — {3}, Exile this card from your graveyard: Draw a card.
+S:Mode$ Continuous | CharacteristicDefining$ True | Affected$ Card.Self | Condition$ MaxSpeed | AddAbility$ ABDraw | Description$ Max speed — {3}, Exile this card from your graveyard: Draw a card.
+SVar:ABDraw:AB$ Draw | PrecostDesc$ Max speed — | Cost$ 3 ExileFromGrave<1/CARDNAME/this card> | ActivationZone$ Graveyard | Secondary$ True | SpellDescription$ Draw a card.
+Oracle:Flying\nStart your engines! (If you have no speed, it starts at 1. It increases once on each of your turns when an opponent loses life. Max speed is 4.)\nMax speed — {3}, Exile this card from your graveyard: Draw a card.

forge-gui/res/cardsfolder/upcoming/goblin_surveyor.txt

@@ -4,5 +4,6 @@ Types:Creature Goblin Scout
 PT:3/2
 K:Trample
 K:Start your engines
-A:AB$ Draw | Cost$ 3 ExileFromGrave<1/CARDNAME> | ActivationZone$ Graveyard | Activation$ MaxSpeed | PrecostDesc$ Max speed — | SpellDescription$ Draw a card.
+S:Mode$ Continuous | CharacteristicDefining$ True | Affected$ Card.Self | Condition$ MaxSpeed | AddAbility$ ABDraw | Description$ Max speed — {3}, Exile this card from your graveyard: Draw a card.
+SVar:ABDraw:AB$ Draw | PrecostDesc$ Max speed — | Cost$ 3 ExileFromGrave<1/CARDNAME/this card> | ActivationZone$ Graveyard | Secondary$ True | SpellDescription$ Draw a card.
 Oracle:Trample\nStart your engines! (If you have no speed, it starts at 1. It increases once on each of your turns when an opponent loses life. Max speed is 4.)\nMax speed — {3}, Exile this card from your graveyard: Draw a card.

forge-gui/res/cardsfolder/upcoming/hazoret_godseeker.txt

@@ -7,5 +7,5 @@ K:Haste
 K:Start your engines
 A:AB$ Effect | Cost$ 1 T | ValidTgts$ Creature.powerLE2 | TgtPrompt$ Select target creature with power 2 or less | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable | AILogic$ Pump | StackDescription$ {c:Targeted} can't be blocked this turn. | SpellDescription$ Target creature with power 2 or less can't be blocked this turn.
 SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ This creature can't be blocked this turn.
-S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ CARDNAME can't attack or block. | CheckSVar$ Count$YourSpeed | SVarCompare$ NE4 | Description$ NICKNAME can't attack or block unless you have max speed.
+S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ CARDNAME can't attack or block. | CheckSVar$ PlayerCountPropertyYou$HasPropertyMaxSpeed | SVarCompare$ NE1 | Description$ NICKNAME can't attack or block unless you have max speed.
 Oracle:Indestructible, haste\nStart your engines! (If you have no speed, it starts at 1. It increases once on each of your turns when an opponent loses life. Max speed is 4.)\n{1}, {T}: Target creature with power 2 or less can't be blocked this turn.\nHazoret can't attack or block unless you have max speed.

forge-gui/res/cardsfolder/upcoming/hour_of_victory.txt

@@ -4,6 +4,7 @@ Types:Enchantment
 K:Start your engines
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When this enchantment enters, create a 2/2 black Zombie creature token.
 SVar:TrigToken:DB$ Token | TokenScript$ b_2_2_zombie
-A:AB$ ChangeZone | PrecostDesc$ Max speed — | Cost$ 1 B Sac<1/CARDNAME/this enchantment> | Origin$ Library | Destination$ Hand | ChangeType$ Card | ChangeNum$ 1 | SorcerySpeed$ True | Activation$ MaxSpeed | SpellDescription$ Search your library for a card, put it into your hand, then shuffle. Activate only as a sorcery.
+S:Mode$ Continuous | CharacteristicDefining$ True | Affected$ Card.Self | Condition$ MaxSpeed | AddAbility$ ABTutor | Description$ Max speed — {1}{B}, Sacrifice this enchantment: Search your library for a card, put it into your hand, then shuffle. Activate only as a sorcery.
+SVar:ABTutor:AB$ ChangeZone | PrecostDesc$ Max speed — | Cost$ 1 B Sac<1/CARDNAME/this enchantment> | Origin$ Library | Destination$ Hand | ChangeType$ Card | ChangeNum$ 1 | SorcerySpeed$ True | Secondary$ True | SpellDescription$ Search your library for a card, put it into your hand, then shuffle. Activate only as a sorcery.
 DeckHas:Ability$Token|Sacrifice
 Oracle:Start your engines!\nWhen this enchantment enters, create a 2/2 black Zombie creature token.\nMax speed — {1}{B}, Sacrifice this enchantment: Search your library for a card, put it into your hand, then shuffle. Activate only as a sorcery.