From c96f1452461fba331394a5fd3b85749781f36131 Mon Sep 17 00:00:00 2001
From: Northmoc <timothy.s.mocny@gmail.com>
Date: Sat, 16 Apr 2022 23:04:48 -0400
Subject: [PATCH 1/8] falco_spara_pactweaver.txt

---
 .../cardsfolder/upcoming/falco_spara_pactweaver.txt  | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/falco_spara_pactweaver.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/falco_spara_pactweaver.txt b/forge-gui/res/cardsfolder/upcoming/falco_spara_pactweaver.txt
new file mode 100644
index 00000000000..3fc987f11f3
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/falco_spara_pactweaver.txt
@@ -0,0 +1,12 @@
+Name:Falco Spara, Pactweaver
+ManaCost:1 G W U
+Types:Legendary Creature Bird Demon
+PT:3/3
+K:Flying
+K:Trample
+K:etbCounter:Shield:1
+S:Mode$ Continuous | Affected$ Card.TopLibrary+YouOwn | AffectedZone$ Library | MayLookAt$ You | Description$ You may look at the top card of your library any time.
+S:Mode$ Continuous | Affected$ Card.TopLibrary+YouOwn+nonLand | AffectedZone$ Library | MayPlay$ True | MayPlayAltManaCost$ RegularCost RemoveAnyCounter<1/Any/Creature.YouCtrl/a creature you control> | Description$ You may cast spells from the top of your library by removing a counter from a creature you control in addition to paying their other costs.
+DeckHas:Ability$Counters
+DeckHints:Ability$Counters|Proliferate
+Oracle:Flying, trample\nFalco Spara, Pactweaver enters the battlefield with a shield counter on it.\nYou may look at the top card of your library any time.\nYou may cast spells from the top of your library by removing a counter from a creature you control in addition to paying their other costs.

From 85ac95caf32266f32b13843fc9444c94dacdd4f6 Mon Sep 17 00:00:00 2001
From: Northmoc <timothy.s.mocny@gmail.com>
Date: Sun, 17 Apr 2022 08:26:06 -0400
Subject: [PATCH 2/8] sanctuary_warden.txt (thanks Marvel)

---
 .../res/cardsfolder/upcoming/sanctuary_warden.txt  | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/sanctuary_warden.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/sanctuary_warden.txt b/forge-gui/res/cardsfolder/upcoming/sanctuary_warden.txt
new file mode 100644
index 00000000000..01a65fb7e31
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/sanctuary_warden.txt
@@ -0,0 +1,14 @@
+Name:Sanctuary Warden
+ManaCost:4 W W
+Types:Creature Angel Soldier
+PT:5/5
+K:Flying
+K:etbCounter:Shield:2
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME enters the battlefield or attacks, you may remove a counter from a creature or planeswalker you control. If you do, draw a card and create a 1/1 green and white Citizen creature token.
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigChange | TriggerZones$ Battlefield | OptionalDecider$ You | Secondary$ True | TriggerDescription$ Whenever CARDNAME enters the battlefield or attacks, you may remove a counter from a creature or planeswalker you control. If you do, draw a card and create a 1/1 green and white Citizen creature token.
+SVar:TrigChange:AB$ Draw | Cost$ RemoveAnyCounter<1/Any/Card.Creature;Card.Planeswalker/a creature or planeswalker you control> | SubAbility$ DBToken
+SVar:DBToken:DB$ Token | TokenScript$ gw_1_1_citizen
+DeckHas:Ability$Token|Counters & Type$Citizen
+DeckHints:Ability$Counters
+SVar:HasAttackEffect:TRUE
+Oracle:Flying\nSanctuary Warden enters the battlefield with two shield counters on it.\nWhenever Sanctuary Warden enters the battlefield or attacks, you may remove a counter from a creature or planeswalker you control. If you do, draw a card and create a 1/1 green and white Citizen creature token.

From 9d695615c457e9e433890fca2c40bda6781fcd48 Mon Sep 17 00:00:00 2001
From: Northmoc <timothy.s.mocny@gmail.com>
Date: Mon, 18 Apr 2022 18:18:47 -0400
Subject: [PATCH 3/8] disciplined_duelist.txt

---
 .../res/cardsfolder/upcoming/disciplined_duelist.txt      | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/disciplined_duelist.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/disciplined_duelist.txt b/forge-gui/res/cardsfolder/upcoming/disciplined_duelist.txt
