diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/Wintergrasp.cpp | 6 | ||||
| -rw-r--r-- | src/game/World.cpp | 3 | ||||
| -rw-r--r-- | src/game/World.h | 3 | ||||
| -rw-r--r-- | src/trinitycore/trinitycore.conf.dist | 11 |
4 files changed, 20 insertions, 3 deletions
diff --git a/src/game/Wintergrasp.cpp b/src/game/Wintergrasp.cpp index 0d30dfb78e0..5172b7f09d6 100644 --- a/src/game/Wintergrasp.cpp +++ b/src/game/Wintergrasp.cpp @@ -127,7 +127,7 @@ bool OPvPWintergrasp::SetupOutdoorPvP() LoadTeamPair(m_creEntryPair, CreatureEntryPair); m_wartime = false; - m_timer = 600000; + m_timer = sWorld.getConfig(CONFIG_OUTDOORPVP_WINTERGRASP_START_TIME) * MINUTE * IN_MILISECONDS; return true; } @@ -407,7 +407,7 @@ bool OPvPWintergrasp::Update(uint32 diff) if(m_wartime) { m_wartime = false; - m_timer = 600000; // for test, should be 2 hour 30 min + m_timer = sWorld.getConfig(CONFIG_OUTDOORPVP_WINTERGRASP_INTERVAL) * MINUTE * IN_MILISECONDS; if(m_defender == TEAM_ALLIANCE) sWorld.SendZoneText(ZONE_WINTERGRASP, "Alliance has successfully defended the fortress!"); else @@ -416,7 +416,7 @@ bool OPvPWintergrasp::Update(uint32 diff) else { m_wartime = true; - m_timer = 30*60*1000; + m_timer = sWorld.getConfig(CONFIG_OUTDOORPVP_WINTERGRASP_BATTLE_TIME) * MINUTE * IN_MILISECONDS; sWorld.SendZoneText(ZONE_WINTERGRASP, "Battle begins!"); UpdateAllWorldObject(); } diff --git a/src/game/World.cpp b/src/game/World.cpp index cf14b846508..89362474f85 100644 --- a/src/game/World.cpp +++ b/src/game/World.cpp @@ -1079,6 +1079,9 @@ void World::LoadConfigSettings(bool reload) m_configs[CONFIG_PVP_TOKEN_COUNT] = sConfig.GetIntDefault("PvPToken.ItemCount", 1); if(m_configs[CONFIG_PVP_TOKEN_COUNT] < 1) m_configs[CONFIG_PVP_TOKEN_COUNT] = 1; + m_configs[CONFIG_OUTDOORPVP_WINTERGRASP_START_TIME] = sConfig.GetIntDefault("OutdoorPvP.Wintergrasp.StartTime", 30); + m_configs[CONFIG_OUTDOORPVP_WINTERGRASP_BATTLE_TIME] = sConfig.GetIntDefault("OutdoorPvP.Wintergrasp.BattleTime", 30); + m_configs[CONFIG_OUTDOORPVP_WINTERGRASP_INTERVAL] = sConfig.GetIntDefault("OutdoorPvP.Wintergrasp.Interval", 150); m_configs[CONFIG_NO_RESET_TALENT_COST] = sConfig.GetBoolDefault("NoResetTalentsCost", false); m_configs[CONFIG_SHOW_KICK_IN_WORLD] = sConfig.GetBoolDefault("ShowKickInWorld", false); m_configs[CONFIG_INTERVAL_LOG_UPDATE] = sConfig.GetIntDefault("RecordUpdateTimeDiffInterval", 60000); diff --git a/src/game/World.h b/src/game/World.h index 92fe74f9b81..3ff814a4d73 100644 --- a/src/game/World.h +++ b/src/game/World.h @@ -225,6 +225,9 @@ enum WorldConfigs CONFIG_PVP_TOKEN_MAP_TYPE, CONFIG_PVP_TOKEN_ID, CONFIG_PVP_TOKEN_COUNT, + CONFIG_OUTDOORPVP_WINTERGRASP_START_TIME, + CONFIG_OUTDOORPVP_WINTERGRASP_BATTLE_TIME, + CONFIG_OUTDOORPVP_WINTERGRASP_INTERVAL, CONFIG_NO_RESET_TALENT_COST, CONFIG_SHOW_KICK_IN_WORLD, CONFIG_INTERVAL_LOG_UPDATE, diff --git a/src/trinitycore/trinitycore.conf.dist b/src/trinitycore/trinitycore.conf.dist index ca6ec3a15d4..c9e184c58f2 100644 --- a/src/trinitycore/trinitycore.conf.dist +++ b/src/trinitycore/trinitycore.conf.dist @@ -1583,6 +1583,14 @@ Ra.Secure = 1 # NoResetTalentsCost # Enable or disable no cost when reseting talents # +# +# OutdoorPvP.Wintergrasp.StartTime = 30 +# The start time of the first battle after server starts (default: 30 minutes) +# OutdoorPvP.Wintergrasp.BattleTime = 30 +# Time limit of a battle +# OutdoorPvP.Wintergrasp.BattleInterval +# Interval between battles (default: 150 minutes) +# # ForbiddenMaps # map ids that users below SEC_GAMEMASTER cannot enter, with delimiter ',' # Default: "" @@ -1624,6 +1632,9 @@ PvPToken.Enable = 0 PvPToken.MapAllowType = 4 PvPToken.ItemID = 29434 PvPToken.ItemCount = 1 +OutdoorPvP.Wintergrasp.StartTime = 30 +OutdoorPvP.Wintergrasp.BattleTime = 30 +OutdoorPvP.Wintergrasp.BattleInterval = 150 NoResetTalentsCost = 0 ShowKickInWorld = 0 RecordUpdateTimeDiffInterval = 60000 |