Merge branch 'guilds_fxes' into 'master'

Fixes from Wharrgarble

See merge request core-developers/forge!938

forge-game/src/main/java/forge/game/card/CardView.java

@@ -905,13 +905,21 @@ public class CardView extends GameEntityView {
             return get(TrackableProperty.Loyalty);
         }
         void updateLoyalty(Card c) {
-            set(TrackableProperty.Loyalty, c.getCurrentLoyalty());
+            updateLoyalty(c.getCurrentLoyalty());
+        }
+        void updateLoyalty(int loyalty) {
+            set(TrackableProperty.Loyalty, loyalty);
         }
         void updateLoyalty(CardState c) {
             if (CardView.this.getCurrentState() == this) {
                 Card card = c.getCard();
                 if (card != null) {
-                    updateLoyalty(card); //TODO: find a better way to do this
+                    if (card.isInZone(ZoneType.Battlefield)) {
+                        updateLoyalty(card);
+                    } else {
+                        updateLoyalty(c.getBaseLoyalty());
+                    }
+
                     return;
                 }
             }

forge-gui/res/blockdata/printsheets.txt

@@ -1391,11 +1391,6 @@ Woodland Stream
 10 Selesnya Guildgate|GRN
 10 Dimir Guildgate|GRN
 10 Boros Guildgate|GRN
-5 Forest|GRN
-5 Island|GRN
-5 Mountain|GRN
-5 Plains|GRN
-5 Swamp|GRN
 
 [GRN Secret Cards]
 Ral, Caller of Storms
@@ -1405,4 +1400,10 @@ Vraska, Regal Gorgon
 Attendant of Vraska
 Vraska's Stoneglare
 Impervious Greatwurm
-
+Precision Bolt
+Kraul Raider
+Golgari Guildgate|GRN
+Izzet Guildgate|GRN
+Selesnya Guildgate|GRN
+Dimir Guildgate|GRN
+Boros Guildgate|GRN

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

@@ -1,7 +1,7 @@
 Name:Cosmotronic Wave
-ManaCost:3 B
+ManaCost:3 R
 Types:Sorcery
-A:SP$ DamageAll | Cost$ 3 B | ValidCards$ Creature.OppCtrl | NumDmg$ 1 | SubAbility$ DBPumpAll | SpellDescription$ CARDNAME deals 1 damage to each creature your opponents control. Creatures your opponents control can't block this turn.
+A:SP$ DamageAll | Cost$ 3 R | ValidCards$ Creature.OppCtrl | NumDmg$ 1 | SubAbility$ DBPumpAll | SpellDescription$ CARDNAME deals 1 damage to each creature your opponents control. Creatures your opponents control can't block this turn.
 SVar:DBPumpAll:DB$ PumpAll | ValidCards$ Creature.OppCtrl | KW$ HIDDEN CARDNAME can't block. | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 Oracle:Cosmotronic Wave deals 1 damage to each creature your opponents control. Creatures your opponents control can't block this turn.

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

@@ -1,6 +1,6 @@
 Name:Dazzling Lights
 ManaCost:U
 Types:Instant
-A:SP$ Pump | Cost$ U | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -3 | IsCurse$ True | Subability$ DBSurveil | SpellDescription$ Target creature gets -3/-0 until end of turn.
+A:SP$ Pump | Cost$ U | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -3 | IsCurse$ True | Subability$ DBSurveil | SpellDescription$ Target creature gets -3/-0 until end of turn. Surveil 2.
 SVar:DBSurveil:DB$ Surveil | Defined$ You | Amount$ 2
 Oracle:Target creature gets -3/-0 until end of turn.\nSurveil 2. (Look at the top two cards of your library, then put any number of them into your graveyard and the rest on the top of your library in any order.)

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

@@ -1,8 +1,8 @@
 Name:Expansion
-ManaCost:U/R
+ManaCost:U/R U/R
 Types:Instant
 AlternateMode: Split
-A:SP$ CopySpellAbility | Cost$ U/R | ValidTgts$ Instant+cmcLE4,Sorcery+cmcLE4 | TargetType$ Spell | SpellDescription$ Copy target instant or sorcery spell with converted mana cost 4 or less. You may choose new targets for the copy.
+A:SP$ CopySpellAbility | Cost$ U/R U/R | ValidTgts$ Card.Instant+cmcLE4,Card.Sorcery+cmcLE4 | TargetType$ Spell | SpellDescription$ Copy target instant or sorcery spell with converted mana cost 4 or less. You may choose new targets for the copy.
 Oracle:Copy target instant or sorcery spell with converted mana cost 4 or less. You may choose new targets for the copy.
 
 ALTERNATE

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

@@ -1,8 +1,8 @@
 Name:Find
-ManaCost:B/G
+ManaCost:B/G B/G
 Types:Sorcery
 AlternateMode:Split
-A:SP$ ChangeZone | Cost$ B/G | Origin$ Graveyard | Destination$ Hand | TargetMin$ 0 | TargetMax$ 2 | TgtPrompt$ Choose target creature card in your graveyard | ValidTgts$ Creature.YouOwn | SpellDescription$ Return up to two target creature cards from your graveyard to your hand.
+A:SP$ ChangeZone | Cost$ B/G B/G | Origin$ Graveyard | Destination$ Hand | TargetMin$ 0 | TargetMax$ 2 | TgtPrompt$ Choose target creature card in your graveyard | ValidTgts$ Creature.YouOwn | SpellDescription$ Return up to two target creature cards from your graveyard to your hand.
 Oracle:Return up to two target creature cards from your graveyard to your hand.
 
 ALTERNATE

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

@@ -1,7 +1,7 @@
 Name:Hellkite Whelp
 ManaCost:4 R
 Types:Creature Dragon
-PT:3/34
+PT:3/3
 K:Flying
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDealDamage | TriggerDescription$ Whenever CARDNAME attacks, it deals 1 damage to target creature defending player controls.
 SVar:TrigDealDamage:DB$DealDamage | ValidTgts$ Creature.DefenderCtrl | TgtPrompt$ Select target creature defending player controls | NumDmg$ 1

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

@@ -4,7 +4,7 @@ Types:Legendary Creature Dragon Wizard
 PT:5/5
 K:Flying
 K:CARDNAME can't be countered.
-T:Mode$ Drawn | ValidCard$ Instant,Sorcery | TriggerZones$ Battlefield | Execute$ TrigDealDamage | TriggerDescription$ Whenever you draw a card, CARDNAME deals 1 damage to any target.
+T:Mode$ Drawn | ValidCard$ Card.YouOwn | TriggerZones$ Battlefield | Execute$ TrigDealDamage | TriggerDescription$ Whenever you draw a card, CARDNAME deals 1 damage to any target.
 SVar:TrigDealDamage:DB$DealDamage | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 1
 T:Mode$ SpellCast | ValidCard$ Instant,Sorcery | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ Whenever a player casts an instant or sorcery spell, you draw a card.
 SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 1

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

@@ -3,6 +3,6 @@ ManaCost:2 G
 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:DBDestroy:DB$ Destroy | ValidTgts$ Artifact,Enchantment | TgtPrompt$ Select target artifact or enchantment | SpellDescription$ Destroy target artifact or enchantment.
 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/undercity_uprising.txt

@@ -2,6 +2,6 @@ Name:Undercity Uprising
 ManaCost:2 B G
 Types:Sorcery
 A:SP$ PumpAll | Cost$ 2 B G | ValidCards$ Creature.YouCtrl | KW$ Deathtouch | SubAbility$ DBPump | SpellDescription$ Creatures you control gain deathtouch until end of turn. Target creature you control fights target creature you don't control.
-SVar:DBPump:DB$ Pump | ValidTgts$ Creature.YouCtrl | AILogic$ Fight | TgtPrompt$ Choose target creature you control to fight | StackDescription$ None | SubAbility$ DBFight | SpellDescription$ Target creature you control fights target creature you don't control.
+SVar:DBPump:DB$ Pump | ValidTgts$ Creature.YouCtrl | AILogic$ Fight | TgtPrompt$ Choose target creature you control to fight | StackDescription$ None | SubAbility$ DBFight
 SVar:DBFight:DB$ Fight | Defined$ ParentTarget | ValidTgts$ Creature.YouDontCtrl | TgtPrompt$ Choose target creature you don't control to fight
 Oracle:Creatures you control gain deathtouch until end of turn. Target creature you control fights target creature you don't control. (Each deals damage equal to its power to the other.)

forge-gui/res/editions/Guilds of Ravnica.txt

@@ -285,5 +285,8 @@ Booster=10 Common:!fromSheet("GRN Secret Cards"), 3 Uncommon:!fromSheet("GRN Sec
 
 [tokens]
 w_1_1_soldier_lifelink
+w_4_4_angel_flying_vigilance
 u_1_1_bird_illusion_flying
 r_1_1_goblin
+wg_2_2_elf_knight_vigilance
+bg_1_1_insect