new file mode 100644
index 00000000000..da271667576
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/disciplined_duelist.txt
@@ -0,0 +1,8 @@
+Name:Disciplined Duelist
+ManaCost:G W U
+Types:Creature Human Citizen
+PT:2/1
+K:Double Strike
+K:etbCounter:Shield:1:no Condition:CARDNAME enters the battlefield with a shield counter on it.  (If it would be dealt damage or destroyed, remove a shield counter from it instead.)
+DeckHas:Ability$Counters
+Oracle:Double strike\nDisciplined Duelist enters the battlefield with a shield counter on it. (If it would be dealt damage or destroyed, remove a shield counter from it instead.)

From 03a231ec54b76a52bdfd6496a8c77e76aac95cdd Mon Sep 17 00:00:00 2001
From: Northmoc <timothy.s.mocny@gmail.com>
Date: Mon, 18 Apr 2022 19:56:45 -0400
Subject: [PATCH 4/8] easy shield counter cards

---
 forge-gui/res/cardsfolder/upcoming/boon_of_safety.txt  |  7 +++++++
 forge-gui/res/cardsfolder/upcoming/brokers_veteran.txt |  8 ++++++++
 .../res/cardsfolder/upcoming/dapper_shieldmate.txt     |  7 +++++++
 forge-gui/res/cardsfolder/upcoming/rhox_pummeler.txt   |  8 ++++++++
 .../res/cardsfolder/upcoming/swooping_protector.txt    |  9 +++++++++
 .../res/cardsfolder/upcoming/voice_of_the_vermin.txt   | 10 ++++++++++
 .../res/cardsfolder/upcoming/wingshield_agent.txt      | 10 ++++++++++
 7 files changed, 59 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/boon_of_safety.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/brokers_veteran.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/dapper_shieldmate.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/rhox_pummeler.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/swooping_protector.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/voice_of_the_vermin.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/wingshield_agent.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/boon_of_safety.txt b/forge-gui/res/cardsfolder/upcoming/boon_of_safety.txt
