From bde30f4eb7105110b77068be0970c036e782e37f Mon Sep 17 00:00:00 2001
From: Hanmac <hanmac@gmx.de>
Date: Sat, 28 Sep 2019 12:35:05 +0200
Subject: [PATCH 1/3] cards: update Xantcha and other enter under opponents
 control

---
 forge-gui/res/cardsfolder/c/captive_audience.txt      | 6 +++---
 forge-gui/res/cardsfolder/p/pendant_of_prosperity.txt | 3 ++-
 forge-gui/res/cardsfolder/x/xantcha_sleeper_agent.txt | 8 ++++----
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/forge-gui/res/cardsfolder/c/captive_audience.txt b/forge-gui/res/cardsfolder/c/captive_audience.txt
index 0319045661e..3890127f79a 100644
--- a/forge-gui/res/cardsfolder/c/captive_audience.txt
+++ b/forge-gui/res/cardsfolder/c/captive_audience.txt
@@ -3,7 +3,7 @@ ManaCost:5 B R
 Types:Enchantment
 R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$ DBChooseOpp | Layer$ Control | Description$ CARDNAME enters the battlefield under the control of an opponent of your choice.
 SVar:DBChooseOpp:DB$ ChoosePlayer | Defined$ You | Choices$ Player.Opponent | ChoiceTitle$ Choose an opponent to give control to: | AILogic$ Curse | SubAbility$ MoveToPlay
-SVar:MoveToPlay:DB$ ChangeZone | Hidden$ True | Origin$ All | Destination$ Battlefield | Defined$ ReplacedCard | GainControl$ True |  NewController$ ChosenPlayer | SubAbility$ ClearRemembered
+SVar:MoveToPlay:DB$ ChangeZone | Hidden$ True | Origin$ All | Destination$ Battlefield | Defined$ ReplacedCard | GainControl$ True | NewController$ ChosenPlayer | SubAbility$ ClearRemembered
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigCharm | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your upkeep, ABILITY
 SVar:TrigCharm:DB$ Charm | Choices$ LifePact,DiscardPact,ZombiesPact | ChoiceRestriction$ NotRemembered | RememberChoice$ True | CharmNum$ 1
 SVar:LifePact:DB$ SetLife | Defined$ You | LifeAmount$ 4 | ChoiceName$ LifePact | SpellDescription$ Your life total becomes 4.
@@ -12,7 +12,7 @@ SVar:ZombiesPact:DB$ RepeatEach | RepeatPlayers$ Player.Opponent | RepeatSubAbil
 SVar:MakeZombies:DB$ Token | LegacyImage$ b 2 2 zombie rna | TokenAmount$ 5 | TokenScript$ b_2_2_zombie | TokenOwner$ Remembered | SpellDescription$ Each opponent creates five 2/2 black Zombie creature tokens.
 # Clear RememberChoice just in case it's not getting cleared by Zone changes
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ ClearRemembered | Static$ True
-SVar:ClearRemembered:DB$ Cleanup | ClearRemembered$ True
+SVar:ClearRemembered:DB$ Cleanup | ClearRemembered$ True | ClearChosenPlayer$ True
 AI:RemoveDeck:Random
 DeckHas:Ability$Token
-Oracle:Captive Audience enters the battlefield under the control of an opponent of your choice.\nAt the beginning of your upkeep, choose one that hasn't been chosen —\n• Your life total becomes 4.\n• Discard your hand.\n• Each opponent creates five 2/2 black Zombie creature tokens.
\ No newline at end of file
+Oracle:Captive Audience enters the battlefield under the control of an opponent of your choice.\nAt the beginning of your upkeep, choose one that hasn't been chosen —\n• Your life total becomes 4.\n• Discard your hand.\n• Each opponent creates five 2/2 black Zombie creature tokens.
diff --git a/forge-gui/res/cardsfolder/p/pendant_of_prosperity.txt b/forge-gui/res/cardsfolder/p/pendant_of_prosperity.txt
index 7572ae71d9d..03fbade38af 100644
--- a/forge-gui/res/cardsfolder/p/pendant_of_prosperity.txt
+++ b/forge-gui/res/cardsfolder/p/pendant_of_prosperity.txt
@@ -3,7 +3,8 @@ ManaCost:3
 Types:Artifact
 R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$ DBChooseOpp | Layer$ Control | Description$ CARDNAME enters the battlefield under the control of an opponent of your choice.
 SVar:DBChooseOpp:DB$ ChoosePlayer | Defined$ You | Choices$ Player.Opponent | ChoiceTitle$ Choose an opponent to give control to: | AILogic$ Curse | SubAbility$ MoveToPlay
