From ee77f31eed9bc57e8275761b4519bb15246f78c1 Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 19:14:18 +0000 Subject: [PATCH] *Added Confiscate Contaminated Bond Guerrilla Tactics Mindslicer --- .gitattributes | 4 ++++ res/cardsfolder/confiscate.txt | 8 ++++++++ res/cardsfolder/contaminated_bond.txt | 12 ++++++++++++ res/cardsfolder/guerrilla_tactics.txt | 10 ++++++++++ res/cardsfolder/mindslicer.txt | 11 +++++++++++ src/forge/CardFactory_Auras.java | 10 ++++++++-- 6 files changed, 53 insertions(+), 2 deletions(-) create mode 100644 res/cardsfolder/confiscate.txt create mode 100644 res/cardsfolder/contaminated_bond.txt create mode 100644 res/cardsfolder/guerrilla_tactics.txt create mode 100644 res/cardsfolder/mindslicer.txt diff --git a/.gitattributes b/.gitattributes index 13b20ba4886..83a336b2d59 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1170,6 +1170,7 @@ res/cardsfolder/conch_horn.txt svneol=native#text/plain res/cardsfolder/concordant_crossroads.txt -text svneol=native#text/plain res/cardsfolder/condemn.txt -text svneol=native#text/plain res/cardsfolder/condescend.txt -text svneol=native#text/plain +res/cardsfolder/confiscate.txt -text svneol=native#text/plain res/cardsfolder/conflux.txt -text svneol=native#text/plain res/cardsfolder/confound.txt -text svneol=native#text/plain res/cardsfolder/congregate.txt -text svneol=native#text/plain @@ -1188,6 +1189,7 @@ res/cardsfolder/contagion.txt -text svneol=native#text/plain res/cardsfolder/contagion_clasp.txt -text svneol=native#text/plain res/cardsfolder/contagion_engine.txt -text svneol=native#text/plain res/cardsfolder/contagious_nim.txt -text svneol=native#text/plain +res/cardsfolder/contaminated_bond.txt -text svneol=native#text/plain res/cardsfolder/contemplation.txt -text svneol=native#text/plain res/cardsfolder/contested_war_zone.txt svneol=native#text/plain res/cardsfolder/control_magic.txt -text svneol=native#text/plain @@ -2709,6 +2711,7 @@ res/cardsfolder/guardian_of_the_guildpact.txt -text svneol=native#text/plain res/cardsfolder/guardian_seraph.txt -text svneol=native#text/plain res/cardsfolder/guardians_magemark.txt -text svneol=native#text/plain res/cardsfolder/guardians_of_akrasa.txt -text svneol=native#text/plain +res/cardsfolder/guerrilla_tactics.txt -text svneol=native#text/plain res/cardsfolder/guided_strike.txt -text svneol=native#text/plain res/cardsfolder/guiltfeeder.txt -text svneol=native#text/plain res/cardsfolder/guilty_conscience.txt -text svneol=native#text/plain @@ -3894,6 +3897,7 @@ res/cardsfolder/mind_warp.txt -text svneol=native#text/plain res/cardsfolder/mindless_automaton.txt -text svneol=native#text/plain res/cardsfolder/minds_desire.txt -text svneol=native#text/plain res/cardsfolder/minds_eye.txt -text svneol=native#text/plain +res/cardsfolder/mindslicer.txt -text svneol=native#text/plain res/cardsfolder/mindstab.txt -text svneol=native#text/plain res/cardsfolder/mindstab_thrull.txt svneol=native#text/plain res/cardsfolder/mindwarper.txt -text svneol=native#text/plain diff --git a/res/cardsfolder/confiscate.txt b/res/cardsfolder/confiscate.txt new file mode 100644 index 00000000000..1820cd75330 --- /dev/null +++ b/res/cardsfolder/confiscate.txt @@ -0,0 +1,8 @@ +Name:Confiscate +ManaCost:4 U U +Types:Enchantment Aura +Text:You control enchanted permanent. +K:Enchant permanent +SVar:Rarity:Rare +SVar:Picture:http://www.wizards.com/global/images/magic/general/confiscate.jpg +End \ No newline at end of file diff --git a/res/cardsfolder/contaminated_bond.txt b/res/cardsfolder/contaminated_bond.txt new file mode 100644 index 00000000000..b224b8f30fe --- /dev/null +++ b/res/cardsfolder/contaminated_bond.txt @@ -0,0 +1,12 @@ +Name:Contaminated Bond +ManaCost:1 B +Types:Enchantment Aura +Text:no text +K:Enchant creature +K:enPump:+0/+0 +T:Mode$ Attacks | ValidCard$ Card.AttachedBy | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ Whenever enchanted creature attacks or blocks, its controller loses 3 life. +T:Mode$ Blocks | ValidCard$ Card.AttachedBy | TriggerZones$ Battlefield | Execute$ TrigLoseLife | Secondary$ True | TriggerDescription$ Whenever enchanted creature attacks or blocks, its controller loses 3 life. +SVar:TrigLoseLife:AB$LoseLife | Cost$ 0 | Defined$ TriggeredController | LifeAmount$ 3 +SVar:Rarity:Common +SVar:Picture:http://www.wizards.com/global/images/magic/general/contaminated_bond.jpg +End \ No newline at end of file diff --git a/res/cardsfolder/guerrilla_tactics.txt b/res/cardsfolder/guerrilla_tactics.txt new file mode 100644 index 00000000000..05988dd6949 --- /dev/null +++ b/res/cardsfolder/guerrilla_tactics.txt @@ -0,0 +1,10 @@ +Name:Guerrilla Tactics +ManaCost:1 R +Types:Instant +Text:no text +A:SP$DealDamage | Cost$ 1 R | Tgt$ TgtCP | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target creature or player. +T:Mode$ Discarded | ValidCard$ Card.Self | ValidCause$ Card.YouDontCtrl | Execute$ TrigDoubleDmg | TriggerDescription$ When a spell or ability an opponent controls causes you to discard CARDNAME, CARDNAME deals 4 damage to target creature or player. +SVar:TrigDoubleDmg:AB$DealDamage | Cost$ 0 | Tgt$ TgtCP | NumDmg$ 4 +SVar:Rarity:Uncommon +SVar:Picture:http://www.wizards.com/global/images/magic/general/guerrilla_tactics.jpg +End \ No newline at end of file diff --git a/res/cardsfolder/mindslicer.txt b/res/cardsfolder/mindslicer.txt new file mode 100644 index 00000000000..56a8978ef07 --- /dev/null +++ b/res/cardsfolder/mindslicer.txt @@ -0,0 +1,11 @@ +Name:Mindslicer +ManaCost:2 B B +Types:Creature Horror +Text:no text +PT:4/3 +T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDiscard | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, each player discards his or her hand. +SVar:TrigDiscard:AB$Discard | Cost$ 0 | Defined$ You | Mode$ Hand | SubAbility$SVar=DBDiscard +SVar:DBDiscard:DB$Discard | Defined$ Opponent | Mode$ Hand +SVar:Rarity:Rare +SVar:Picture:http://www.wizards.com/global/images/magic/general/mindslicer.jpg +End \ No newline at end of file diff --git a/src/forge/CardFactory_Auras.java b/src/forge/CardFactory_Auras.java index f40bb96e5c8..d13df769354 100644 --- a/src/forge/CardFactory_Auras.java +++ b/src/forge/CardFactory_Auras.java @@ -1523,10 +1523,16 @@ class CardFactory_Auras { //*************** START *********** START ************************** - else if(cardName.equals("Take Possession") || cardName.equals("Volition Reins")) { + else if(cardName.equals("Take Possession") || cardName.equals("Volition Reins") || cardName.equals("Confiscate")) { final Player[] prevController = new Player[1]; prevController[0] = null; - String costString = cardName.equals("Volition Reins") ? "3 U U U" : "5 U U"; + String costString = "0"; + if(cardName.equals("Volition Reins")) + costString = "3 U U U"; + else if(cardName.equals("Take Possession")) + costString = "5 U U"; + else if(cardName.equals("Confiscate")) + costString = "4 U U"; Ability_Cost cost = new Ability_Cost(costString, cardName, false); Target tgt = new Target(card,"Select target Permanent", "Permanent".split(","));