From afa4c7e43d63cbcbeedbbcf25e11cd9ab980a713 Mon Sep 17 00:00:00 2001
From: SilverNexus <hawkins280@proton.me>
Date: Mon, 1 May 2023 02:12:02 -0400
Subject: [PATCH] Prevent nonintelligent monsters such as slimes from being
 charmed. For now, constructs like golems are still affected, but that may
 also be something to consider changing in the future. This change prevents
 charm monster from affecting these monsters, as well as singing and oratory.

---
 ChangeLog                                  | 13 +++++++++++++
 monster/acid/acidsphere.arc                |  3 +++
 monster/acid/bpudding.arc                  |  3 +++
 monster/acid/greenslime.arc                |  1 +
 monster/acid/slime.arc                     |  1 +
 monster/acid/slimecrawler/slimecrawler.arc |  1 +
 monster/misc/blob.arc                      |  1 +
 monster/misc/firechest.arc                 |  1 +
 8 files changed, 24 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 047e4fb78..138d8c6b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+Prevent nonintelligent living monsters from being charmable.
+This includes acid spheres, slimes, blobs, and some others.
+Basically all of these are of race slime.
+Mechanically, these monsters don't have a brain, so they logically cannot be charmed.
+monster/acid/acidsphere.arc
+monster/acid/slimecrawler/slimecrawler.arc
+monster/acid/bpudding.arc
+monster/acid/greenslime.arc
+monster/acid/slime.arc
+monster/misc/blob.arc
+monster/misc/firechest.arc
+Daniel Hawkins 2023-05-01
+
 Add one_hit to magic missile.
 For server version a763845fa3 or later, this will prevent magic missiles from
 having a magic-bullet-like piercing effect when they overkill enemies. For
diff --git a/monster/acid/acidsphere.arc b/monster/acid/acidsphere.arc
index 4d6ba5eab..803521a1d 100644
--- a/monster/acid/acidsphere.arc
+++ b/monster/acid/acidsphere.arc
@@ -38,4 +38,7 @@ speed 0.01
 anim_speed 1
 exp 100
 one_hit 1
+# It's literally a blob of acid.
+# Charming it would require it to have intellect
+no_mood_change 1
 end
diff --git a/monster/acid/bpudding.arc b/monster/acid/bpudding.arc
index 866fa45e0..85ffc3562 100644
--- a/monster/acid/bpudding.arc
+++ b/monster/acid/bpudding.arc
@@ -26,6 +26,7 @@ attacktype 64
 resist_fire -100
 resist_blind 100
 hitback 1
+no_mood_change 1
 end
 Object black_pudding_grow
 name black pudding
@@ -50,6 +51,7 @@ level 7
 attacktype 64
 resist_fire -100
 hitback 1
+no_mood_change 1
 end
 Object black_pudding_split
 name black pudding
@@ -74,4 +76,5 @@ level 7
 attacktype 64
 resist_fire -100
 hitback 1
+no_mood_change 1
 end
diff --git a/monster/acid/greenslime.arc b/monster/acid/greenslime.arc
index f26f61f3c..d09c3b804 100644
--- a/monster/acid/greenslime.arc
+++ b/monster/acid/greenslime.arc
@@ -21,4 +21,5 @@ attacktype 64
 hitback 1
 hp 40
 maxhp 40
+no_mood_change 1
 end
diff --git a/monster/acid/slime.arc b/monster/acid/slime.arc
index 51f3a87ed..99a520cf3 100644
--- a/monster/acid/slime.arc
+++ b/monster/acid/slime.arc
@@ -28,4 +28,5 @@ maxhp 5
 level 1
 speed 0.06
 weight 20000
+no_mood_change 1
 end
diff --git a/monster/acid/slimecrawler/slimecrawler.arc b/monster/acid/slimecrawler/slimecrawler.arc
index 6578dffc0..b32161b84 100644
--- a/monster/acid/slimecrawler/slimecrawler.arc
+++ b/monster/acid/slimecrawler/slimecrawler.arc
@@ -30,4 +30,5 @@ resist_cold 50
 resist_physical 40
 resist_acid 90
 resist_blind 80
+no_mood_change 1
 end
diff --git a/monster/misc/blob.arc b/monster/misc/blob.arc
index 7592e5e55..a9cab0b63 100644
--- a/monster/misc/blob.arc
+++ b/monster/misc/blob.arc
@@ -27,4 +27,5 @@ weight 50000
 run_away 100
 pick_up 64
 attacktype 1
+no_mood_change 1
 end
diff --git a/monster/misc/firechest.arc b/monster/misc/firechest.arc
index 0de6751e4..b8f2c6195 100644
--- a/monster/misc/firechest.arc
+++ b/monster/misc/firechest.arc
@@ -12,4 +12,5 @@ level 1
 no_pick 1
 resist_fire 100
 direction 0
+no_mood_change 1
 end