-SVar:MoveToPlay:DB$ ChangeZone | Hidden$ True | Origin$ All | Destination$ Battlefield | Defined$ ReplacedCard | GainControl$ True |  NewController$ ChosenPlayer
+SVar:MoveToPlay:DB$ ChangeZone | Hidden$ True | Origin$ All | Destination$ Battlefield | Defined$ ReplacedCard | GainControl$ True | NewController$ ChosenPlayer | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearChosenPlayer$ True
 A:AB$ Draw | Cost$ 2 T | NumCards$ 1 | SubAbility$ DBChangeZone | SpellDescription$ Draw a card, then you may put a land card from your hand onto the battlefield. CARDNAME's owner draws a card, then that player may put a land card from their hand onto the battlefield.
 SVar:DBChangeZone:DB$ ChangeZone | Origin$ Hand | Destination$ Battlefield | ChangeType$ Land | ChangeNum$ 1 | SubAbility$ DBDraw
 SVar:DBDraw:DB$ Draw | Defined$ CardOwner | NumCards$ 1 | SubAbility$ DBChangeZone2
diff --git a/forge-gui/res/cardsfolder/x/xantcha_sleeper_agent.txt b/forge-gui/res/cardsfolder/x/xantcha_sleeper_agent.txt
index 6fc19fd142a..d8a1a9c936a 100644
--- a/forge-gui/res/cardsfolder/x/xantcha_sleeper_agent.txt
+++ b/forge-gui/res/cardsfolder/x/xantcha_sleeper_agent.txt
@@ -3,11 +3,11 @@ ManaCost:1 B R
 Types:Legendary Creature Minion
 PT:5/5
 K:CARDNAME attacks each combat if able.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChoose | Static$ True | TriggerDescription$ As CARDNAME enters the battlefield, an opponent gains control of it.
-SVar:TrigChoose:DB$ ChoosePlayer | Defined$ You | Choices$ Player.Opponent | ChoiceTitle$ Choose an opponent to give control to: | AILogic$ Curse | SubAbility$ DBDonate
-SVar:DBDonate:DB$ GainControl | Defined$ Self | NewController$ Player.Chosen | SubAbility$ DBCleanup
+R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$ DBChooseOpp | Layer$ Control | Description$ CARDNAME enters the battlefield under the control of an opponent of your choice.
+SVar:DBChooseOpp:DB$ ChoosePlayer | Defined$ You | Choices$ Player.Opponent | ChoiceTitle$ Choose an opponent to give control to: | AILogic$ Curse | SubAbility$ MoveToPlay
+SVar:MoveToPlay:DB$ ChangeZone | Hidden$ True | Origin$ All | Destination$ Battlefield | Defined$ ReplacedCard | GainControl$ True | NewController$ ChosenPlayer | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearChosenPlayer$ True
 S:Mode$ CantAttack | ValidCard$ Card.Self | Target$ Player.CardOwner,Planeswalker.ControlledBy Player.CardOwner | Description$ CARDNAME can't attack its owner or planeswalkers its owner controls.
 A:AB$ Draw | Cost$ 3 | NumCards$ 1 | AnyPlayer$ True | SubAbility$ DBLoseLife | SpellDescription$ Xantcha's controller loses 2 life and you draw a card. Any player may activate this ability.
 SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ 2 | Defined$ CardController
-Oracle:As Xantcha, Sleeper Agent enters the battlefield, an opponent of your choice gains control of it.\nXantcha attacks each combat if able and can't attack its owner or planeswalkers its owner controls.\n{3}: Xantcha's controller loses 2 life and you draw a card. Any player may activate this ability.
\ No newline at end of file
+Oracle:Xantcha, Sleeper Agent enters the battlefield under the control of an opponent of your choice.\nXantcha attacks each combat if able and can't attack its owner or planeswalkers its owner controls.\n{3}: Xantcha's controller loses 2 life and you draw a card. Any player may activate this ability.

From 74558a88cd8aa72f975ee1086ce171cdbee355c6 Mon Sep 17 00:00:00 2001
From: Hanmac <hanmac@gmx.de>
Date: Sat, 28 Sep 2019 12:36:05 +0200
Subject: [PATCH 2/3] some cards got their effect reverted

