Merge branch 'more_guilds_fixes' into 'master'

More guilds fixes

See merge request core-developers/forge!935

forge-core/src/main/java/forge/item/PaperToken.java

@@ -137,6 +137,6 @@ public class PaperToken implements InventoryItemFromSet, IPaperCard {
 
     @Override
     public String getImageKey(boolean altState) {
-        return ImageKeys.TOKEN_PREFIX + imageFileName;
+        return ImageKeys.TOKEN_PREFIX + imageFileName.replace(" ", "_");
     }
 }

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

@@ -11,6 +11,6 @@ ALTERNATE
 Name:Assemble
 ManaCost:4 G W
 Types:Instant
-A:SP$ Token | Cost$ 4 G W | TokenAmount$ 3 | TokenName$ Elf Knight | TokenTypes$ Creature,Elf,Knight | TokenOwner$ You | TokenColors$ Green,White | TokenPower$ 2 | TokenToughness$ 2 | TokenKeywords$ Vigilance | SpellDescription$ Create three 2/2 green and white Elf Knight creature tokens with vigilance.
+A:SP$ Token | Cost$ 4 G W | TokenAmount$ 3 | TokenScript$ wg_2_2_elf_knight_vigilance | SpellDescription$ Create three 2/2 green and white Elf Knight creature tokens with vigilance.
 DeckHas:Ability$Token
 Oracle:Create three 2/2 green and white Elf Knight creature tokens with vigilance.

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

@@ -4,9 +4,9 @@ Types:Legendary Creature Angel
 PT:2/5
 K:Flying
 K:Mentor
-T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ DBChooseCreature | TriggerDescription$ At the beginning of combat on your turn, choose up to one target creature you control. Until end of turn, that creature gets +2/+0, gains trample if it's red, and gains vigilance if it's white.
+T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ DBPump | TriggerDescription$ At the beginning of combat on your turn, choose up to one target creature you control. Until end of turn, that creature gets +2/+0, gains trample if it's red, and gains vigilance if it's white.
-SVar:DBChooseCreature:DB$ ChooseCard | Defined$ You | Amount$ 1 | Choices$ Creature.YouCtrl | ChoiceTitle$ Choose a creature | SubAbility$ DBPumpAll | SpellDescription$ At the beginning of combat on your turn, choose up to one target creature you control. Until end of turn, that creature gets +2/+0, gains trample if it's red, and gains vigilance if it's white.
+SVar:DBPump:DB$ Pump | ValidTgts$ Creature.YouCtrl | NumAtt$ 2 | RememberTargets$ True | SubAbility$ DBPump1
-SVar:DBPumpAll:DB$ Pump | Defined$ ChosenCard | NumAtt$ 2 | NumDef$ 0 | SubAbility$ DBPump1
+SVar:DBPump1:DB$Pump | Defined$ Remembered | KW$ Trample | ConditionDefined$ Remembered | ConditionPresent$ Card.Red | SubAbility$ DBPump2
-SVar:DBPump1:DB$Pump | Defined$ ChosenCard | KW$ Trample | ConditionDefined$ Remembered | ConditionPresent$ Card.Red | SubAbility$ DBPump2
+SVar:DBPump2:DB$Pump | Defined$ Remembered | KW$ Vigilance | ConditionDefined$ Remembered | ConditionPresent$ Card.White | SubAbility$ DBCleanup
-SVar:DBPump2:DB$Pump | Defined$ ChosenCard | KW$ Vigilance | ConditionDefined$ Remembered | ConditionPresent$ Card.White
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 Oracle:Flying\nMentor (Whenever this creature attacks, put a +1/+1 counter on target attacking creature with lesser power.)\nAt the beginning of combat on your turn, choose up to one target creature you control. Until end of turn, that creature gets +2/+0, gains trample if it's red, and gains vigilance if it's white.

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

@@ -4,7 +4,7 @@ Types:Creature Centaur Knight
 PT:4/4
 K:Vigilance
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, create two green and green 2/2 Elf Knight creature tokens with vigilance.
-SVar:TrigToken:DB$ Token | TokenAmount$ 2 | TokenName$ Elf Knight | TokenTypes$ Creature,Elf,Knight | TokenOwner$ You | TokenColors$ Green,White | TokenPower$ 2 | TokenToughness$ 2 | TokenKeywords$ Vigilance
+SVar:TrigToken:DB$ Token | TokenAmount$ 2 | TokenScript$ wg_2_2_elf_knight_vigilance
 DeckHas:Ability$Token
 SVar:SacMe:4
 Oracle:Vigilance\nWhen Conclave Cavalier dies, create two green and white 2/2 Elf Knight creature tokens with vigilance.

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

@@ -3,6 +3,6 @@ ManaCost:G W
 Types:Creature Elf Cleric
 PT:2/2
 A:AB$ PumpAll | Cost$ G T | ValidCards$ Creature.YouCtrl | KW$ Trample | SpellDescription$ Creatures you control gain trample until end of turn.
