1 files changed, 51 insertions, 16 deletions
diff --git a/conf/groups.conf b/conf/groups.conf
index 717b6b83a..39f733ac5 100644
--- a/conf/groups.conf
+++ b/conf/groups.conf
@@ -158,6 +158,8 @@ groups: (
 		skillid: true
 		skilltree: true
 		monsterignore: true
+		broadcast: true
+		localbroadcast: true
 	}
 	log_commands: true
 	permissions: {
@@ -191,8 +193,6 @@ groups: (
 	inherit: ( "Support" )
 	level: 4
 	commands: {
-		broadcast: true
-		localbroadcast: true
 		monster: true
 		monstersmall: true
 		monsterbig: true
@@ -254,8 +254,6 @@ groups: (
 	inherit: ( "Support", "Script Manager" )
 	level: 5
 	commands: {
-		broadcast: true
-		localbroadcast: true
 		hide: true
 		follow: true
 		warp: true
@@ -293,10 +291,10 @@ groups: (
 	}
 },
 {
-	id: 7
-	name: "Officer"
-	inherit: ( "Support", "Patrol" ) /* Officer is not used in TMW2 and may be removed later */
-	level: 5
+	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: {
 		heal: [true, true]
 		alive: [true, true]
@@ -309,9 +307,15 @@ groups: (
 		cartlist: [true, true]
 		itemlist: [true, true]
 		stats: [true, true]
+		fakename: true
+		recallall: true
+		raisemap: [true, true]
+		raise: [true, true]
+		dropall: true
 	}
 	log_commands: true
 	permissions: {
+		any_warp: true
 		join_chat: true
 		kick_chat: true
 		hide_session: true
@@ -320,20 +324,51 @@ groups: (
 	}
 },
 {
-	id: 8
-	name: "Herc Game Master"
-	inherit: ( "Event Coordinator", "Officer" ) /* Herc Game Master is not used in TMW2 and may be removed later */
-	level: 6
+	id: 60
+	name: "Officer"
+	level: 60
+	inherit: ( "Support" )
 	commands: {
-		fakename: true
-		recallall: true
+		storagelist: [true, true]
+		cartlist: [true, true]
+		itemlist: [true, true]
+		stats: [true, true]
+		recall: true
 		raisemap: [true, true]
-		raise: [true, true]
-		dropall: true
+		kick: true
+		jailfor: true
+        unjail: true
+		unban: true
+		monster: true
+		monstersmall: true
+		monsterbig: true
+		killmonster2: true
+		cleanarea: true
+		cleanmap: true
+		heal: [true, true]
+		alive: [true, true]
+		sound: true
+		storage: true
+		clone: [true, true]
+		slaveclone: [true, true]
+		evilclone: [true, true]
+		jump: [true, true]
+		npctalk: true
+		mute: true
+		unmute: true
+		speed: true
 	}
 	log_commands: true
 	permissions: {
+		who_display_aid: true
+		view_hpmeter: true
 		any_warp: true
+		join_chat: true
+		kick_chat: true
+		hide_session: true
+		hack_info: true
+		send_gm: true
+		can_trade_bound: false
 	}
 },
 {