new file mode 100644
index 00000000000..647b709942f
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/boon_of_safety.txt
@@ -0,0 +1,7 @@
+Name:Boon of Safety
+ManaCost:W
+Types:Instant
+A:SP$ PutCounter | ValidTgts$ Creature | CounterType$ Shield | SubAbility$ DBScry | SpellDescription$ Put a shield counter on target creature. (If that creature would be dealt damage or destroyed, remove a shield counter from it instead.)
+SVar:DBScry:DB$ Scry | SpellDescription$ Scry 1.
+DeckHas:Ability$Counters
+Oracle:Put a shield counter on target creature. (If that creature would be dealt damage or destroyed, remove a shield counter from it instead.)\nScry 1.
diff --git a/forge-gui/res/cardsfolder/upcoming/brokers_veteran.txt b/forge-gui/res/cardsfolder/upcoming/brokers_veteran.txt
new file mode 100644
index 00000000000..af888d92fb9
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/brokers_veteran.txt
@@ -0,0 +1,8 @@
+Name:Brokers Veteran
+ManaCost:1 U
+Types:Creature Human Soldier
+PT:2/1
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigPutCounter | TriggerDescription$ When CARDNAME dies, put a shield counter on target creature you control. (If that creature would be dealt damage or destroyed, remove a shield counter from it instead.)
+SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | CounterType$ Shield
+DeckHas:Ability$Counters
+Oracle:When Brokers Veteran dies, put a shield counter on target creature you control. (If that creature would be dealt damage or destroyed, remove a shield counter from it instead.)
diff --git a/forge-gui/res/cardsfolder/upcoming/dapper_shieldmate.txt b/forge-gui/res/cardsfolder/upcoming/dapper_shieldmate.txt
new file mode 100644
index 00000000000..a6f979448b9
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/dapper_shieldmate.txt
@@ -0,0 +1,7 @@
+Name:Dapper Shieldmate
+ManaCost:3 W
+Types:Creature Human Soldier
+PT:2/2
+K:etbCounter:Shield:1:no Condition:CARDNAME enters the battlefield with a shield counter on it.  (If it would be dealt damage or destroyed, remove a shield counter from it instead.)
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 2 | Condition$ PlayerTurn | Description$ As long as it's your turn, CARDNAME gets +2/+0.
+Oracle:Dapper Shieldmate enters the battlefield with a shield counter on it. (If it would be dealt damage or destroyed, remove a shield counter from it instead.)\nAs long as it's your turn, Dapper Shieldmate gets +2/+0.
diff --git a/forge-gui/res/cardsfolder/upcoming/rhox_pummeler.txt b/forge-gui/res/cardsfolder/upcoming/rhox_pummeler.txt
new file mode 100644
index 00000000000..5a82984c0ec
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/rhox_pummeler.txt
@@ -0,0 +1,8 @@
+Name:Rhox Pummeler
+ManaCost:3 G
+Types:Creature Rhino Soldier
+PT:3/3
+K:etbCounter:Shield:1:no Condition:CARDNAME enters the battlefield with a shield counter on it.  (If it would be dealt damage or destroyed, remove a shield counter from it instead.)
+S:Mode$ Continuous | Affected$ Card.Self+counters_GE1_Shield | AddKeyword$ Trample | Description$ CARDNAME has trample as long as it has a shield counter on it.
+DeckHas:Ability$Counters
+Oracle:Rhox Pummeler enters the battlefield with a shield counter on it. (If it would be dealt damage or destroyed, remove a shield counter from it instead.)\nRhox Pummeler has trample as long as it has a shield counter on it.
diff --git a/forge-gui/res/cardsfolder/upcoming/swooping_protector.txt b/forge-gui/res/cardsfolder/upcoming/swooping_protector.txt
new file mode 100644
index 00000000000..5fad150bff0
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/swooping_protector.txt
@@ -0,0 +1,9 @@
+Name:Swooping Protector
+ManaCost:3 W
+Types:Creature Bird Citizen
+PT:2/1
+K:Flash
+K:Flying
+K:etbCounter:Shield:1:no Condition:CARDNAME enters the battlefield with a shield counter on it.  (If it would be dealt damage or destroyed, remove a shield counter from it instead.)
+DeckHas:Ability$Counters
+Oracle:Flash\nFlying\nSwooping Protector enters the battlefield with a shield counter on it. (If it would be dealt damage or destroyed, remove a shield counter from it instead.)
diff --git a/forge-gui/res/cardsfolder/upcoming/voice_of_the_vermin.txt b/forge-gui/res/cardsfolder/upcoming/voice_of_the_vermin.txt
new file mode 100644
index 00000000000..242e1a115be
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/voice_of_the_vermin.txt
@@ -0,0 +1,10 @@
+Name:Voice of the Vermin
+ManaCost:3 G
+Types:Creature Human Citizen
+PT:2/2
+K:etbCounter:Shield:1:no Condition:CARDNAME enters the battlefield with a shield counter on it.  (If it would be dealt damage or destroyed, remove a shield counter from it instead.)
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigAnimate | TriggerDescription$ Whenever CARDNAME attacks, target creature you control has base power and toughness 4/4 until end of turn.
+SVar:TrigAnimate:DB$ Animate | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | Power$ 4 | Toughness$ 4
+DeckHas:Ability$Counters
+SVar:HasAttackEffect:TRUE
+Oracle:Voice of the Vermin enters the battlefield with a shield counter on it. (If it would be dealt damage or destroyed, remove a shield counter from it instead.)\nWhenever Voice of the Vermin attacks, target creature you control has base power and toughness 4/4 until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/wingshield_agent.txt b/forge-gui/res/cardsfolder/upcoming/wingshield_agent.txt
new file mode 100644
index 00000000000..0d32e5ac6bd
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/wingshield_agent.txt
@@ -0,0 +1,10 @@
+Name:Wingshield Agent
+ManaCost:2 U
+Types:Creature Human Soldier
+PT:2/3
+K:etbCounter:Shield:1:no Condition:CARDNAME enters the battlefield with a shield counter on it.  (If it would be dealt damage or destroyed, remove a shield counter from it instead.)
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks, up to one other target creature gains flying until end of turn.
+SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.Other | TgtPrompt$ Select up to one other target creature | TargetMin$ 0 | TargetMax$ 1 | KW$ Flying
+DeckHas:Ability$Counters
+SVar:HasAttackEffect:TRUE
+Oracle:Wingshield Agent enters the battlefield with a shield counter on it. (If it would be dealt damage or destroyed, remove a shield counter from it instead.)\nWhenever Wingshield Agent attacks, up to one other target creature gains flying until end of turn.

From 59dcc44ea6bde1531925d6a46100667c334df773 Mon Sep 17 00:00:00 2001
From: Northmoc <timothy.s.mocny@gmail.com>
Date: Mon, 18 Apr 2022 20:21:41 -0400
Subject: [PATCH 5/8] undercover_operative.txt

---
 .../res/cardsfolder/upcoming/undercover_operative.txt | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/undercover_operative.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/undercover_operative.txt b/forge-gui/res/cardsfolder/upcoming/undercover_operative.txt
