[svn] * Merge Temp dev SVN with Assembla.

* Changes include:
   - Implementation of w12x's Outdoor PvP and Game Event Systems.
   - Temporary removal of IRC Chat Bot (until infinite loop when disabled is fixed).
   - All mangos -> trinity (to convert your mangos_string table, please run mangos_string_to_trinity_string.sql).
   - Improved Config cleanup.
   - And many more changes.

--HG--
branch : trunk

1 files changed, 8 insertions, 205 deletions

diff --git a/src/trinitycore/trinitycore.conf.dist b/src/trinitycore/trinitycore.conf.dist
index 0c23e97610f..eab2af94eeb 100644
--- a/src/trinitycore/trinitycore.conf.dist
+++ b/src/trinitycore/trinitycore.conf.dist
@@ -299,7 +299,7 @@ AddonChannel = 1
 
 LogSQL = 1
 PidFile = ""
-LogLevel = 3
+LogLevel = 1
 LogTime = 0
 LogFile = "server.log"
 LogTimestamp = 0
@@ -807,7 +807,7 @@ GM.LogTrade = 1
 #    Visibility.Distance.Grey.Unit
 #        Visibility grey distance for creatures/players (fast changing objects)
 #        addition to appropriate object type Visibility.Distance.* use in case visibility removing to
-#        object (except corpse around distences) If � is distance and G is grey distance then object
+#        object (except corpse around distences) If ? is distance and G is grey distance then object
 #        make visible if distance to it <= D but make non visible if distance > D+G
 #        Default: 1 (yard)
 #
@@ -1133,10 +1133,6 @@ Network.TcpNodelay = 1
 #	PlayerStart.AllFlightPaths
 #		Players will start with all flight paths (Note: ALL flight paths, not only player's team)
 #
-#	AntiCheat.GMIsland
-#		If a player enters GM island, he will get teleported away. This will prevent cheaters from buying GM stuff
-#		on servers with a GM mall. GM's will not get teleported away.
-#
 #	GamemasterStartLevel
 #		GM starting level
 #		Default: 70 Min,max: 1 - 255
@@ -1149,12 +1145,6 @@ Network.TcpNodelay = 1
 #	MusicInBattleground
 #		If enabled, "L70ETC - Power of the horde" will be played when BG starts ;)
 #
-#	EnableQueueForGMs
-#      NOTE: This option currently does not work due to ACE patch
-#		GMs will also be added to the login queue (not gmlvl 3+) if enabled. Useful for GM servers.
-#		Default: 0 - off
-#				 1 - on
-#
 #	HonorPointsAfterDuel
 #		The amount of honor points the duel winner will get after a duel.
 #		Default: 0 - disable
@@ -1162,9 +1152,6 @@ Network.TcpNodelay = 1
 #	DisableWaterBreath
 #		Disable/enable waterbreathing for players
 #
-#	DisableResurrectSickness
-#		Players wont get any resurrect sickness when speaking with a spirit healer if this is enabled+
-#
 #	AlwaysMaxWeaponSkill
 #		Players will automatically gain max weapon/defense skill when logging in, leveling up etc.
 #
@@ -1188,6 +1175,12 @@ Network.TcpNodelay = 1
 #	NoResetTalentsCost
 #		Enable or disable no cost when reseting talents
 #
+#   ForbiddenMaps
+#       map ids that users below SEC_GAMEMASTER cannot enter, with delimiter ','
+#       Default: ""
+#       example: "538,90"
+#       Note that it's HIGHLY DISCOURAGED to forbid starting maps (0, 1, 530)!
+#
 ###################################################################################################################
 
 PlayerStart.Gold = 0
@@ -1197,14 +1190,11 @@ PlayerStart.AllReputation = 0
 PlayerStart.AllSpells = 0
 PlayerStart.MapsExplored = 0
 PlayerStart.AllFlightPaths = 0
-AntiCheat.GMIsland = 0
 GamemasterStartLevel = 70
 PlayerInstantLogout = 0
 MusicInBattleground = 0
