diff --git a/src/server/authserver/authserver.conf.dist b/src/server/authserver/authserver.conf.dist index 2ab525b97..93f2b472b 100644 --- a/src/server/authserver/authserver.conf.dist +++ b/src/server/authserver/authserver.conf.dist @@ -257,4 +257,12 @@ LoginDatabaseInfo = "127.0.0.1;3306;acore;acore;acore_auth" LoginDatabase.WorkerThreads = 1 # -################################################################################################### +# LoginDatabase.SynchThreads +# Description: The amount of MySQL connections spawned to handle. +# Default: 1 - (LoginDatabase.WorkerThreads) +# + +LoginDatabase.SynchThreads = 1 + +# +################################################################################################### \ No newline at end of file diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index 01b1fe0ac..e59f3a1c7 100644 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -654,7 +654,6 @@ void World::LoadConfigSettings(bool reload) /// \todo Add MonsterSight and GuarderSight (with meaning) in worldserver.conf or put them as define m_float_configs[CONFIG_SIGHT_MONSTER] = sConfigMgr->GetFloatDefault("MonsterSight", 50); - m_float_configs[CONFIG_SIGHT_GUARDER] = sConfigMgr->GetFloatDefault("GuarderSight", 50); if (reload) { @@ -937,7 +936,6 @@ void World::LoadConfigSettings(bool reload) m_int_configs[CONFIG_MAX_ALLOWED_MMR_DROP] = sConfigMgr->GetIntDefault("MaxAllowedMMRDrop", 500); // pussywizard m_bool_configs[CONFIG_ENABLE_LOGIN_AFTER_DC] = sConfigMgr->GetBoolDefault("EnableLoginAfterDC", true); // pussywizard m_bool_configs[CONFIG_DONT_CACHE_RANDOM_MOVEMENT_PATHS] = sConfigMgr->GetBoolDefault("DontCacheRandomMovementPaths", true); // pussywizard - SetRealmName(sConfigMgr->GetStringDefault("RealmName", "X")); m_int_configs[CONFIG_SKILL_CHANCE_ORANGE] = sConfigMgr->GetIntDefault("SkillChance.Orange", 100); m_int_configs[CONFIG_SKILL_CHANCE_YELLOW] = sConfigMgr->GetIntDefault("SkillChance.Yellow", 75); @@ -1244,7 +1242,6 @@ void World::LoadConfigSettings(bool reload) // misc m_bool_configs[CONFIG_PDUMP_NO_PATHS] = sConfigMgr->GetBoolDefault("PlayerDump.DisallowPaths", true); m_bool_configs[CONFIG_PDUMP_NO_OVERWRITE] = sConfigMgr->GetBoolDefault("PlayerDump.DisallowOverwrite", true); - m_bool_configs[CONFIG_FREE_DUAL_SPEC] = sConfigMgr->GetBoolDefault("FreeDualTalentSpecialization", false); m_bool_configs[CONFIG_ENABLE_MMAPS] = sConfigMgr->GetBoolDefault("MoveMaps.Enable", true); MMAP::MMapFactory::InitializeDisabledMaps(); diff --git a/src/server/game/World/World.h b/src/server/game/World/World.h index 042204d59..d7ba0040b 100644 --- a/src/server/game/World/World.h +++ b/src/server/game/World/World.h @@ -152,7 +152,6 @@ enum WorldBoolConfigs CONFIG_WINTERGRASP_ENABLE, CONFIG_PDUMP_NO_PATHS, CONFIG_PDUMP_NO_OVERWRITE, - CONFIG_FREE_DUAL_SPEC, // pussywizard CONFIG_ENABLE_MMAPS, // pussywizard CONFIG_ENABLE_LOGIN_AFTER_DC, // pussywizard CONFIG_DONT_CACHE_RANDOM_MOVEMENT_PATHS, // pussywizard @@ -167,7 +166,6 @@ enum WorldFloatConfigs CONFIG_GROUP_XP_DISTANCE = 0, CONFIG_MAX_RECRUIT_A_FRIEND_DISTANCE, CONFIG_SIGHT_MONSTER, - CONFIG_SIGHT_GUARDER, CONFIG_LISTEN_RANGE_SAY, CONFIG_LISTEN_RANGE_TEXTEMOTE, CONFIG_LISTEN_RANGE_YELL, diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist index 66fa7fb61..18002b79f 100644 --- a/src/server/worldserver/worldserver.conf.dist +++ b/src/server/worldserver/worldserver.conf.dist @@ -3017,5 +3017,110 @@ PlayerDump.DisallowPaths = 1 PlayerDump.DisallowOverwrite = 1 +# +# DisconnectToleranceInterval +# Description: Allows to skip queue after being disconnected for a given number of seconds. +# Default: 0 + +DisconnectToleranceInterval = 0 + +# +# MonsterSight +# Description: The maximum distance in yards that a "monster" creature can see +# regardless of level difference (through CreatureAI::IsVisible). +# Increases CONFIG_SIGHT_MONSTER to 50 yards. Used to be 20 yards. +# Default: 50.000000 + +MonsterSight = 50.000000 + +# +# StrictChannelNames +# Description: Limit channel names to language specific symbol set. +# Prevents charter creation if not allowed symbols are used. +# Default: 0 - (Disable, Limited server timezone dependent client check) +# 1 - (Enabled, Strictly basic Latin characters) +# 2 - (Enabled, Strictly realm zone specific, See RealmZone setting, +# Note: Client needs to have the appropriate fonts installed which support +# the charset. For non-official localization, custom fonts need to be +# placed in clientdir/Fonts. +# 3 - (Enabled, Basic Latin characters + server timezone specific) + +StrictChannelNames = 0 + +# +# Instance.SharedNormalHeroicId +# Description: No description +# Default: 0 - Disable +# 1 - Enable +# + +Instance.SharedNormalHeroicId = 0 + +# +# Instance.ResetTimeRelativeTimestamp +# Description: Needed for displaying valid instance reset times in ingame calendar. +# This timestamp should be set to a date in the past (midnight) on which +# both 3-day and 7-day raids were reset. +# Default: 1135814400 - (Thu, 29 Dec 2005 00:00:00 GMT - meaning that 7-day raid reset falls on Thursdays, +# while 3-day reset falls on "Thu 29 Dec 2005", "Sun 01 Jan 2006", "Wed 04 Jan 2006", and so on) + +Instance.ResetTimeRelativeTimestamp = 1135814400 + +# +# TeleportTimeoutNear +# Description: No description +# Default: 25 +# + +TeleportTimeoutNear = 25 + +# +# TeleportTimeoutFar +# Description: No description +# Default: 45 +# + +TeleportTimeoutFar = 45 + +# +# MaxAllowedMMRDrop +# Description: Some players continuously lose arena matches to lower their MMR and then fight with weaker opponents. +# This setting prevents lowering MMR too much from max achieved MMR. +# Eg. if max achieved MMR for a character was 2400, with default setting (MaxAllowedMMRDrop = 500) the character can't get below 1900 MMR no matter what. +# Default: 500 + +MaxAllowedMMRDrop = 500 + +# +# EnableLoginAfterDC +# Description: After not logging out properly (clicking Logout and waiting 20 seconds), +# characters stay in game world for a full minute, even if the client connection was closed. +# Such behaviour prevents for example exploiting boss encounters by alt+f4 +# and skipping crucial boss abilities, or escaping opponents in PvP. +# This setting is used to allow/disallow players to log back into characters that are left in world. +# Default: 1 - (by clicking "Enter World" player will log back into a character that is already in world) +# 0 - (by clicking "Enter World" player will get an error message when trying to log into a character +# that is left in world, and has to wait a minute for the character to be removed from world) + +EnableLoginAfterDC = 1 + +# +# DontCacheRandomMovementPaths +# Description: Random movement paths (calculated using MoveMaps) can be cached to save cpu time, +# but this may use up considerable amount of memory and can be prevented by setting this option to 1. +# Recommended setting for populated servers is having enough RAM and setting this to 0. +# Default: 0 - (cache paths, uses more memory) +# 1 - (don't cache, uses more cpu) + +DontCacheRandomMovementPaths = 0 + +# +# MoveMaps.Enable +# Description: Enable/Disable pathfinding using mmaps - recommended. +# Default: 0 - (Disabled) +# 1 - (Enabled) + +MoveMaps.Enable = 1 + # ###################################################################################################