diff --git a/.gitattributes b/.gitattributes index 11edd17175a..1b100711a85 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4401,12 +4401,14 @@ res/cardsfolder/k/kabira_vindicator.txt svneol=native#text/plain res/cardsfolder/k/kabuto_moth.txt svneol=native#text/plain res/cardsfolder/k/kaervek_the_merciless.txt svneol=native#text/plain res/cardsfolder/k/kaerveks_hex.txt svneol=native#text/plain +res/cardsfolder/k/kaerveks_purge.txt -text res/cardsfolder/k/kaerveks_spite.txt svneol=native#text/plain res/cardsfolder/k/kagemaro_first_to_suffer.txt svneol=native#text/plain res/cardsfolder/k/kagemaros_clutch.txt -text res/cardsfolder/k/kaijin_of_the_vanishing_touch.txt svneol=native#text/plain res/cardsfolder/k/kalastria_highborn.txt svneol=native#text/plain res/cardsfolder/k/kaleidostone.txt svneol=native#text/plain +res/cardsfolder/k/kalitas_bloodchief_of_ghet.txt -text res/cardsfolder/k/kalonian_behemoth.txt svneol=native#text/plain res/cardsfolder/k/kamahl_fist_of_krosa.txt svneol=native#text/plain res/cardsfolder/k/kamahl_pit_fighter.txt svneol=native#text/plain diff --git a/res/cardsfolder/d/devoted_caretaker.txt b/res/cardsfolder/d/devoted_caretaker.txt index bdaf5368471..68b2e64e8f5 100644 --- a/res/cardsfolder/d/devoted_caretaker.txt +++ b/res/cardsfolder/d/devoted_caretaker.txt @@ -7,4 +7,6 @@ A:AB$ Pump | Cost$ W T | KW$ Protection:Spell.Instant,Spell.Sorcery:Protection f SVar:RemAIDeck:True SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/devoted_caretaker.jpg +SetInfo:ODY|Rare|http://magiccards.info/scans/en/od/18.jpg +Oracle:{W}, {T}: Target permanent you control gains protection from instant spells and from sorcery spells until end of turn. End \ No newline at end of file diff --git a/res/cardsfolder/k/kaerveks_purge.txt b/res/cardsfolder/k/kaerveks_purge.txt new file mode 100644 index 00000000000..e1b23cfb01e --- /dev/null +++ b/res/cardsfolder/k/kaerveks_purge.txt @@ -0,0 +1,15 @@ +Name:Kaervek's Purge +ManaCost:X B R +Types:Sorcery +Text:no text +A:SP$ Destroy | Cost$ X B R | ValidTgts$ Creature | TgtPrompt$ Select target creature | RememberDestroyed$ True | SubAbility$ DBDamage | SpellDescription$ Destroy target creature with converted mana cost X. If that creature dies this way, CARDNAME deals damage equal to the creature's power to the creature's controller. +SVar:DBDamage:DB$DealDamage | Defined$ TargetedController | NumDmg$ Z | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE1 +SVar:X:Targeted$CardManaCost +SVar:Y:Remembered$Amount +SVar:Z:Targeted$CardPower +SVar:RemAIDeck:True +SVar:Rarity:Uncommon +SVar:Picture:http://www.wizards.com/global/images/magic/general/kaerveks_purge.jpg +SetInfo:MIR|Uncommon|http://magiccards.info/scans/en/mr/330.jpg +Oracle:Destroy target creature with converted mana cost X. If that creature dies this way, Kaervek's Purge deals damage equal to the creature's power to the creature's controller. +End \ No newline at end of file diff --git a/res/cardsfolder/k/kalitas_bloodchief_of_ghet.txt b/res/cardsfolder/k/kalitas_bloodchief_of_ghet.txt new file mode 100644 index 00000000000..fb7bcf663a9 --- /dev/null +++ b/res/cardsfolder/k/kalitas_bloodchief_of_ghet.txt @@ -0,0 +1,15 @@ +Name:Kalitas, Bloodchief of Ghet +ManaCost:5 B B +Types:Legendary Creature Vampire Warrior +Text:no text +PT:5/5 +A:AB$ Destroy | Cost$ B B B T | ValidTgts$ Creature | TgtPrompt$ Select target creature | RememberDestroyed$ True | SubAbility$ DBToken | SpellDescription$ Destroy target creature. If that creature dies this way, put a black Vampire creature token onto the battlefield. Its power is equal to that creature's power and its toughness is equal to that creature's toughness. +SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenImage$ X X Vampire | TokenName$ Vampire | TokenTypes$ Creature,Vampire | TokenColors$ Black | TokenOwner$ You | TokenPower$ dX | TokenToughness$ dY | ConditionCheckSVar$ X | ConditionSVarCompare$ GE1 +SVar:X:Remembered$Amount +SVar:dX:Targeted$CardPower +SVar:dY:Targeted$CardToughness +SVar:Rarity:Mythic +SVar:Picture:http://www.wizards.com/global/images/magic/general/kalitas_bloodchief_of_ghet.jpg +SetInfo:ZEN|Mythic|http://magiccards.info/scans/en/zen/99.jpg +Oracle:{B}{B}{B}, {T}: Destroy target creature. If that creature dies this way, put a black Vampire creature token onto the battlefield. Its power is equal to that creature's power and its toughness is equal to that creature's toughness. +End \ No newline at end of file diff --git a/res/token-images.txt b/res/token-images.txt index 2e08cd09c9b..760a7f0dcf2 100644 --- a/res/token-images.txt +++ b/res/token-images.txt @@ -28,6 +28,7 @@ b_6_6_wurm.jpg http://www.cardforge.org/fpics/tokens/b_6 b_dx_dy_spirit.jpg http://www.cardforge.org/fpics/tokens/b_dx_dy_spirit.jpg b_x_x_demon.jpg http://www.cardforge.org/fpics/tokens/b_x_x_demon.jpg b_x_x_minion.jpg http://www.cardforge.org/fpics/tokens/b_x_x_minion.jpg +b_x_x_vampire.jpg http://www.cardforge.org/fpics/tokens/b_x_x_vampire.jpg bg_1_1_worm.jpg http://www.cardforge.org/fpics/tokens/bg_1_1_worm.jpg br_1_1_minor_demon.jpg http://www.cardforge.org/fpics/tokens/br_1_1_minor_demon.jpg br_3_1_graveborn.jpg http://www.cardforge.org/fpics/tokens/br_3_1_graveborn.jpg @@ -189,7 +190,6 @@ wu_1_1_bird.jpg http://www.cardforge.org/fpics/tokens/wu_ # //These tokens are not currently used by any cards in Forge, but links provided should they be scripted so the correct name is used: -# //b_x_x_vampire.jpg http://www.cardforge.org/fpics/tokens/b_x_x_vampire.jpg [ZEN] Kalitas, Bloodchief of Ghet # //c_1_1_tetravite.jpg http://www.cardforge.org/fpics/tokens/c_1_1_tetravite.jpg [ATQ/4ED] Tetravus # //c_4_4_kaldra.jpg http://www.cardforge.org/fpics/tokens/c_4_4_kaldra.jpg [5DN] Helm of Kaldra # //g_1_1_wolves_of_the_hunt.jpg http://www.cardforge.org/fpics/tokens/g_1_1_wolves_of_the_hunt.jpg [LEG] Master of the Hunt diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryDestroy.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryDestroy.java index d8f690ea403..a09ccdeae1b 100644 --- a/src/main/java/forge/card/abilityfactory/AbilityFactoryDestroy.java +++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryDestroy.java @@ -512,6 +512,12 @@ public class AbilityFactoryDestroy { */ private static void destroyResolve(final AbilityFactory af, final SpellAbility sa) { final HashMap params = af.getMapParams(); + final Card card = sa.getSourceCard(); + + final boolean remDestroyed = params.containsKey("RememberDestroyed"); + if (remDestroyed) { + card.clearRemembered(); + } final boolean noRegen = params.containsKey("NoRegen"); final boolean sac = params.containsKey("Sacrifice"); @@ -541,6 +547,8 @@ public class AbilityFactoryDestroy { AllZone.getGameAction().destroyNoRegeneration(tgtC); } else { AllZone.getGameAction().destroy(tgtC); + } if (remDestroyed) { + card.addRemembered(tgtC); } } } @@ -553,6 +561,8 @@ public class AbilityFactoryDestroy { AllZone.getGameAction().destroyNoRegeneration(unTgtC); } else { AllZone.getGameAction().destroy(unTgtC); + } if (remDestroyed) { + card.addRemembered(unTgtC); } } }