Merge pull request #104 from matthe815/feature/custom-prefix

feat: Custom prefixes and basic help command

config.json

@@ -14,6 +14,7 @@
   "ClientMode": "ZZ",
   "QuestCacheExpiry": 300,
   "ProxyPort": 0,
+  "CommandPrefix": "!",
   "DevMode": true,
   "DevModeOptions": {
     "AutoCreateAccount": true,
@@ -79,32 +80,44 @@
   },
   "Commands": [
     {
+      "Name": "Help",
+      "Enabled": true,
+      "Description": "Show enabled chat commands",
+      "Prefix": "help"
+    }, {
       "Name": "Rights",
       "Enabled": false,
+      "Description": "Overwrite the Rights value on your account",
       "Prefix": "rights"
     }, {
       "Name": "Raviente",
       "Enabled": true,
+      "Description": "Various Raviente siege commands",
       "Prefix": "ravi"
     }, {
       "Name": "Teleport",
       "Enabled": false,
+      "Description": "Teleport to specified coordinates",
       "Prefix": "tele"
     }, {
       "Name": "Reload",
       "Enabled": true,
+      "Description": "Reload all players in your Land",
       "Prefix": "reload"
     }, {
       "Name": "KeyQuest",
       "Enabled": false,
+      "Description": "Overwrite your HR Key Quest progress",
       "Prefix": "kqf"
     }, {
       "Name": "Course",
       "Enabled": true,
+      "Description": "Toggle Courses on your account",
       "Prefix": "course"
     }, {
       "Name": "PSN",
       "Enabled": true,
+      "Description": "Link a PlayStation Network ID to your account",
       "Prefix": "psn"
     }
   ],

config/config.go

@@ -81,6 +81,7 @@ type Config struct {
 	RealClientMode         Mode
 	QuestCacheExpiry       int    // Number of seconds to keep quest data cached
 	ProxyPort              uint16 // Forces the game to connect to a channel server proxy
+	CommandPrefix          string // The prefix for commands
 	DevMode                bool
 
 	DevModeOptions  DevModeOptions
@@ -168,9 +169,10 @@ type Discord struct {
 
 // Command is a channelserver chat command
 type Command struct {
-	Name    string
-	Enabled bool
-	Prefix  string
+	Name        string
+	Enabled     bool
+	Description string
+	Prefix      string
 }
 
 // Course represents a course within MHF

server/channelserver/handlers_cast_binary.go

@@ -84,7 +84,7 @@ func sendServerChatMessage(s *Session, message string) {
 }
 
 func parseChatCommand(s *Session, command string) {
-	args := strings.Split(command[1:], " ")
+	args := strings.Split(command[len(s.server.erupeConfig.CommandPrefix):], " ")
 	switch args[0] {
 	case commands["PSN"].Prefix:
 		if commands["PSN"].Enabled {
@@ -322,6 +322,16 @@ func parseChatCommand(s *Session, command string) {
 		} else {
 			sendDisabledCommandMessage(s, commands["Teleport"])
 		}
+	case commands["Help"].Prefix:
+		if commands["Help"].Enabled {
+			for _, command := range commands {
+				if command.Enabled {
+					sendServerChatMessage(s, fmt.Sprintf("%s%s: %s", s.server.erupeConfig.CommandPrefix, command.Prefix, command.Description))
+				}
+			}
+		} else {
+			sendDisabledCommandMessage(s, commands["Help"])
+		}
 	}
 }
 
@@ -395,7 +405,7 @@ func handleMsgSysCastBinary(s *Session, p mhfpacket.MHFPacket) {
 			bf.SetLE()
 			chatMessage := &binpacket.MsgBinChat{}
 			chatMessage.Parse(bf)
-			if strings.HasPrefix(chatMessage.Message, "!") {
+			if strings.HasPrefix(chatMessage.Message, s.server.erupeConfig.CommandPrefix) {
 				parseChatCommand(s, chatMessage.Message)
 				return
 			}