diff --git a/src/game/World.cpp b/src/game/World.cpp index 0c7d222f9..0f3f1086f 100644 --- a/src/game/World.cpp +++ b/src/game/World.cpp @@ -552,9 +552,9 @@ void World::LoadConfigSettings(bool reload) } m_configs[CONFIG_ADDON_CHANNEL] = sConfig.GetBoolDefault("AddonChannel", true); m_configs[CONFIG_GRID_UNLOAD] = sConfig.GetBoolDefault("GridUnload", true); - m_configs[CONFIG_INTERVAL_SAVE] = sConfig.GetIntDefault("PlayerSaveInterval", 900000); + m_configs[CONFIG_INTERVAL_SAVE] = sConfig.GetIntDefault("PlayerSaveInterval", 15 * MINUTE * IN_MILISECONDS); - m_configs[CONFIG_INTERVAL_GRIDCLEAN] = sConfig.GetIntDefault("GridCleanUpDelay", 300000); + m_configs[CONFIG_INTERVAL_GRIDCLEAN] = sConfig.GetIntDefault("GridCleanUpDelay", 5 * MINUTE * IN_MILISECONDS); if(m_configs[CONFIG_INTERVAL_GRIDCLEAN] < MIN_GRID_DELAY) { sLog.outError("GridCleanUpDelay (%i) must be greater %u. Use this minimal value.",m_configs[CONFIG_INTERVAL_GRIDCLEAN],MIN_GRID_DELAY); @@ -572,7 +572,7 @@ void World::LoadConfigSettings(bool reload) if(reload) MapManager::Instance().SetMapUpdateInterval(m_configs[CONFIG_INTERVAL_MAPUPDATE]); - m_configs[CONFIG_INTERVAL_CHANGEWEATHER] = sConfig.GetIntDefault("ChangeWeatherInterval", 600000); + m_configs[CONFIG_INTERVAL_CHANGEWEATHER] = sConfig.GetIntDefault("ChangeWeatherInterval", 10 * MINUTE * IN_MILISECONDS); if(reload) { @@ -764,7 +764,7 @@ void World::LoadConfigSettings(bool reload) m_configs[CONFIG_CAST_UNSTUCK] = sConfig.GetBoolDefault("CastUnstuck", true); m_configs[CONFIG_INSTANCE_RESET_TIME_HOUR] = sConfig.GetIntDefault("Instance.ResetTimeHour", 4); - m_configs[CONFIG_INSTANCE_UNLOAD_DELAY] = sConfig.GetIntDefault("Instance.UnloadDelay", 1800000); + m_configs[CONFIG_INSTANCE_UNLOAD_DELAY] = sConfig.GetIntDefault("Instance.UnloadDelay", 30 * MINUTE * IN_MILISECONDS); m_configs[CONFIG_MAX_PRIMARY_TRADE_SKILL] = sConfig.GetIntDefault("MaxPrimaryTradeSkill", 2); m_configs[CONFIG_MIN_PETITION_SIGNS] = sConfig.GetIntDefault("MinPetitionSigns", 9); @@ -932,7 +932,7 @@ void World::LoadConfigSettings(bool reload) m_configs[CONFIG_BATTLEGROUND_INVITATION_TYPE] = sConfig.GetIntDefault ("Battleground.InvitationType", 0); m_configs[CONFIG_BATTLEGROUND_PREMATURE_FINISH_TIMER] = sConfig.GetIntDefault ("BattleGround.PrematureFinishTimer", 5 * MINUTE * IN_MILISECONDS); m_configs[CONFIG_BATTLEGROUND_PREMADE_GROUP_WAIT_FOR_MATCH] = sConfig.GetIntDefault ("BattleGround.PremadeGroupWaitForMatch", 30 * MINUTE * IN_MILISECONDS); - m_configs[CONFIG_ARENA_MAX_RATING_DIFFERENCE] = sConfig.GetIntDefault ("Arena.MaxRatingDifference", 100); + m_configs[CONFIG_ARENA_MAX_RATING_DIFFERENCE] = sConfig.GetIntDefault ("Arena.MaxRatingDifference", 150); m_configs[CONFIG_ARENA_RATING_DISCARD_TIMER] = sConfig.GetIntDefault ("Arena.RatingDiscardTimer", 10 * MINUTE * IN_MILISECONDS); m_configs[CONFIG_ARENA_AUTO_DISTRIBUTE_POINTS] = sConfig.GetBoolDefault("Arena.AutoDistributePoints", false); m_configs[CONFIG_ARENA_AUTO_DISTRIBUTE_INTERVAL_DAYS] = sConfig.GetIntDefault ("Arena.AutoDistributeInterval", 7); diff --git a/src/mangosd/mangosd.conf.dist.in b/src/mangosd/mangosd.conf.dist.in index 268d81457..a6a7f29bd 100644 --- a/src/mangosd/mangosd.conf.dist.in +++ b/src/mangosd/mangosd.conf.dist.in @@ -94,7 +94,7 @@ BindIP = "0.0.0.0" # # SocketSelectTime # Socket select time (in milliseconds) -# Default: 10000 +# Default: 10000 (10 secs) # # GridCleanUpDelay # Grid clean up delay (in milliseconds) @@ -115,8 +115,8 @@ BindIP = "0.0.0.0" # vmap.enableLOS # vmap.enableHeight # Enable/Disable VMmap support for line of sight and height calculation -# Default: 1 (true) -# 0 (false) +# Default: 0 (disable) +# 1 (enable) # # vmap.ignoreMapIds # Map id that will be ignored by VMaps @@ -504,7 +504,7 @@ LogColors = "" # # Instance.UnloadDelay # Unload the instance map from memory after some time if no players are inside. -# Default: 1800000 (miliseconds, i.e 30 minutes) +# Default: 1800000 (miliseconds 30 minutes) # 0 (instance maps are kept in memory until they are reset) # # Quests.LowLevelHideDiff @@ -841,7 +841,7 @@ Channel.SilentlyGMJoin = 0 # 1 (enable) # # GM.InGMList -# Is GM showed in GM list (if visible) in non-GM state (.gmoff) +# Is GM showed in GM list (if visible) in non-GM state (.gm off) # Default: 0 (false) # 1 (true) # @@ -866,8 +866,8 @@ Channel.SilentlyGMJoin = 0 # # GM.AllowAchievementGain # If enabled it allows gaining achievements for GM characters -# Default: 0 (disable) -# 1 (enable) (default) +# Default: 1 (enable) +# 0 (disable) # ################################################################################################################### @@ -1052,7 +1052,7 @@ Visibility.Distance.Grey.Object = 10 # # Death.Bones.World # Death.Bones.BattlegroundOrArena -# Enabled/disabled creating bones instead corpse at resurrection (in normal zones/instacnes, or battleground/arenas) +# Enable/disable creating bones instead corpse at resurrection (in normal zones/instacnes, or battleground/arenas) # Default: 1 (enabled) # 0 (disabled) # @@ -1116,19 +1116,19 @@ Death.Bones.BattlegroundOrArena = 1 # BATTLEGROUND CONFIG # # Battleground.CastDeserter -# Cast or not Deserter spell at player who leave battleground in progress -# Default: 1 (true) -# 0 (false) +# Cast Deserter spell at player who leave battleground in progress +# Default: 1 (enable) +# 0 (disable) # # Battleground.QueueAnnouncer.Enable # Enable queue announcer posting to chat -# Default: 0 (false) -# 1 (true) +# Default: 0 (disable) +# 1 (enable) # # Battleground.QueueAnnouncer.PlayerOnly # Enable queue announcer posting to chat -# Default: 0 (false) -# 1 (true) +# Default: 0 (disable) +# 1 (enable) # # Battleground.InvitationType # Set Battleground invitation type @@ -1160,7 +1160,7 @@ BattleGround.PremadeGroupWaitForMatch = 1800000 # # Arena.MaxRatingDifference # The maximum rating difference between two groups in rated matches -# Default: 100 (enable, recommended) +# Default: 150 (enable, recommended) # 0 (disable, rating difference is discarded) # # Arena.RatingDiscardTimer @@ -1168,7 +1168,7 @@ BattleGround.PremadeGroupWaitForMatch = 1800000 # rating information will be discarded when selecting teams for matches # also initiates an update by this timer # Default: 600000 (10 minutes, recommended) -# 0 (disable, DO NOT USE - it will cause lags) +# 0 (disable) # # Arena.AutoDistributePoints # Set if arena points should be distributed automatically, or by GM command @@ -1182,8 +1182,8 @@ BattleGround.PremadeGroupWaitForMatch = 1800000 # # Arena.QueueAnnouncer.Enable # Enable bg queue announcer posting to chat -# Default: 0 (false) -# 1 (true) +# Default: 0 (disable) +# 1 (enable) # # Arena.ArenaSeason.ID # Current area season id show in client @@ -1196,7 +1196,7 @@ BattleGround.PremadeGroupWaitForMatch = 1800000 # ################################################################################################################### -Arena.MaxRatingDifference = 100 +Arena.MaxRatingDifference = 150 Arena.RatingDiscardTimer = 600000 Arena.AutoDistributePoints = 0 Arena.AutoDistributeInterval = 7 diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index b3a576dcd..636d96466 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "7382" + #define REVISION_NR "7383" #endif // __REVISION_NR_H__