new file mode 100644
index 00000000000..d77e9e57d9c
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/undercover_operative.txt
@@ -0,0 +1,11 @@
+Name:Undercover Operative
+ManaCost:2 U U
+Types:Creature Shapeshifter Rogue
+PT:0/0
+K:ETBReplacement:Copy:DBCopy:Optional
+SVar:DBCopy:DB$ Clone | Choices$ Creature.Other | SubAbility$ DBAddCounter | RememberCloneOrigin$ True | SpellDescription$ You may have CARDNAME enter the battlefield as a copy of any creature on the battlefield, except it enters with a shield counter on it if you control that creature. (If it would be dealt damage or destroyed, remove a shield counter from it instead.)
+SVar:DBAddCounter:DB$ PutCounter | Defined$ Self | CounterType$ Shield | ETB$ True | ConditionDefined$ Remembered | ConditionPresent$ Creature.YouCtrl | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:X:Count$xPaid
+DeckHas:Ability$Counters
+Oracle:You may have Undercover Operative enter the battlefield as a copy of any creature on the battlefield, except it enters with a shield counter on it if you control that creature. (If it would be dealt damage or destroyed, remove a shield counter from it instead.)

From b925effd225ae8106d67c97829850c3a848ab226 Mon Sep 17 00:00:00 2001
From: Northmoc <timothy.s.mocny@gmail.com>
Date: Mon, 18 Apr 2022 20:22:11 -0400
Subject: [PATCH 6/8] rigo_streetwise_mentor.txt

---
 .../res/cardsfolder/upcoming/rigo_streetwise_mentor.txt  | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/rigo_streetwise_mentor.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/rigo_streetwise_mentor.txt b/forge-gui/res/cardsfolder/upcoming/rigo_streetwise_mentor.txt
new file mode 100644
index 00000000000..0aada20ef16
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/rigo_streetwise_mentor.txt
@@ -0,0 +1,9 @@
+Name:Rigo, Streetwise Mentor
+ManaCost:GW W WU
+Types:Legendary Creature Cat Citizen
+PT:2/2
+K:etbCounter:Shield:1:no Condition:CARDNAME enters the battlefield with a shield counter on it.  (If it would be dealt damage or destroyed, remove a shield counter from it instead.)
+T:Mode$ AttackersDeclaredOneTarget | ValidAttackers$ Creature.YouCtrl+powerLE1 | AttackedTarget$ Player,Planeswalker | Execute$ TrigDraw | TriggerZones$ Battlefield | TriggerDescription$ Whenever you attack a player or planeswalker with one or more creatures with power 1 or less, draw a card.
+SVar:TrigDraw:DB$ Draw | NumCards$ 1
+DeckHas:Ability$Counters
+Oracle:Rigo, Streetwise Mentor enters the battlefield with a shield counter on it. (If it would be dealt damage or destroyed, remove a shield counter from it instead.)\nWhenever you attack a player or planeswalker with one or more creatures with power 1 or less, draw a card.

From cec02f3579a3a7559684f2b2b799a0be6c8ee9de Mon Sep 17 00:00:00 2001
From: Northmoc <timothy.s.mocny@gmail.com>
Date: Mon, 18 Apr 2022 20:23:34 -0400
Subject: [PATCH 7/8] titan_of_industry.txt

---
 .../res/cardsfolder/upcoming/titan_of_industry.txt | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/titan_of_industry.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/titan_of_industry.txt b/forge-gui/res/cardsfolder/upcoming/titan_of_industry.txt
new file mode 100644
index 00000000000..f12b00d51e2
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/titan_of_industry.txt
@@ -0,0 +1,14 @@
+Name:Titan of Industry
+ManaCost:4 G G G
+Types:Creature Elemental
+PT:7/7
+K:Reach
+K:Trample
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigCharm | TriggerDescription$ When CARDNAME enters the battlefield, ABILITY
+SVar:TrigCharm:DB$ Charm | Choices$ Destroy,GainLife,Token,PutCounter | CharmNum$ 2
+SVar:Destroy:DB$ Destroy | ValidTgts$ Artifact,Enchantment | TgtPrompt$ Select target artifact or enchantment | SpellDescription$ Destroy target artifact or enchantment.
+SVar:GainLife:DB$ GainLife | LifeAmount$ 5 | ValidTgts$ Player | TgtPrompt$ Choose a player | SpellDescription$ Target player gains 5 life.
+SVar:Token:DB$ Token | TokenScript$ g_4_4_rhino_warrior | SpellDescription$ Create a 4/4 green Rhino Warrior creature token.
+SVar:PutCounter:DB$ PutCounter | Choices$ Creature.YouCtrl | ChoiceTitle$ Choose a creature you control | CounterType$ Shield | SpellDescription$ Put a shield counter on a creature you control.
+DeckHas:Ability$LifeGain|Token|Counters & Types$Rhino|Warrior
+Oracle:Reach, trample\nWhen Titan of Industry enters the battlefield, choose two —\n• Destroy target artifact or enchantment.\n• Target player gains 5 life.\n• Create a 4/4 green Rhino Warrior creature token.\n• Put a shield counter on a creature you control.

