Hercules Renewal: clif.c complete

Added the last missing functions into the interface, all functions in clif.c are now wired to the interface.
http://hercules.ws/board/topic/237-hercules-renewal/
Also shortened clif->displaymessage to clif->message, removed the old clif->message and merged its functionality with clif->disp_overhead (both use the same packet and do the same thing :P)
-
and a gazillion other stuff:
http://hercules.ws/board/topic/316-introducing-hercules-channel-system/

Signed-off-by: shennetsind <ind@henn.et>

7 files changed, 86 insertions, 7 deletions

diff --git a/conf/atcommand.conf b/conf/atcommand.conf
index 5a0a5b289..67af3b91f 100644
--- a/conf/atcommand.conf
+++ b/conf/atcommand.conf
@@ -56,6 +56,7 @@ aliases: {
 	guildstorage: ["gstorage"]
 	accinfo: ["accountinfo"]
 	itemreset: ["clearinventory"]
+	channel: ["main"]
 }
 
 /* Commands help file */
diff --git a/conf/battle/items.conf b/conf/battle/items.conf
index 4401072d5..05aadfecd 100644
--- a/conf/battle/items.conf
+++ b/conf/battle/items.conf
@@ -76,7 +76,7 @@ gtb_sc_immunity: 50
 // always work independently of each other regardless of setting.
 autospell_stacking: no
 
-// Will disabled consumables (disabled by item_noequip.txt) be consumed when trying to use them?
+// Will disabled consumables (disabled by map_zone_db.conf) be consumed when trying to use them?
 // 1 (official): yes
 // 0: no
 item_restricted_consumption_type:1
diff --git a/conf/channels.conf b/conf/channels.conf
new file mode 100644
index 000000000..b12d2da8b
--- /dev/null
+++ b/conf/channels.conf
@@ -0,0 +1,39 @@
+chsys: (
+{
+	/* default channels (available on boot) */
+	default_channels: {
+		/* channel_name : channel_messages_color */
+	 	main: "Orange" /* available as #main */
+		support: "Blue" /* available as #support */
+		trade: "Red" /* available as #trade */
+		offtopic: "Cyan" /* available as #offtopic */
+		/* as many channels as you like */
+	}
+	/* colors available */
+	colors: {
+		Default: "0xffffff" /* custom channels will use the first in the list unless a font is selected thru @channel */
+		Red: "0xff0000"
+		Blue: "0x83cfe9"
+		Orange: "0xe57c00"
+		Cyan: "0x00b89d"
+		Yellow: "0xffff90"
+		Green: "0x28bf00"
+		Normal: "0x00ff00"
+		/* as many colors as you like */
+	}
+	/* allow users to create their own (private) channels through @channels command? */
+	/* (must also allow players to use @channels in groups.conf) */
+	allow_user_channel_creation: true
+	/* "map_local_channel" is a instanced channel unique to each map */
+	map_local_channel: true
+	map_local_channel_name: "map" /* available as #map */
+	map_local_channel_color: "Yellow"
+	map_local_channel_autojoin: true /* can disable autojoin in specific maps through a mapflag or zone */
+	/* "ally_channel" is a channel shared by all your guild allies */
+	ally_channel_enabled: true
+	ally_channel_name: "ally" /* available as #ally */
+	ally_channel_color: "Green"
+	ally_channel_autojoin: true
+}
+)
+
diff --git a/conf/groups.conf b/conf/groups.conf
index a243716e6..879361387 100644
--- a/conf/groups.conf
+++ b/conf/groups.conf
@@ -123,13 +123,13 @@ groups: (
 		refresh: true
 		noask: true
 		noks: true
-		main: true
 		autoloot: true
 		alootid: true
 		autotrade: true
 		request: true
 		go: true
 		breakguild: true
+		channel: true
 	}
 	permissions: {
 	}
@@ -272,6 +272,7 @@ groups: (
 		use_check: true
 		use_changemaptype: true
 		all_commands: true
+		hchsys_admin: true
 	}
 }
 )
diff --git a/conf/help.txt b/conf/help.txt
index 105371e9f..6f202091e 100644
--- a/conf/help.txt
+++ b/conf/help.txt
@@ -6,7 +6,6 @@
 // This file uses libconfig syntax.
 
 help: "Params: <command>\n" "Shows help for specified command."
-main: "Params: [on|off|<message>]\n" "Turns on or off main (server-wide) chat. Sends message to main chat."
 noask: "Auto rejects deals/invites."
 gmotd: "Broadcasts the Message of The Day to all players."
 me: "Params: <message>\n" "Displays normal text as a message in this format: *name message* (like /me in mIRC)."
diff --git a/conf/inter-server.conf b/conf/inter-server.conf
index 523437007..bf8d9e7a3 100644
--- a/conf/inter-server.conf
+++ b/conf/inter-server.conf
@@ -119,8 +119,4 @@ mapreg_db: mapreg
 //Use SQL item_db, mob_db and mob_skill_db for the map server
 use_sql_db: no
 
-// Nick for sending mainchat 
-// messages like whisper
-main_chat_nick: Main
-
 import: conf/import/inter_conf.txt
diff --git a/conf/messages.conf b/conf/messages.conf
index 6025ecd81..7666badf3 100644
--- a/conf/messages.conf
+++ b/conf/messages.conf
@@ -1409,5 +1409,48 @@
 // @skillid (extension)
 1398: -- Displaying first %d partial matches
 
+// @join
+1399: Unknown Channel (usage: %s <#channel_name>)
+1400: Unknown Channel '%s' (usage: %s <#channel_name>)
+1401: '%s' Channel is password protected (usage: %s <#channel_name> <password>)
+1403: You're now in the '%s' channel
+
+// Hercules Chat Feature
+1402: You're not in that channel, type '@join <#channel_name>'
+1434: You're already in the '%s' channel
+1435: You're now in the '#%s' channel for '%s'
+
+// @channel
+1404: %s failed
+1405: Channel name must start with a '#'
+1406: Channel length must be between 3 and %d
+1407: Channel '%s' is not available
+1408: Channel password may not contain spaces
+1409: - #%s ( %d users )
+1410: -- Public Channels
+1411: Unknown color '%s'
+1412: You're not the owner of channel '%s'
+1413: '%s' channel color updated to '%s' 
+1414: --- Available options:
+1415: -- %s create <channel name> <channel password>
+1416: - creates a new channel
+1417: -- %s list
+1418: - lists public channels
+1419: -- %s list colors
+1420: - lists colors available to select for custom channels
+1421: -- %s setcolor <channel name> <color name>
+1422: - changes <channel name> color to <color name>
+1423: -- %s leave <channel name>
+1424: - leaves <channel name>
+1425: You're not part of the '%s' channel
+1426: You've left the '%s' channel
+1427: -- %s bindto <channel name>
+1428: - binds your global chat to <channel name>, making anything you type in global be sent to the channel
+1429: -- %s unbind
+1430: - unbinds your global chat from its attached channel (if binded)
+1431: Your global chat is now binded to the '%s' channel
+1432: Your global chat is not binded to any channel
+1433: Your global chat is now unbinded from the '#%s' channel
+
 //Custom translations
 import: conf/import/msg_conf.txt