From a08f0c2710fef37d01caa92f9a198be9e3f391f4 Mon Sep 17 00:00:00 2001
From: Simisays <67333662+Simisays@users.noreply.github.com>
Date: Sat, 7 Oct 2023 18:55:33 +0200
Subject: [PATCH 1/6] update

---
 .../main/java/forge/game/card/CounterEnumType.java  |  2 ++
 .../res/cardsfolder/upcoming/aces_baseball_bat.txt  |  9 +++++++++
 .../cardsfolder/upcoming/alistair_the_brigadier.txt | 13 +++++++++++++
 .../upcoming/antarctic_research_base.txt            | 12 ++++++++++++
 .../res/cardsfolder/upcoming/aplan_mortarium.txt    | 11 +++++++++++
 .../upcoming/five_hundred_year_diary.txt            | 10 ++++++++++
 .../cardsfolder/upcoming/into_the_time_vortex.txt   |  6 ++++++
 .../upcoming/jenny_generated_anomaly.txt            |  9 +++++++++
 .../cardsfolder/upcoming/quantum_misalignment.txt   |  7 +++++++
 forge-gui/res/lists/TypeLists.txt                   |  1 +
 10 files changed, 80 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/aces_baseball_bat.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/alistair_the_brigadier.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/antarctic_research_base.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/aplan_mortarium.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/five_hundred_year_diary.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/into_the_time_vortex.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/jenny_generated_anomaly.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/quantum_misalignment.txt

