Merge branch 'master' of https://git.cardforge.org/core-developers/forge

forge-gui-mobile/src/forge/assets/ImageCache.java

@@ -233,6 +233,8 @@ public class ImageCache {
         CardView.CardStateView state = c.getCurrentState();
         if (state.getSetCode().contains("MPS_"))
             return true;
+        if (state.getSetCode().equalsIgnoreCase("UST"))
+            return true;
         return false;
     }
     public static boolean isExtendedArt(IPaperCard c) {
@@ -241,6 +243,8 @@ public class ImageCache {
 
         if (c.getEdition().contains("MPS_"))
             return true;
+        if (c.getEdition().equalsIgnoreCase("UST"))
+            return true;
         return false;
     }
     public static FImage getBorderImage(CardView c, boolean canshow) {

forge-gui/res/cardsfolder/a/adaptive_automaton.txt

@@ -6,5 +6,6 @@ K:ETBReplacement:Other:ChooseCT
 SVar:ChooseCT:DB$ ChooseType | Type$ Creature | AILogic$ MostProminentInComputerDeck | SpellDescription$ As CARDNAME enters the battlefield, choose a creature type.
 S:Mode$ Continuous | EffectZone$ All | Affected$ Card.Self | CharacteristicDefining$ True | AddType$ ChosenType | Description$ CARDNAME is the chosen type in addition to its other types.
 S:Mode$ Continuous | Affected$ Creature.ChosenType+Other+YouCtrl | AddPower$ 1 | AddToughness$ 1 | Description$ Other creatures you control of the chosen type get +1/+1.
+SVar:PlayMain1:TRUE
 SVar:Picture:http://www.wizards.com/global/images/magic/general/adaptive_automaton.jpg
 Oracle:As Adaptive Automaton enters the battlefield, choose a creature type.\nAdaptive Automaton is the chosen type in addition to its other types.\nOther creatures you control of the chosen type get +1/+1.

forge-gui/res/cardsfolder/a/avenger_of_zendikar.txt

@@ -6,7 +6,7 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.S
 SVar:TrigToken:DB$Token | TokenAmount$ X | TokenScript$ g_0_1_plant | TokenOwner$ You | LegacyImage$ g 0 1 plant wwk | References$ X
 SVar:X:Count$NumTypeYouCtrl.Land
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounterAll | OptionalDecider$ You | TriggerDescription$ Landfall — Whenever a land enters the battlefield under your control, you may put a +1/+1 counter on each Plant creature you control.
-SVar:TrigPutCounterAll:DB$PutCounterAll | ValidCards$ Creature.Plant+YouCtrl | CounterType$ P1P1 | CounterNum$ 1
+SVar:TrigPutCounterAll:DB$PutCounterAll | ValidCards$ Creature.Plant+YouCtrl | CounterType$ P1P1 | CounterNum$ 1 | AILogic$ Always
 SVar:BuffedBy:Land
 SVar:Picture:http://www.wizards.com/global/images/magic/general/avenger_of_zendikar.jpg
 Oracle:When Avenger of Zendikar enters the battlefield, create a 0/1 green Plant creature token for each land you control.\nLandfall — Whenever a land enters the battlefield under your control, you may put a +1/+1 counter on each Plant creature you control.

forge-gui/res/cardsfolder/m/merfolk_skydiver.txt

@@ -6,6 +6,7 @@ K:Flying
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPutCounter | TriggerDescription$ When CARDNAME enters the battlefield, put a +1/+1 counter on target creature you control.
 SVar:TrigPutCounter:DB$PutCounter | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | CounterType$ P1P1 | CounterNum$ 1
 A:AB$ Proliferate | Cost$ 3 G U | SpellDescription$ Proliferate.
+SVar:PlayMain1:TRUE
 DeckHas:Ability$Proliferate & Ability$Counters
 DeckNeeds:Ability$Counters
 Oracle:Flying\nWhen Merfolk Skydiver enters the battlefield, put a +1/+1 counter on target creature you control.\n{3}{G}{U}: Proliferate. (Choose any number of permanents and/or players, then give each another counter of each kind already there.)

forge-gui/res/cardsfolder/o/oko_the_trickster.txt

@@ -3,7 +3,7 @@ ManaCost:4 G U
 Types:Legendary Planeswalker Oko
 Loyalty:4
 A:AB$ PutCounter | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | TargetMin$ 0 | TargetMax$ 1 | CounterType$ P1P1 | CounterNum$ 2 | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | SpellDescription$ Put two +1/+1 counters on up to one target creature you control.
-A:AB$ Clone | Cost$ AddCounter<0/LOYALTY> | ValidTgts$ Creature.YouCtrl | Planeswalker$ True | TgtPrompt$ Select target creature you control | SubAbility$ DBPrevent | StackDescription$ SpellDescription | SpellDescription$ Until end of turn, CARDNAME becomes a copy of target creature you control. Prevent all damage that would be dealt to him this turn.
+A:AB$ Clone | Cost$ AddCounter<0/LOYALTY> | ValidTgts$ Creature.YouCtrl | Planeswalker$ True | TgtPrompt$ Select target creature you control | Duration$ UntilEndOfTurn | SubAbility$ DBPrevent | StackDescription$ SpellDescription | SpellDescription$ Until end of turn, CARDNAME becomes a copy of target creature you control. Prevent all damage that would be dealt to him this turn.
 SVar:DBPrevent:DB$ Pump | Defined$ Self | KW$ Prevent all damage that would be dealt to CARDNAME.
 A:AB$ AnimateAll | Cost$ SubCounter<7/LOYALTY> | Planeswalker$ True | Ultimate$ True | ValidCards$ Creature.YouCtrl | Power$ 10 | Toughness$ 10 | Keywords$ Trample | SpellDescription$ Until end of turn, each creature you control has base power and toughness 10/10 and gains trample.
 DeckHas:Ability$Counters

forge-gui/res/cardsfolder/p/pollenbright_druid.txt

@@ -6,5 +6,6 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.S
 SVar:TrigCharm:DB$ Charm | Choices$ DBCounter,DBProliferate
 SVar:DBCounter:DB$ PutCounter | ValidTgts$ Creature | Tgtprompt$ Select target creature | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Put a +1/+1 counter on target creature.
 SVar:DBProliferate:DB$ Proliferate | SpellDescription$ Proliferate (Choose any number of permanents and/or players, then give each another counter of each kind already there.)
+SVar:PlayMain1:TRUE
 DeckHas:Ability$Counters & Ability$Proliferate
 Oracle:When Pollenbright Druid enters the battlefield, choose one - \n• Put a +1/+1 counter on target creature.\n• Proliferate. (Choose any number of permanents and/or players, then give each another counter of each kind already there.)

forge-gui/res/cardsfolder/t/tezzeret_cruel_machinist.txt

@@ -3,7 +3,7 @@ ManaCost:4 U U
 Loyalty:4
 Types:Legendary Planeswalker Tezzeret
 A:AB$ Draw | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | NumCards$ 1 | Defined$ You | SpellDescription$ Draw a card.
-A:AB$ Animate | Cost$ AddCounter<0/LOYALTY> | Planeswalker$ True | ValidTgts$ Artifact.YouCtrl | TgtPrompt$ Select target artifact you control | Power$ 5 | Toughness$ 5 | Types$ Artifact | SpellDescription$ Until your next turn, target artifact you control becomes a 5/5 creature in addition to its other types.
+A:AB$ Animate | Cost$ AddCounter<0/LOYALTY> | Planeswalker$ True | ValidTgts$ Artifact.YouCtrl | TgtPrompt$ Select target artifact you control | Power$ 5 | Toughness$ 5 | Types$ Artifact | UntilYourNextTurn$ True | SpellDescription$ Until your next turn, target artifact you control becomes a 5/5 creature in addition to its other types.
 A:AB$ ChangeZone | Cost$ SubCounter<7/LOYALTY> | Planeswalker$ True | Ultimate$ True | Origin$ Hand | Destination$ Battlefield | ChangeType$ Card | ChangeNum$ X | References$ X | FaceDown$ True | FaceDownPower$ 5 | FaceDownToughness$ 5 | FaceDownAddType$ Artifact,Creature | StackDescription$ SpellDescription | SpellDescription$ Put any number of cards from your hand onto the battlefield face down. They're 5/5 artifact creatures.
 SVar:X:Count$InYourHand
 Oracle:[+1]: Draw a card.\n[0]: Until your next turn, target artifact you control becomes a 5/5 creature in addition to its other types.\n[-7]: Put any number of cards from your hand onto the battlefield face down. They're 5/5 artifact creatures.

forge-gui/res/cardsfolder/t/thirsting_bloodlord.txt

@@ -3,6 +3,7 @@ ManaCost:2 B B
 Types:Creature Vampire
 PT:3/3
 S:Mode$ Continuous | Affected$ Creature.Vampire+Other+YouCtrl | AddPower$ 1 | AddToughness$ 1 | Description$ Other Vampires you control get +1/+1.
+SVar:PlayMain1:TRUE
 DeckHints:Type$Vampire
 SVar:BuffedBy:Vampire
 Oracle:Other Vampires you control get +1/+1.

forge-gui/res/cardsfolder/t/thoughtbound_phantasm.txt

@@ -3,9 +3,9 @@ ManaCost:U
 Types:Creature Spirit
 PT:2/2
 K:Defender
-T:Mode$ Surveil | ValidPlayer$ You | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever you surveil, put a +1/+1 counter on CARDNAME
+T:Mode$ Surveil | ValidPlayer$ You | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever you surveil, put a +1/+1 counter on CARDNAME.
 SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
-S:Mode$ Continuous | Affected$ Card.Self+counters_GE3_P1P1 | AddHiddenKeyword$ CARDNAME can attack as though it didn't have defender. | Description$ As long as CARDNAME has three or more +1/+1 counters on it, it can attack
+S:Mode$ Continuous | Affected$ Card.Self+counters_GE3_P1P1 | AddHiddenKeyword$ CARDNAME can attack as though it didn't have defender. | Description$ As long as CARDNAME has three or more +1/+1 counters on it, it can attack as though it didn't have defender.
 DeckNeeds:Ability$Surveil
 DeckHas:Ability$Counters
 Oracle:Defender\nWhenever you surveil, put a +1/+1 counter on Thoughtbound Phantasm.\nAs long as Thoughtbound Phantasm has three or more +1/+1 counters on it, it can attack as though it didn't have defender.

forge-gui/res/editions/Game Night 2019.txt

@@ -0,0 +1,80 @@
+[metadata]
+Code=GN2
+Date=2019-11-15
+Name=Game Night 2019
+Code2=GN2
+MciCode=gn2
+Type=Other
+
+[cards]
+1 M Highcliff Felidar
+2 M Sphinx of Enlightenment
+3 M Calculating Lich
+4 M Fiendish Duo
+5 M Earthshaker Giant
+6 U Consul's Lieutenant
+7 C Fiend Binder
+8 R Kytheon's Irregulars
+9 C Mighty Leap
+10 U Patron of the Valiant
+11 U Relief Captain
+12 U Steppe Glider
+13 C Take Vengeance
+14 C Topan Freeblade
+15 R Zetalpa, Primal Dawn
+16 C Aven Wind Mage
+17 C Claustrophobia
+18 U Cryptic Serpent
+19 C Decision Paralysis
+20 C Dramatic Reversal
+21 R Engulf the Shore
+22 U Galestrike
+23 U Rise from the Tides
+24 R River's Rebuke
+25 C Salvager of Secrets
+26 U Accursed Horde
+27 C Carrion Screecher
+28 C Crow of Dark Tidings
+29 C Gavony Unhallowed
+30 U Grasp of Darkness
+31 R Liliana's Mastery
+32 U Lord of the Accursed
+33 U Rise from the Grave
+34 C Tattered Mummy
+35 R Torgaar, Famine Incarnate
+36 R Akoum Hellkite
+37 C Brute Strength
+38 C Destructive Tampering
+39 U Dragon Egg
+40 C Kargan Dragonrider
+41 R Lathliss, Dragon Queen
+42 C Lightning Strike
+43 C Sparktongue Dragon
+44 C Voldaren Duelist
+45 C Zealot of the God-Pharaoh
+46 U Crested Herdcaller
+47 R Ghalta, Primal Hunger
+48 C Grazing Whiptail
+49 U Ranging Raptors
+50 R Ripjaw Raptor
+51 C Spidery Grasp
+52 U Thunderherd Migration
+53 U Thundering Spineback
+54 U Howling Golem
+55 L Plains
+56 L Plains
+57 L Island
+58 L Island
+59 L Swamp
+60 L Swamp
+61 L Mountain
+62 L Mountain
+63 L Forest
+64 L Forest
+
+[tokens]
+w_1_1_soldier
+g_3_3_dinosaur_trample
+b_2_2_zombie
+r_5_5_dragon_flying
+g_2_2_wolf

forge-gui/res/languages/es-ES.properties

@@ -1382,21 +1382,21 @@ lblVoters=Votantes
 #PermanentCreatureEffect.java
 lblCreature=Criatura
 #LimitedWinLoseController.java
-btnRestartRound=Restart Round
+btnRestartRound=Reiniciar Ronda
-btnTournamentInfo=Tournament Info
+btnTournamentInfo=Info del Torneo
-btnNextRound=Next Round
+btnNextRound=Siguiente Ronda
-btnWonRound=YOU HAVE WON ROUND 
+btnWonRound=HAS GANADO LA RONDA 
-btnWonTournament=***CONGRATULATIONS! YOU HAVE WON THE TOURNAMENT!***
+btnWonTournament=***¡FELICIDADES! ¡HAS GANADO EL TORNEO!***
-btnLoseRound=YOU HAVE LOST ON ROUND 
+btnLoseRound=HAS PERDIDO EN LA RONDA 
-btnQuit=Quit
+btnQuit=Salir
-btnContinue=Continue
+btnContinue=Continuar
-btnRestart=Restart
+btnRestart=Reiniciar
 #TournamentWinLoseController.java
-btnSaveQuit=Save and Quit
+btnSaveQuit=Guardar y Salir
-lblCongratulations=CONGRATULATIONS!
+lblCongratulations=¡FELICIDADES!
-lblThroughTournament=You made it through the tournament!
+lblThroughTournament=¡Lograste superar el torneo!
-lblDefeated=DEFEATED!
+lblDefeated=¡DERROTADO!
-lblFailedTournament=You have failed to pass the tournament.
+lblFailedTournament=No has conseguido pasar el torneo.
 #GauntletWinLoseController.java
-lblGauntletTournament=You made it through the gauntlet!
+lblGauntletTournament=¡Conseguiste superar el desafío!
-lblFailedGauntlet=You have failed to pass the gauntlet.
+lblFailedGauntlet=No has podido superar el desafío.

forge-gui/res/puzzle/PS_ELD6.pzl

@@ -0,0 +1,17 @@
+[metadata]
+Name:Possibility Storm - Throne of Eldraine #06
+URL:http://www.possibilitystorm.com/wp-content/uploads/2019/11/137.-ELD6.jpg
+Goal:Win
+Turns:1
+Difficulty:Rare
+Description:Win this turn. Thanks to Charming Prince's Scry 2, you know that you have a Smitten Swordmaster on top of your library.
+[state]
+humanlife=20
+ailife=7
+turn=1
+activeplayer=human
+activephase=MAIN1
+humanhand=Blacklance Paragon;Marauder's Axe;Mask of Immolation;Mace of the Valiant
+humanlibrary=Smitten Swordmaster;Opt;Opt;Opt;Opt;Opt;Opt;Opt;Opt;Opt
+humanbattlefield=Syr Gwyn, Hero of Ashvale;Marauding Raptor;Charming Prince;Plains;Plains;Swamp;Swamp;Mountain;Mountain
+aibattlefield=Grumgully, the Generous;Tajic, Legion's Edge;Gruul Spellbreaker|Counters:P1P1=2