Merge Patrol with Hercules Game Master.

New GM Levels: Player (0) Super Player (1) Support (2) Developer (5)
Herc Game Master (8) Officer (60) Game Master (80) Administrator (99)

1 files changed, 9 insertions, 18 deletions

diff --git a/conf/groups.conf b/conf/groups.conf
index 31d4815d4..220d882b5 100644
--- a/conf/groups.conf
+++ b/conf/groups.conf
@@ -111,10 +111,11 @@ groups: (
 	permissions: {
 	}
 },
+/* “Support” is a baseclass with the basic commands every DEV/GM/ADM may have. */
 {
 	id: 2
 	name: "Support"
-	inherit: ( "Super Player" ) /* Support is not used in TMW2 and may be removed later */
+	inherit: ( "Super Player" )
 	level: 3
 	commands: {
 		hugo: true
@@ -171,6 +172,7 @@ groups: (
 		view_equipment: true
 	}
 },
+/* Developer class is only used on TEST SERVER */
 {
 	id: 5
 	name: "Developer"
@@ -200,10 +202,10 @@ groups: (
 	}
 },
 {
-	id: 6
-	name: "Patrol"
-	inherit: ( "Support" ) /* Patrol is not used in TMW2 and may be removed later */
-	level: 4
+	id: 8
+	name: "Herc Game Master"
+	inherit: ( "Support" ) /* Herc Game Master is not used in TMW2 and may be removed later */
+	level: 6
 	commands: {
 		kick: true
 		jailfor: true
@@ -214,19 +216,6 @@ groups: (
 		memo: true
 		load: true
 		recall: true
-	}
-	log_commands: true
-	permissions: {
-		who_display_aid: true
-		view_hpmeter: true
-	}
-},
-{
-	id: 8
-	name: "Herc Game Master"
-	inherit: ( "Event Coordinator", "Support", "Patrol" ) /* Herc Game Master is not used in TMW2 and may be removed later */
-	level: 6
-	commands: {
 		monster: true
 		monstersmall: true
 		monsterbig: true
@@ -296,6 +285,8 @@ groups: (
 	}
 	log_commands: true
 	permissions: {
+		who_display_aid: true
+		view_hpmeter: true
 		any_warp: true
 		join_chat: true
 		kick_chat: true