diff --git a/forge-game/src/main/java/forge/game/card/CounterEnumType.java b/forge-game/src/main/java/forge/game/card/CounterEnumType.java
index a2e83c166be..45828ac999e 100644
--- a/forge-game/src/main/java/forge/game/card/CounterEnumType.java
+++ b/forge-game/src/main/java/forge/game/card/CounterEnumType.java
@@ -122,6 +122,8 @@ public enum CounterEnumType {
     EON("EON", 23, 194, 255),
 
     EMBER("EMBER", 247, 52, 43),
+    
+    EXPOSURE("EXPOSURE", 50, 180, 30),
 
     EYEBALL("EYE", 184, 202, 201),
 
diff --git a/forge-gui/res/cardsfolder/upcoming/aces_baseball_bat.txt b/forge-gui/res/cardsfolder/upcoming/aces_baseball_bat.txt
new file mode 100644
index 00000000000..7b4585d0d88
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/aces_baseball_bat.txt
@@ -0,0 +1,9 @@
+Name:Ace's Baseball Bat
+ManaCost:2
+Types:Legendary Artifact Equipment
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 3 | Description$ Equipped creature gets +3/+0.
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | IsPresent$ Creature.EquippedBy+attacking | AddKeyword$ First Strike & MustBeBlockedBy Creature.Dalek | Description$ As long as equipped creature is attacking, it has first strike and must be blocked by a Dalek if able.
+K:Equip:1:Creature.Legendary:legendary creature
+K:Equip:3
+DeckHints:Type$Legendary & Type$Creature
+Oracle:Equipped creature gets +3/+0.\nAs long as equipped creature is attacking, it has first strike and must be blocked by a Dalek if able.\nEquip legendary creature {1}\nEquip {3}
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/alistair_the_brigadier.txt b/forge-gui/res/cardsfolder/upcoming/alistair_the_brigadier.txt
new file mode 100644
index 00000000000..875e56c9bb0
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/alistair_the_brigadier.txt
@@ -0,0 +1,13 @@
+Name:Alistair, the Brigadier
+ManaCost:1 G W U
+Types:Legendary Creature Human Soldier
+PT:3/3
+T:Mode$ SpellCast | ValidCard$ Card.Historic | ValidActivatingPlayer$ You | Execute$ TrigToken | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast a historic spell, create a 1/1 white Soldier creature token. (Artifacts, legendaries, and Sagas are historic.)
+SVar:TrigToken:DB$ Token | TokenScript$ w_1_1_soldier
+T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigPumpAll | TriggerDescription$ Whenever NICKNAME attacks, you may pay {8}. If you do, creatures you control get +X/+X until end of turn, where X is the number of historic permanents you control.
+SVar:TrigPumpAll:AB$ PumpAll | Cost$ 8 | ValidCards$ Creature.YouCtrl | NumAtt$ X | NumDef$ X
+SVar:X:Count$Valid Permanent.YouCtrl+Historic
+DeckHas:Ability$Token
+DeckHints:Type$Artifact|Legendary|Saga
+SVar:HasAttackEffect:TRUE
+Oracle:Whenever you cast a historic spell, create a 1/1 white Soldier creature token. (Artifacts, legendaries, and Sagas are historic.)\nWhenever Alistair attacks, you may pay {8}. If you do, creatures you control get +X/+X until end of turn, where X is the number of historic permanents you control.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/antarctic_research_base.txt b/forge-gui/res/cardsfolder/upcoming/antarctic_research_base.txt
new file mode 100644
index 00000000000..82350cfd46b
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/antarctic_research_base.txt
@@ -0,0 +1,12 @@
+Name:Antarctic Research Base
+ManaCost:no cost
+Types:Plane Earth
+T:Mode$ PlaneswalkedTo | ValidCard$ Card.Self | Execute$ TrigInvestigate | TriggerDescription$ When you planeswalk to CARDNAME Base and at the beginning of your upkeep, investigate.
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigInvestigate | TriggerZones$ Command | Secondary$ True | TriggerDescription$ When you planeswalk to CARDNAME and at the beginning of your upkeep, investigate.
+SVar:TrigInvestigate:DB$ Investigate
+T:Mode$ ChaosEnsues | TriggerZones$ Command | Execute$ TrigPutCounter | TriggerDescription$ Whenever chaos ensues, put X +1/+1 counters on target creature you control, where X is the number of artifacts you control. It becomes a Plant in addition to its other types.
+SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | CounterType$ P1P1 | CounterNum$ X | SubAbility$ DBAnimate
+SVar:DBAnimate:DB$ Animate | Defined$ Targeted | Types$ Plant | Duration$ Permanent
+SVar:X:Count$Valid Artifact.YouCtrl
+DeckHas:Ability$Token|Counters & Type$Clue|Artifact|Plant
+Oracle:When you planeswalk to Antarctic Research Base and at the beginning of your upkeep, investigate.\nWhenever chaos ensues, put X +1/+1 counters on target creature you control, where X is the number of artifacts you control. It becomes a Plant in addition to its other types.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/aplan_mortarium.txt b/forge-gui/res/cardsfolder/upcoming/aplan_mortarium.txt
new file mode 100644
index 00000000000..aef85245c78
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/aplan_mortarium.txt
@@ -0,0 +1,11 @@
+Name:Aplan Mortarium
+ManaCost:no cost
+Types:Plane Alfava Metraxis
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigPutCounter | TriggerZones$ Command | TriggerDescription$ Byzantium Radiation — At the beginning of your upkeep, put an exposure counter on CARDNAME. Then you lose life equal to the number of exposure counters on it.
+SVar:TrigPutCounter:DB$ PutCounter | CounterType$ EXPOSURE | CounterNum$ 1 | SubAbility$ DBLoseLife
+SVar:DBLoseLife:DB$ LoseLife | Defined$ You | LifeAmount$ X
+SVar:X:Count$CardCounters.EXPOSURE
+T:Mode$ ChaosEnsues | OptionalDecider$ You | TriggerZones$ Command | Execute$ TrigToken | TriggerDescription$ Whenever chaos ensues, put X +1/+1 counters on target creature you control, where X is the number of artifacts you control. It becomes a Plant in addition to its other types.
+SVar:TrigToken:DB$ Token | TokenAmount$ 2 | TokenScript$ b_2_2_a_alien_angel_firststrike_vigilance 
+DeckHas:Ability$Counters|Token & Type$Angel|Alien|Artifact
+Oracle:Byzantium Radiation — At the beginning of your upkeep, put an exposure counter on Aplan Mortarium. Then you lose life equal to the number of exposure counters on it.\nWhenever chaos ensues, create two 2/2 black Alien Angel artifact creature tokens with first strike, vigilance, and "Whenever an opponent casts a creature spell, this permanent isn't a creature until end of turn."
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/five_hundred_year_diary.txt b/forge-gui/res/cardsfolder/upcoming/five_hundred_year_diary.txt
new file mode 100644
index 00000000000..66d39f80148
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/five_hundred_year_diary.txt
@@ -0,0 +1,10 @@
+Name:Five Hundred Year Diary
+ManaCost:3 U
+Types:Legendary Artifact Clue
+K:CARDNAME enters the battlefield tapped.
+A:AB$ Mana | Cost$ T | Produced$ U | Amount$ X | SpellDescription$ Add {U} for each Clue you control.
+SVar:X:Count$Valid Clue
+A:AB$ Draw | Cost$ 2 Sac<1/CARDNAME> | SpellDescription$ Draw a card.
+DeckHints:Type$Clue
+DeckHas:Ability$Sacrifice
+Oracle:Five Hundred Year Diary enters the battlefield tapped.\n{T}: Add {U} for each Clue you control.\n{2}, Sacrifice Five Hundred Year Diary: Draw a card.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/into_the_time_vortex.txt b/forge-gui/res/cardsfolder/upcoming/into_the_time_vortex.txt
new file mode 100644
index 00000000000..1bedca57404
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/into_the_time_vortex.txt
@@ -0,0 +1,6 @@
+Name:Into the Time Vortex
+ManaCost:4 R
+Types:Sorcery
+K:Cascade
+K:Rebound
+Oracle:Cascade (When you cast this spell, exile cards from the top of your library until you exile a nonland card that costs less. You may cast it without paying its mana cost. Put the exiled cards on the bottom in a random order.)\nRebound (If you cast this spell from your hand, exile it as it resolves. At the beginning of your next upkeep, you may cast this card from exile without paying its mana cost.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/jenny_generated_anomaly.txt b/forge-gui/res/cardsfolder/upcoming/jenny_generated_anomaly.txt
new file mode 100644
index 00000000000..ba9a16a932f
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/jenny_generated_anomaly.txt
@@ -0,0 +1,9 @@
+Name:Jenny, Generated Anomaly
+ManaCost:2 R W
+Types:Legendary Creature Time Lord Soldier
+PT:2/3
+K:Double strike
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigExplore | TriggerZones$ Battlefield | TriggerController$ TriggeredSourceController | TriggerDescription$ Whenever NICKNAME deals combat damage to a player, it explores. (Reveal the top card of your library. Put that card into your hand if it's a land. Otherwise, put a +1/+1 counter on this creature, then put the card back or put it into your graveyard.)
+SVar:TrigExplore:DB$ Explore
+DeckHas:Ability$Counters
+Oracle:Double strike\nWhenever Jenny deals combat damage to a player, it explores. (Reveal the top card of your library. Put that card into your hand if it's a land. Otherwise, put a +1/+1 counter on this creature, then put the card back or put it into your graveyard.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/quantum_misalignment.txt b/forge-gui/res/cardsfolder/upcoming/quantum_misalignment.txt
new file mode 100644
index 00000000000..5120121edc4
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/quantum_misalignment.txt
@@ -0,0 +1,7 @@
+Name:Quantum Misalignment
+ManaCost:4 U
+Types:Sorcery
+K:Rebound
+DeckHas:Ability$Token
+A:SP$ CopyPermanent | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control |NonLegendary$ True | SpellDescription$ Create a token that's a copy of target creature you control, except it isn't legendary.
+Oracle:Create a token that's a copy of target creature you control, except it isn't legendary.\nRebound (If you cast this spell from your hand, exile it as it resolves. At the beginning of your next upkeep, you may cast this card from exile without paying its mana cost.)
\ No newline at end of file
diff --git a/forge-gui/res/lists/TypeLists.txt b/forge-gui/res/lists/TypeLists.txt
index 2c903e59b5b..dd8ee510a84 100644
--- a/forge-gui/res/lists/TypeLists.txt
+++ b/forge-gui/res/lists/TypeLists.txt
@@ -420,6 +420,7 @@ Undercity
 Siege
 [PlanarTypes]
 Alara
+Alfava Metraxis
 Amonkhet
 Antausia
 Arcavios

From c12e5975547f410438897fec4d39dbcf02344cae Mon Sep 17 00:00:00 2001
From: Simisays <67333662+Simisays@users.noreply.github.com>
Date: Sat, 7 Oct 2023 19:00:29 +0200
Subject: [PATCH 2/6] update

---
 forge-gui/res/cardsfolder/upcoming/aplan_mortarium.txt      | 3 ++-
 forge-gui/res/cardsfolder/upcoming/into_the_time_vortex.txt | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/aplan_mortarium.txt b/forge-gui/res/cardsfolder/upcoming/aplan_mortarium.txt
index aef85245c78..107d1979c79 100644
--- a/forge-gui/res/cardsfolder/upcoming/aplan_mortarium.txt
+++ b/forge-gui/res/cardsfolder/upcoming/aplan_mortarium.txt
@@ -5,7 +5,8 @@ T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigPutCounter | Tri
 SVar:TrigPutCounter:DB$ PutCounter | CounterType$ EXPOSURE | CounterNum$ 1 | SubAbility$ DBLoseLife
 SVar:DBLoseLife:DB$ LoseLife | Defined$ You | LifeAmount$ X
 SVar:X:Count$CardCounters.EXPOSURE
-T:Mode$ ChaosEnsues | OptionalDecider$ You | TriggerZones$ Command | Execute$ TrigToken | TriggerDescription$ Whenever chaos ensues, put X +1/+1 counters on target creature you control, where X is the number of artifacts you control. It becomes a Plant in addition to its other types.
+T:Mode$ ChaosEnsues | TriggerZones$ Command | Execute$ TrigToken | TriggerDescription$ Whenever chaos ensues, create two 2/2 black Alien Angel artifact creature tokens with first strike, vigilance, and "Whenever an opponent casts a creature spell, this permanent isn't a creature until end of turn."
+
 SVar:TrigToken:DB$ Token | TokenAmount$ 2 | TokenScript$ b_2_2_a_alien_angel_firststrike_vigilance 
 DeckHas:Ability$Counters|Token & Type$Angel|Alien|Artifact
 Oracle:Byzantium Radiation — At the beginning of your upkeep, put an exposure counter on Aplan Mortarium. Then you lose life equal to the number of exposure counters on it.\nWhenever chaos ensues, create two 2/2 black Alien Angel artifact creature tokens with first strike, vigilance, and "Whenever an opponent casts a creature spell, this permanent isn't a creature until end of turn."
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/into_the_time_vortex.txt b/forge-gui/res/cardsfolder/upcoming/into_the_time_vortex.txt
index 1bedca57404..bac3e731888 100644
--- a/forge-gui/res/cardsfolder/upcoming/into_the_time_vortex.txt
+++ b/forge-gui/res/cardsfolder/upcoming/into_the_time_vortex.txt
@@ -1,6 +1,7 @@
 Name:Into the Time Vortex
 ManaCost:4 R
 Types:Sorcery
+A:SP$ Pump | Cost$ 4 R | StackDescription$ None
 K:Cascade
 K:Rebound
 Oracle:Cascade (When you cast this spell, exile cards from the top of your library until you exile a nonland card that costs less. You may cast it without paying its mana cost. Put the exiled cards on the bottom in a random order.)\nRebound (If you cast this spell from your hand, exile it as it resolves. At the beginning of your next upkeep, you may cast this card from exile without paying its mana cost.)
\ No newline at end of file

From bbea66b9492cad9f3ee4b6b31fafdfcc39e8e951 Mon Sep 17 00:00:00 2001
From: Simisays <67333662+Simisays@users.noreply.github.com>
Date: Sat, 7 Oct 2023 19:01:17 +0200
Subject: [PATCH 3/6] Update quantum_misalignment.txt

---
 forge-gui/res/cardsfolder/upcoming/quantum_misalignment.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/quantum_misalignment.txt b/forge-gui/res/cardsfolder/upcoming/quantum_misalignment.txt
index 5120121edc4..08829cf1aa7 100644
--- a/forge-gui/res/cardsfolder/upcoming/quantum_misalignment.txt
+++ b/forge-gui/res/cardsfolder/upcoming/quantum_misalignment.txt
@@ -2,6 +2,6 @@ Name:Quantum Misalignment
 ManaCost:4 U
 Types:Sorcery
 K:Rebound
+A:SP$ CopyPermanent | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | NonLegendary$ True | SpellDescription$ Create a token that's a copy of target creature you control, except it isn't legendary.
 DeckHas:Ability$Token
-A:SP$ CopyPermanent | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control |NonLegendary$ True | SpellDescription$ Create a token that's a copy of target creature you control, except it isn't legendary.
-Oracle:Create a token that's a copy of target creature you control, except it isn't legendary.\nRebound (If you cast this spell from your hand, exile it as it resolves. At the beginning of your next upkeep, you may cast this card from exile without paying its mana cost.)
\ No newline at end of file
+Oracle:Create a token that's a copy of target creature you control, except it isn't legendary.\nRebound (If you cast this spell from your hand, exile it as it resolves. At the beginning of your next upkeep, you may cast this card from exile without paying its mana cost.)

From fb12aba5cc453ed836b60867033f28bf259239d4 Mon Sep 17 00:00:00 2001
From: Simisays <67333662+Simisays@users.noreply.github.com>
Date: Sat, 7 Oct 2023 21:46:45 +0200
Subject: [PATCH 4/6] update

---
 .../res/cardsfolder/upcoming/aces_baseball_bat.txt   |  2 +-
 .../cardsfolder/upcoming/antarctic_research_base.txt |  2 +-
 .../res/cardsfolder/upcoming/aplan_mortarium.txt     |  1 -
 .../cardsfolder/upcoming/ashad_the_lone_cyberman.txt | 11 +++++++++++
 forge-gui/res/cardsfolder/upcoming/astrid_peth.txt   | 12 ++++++++++++
 forge-gui/res/cardsfolder/upcoming/atraxi_warden.txt |  9 +++++++++
 forge-gui/res/cardsfolder/upcoming/auton_soldier.txt |  8 ++++++++
 .../upcoming/banish_to_another_universe.txt          | 10 ++++++++++
 .../cardsfolder/upcoming/five_hundred_year_diary.txt |  2 +-
 .../cardsfolder/upcoming/jenny_generated_anomaly.txt |  2 +-
 10 files changed, 54 insertions(+), 5 deletions(-)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/ashad_the_lone_cyberman.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/astrid_peth.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/atraxi_warden.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/auton_soldier.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/banish_to_another_universe.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/aces_baseball_bat.txt b/forge-gui/res/cardsfolder/upcoming/aces_baseball_bat.txt
index 7b4585d0d88..2fcd5e4ede8 100644
--- a/forge-gui/res/cardsfolder/upcoming/aces_baseball_bat.txt
+++ b/forge-gui/res/cardsfolder/upcoming/aces_baseball_bat.txt
@@ -2,7 +2,7 @@ Name:Ace's Baseball Bat
 ManaCost:2
 Types:Legendary Artifact Equipment
 S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 3 | Description$ Equipped creature gets +3/+0.
-S:Mode$ Continuous | Affected$ Creature.EquippedBy | IsPresent$ Creature.EquippedBy+attacking | AddKeyword$ First Strike & MustBeBlockedBy Creature.Dalek | Description$ As long as equipped creature is attacking, it has first strike and must be blocked by a Dalek if able.
+S:Mode$ Continuous | Affected$ Creature.EquippedBy+attacking | AddKeyword$ First Strike & MustBeBlockedBy Creature.Dalek | Description$ As long as equipped creature is attacking, it has first strike and must be blocked by a Dalek if able.
 K:Equip:1:Creature.Legendary:legendary creature
 K:Equip:3
 DeckHints:Type$Legendary & Type$Creature
diff --git a/forge-gui/res/cardsfolder/upcoming/antarctic_research_base.txt b/forge-gui/res/cardsfolder/upcoming/antarctic_research_base.txt
index 82350cfd46b..427b89c787a 100644
--- a/forge-gui/res/cardsfolder/upcoming/antarctic_research_base.txt
+++ b/forge-gui/res/cardsfolder/upcoming/antarctic_research_base.txt
@@ -1,7 +1,7 @@
 Name:Antarctic Research Base
 ManaCost:no cost
 Types:Plane Earth
-T:Mode$ PlaneswalkedTo | ValidCard$ Card.Self | Execute$ TrigInvestigate | TriggerDescription$ When you planeswalk to CARDNAME Base and at the beginning of your upkeep, investigate.
+T:Mode$ PlaneswalkedTo | ValidCard$ Card.Self | Execute$ TrigInvestigate | TriggerDescription$ When you planeswalk to CARDNAME and at the beginning of your upkeep, investigate.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigInvestigate | TriggerZones$ Command | Secondary$ True | TriggerDescription$ When you planeswalk to CARDNAME and at the beginning of your upkeep, investigate.
 SVar:TrigInvestigate:DB$ Investigate
 T:Mode$ ChaosEnsues | TriggerZones$ Command | Execute$ TrigPutCounter | TriggerDescription$ Whenever chaos ensues, put X +1/+1 counters on target creature you control, where X is the number of artifacts you control. It becomes a Plant in addition to its other types.
diff --git a/forge-gui/res/cardsfolder/upcoming/aplan_mortarium.txt b/forge-gui/res/cardsfolder/upcoming/aplan_mortarium.txt
index 107d1979c79..1c46ee4e078 100644
--- a/forge-gui/res/cardsfolder/upcoming/aplan_mortarium.txt
+++ b/forge-gui/res/cardsfolder/upcoming/aplan_mortarium.txt
@@ -6,7 +6,6 @@ SVar:TrigPutCounter:DB$ PutCounter | CounterType$ EXPOSURE | CounterNum$ 1 | Sub
 SVar:DBLoseLife:DB$ LoseLife | Defined$ You | LifeAmount$ X
 SVar:X:Count$CardCounters.EXPOSURE
 T:Mode$ ChaosEnsues | TriggerZones$ Command | Execute$ TrigToken | TriggerDescription$ Whenever chaos ensues, create two 2/2 black Alien Angel artifact creature tokens with first strike, vigilance, and "Whenever an opponent casts a creature spell, this permanent isn't a creature until end of turn."
-
 SVar:TrigToken:DB$ Token | TokenAmount$ 2 | TokenScript$ b_2_2_a_alien_angel_firststrike_vigilance 
 DeckHas:Ability$Counters|Token & Type$Angel|Alien|Artifact
 Oracle:Byzantium Radiation — At the beginning of your upkeep, put an exposure counter on Aplan Mortarium. Then you lose life equal to the number of exposure counters on it.\nWhenever chaos ensues, create two 2/2 black Alien Angel artifact creature tokens with first strike, vigilance, and "Whenever an opponent casts a creature spell, this permanent isn't a creature until end of turn."
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/ashad_the_lone_cyberman.txt b/forge-gui/res/cardsfolder/upcoming/ashad_the_lone_cyberman.txt
new file mode 100644
index 00000000000..dca5d9ecf84
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/ashad_the_lone_cyberman.txt
@@ -0,0 +1,11 @@
+Name:Ashad, the Lone Cyberman
+ManaCost:1 U B R
+Types:Legendary Artifact Creature Cyberman
+PT:3/3
+S:Mode$ Continuous | Affected$ Card.Artifact+nonLegendary | AffectedZone$ Stack | CheckSVar$ X | SVarCompare$ EQ0 | AddKeyword$ Casualty:2 | Description$ The first nonlegendary artifact spell you cast each turn has casualty 2. (As you cast it, you may sacrifice a creature with power 2 or greater. When you do, copy it. A copy of an artifact spell becomes a token.)
+SVar:X:Count$ThisTurnCast_Artifact.nonLegendary+YouCtrl
+T:Mode$ Sacrificed | ValidCard$ Creature.Other | ValidPlayer$ You | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever you sacrifice another creature, put a +1/+1 counter on CARDNAME.
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
+DeckHas:Ability$Sacrifice|Counters
+DeckHints:Type$Artifact
+Oracle:The first nonlegendary artifact spell you cast each turn has casualty 2. (As you cast it, you may sacrifice a creature with power 2 or greater. When you do, copy it. A copy of an artifact spell becomes a token.)\nWhenever you sacrifice another creature, put a +1/+1 counter on Ashad, the Lone Cyberman.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/astrid_peth.txt b/forge-gui/res/cardsfolder/upcoming/astrid_peth.txt
new file mode 100644
index 00000000000..f0880accfa5
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/astrid_peth.txt
@@ -0,0 +1,12 @@
+Name:Astrid Peth
+ManaCost:1 W
+Types:Legendary Creature Human
+PT:2/2
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME enters the battlefield or attacks, create a Food token.
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME enters the battlefield or attacks, create a Food token.
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_food_sac | TokenOwner$ You
+T:Mode$ Sacrificed | ValidPlayer$ You | ValidCard$ Food.YouCtrl,Clue.YouCtrl | Origin$ Any | Destination$ Battlefield | Execute$ TrigExplore | TriggerZones$ Battlefield | TriggerDescription$ Brand-new Sky — Whenever you sacrifice a Clue or Food, CARDNAME explores. (Reveal the top card of your library. Put that card into your hand if it's a land. Otherwise, put a +1/+1 counter on this creature, then put the card back or put it into your graveyard.)
+SVar:TrigExplore:DB$ Explore
+DeckHas:Ability$Sacrifice|Token|Counters & Type$Food|Artifact
+DeckHints:Type$Food|Clue
+Oracle:Whenever Astrid Peth enters the battlefield or attacks, create a Food token.\nBrand-new Sky — Whenever you sacrifice a Clue or Food, Astrid Peth explores. (Reveal the top card of your library. Put that card into your hand if it's a land. Otherwise, put a +1/+1 counter on this creature, then put the card back or put it into your graveyard.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/atraxi_warden.txt b/forge-gui/res/cardsfolder/upcoming/atraxi_warden.txt
new file mode 100644
index 00000000000..7d9f2bd3f59
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/atraxi_warden.txt
@@ -0,0 +1,9 @@
+Name:Atraxi Warden
+ManaCost:4 W W
+Types:Creature Alien Eye
+PT:6/6
+K:Flying
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | TriggerZones$ Battlefield | ValidCard$ Card.Self | Execute$ DBChangeZone | TriggerDescription$When CARDNAME enters the battlefield, exile up to one target tapped creature.
+SVar:DBChangeZone:DB$ ChangeZone | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Creature.tapped | TgtPrompt$ Select up to one target tapped creature | TargetMin$ 0 | TargetMax$ 1
+K:Suspend:5:1 W
+Oracle:Flying\nWhen Atraxi Warden enters the battlefield, exile up to one target tapped creature.\nSuspend 5—{1}{W} (Rather than cast this card from your hand, you may pay {1}{W} and exile it with five time counters on it. At the beginning of your upkeep, remove a time counter. When the last is removed, cast it without paying its mana cost. It has haste.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/auton_soldier.txt b/forge-gui/res/cardsfolder/upcoming/auton_soldier.txt
new file mode 100644
index 00000000000..0a43a145c9c
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/auton_soldier.txt
@@ -0,0 +1,8 @@
+Name:Auton Soldier
+ManaCost:4 U U
+Types:Artifact Creature Alien Soldier
+PT:0/0
+K:ETBReplacement:Copy:DBCopy:Optional
+SVar:DBCopy:DB$ Clone | Choices$ Creature | AddTypes$ Artifact | AddKeywords$ Myriad | NonLegendary$ True | SpellDescription$ You may have CARDNAME enter the battlefield as a copy of any creature on the battlefield, except it isn't legendary, is an artifact in addition to its other types, and has myriad. (Whenever it attacks, for each opponent other than defending player, you may put a token that's a copy of this creature onto the battlefield tapped and attacking that player or a planeswalker they control. Exile the tokens at end of combat.)
+DeckHas:Ability$Counters
+Oracle:You may have Auton Soldier enter the battlefield as a copy of any creature on the battlefield, except it isn’t legendary, is an artifact in addition to its other types, and has myriad. (Whenever it attacks, for each opponent other than defending player, you may put a token that's a copy of this creature onto the battlefield tapped and attacking that player or a planeswalker they control. Exile the tokens at end of combat.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/banish_to_another_universe.txt b/forge-gui/res/cardsfolder/upcoming/banish_to_another_universe.txt
new file mode 100644
index 00000000000..034fe235f8d
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/banish_to_another_universe.txt
@@ -0,0 +1,10 @@
+Name:Banish to Another Universe
+ManaCost:4 W
+Types:Enchantment
+K:Affinity:Permanent.Historic
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ When CARDNAME enters the battlefield, exile target nonland permanent an opponent controls until CARDNAME leaves the battlefield.
+SVar:TrigExile:DB$ ChangeZone | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Permanent.nonLand+OppCtrl | TgtPrompt$ Select target nonland permanent an opponent controls | Duration$ UntilHostLeavesPlay
+SVar:PlayMain1:TRUE
+SVar:OblivionRing:TRUE
+DeckHints:Type$Artifact|Legendary|Saga
+Oracle:Affinity for historic permanents (This spell costs {1} less to cast for each artifact, legendary, and/or Saga permanent you control.)\nWhen Banish to Another Universe enters the battlefield, exile target nonland permanent an opponent controls until Banish to Another Universe leaves the battlefield.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/five_hundred_year_diary.txt b/forge-gui/res/cardsfolder/upcoming/five_hundred_year_diary.txt
index 66d39f80148..94d50c395f9 100644
--- a/forge-gui/res/cardsfolder/upcoming/five_hundred_year_diary.txt
+++ b/forge-gui/res/cardsfolder/upcoming/five_hundred_year_diary.txt
@@ -3,7 +3,7 @@ ManaCost:3 U
 Types:Legendary Artifact Clue
 K:CARDNAME enters the battlefield tapped.
 A:AB$ Mana | Cost$ T | Produced$ U | Amount$ X | SpellDescription$ Add {U} for each Clue you control.
-SVar:X:Count$Valid Clue
+SVar:X:Count$Valid Clue.YouCtrl
 A:AB$ Draw | Cost$ 2 Sac<1/CARDNAME> | SpellDescription$ Draw a card.
 DeckHints:Type$Clue
 DeckHas:Ability$Sacrifice
diff --git a/forge-gui/res/cardsfolder/upcoming/jenny_generated_anomaly.txt b/forge-gui/res/cardsfolder/upcoming/jenny_generated_anomaly.txt
index ba9a16a932f..7da3377be64 100644
--- a/forge-gui/res/cardsfolder/upcoming/jenny_generated_anomaly.txt
+++ b/forge-gui/res/cardsfolder/upcoming/jenny_generated_anomaly.txt
@@ -2,7 +2,7 @@ Name:Jenny, Generated Anomaly
 ManaCost:2 R W
 Types:Legendary Creature Time Lord Soldier
 PT:2/3
-K:Double strike
+K:Double Strike
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigExplore | TriggerZones$ Battlefield | TriggerController$ TriggeredSourceController | TriggerDescription$ Whenever NICKNAME deals combat damage to a player, it explores. (Reveal the top card of your library. Put that card into your hand if it's a land. Otherwise, put a +1/+1 counter on this creature, then put the card back or put it into your graveyard.)
 SVar:TrigExplore:DB$ Explore
 DeckHas:Ability$Counters

From d820aca71f83c32daa38e196277fd35d31faa83d Mon Sep 17 00:00:00 2001
From: Simisays <67333662+Simisays@users.noreply.github.com>
Date: Sat, 7 Oct 2023 21:47:14 +0200
Subject: [PATCH 5/6] Update banish_to_another_universe.txt

---
 .../res/cardsfolder/upcoming/banish_to_another_universe.txt     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/banish_to_another_universe.txt b/forge-gui/res/cardsfolder/upcoming/banish_to_another_universe.txt
index 034fe235f8d..2fdea982013 100644
--- a/forge-gui/res/cardsfolder/upcoming/banish_to_another_universe.txt
+++ b/forge-gui/res/cardsfolder/upcoming/banish_to_another_universe.txt
@@ -1,7 +1,7 @@
 Name:Banish to Another Universe
 ManaCost:4 W
 Types:Enchantment
-K:Affinity:Permanent.Historic
+K:Affinity:Permanent.Historic:historic permanent
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ When CARDNAME enters the battlefield, exile target nonland permanent an opponent controls until CARDNAME leaves the battlefield.
 SVar:TrigExile:DB$ ChangeZone | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Permanent.nonLand+OppCtrl | TgtPrompt$ Select target nonland permanent an opponent controls | Duration$ UntilHostLeavesPlay
 SVar:PlayMain1:TRUE

From 85a6d346563e8e4f0260bf9df670082a24e503b4 Mon Sep 17 00:00:00 2001
From: Simisays <67333662+Simisays@users.noreply.github.com>
Date: Sat, 7 Oct 2023 23:05:28 +0200
Subject: [PATCH 6/6] Update astrid_peth.txt

---
 forge-gui/res/cardsfolder/upcoming/astrid_peth.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/astrid_peth.txt b/forge-gui/res/cardsfolder/upcoming/astrid_peth.txt
index f0880accfa5..f5ea2b0c8db 100644
--- a/forge-gui/res/cardsfolder/upcoming/astrid_peth.txt
+++ b/forge-gui/res/cardsfolder/upcoming/astrid_peth.txt
@@ -3,10 +3,10 @@ ManaCost:1 W
 Types:Legendary Creature Human
 PT:2/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME enters the battlefield or attacks, create a Food token.
-T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME enters the battlefield or attacks, create a Food token.
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigToken | Secondary$ True | TriggerDescription$ Whenever CARDNAME enters the battlefield or attacks, create a Food token.
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_food_sac | TokenOwner$ You
-T:Mode$ Sacrificed | ValidPlayer$ You | ValidCard$ Food.YouCtrl,Clue.YouCtrl | Origin$ Any | Destination$ Battlefield | Execute$ TrigExplore | TriggerZones$ Battlefield | TriggerDescription$ Brand-new Sky — Whenever you sacrifice a Clue or Food, CARDNAME explores. (Reveal the top card of your library. Put that card into your hand if it's a land. Otherwise, put a +1/+1 counter on this creature, then put the card back or put it into your graveyard.)
+T:Mode$ Sacrificed | ValidPlayer$ You | ValidCard$ Food.YouCtrl,Clue.YouCtrl | Execute$ TrigExplore | TriggerZones$ Battlefield | TriggerDescription$ Brand-new Sky — Whenever you sacrifice a Clue or Food, CARDNAME explores. (Reveal the top card of your library. Put that card into your hand if it's a land. Otherwise, put a +1/+1 counter on this creature, then put the card back or put it into your graveyard.)
 SVar:TrigExplore:DB$ Explore
 DeckHas:Ability$Sacrifice|Token|Counters & Type$Food|Artifact
 DeckHints:Type$Food|Clue
-Oracle:Whenever Astrid Peth enters the battlefield or attacks, create a Food token.\nBrand-new Sky — Whenever you sacrifice a Clue or Food, Astrid Peth explores. (Reveal the top card of your library. Put that card into your hand if it's a land. Otherwise, put a +1/+1 counter on this creature, then put the card back or put it into your graveyard.)
\ No newline at end of file
+Oracle:Whenever Astrid Peth enters the battlefield or attacks, create a Food token.\nBrand-new Sky — Whenever you sacrifice a Clue or Food, Astrid Peth explores. (Reveal the top card of your library. Put that card into your hand if it's a land. Otherwise, put a +1/+1 counter on this creature, then put the card back or put it into your graveyard.)