From 4ace4b89f6835aa59cd0228a5ce313046ae3386a Mon Sep 17 00:00:00 2001
From: Northmoc <timothy.s.mocny@gmail.com>
Date: Wed, 27 Apr 2022 15:59:06 -0400
Subject: [PATCH 8/8] Shield -> SHIELD

---
 forge-gui/res/cardsfolder/upcoming/boon_of_safety.txt         | 2 +-
 forge-gui/res/cardsfolder/upcoming/brokers_veteran.txt        | 2 +-
 forge-gui/res/cardsfolder/upcoming/dapper_shieldmate.txt      | 2 +-
 forge-gui/res/cardsfolder/upcoming/disciplined_duelist.txt    | 2 +-
 forge-gui/res/cardsfolder/upcoming/falco_spara_pactweaver.txt | 2 +-
 forge-gui/res/cardsfolder/upcoming/rhox_pummeler.txt          | 4 ++--
 forge-gui/res/cardsfolder/upcoming/rigo_streetwise_mentor.txt | 2 +-
 forge-gui/res/cardsfolder/upcoming/sanctuary_warden.txt       | 2 +-
 forge-gui/res/cardsfolder/upcoming/swooping_protector.txt     | 2 +-
 forge-gui/res/cardsfolder/upcoming/titan_of_industry.txt      | 2 +-
 forge-gui/res/cardsfolder/upcoming/undercover_operative.txt   | 2 +-
 forge-gui/res/cardsfolder/upcoming/voice_of_the_vermin.txt    | 2 +-
 forge-gui/res/cardsfolder/upcoming/wingshield_agent.txt       | 2 +-
 13 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/boon_of_safety.txt b/forge-gui/res/cardsfolder/upcoming/boon_of_safety.txt
index 647b709942f..f72d289e767 100644
--- a/forge-gui/res/cardsfolder/upcoming/boon_of_safety.txt
+++ b/forge-gui/res/cardsfolder/upcoming/boon_of_safety.txt
@@ -1,7 +1,7 @@
 Name:Boon of Safety
 ManaCost:W
 Types:Instant
-A:SP$ PutCounter | ValidTgts$ Creature | CounterType$ Shield | SubAbility$ DBScry | SpellDescription$ Put a shield counter on target creature. (If that creature would be dealt damage or destroyed, remove a shield counter from it instead.)
+A:SP$ PutCounter | ValidTgts$ Creature | CounterType$ SHIELD | SubAbility$ DBScry | SpellDescription$ Put a shield counter on target creature. (If that creature would be dealt damage or destroyed, remove a shield counter from it instead.)
 SVar:DBScry:DB$ Scry | SpellDescription$ Scry 1.
 DeckHas:Ability$Counters
 Oracle:Put a shield counter on target creature. (If that creature would be dealt damage or destroyed, remove a shield counter from it instead.)\nScry 1.
diff --git a/forge-gui/res/cardsfolder/upcoming/brokers_veteran.txt b/forge-gui/res/cardsfolder/upcoming/brokers_veteran.txt
index af888d92fb9..722458a72bd 100644
--- a/forge-gui/res/cardsfolder/upcoming/brokers_veteran.txt
+++ b/forge-gui/res/cardsfolder/upcoming/brokers_veteran.txt
@@ -3,6 +3,6 @@ ManaCost:1 U
 Types:Creature Human Soldier
 PT:2/1
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigPutCounter | TriggerDescription$ When CARDNAME dies, put a shield counter on target creature you control. (If that creature would be dealt damage or destroyed, remove a shield counter from it instead.)
-SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | CounterType$ Shield
+SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | CounterType$ SHIELD
 DeckHas:Ability$Counters
 Oracle:When Brokers Veteran dies, put a shield counter on target creature you control. (If that creature would be dealt damage or destroyed, remove a shield counter from it instead.)
