Change conducts of Zin and TSO (!)

Zin:
- DID_UNDEAD_KILLED_BY_SERVANT
- DID_DEMON_KILLED_BY_SERVANT
+ DID_KILL_MUTATOR_OR_ROTTER
(shapeshifters and monsters that have an attack AF_MUTATE or AF_ROT)

TSO:
+ DID_KILL_NATURAL_EVIL
+ DID_NATURAL_EVIL_KILLED_BY_SERVANT

Removed M_EVIL flag from a number of early monsters such as goblins 
and hobgoblins, and also from orcs, ogres, trolls and big kobold. 
Reasoning: The corresponding species are not considered evil 
themselves and are allowed to worship the good gods).
Note that this weakens all forms of holy attacks!

Any attempt to charm evil, undead or demonic monsters will fail
(no effect) for worshippers of TSO.

Like Makhleb, TSO now gets returning power (arguable) and hp from 
killing evil, undead and demonic monsters.

Zin's piety pool (from donations) is drained much quicker now, on 
average once every 5 turns.



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

1 files changed, 37 insertions, 4 deletions

diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index 9412d32480..7ca88e86a8 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -1335,6 +1335,32 @@ bool did_god_conduct( conduct_type thing_done, int level, bool known,
         }
         break;
 
+    case DID_KILL_NATURAL_EVIL:
+        if (you.religion == GOD_SHINING_ONE)
+        {
+            if (god_hates_attacking_friend(you.religion, victim))
+                break;
+
+            simple_god_message(" accepts your kill.");
+            ret = true;
+            if (random2(level + 18) > 3)
+                piety_change = 1;
+        }
+        break;
+
+    case DID_KILL_MUTATOR_OR_ROTTER:
+        if (you.religion == GOD_ZIN)
+        {
+            if (god_hates_attacking_friend(you.religion, victim))
+                break;
+
+            simple_god_message(" appreciates the killing of a spawn of chaos.");
+            ret = true;
+            if (random2(level + 18) > 3)
+                piety_change = 1;
+        }
+        break;
+
     case DID_KILL_PRIEST:
         if (you.religion == GOD_BEOGH
             && !god_hates_attacking_friend(you.religion, victim))
@@ -1437,7 +1463,6 @@ bool did_god_conduct( conduct_type thing_done, int level, bool known,
     case DID_UNDEAD_KILLED_BY_SERVANT:
         switch (you.religion)
         {
-        case GOD_ZIN:
         case GOD_SHINING_ONE:
         case GOD_VEHUMET:
         case GOD_MAKHLEB:
@@ -1456,7 +1481,6 @@ bool did_god_conduct( conduct_type thing_done, int level, bool known,
     case DID_DEMON_KILLED_BY_SERVANT: 
         switch (you.religion)
         {
-        case GOD_ZIN:
         case GOD_SHINING_ONE:
             simple_god_message(" accepts your collateral kill.");
             ret = true;
@@ -1469,6 +1493,17 @@ bool did_god_conduct( conduct_type thing_done, int level, bool known,
         }
         break;
 
+    case DID_NATURAL_EVIL_KILLED_BY_SERVANT:
+        if (you.religion == GOD_SHINING_ONE)
+        {
+            simple_god_message(" accepts your collateral kill.");
+            ret = true;
+            
+            if (random2(level + 10) > 5)
+                piety_change = 1;
+        }
+        break;
+
     case DID_SPELL_MEMORISE:
         if (you.religion == GOD_TROG)
         {
@@ -1568,8 +1603,6 @@ bool did_god_conduct( conduct_type thing_done, int level, bool known,
     case DID_STIMULANTS:                        // unused
     case DID_EAT_MEAT:                          // unused
     case DID_CREATED_LIFE:                      // unused
-    case DID_KILL_NATURAL_EVIL:                 // unused
-    case DID_NATURAL_EVIL_KILLED_BY_SERVANT:    // unused
     case DID_SPELL_NONUTILITY:                  // unused
     case NUM_CONDUCTS:
         break;