Merge branch 'ZhengPeiRu21:master' into Rattlecage-Skull-drop-chance

conf/individualProgression.conf.dist

@@ -358,3 +358,19 @@ IndividualProgression.PvPGearRequirements = 1
 #                     1 - Disabled
 #
 IndividualProgression.DisableRDF = 0
+#
+#    IndividualProgression.ExcludeAccounts
+#        Description: Enable or disable the exclusion of accounts from Individual Progression.
+#        This is useful for accounts that are used for bots, testing, or other purposes where progression should not be enforced.
+#        Default:     0 - Disabled
+#                     1 - Enabled
+#
+IndividualProgression.ExcludeAccounts = 0
+#
+#    IndividualProgression.ExcludedAccountsRegex
+#        Description: A regular expression to match account names that should be excluded from Individual Progression.
+#        This is useful for accounts that are used for bots, testing, or other purposes where progression should not be enforced.
+#        Only used if ExcludeAccounts is enabled.
+#        Default:     ""
+#
+IndividualProgression.ExcludedAccountsRegex = ""

sql/world/base/professions.sql

@@ -864,7 +864,8 @@ INSERT INTO `npc_trainer` (`ID`, `SpellID`, `MoneyCost`, `ReqSkillLine`, `ReqSki
 (4212, -380002, 0, 0, 0, 0);
 
 -- Master Leatherworking Trainer
-INSERT INTO `npc_trainer` (`ID`, `SpellID`, `MoneyCost`, `ReqSkillLine`, `ReqSkillRank`, `ReqLevel`) VALUES (18754, -201028, 0, 0, 0, 0);
+INSERT INTO `npc_trainer` (`ID`, `SpellID`, `MoneyCost`, `ReqSkillLine`, `ReqSkillRank`, `ReqLevel`) VALUES 
+(18754, -201028, 0, 0, 0, 0),
 (18771, -201028, 0, 0, 0, 0),
 (19187, -201028, 0, 0, 0, 0),
 (21087, -201028, 0, 0, 0, 0),

sql/world/base/zone_eversong_woods.sql

@@ -5,7 +5,9 @@ INSERT INTO `creature_questender` (`id`, `quest`) VALUES (15283, 8344);
 -- Windows to the Source (Warlock)
 DELETE FROM `creature_queststarter` WHERE `id`=15283 AND `quest`=8344;
 INSERT INTO `creature_queststarter` (`id`, `quest`) VALUES (15283, 8344);
-INSERT INTO creature_loot_template (Entry, Item, Reference, Chance, QuestRequired, LootMode, GroupId, MinCount, MaxCount, Comment) VALUES
+
+DELETE FROM `creature_loot_template` WHERE `Entry`= 15298 AND `Item`=20935;
+INSERT INTO `creature_loot_template` (Entry, Item, Reference, Chance, QuestRequired, LootMode, GroupId, MinCount, MaxCount, Comment) VALUES
 (15298, 20935, 0, 80, 1, 1, 0, 1, 1, 'Tainted Arcane Wraith - Tainted Wraith Essence');
 
  -- Kanaria <First Aid Trainer> 

src/IndividualProgression.cpp

@@ -315,6 +315,8 @@ private:
         sIndividualProgression->LoadCustomProgressionEntries(sConfigMgr->GetOption<std::string>("IndividualProgression.CustomProgression", ""));
         sIndividualProgression->earlyDungeonSet2 = sConfigMgr->GetOption<bool>("IndividualProgression.AllowEarlyDungeonSet2", true);
         sIndividualProgression->pvpGearRequirements = sConfigMgr->GetOption<bool>("IndividualProgression.PvPGearRequirements", true);
+        sIndividualProgression->excludeAccounts = sConfigMgr->GetOption<bool>("IndividualProgression.ExcludeAccounts", false);
+        sIndividualProgression->excludedAccountsRegex = sConfigMgr->GetOption<std::string>("IndividualProgression.ExcludedAccountsRegex", "");
     }
 
     static void LoadXpValues()

src/IndividualProgression.h

@@ -16,6 +16,7 @@
 #include "QuestDef.h"
 #include "GameObject.h"
 #include "IWorld.h"
+#include <regex>
 
 typedef std::unordered_map<uint32, uint32> questXpMapType;
 
@@ -180,8 +181,9 @@ public:
     std::map<uint32, uint8> customProgressionMap;
     questXpMapType questXpMap;
     float vanillaPowerAdjustment, vanillaHealthAdjustment, tbcPowerAdjustment, tbcHealthAdjustment, vanillaHealingAdjustment, tbcHealingAdjustment, previousGearTuning;
-    bool enabled, questXpFix, hunterPetLevelFix, requirePreAQQuests, enforceGroupRules, fishingFix, simpleConfigOverride, questMoneyAtLevelCap, repeatableVanillaQuestsXp, disableDefaultProgression, earlyDungeonSet2, requireNaxxStrath, pvpGearRequirements;
+    bool enabled, questXpFix, hunterPetLevelFix, requirePreAQQuests, enforceGroupRules, fishingFix, simpleConfigOverride, questMoneyAtLevelCap, repeatableVanillaQuestsXp, disableDefaultProgression, earlyDungeonSet2, requireNaxxStrath, pvpGearRequirements, excludeAccounts;
     int progressionLimit, startingProgression, tbcRacesProgressionLevel, deathKnightProgressionLevel, deathKnightStartingProgression;
+    std::string excludedAccountsRegex;
 
     bool hasPassedProgression(Player* player, ProgressionState state) const;
     static bool isBeforeProgression(Player* player, ProgressionState state) ;

src/IndividualProgressionPlayer.cpp

@@ -31,10 +31,11 @@ public:
 
     void OnSetMaxLevel(Player* player, uint32& maxPlayerLevel) override
     {
-        if (!sIndividualProgression->enabled)
+        if (!sIndividualProgression->enabled || isExcludedFromProgression(player))
         {
             return;
         }
+
         if (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_NAXX40))
         {
             if (sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL) > 60)
@@ -86,7 +87,7 @@ public:
     void OnAfterUpdateMaxHealth(Player* player, float& value) override
     {
         // TODO: This should be adjust to use an aura like damage adjustment. This is more robust to update when changing equipment, etc.
-        if (!sIndividualProgression->enabled)
+        if (!sIndividualProgression->enabled || isExcludedFromProgression(player))
         {
             return;
         }
@@ -118,7 +119,7 @@ public:
 
     void OnQuestComputeXP(Player* player, Quest const* quest, uint32& xpValue) override
     {
-        if (!sIndividualProgression->enabled || !sIndividualProgression->questXpFix)
+        if (!sIndividualProgression->enabled || !sIndividualProgression->questXpFix || isExcludedFromProgression(player))
         {
             return;
         }
@@ -135,7 +136,7 @@ public:
 
     void OnGiveXP(Player* player, uint32& amount, Unit* /*victim*/, uint8 xpSource) override
     {
-        if (!sIndividualProgression->enabled)
+        if (!sIndividualProgression->enabled || isExcludedFromProgression(player))
         {
             return;
         }
@@ -159,9 +160,20 @@ public:
         }
     }
 
+    bool isExcludedFromProgression(Player* player)
+    {
+        if(!sIndividualProgression->excludeAccounts) {
+            return false;
+        }
+        std::string accountName;
+        bool accountNameFound = AccountMgr::GetName(player->GetSession()->GetAccountId(), accountName);
+        std::regex excludedAccountsRegex (sIndividualProgression->excludedAccountsRegex);
+        return (accountNameFound && std::regex_match(accountName, excludedAccountsRegex));
+    }
+
     bool OnBeforeTeleport(Player* player, uint32 mapid, float x, float y, float z, float /*orientation*/, uint32 /*options*/, Unit* /*target*/) override
     {
-        if (!sIndividualProgression->enabled || player->IsGameMaster())
+        if (!sIndividualProgression->enabled || player->IsGameMaster() || isExcludedFromProgression(player))
         {
             return true;
         }
@@ -237,7 +249,7 @@ public:
 
     void OnPlayerCompleteQuest(Player* player, Quest const* quest) override
     {
-        if (!sIndividualProgression->enabled)
+        if (!sIndividualProgression->enabled || isExcludedFromProgression(player))
         {
             return;
         }
@@ -264,7 +276,7 @@ public:
 
     bool CanGroupInvite(Player* player, std::string& membername) override
     {
-        if (!sIndividualProgression->enabled || !sIndividualProgression->enforceGroupRules)
+        if (!sIndividualProgression->enabled || !sIndividualProgression->enforceGroupRules || isExcludedFromProgression(player))
         {
             return true;
         }
@@ -276,7 +288,7 @@ public:
 
     bool CanGroupAccept(Player* player, Group* group) override
     {
-        if (!sIndividualProgression->enabled || !sIndividualProgression->enforceGroupRules)
+        if (!sIndividualProgression->enabled || !sIndividualProgression->enforceGroupRules || isExcludedFromProgression(player))
         {
             return true;
         }
@@ -309,7 +321,7 @@ public:
 
     bool OnUpdateFishingSkill(Player* /*player*/, int32 /*skill*/, int32 /*zone_skill*/, int32 chance, int32 roll) override
     {
-        if (!sIndividualProgression->enabled || !sIndividualProgression->fishingFix)
+        if (!sIndividualProgression->enabled || !sIndividualProgression->fishingFix || isExcludedFromProgression(player))
             return true;
         if (chance < roll)
             return false;