diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/BattleGround.cpp | 2 | ||||
| -rw-r--r-- | src/game/World.cpp | 1 | ||||
| -rw-r--r-- | src/game/World.h | 1 | ||||
| -rw-r--r-- | src/trinitycore/trinitycore.conf.dist | 6 |
4 files changed, 9 insertions, 1 deletions
diff --git a/src/game/BattleGround.cpp b/src/game/BattleGround.cpp index 06a4dbd5391..8ca49225597 100644 --- a/src/game/BattleGround.cpp +++ b/src/game/BattleGround.cpp @@ -1954,7 +1954,7 @@ void BattleGround::SetBracket(PvPDifficultyEntry const* bracketEntry) void BattleGround::RewardXPAtKill(Player* plr, Player* victim) { - if (!plr || !victim) + if (!sWorld.getConfig(CONFIG_BG_XP_FOR_KILL) || !plr || !victim) return; uint32 xp = 0; diff --git a/src/game/World.cpp b/src/game/World.cpp index f189a0e8c33..0ef07e143ba 100644 --- a/src/game/World.cpp +++ b/src/game/World.cpp @@ -1050,6 +1050,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_BG_XP_FOR_KILL] = sConfig.GetBoolDefault("Battleground.GiveXPForKills", false); 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); diff --git a/src/game/World.h b/src/game/World.h index 4ff574b42a9..caf9a54d2c4 100644 --- a/src/game/World.h +++ b/src/game/World.h @@ -276,6 +276,7 @@ enum WorldConfigs CONFIG_GUILD_BANK_EVENT_LOG_COUNT, CONFIG_MIN_LEVEL_STAT_SAVE, CONFIG_STATS_SAVE_ONLY_ON_LOGOUT, + CONFIG_BG_XP_FOR_KILL, CONFIG_VALUE_COUNT }; diff --git a/src/trinitycore/trinitycore.conf.dist b/src/trinitycore/trinitycore.conf.dist index 274412fc5dc..e260cdd11cd 100644 --- a/src/trinitycore/trinitycore.conf.dist +++ b/src/trinitycore/trinitycore.conf.dist @@ -1656,6 +1656,11 @@ AutoBroadcast.Timer = 60000 # Default: 1800000 (30 minutes) # 0 - disable (not recommended) # +# Battleground.GiveXPForKills +# Give experience for honorable kills in battlegrounds +# Default: 0 (disable) +# 1 (enable) +# ############################################################################### Battleground.CastDeserter = 1 @@ -1664,6 +1669,7 @@ Battleground.QueueAnnouncer.PlayerOnly = 0 Battleground.InvitationType = 0 BattleGround.PrematureFinishTimer = 300000 BattleGround.PremadeGroupWaitForMatch = 1800000 +Battleground.GiveXPForKills = 0 ############################################################################### # ARENA CONFIG |