For now, don't differentiate between attacks on permanently neutral

monsters and temporarily neutral monsters anymore.


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

6 files changed, 6 insertions, 12 deletions

diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc
index 9db4952d77..b988ded16e 100644
--- a/crawl-ref/source/beam.cc
+++ b/crawl-ref/source/beam.cc
@@ -3819,7 +3819,7 @@ static int _affect_monster(bolt &beam, monsters *mon)
                 {
                     if (mons_friendly(mon))
                         did_god_conduct(DID_ATTACK_FRIEND, 5, true, mon);
-                    else if (mons_good_neutral(mon))
+                    else if (mons_neutral(mon))
                         did_god_conduct(DID_ATTACK_NEUTRAL, 5, true, mon);
                 }
 
@@ -3993,7 +3993,7 @@ static int _affect_monster(bolt &beam, monsters *mon)
 
             if (mons_friendly(mon))
                 conduct.set(DID_ATTACK_FRIEND, 5, !okay, mon);
-            else if (mons_good_neutral(mon))
+            else if (mons_neutral(mon))
                 conduct.set(DID_ATTACK_NEUTRAL, 5, !okay, mon);
 
             if (mons_is_holy(mon))
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc
index b120b73ec1..402aeac188 100644
--- a/crawl-ref/source/mon-util.cc
+++ b/crawl-ref/source/mon-util.cc
@@ -1811,11 +1811,6 @@ bool mons_neutral(const monsters *m)
     return (m->attitude == ATT_NEUTRAL || m->has_ench(ENCH_NEUTRAL));
 }
 
-bool mons_good_neutral(const monsters *m)
-{
-    return (mons_neutral(m) && testbits(m->flags, MF_GOD_GIFT));
-}
-
 mon_attitude_type mons_attitude(const monsters *m)
 {
     return (m->has_ench(ENCH_CHARM)? ATT_FRIENDLY : m->attitude);
diff --git a/crawl-ref/source/mon-util.h b/crawl-ref/source/mon-util.h
index 1a250e689e..ae69af7e15 100644
--- a/crawl-ref/source/mon-util.h
+++ b/crawl-ref/source/mon-util.h
@@ -621,7 +621,6 @@ bool mons_aligned(int m1, int m2);
  * *********************************************************************** */
 bool mons_friendly(const monsters *m);
 bool mons_neutral(const monsters *m);
-bool mons_good_neutral(const monsters *m);
 mon_attitude_type mons_attitude(const monsters *m);
 
 bool mons_behaviour_perceptible(const monsters *mon);
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index 113d0d1063..b6582ebfb1 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -5886,7 +5886,7 @@ void player::attacking(actor *other)
         const monsters *mons = dynamic_cast<monsters*>(other);
         if (mons_friendly(mons))
             did_god_conduct(DID_ATTACK_FRIEND, 5, true, mons);
-        else if (mons_good_neutral(mons))
+        else if (mons_neutral(mons))
             did_god_conduct(DID_ATTACK_NEUTRAL, 5, true, mons);
         else
             pet_target = monster_index(mons);
diff --git a/crawl-ref/source/spells2.cc b/crawl-ref/source/spells2.cc
index 5c0d66c752..d4fecd45be 100644
--- a/crawl-ref/source/spells2.cc
+++ b/crawl-ref/source/spells2.cc
@@ -1179,7 +1179,7 @@ char burn_freeze(int pow, beam_type flavour)
     {
         if (mons_friendly(monster))
             did_god_conduct(DID_ATTACK_FRIEND, 5, true, monster);
-        else if (mons_good_neutral(monster))
+        else if (mons_neutral(monster))
             did_god_conduct(DID_ATTACK_NEUTRAL, 5, true, monster);
 
         if (mons_holiness(monster) == MH_HOLY)
diff --git a/crawl-ref/source/spells3.cc b/crawl-ref/source/spells3.cc
index 9dfad576e2..6ceb3fb857 100644
--- a/crawl-ref/source/spells3.cc
+++ b/crawl-ref/source/spells3.cc
@@ -216,7 +216,7 @@ int cast_smiting(int power, dist &beam)
 
         if (mons_friendly(monster))
             did_god_conduct(DID_ATTACK_FRIEND, 5, true, monster);
-        else if (mons_good_neutral(monster))
+        else if (mons_neutral(monster))
             did_god_conduct(DID_ATTACK_NEUTRAL, 5, true, monster);
 
         if (mons_is_holy(monster))
@@ -275,7 +275,7 @@ int airstrike(int power, dist &beam)
 
             if (mons_friendly(monster))
                 did_god_conduct(DID_ATTACK_FRIEND, 5, true, monster);
-            else if (mons_good_neutral(monster))
+            else if (mons_neutral(monster))
                 did_god_conduct(DID_ATTACK_NEUTRAL, 5, true, monster);
 
             if (mons_is_holy(monster))