-EnableQueueForGMs = 0
 HonorPointsAfterDuel = 0
 DisableWaterBreath = 0
-DisableResurrectSickness = 0
 AlwaysMaxWeaponSkill = 0
 PvPToken.Enable = 0
 PvPToken.MapAllowType = 4
@@ -1212,190 +1202,3 @@ PvPToken.ItemID = 29434
 PvPToken.ItemCount = 1
 NoResetTalentsCost = 0
 
-###################################################################################################################
-# IRC SYSTEM CONFIG
-#
-# irc.active
-#     Enable IRC bot/system
-#     Default: 0 - Disable
-#              0 - Enable
-# irc.icc
-#     IRC connect code
-#     Default: 001 - Welcome To Network msg
-#              375 - Beginning Of MOTD
-#              376 - End Of MOTD
-#
-# irc.host
-#     IRC server to connect to
-#
-# irc.port
-#     IRC server port to use
-#     Default: "6667" - Semi-standard IRC port
-#
-# irc.user
-#     The username/ident to use when connecting to the IRC server
-#
-# irc.nick
-#     IRC nickname to be used by the bot
-#
-# irc.pass
-#     The password to be used to identify to NickServ
-#
-# irc.auth
-#     IRC Authentication Method
-#     Default: 0 - Disable
-#              1 - NickServ - Normal Method - PRIVMSG NickServ :IDENTIFY Password
-#              2 - NickServ - Alternate Method To Identify To A Different Nick - PRIVMSG NickServ :IDENTIFY irc.auth.nick Password
-#              3 - QuakeNet - Normal Method - PRIVMSG Q@CServe.quakenet.org :AUTH irc.nick Password
-#              4 - QuakeNet - Alternate Method To Identify To A Different Nick - PRIVMSG Q@CServe.quakenet.org :AUTH irc.auth.nick Password
-#
-# irc.auth.nick
-#     IRC Nickname to use if Auth method 2 or 4 is used
-#
-# irc.ldef
-#     Leave a defined IRC channel on server connect
-#     Default: 0 - Disable
-#              1 - Enable
-# irc.defchan
-#     IRC channel to leave on server connect if irc.ldef is on
-#
-# irc.wct
-#     Time to wait before (re)attemptimg connection to IRC server
-#     Default: 30000 - (30 Seconds)
-#
-# irc.maxattempt
-#     Maximum attempts to try IRC server
-#     Default: 20
-#
-# irc.auto.announce
-#     Time to wait in Minutes to announce random messages from database.
-#     Default: 30 - (30 Minutes)
-#
-# irc.autojoin_kick
-#     Autojoin IRC channel if kicked
-#     Default: 1 - Enable
-#              0 - Disable
-#
-# irc.command_prefix
-#     IRC command prefix
-#     Example: (.)online all
-#
-# irc.joinmsg
-# irc.rstmsg
-# irc.kickmsg
-#     Bot join/restart/kick messages
-#
-# irc.chan_#
-# wow.chan_#
-#     IRC and WOW channels to link. Leave # out of IRC channel. Both channels _ARE_ case sensitive
-#     Example: irc.chan_1 = "Trinity"
-#              irc.chan_2 = "trinity2"
-#              wow.chan_1 = "world"
-#              wow.chan_2 = "LookingForGroup"
-#
-# irc.StatusChannel
-#     Channel Number To Display Status Messages In (AuctionHouse, Levels, Deaths, Etc)
-#     Default: 1 - Channel ID 1
-#
-# irc.AnnounceChannel
-#     Channel Number To Display Announcements In (Announces, Notifies, Event)
-#     Default: 1 - Channel ID 1
-#
-# irc.op_gm_login
-#     Op The GM In All Channels The Bot Is On When They Log In
-#     Default: 0 - Disable
-#              1 - Enable
-#
-# irc.op_gm_level
-#     The Minimum GM Level Required To Have The Bot Op The User
-#     Default: 5 - GM Level 5
-#
-# irc.ajoin (Experimental/Under Development)
-#     Force players to autojoin an in game channel
-#     Atleast one player must be in the channel on server start, and atleast one person online for invite to work
-#     Default: 0 - Disable
-#              1 - Enable
-# irc.ajchan
-#     Channel to join if above is Enabled.
-#
-# irc.online.result
-#     Maximum number of results per line for the online command
-#
-# chat.*** (Defineable Strings)
-#     wow_* - String is displayed in IRC channel
-#     irc_* - String is displayed in WOW channel
-#     Options: $Name, $Level, $Msg, $GM (not all options work in every string)
-#
-# Botmask
-#     This defines what the bot announces, if its 0 everything is disabled
-#     simply add the values of the elements you want to create this mask.
-#     Example: WoW join/leaves are 1 and IRC join/leaves are 2, if you want both of these active then the BotMask is 3.
-#       (1)Display WoW Chan Join/Leaves In IRC
-#       (2)Display IRC Chan Join/Leaves/NickChanges In WoW
-#       (4)Display Unknown Command Message When Trigger Is Used And No Command Exists
-#       (8)Announce Security Level > 0 As GM At Login
-#       (16)Announce GM In GM ON State AS GM At Login
-#       (32)Return Errors To Notice. (If disabled then default is Private Message)
-#       (64)Display WoW Status Messages (Levels/Deaths)
-#       (128)Display Nick Changes From IRC In WOW
-#       (256)Display WoW Announces/Notifies In IRC
-#       (512)Do Not Let Players Use Commands On Higher GM Level Players
-#       (1024)Enable AuctionHouse Announcements
-#
-# irc.gmlog
-#     Minimum GM level to not show login/pass info in IRC logs
-#
-# irc.logfile.prefix
-#     The prefix of the IRC logfile. Directories can be added here.
-#     Example: "IRC/IRC_" outputs IRC_YYYY-MM-DD.log to the IRC subdirectory in your logs dir
-#
-# irc.fun.games (Experimental/Under Development)
-#     Enable IRC games
-#     Default: 0 - Disable
-#              1 - Enable
-# irc.gm#
-#     GM tag to append to (GM onjoin / online command) IRC color codes are acceptable
-#
-###################################################################################################################
-
-irc.active = 0
-irc.icc = 001
-irc.host = ""
-irc.port = "6667"
-irc.user = "TC"
-irc.nick = "TrinityCoreBot"
-irc.pass = ""
-irc.auth = 0
-irc.auth.nick = "TrinityCoreBot"
-irc.ldef = 0
-irc.defchan = "lobby"
-irc.wct = 30000
-irc.maxattempt = 20
-irc.auto.announce = 30
-irc.autojoin_kick = 1
-irc.command_prefix = "-"
-irc.joinmsg = "Trinity Core running. Command trigger is $Trigger."
-irc.rstmsg  = "Trinity Core is restarting..."
-irc.kickmsg = "Do not kick me."
-irc.chan_1 = "mangos"
-wow.chan_1 = "world"
-irc.StatusChannel = 1
-irc.AnnounceChannel = 1
-irc.op_gm_login = 0
-irc.op_gm_level = 3
-irc.ajoin = 1
-irc.ajchan = "World"
-irc.online.result = 30
-chat.wow_irc = "-WoW-$Name [$Level]: $Msg"
-chat.irc_wow = "-IRC-$Name: $Msg"
-chat.join_wow = "[$GM] $Name has joined IRC."
-chat.leave_wow = "[$GM] $Name has left IRC."
-Botmask = 1023
-irc.gmlog = 1
-irc.logfile.prefix = "irc_"
-irc.fun.games = 0
-irc.gm1 = "[Moderator]"
-irc.gm2 = "[Game Master]"
-irc.gm3 = "[BugTracker]"
-irc.gm4 = "[DevTeam Admin]"
-irc.gm5 = "[SysOP]"