diff --git a/forge-gui/res/cardsfolder/upcoming/dapper_shieldmate.txt b/forge-gui/res/cardsfolder/upcoming/dapper_shieldmate.txt
index a6f979448b9..22230c221ff 100644
--- a/forge-gui/res/cardsfolder/upcoming/dapper_shieldmate.txt
+++ b/forge-gui/res/cardsfolder/upcoming/dapper_shieldmate.txt
@@ -2,6 +2,6 @@ Name:Dapper Shieldmate
 ManaCost:3 W
 Types:Creature Human Soldier
 PT:2/2
-K:etbCounter:Shield:1:no Condition:CARDNAME enters the battlefield with a shield counter on it.  (If it would be dealt damage or destroyed, remove a shield counter from it instead.)
+K:etbCounter:SHIELD:1
 S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 2 | Condition$ PlayerTurn | Description$ As long as it's your turn, CARDNAME gets +2/+0.
 Oracle:Dapper Shieldmate enters the battlefield with a shield counter on it. (If it would be dealt damage or destroyed, remove a shield counter from it instead.)\nAs long as it's your turn, Dapper Shieldmate gets +2/+0.
diff --git a/forge-gui/res/cardsfolder/upcoming/disciplined_duelist.txt b/forge-gui/res/cardsfolder/upcoming/disciplined_duelist.txt
index da271667576..919f9b036c9 100644
--- a/forge-gui/res/cardsfolder/upcoming/disciplined_duelist.txt
+++ b/forge-gui/res/cardsfolder/upcoming/disciplined_duelist.txt
@@ -3,6 +3,6 @@ ManaCost:G W U
 Types:Creature Human Citizen
 PT:2/1
 K:Double Strike
-K:etbCounter:Shield:1:no Condition:CARDNAME enters the battlefield with a shield counter on it.  (If it would be dealt damage or destroyed, remove a shield counter from it instead.)
+K:etbCounter:SHIELD:1
 DeckHas:Ability$Counters
 Oracle:Double strike\nDisciplined Duelist enters the battlefield with a shield counter on it. (If it would be dealt damage or destroyed, remove a shield counter from it instead.)
diff --git a/forge-gui/res/cardsfolder/upcoming/falco_spara_pactweaver.txt b/forge-gui/res/cardsfolder/upcoming/falco_spara_pactweaver.txt
index 3fc987f11f3..66aaeefec92 100644
--- a/forge-gui/res/cardsfolder/upcoming/falco_spara_pactweaver.txt
+++ b/forge-gui/res/cardsfolder/upcoming/falco_spara_pactweaver.txt
@@ -4,7 +4,7 @@ Types:Legendary Creature Bird Demon
 PT:3/3
 K:Flying
 K:Trample
-K:etbCounter:Shield:1
+K:etbCounter:SHIELD:1
 S:Mode$ Continuous | Affected$ Card.TopLibrary+YouOwn | AffectedZone$ Library | MayLookAt$ You | Description$ You may look at the top card of your library any time.
 S:Mode$ Continuous | Affected$ Card.TopLibrary+YouOwn+nonLand | AffectedZone$ Library | MayPlay$ True | MayPlayAltManaCost$ RegularCost RemoveAnyCounter<1/Any/Creature.YouCtrl/a creature you control> | Description$ You may cast spells from the top of your library by removing a counter from a creature you control in addition to paying their other costs.
 DeckHas:Ability$Counters
diff --git a/forge-gui/res/cardsfolder/upcoming/rhox_pummeler.txt b/forge-gui/res/cardsfolder/upcoming/rhox_pummeler.txt
index 5a82984c0ec..5fe39cb7f43 100644
--- a/forge-gui/res/cardsfolder/upcoming/rhox_pummeler.txt
+++ b/forge-gui/res/cardsfolder/upcoming/rhox_pummeler.txt
@@ -2,7 +2,7 @@ Name:Rhox Pummeler
 ManaCost:3 G
 Types:Creature Rhino Soldier
 PT:3/3
-K:etbCounter:Shield:1:no Condition:CARDNAME enters the battlefield with a shield counter on it.  (If it would be dealt damage or destroyed, remove a shield counter from it instead.)
-S:Mode$ Continuous | Affected$ Card.Self+counters_GE1_Shield | AddKeyword$ Trample | Description$ CARDNAME has trample as long as it has a shield counter on it.
+K:etbCounter:SHIELD:1
+S:Mode$ Continuous | Affected$ Card.Self+counters_GE1_SHIELD | AddKeyword$ Trample | Description$ CARDNAME has trample as long as it has a shield counter on it.
 DeckHas:Ability$Counters
 Oracle:Rhox Pummeler enters the battlefield with a shield counter on it. (If it would be dealt damage or destroyed, remove a shield counter from it instead.)\nRhox Pummeler has trample as long as it has a shield counter on it.