---
 forge-gui/res/cardsfolder/d/dwarven_song.txt       | 4 ++--
 forge-gui/res/cardsfolder/h/heavens_gate.txt       | 4 ++--
 forge-gui/res/cardsfolder/s/sea_kings_blessing.txt | 4 ++--
 forge-gui/res/cardsfolder/s/sylvan_paradise.txt    | 4 ++--
 forge-gui/res/cardsfolder/t/touch_of_darkness.txt  | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/forge-gui/res/cardsfolder/d/dwarven_song.txt b/forge-gui/res/cardsfolder/d/dwarven_song.txt
index 51dcb504bea..85ca7ceb8e8 100644
--- a/forge-gui/res/cardsfolder/d/dwarven_song.txt
+++ b/forge-gui/res/cardsfolder/d/dwarven_song.txt
@@ -1,9 +1,9 @@
 Name:Dwarven Song
 ManaCost:R
 Types:Instant
-A:SP$ Animate | Cost$ R | ValidTgts$ Creature | TargetMin$ 0 | TargetMax$ MaxTgts | TgtPrompt$ Select target creatures | Colors$ Red | OverwriteColors$ True | References$ MaxTgts | SpellDescription$ Any number of target creatures become red until end of turn.
+A:SP$ Animate | Cost$ R | ValidTgts$ Creature | TargetMin$ 1 | TargetMax$ MaxTgts | TgtPrompt$ Select target creatures | Colors$ Red | OverwriteColors$ True | References$ MaxTgts | SpellDescription$ One or more target creatures become red until end of turn.
 SVar:MaxTgts:Count$Valid Creature
 AI:RemoveDeck:All
 AI:RemoveDeck:Random
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dwarven_song.jpg
-Oracle:Any number of target creatures become red until end of turn.
+Oracle:One or more target creatures become red until end of turn.
diff --git a/forge-gui/res/cardsfolder/h/heavens_gate.txt b/forge-gui/res/cardsfolder/h/heavens_gate.txt
index 5b30bc8c7b9..46aed713a8f 100644
--- a/forge-gui/res/cardsfolder/h/heavens_gate.txt
+++ b/forge-gui/res/cardsfolder/h/heavens_gate.txt
@@ -1,9 +1,9 @@
 Name:Heaven's Gate
 ManaCost:W
 Types:Instant
-A:SP$ Animate | Cost$ W | ValidTgts$ Creature | TargetMin$ 0 | TargetMax$ MaxTgts | TgtPrompt$ Select target creatures | Colors$ White | OverwriteColors$ True | References$ MaxTgts | SpellDescription$ Any number of target creatures become white until end of turn.
+A:SP$ Animate | Cost$ W | ValidTgts$ Creature | TargetMin$ 1 | TargetMax$ MaxTgts | TgtPrompt$ Select target creatures | Colors$ White | OverwriteColors$ True | References$ MaxTgts | SpellDescription$ One or more target creatures become white until end of turn.
 SVar:MaxTgts:Count$Valid Creature
 AI:RemoveDeck:All
 AI:RemoveDeck:Random
 SVar:Picture:http://www.wizards.com/global/images/magic/general/heavens_gate.jpg
-Oracle:Any number of target creatures become white until end of turn.
+Oracle:One or more target creatures become white until end of turn.
diff --git a/forge-gui/res/cardsfolder/s/sea_kings_blessing.txt b/forge-gui/res/cardsfolder/s/sea_kings_blessing.txt
index a06d0fda19e..db93a6a1906 100644
--- a/forge-gui/res/cardsfolder/s/sea_kings_blessing.txt
+++ b/forge-gui/res/cardsfolder/s/sea_kings_blessing.txt
@@ -1,9 +1,9 @@
 Name:Sea Kings' Blessing
 ManaCost:U
 Types:Instant
