Replace the conduct for killing a neutral monster with a conduct for

attacking a neutral monster.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4102 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 22 insertions, 22 deletions

diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index 2a5258e727..c17abd997d 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -1730,6 +1730,21 @@ bool did_god_conduct( conduct_type thing_done, int level, bool known,
         }
         break;
 
+    case DID_ATTACK_NEUTRAL:
+        switch (you.religion)
+        {
+        case GOD_ELYVILON:
+            simple_god_message(" did not appreciate that!");
+            ret = true;
+            piety_change = -(level/2 + 1);
+            penance = std::min(level, 5);
+            break;
+
+        default:
+            break;
+        }
+        break;
+
     case DID_ATTACK_FRIEND:
         if (god_hates_attacking_friend(you.religion, victim))
         {
@@ -1785,21 +1800,6 @@ bool did_god_conduct( conduct_type thing_done, int level, bool known,
         }
         break;
 
-    case DID_KILL_NEUTRAL:
-        switch (you.religion)
-        {
-        case GOD_ELYVILON:
-            simple_god_message(" did not appreciate that!");
-            ret = true;
-            piety_change = -(level/2 + 1);
-            penance = std::min(level, 5);
-            break;
-
-        default:
-            break;
-        }
-        break;
-
     case DID_KILL_LIVING:
         switch (you.religion)
         {
@@ -2185,15 +2185,15 @@ bool did_god_conduct( conduct_type thing_done, int level, bool known,
         static const char *conducts[] =
         {
           "",
-          "Necromancy", "Unholy", "Attack Holy", "Attack Friend",
-          "Friend Died", "Stab", "Poison", "Field Sacrifice",
+          "Necromancy", "Unholy", "Attack Holy", "Attack Neutral",
+          "Attack Friend", "Friend Died", "Stab", "Poison", "Field Sacrifice",
           "Kill Living", "Kill Undead", "Kill Demon", "Kill Natural Evil",
           "Kill Mutator Or Rotter", "Kill Wizard", "Kill Priest",
-          "Kill Holy", "Kill Neutral", "Undead Slave Kill Living",
-          "Servant Kill Living", "Servant Kill Undead", "Servant Kill Demon",
-          "Servant Kill Natural Evil", "Servant Kill Holy",
-          "Spell Memorise", "Spell Cast", "Spell Practise", "Spell Nonutility",
-          "Cards", "Stimulants", "Drink Blood", "Cannibalism", "Eat Meat",
+          "Kill Holy", "Undead Slave Kill Living", "Servant Kill Living",
+          "Servant Kill Undead", "Servant Kill Demon",
+          "Servant Kill Natural Evil", "Servant Kill Holy", "Spell Memorise",
+          "Spell Cast", "Spell Practise", "Spell Nonutility", "Cards",
+          "Stimulants", "Drink Blood", "Cannibalism", "Eat Meat",
           "Eat Souled Being", "Deliberate Mutation", "Cause Glowing",
           "Create Life"
         };