From e7f5e70328fd5a358467297ff9659f80d78708e0 Mon Sep 17 00:00:00 2001
From: moomarc <moomarc@cardforge.org>
Date: Mon, 13 Feb 2012 15:46:01 +0000
Subject: [PATCH] Previous commit left out the actual script for Tetravus and
 the change to AbilityFactoryCleanup.java

---
 .gitattributes                                |  1 +
 res/cardsfolder/t/tetravus.txt                | 20 +++++++++++++++++++
 .../abilityfactory/AbilityFactoryCleanup.java |  3 +++
 3 files changed, 24 insertions(+)
 create mode 100644 res/cardsfolder/t/tetravus.txt

diff --git a/.gitattributes b/.gitattributes
index b98dd9ed335..9ad2d17f16d 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -8940,6 +8940,7 @@ res/cardsfolder/t/test_of_endurance.txt svneol=native#text/plain
 res/cardsfolder/t/testament_of_faith.txt svneol=native#text/plain
 res/cardsfolder/t/tethered_griffin.txt svneol=native#text/plain
 res/cardsfolder/t/tethered_skirge.txt svneol=native#text/plain
+res/cardsfolder/t/tetravus.txt -text
 res/cardsfolder/t/tetsuo_umezawa.txt svneol=native#text/plain
 res/cardsfolder/t/teysa_orzhov_scion.txt svneol=native#text/plain
 res/cardsfolder/t/tezzeret_agent_of_bolas.txt svneol=native#text/plain
diff --git a/res/cardsfolder/t/tetravus.txt b/res/cardsfolder/t/tetravus.txt
new file mode 100644
index 00000000000..2d0e60cb17d
--- /dev/null
+++ b/res/cardsfolder/t/tetravus.txt
@@ -0,0 +1,20 @@
+Name:Tetravus
+ManaCost:6
+Types:Artifact Creature Construct
+Text:no text
+PT:1/1
+K:etbCounter:P1P1:3
+K:Flying
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ At the beginning of your upkeep, you may remove any number of +1/+1 counters from CARDNAME. If you do, put that many 1/1 colorless Tetravite artifact creature tokens onto the battlefield. They each have flying and "This creature can't be enchanted."
+SVar:TrigToken:AB$Token | Cost$ SubCounter<X/P1P1> | TokenAmount$ ChosenX | TokenName$ Tetravite | TokenTypes$ Artifact,Creature,Tetravite | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying<>CARDNAME can't be enchanted. | RememberTokens$ True | SubAbility$ DBClearXChoice
+SVar:DBClearXChoice:DB$ Cleanup | ClearChosenX$ True
+SVar:X:XChoice
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPutCounters | TriggerDescription$ At the beginning of your upkeep, you may exile any number of tokens put onto the battlefield with CARDNAME. If you do, put that many +1/+1 counters on CARDNAME.
+SVar:TrigPutCounters:AB$PutCounter | Cost$ Exile<Y/Creature.IsRemembered/Tetravite> | Defined$ Self | CounterType$ P1P1 | CounterNum$ ChosenY | CostDesc$ Exile any number of tokens put onto the battlefield with CARDNAME. | SubAbility$ DBClearYChoice
+SVar:DBClearYChoice:DB$ Cleanup | ClearChosenY$ True
+SVar:Y:YChoice
+SVar:Rarity:Rare
+SetInfo:4ED|Rare|http://magiccards.info/scans/en/4e/368.jpg
+SetInfo:ATQ|Rare|http://magiccards.info/scans/en/aq/36.jpg
+Oracle:Flying\nTetravus enters the battlefield with three +1/+1 counters on it.\nAt the beginning of your upkeep, you may remove any number of +1/+1 counters from Tetravus. If you do, put that many 1/1 colorless Tetravite artifact creature tokens onto the battlefield. They each have flying and "This creature can't be enchanted."\nAt the beginning of your upkeep, you may exile any number of tokens put onto the battlefield with Tetravus. If you do, put that many +1/+1 counters on Tetravus.
+End
\ No newline at end of file
diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryCleanup.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryCleanup.java
index 487b6d313c8..babb4714732 100644
--- a/src/main/java/forge/card/abilityfactory/AbilityFactoryCleanup.java
+++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryCleanup.java
@@ -95,6 +95,9 @@ public final class AbilityFactoryCleanup {
         if (params.containsKey("ClearChosenX")) {
             sa.getSourceCard().setSVar("ChosenX", "");
         }
+        if (params.containsKey("ClearChosenY")) {
+            sa.getSourceCard().setSVar("ChosenY", "");
+        }
         if (params.containsKey("ClearTriggered")) {
             AllZone.getTriggerHandler().clearDelayedTrigger(sa.getSourceCard());
         }