diff --git a/forge-gui/res/cardsfolder/upcoming/rigo_streetwise_mentor.txt b/forge-gui/res/cardsfolder/upcoming/rigo_streetwise_mentor.txt
index 0aada20ef16..d46e3e581bc 100644
--- a/forge-gui/res/cardsfolder/upcoming/rigo_streetwise_mentor.txt
+++ b/forge-gui/res/cardsfolder/upcoming/rigo_streetwise_mentor.txt
@@ -2,7 +2,7 @@ Name:Rigo, Streetwise Mentor
 ManaCost:GW W WU
 Types:Legendary Creature Cat Citizen
 PT:2/2
-K:etbCounter:Shield:1:no Condition:CARDNAME enters the battlefield with a shield counter on it.  (If it would be dealt damage or destroyed, remove a shield counter from it instead.)
+K:etbCounter:SHIELD:1
 T:Mode$ AttackersDeclaredOneTarget | ValidAttackers$ Creature.YouCtrl+powerLE1 | AttackedTarget$ Player,Planeswalker | Execute$ TrigDraw | TriggerZones$ Battlefield | TriggerDescription$ Whenever you attack a player or planeswalker with one or more creatures with power 1 or less, draw a card.
 SVar:TrigDraw:DB$ Draw | NumCards$ 1
 DeckHas:Ability$Counters
diff --git a/forge-gui/res/cardsfolder/upcoming/sanctuary_warden.txt b/forge-gui/res/cardsfolder/upcoming/sanctuary_warden.txt
index 01a65fb7e31..0661b5bb542 100644
--- a/forge-gui/res/cardsfolder/upcoming/sanctuary_warden.txt
+++ b/forge-gui/res/cardsfolder/upcoming/sanctuary_warden.txt
@@ -3,7 +3,7 @@ ManaCost:4 W W
 Types:Creature Angel Soldier
 PT:5/5
 K:Flying
-K:etbCounter:Shield:2
+K:etbCounter:SHIELD:2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME enters the battlefield or attacks, you may remove a counter from a creature or planeswalker you control. If you do, draw a card and create a 1/1 green and white Citizen creature token.
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigChange | TriggerZones$ Battlefield | OptionalDecider$ You | Secondary$ True | TriggerDescription$ Whenever CARDNAME enters the battlefield or attacks, you may remove a counter from a creature or planeswalker you control. If you do, draw a card and create a 1/1 green and white Citizen creature token.
 SVar:TrigChange:AB$ Draw | Cost$ RemoveAnyCounter<1/Any/Card.Creature;Card.Planeswalker/a creature or planeswalker you control> | SubAbility$ DBToken
diff --git a/forge-gui/res/cardsfolder/upcoming/swooping_protector.txt b/forge-gui/res/cardsfolder/upcoming/swooping_protector.txt
index 5fad150bff0..9b1b0f1fd95 100644
--- a/forge-gui/res/cardsfolder/upcoming/swooping_protector.txt
+++ b/forge-gui/res/cardsfolder/upcoming/swooping_protector.txt
@@ -4,6 +4,6 @@ Types:Creature Bird Citizen
 PT:2/1
 K:Flash
 K:Flying
-K:etbCounter:Shield:1:no Condition:CARDNAME enters the battlefield with a shield counter on it.  (If it would be dealt damage or destroyed, remove a shield counter from it instead.)
+K:etbCounter:SHIELD:1
 DeckHas:Ability$Counters
 Oracle:Flash\nFlying\nSwooping Protector enters the battlefield with a shield counter on it. (If it would be dealt damage or destroyed, remove a shield counter from it instead.)
diff --git a/forge-gui/res/cardsfolder/upcoming/titan_of_industry.txt b/forge-gui/res/cardsfolder/upcoming/titan_of_industry.txt
index f12b00d51e2..2e556a4328e 100644
--- a/forge-gui/res/cardsfolder/upcoming/titan_of_industry.txt
+++ b/forge-gui/res/cardsfolder/upcoming/titan_of_industry.txt
@@ -9,6 +9,6 @@ SVar:TrigCharm:DB$ Charm | Choices$ Destroy,GainLife,Token,PutCounter | CharmNum
 SVar:Destroy:DB$ Destroy | ValidTgts$ Artifact,Enchantment | TgtPrompt$ Select target artifact or enchantment | SpellDescription$ Destroy target artifact or enchantment.
 SVar:GainLife:DB$ GainLife | LifeAmount$ 5 | ValidTgts$ Player | TgtPrompt$ Choose a player | SpellDescription$ Target player gains 5 life.
 SVar:Token:DB$ Token | TokenScript$ g_4_4_rhino_warrior | SpellDescription$ Create a 4/4 green Rhino Warrior creature token.
