diff --git a/projects/mtg/bin/Res/sets/RV/_cards.dat b/projects/mtg/bin/Res/sets/RV/_cards.dat index 9bfa3bf52..f087f4702 100644 --- a/projects/mtg/bin/Res/sets/RV/_cards.dat +++ b/projects/mtg/bin/Res/sets/RV/_cards.dat @@ -1471,6 +1471,7 @@ toughness=* [/card] [card] text={W}{W}, {T}: Destroy target black permanent. +auto={W}{W}{T}:destroy target(*[black]) id=1355 name=Northern Paladin rarity=R diff --git a/projects/mtg/bin/Res/test/_tests.txt b/projects/mtg/bin/Res/test/_tests.txt index 19a79afeb..e4a3f18d6 100644 --- a/projects/mtg/bin/Res/test/_tests.txt +++ b/projects/mtg/bin/Res/test/_tests.txt @@ -82,6 +82,8 @@ nantuko_husk.txt Nevinyrrals_Disk.txt Nevinyrrals_Disk2.txt nightmare.txt +northern_paladin.txt +northern_paladin2.txt Nyxathid.txt orcish_lumberjack.txt paralysis.txt @@ -116,4 +118,4 @@ zombify.txt ######################## #Momir Basic Tests ######################## -momir/keldon_warlord.txt +momir/keldon_warlord.txt \ No newline at end of file diff --git a/projects/mtg/bin/Res/test/northern_paladin.txt b/projects/mtg/bin/Res/test/northern_paladin.txt new file mode 100644 index 000000000..6ddf7ad3a --- /dev/null +++ b/projects/mtg/bin/Res/test/northern_paladin.txt @@ -0,0 +1,19 @@ +#Testing Northern paladin on Black Knight +[INIT] +FIRSTMAIN +[PLAYER1] +inplay:northern paladin +manapool:{W}{W} +[PLAYER2] +inplay:Black Knight +[DO] +northern paladin +black knight +[ASSERT] +FIRSTMAIN +[PLAYER1] +inplay:northern paladin +manapool:{W}{W} +[PLAYER2] +inplay:black knight +[END] \ No newline at end of file diff --git a/projects/mtg/bin/Res/test/northern_paladin2.txt b/projects/mtg/bin/Res/test/northern_paladin2.txt new file mode 100644 index 000000000..43428c648 --- /dev/null +++ b/projects/mtg/bin/Res/test/northern_paladin2.txt @@ -0,0 +1,19 @@ +#Testing Northern paladin on erg raiders +[INIT] +FIRSTMAIN +[PLAYER1] +inplay:northern paladin +manapool:{W}{W} +[PLAYER2] +inplay:erg raiders +[DO] +northern paladin +erg raiders +[ASSERT] +FIRSTMAIN +[PLAYER1] +inplay:northern paladin +manapool:{W}{W} +[PLAYER2] +graveyard:erg raiders +[END] \ No newline at end of file diff --git a/projects/mtg/include/AllAbilities.h b/projects/mtg/include/AllAbilities.h index 15cd29308..a3b87dd06 100644 --- a/projects/mtg/include/AllAbilities.h +++ b/projects/mtg/include/AllAbilities.h @@ -2554,27 +2554,6 @@ class AKarma: public TriggeredAbility{ } }; -//1355 Northern Paladin -class ANorthernPaladin:public TargetAbility{ - public: - ANorthernPaladin(int _id, MTGCardInstance * card):TargetAbility(_id, card){ - int _cost[] = {Constants::MTG_COLOR_WHITE, 2}; - cost = NEW ManaCost(_cost,1); - tc = NEW TargetChooser(); - } - - int resolve(){ - MTGCardInstance * card = tc->getNextCardTarget(); - if (card->hasColor(Constants::MTG_COLOR_BLACK)){ - card->controller()->game->putInGraveyard(card); - return 1; - } - return 0; - } - - -}; - //Soul Net class ASoulNet:public ActivatedAbility{ diff --git a/projects/mtg/src/MTGAbility.cpp b/projects/mtg/src/MTGAbility.cpp index 3ac8cf501..0c77f4c62 100644 --- a/projects/mtg/src/MTGAbility.cpp +++ b/projects/mtg/src/MTGAbility.cpp @@ -1494,11 +1494,6 @@ void AbilityFactory::addAbilities(int _id, Spell * spell){ game->addObserver(NEW AKarma(_id, card)); break; } - case 1355: //Northern Paladin - { - game->addObserver(NEW ANorthernPaladin(_id, card)); - break; - } case 1359: //Red Ward { game->addObserver(NEW AProtectionFrom( _id,card, card->target, Constants::MTG_COLOR_RED)); diff --git a/projects/mtg/src/TargetChooser.cpp b/projects/mtg/src/TargetChooser.cpp index a5abebf90..e9f850a2f 100644 --- a/projects/mtg/src/TargetChooser.cpp +++ b/projects/mtg/src/TargetChooser.cpp @@ -224,7 +224,6 @@ TargetChooser * TargetChooserFactory::createTargetChooser(MTGCardInstance * card //Any target than cannot be defined automatically is determined by its id switch (id){ //Spell - //case 1196: //CounterSpell case 1224: //Spell blast { #if defined (WIN32) || defined (LINUX)