-A:AB$ Token | Cost$ 5 W T | TokenAmount$ 1 | TokenName$ Elf Knight | TokenTypes$ Creature,Elf,Knight | TokenOwner$ You | TokenColors$ Green,White | TokenPower$ 2 | TokenToughness$ 2 | TokenKeywords$ Vigilance | SpellDescription$ Create a 2/2 green and white Elf Knight creature token with vigilance.
+A:AB$ Token | Cost$ 5 W T | TokenAmount$ 1 | TokenScript$ wg_2_2_elf_knight_vigilance | SpellDescription$ Create a 2/2 green and white Elf Knight creature token with vigilance.
 SVar:RemRandomDeck:True
 Oracle:{G}, {T}: Creatures you control gain trample until end of turn.\n{5}{W}, {T}: Create a 2/2 green and white Elf Knight creature token with vigilance.

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

@@ -3,6 +3,6 @@ ManaCost:1 W
 Types:Enchantment
 T:Mode$ LifeGained | ValidPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigDraw | TriggerDescription$ Whenever you gain life, you may pay {2}. If you do, draw a card.
 SVar:TrigDraw:AB$Draw | Cost$ 2 | Defined$ You | NumCards$ 1
-A:AB$ Token | Cost$ 3 W | TokenAmount$ 1 | TokenName$ Soldier | TokenTypes$ Creature,Soldier | TokenOwner$ You | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Lifelink | TokenImage$ w 1 1 soldier grn | SpellDescription$ Create a 1/1 white Soldier creature token with lifelink.
+A:AB$ Token | Cost$ 3 W | TokenAmount$ 1 | TokenScript$ w_1_1_soldier_lifelink | SpellDescription$ Create a 1/1 white Soldier creature token with lifelink.
 DeckHas:Ability$Token
 Oracle:Whenever you gain life, you may pay {2}. If you do, draw a card.\n{3}{W}: Create a 1/1 white Soldier creature token with lifelink.

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

@@ -3,6 +3,6 @@ ManaCost:W
 Types:Creature Human Soldier
 PT:1/1
 T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | CheckSVar$ AttackerTest | SVarCompare$ GE2 | NoResolvingCheck$ True | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME and at least two other creatures attack, create a 1/1 white Soldier creature token with lifelink.
-SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenName$ Soldier | TokenTypes$ Creature,Soldier | TokenOwner$ You | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Lifelink | TokenImage$ w 1 1 soldier grn
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ w_1_1_soldier_lifelink
 SVar:AttackerTest:Count$Valid Creature.attacking+Other
 Oracle:Whenever Haazda Marshal and at least two other creatures attack, create a 1/1 white Soldier creature token with lifelink.

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

@@ -3,7 +3,7 @@ ManaCost:W
 Types:Creature Human
 PT:1/1
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, create a 1/1 white Soldier creature token with lifelink.
-SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenName$ Soldier | TokenTypes$ Creature,Soldier | TokenOwner$ You | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Lifelink
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ w_1_1_soldier_lifelink
 DeckHas:Ability$Token
 SVar:SacMe:1
 Oracle:When Hunted Witness dies, create a 1/1 white Soldier creature token with lifelink.

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

@@ -3,7 +3,7 @@ ManaCost:2 B B G G
 Types:Legendary Creature Elf Shaman
 PT:2/3
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ Undergrowth - When CARDNAME enters the battlefield, create a 1/1 black and green Insect creature token for each creature card in your graveyard.
-SVar:TrigToken:DB$Token | TokenAmount$ X | TokenName$ Insect | TokenTypes$ Creature,Insect | TokenOwner$ You | TokenColors$ Black,Green | TokenPower$ 1 | TokenToughness$ 1 | TokenImage$ bg 1 1 insect grn | References$ X
+SVar:TrigToken:DB$Token | TokenAmount$ X | TokenName$ Insect | TokenTypes$ Creature,Insect | TokenOwner$ You | TokenColors$ Black,Green | TokenPower$ 1 | TokenToughness$ 1 | TokenImage$ bg 1 1 insect grn | References$ X | TokenScript$ bg_1_1_insect
 SVar:X:Count$TypeInYourYard.Creature
 A:AB$ GainLife | Cost$ B G Sac<1/Creature.Other/another creature> | Defined$ You | LifeAmount$ 1 | SubAbility$ DBDraw | SpellDescription$ You gain 1 life and draw a card.
 SVar:DBDraw:DB$ Draw | NumCards$ 1

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

@@ -10,6 +10,6 @@ SVar:TrigPump:DB$ Pump | NumAtt$ X | References$ X
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Count$Valid Creature.YouCtrl
 SVar:Y:Remembered$Amount