-SVar:PutCounter:DB$ PutCounter | Choices$ Creature.YouCtrl | ChoiceTitle$ Choose a creature you control | CounterType$ Shield | SpellDescription$ Put a shield counter on a creature you control.
+SVar:PutCounter:DB$ PutCounter | Choices$ Creature.YouCtrl | ChoiceTitle$ Choose a creature you control | CounterType$ SHIELD | SpellDescription$ Put a shield counter on a creature you control.
 DeckHas:Ability$LifeGain|Token|Counters & Types$Rhino|Warrior
 Oracle:Reach, trample\nWhen Titan of Industry enters the battlefield, choose two —\n• Destroy target artifact or enchantment.\n• Target player gains 5 life.\n• Create a 4/4 green Rhino Warrior creature token.\n• Put a shield counter on a creature you control.
diff --git a/forge-gui/res/cardsfolder/upcoming/undercover_operative.txt b/forge-gui/res/cardsfolder/upcoming/undercover_operative.txt
index d77e9e57d9c..2637824da18 100644
--- a/forge-gui/res/cardsfolder/upcoming/undercover_operative.txt
+++ b/forge-gui/res/cardsfolder/upcoming/undercover_operative.txt
@@ -4,7 +4,7 @@ Types:Creature Shapeshifter Rogue
 PT:0/0
 K:ETBReplacement:Copy:DBCopy:Optional
 SVar:DBCopy:DB$ Clone | Choices$ Creature.Other | SubAbility$ DBAddCounter | RememberCloneOrigin$ True | SpellDescription$ You may have CARDNAME enter the battlefield as a copy of any creature on the battlefield, except it enters with a shield counter on it if you control that creature. (If it would be dealt damage or destroyed, remove a shield counter from it instead.)
-SVar:DBAddCounter:DB$ PutCounter | Defined$ Self | CounterType$ Shield | ETB$ True | ConditionDefined$ Remembered | ConditionPresent$ Creature.YouCtrl | SubAbility$ DBCleanup
+SVar:DBAddCounter:DB$ PutCounter | Defined$ Self | CounterType$ SHIELD | ETB$ True | ConditionDefined$ Remembered | ConditionPresent$ Creature.YouCtrl | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Count$xPaid
 DeckHas:Ability$Counters
diff --git a/forge-gui/res/cardsfolder/upcoming/voice_of_the_vermin.txt b/forge-gui/res/cardsfolder/upcoming/voice_of_the_vermin.txt
index 242e1a115be..4d28ace4c77 100644
--- a/forge-gui/res/cardsfolder/upcoming/voice_of_the_vermin.txt
+++ b/forge-gui/res/cardsfolder/upcoming/voice_of_the_vermin.txt
@@ -2,7 +2,7 @@ Name:Voice of the Vermin
 ManaCost:3 G
 Types:Creature Human Citizen
 PT:2/2
-K:etbCounter:Shield:1:no Condition:CARDNAME enters the battlefield with a shield counter on it.  (If it would be dealt damage or destroyed, remove a shield counter from it instead.)
+K:etbCounter:SHIELD:1
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigAnimate | TriggerDescription$ Whenever CARDNAME attacks, target creature you control has base power and toughness 4/4 until end of turn.
 SVar:TrigAnimate:DB$ Animate | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | Power$ 4 | Toughness$ 4
 DeckHas:Ability$Counters
diff --git a/forge-gui/res/cardsfolder/upcoming/wingshield_agent.txt b/forge-gui/res/cardsfolder/upcoming/wingshield_agent.txt
index 0d32e5ac6bd..c1596675cf5 100644
--- a/forge-gui/res/cardsfolder/upcoming/wingshield_agent.txt
+++ b/forge-gui/res/cardsfolder/upcoming/wingshield_agent.txt
@@ -2,7 +2,7 @@ Name:Wingshield Agent
 ManaCost:2 U
 Types:Creature Human Soldier
 PT:2/3
-K:etbCounter:Shield:1:no Condition:CARDNAME enters the battlefield with a shield counter on it.  (If it would be dealt damage or destroyed, remove a shield counter from it instead.)
+K:etbCounter:SHIELD:1
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks, up to one other target creature gains flying until end of turn.
 SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.Other | TgtPrompt$ Select up to one other target creature | TargetMin$ 0 | TargetMax$ 1 | KW$ Flying
 DeckHas:Ability$Counters