diff --git a/projects/mtg/bin/Res/sets/M10/_cards.dat b/projects/mtg/bin/Res/sets/M10/_cards.dat index 1e2a6f22c..dcf3ab065 100644 --- a/projects/mtg/bin/Res/sets/M10/_cards.dat +++ b/projects/mtg/bin/Res/sets/M10/_cards.dat @@ -786,6 +786,18 @@ auto=may moveTo(myHand) target(creature|myGraveyard) rarity=U [/card] [card] +id=193759 +name=Great Sable Stag +mana={1}{G}{G} +type=Creature +subtype=Elk +power=3 +toughness=3 +abilities=nofizzle,protection from black,protection from red +text=Great Sable Stag can't be countered. Protection from blue and from black (This creature can't be blocked, targeted, dealt damage, or enchanted by anything blue or black.) +rarity=R +[/card] +[card] id=190170 name=Griffin Sentinel mana={2}{W} diff --git a/projects/mtg/bin/Res/sets/M10/todo.dat b/projects/mtg/bin/Res/sets/M10/todo.dat index 6d0b9f864..93c734664 100644 --- a/projects/mtg/bin/Res/sets/M10/todo.dat +++ b/projects/mtg/bin/Res/sets/M10/todo.dat @@ -176,17 +176,6 @@ text=Equipped creature gets +1/+1 and has deathtouch. (Creatures dealt damage by rarity=U [/card] [card] -id=193759 -name=Great Sable Stag -mana={1}{G}{G} -type=Creature -subtype=Elk -power=3 -toughness=3 -text=Great Sable Stag can't be countered. Protection from blue and from black (This creature can't be blocked, targeted, dealt damage, or enchanted by anything blue or black.) -rarity=R -[/card] -[card] id=193766 name=Guardian Seraph mana={2}{W}{W} diff --git a/projects/mtg/include/AllAbilities.h b/projects/mtg/include/AllAbilities.h index 518ddd830..25b47ded2 100644 --- a/projects/mtg/include/AllAbilities.h +++ b/projects/mtg/include/AllAbilities.h @@ -238,6 +238,8 @@ class AAFizzler:public ActivatedAbility{ int resolve(){ Spell * _target = (Spell *) target; + if(_target->source->has(Constants::NOFIZZLE)) + return 0; game->mLayers->stackLayer()->Fizzle(_target); return 1; } diff --git a/projects/mtg/include/MTGDefinitions.h b/projects/mtg/include/MTGDefinitions.h index a886475b0..5f27e28e7 100644 --- a/projects/mtg/include/MTGDefinitions.h +++ b/projects/mtg/include/MTGDefinitions.h @@ -102,16 +102,17 @@ class Constants DEATHTOUCH = 44, HORSEMANSHIP = 45, CANTREGENERATE = 46, + NOFIZZLE = 47, - NB_BASIC_ABILITIES = 47, + NB_BASIC_ABILITIES = 48, - RARITY_M = 'M', - RARITY_R = 'R', - RARITY_U = 'U', - RARITY_C = 'C', - RARITY_L = 'L', - RARITY_T = 'T', //Tokens + RARITY_M = 'M', //Mythics + RARITY_R = 'R', //Rares + RARITY_U = 'U', //Uncommons + RARITY_C = 'C', //Commons + RARITY_L = 'L', //Lands + RARITY_T = '~', //Tokens, reserved for internal logic. //Price for singles PRICE_1M = 3000, diff --git a/projects/mtg/src/MTGDefinitions.cpp b/projects/mtg/src/MTGDefinitions.cpp index 941ff9568..d6454aeec 100644 --- a/projects/mtg/src/MTGDefinitions.cpp +++ b/projects/mtg/src/MTGDefinitions.cpp @@ -54,7 +54,8 @@ const char* Constants::MTGBasicAbilities[] = { "intimidate", "deathtouch", "horsemanship", -"cantregenerate" +"cantregenerate", +"nofizzle", };