-A:AB$ Token | Cost$ 3 G W | TokenAmount$ 1 | TokenName$ Soldier | TokenTypes$ Creature,Soldier | TokenOwner$ You | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Lifelink | SpellDescription$ Create a 1/1 white Soldier creature token with lifelink.
+A:AB$ Token | Cost$ 3 G W | TokenAmount$ 1 | TokenScript$ w_1_1_soldier_lifelink | SpellDescription$ Create a 1/1 white Soldier creature token with lifelink.
 DeckHas:Ability$Token
 Oracle:Whenever Ledev Champion attacks, you may tap any number of untapped creatures you control. Ledev Champion gets +1/+1 until end of turn for each creature tapped this way.\n{3}{G}{W}: Create a 1/1 white Soldier creature token with lifelink.

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

@@ -2,6 +2,6 @@ Name:March of the Multitudes
 ManaCost:X G W W
 Types:Instant
 K:Convoke
-A:SP$ Token | Cost$ X G W W | TokenAmount$ X | References$ X | TokenName$ Soldier | TokenTypes$ Creature,Soldier | TokenOwner$ You | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Lifelink | TokenImage$ w 1 1 soldier grn | SpellDescription$ Create X 1/1 white Soldier creature tokens with lifelink.
+A:SP$ Token | Cost$ X G W W | TokenAmount$ X | References$ X | TokenScript$ w_1_1_soldier_lifelink | SpellDescription$ Create X 1/1 white Soldier creature tokens with lifelink.
 SVar:X:Count$xPaid
 Oracle:Convoke (Your creatures can help cast this spell. Each creature you tap while casting this spell pays for {1} or one mana of the creature's color.)\nCreate X 1/1 white Soldier creature tokens with lifelink.

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

@@ -4,5 +4,5 @@ Types:Sorcery
 K:Convoke
 A:SP$ Charm | Cost$ 2 G | Choices$ DBToken,DBDestroy
 SVar:DBDestroy:DB$ Destroy | ValidTgts$ Artifact,Creature,Enchantment | TgtPrompt$ Select target artifact, creature or enchantment | SpellDescription$ Destroy target artifact, creature or enchantment.
-SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenName$ Elf Knight | TokenTypes$ Creature,Elf,Knight | TokenOwner$ You | TokenColors$ Green,White | TokenPower$ 2 | TokenToughness$ 2 | TokenKeywords$ Vigilance | SpellDescription$ Create a 2/2 green and white Elf Knight creature token with vigilance.
+SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ wg_2_2_elf_knight_vigilance | SpellDescription$ Create a 2/2 green and white Elf Knight creature token with vigilance.
 Oracle:Convoke (Your creatures can help cast this spell. Each creature you tap while casting this spell pays for {1} or one mana of that creature's color.)\nChoose one —\n• Create a 2/2 green and white Elf Knight creature token with vigilance.\n• Destroy target artifact or enchantment.

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

@@ -1,6 +1,6 @@
 Name:Sworn Companions
 ManaCost:2 W
 Types:Sorcery
-A:SP$ Token | Cost$ 2 W | TokenAmount$ 2 | TokenName$ Soldier | TokenTypes$ Creature,Soldier | TokenOwner$ You | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Lifelink
+A:SP$ Token | Cost$ 2 W | TokenAmount$ 2 | TokenScript$ w_1_1_soldier_lifelink
 DeckHas:Ability$Token
 Oracle:Creature two 1/1 white Soldier creature tokens with lifelink.

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

@@ -4,7 +4,7 @@ Types:Legendary Creature Dryad
 PT:1/4
 S:Mode$ Continuous | Affected$ Creature.Other+YouCtrl | AddPower$ 1 | AddToughness$ 1 | Description$ Other creatures you control get +1/+1.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create two 1/1 white Soldier creature tokens with lifelink.
-SVar:TrigToken:DB$ Token | TokenAmount$ 2 | TokenName$ Soldier | TokenTypes$ Creature,Soldier | TokenOwner$ You | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Lifelink
+SVar:TrigToken:DB$ Token | TokenAmount$ 2 | TokenScript$ w_1_1_soldier_lifelink
 T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigGainControl | TriggerDescription$ At the beginning of your end step, each player gains control of all creatures they own.
 SVar:TrigGainControl:DB$ RepeatEach | RepeatPlayers$ Player | AILogic$ GainControlOwns | RepeatSubAbility$ DBGainControl | SpellDescription$ Each player gains control of all creatures they own.
 SVar:DBGainControl:DB$ GainControl | AllValid$ Creature.RememberedPlayerOwn | NewController$ Player.IsRemembered

forge-gui/res/tokenscripts/bg_1_1_insect.txt

@@ -0,0 +1,6 @@
+Name:Insect
+ManaCost:no cost
+Types:Creature Insect
+Colors:black,green
+PT:1/1
+Oracle:

forge-gui/res/tokenscripts/wg_2_2_elf_knight_vigilance.txt

@@ -0,0 +1,7 @@
+Name:Elf Knight
+ManaCost:no cost
+Types:Creature Elf Knight
+Colors:white,green
+PT:2/2
+K:Vigilance
+Oracle:Vigilance