-A:SP$ Animate | Cost$ U | ValidTgts$ Creature | TargetMin$ 0 | TargetMax$ MaxTgts | TgtPrompt$ Select target creatures | Colors$ Blue | OverwriteColors$ True | References$ MaxTgts | SpellDescription$ Any number of target creatures become blue until end of turn.
+A:SP$ Animate | Cost$ U | ValidTgts$ Creature | TargetMin$ 1 | TargetMax$ MaxTgts | TgtPrompt$ Select target creatures | Colors$ Blue | OverwriteColors$ True | References$ MaxTgts | SpellDescription$ One or more target creatures become blue until end of turn.
 SVar:MaxTgts:Count$Valid Creature
 AI:RemoveDeck:All
 AI:RemoveDeck:Random
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sea_kings_blessing.jpg
-Oracle:Any number of target creatures become blue until end of turn.
+Oracle:One or more target creatures become blue until end of turn.
diff --git a/forge-gui/res/cardsfolder/s/sylvan_paradise.txt b/forge-gui/res/cardsfolder/s/sylvan_paradise.txt
index 19153d3a7ce..9af5fb4e4f4 100644
--- a/forge-gui/res/cardsfolder/s/sylvan_paradise.txt
+++ b/forge-gui/res/cardsfolder/s/sylvan_paradise.txt
@@ -1,9 +1,9 @@
 Name:Sylvan Paradise
 ManaCost:G
 Types:Instant
-A:SP$ Animate | Cost$ G | ValidTgts$ Creature | TargetMin$ 0 | TargetMax$ MaxTgts | References$ MaxTgts | TgtPrompt$ Select target creatures | Colors$ Green | OverwriteColors$ True | SpellDescription$ Any number of target creatures become green until end of turn.
+A:SP$ Animate | Cost$ G | ValidTgts$ Creature | TargetMin$ 1 | TargetMax$ MaxTgts | References$ MaxTgts | TgtPrompt$ Select target creatures | Colors$ Green | OverwriteColors$ True | SpellDescription$ One or more target creatures become green until end of turn.
 SVar:MaxTgts:Count$Valid Creature
 AI:RemoveDeck:All
 AI:RemoveDeck:Random
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sylvan_paradise.jpg
-Oracle:Any number of target creatures become green until end of turn.
+Oracle:One or more target creatures become green until end of turn.
diff --git a/forge-gui/res/cardsfolder/t/touch_of_darkness.txt b/forge-gui/res/cardsfolder/t/touch_of_darkness.txt
index 979dfa85cbf..3e879e4d711 100644
--- a/forge-gui/res/cardsfolder/t/touch_of_darkness.txt
+++ b/forge-gui/res/cardsfolder/t/touch_of_darkness.txt
@@ -1,9 +1,9 @@
 Name:Touch of Darkness
 ManaCost:B
 Types:Instant
-A:SP$ Animate | Cost$ B | ValidTgts$ Creature | TargetMin$ 0 | TargetMax$ MaxTgts | References$ MaxTgts | TgtPrompt$ Select target creatures | Colors$ Black | OverwriteColors$ True | SpellDescription$ Any number of target creatures become black until end of turn.
+A:SP$ Animate | Cost$ B | ValidTgts$ Creature | TargetMin$ 1 | TargetMax$ MaxTgts | References$ MaxTgts | TgtPrompt$ Select target creatures | Colors$ Black | OverwriteColors$ True | SpellDescription$ One or more target creatures become black until end of turn.
 SVar:MaxTgts:Count$Valid Creature
 AI:RemoveDeck:All
 AI:RemoveDeck:Random
 SVar:Picture:http://www.wizards.com/global/images/magic/general/touch_of_darkness.jpg
-Oracle:Any number of target creatures become black until end of turn.
+Oracle:One or more target creatures become black until end of turn.

From 00aea6e6479bdff73d73aab998f9402424537d0a Mon Sep 17 00:00:00 2001
From: Hanmac <hanmac@gmx.de>
Date: Sat, 28 Sep 2019 12:46:32 +0200
Subject: [PATCH 3/3] cards: update Noble creature Type

