From a22f11c8eaf89e60f1983f2e1b85d0ad3392950a Mon Sep 17 00:00:00 2001 From: Agetian Date: Sat, 15 Oct 2016 14:54:16 +0000 Subject: [PATCH] - Removed duplicate CN2 commits (they are now in their proper folders). --- .gitattributes | 2 -- .../upcoming/assemble_the_rank_and_vile.txt | 10 ---------- .../res/cardsfolder/upcoming/domesticated_hydra.txt | 9 --------- 3 files changed, 21 deletions(-) delete mode 100644 forge-gui/res/cardsfolder/upcoming/assemble_the_rank_and_vile.txt delete mode 100644 forge-gui/res/cardsfolder/upcoming/domesticated_hydra.txt diff --git a/.gitattributes b/.gitattributes index 00f94d10df9..e847713fcb2 100644 --- a/.gitattributes +++ b/.gitattributes @@ -16442,8 +16442,6 @@ forge-gui/res/cardsfolder/u/utter_end.txt -text forge-gui/res/cardsfolder/u/utvara_hellkite.txt -text forge-gui/res/cardsfolder/u/utvara_scalper.txt svneol=native#text/plain forge-gui/res/cardsfolder/u/uyo_silent_prophet.txt svneol=native#text/plain -forge-gui/res/cardsfolder/upcoming/assemble_the_rank_and_vile.txt -text svneol=unset#text/plain -forge-gui/res/cardsfolder/upcoming/domesticated_hydra.txt -text svneol=unset#text/plain forge-gui/res/cardsfolder/v/vacuumelt.txt svneol=native#text/plain forge-gui/res/cardsfolder/v/vaevictis_asmadi.txt svneol=native#text/plain forge-gui/res/cardsfolder/v/vagrant_plowbeasts.txt svneol=native#text/plain diff --git a/forge-gui/res/cardsfolder/upcoming/assemble_the_rank_and_vile.txt b/forge-gui/res/cardsfolder/upcoming/assemble_the_rank_and_vile.txt deleted file mode 100644 index b4a7b71109f..00000000000 --- a/forge-gui/res/cardsfolder/upcoming/assemble_the_rank_and_vile.txt +++ /dev/null @@ -1,10 +0,0 @@ -Name:Assemble the Rank and Vile -ManaCost:no cost -Types:Conspiracy -K:Hidden agenda -S:Mode$ Continuous | Affected$ Creature.YouCtrl+NamedCard | EffectZone$ Command | AddTrigger$ DiesTrigger | AddSVar$ AssembleRankVileToken | Description$ Creatures you control with the chosen name have "When this creature dies, you may pay B. If you do, put a 2/2 black Zombie creature token onto the battlefield tapped." -SVar:DiesTrigger:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ AssembleRankVileToken | TriggerController$ TriggeredCardController | TriggerDescription$ When this creature dies, you may pay B. If you do, put a 2/2 black Zombie creature token onto the battlefield tapped. -SVar:AssembleRankToken:AB$ Token | Cost$ B | TokenAmount$ 1 | TokenName$ Zombie | TokenTypes$ Creature,Zombie | TokenOwner$ You | TokenColors$ Black | TokenPower$ 2 | TokenToughness$ 2 | TokenImage$ b 2 2 zombie cn2 | TokenTapped$ True -SVar:AgendaLogic:MostProminentCreatureInComputerDeck -SVar:Picture:http://www.wizards.com/global/images/magic/general/assemble_the_rank_and_vile.jpg -Oracle:Hidden agenda (Start the game with this conspiracy face down in the command zone and secretly name a card. You may turn this conspiracy face up any time and reveal the chosen name.)\nCreatures you control with the chosen name have "When this creature dies, you may pay B. If you do, put a 2/2 black Zombie creature token onto the battlefield tapped." diff --git a/forge-gui/res/cardsfolder/upcoming/domesticated_hydra.txt b/forge-gui/res/cardsfolder/upcoming/domesticated_hydra.txt deleted file mode 100644 index 4031ff82887..00000000000 --- a/forge-gui/res/cardsfolder/upcoming/domesticated_hydra.txt +++ /dev/null @@ -1,9 +0,0 @@ -Name:Domesticated Hydra -ManaCost:2 G G -Types:Creature Hydra -PT:3/3 -K:Monstrosity X:X G G G -S:Mode$ Continuous | Affected$ Card.Self+IsMonstrous | AddKeyword$ Trample | Description$ As long as CARDNAME is monstrous, it has trample. -SVar:X:Count$xPaid -SVar:Picture:http://www.wizards.com/global/images/magic/general/domesticated_hydra.jpg -Oracle:{X}{G}{G}{G}: Monstrosity X (If this creature isn't monstrous, put X +1/+1 counters on it and it becomes monstrous.)\nAs long as Domesticated Hydra is monstrous, it has trample.