From 3e466a6cf5d28beaa065a7c6f5f0c014189be926 Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 12:46:49 +0000 Subject: [PATCH] - Added Death Pits of Rath. --- .gitattributes | 1 + res/cardsfolder/bound_in_silence.txt | 2 +- res/cardsfolder/cagemail.txt | 2 +- res/cardsfolder/death_pits_of_rath.txt | 9 +++++++++ res/cardsfolder/manacles_of_decay.txt | 14 +++++++------- src/forge/Card.java | 14 +++++++++++--- 6 files changed, 30 insertions(+), 12 deletions(-) create mode 100644 res/cardsfolder/death_pits_of_rath.txt diff --git a/.gitattributes b/.gitattributes index 23462dead8d..25e0ab35757 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1104,6 +1104,7 @@ res/cardsfolder/death_cultist.txt -text svneol=native#text/plain res/cardsfolder/death_grasp.txt -text svneol=native#text/plain res/cardsfolder/death_mutation.txt -text svneol=native#text/plain res/cardsfolder/death_of_a_thousand_stings.txt -text svneol=native#text/plain +res/cardsfolder/death_pits_of_rath.txt -text svneol=native#text/plain res/cardsfolder/death_speakers.txt -text svneol=native#text/plain res/cardsfolder/death_stroke.txt -text svneol=native#text/plain res/cardsfolder/death_ward.txt -text svneol=native#text/plain diff --git a/res/cardsfolder/bound_in_silence.txt b/res/cardsfolder/bound_in_silence.txt index e1cb7688097..b79adc92bb1 100644 --- a/res/cardsfolder/bound_in_silence.txt +++ b/res/cardsfolder/bound_in_silence.txt @@ -3,7 +3,7 @@ ManaCost:2 W Types:Tribal Enchantment Rebel Aura Text:Enchanted creature can't attack or block. K:Enchant creature -K:enPumpCurse:CARDNAME can't attack or block. +K:enPumpCurse:HIDDEN CARDNAME can't attack or block. SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/bound_in_silence.jpg SetInfo:FUT|Uncommon|http://magiccards.info/scans/en/fut/20.jpg diff --git a/res/cardsfolder/cagemail.txt b/res/cardsfolder/cagemail.txt index b7159af7818..b4d646a803c 100644 --- a/res/cardsfolder/cagemail.txt +++ b/res/cardsfolder/cagemail.txt @@ -3,7 +3,7 @@ ManaCost:1 W Types:Enchantment Aura Text:Enchanted creature gets +2/+2 and can't attack. K:Enchant creature -K:enPumpCurse:+2/+2/CARDNAME can't attack. +K:enPumpCurse:+2/+2/HIDDEN CARDNAME can't attack. SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/cagemail.jpg SetInfo:JUD|Common|http://magiccards.info/scans/en/ju/7.jpg diff --git a/res/cardsfolder/death_pits_of_rath.txt b/res/cardsfolder/death_pits_of_rath.txt new file mode 100644 index 00000000000..aa88aa70fe9 --- /dev/null +++ b/res/cardsfolder/death_pits_of_rath.txt @@ -0,0 +1,9 @@ +Name:Death Pits of Rath +ManaCost:3 B B +Types:Enchantment +Text:no text +K:stPumpAll:Creature:0/0/HIDDEN When CARDNAME is dealt damage, destroy it. It can't be regenerated.:No Condition:Whenever a creature is dealt damage, destroy it. It can't be regenerated. +SVar:RemAIDeck:True +SVar:Rarity:Rare +SVar:Picture:http://www.wizards.com/global/images/magic/general/death_pits_of_rath.jpg +End diff --git a/res/cardsfolder/manacles_of_decay.txt b/res/cardsfolder/manacles_of_decay.txt index 47d1dcfa76a..7375b581c15 100644 --- a/res/cardsfolder/manacles_of_decay.txt +++ b/res/cardsfolder/manacles_of_decay.txt @@ -4,12 +4,12 @@ Types:Enchantment Aura Text:Enchanted creature can't attack. K:Enchant creature K:enPump:CARDNAME can't attack. -A:AB$Pump | Cost$ B | Defined$ Enchanted | NumAtt$ -1 | NumDef$ -1 | IsCurse$ True | SpellDescription$ Enchanted creature gets -1/-1 until end of turn. -A:AB$Pump | Cost$ R | Defined$ Enchanted | KW$ CARDNAME can't block. | IsCurse$ True | SpellDescription$ Enchanted creature can't block this turn. +A:AB$Pump | Cost$ B | Defined$ Enchanted | NumAtt$ -1 | NumDef$ -1 | IsCurse$ True | SpellDescription$ Enchanted creature gets -1/-1 until end of turn. +A:AB$Pump | Cost$ R | Defined$ Enchanted | KW$ HIDDEN CARDNAME can't block. | IsCurse$ True | SpellDescription$ Enchanted creature can't block this turn. SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/manacles_of_decay.jpg -End - - - - +End + + + + diff --git a/src/forge/Card.java b/src/forge/Card.java index 65e6e60316d..9e559db31e0 100644 --- a/src/forge/Card.java +++ b/src/forge/Card.java @@ -2948,18 +2948,26 @@ public class Card extends MyObservable { AllZone.Stack.add(ability2); } - if(getKeyword().contains("When CARDNAME is dealt damage, destroy it.")) { + if(hasStartOfKeyword("When CARDNAME is dealt damage, destroy it.")) { final Card damagedCard = this; final Ability ability = new Ability(source, "0") { @Override public void resolve() { AllZone.GameAction.destroy(damagedCard); } }; + + final Ability ability2 = new Ability(source, "0") { + @Override + public void resolve() { AllZone.GameAction.destroyNoRegeneration(damagedCard); } + }; StringBuilder sb = new StringBuilder(); sb.append(damagedCard).append(" - destroy"); ability.setStackDescription(sb.toString()); - - AllZone.Stack.add(ability); + ability2.setStackDescription(sb.toString()); + + if(this.getKeyword().contains("When CARDNAME is dealt damage, destroy it. It can't be regenerated.")) + AllZone.Stack.add(ability2); + else AllZone.Stack.add(ability); } if(source.getKeyword().contains("Deathtouch") && this.isCreature()) AllZone.GameAction.destroy(this);