---
 forge-gui/res/cardsfolder/a/aboshan_cephalid_emperor.txt   | 2 +-
 forge-gui/res/cardsfolder/b/baron_sengir.txt               | 2 +-
 forge-gui/res/cardsfolder/b/brago_king_eternal.txt         | 2 +-
 forge-gui/res/cardsfolder/c/cephalid_aristocrat.txt        | 2 +-
 forge-gui/res/cardsfolder/e/empress_galina.txt             | 2 +-
 forge-gui/res/cardsfolder/f/faerie_noble.txt               | 2 +-
 forge-gui/res/cardsfolder/f/falkenrath_aristocrat.txt      | 2 +-
 forge-gui/res/cardsfolder/f/falkenrath_noble.txt           | 2 +-
 forge-gui/res/cardsfolder/g/garza_zol_plague_queen.txt     | 2 +-
 forge-gui/res/cardsfolder/i/imposing_sovereign.txt         | 2 +-
 forge-gui/res/cardsfolder/i/indulgent_aristocrat.txt       | 2 +-
 forge-gui/res/cardsfolder/k/king_macar_the_gold_cursed.txt | 2 +-
 forge-gui/res/cardsfolder/k/king_suleiman.txt              | 2 +-
 forge-gui/res/cardsfolder/l/llawan_cephalid_empress.txt    | 2 +-
 forge-gui/res/cardsfolder/m/merfolk_sovereign.txt          | 2 +-
 forge-gui/res/cardsfolder/s/sprite_noble.txt               | 2 +-
 forge-gui/res/cardsfolder/s/stromkirk_noble.txt            | 2 +-
 forge-gui/res/cardsfolder/v/vampire_aristocrat.txt         | 2 +-
 forge-gui/res/cardsfolder/v/vampire_noble.txt              | 2 +-
 forge-gui/res/cardsfolder/v/vampire_sovereign.txt          | 4 ++--
 20 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/forge-gui/res/cardsfolder/a/aboshan_cephalid_emperor.txt b/forge-gui/res/cardsfolder/a/aboshan_cephalid_emperor.txt
index 64c97c84d24..28e18c534f9 100644
--- a/forge-gui/res/cardsfolder/a/aboshan_cephalid_emperor.txt
+++ b/forge-gui/res/cardsfolder/a/aboshan_cephalid_emperor.txt
@@ -1,6 +1,6 @@
 Name:Aboshan, Cephalid Emperor
 ManaCost:4 U U
-Types:Legendary Creature Cephalid
+Types:Legendary Creature Cephalid Noble
 PT:3/3
 A:AB$ Tap | Cost$ tapXType<1/Cephalid> | ValidTgts$ Permanent | TgtPrompt$ Select target permanent | SpellDescription$ Tap target permanent.
 A:AB$ TapAll | Cost$ U U U | ValidCards$ Creature.withoutFlying | SpellDescription$ Tap all creatures without flying.
diff --git a/forge-gui/res/cardsfolder/b/baron_sengir.txt b/forge-gui/res/cardsfolder/b/baron_sengir.txt
index d3ca0692d06..49cbed0b43d 100644
--- a/forge-gui/res/cardsfolder/b/baron_sengir.txt
+++ b/forge-gui/res/cardsfolder/b/baron_sengir.txt
@@ -1,6 +1,6 @@
 Name:Baron Sengir
 ManaCost:5 B B B
-Types:Legendary Creature Vampire
+Types:Legendary Creature Vampire Noble
 PT:5/5
 K:Flying
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.DamagedBy | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever a creature dealt damage by CARDNAME this turn dies, put a +2/+2 counter on CARDNAME.
diff --git a/forge-gui/res/cardsfolder/b/brago_king_eternal.txt b/forge-gui/res/cardsfolder/b/brago_king_eternal.txt
index 9a3fafbeff6..65b84ea466a 100644
--- a/forge-gui/res/cardsfolder/b/brago_king_eternal.txt
+++ b/forge-gui/res/cardsfolder/b/brago_king_eternal.txt
@@ -1,6 +1,6 @@
 Name:Brago, King Eternal
 ManaCost:2 W U
-Types:Legendary Creature Spirit
+Types:Legendary Creature Spirit Noble
 PT:2/4
 K:Flying
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigExile | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, exile any number of target nonland permanents you control, then return those cards to the battlefield under their owner's control.
diff --git a/forge-gui/res/cardsfolder/c/cephalid_aristocrat.txt b/forge-gui/res/cardsfolder/c/cephalid_aristocrat.txt
index 5fc8bfa0a5d..aae958f7dfc 100644
--- a/forge-gui/res/cardsfolder/c/cephalid_aristocrat.txt
+++ b/forge-gui/res/cardsfolder/c/cephalid_aristocrat.txt
@@ -1,6 +1,6 @@
 Name:Cephalid Aristocrat
 ManaCost:4 U
-Types:Creature Cephalid
+Types:Creature Cephalid Noble
 PT:3/3
 T:Mode$ BecomesTarget | ValidTarget$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigMill | TriggerDescription$ Whenever CARDNAME becomes the target of a spell or ability, put the top two cards of your library into your graveyard.
 SVar:TrigMill:DB$Mill | NumCards$ 2 | Defined$ You
