From 4b964057ce7879e953e081b5cf26ee1b6fe2a188 Mon Sep 17 00:00:00 2001 From: Sloth Date: Thu, 8 Sep 2011 18:46:48 +0000 Subject: [PATCH] - Added the keyword "CARDNAME assigns no combat damage" and converted some cards to use it. --- res/cardsfolder/d/dwarven_vigilantes.txt | 2 +- res/cardsfolder/f/floral_spuzzem.txt | 2 +- res/cardsfolder/g/goblin_vandal.txt | 3 +-- res/cardsfolder/k/keeper_of_tresserhorn.txt | 2 +- res/cardsfolder/k/kukemssa_pirates.txt | 2 +- res/cardsfolder/l/laccolith_grunt.txt | 2 +- res/cardsfolder/l/laccolith_titan.txt | 2 +- res/cardsfolder/l/laccolith_warrior.txt | 2 +- res/cardsfolder/l/laccolith_whelp.txt | 2 +- res/cardsfolder/o/ophidian.txt | 2 +- src/main/java/forge/Card.java | 4 ++++ 11 files changed, 14 insertions(+), 11 deletions(-) diff --git a/res/cardsfolder/d/dwarven_vigilantes.txt b/res/cardsfolder/d/dwarven_vigilantes.txt index c7a83e785f1..624a3ceea99 100644 --- a/res/cardsfolder/d/dwarven_vigilantes.txt +++ b/res/cardsfolder/d/dwarven_vigilantes.txt @@ -5,7 +5,7 @@ Text:no text PT:2/2 T:Mode$ AttackerUnblocked | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigDamage | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME attacks and isn't blocked, you may have it deal damage equal to its power to target creature. If you do, CARDNAME assigns no combat damage this turn. SVar:TrigDamage:AB$DealDamage | Cost$ 0 | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ X | SubAbility$ SVar=DBNoCombatDamage -SVar:DBNoCombatDamage:DB$Pump | Defined$ Self | KW$ HIDDEN Prevent all combat damage that would be dealt by CARDNAME. +SVar:DBNoCombatDamage:DB$Pump | Defined$ Self | KW$ HIDDEN CARDNAME assigns no combat damage SVar:X:Count$CardPower SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/dwarven_vigilantes.jpg diff --git a/res/cardsfolder/f/floral_spuzzem.txt b/res/cardsfolder/f/floral_spuzzem.txt index 761d598b3af..4e1fff584b7 100644 --- a/res/cardsfolder/f/floral_spuzzem.txt +++ b/res/cardsfolder/f/floral_spuzzem.txt @@ -5,7 +5,7 @@ Text:no text PT:2/2 T:Mode$ AttackerUnblocked | ValidCard$ Card.Self | Execute$ TrigDestroy | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME attacks and isn't blocked, you may destroy target artifact defending player controls. If you do, CARDNAME assigns no combat damage this turn. SVar:TrigDestroy:AB$Destroy | Cost$ 0 | ValidTgts$ Artifact.YouDontCtrl | TgtPrompt$ Select target artifact | SubAbility$ DBPump -SVar:DBPump:DB$Pump | KW$ HIDDEN Prevent all combat damage that would be dealt by CARDNAME. +SVar:DBPump:DB$Pump | KW$ HIDDEN CARDNAME assigns no combat damage SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/floral_spuzzem.jpg SetInfo:LEG|Uncommon|http://magiccards.info/scans/en/lg/101.jpg diff --git a/res/cardsfolder/g/goblin_vandal.txt b/res/cardsfolder/g/goblin_vandal.txt index 9abdfce67eb..c84bf025ed8 100644 --- a/res/cardsfolder/g/goblin_vandal.txt +++ b/res/cardsfolder/g/goblin_vandal.txt @@ -5,8 +5,7 @@ Text:no text PT:1/1 T:Mode$ AttackerUnblocked | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigDestroy | TriggerDescription$ Whenever CARDNAME attacks and isn't blocked, you may pay R. If you do, destroy target artifact defending player controls and CARDNAME assigns no combat damage this turn. SVar:TrigDestroy:AB$Destroy | Cost$ R | ValidTgts$ Artifact.YouDontCtrl | TgtPrompt$ Select target artifact defending player controls | SubAbility$ SVar=DBPump | Mandatory$ True -SVar:DBPump:DB$Pump | KW$ HIDDEN Prevent all combat damage that would be dealt by CARDNAME. -SVar:RemAIDeck:True +SVar:DBPump:DB$Pump | KW$ HIDDEN CARDNAME assigns no combat damage SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/goblin_vandal.jpg SetInfo:WTH|Common|http://magiccards.info/scans/en/wl/105.jpg diff --git a/res/cardsfolder/k/keeper_of_tresserhorn.txt b/res/cardsfolder/k/keeper_of_tresserhorn.txt index dafb747bd70..e99a5ae8012 100644 --- a/res/cardsfolder/k/keeper_of_tresserhorn.txt +++ b/res/cardsfolder/k/keeper_of_tresserhorn.txt @@ -4,7 +4,7 @@ Types:Creature Avatar Text:no text PT:6/6 T:Mode$ AttackerUnblocked | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks and isn't blocked, it assigns no combat damage this turn and defending player loses 2 life. -SVar:TrigPump:DB$Pump | Cost$ 0 | KW$ HIDDEN Prevent all combat damage that would be dealt by CARDNAME. | SubAbility$ SVar=DBLose +SVar:TrigPump:DB$Pump | Cost$ 0 | KW$ HIDDEN CARDNAME assigns no combat damage | SubAbility$ SVar=DBLose SVar:DBLose:DB$LoseLife | Defined$ Opponent | LifeAmount$ 2 SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/keeper_of_tresserhorn.jpg diff --git a/res/cardsfolder/k/kukemssa_pirates.txt b/res/cardsfolder/k/kukemssa_pirates.txt index 747d8ac5a6d..a67360f96f5 100644 --- a/res/cardsfolder/k/kukemssa_pirates.txt +++ b/res/cardsfolder/k/kukemssa_pirates.txt @@ -5,7 +5,7 @@ Text:no text PT:2/2 T:Mode$ AttackerUnblocked | ValidCard$ Card.Self | Execute$ TrigGainControl | TriggerDescription$ Whenever CARDNAME attacks and isn't blocked, you may gain control of target artifact defending player controls. If you do, CARDNAME assigns no combat damage this turn. SVar:TrigGainControl:AB$GainControl | Cost$ 0 | ValidTgts$ Artifact.YouDontCtrl | TgtPrompt$ Select target artifact defending player controls | SubAbility$ SVar=DBNoCombatDamage -SVar:DBNoCombatDamage:DB$Pump | Defined$ Self | KW$ HIDDEN Prevent all combat damage that would be dealt by CARDNAME. +SVar:DBNoCombatDamage:DB$Pump | Defined$ Self | KW$ HIDDEN CARDNAME assigns no combat damage SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/kukemssa_pirates.jpg SetInfo:MIR|Rare|http://magiccards.info/scans/en/mr/71.jpg diff --git a/res/cardsfolder/l/laccolith_grunt.txt b/res/cardsfolder/l/laccolith_grunt.txt index 0623be5ddeb..802e3f41580 100644 --- a/res/cardsfolder/l/laccolith_grunt.txt +++ b/res/cardsfolder/l/laccolith_grunt.txt @@ -5,7 +5,7 @@ Text:no text PT:2/2 T:Mode$ AttackerBlocked | ValidCard$ Card.Self | Execute$ TrigDamage | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME becomes blocked, you may have it deal damage equal to its power to target creature. If you do, CARDNAME assigns no combat damage this turn. SVar:TrigDamage:AB$DealDamage | Cost$ 0 | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ X | SubAbility$ SVar=DBNoCombatDamage -SVar:DBNoCombatDamage:DB$Pump | Defined$ Self | KW$ HIDDEN Prevent all combat damage that would be dealt by CARDNAME. +SVar:DBNoCombatDamage:DB$Pump | Defined$ Self | KW$ HIDDEN CARDNAME assigns no combat damage SVar:X:Count$CardPower SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/laccolith_grunt.jpg diff --git a/res/cardsfolder/l/laccolith_titan.txt b/res/cardsfolder/l/laccolith_titan.txt index 6a8f3a759fa..6dc4c1a2eb4 100644 --- a/res/cardsfolder/l/laccolith_titan.txt +++ b/res/cardsfolder/l/laccolith_titan.txt @@ -5,7 +5,7 @@ Text:no text PT:6/6 T:Mode$ AttackerBlocked | ValidCard$ Card.Self | Execute$ TrigDamage | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME becomes blocked, you may have it deal damage equal to its power to target creature. If you do, CARDNAME assigns no combat damage this turn. SVar:TrigDamage:AB$DealDamage | Cost$ 0 | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ X | SubAbility$ SVar=DBNoCombatDamage -SVar:DBNoCombatDamage:DB$Pump | Defined$ Self | KW$ HIDDEN Prevent all combat damage that would be dealt by CARDNAME. +SVar:DBNoCombatDamage:DB$Pump | Defined$ Self | KW$ HIDDEN CARDNAME assigns no combat damage SVar:X:Count$CardPower SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/laccolith_titan.jpg diff --git a/res/cardsfolder/l/laccolith_warrior.txt b/res/cardsfolder/l/laccolith_warrior.txt index 82868926be2..5389a7668d4 100644 --- a/res/cardsfolder/l/laccolith_warrior.txt +++ b/res/cardsfolder/l/laccolith_warrior.txt @@ -5,7 +5,7 @@ Text:no text PT:3/3 T:Mode$ AttackerBlocked | ValidCard$ Card.Self | Execute$ TrigDamage | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME becomes blocked, you may have it deal damage equal to its power to target creature. If you do, CARDNAME assigns no combat damage this turn. SVar:TrigDamage:AB$DealDamage | Cost$ 0 | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ X | SubAbility$ SVar=DBPump -SVar:DBPump:DB$Pump | Defined$ Self | KW$ HIDDEN Prevent all combat damage that would be dealt by CARDNAME. +SVar:DBPump:DB$Pump | Defined$ Self | KW$ HIDDEN CARDNAME assigns no combat damage SVar:X:Count$CardPower SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/laccolith_warrior.jpg diff --git a/res/cardsfolder/l/laccolith_whelp.txt b/res/cardsfolder/l/laccolith_whelp.txt index 54b10cf0da4..552f0cc2309 100644 --- a/res/cardsfolder/l/laccolith_whelp.txt +++ b/res/cardsfolder/l/laccolith_whelp.txt @@ -5,7 +5,7 @@ Text:no text PT:1/1 T:Mode$ AttackerBlocked | ValidCard$ Card.Self | Execute$ TrigDamage | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME becomes blocked, you may have it deal damage equal to its power to target creature. If you do, CARDNAME assigns no combat damage this turn. SVar:TrigDamage:AB$DealDamage | Cost$ 0 | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ X | SubAbility$ SVar=DBPump -SVar:DBPump:DB$Pump | Defined$ Self | KW$ HIDDEN Prevent all combat damage that would be dealt by CARDNAME. +SVar:DBPump:DB$Pump | Defined$ Self | KW$ HIDDEN CARDNAME assigns no combat damage SVar:X:Count$CardPower SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/laccolith_whelp.jpg diff --git a/res/cardsfolder/o/ophidian.txt b/res/cardsfolder/o/ophidian.txt index e1f559b1852..375b31dc4d1 100644 --- a/res/cardsfolder/o/ophidian.txt +++ b/res/cardsfolder/o/ophidian.txt @@ -5,7 +5,7 @@ Text:no text PT:1/3 T:Mode$ AttackerUnblocked | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigDraw | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME attacks and isn't blocked, you may draw a card. If you do, CARDNAME assigns no combat damage this turn. SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ 1 | SubAbility$ SVar=DBPump -SVar:DBPump:DB$Pump | Cost$ 0 | KW$ HIDDEN Prevent all combat damage that would be dealt by CARDNAME. +SVar:DBPump:DB$Pump | Cost$ 0 | KW$ HIDDEN CARDNAME assigns no combat damage SVar:RemAIDeck:True SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/ophidian.jpg diff --git a/src/main/java/forge/Card.java b/src/main/java/forge/Card.java index 00de6eac9a3..c198afdb35d 100644 --- a/src/main/java/forge/Card.java +++ b/src/main/java/forge/Card.java @@ -3620,6 +3620,10 @@ public class Card extends GameEntity implements Comparable { * @return a int. */ public final int getNetCombatDamage() { + if (hasKeyword("CARDNAME assigns no combat damage")) { + return 0; + } + if (AllZoneUtil.isCardInPlay("Doran, the Siege Tower")) { return getNetDefense(); }