Added new groups (#3634)

otland · Sep 12, 2021 · f7efa85 · f7efa85
1 parent f4ce3c9
commit f7efa85
Show file tree

Hide file tree

Showing 5 changed files with 65 additions and 8 deletions.
diff --git a/data/XML/groups.xml b/data/XML/groups.xml
@@ -1,12 +1,67 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <groups>
 	<group id="1" name="player" access="0" maxdepotitems="0" maxvipentries="0" />
-	<group id="2" name="gamemaster" access="1" maxdepotitems="0" maxvipentries="200" >
+	<group id="2" name="tutor" access="0" maxdepotitems="0" maxvipentries="0">
+		<flags>
+			<flag talkorangehelpchannel="1" />
+			<flag cannotbemuted="1" />
+		</flags>
+	</group>
+	<group id="3" name="senior tutor" access="0" maxdepotitems="0" maxvipentries="0">
+		<flags>
+			<flag talkorangehelpchannel="1" />
+			<flag cantalkredprivate="1" />
+			<flag cantalkredchannel="1" />
+			<flag cannotbemuted="1" />
+		</flags>
+	</group>
+	<group id="4" name="gamemaster" access="1" maxdepotitems="0" maxvipentries="200">
 		<flags>
 			<flag cannotusecombat="1" />
 			<flag cannotattackplayer="1" />
 			<flag cannotattackmonster="1" />
 			<flag cannotbeattacked="1" />
+			<flag canconvinceall="0" />
+			<flag cansummonall="0" />
+			<flag canillusionall="1" />
+			<flag cansenseinvisibility="1" />
+			<flag ignoredbymonsters="1" />
+			<flag notgaininfight="1" />
+			<flag hasinfinitemana="0" />
+			<flag hasinfinitesoul="0" />
+			<flag hasnoexhaustion="1" />
+			<flag cannotusespells="1" />
+			<flag cannotpickupitem="1" />
+			<flag canalwayslogin="1" />
+			<flag canbroadcast="1" />
+			<flag canedithouses="0" />
+			<flag cannotbebanned="1" />
+			<flag cannotbepushed="1" />
+			<flag hasinfinitecapacity="1" />
+			<flag canpushallcreatures="1" />
+			<flag cantalkredprivate="1" />
+			<flag cantalkredchannel="1" />
+			<flag talkorangehelpchannel="1" />
+			<flag notgainexperience="1" />
+			<flag notgainmana="1" />
+			<flag notgainhealth="1" />
+			<flag notgainskill="1" />
+			<flag setmaxspeed="1" />
+			<flag specialvip="1" />
+			<flag notgenerateloot="1" />
+			<flag ignoreprotectionzone="1" />
+			<flag ignorespellcheck="1" />
+			<flag ignoreweaponcheck="1" />
+			<flag cannotbemuted="1" />
+			<flag isalwayspremium="1" />
+		</flags>
+	</group>
+	<group id="5" name="community manager" access="1" maxdepotitems="0" maxvipentries="200">
+		<flags>
+			<flag cannotusecombat="0" />
+			<flag cannotattackplayer="1" />
+			<flag cannotattackmonster="0" />
+			<flag cannotbeattacked="1" />
 			<flag canconvinceall="1" />
 			<flag cansummonall="1" />
 			<flag canillusionall="1" />
@@ -16,11 +71,11 @@
 			<flag hasinfinitemana="1" />
 			<flag hasinfinitesoul="1" />
 			<flag hasnoexhaustion="1" />
-			<flag cannotusespells="1" />
-			<flag cannotpickupitem="1" />
+			<flag cannotusespells="0" />
+			<flag cannotpickupitem="0" />
 			<flag canalwayslogin="1" />
 			<flag canbroadcast="1" />
-			<flag canedithouses="1" />
+			<flag canedithouses="0" />
 			<flag cannotbebanned="1" />
 			<flag cannotbepushed="1" />
 			<flag hasinfinitecapacity="1" />
@@ -42,7 +97,7 @@
 			<flag isalwayspremium="1" />
 		</flags>
 	</group>
-	<group id="3" name="god" access="1" maxdepotitems="0" maxvipentries="200" >
+	<group id="6" name="god" access="1" maxdepotitems="0" maxvipentries="200">
 		<flags>
 			<flag cannotusecombat="0" />
 			<flag cannotattackplayer="1" />

diff --git a/data/talkactions/scripts/add_tutor.lua b/data/talkactions/scripts/add_tutor.lua
@@ -1,5 +1,5 @@
 function onSay(player, words, param)
-	if player:getAccountType() <= ACCOUNT_TYPE_TUTOR then
+	if player:getAccountType() <= ACCOUNT_TYPE_SENIORTUTOR then
 		return true
 	end
 

diff --git a/data/talkactions/scripts/remove_tutor.lua b/data/talkactions/scripts/remove_tutor.lua
@@ -1,5 +1,5 @@
 function onSay(player, words, param)
-	if player:getAccountType() <= ACCOUNT_TYPE_TUTOR then
+	if player:getAccountType() <= ACCOUNT_TYPE_SENIORTUTOR then
 		return true
 	end
 

diff --git a/src/enums.h b/src/enums.h
@@ -168,7 +168,8 @@ enum AccountType_t : uint8_t {
 	ACCOUNT_TYPE_TUTOR = 2,
 	ACCOUNT_TYPE_SENIORTUTOR = 3,
 	ACCOUNT_TYPE_GAMEMASTER = 4,
-	ACCOUNT_TYPE_GOD = 5
+	ACCOUNT_TYPE_COMMUNITYMANAGER = 5,
+	ACCOUNT_TYPE_GOD = 6
 };
 
 enum RaceType_t : uint8_t {

diff --git a/src/luascript.cpp b/src/luascript.cpp
@@ -1111,6 +1111,7 @@ void LuaScriptInterface::registerFunctions()
 	registerEnum(ACCOUNT_TYPE_TUTOR)
 	registerEnum(ACCOUNT_TYPE_SENIORTUTOR)
 	registerEnum(ACCOUNT_TYPE_GAMEMASTER)
+	registerEnum(ACCOUNT_TYPE_COMMUNITYMANAGER)
 	registerEnum(ACCOUNT_TYPE_GOD)
 
 	registerEnum(AMMO_NONE)