From 49bb679a125b904435d643c4cce0056c74c2baeb Mon Sep 17 00:00:00 2001
From: swordshine <hjy1986@gmail.com>
Date: Sun, 5 May 2019 08:50:06 +0800
Subject: [PATCH] Fix a few cards

---
 forge-core/src/main/java/forge/card/MagicColor.java | 4 ++--
 forge-gui/res/cardsfolder/d/dreadhorde_twins.txt    | 2 +-
 forge-gui/res/cardsfolder/f/forget.txt              | 3 ++-
 forge-gui/res/cardsfolder/u/ugins_conjurant.txt     | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/forge-core/src/main/java/forge/card/MagicColor.java b/forge-core/src/main/java/forge/card/MagicColor.java
index 552e99147f1..bf0b4fdbb9f 100644
--- a/forge-core/src/main/java/forge/card/MagicColor.java
+++ b/forge-core/src/main/java/forge/card/MagicColor.java
@@ -25,8 +25,8 @@ public final class MagicColor {
 
     public static final byte[] WUBRG  = new byte[] { WHITE, BLUE, BLACK, RED, GREEN };
     public static final byte[] WUBRGC = new byte[] { WHITE, BLUE, BLACK, RED, GREEN, COLORLESS };
-    public static final byte[] COLORPAIR  = new byte[] { WHITE | BLUE, BLUE | BLACK, BLACK | RED, RED | GREEN, GREEN |WHITE,
-            WHITE | BLACK, BLUE | RED, BLACK | GREEN, RED | WHITE, GREEN | BLUE};
+    public static final byte[] COLORPAIR  = new byte[] { WHITE | BLUE, BLUE | BLACK, BLACK | RED, RED | GREEN, GREEN | WHITE,
+            WHITE | BLACK, BLUE | RED, BLACK | GREEN, RED | WHITE, GREEN | BLUE };
 
     /**
      * Private constructor to prevent instantiation.
diff --git a/forge-gui/res/cardsfolder/d/dreadhorde_twins.txt b/forge-gui/res/cardsfolder/d/dreadhorde_twins.txt
index 13a33410e3a..114e0e53e88 100644
--- a/forge-gui/res/cardsfolder/d/dreadhorde_twins.txt
+++ b/forge-gui/res/cardsfolder/d/dreadhorde_twins.txt
@@ -4,7 +4,7 @@ Types:Creature Zombie Jackal Warrior
 PT:2/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ DBAmass | TriggerDescription$ When CARDNAME enters the battlefield, amass 2. (Put two +1/+1 counters on an Army you control. If you don't control one, create a 0/0 black Zombie Army creature token first.)
 SVar:DBAmass:DB$ Amass | Num$ 2
-S:Mode$ Continuous | Affected$ Creature.token+YouCtrl | AddKeyword$ Trample | Description$ Zombie tokens you control have trample.
+S:Mode$ Continuous | Affected$ Zombie.token+YouCtrl | AddKeyword$ Trample | Description$ Zombie tokens you control have trample.
 SVar:PlayMain1:TRUE
 DeckHints:Ability$Amass & Type$Zombie
 DeckHas:Ability$Amass & Ability$Counters & Ability$Token
diff --git a/forge-gui/res/cardsfolder/f/forget.txt b/forge-gui/res/cardsfolder/f/forget.txt
index df0e72c60ce..616c34a8b70 100644
--- a/forge-gui/res/cardsfolder/f/forget.txt
+++ b/forge-gui/res/cardsfolder/f/forget.txt
@@ -2,7 +2,8 @@ Name:Forget
 ManaCost:U U
 Types:Sorcery
 A:SP$ Discard | Cost$ U U | ValidTgts$ Player | TgtPrompt$ Select target player | Mode$ TgtChoose | NumCards$ 2 | RememberDiscarded$ True | SubAbility$ DBDraw | SpellDescription$ Target player discards two cards, then draws as many cards as they discarded this way.
-SVar:DBDraw:DB$ Draw | Defined$ Targeted | NumCards$ X | References$ X
+SVar:DBDraw:DB$ Draw | Defined$ Targeted | NumCards$ X | References$ X | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Remembered$Amount
 SVar:Picture:http://www.wizards.com/global/images/magic/general/forget.jpg
 Oracle:Target player discards two cards, then draws as many cards as they discarded this way.
diff --git a/forge-gui/res/cardsfolder/u/ugins_conjurant.txt b/forge-gui/res/cardsfolder/u/ugins_conjurant.txt
index 54a41d1c350..578b9e75df7 100644
--- a/forge-gui/res/cardsfolder/u/ugins_conjurant.txt
+++ b/forge-gui/res/cardsfolder/u/ugins_conjurant.txt
@@ -5,7 +5,7 @@ PT:0/0
 K:etbCounter:P1P1:X
 SVar:X:Count$xPaid
 R:Event$ DamageDone | ActiveZones$ Battlefield | ValidTarget$ Card.Self+counters_GE1_P1P1 | ReplaceWith$ Counters | PreventionEffect$ True | Description$ If damage would be dealt to CARDNAME while it has a +1/+1 counter on it, prevent that damage and remove that many +1/+1 counters from CARDNAME.
-SVar:Counters:DB$ RemoveCounter | Defined$ ReplacedTarget | CounterType$ P1P1 | CounterNum$ CounterNum$ Y | References$ Y
+SVar:Counters:DB$ RemoveCounter | Defined$ ReplacedTarget | CounterType$ P1P1 | CounterNum$ Y | References$ Y
 SVar:Y:ReplaceCount$DamageAmount
 DeckHas:Ability$Counters
 Oracle:Ugin's Conjurant enters the battlefield with X +1/+1 counters on it.\nIf damage would be dealt to Ugin's Conjurant while it has a +1/+1 counter on it, prevent that damage and remove that many +1/+1 counters from Ugin's Conjurant.