Merge branch 'master' into 'master'

Restore AI SVars for a couple cards.

See merge request core-developers/forge!1310

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

@@ -2,5 +2,6 @@ Name:Smothering Tithe
 ManaCost:3 W
 Types:Enchantment
 T:Mode$ Drawn | ValidCard$ Card.OppOwn | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever an opponent draws a card, that player may pay {2}. If the player doesn't, you create a colorless Treasure artifact token with flying{T}, Sacrifice this artifact: Add one mana of any color.
-SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_treasure_sac | TokenOwner$ TriggeredPlayer | LegacyImage$ c a treasure sac
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_treasure_sac | TokenOwner$ TriggeredPlayer | LegacyImage$ c treasure
+DeckHas:Ability$Token
 Oracle:Whenever an opponent draws a card, that player may pay {2}. If the player doesn't, you create a colorless Treasure artifact token with "{T}, Sacrifice this artifact: Add one mana of any color."

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

@@ -13,4 +13,5 @@ Name:Threat
 ManaCost:2 R G
 Types:Sorcery
 A:SP$ Token | Cost$ 2 R G | TokenAmount$ 1 | TokenOwner$ You | TokenScript$ rg_4_4_beast_trample | LegacyImage$ rg 4 4 beast trample rna | SpellDescription$ Create a 4/4 red and green Beast creature token with trample.
+DeckHas:Ability$Token
 Oracle:Create a 4/4 red and green Beast creature token with trample.
\ No newline at end of file