feat(Core/Conf/BG): allow battlegrounds to be more configurable (azer…

…othcore#20320)
valsan-azerty-boi · Jan 9, 2025 · 594fb62 · 594fb62
1 parent 4411b4a
commit 594fb62
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/src/server/apps/worldserver/worldserver.conf.dist b/src/server/apps/worldserver/worldserver.conf.dist
@@ -3738,8 +3738,8 @@ Battleground.Alterac.Reinforcements = 600
 #    Battleground.Alterac.ReputationOnBossDeath
 #        Description: Set the number of rep point given for a boss killed in Alterac battleground
 #                     (It is necessary to restart the server after changing the ReputationOnBossDeath value)
-#        Default:     350 (Enabled, Blizzlike)
-#                     389 (Enabled, Vanilla like)
+#        Default:     350 (Blizzlike)
+#                     389 (Vanilla like)
 
 Battleground.Alterac.ReputationOnBossDeath = 350
 

diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp
@@ -479,7 +479,7 @@ void BattlegroundAB::Init()
     _capturePointInfo[BG_AB_NODE_LUMBER_MILL]._iconCapture = BG_AB_OP_LUMBERMILL_STATE_ALIENCE;
     _capturePointInfo[BG_AB_NODE_GOLD_MINE]._iconCapture = BG_AB_OP_GOLDMINE_STATE_ALIENCE;
 
-    int bgArathiCapturePointsConfig = sWorld->getIntConfig(CONFIG_BATTLEGROUND_ARATHI_CAPTUREPOINTS);
+    uint32 bgArathiCapturePointsConfig = sWorld->getIntConfig(CONFIG_BATTLEGROUND_ARATHI_CAPTUREPOINTS);
     _configurableMaxTeamScore = bgArathiCapturePointsConfig > 0
         ? bgArathiCapturePointsConfig
         : BG_AB_MAX_TEAM_SCORE;

diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp
@@ -362,7 +362,7 @@ void BattlegroundEY::Init()
     _flagState = BG_EY_FLAG_STATE_ON_BASE;
     _flagCapturedObject = 0;
 
-    int bgEyCapturePointsConfig = sWorld->getIntConfig(CONFIG_BATTLEGROUND_EYEOFTHESTORM_CAPTUREPOINTS);
+    uint32 bgEyCapturePointsConfig = sWorld->getIntConfig(CONFIG_BATTLEGROUND_EYEOFTHESTORM_CAPTUREPOINTS);
     _configurableMaxTeamScore = bgEyCapturePointsConfig > 0
         ? bgEyCapturePointsConfig
         : BG_EY_MAX_TEAM_SCORE;

diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp
@@ -498,7 +498,7 @@ void BattlegroundWS::Init()
         _honorEndKills = 2;
     }
 
-    int bgWarsongFlagsConfig = sWorld->getIntConfig(CONFIG_BATTLEGROUND_WARSONG_FLAGS);
+    uint32 bgWarsongFlagsConfig = sWorld->getIntConfig(CONFIG_BATTLEGROUND_WARSONG_FLAGS);
     _configurableMaxTeamScore = bgWarsongFlagsConfig > 0
         ? bgWarsongFlagsConfig
         : BG_WS_MAX_TEAM_SCORE;

diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp
@@ -1174,8 +1174,8 @@ void World::LoadConfigSettings(bool reload)
 
     _int_configs[CONFIG_BATTLEGROUND_WARSONG_FLAGS]                        = sConfigMgr->GetOption<uint32>("Battleground.Warsong.Flags", 3);
     _int_configs[CONFIG_BATTLEGROUND_ARATHI_CAPTUREPOINTS]                 = sConfigMgr->GetOption<uint32>("Battleground.Arathi.CapturePoints", 1600);
-    _int_configs[CONFIG_BATTLEGROUND_ALTERAC_REINFORCEMENTS]               = sConfigMgr->GetOption<int32>("Battleground.Alterac.Reinforcements", 600);
-    _int_configs[CONFIG_BATTLEGROUND_ALTERAC_REP_ONBOSSDEATH]              = sConfigMgr->GetOption<int32>("Battleground.Alterac.ReputationOnBossDeath", 350);
+    _int_configs[CONFIG_BATTLEGROUND_ALTERAC_REINFORCEMENTS]               = sConfigMgr->GetOption<uint32>("Battleground.Alterac.Reinforcements", 600);
+    _int_configs[CONFIG_BATTLEGROUND_ALTERAC_REP_ONBOSSDEATH]              = sConfigMgr->GetOption<uint32>("Battleground.Alterac.ReputationOnBossDeath", 350);
     _int_configs[CONFIG_BATTLEGROUND_EYEOFTHESTORM_CAPTUREPOINTS]          = sConfigMgr->GetOption<uint32>("Battleground.EyeOfTheStorm.CapturePoints", 1600);
 
     _int_configs[CONFIG_ARENA_MAX_RATING_DIFFERENCE]                = sConfigMgr->GetOption<uint32>("Arena.MaxRatingDifference", 150);