diff --git a/forge-gui/res/cardsfolder/e/empress_galina.txt b/forge-gui/res/cardsfolder/e/empress_galina.txt
index c78006486f5..37a0b6e62a2 100644
--- a/forge-gui/res/cardsfolder/e/empress_galina.txt
+++ b/forge-gui/res/cardsfolder/e/empress_galina.txt
@@ -1,6 +1,6 @@
 Name:Empress Galina
 ManaCost:3 U U
-Types:Legendary Creature Merfolk
+Types:Legendary Creature Merfolk Noble
 PT:1/3
 A:AB$ GainControl | Cost$ U U T | ValidTgts$ Permanent.Legendary | TgtPrompt$ Select target legendary permanent | SpellDescription$ Gain control of target legendary permanent. (This effect lasts indefinitely.)
 SVar:Picture:http://www.wizards.com/global/images/magic/general/empress_galina.jpg
diff --git a/forge-gui/res/cardsfolder/f/faerie_noble.txt b/forge-gui/res/cardsfolder/f/faerie_noble.txt
index 68ab0ea995a..844c8b72acf 100644
--- a/forge-gui/res/cardsfolder/f/faerie_noble.txt
+++ b/forge-gui/res/cardsfolder/f/faerie_noble.txt
@@ -1,6 +1,6 @@
 Name:Faerie Noble
 ManaCost:2 G
-Types:Creature Faerie
+Types:Creature Faerie Noble
 PT:1/2
 K:Flying
 S:Mode$ Continuous | Affected$ Creature.Faerie+Other+YouCtrl | AddToughness$ 1 | Description$ Other Faerie creatures you control get +0/+1.
diff --git a/forge-gui/res/cardsfolder/f/falkenrath_aristocrat.txt b/forge-gui/res/cardsfolder/f/falkenrath_aristocrat.txt
index 456335d6c39..301862dcba6 100644
--- a/forge-gui/res/cardsfolder/f/falkenrath_aristocrat.txt
+++ b/forge-gui/res/cardsfolder/f/falkenrath_aristocrat.txt
@@ -1,6 +1,6 @@
 Name:Falkenrath Aristocrat
 ManaCost:2 B R
-Types:Creature Vampire
+Types:Creature Vampire Noble
 PT:4/1
 K:Flying
 K:Haste
diff --git a/forge-gui/res/cardsfolder/f/falkenrath_noble.txt b/forge-gui/res/cardsfolder/f/falkenrath_noble.txt
index bed82a3e731..33dab1edc37 100644
--- a/forge-gui/res/cardsfolder/f/falkenrath_noble.txt
+++ b/forge-gui/res/cardsfolder/f/falkenrath_noble.txt
@@ -1,6 +1,6 @@
 Name:Falkenrath Noble
 ManaCost:3 B
-Types:Creature Vampire
+Types:Creature Vampire Noble
 PT:2/2
 K:Flying
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.Other | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ Whenever CARDNAME or another creature dies, target player loses 1 life and you gain 1 life.
diff --git a/forge-gui/res/cardsfolder/g/garza_zol_plague_queen.txt b/forge-gui/res/cardsfolder/g/garza_zol_plague_queen.txt
index 10149648fde..17ef2709c33 100644
--- a/forge-gui/res/cardsfolder/g/garza_zol_plague_queen.txt
+++ b/forge-gui/res/cardsfolder/g/garza_zol_plague_queen.txt
@@ -1,6 +1,6 @@
 Name:Garza Zol, Plague Queen
 ManaCost:4 U B R
-Types:Legendary Creature Vampire
+Types:Legendary Creature Vampire Noble
 PT:5/5
 K:Flying
 K:Haste
diff --git a/forge-gui/res/cardsfolder/i/imposing_sovereign.txt b/forge-gui/res/cardsfolder/i/imposing_sovereign.txt
index b8a7ba84658..bd301511163 100644
--- a/forge-gui/res/cardsfolder/i/imposing_sovereign.txt
+++ b/forge-gui/res/cardsfolder/i/imposing_sovereign.txt
@@ -1,6 +1,6 @@
 Name:Imposing Sovereign
 ManaCost:1 W
-Types:Creature Human
+Types:Creature Human Noble
 PT:2/1
 S:Mode$ ETBTapped | ValidCard$ Creature.OppCtrl | Description$ Creatures your opponents control enter the battlefield tapped.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/imposing_sovereign.jpg
