Merge branch 'j21_30' into 'master'

J21 - 30 July

See merge request core-developers/forge!5147

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

@@ -0,0 +1,13 @@
+Name:Kiora, the Tide's Fury
+ManaCost:3 U
+Types:Legendary Planeswalker Kiora
+Loyalty:4
+A:AB$ MakeCard | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | Name$ Kraken Hatchling | Zone$ Hand | SpellDescription$ Conjure a Kraken Hatchling card into your hand.
+A:AB$ Untap | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | TgtPrompt$ Select target creature or land | ValidTgts$ Creature,Land | SubAbility$ DBPump | StackDescription$ Untap {c:Targeted}. Prevent all damage that would be dealt to and dealt by that permanent until your next turn. | SpellDescription$ Untap target creature or land. Prevent all damage that would be dealt to and dealt by that permanent until your next turn.
+SVar:DBPump:DB$ Pump | Defined$ Targeted | KW$ Prevent all damage that would be dealt to and dealt by CARDNAME. | Duration$ UntilYourNextTurn | StackDescription$ None
+A:AB$ Sacrifice | Cost$ SubCounter<3/LOYALTY> | Planeswalker$ True | Optional$ True | SacValid$ Kraken | Amount$ 1 | RememberSacrificed$ True | SubAbility$ DBToken | StackDescription$ SpellDescription | SpellDescription$ You may sacrifice a Kraken. If you do, create an 8/8 blue Kraken creature token.
+SVar:DBToken:DB$ Token | TokenScript$ u_8_8_kraken | ConditionDefined$ Remembered | ConditionPresent$ Card | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+DeckHas:Ability$Token & Ability$Sacrifice
+DeckHints:Type$Kraken
+Oracle:[+1]: Conjure a Kraken Hatchling card into your hand.\n[+1]: Untap target creature or land. Prevent all damage that would be dealt to and dealt by that permanent until your next turn.\n[-3]: You may sacrifice a Kraken. If you do, create an 8/8 blue Kraken creature token.

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

@@ -0,0 +1,14 @@
+Name:Longtusk Stalker
+ManaCost:G
+Types:Creature Cat
+PT:1/1
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigEnergy | TriggerDescription$ Whenever CARDNAME enters the battlefield or attacks, you get {E}.
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigEnergy | Secondary$ True | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME enters the battlefield or attacks, you get {E}.
+SVar:TrigEnergy:DB$ PutCounter | Defined$ You | CounterType$ ENERGY | CounterNum$ 1
+A:AB$ Effect | Cost$ PayEnergy<2> | StaticAbilities$ SelfPerpetualP1P0 | Duration$ Permanent | SubAbility$ DBChooseCard | SpellDescription$ CARDNAME perpetually gets +1/+0. You may choose a creature card in your hand. If you do, that card perpetually gets +1/+0.
+SVar:SelfPerpetualP1P0:Mode$ Continuous | Affected$ Card.EffectSource | AddPower$ 1 | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ EFFECTSOURCE perpetually gets +1/+1.
+SVar:DBChooseCard:DB$ ChooseCard | ChoiceZone$ Hand | Choices$ Card.Creature+YouOwn | ChoiceTitle$ Choose up to one creature card in your hand | MinAmount$ 0 | Amount$ 1 | SubAbility$ DBEffect
+SVar:DBEffect:DB$ Effect | ConditionDefined$ ChosenCard | ConditionPresent$ Card | StaticAbilities$ PerpetualP1P0 | Duration$ Permanent | SubAbility$ DBCleanup
+SVar:PerpetualP1P0:Mode$ Continuous | Affected$ Card.ChosenCard | AddPower$ 1 | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ This card perpetually gets +1/+0.
+SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True
+Oracle:Whenever Longtusk Stalker enters the battlefield or attacks, you get {E}.\nPay {E}{E}: Longtusk Stalker perpetually gets +1/+0. You may choose a creature card in your hand. If you do, that card perpetually gets +1/+0.

forge-gui/res/editions/Jumpstart Historic Horizons.txt

@@ -7,16 +7,30 @@ ScryfallCode=J21
 
 [cards]
 0 C Baffling Defenses
+0 U Boneyard Aberration
+0 C Bounty of the Deep
 0 M Davriel, Soul Broker
 0 C Davriel's Withering
 0 C Ethereal Grasp
 0 C Faceless Agent
+0 M Kiora, the Tide's Fury
+0 C Longtusk Stalker
 0 C Lumbering Lightshield
+0 R Managorger Phoenix
 0 U Manor Guardian
 0 C Plaguecrafter's Familiar
+0 R Pool of Vigorous Growth
 0 C Sarkhan's Scorn
 0 M Sarkhan, Wanderer to Shiv
 0 C Scion of Shiv
+0 U Shoreline Scout
+0 C Skyshroud Ambush
+0 U Static Discharge
 0 R Subversive Acolyte
 0 R Tome of the Infinite
+0 C Veteran Charger
 0 U Wingsteed Trainer
+
+[tokens]
+
+u_8_8_kraken

forge-gui/res/tokenscripts/u_8_8_kraken.txt

@@ -3,4 +3,4 @@ ManaCost:no cost
 Types:Creature Kraken
 Colors:blue
 PT:8/8
-Oracle:
+Oracle: