From 3390855c10c1a474fa7016c2ba0bc2f7da353cf8 Mon Sep 17 00:00:00 2001
From: moomarc <moomarc@cardforge.org>
Date: Tue, 14 Aug 2012 08:43:24 +0000
Subject: [PATCH] - Added Delif's Cube - Made X svar in Delif's Cone a unique
 name improved stack description - CUBE counters added to counter types

---
 .gitattributes                    |  1 +
 res/cardsfolder/d/delifs_cone.txt |  8 ++++----
 res/cardsfolder/d/delifs_cube.txt | 17 +++++++++++++++++
 src/main/java/forge/Counters.java |  3 +++
 4 files changed, 25 insertions(+), 4 deletions(-)
 create mode 100644 res/cardsfolder/d/delifs_cube.txt

diff --git a/.gitattributes b/.gitattributes
index 024903dba70..9cc68e74047 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2225,6 +2225,7 @@ res/cardsfolder/d/dehydration.txt svneol=native#text/plain
 res/cardsfolder/d/deity_of_scars.txt svneol=native#text/plain
 res/cardsfolder/d/deja_vu.txt svneol=native#text/plain
 res/cardsfolder/d/delifs_cone.txt -text
+res/cardsfolder/d/delifs_cube.txt -text
 res/cardsfolder/d/delirium.txt svneol=native#text/plain
 res/cardsfolder/d/delirium_skeins.txt svneol=native#text/plain
 res/cardsfolder/d/delraich.txt svneol=native#text/plain
diff --git a/res/cardsfolder/d/delifs_cone.txt b/res/cardsfolder/d/delifs_cone.txt
index 8f1dd418aba..d3cd3f59a54 100644
--- a/res/cardsfolder/d/delifs_cone.txt
+++ b/res/cardsfolder/d/delifs_cone.txt
@@ -2,11 +2,11 @@ Name:Delif's Cone
 ManaCost:0
 Types:Artifact
 Text:no text
-A:AB$ Animate | Cost$ T Sac<1/CARDNAME> | ValidTgts$ Creature.YouCtrl | Triggers$ TrigAttackerUnblocked | sVars$ GainLife,DBPump,X | SpellDescription$ This turn, when target creature you control attacks and isn't blocked, you may gain life equal to its power. If you do, it assigns no combat damage this turn.
+A:AB$ Animate | Cost$ T Sac<1/CARDNAME> | ValidTgts$ Creature.YouCtrl | Triggers$ TrigAttackerUnblocked | sVars$ GainLife,DBPump,DelifX | SpellDescription$ This turn, when target creature you control attacks and isn't blocked, you may gain life equal to its power. If you do, it assigns no combat damage this turn.
 SVar:TrigAttackerUnblocked:Mode$ AttackerUnblocked | ValidCard$ Card.Self | Execute$ GainLife | OptionalDecider$ You | TriggerDescription$ This turn, when CARDNAME attacks and isn't blocked, you may gain life equal to its power. If you do, it assigns no combat damage this turn.
-SVar:GainLife:AB$ GainLife | Cost$ 0 | Defined$ You | LifeAmount$ X | SubAbility$ DBPump | References$ X
-SVar:DBPump:DB$Pump | Defined$ Self | KW$ HIDDEN CARDNAME assigns no combat damage
-SVar:X:Count$CardPower
+SVar:GainLife:AB$ GainLife | Cost$ 0 | Defined$ You | LifeAmount$ DelifX | SubAbility$ DBPump | References$ DelifX
+SVar:DBPump:DB$Pump | Defined$ Self | KW$ HIDDEN CARDNAME assigns no combat damage | StackDescription$ CARDNAME assigns no combat damage this turn.
+SVar:DelifX:Count$CardPower
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/delifs_cone.jpg
diff --git a/res/cardsfolder/d/delifs_cube.txt b/res/cardsfolder/d/delifs_cube.txt
new file mode 100644
index 00000000000..968ce779901
--- /dev/null
+++ b/res/cardsfolder/d/delifs_cube.txt
@@ -0,0 +1,17 @@
+Name:Delif's Cube
+ManaCost:1
+Types:Artifact
+Text:no text
+A:AB$ Effect | Cost$ 2 T | Name$ Delif's Cube Effect | ValidTgts$ Creature.YouCtrl | Triggers$ TrigAttackerUnblocked,TrigLeave | SVars$ DBPump,PutCounter,ExileEffect | RememberObjects$ Targeted | ImprintCards$ Self | SpellDescription$ This turn, when target creature you control attacks and isn't blocked, it assigns no combat damage this turn and you put a cube counter on CARDNAME.
+SVar:TrigAttackerUnblocked:Mode$ AttackerUnblocked | ValidCard$ Card.IsRemembered | Execute$ DBPump | TriggerDescription$ This turn, when targeted creature attacks and isn't blocked, it assigns no combat damage this turn and you put a cube counter on Delif's Cube.
+SVar:DBPump:DB$Pump | Defined$ Remembered | KW$ HIDDEN CARDNAME assigns no combat damage | SubAbility$ PutCounter
+SVar:PutCounter:DB$PutCounter | Defined$ Imprinted | CounterType$ CUBE | CounterNum$ 1 | SubAbility$ ExileEffect
+SVar:TrigLeave:Mode$ ChangesZone | ValidCard$ Creature.IsRemembered | Origin$ Battlefield | Destination$ Any | Execute$ ExileEffect | Static$ True
+SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Battlefield | Destination$ Exile | Static$ True
+A:AB$ Regenerate | Cost$ 2 SubCounter<1/CUBE> | ValidTgts$ Creature | TgtPrompt$ Select target creature | SpellDescription$ Regenerate target creature.
+SVar:RemAIDeck:True
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/delifs_cube.jpg
+SetInfo:FEM|Rare|http://magiccards.info/scans/en/fe/170.jpg
+Oracle:{2}, {T}: This turn, when target creature you control attacks and isn't blocked, it assigns no combat damage this turn and you put a cube counter on Delif's Cube.\n{2}, Remove a cube counter from Delif's Cube: Regenerate target creature.
+End
\ No newline at end of file
diff --git a/src/main/java/forge/Counters.java b/src/main/java/forge/Counters.java
index a2cdee00176..8c19e40012b 100644
--- a/src/main/java/forge/Counters.java
+++ b/src/main/java/forge/Counters.java
@@ -62,6 +62,9 @@ public enum Counters {
     /** The CREDIT. */
     CREDIT(),
 
+    /** The CUBE. */
+    CUBE(),
+
     /** The CURRENCY. */
     CURRENCY(),