diff options
Diffstat (limited to 'src/trinitycore')
| -rw-r--r-- | src/trinitycore/CliRunnable.cpp | 37 | ||||
| -rw-r--r-- | src/trinitycore/CliRunnable.h | 10 | ||||
| -rw-r--r-- | src/trinitycore/Main.cpp | 22 | ||||
| -rw-r--r-- | src/trinitycore/Makefile.am | 3 | ||||
| -rw-r--r-- | src/trinitycore/Master.cpp | 33 | ||||
| -rw-r--r-- | src/trinitycore/Master.h | 12 | ||||
| -rw-r--r-- | src/trinitycore/RASocket.cpp | 10 | ||||
| -rw-r--r-- | src/trinitycore/RASocket.h | 10 | ||||
| -rw-r--r-- | src/trinitycore/WorldRunnable.cpp | 10 | ||||
| -rw-r--r-- | src/trinitycore/WorldRunnable.h | 10 | ||||
| -rw-r--r-- | src/trinitycore/trinitycore.conf.dist | 213 |
11 files changed, 82 insertions, 288 deletions
diff --git a/src/trinitycore/CliRunnable.cpp b/src/trinitycore/CliRunnable.cpp index 7e4c0e2eeb7..b94176178f8 100644 --- a/src/trinitycore/CliRunnable.cpp +++ b/src/trinitycore/CliRunnable.cpp @@ -1,5 +1,7 @@ /* - * Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/> + * Copyright (C) 2008 Trinity <http://www.trinitycore.org/> + * + * Thanks to the original authors: MaNGOS <http://www.mangosproject.org/> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -8,15 +10,15 @@ * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/// \addtogroup mangosd +/// \addtogroup Trinityd /// @{ /// \file @@ -36,7 +38,6 @@ #include "MapManager.h" #include "PlayerDump.h" #include "Player.h" -#include "IRCClient.h" //CliCommand and CliCommandHolder are defined in World.h to avoid cyclic deps @@ -314,14 +315,6 @@ void CliBroadcast(char *text,pPrintf zprintf) sWorld.SendWorldText(LANG_SYSTEMMESSAGE,textUtf8.c_str()); zprintf("Broadcasting to the world: %s\r\n",textUtf8.c_str()); - - if((sIRC.BOTMASK & 256) != 0) - { - std::string ircchan = "#"; - ircchan += sIRC._irc_chan[sIRC.anchn].c_str(); - sIRC.Send_IRC_Channel(ircchan, sIRC.MakeMsg("\00304,08\037/!\\\037\017\00304 System Message \00304,08\037/!\\\037\017 %s", "%s", text), true); - } - } /// Print the list of commands and associated description @@ -640,7 +633,7 @@ void CliBan(char*command,pPrintf zprintf) } } -/// Display %MaNGOS version +/// Display %TrinIty version void CliVersion(char*,pPrintf zprintf) { //<--maybe better append to info cmd @@ -947,7 +940,7 @@ void CliTele(char*command,pPrintf zprintf) QueryResult *result = WorldDatabase.PQuery("SELECT position_x,position_y,position_z,orientation,map FROM game_tele WHERE name = '%s'",location.c_str()); if (!result) { - zprintf(objmgr.GetMangosStringForDBCLocale(LANG_COMMAND_TELE_NOTFOUND),"\r\n"); + zprintf(objmgr.GetTrinityStringForDBCLocale(LANG_COMMAND_TELE_NOTFOUND),"\r\n"); return; } @@ -961,7 +954,7 @@ void CliTele(char*command,pPrintf zprintf) if(!MapManager::IsValidMapCoord(mapid,x,y,z,ort)) { - zprintf(objmgr.GetMangosStringForDBCLocale(LANG_INVALID_TARGET_COORD),"\r\n",x,y,mapid); + zprintf(objmgr.GetTrinityStringForDBCLocale(LANG_INVALID_TARGET_COORD),"\r\n",x,y,mapid); return; } @@ -971,17 +964,17 @@ void CliTele(char*command,pPrintf zprintf) if(chr->IsBeingTeleported()==true) { - zprintf(objmgr.GetMangosStringForDBCLocale(LANG_IS_TELEPORTED),"\r\n",chr->GetName()); + zprintf(objmgr.GetTrinityStringForDBCLocale(LANG_IS_TELEPORTED),"\r\n",chr->GetName()); return; } if(chr->isInFlight()) { - zprintf(objmgr.GetMangosStringForDBCLocale(LANG_CHAR_IN_FLIGHT),"\r\n",chr->GetName()); + zprintf(objmgr.GetTrinityStringForDBCLocale(LANG_CHAR_IN_FLIGHT),"\r\n",chr->GetName()); return; } - zprintf(objmgr.GetMangosStringForDBCLocale(LANG_TELEPORTING_TO),"\r\n",chr->GetName(),"", location.c_str()); + zprintf(objmgr.GetTrinityStringForDBCLocale(LANG_TELEPORTING_TO),"\r\n",chr->GetName(),"", location.c_str()); chr->SaveRecallPosition(); @@ -989,11 +982,11 @@ void CliTele(char*command,pPrintf zprintf) } else if (uint64 guid = objmgr.GetPlayerGUIDByName(name.c_str())) { - zprintf(objmgr.GetMangosStringForDBCLocale(LANG_TELEPORTING_TO),"\r\n",name.c_str(), objmgr.GetMangosStringForDBCLocale(LANG_OFFLINE), location.c_str()); + zprintf(objmgr.GetTrinityStringForDBCLocale(LANG_TELEPORTING_TO),"\r\n",name.c_str(), objmgr.GetTrinityStringForDBCLocale(LANG_OFFLINE), location.c_str()); Player::SavePositionInDB(mapid,x,y,z,ort,MapManager::Instance().GetZoneId(mapid,x,y),guid); } else - zprintf(objmgr.GetMangosStringForDBCLocale(LANG_NO_PLAYER),"\r\n",name.c_str()); + zprintf(objmgr.GetTrinityStringForDBCLocale(LANG_NO_PLAYER),"\r\n",name.c_str()); } /// Display/Define the 'Message of the day' for the realm @@ -1097,7 +1090,7 @@ void CliSave(char*,pPrintf zprintf) { ///- Save players ObjectAccessor::Instance().SaveAllPlayers(); - zprintf( objmgr.GetMangosStringForDBCLocale(LANG_PLAYERS_SAVED) ); + zprintf( objmgr.GetTrinityStringForDBCLocale(LANG_PLAYERS_SAVED) ); ///- Send a message sWorld.SendWorldText(LANG_PLAYERS_SAVED); diff --git a/src/trinitycore/CliRunnable.h b/src/trinitycore/CliRunnable.h index 2dc4a51d89a..5f2806156fb 100644 --- a/src/trinitycore/CliRunnable.h +++ b/src/trinitycore/CliRunnable.h @@ -1,5 +1,7 @@ /* - * Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/> + * Copyright (C) 2008 Trinity <http://www.trinitycore.org/> + * + * Thanks to the original authors: MaNGOS <http://www.mangosproject.org/> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -8,15 +10,15 @@ * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/// \addtogroup mangosd +/// \addtogroup Trinityd /// @{ /// \file diff --git a/src/trinitycore/Main.cpp b/src/trinitycore/Main.cpp index 1c3ec6fea6e..5f2f95d81d5 100644 --- a/src/trinitycore/Main.cpp +++ b/src/trinitycore/Main.cpp @@ -1,5 +1,7 @@ /* - * Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/> + * Copyright (C) 2008 Trinity <http://www.trinitycore.org/> + * + * Thanks to the original authors: MaNGOS <http://www.mangosproject.org/> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -8,15 +10,15 @@ * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/// \addtogroup mangosd Mangos Daemon +/// \addtogroup Trinityd Trinity Daemon /// @{ /// \file @@ -25,8 +27,6 @@ #include "Config/ConfigEnv.h" #include "Log.h" #include "Master.h" -#include "../game/IRCConf.h" -#include "../game/IRCClient.h" #ifndef _TRINITY_CORE_CONFIG # define _TRINITY_CORE_CONFIG "trinitycore.conf" @@ -40,8 +40,8 @@ #ifdef WIN32 #include "ServiceWin32.h" -char serviceName[] = "mangosd"; -char serviceLongName[] = "MaNGOS world service"; +char serviceName[] = "Trinityd"; +char serviceLongName[] = "Trinity core service"; char serviceDescription[] = "Massive Network Game Object Server"; /* * -1 - not in service mode @@ -72,12 +72,11 @@ void usage(const char *prog) ,prog); } -/// Launch the mangos server +/// Launch the Trinity server extern int main(int argc, char **argv) { ///- Command line parsing to get the configuration file name char const* cfg_file = _TRINITY_CORE_CONFIG; - char const* mc_cfg_file = _TRINITY_CORE_CONFIG; int c=1; while( c < argc ) { @@ -139,7 +138,6 @@ extern int main(int argc, char **argv) return 1; } - sIRC.SetCfg(mc_cfg_file); sLog.outString("Using configuration file %s.", cfg_file); uint32 confVersion = sConfig.GetIntDefault("ConfVersion", 0); @@ -162,7 +160,7 @@ extern int main(int argc, char **argv) // at sMaster return function exist with codes // 0 - normal shutdown // 1 - shutdown at error - // 2 - restart command used, this code can be used by restarter for restart mangosd + // 2 - restart command used, this code can be used by restarter for restart Trinityd } /// @} diff --git a/src/trinitycore/Makefile.am b/src/trinitycore/Makefile.am index 654cc71be95..38a8e8bf9b1 100644 --- a/src/trinitycore/Makefile.am +++ b/src/trinitycore/Makefile.am @@ -4,7 +4,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or +# the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -82,3 +82,4 @@ install-data-hook: fi; \ done + diff --git a/src/trinitycore/Master.cpp b/src/trinitycore/Master.cpp index 216a48c59c0..ffc6d930483 100644 --- a/src/trinitycore/Master.cpp +++ b/src/trinitycore/Master.cpp @@ -1,5 +1,7 @@ /* - * Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/> + * Copyright (C) 2008 Trinity <http://www.trinitycore.org/> + * + * Thanks to the original authors: MaNGOS <http://www.mangosproject.org/> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -8,16 +10,16 @@ * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /** \file - \ingroup mangosd + \ingroup Trinityd */ #include <ace/OS_NS_signal.h> @@ -38,7 +40,6 @@ #include "RASocket.h" #include "ScriptCalls.h" #include "Util.h" -#include "IRCClient.h" #include "sockets/TcpSocket.h" #include "sockets/Utility.h" @@ -155,9 +156,9 @@ public: std::string stringip = sConfig.GetStringDefault ("Ra.IP", "0.0.0.0"); ipaddr_t raip; if (!Utility::u2ip (stringip, raip)) - sLog.outError ("MaNGOS RA can not bind to ip %s", stringip.c_str ()); + sLog.outError ("Trinity RA can not bind to ip %s", stringip.c_str ()); else if (RAListenSocket.Bind (raip, raport)) - sLog.outError ("MaNGOS RA can not bind to port %d on %s", raport, stringip.c_str ()); + sLog.outError ("Trinity RA can not bind to port %d on %s", raport, stringip.c_str ()); else { h.Add (&RAListenSocket); @@ -227,9 +228,6 @@ int Master::Run() if (!_StartDB()) return 1; - ///- Load IRC Config (need DB for gm levels, AutoBroadcast uses world timers) - sIRC.LoadConfig(sIRC.CfgFile); - ///- Initialize the World sWorld.SetInitialWorldSettings(); @@ -243,11 +241,6 @@ int Master::Run() // set server online loginDatabase.PExecute("UPDATE realmlist SET color = 0, population = 0 WHERE id = '%d'",realmID); - // Create table: has_logged_in_before - used for certain custom options - sLog.outBasic("ImpConfig: Creating/Checking table 'has_logged_in_before'..."); - CharacterDatabase.PExecute("CREATE TABLE IF NOT EXISTS `has_logged_in_before` (`guid` int(11) unsigned NOT NULL default '0', PRIMARY KEY (`guid`)) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='ImpConfig check';"); - sLog.outBasic("ImpConfig: Done..."); - #ifdef WIN32 if (sConfig.GetBoolDefault("Console.Enable", true) && (m_ServiceStatus == -1)/* need disable console in service mode*/) #else @@ -277,7 +270,7 @@ int Master::Run() if(!curAff ) { - sLog.outError("Processors marked in UseProcessors bitmask (hex) %x not accessible for mangosd. Accessible processors bitmask (hex): %x",Aff,appAff); + sLog.outError("Processors marked in UseProcessors bitmask (hex) %x not accessible for Trinityd. Accessible processors bitmask (hex): %x",Aff,appAff); } else { @@ -298,7 +291,7 @@ int Master::Run() if(SetPriorityClass(hProcess,HIGH_PRIORITY_CLASS)) sLog.outString("TrinityCore process priority class set to HIGH"); else - sLog.outError("ERROR: Can't set mangosd process priority class."); + sLog.outError("ERROR: Can't set Trinityd process priority class."); sLog.outString(); } } @@ -313,12 +306,6 @@ int Master::Run() uint32 numLoops = (sConfig.GetIntDefault( "MaxPingTime", 30 ) * (MINUTE * 1000000 / socketSelecttime)); uint32 loopCounter = 0; - // Start up IRC bot - ZThread::Thread irc(new IRCClient); - irc.setPriority ((ZThread::Priority )2); - - - ///- Start up freeze catcher thread uint32 freeze_delay = sConfig.GetIntDefault("MaxCoreStuckTime", 0); if(freeze_delay) diff --git a/src/trinitycore/Master.h b/src/trinitycore/Master.h index ce756545720..7b850a30971 100644 --- a/src/trinitycore/Master.h +++ b/src/trinitycore/Master.h @@ -1,5 +1,7 @@ /* - * Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/> + * Copyright (C) 2008 Trinity <http://www.trinitycore.org/> + * + * Thanks to the original authors: MaNGOS <http://www.mangosproject.org/> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -8,15 +10,15 @@ * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/// \addtogroup mangosd +/// \addtogroup Trinityd /// @{ /// \file @@ -45,6 +47,6 @@ class Master void clearOnlineAccounts(); }; -#define sMaster MaNGOS::Singleton<Master>::Instance() +#define sMaster Trinity::Singleton<Master>::Instance() #endif /// @} diff --git a/src/trinitycore/RASocket.cpp b/src/trinitycore/RASocket.cpp index 04f2cca4261..64ef40dfb33 100644 --- a/src/trinitycore/RASocket.cpp +++ b/src/trinitycore/RASocket.cpp @@ -1,5 +1,7 @@ /* - * Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/> + * Copyright (C) 2008 Trinity <http://www.trinitycore.org/> + * + * Thanks to the original authors: MaNGOS <http://www.mangosproject.org/> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -8,16 +10,16 @@ * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /** \file - \ingroup mangosd + \ingroup Trinityd */ #include "Common.h" diff --git a/src/trinitycore/RASocket.h b/src/trinitycore/RASocket.h index d082c45112a..e90ba7a3352 100644 --- a/src/trinitycore/RASocket.h +++ b/src/trinitycore/RASocket.h @@ -1,5 +1,7 @@ /* - * Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/> + * Copyright (C) 2008 Trinity <http://www.trinitycore.org/> + * + * Thanks to the original authors: MaNGOS <http://www.mangosproject.org/> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -8,15 +10,15 @@ * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/// \addtogroup mangosd +/// \addtogroup Trinityd /// @{ /// \file diff --git a/src/trinitycore/WorldRunnable.cpp b/src/trinitycore/WorldRunnable.cpp index 35d643727c6..05926d7ec9b 100644 --- a/src/trinitycore/WorldRunnable.cpp +++ b/src/trinitycore/WorldRunnable.cpp @@ -1,5 +1,7 @@ /* - * Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/> + * Copyright (C) 2008 Trinity <http://www.trinitycore.org/> + * + * Thanks to the original authors: MaNGOS <http://www.mangosproject.org/> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -8,16 +10,16 @@ * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /** \file - \ingroup mangosd + \ingroup Trinityd */ #include "WorldSocketMgr.h" diff --git a/src/trinitycore/WorldRunnable.h b/src/trinitycore/WorldRunnable.h index 2fec658f5d1..7a8b5af245d 100644 --- a/src/trinitycore/WorldRunnable.h +++ b/src/trinitycore/WorldRunnable.h @@ -1,5 +1,7 @@ /* - * Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/> + * Copyright (C) 2008 Trinity <http://www.trinitycore.org/> + * + * Thanks to the original authors: MaNGOS <http://www.mangosproject.org/> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -8,15 +10,15 @@ * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/// \addtogroup mangosd +/// \addtogroup Trinityd /// @{ /// \file 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]" |