2 files changed, 21 insertions, 6 deletions
diff --git a/conf-tmpl/Changelog.txt b/conf-tmpl/Changelog.txt
index 25a21f4eb..7c8a5cb6d 100644
--- a/conf-tmpl/Changelog.txt
+++ b/conf-tmpl/Changelog.txt
@@ -1,5 +1,11 @@
 Date	Added
 
+2006/11/22
+	* Modified slaves_inherit_speed (monster.conf): 0 never. 1 - when the
+	  master can move. 2 - when the master can't move. 3 - always (default)
+	* Also modified slaves_inherit_mode: 0 don't change mode. 1 slaves are
+	  always aggressive. 2 slaves are always passive. 3 they copy the
+	  agro/passive mode from their master. Defaults to 2.
 2006/11/20
 	* Added monster_ai&0x200 (monster.conf). When set, mob skill delays are
 	  shared. That is, if the mob has several lines with the same skill, when the
diff --git a/conf-tmpl/battle/monster.conf b/conf-tmpl/battle/monster.conf
index c0436d26c..7549ea3e8 100644
--- a/conf-tmpl/battle/monster.conf
+++ b/conf-tmpl/battle/monster.conf
@@ -139,12 +139,21 @@ no_spawn_on_player: 0
 // map regardless of what the mob-spawn file says.
 force_random_spawn: no
 
-// Do summon slaves inherit the passive/aggressive traits of their master? (Note 1)
-slaves_inherit_mode: yes
-
-// Do summon slaves have the same walking speed as their master? (Note 1)
-// NOTE: The default is yes for official servers.
-slaves_inherit_speed: yes
+// Do summon slaves inherit the passive/aggressive traits of their master?
+// 0: No, retain original mode.
+// 1: Slaves are always aggressive.
+// 2: Slaves are always passive.
+// 3: Same as master's aggressive/passive state.
+slaves_inherit_mode: 2
+
+// Do summon slaves have the same walking speed as their master?
+// NOTE: The default is 3 for official servers.
+// 0: Never.
+// 1: If the master can walk
+// 2: If the master can't walk (even motionless mobs have a speed
+//    entry in their mob_db)
+// 3: Always
+slaves_inherit_speed: 3
 
 // Will summoned monsters (alchemists, or @summon'ed monsters) attack cause a
 // chance of triggering the master's autospell cards? (Note 1)