Merge pull request liyunfan1223#463 from liyunfan1223/rewrite-equip-s…

…core2 Rewrite item score calculation for gear initialization
AthenaSui · Aug 11, 2024 · fa7bcba · fa7bcba
2 parents b847417 + 32d2ac5
commit fa7bcba
Show file tree

Hide file tree

Showing 17 changed files with 1,526 additions and 1,149 deletions.
diff --git a/conf/playerbots.conf.dist b/conf/playerbots.conf.dist
@@ -519,13 +519,13 @@ AiPlayerbot.MinEnchantingBotLevel = 60
 
 # Enable expansion limitation for enchants - ie: level <= 60 bot only uses enchants
 # available in vanilla, level <= 70 bot only uses enchants available in TBC)
-# Default: 0
-AiPlayerbot.LimitEnchantExpansion = 0
+# Default: 1
+AiPlayerbot.LimitEnchantExpansion = 1
 
 # Enable expansion limitation for gear - ie: level <= 60 bot only uses gear
 # available in vanilla, level <= 70 bot only uses gear available in TBC)
-# Default: 0
-AiPlayerbot.LimitGearExpansion = 0
+# Default: 1
+AiPlayerbot.LimitGearExpansion = 1
 
 # Change random bot has lower gear
 AiPlayerbot.RandomGearLoweringChance = 0

diff --git a/src/PlayerbotAI.cpp b/src/PlayerbotAI.cpp
@@ -1677,7 +1677,7 @@ bool PlayerbotAI::IsTank(Player* player)
     switch (player->getClass())
     {
         case CLASS_DEATH_KNIGHT:
-            if (tab == DEATHKNIGT_TAB_BLOOD)
+            if (tab == DEATHKNIGHT_TAB_BLOOD)
             {
                 return true;
             }
@@ -1781,7 +1781,7 @@ bool PlayerbotAI::IsDps(Player* player)
             }
             break;
         case CLASS_DEATH_KNIGHT:
-            if (tab != DEATHKNIGT_TAB_BLOOD)
+            if (tab != DEATHKNIGHT_TAB_BLOOD)
             {
                 return true;
             }

diff --git a/src/PlayerbotAI.h b/src/PlayerbotAI.h
@@ -233,11 +233,11 @@ enum PRIEST_TABS
     PRIEST_TAB_SHADOW,
 };
 
-enum DEATHKNIGT_TABS
+enum DEATHKNIGHT_TABS
 {
-    DEATHKNIGT_TAB_BLOOD,
-    DEATHKNIGT_TAB_FROST,
-    DEATHKNIGT_TAB_UNHOLY,
+    DEATHKNIGHT_TAB_BLOOD,
+    DEATHKNIGHT_TAB_FROST,
+    DEATHKNIGHT_TAB_UNHOLY,
 };
 
 enum DRUID_TABS

diff --git a/src/PlayerbotAIConfig.cpp b/src/PlayerbotAIConfig.cpp
@@ -343,8 +343,8 @@ bool PlayerbotAIConfig::Initialize()
     randombotsWalkingRPG = sConfigMgr->GetOption<bool>("AiPlayerbot.RandombotsWalkingRPG", false);
     randombotsWalkingRPGInDoors = sConfigMgr->GetOption<bool>("AiPlayerbot.RandombotsWalkingRPG.InDoors", false);
     minEnchantingBotLevel = sConfigMgr->GetOption<int32>("AiPlayerbot.MinEnchantingBotLevel", 60);
-    limitEnchantExpansion = sConfigMgr->GetOption<int32>("AiPlayerbot.LimitEnchantExpansion", 0);
-    limitGearExpansion = sConfigMgr->GetOption<int32>("AiPlayerbot.LimitGearExpansion", 0);
+    limitEnchantExpansion = sConfigMgr->GetOption<int32>("AiPlayerbot.LimitEnchantExpansion", 1);
+    limitGearExpansion = sConfigMgr->GetOption<int32>("AiPlayerbot.LimitGearExpansion", 1);
     randombotStartingLevel = sConfigMgr->GetOption<int32>("AiPlayerbot.RandombotStartingLevel", 5);
     enableRotation = sConfigMgr->GetOption<bool>("AiPlayerbot.EnableRotation", false);
     rotationPoolSize = sConfigMgr->GetOption<int32>("AiPlayerbot.RotationPoolSize", 500);