diff --git a/forge-gui/res/cardsfolder/i/indulgent_aristocrat.txt b/forge-gui/res/cardsfolder/i/indulgent_aristocrat.txt
index 9281720e0a4..93bbb572e8b 100644
--- a/forge-gui/res/cardsfolder/i/indulgent_aristocrat.txt
+++ b/forge-gui/res/cardsfolder/i/indulgent_aristocrat.txt
@@ -1,6 +1,6 @@
 Name:Indulgent Aristocrat
 ManaCost:B
-Types:Creature Vampire
+Types:Creature Vampire Noble
 PT:1/1
 K:Lifelink
 A:AB$ PutCounterAll | Cost$ 2 Sac<1/Creature> | ValidCards$ Vampire.YouCtrl | CounterType$ P1P1 | CounterNum$ 1 | AILogic$ AtOppEOT | SpellDescription$ Put a +1/+1 counter on each Vampire you control.
diff --git a/forge-gui/res/cardsfolder/k/king_macar_the_gold_cursed.txt b/forge-gui/res/cardsfolder/k/king_macar_the_gold_cursed.txt
index 510824c6f3d..e5aa44ddc1c 100644
--- a/forge-gui/res/cardsfolder/k/king_macar_the_gold_cursed.txt
+++ b/forge-gui/res/cardsfolder/k/king_macar_the_gold_cursed.txt
@@ -1,6 +1,6 @@
 Name:King Macar, the Gold-Cursed
 ManaCost:2 B B
-Types:Legendary Creature Human
+Types:Legendary Creature Human Noble
 PT:2/3
 T:Mode$ Untaps | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigExile | OptionalDecider$ You | TriggerDescription$ Inspired — Whenever CARDNAME becomes untapped, you may exile target creature. If you do, create a colorless artifact token named Gold. It has "Sacrifice this artifact: Add one mana of any color."
 SVar:TrigExile:DB$ ChangeZone | ValidTgts$ Creature | Origin$ Battlefield | Destination$ Exile | RememberChanged$ True | SubAbility$ DBToken
diff --git a/forge-gui/res/cardsfolder/k/king_suleiman.txt b/forge-gui/res/cardsfolder/k/king_suleiman.txt
index e6e891681de..1b326c2cef8 100644
--- a/forge-gui/res/cardsfolder/k/king_suleiman.txt
+++ b/forge-gui/res/cardsfolder/k/king_suleiman.txt
@@ -1,6 +1,6 @@
 Name:King Suleiman
 ManaCost:1 W
-Types:Creature Human
+Types:Creature Human Noble
 PT:1/1
 A:AB$ Destroy | Cost$ T | ValidTgts$ Djinn,Efreet | TgtPrompt$ Select target Djinn or Efreet | SpellDescription$ Destroy target Djinn or Efreet.
 AI:RemoveDeck:Random
diff --git a/forge-gui/res/cardsfolder/l/llawan_cephalid_empress.txt b/forge-gui/res/cardsfolder/l/llawan_cephalid_empress.txt
index e88e38cf2cb..468992c3eb3 100644
--- a/forge-gui/res/cardsfolder/l/llawan_cephalid_empress.txt
+++ b/forge-gui/res/cardsfolder/l/llawan_cephalid_empress.txt
@@ -1,6 +1,6 @@
 Name:Llawan, Cephalid Empress
 ManaCost:3 U
-Types:Legendary Creature Cephalid
+Types:Legendary Creature Cephalid Noble
 PT:2/3
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters the battlefield, return all blue creatures your opponents control to their owners' hands.
 SVar:TrigChange:DB$ChangeZoneAll | ChangeType$ Creature.Blue+OppCtrl | Origin$ Battlefield | Destination$ Hand
diff --git a/forge-gui/res/cardsfolder/m/merfolk_sovereign.txt b/forge-gui/res/cardsfolder/m/merfolk_sovereign.txt
index 93b5e2554c1..82f619bf48d 100644
--- a/forge-gui/res/cardsfolder/m/merfolk_sovereign.txt
+++ b/forge-gui/res/cardsfolder/m/merfolk_sovereign.txt
@@ -1,6 +1,6 @@
 Name:Merfolk Sovereign
 ManaCost:1 U U
-Types:Creature Merfolk
+Types:Creature Merfolk Noble
 PT:2/2
 S:Mode$ Continuous | Affected$ Creature.Merfolk+Other+YouCtrl | AddPower$ 1 | AddToughness$ 1 | Description$ Other Merfolk creatures you control get +1/+1.
 A:AB$ Pump | Cost$ T | ValidTgts$ Creature.Merfolk | TgtPrompt$ Select target Merfolk creature | KW$ HIDDEN Unblockable | SpellDescription$ Target Merfolk creature can't be blocked this turn.
