From 1f552039ae0700bc6df86d753cd162a44b24d75f Mon Sep 17 00:00:00 2001
From: jendave <jendave@cardforge.org>
Date: Sat, 6 Aug 2011 12:40:38 +0000
Subject: [PATCH] - Updated evaluateCreature.

---
 .gitattributes                          |  1 +
 res/cardsfolder/serpentine_basilisk.txt |  9 +++++++++
 src/forge/CardFactoryUtil.java          | 26 +++++++++++++++----------
 3 files changed, 26 insertions(+), 10 deletions(-)
 create mode 100644 res/cardsfolder/serpentine_basilisk.txt

diff --git a/.gitattributes b/.gitattributes
index 169082d28d0..2a94ecec8c4 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -4030,6 +4030,7 @@ res/cardsfolder/serpent_assassin.txt -text svneol=native#text/plain
 res/cardsfolder/serpent_generator.txt -text svneol=native#text/plain
 res/cardsfolder/serpent_of_the_endless_sea.txt -text svneol=native#text/plain
 res/cardsfolder/serpent_warrior.txt -text svneol=native#text/plain
+res/cardsfolder/serpentine_basilisk.txt -text svneol=native#text/plain
 res/cardsfolder/serpentine_kavu.txt -text svneol=native#text/plain
 res/cardsfolder/serra_angel.txt -text svneol=native#text/plain
 res/cardsfolder/serra_ascendant.txt -text svneol=native#text/plain
diff --git a/res/cardsfolder/serpentine_basilisk.txt b/res/cardsfolder/serpentine_basilisk.txt
new file mode 100644
index 00000000000..843b7003a00
--- /dev/null
+++ b/res/cardsfolder/serpentine_basilisk.txt
@@ -0,0 +1,9 @@
+Name:Serpentine Basilisk
+ManaCost:2 G G
+Types:Creature Basilisk
+Text:no text
+PT:2/3
+K:Whenever CARDNAME deals combat damage to a creature, destroy that creature at end of combat.
+K:Morph:1 G G
+SVar:Rarity:Uncommon
+End
\ No newline at end of file
diff --git a/src/forge/CardFactoryUtil.java b/src/forge/CardFactoryUtil.java
index 466ecdd0655..e7becb77acc 100644
--- a/src/forge/CardFactoryUtil.java
+++ b/src/forge/CardFactoryUtil.java
@@ -455,30 +455,35 @@ public class CardFactoryUtil {
         if (c.hasKeyword("Flying")) value += power * 10;
         if (c.hasKeyword("Horsemanship")) value += power * 10;
         if (c.hasKeyword("Unblockable")) value += power * 10;
-        if (c.hasKeyword("Fear")) value += power * 5;
-        if (c.hasKeyword("Intimidate")) value += power * 5;
+        if (c.hasKeyword("Fear")) value += power * 6;
+        if (c.hasKeyword("Intimidate")) value += power * 6;
         if (c.hasStartOfKeyword("CARDNAME can't be blocked except by")) value += power * 5;
         if (c.hasStartOfKeyword("CARDNAME can't be blocked by")) value += power * 2;
         
         //Battle stats increasing keywords
         if (c.hasKeyword("Double Strike")) value += power * 15;
-        value += c.getKeywordMagnitude("Bushido") * 20;
-        value += c.getAmountOfKeyword("Flanking") * 20;
+        value += c.getKeywordMagnitude("Bushido") * 16;
+        value += c.getAmountOfKeyword("Flanking") * 15;
         
         //Other good keywords
         if (c.hasKeyword("Deathtouch") && power > 0) value += 25;
-        value += c.getAmountOfKeyword("Exalted") * 20;
+        if (c.hasKeyword("Whenever CARDNAME deals combat damage to a creature, destroy that creature at end of combat.") 
+        		&& power > 0) value += 24;
+        value += c.getAmountOfKeyword("Exalted") * 15;
         if (c.hasKeyword("First Strike") && !c.hasKeyword("Double Strike") && power > 0) value += 15;
         if (c.hasKeyword("Lifelink")) value += power * 10;
         if (c.hasKeyword("Trample")) value += power * 3;
         if (c.hasKeyword("Vigilance")) value += power * 5 + toughness * 5;
         if (c.hasKeyword("Wither")) value += power * 10;
         value += c.getKeywordMagnitude("Rampage");
-        value += c.getKeywordMagnitude("Annihilator") * 30;
+        value += c.getKeywordMagnitude("Annihilator") * 50;
         if (c.hasKeyword("Changeling")) value += 5;
-        if (c.hasKeyword("Whenever CARDNAME becomes blocked by a creature, destroy that creature at end of combat") && power > 0) value += 15;
-        if (c.hasKeyword("Whenever a creature dealt damage by CARDNAME this turn is put into a graveyard, put a +1/+1 counter on CARDNAME.") && power > 0) value += 2;
-        if (c.hasKeyword("Whenever a creature dealt damage by CARDNAME this turn is put into a graveyard, put a +2/+2 counter on CARDNAME.") && power > 0) value += 5;
+        if (c.hasKeyword("Whenever CARDNAME becomes blocked by a creature, destroy that creature at end of combat") 
+        		&& power > 0) value += power * 5;
+        if (c.hasKeyword("Whenever a creature dealt damage by CARDNAME this turn is put into a graveyard, put a +1/+1 counter on CARDNAME.") 
+        		&& power > 0) value += 2;
+        if (c.hasKeyword("Whenever a creature dealt damage by CARDNAME this turn is put into a graveyard, put a +2/+2 counter on CARDNAME.") 
+        		&& power > 0) value += 4;
         
         //Defensive Keywords
         if (c.hasKeyword("Reach")) value += 5;
@@ -489,7 +494,8 @@ public class CardFactoryUtil {
         if (c.hasKeyword("Indestructible")) value += 70;
         if (c.hasKeyword("Shroud")) value += 30;
         if (c.hasKeyword("CARDNAME can't be the target of spells or abilities your opponents control.")) value += 35;
-        if (c.hasStartOfKeyword("Protection from")) value += 20;
+        if (c.hasStartOfKeyword("Protection")) value += 20;
+        if (c.hasStartOfKeyword("PreventAllDamageBy")) value += 10;
         
         //Activated Abilities
         if (c.hasStartOfKeyword("ab")) value += 10;