From 6035f493a1f652ce27d0fadf477f1726d7c537a0 Mon Sep 17 00:00:00 2001
From: melvin <melvinzhang@gmail.com>
Date: Sun, 26 Aug 2012 22:43:25 +0800
Subject: [PATCH] replace card code for Victim of Night with effect property in
 card script

---
 release/Magarena/scripts/Victim_of_Night.txt  |  2 +-
 src/magic/card/Victim_of_Night.java           | 42 -------------------
 src/magic/model/choice/MagicTargetChoice.java |  2 +
 3 files changed, 3 insertions(+), 43 deletions(-)
 delete mode 100644 src/magic/card/Victim_of_Night.java

diff --git a/release/Magarena/scripts/Victim_of_Night.txt b/release/Magarena/scripts/Victim_of_Night.txt
index 9a1af60b31..4fdc3f5d9b 100644
--- a/release/Magarena/scripts/Victim_of_Night.txt
+++ b/release/Magarena/scripts/Victim_of_Night.txt
@@ -8,4 +8,4 @@ rarity=C
 type=Instant
 cost={B}{B}
 timing=removal
-requires_card_code
+effect=Destroy target non-Vampire, non-Werewolf, non-Zombie creature
diff --git a/src/magic/card/Victim_of_Night.java b/src/magic/card/Victim_of_Night.java
deleted file mode 100644
index b638a7d106..0000000000
--- a/src/magic/card/Victim_of_Night.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package magic.card;
-
-import magic.model.MagicGame;
-import magic.model.MagicPayedCost;
-import magic.model.MagicPermanent;
-import magic.model.action.MagicDestroyAction;
-import magic.model.action.MagicMoveCardAction;
-import magic.model.action.MagicPermanentAction;
-import magic.model.choice.MagicTargetChoice;
-import magic.model.event.MagicEvent;
-import magic.model.event.MagicSpellCardEvent;
-import magic.model.stack.MagicCardOnStack;
-import magic.model.target.MagicDestroyTargetPicker;
-
-public class Victim_of_Night {
-    public static final MagicSpellCardEvent S = new MagicSpellCardEvent() {
-        @Override
-        public MagicEvent getEvent(final MagicCardOnStack cardOnStack,final MagicPayedCost payedCost) {
-            return new MagicEvent(
-                    cardOnStack.getCard(),
-                    cardOnStack.getController(),
-                    MagicTargetChoice.NEG_TARGET_NONVAMPIRE_NONWEREWOLF_NONZOMBIE,
-                    new MagicDestroyTargetPicker(false),
-                    new Object[]{cardOnStack},
-                    this,
-                    "Destroy target non-Vampire, non-Werewolf, non-Zombie creature$.");
-        }
-        @Override
-        public void executeEvent(
-                final MagicGame game,
-                final MagicEvent event,
-                final Object[] data,
-                final Object[] choiceResults) {
-            game.doAction(new MagicMoveCardAction((MagicCardOnStack)data[0]));
-            event.processTargetPermanent(game,choiceResults,0,new MagicPermanentAction() {
-                public void doAction(final MagicPermanent creature) {
-                    game.doAction(new MagicDestroyAction(creature));
-                }
-            });
-        }
-    };
-}
diff --git a/src/magic/model/choice/MagicTargetChoice.java b/src/magic/model/choice/MagicTargetChoice.java
index 8794218228..be184206c4 100644
--- a/src/magic/model/choice/MagicTargetChoice.java
+++ b/src/magic/model/choice/MagicTargetChoice.java
@@ -511,6 +511,8 @@ public class MagicTargetChoice extends MagicChoice {
         factory.put("neg target enchantment ", NEG_TARGET_ENCHANTMENT);
         factory.put("neg target creature with power 4 or greater", NEG_TARGET_CREATURE_POWER_4_OR_MORE);
         factory.put("neg target creature with flying", NEG_TARGET_CREATURE_WITH_FLYING);
+        factory.put("neg target non-vampire, non-werewolf, non-zombie creature", NEG_TARGET_NONVAMPIRE_NONWEREWOLF_NONZOMBIE);
+
     }
 
     public static MagicTargetChoice build(String arg) {