diff --git a/forge-gui/res/cardsfolder/s/sprite_noble.txt b/forge-gui/res/cardsfolder/s/sprite_noble.txt
index 63e2f4a68bb..85a16a99a8d 100644
--- a/forge-gui/res/cardsfolder/s/sprite_noble.txt
+++ b/forge-gui/res/cardsfolder/s/sprite_noble.txt
@@ -1,6 +1,6 @@
 Name:Sprite Noble
 ManaCost:1 U U
-Types:Creature Faerie
+Types:Creature Faerie Noble
 PT:2/2
 K:Flying
 S:Mode$ Continuous | Affected$ Creature.withFlying+YouCtrl+Other | AddToughness$ 1 | Description$ Other creatures you control with flying get +0/+1.
diff --git a/forge-gui/res/cardsfolder/s/stromkirk_noble.txt b/forge-gui/res/cardsfolder/s/stromkirk_noble.txt
index ebd93b99a22..d6e1cac6ce2 100644
--- a/forge-gui/res/cardsfolder/s/stromkirk_noble.txt
+++ b/forge-gui/res/cardsfolder/s/stromkirk_noble.txt
@@ -1,6 +1,6 @@
 Name:Stromkirk Noble
 ManaCost:R
-Types:Creature Vampire
+Types:Creature Vampire Noble
 PT:1/1
 K:CantBeBlockedBy Creature.Human
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, put a +1/+1 counter on it.
diff --git a/forge-gui/res/cardsfolder/v/vampire_aristocrat.txt b/forge-gui/res/cardsfolder/v/vampire_aristocrat.txt
index 1e9e68c7700..99cb33f2a17 100644
--- a/forge-gui/res/cardsfolder/v/vampire_aristocrat.txt
+++ b/forge-gui/res/cardsfolder/v/vampire_aristocrat.txt
@@ -1,6 +1,6 @@
 Name:Vampire Aristocrat
 ManaCost:2 B
-Types:Creature Vampire Rogue
+Types:Creature Vampire Noble Rogue
 PT:2/2
 A:AB$ Pump | Cost$ Sac<1/Creature> | NumAtt$ +2 | NumDef$ +2 | AILogic$ Aristocrat | SpellDescription$ CARDNAME gets +2/+2 until end of turn.
 SVar:AIPreference:SacCost$Creature.Other
diff --git a/forge-gui/res/cardsfolder/v/vampire_noble.txt b/forge-gui/res/cardsfolder/v/vampire_noble.txt
index 0d04f469f59..94e079c7fb5 100644
--- a/forge-gui/res/cardsfolder/v/vampire_noble.txt
+++ b/forge-gui/res/cardsfolder/v/vampire_noble.txt
@@ -1,6 +1,6 @@
 Name:Vampire Noble
 ManaCost:2 B
-Types:Creature Vampire
+Types:Creature Vampire Noble
 PT:3/2
 SVar:Picture:http://www.wizards.com/global/images/magic/general/vampire_noble.jpg
 Oracle:
diff --git a/forge-gui/res/cardsfolder/v/vampire_sovereign.txt b/forge-gui/res/cardsfolder/v/vampire_sovereign.txt
index af37d0e71d3..be7235f77ad 100644
--- a/forge-gui/res/cardsfolder/v/vampire_sovereign.txt
+++ b/forge-gui/res/cardsfolder/v/vampire_sovereign.txt
@@ -1,9 +1,9 @@
 Name:Vampire Sovereign
 ManaCost:3 B B 
-Types:Creature Vampire
+Types:Creature Vampire Noble
 PT:3/4
 K:Flying
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigBite | TriggerDescription$ When CARDNAME enters the battlefield target opponent loses 3 life and you gain 3 life.
 SVar:TrigBite:DB$LoseLife | ValidTgts$ Opponent | TgtPrompt$ Select an opponent | LifeAmount$ 3 | SubAbility$ DBGainLife | SpellDescription$ Target opponent loses 3 life and you gain 3 life.
 SVar:DBGainLife:DB$GainLife | LifeAmount$ 3
-Oracle:Flying\nWhen Vampire Sovereign enters the battlefield, target opponent loses 3 life and you gain 3 life.
\ No newline at end of file
+Oracle:Flying\nWhen Vampire Sovereign enters the battlefield, target opponent loses 3 life and you gain 3 life.