Loot system improvment

conf/playerbots.conf.dist

@@ -288,9 +288,62 @@ AiPlayerbot.TwoRoundsGearInit = 0
 # Default: 0 (disabled)
 AiPlayerbot.FreeMethodLoot = 0
 
-# Bots' loot roll level (0 = pass, 1 = greed, 2 = need)
-# Default: 1 (greed)
-AiPlayerbot.LootRollLevel = 1
+# Bots' loot roll level:
+#   0 = always pass
+#   1 = always greed (legacy default, bots never roll "need")
+#   2 = allow need (recommended with new loot AI)
+#
+# With the new loot AI, bots can correctly decide when an item is really useful.
+# Setting this to 2 lets them use "need" appropriately. Value 1 only does greed,
+# which was the old safe default but bypasses the new decision-making.
+AiPlayerbot.LootRollLevel = 2
+
+# NEED only if the item matches the bot's MAIN spec (stats & armor/weapon type).
+# Off-spec upgrades are automatically downgraded to GREED.
+# Default: 1 (enabled)
+AiPlayerbot.Roll.SmartNeedBySpec = 1
+
+# Bind-on-Equip etiquette: GREED by default to keep it tradeable.
+# Set to 1 to allow NEED on BoE if it's a clear upgrade.
+# Default: 1 (enabled)
+AiPlayerbot.Roll.AllowBoENeedIfUpgrade = 1
+
+# Bind-on-Use etiquette: GREED by default to keep it tradeable.
+# Set to 1 to allow NEED on BoU if it's a clear upgrade.
+# Default: 1 (enabled)
+AiPlayerbot.Roll.AllowBoUNeedIfUpgrade = 1
+
+# If Need-Before-Greed is active and the item is only useful for disenchanting,
+# bots will press the "Disenchant" button instead of GREED.
+# Default: 1 (enabled)
+AiPlayerbot.Roll.UseDEButton = 1
+
+# NEED on learnable profession recipes/patterns/books if the bot has the profession.
+# Default: 1 (enabled)
+AiPlayerbot.Roll.NeedOnProfessionRecipes = 1
+
+# Ignore required skill rank when deciding NEED on profession recipes (not recommended for strict etiquette).
+# Default: 0 (disabled)
+AiPlayerbot.Roll.Recipes.IgnoreSkillRank = 0
+
+# Cross-armor rule (cloth/leather/mail on a plate user, etc.):
+# Allow NEED only if newScore >= CrossArmorExtraMargin * bestEquippedScore.
+# Default: 1.20 (conservative). Use 9.99 to effectively forbid cross-armor NEED.
+AiPlayerbot.Roll.CrossArmorExtraMargin = 1.20
+
+# Cross-armor policy: when an off-armor (lower tier) item is not primary, should bots PASS instead of GREED?
+# false (0): cross-armor -> GREED (default, legacy behavior)
+# true (1): cross-armor -> PASS (bots won't roll at all on off-armor)
+# Default: 0 (false)
+AiPlayerbot.Roll.CrossArmorGreedIsPass = 0
+
+# Minimum item level delta to treat a SET TOKEN as a real upgrade (0 means >=).
+# Prevents NEED on same-tier duplicates.
+# Example: Paladin Prot with chest ilvl 232:
+#  - “Trophy of the Crusade” (ilvl 245) => NEED allowed.
+#  - Token ilvl 232 with TokenILevelMargin=0.1 => GREED (no same-tier NEED).
+# Default: 0.1
+AiPlayerbot.Roll.TokenILevelMargin = 0.1
 
 #
 #

src/PlayerbotAIConfig.cpp

@@ -610,6 +610,15 @@ bool PlayerbotAIConfig::Initialize()
     autoPickReward = sConfigMgr->GetOption<std::string>("AiPlayerbot.AutoPickReward", "yes");
     autoEquipUpgradeLoot = sConfigMgr->GetOption<bool>("AiPlayerbot.AutoEquipUpgradeLoot", true);
     equipUpgradeThreshold = sConfigMgr->GetOption<float>("AiPlayerbot.EquipUpgradeThreshold", 1.1f);
+    allowBoENeedIfUpgrade = sConfigMgr->GetOption<bool>("AiPlayerbot.Roll.AllowBoENeedIfUpgrade", true);
+    allowBoUNeedIfUpgrade = sConfigMgr->GetOption<bool>("AiPlayerbot.Roll.AllowBoUNeedIfUpgrade", true);
+    crossArmorExtraMargin = sConfigMgr->GetOption<float>("AiPlayerbot.Roll.CrossArmorExtraMargin", 1.20f);
+    crossArmorGreedIsPass = sConfigMgr->GetOption<bool>("AiPlayerbot.Roll.CrossArmorGreedIsPass", false);
+    useDEButton = sConfigMgr->GetOption<bool>("AiPlayerbot.Roll.UseDEButton", true);
+    tokenILevelMargin = sConfigMgr->GetOption<float>("AiPlayerbot.Roll.TokenILevelMargin", 0.10f);
+    needOnProfessionRecipes = sConfigMgr->GetOption<bool>("AiPlayerbot.Roll.NeedOnProfessionRecipes", true);
+    recipesIgnoreSkillRank   = sConfigMgr->GetOption<bool>("AiPlayerbot.Roll.Recipes.IgnoreSkillRank", false);
+    smartNeedBySpec = sConfigMgr->GetOption<bool>("AiPlayerbot.Roll.SmartNeedBySpec", true);
     twoRoundsGearInit = sConfigMgr->GetOption<bool>("AiPlayerbot.TwoRoundsGearInit", false);
     syncQuestWithPlayer = sConfigMgr->GetOption<bool>("AiPlayerbot.SyncQuestWithPlayer", true);
     syncQuestForPlayer = sConfigMgr->GetOption<bool>("AiPlayerbot.SyncQuestForPlayer", false);

src/PlayerbotAIConfig.h

@@ -62,7 +62,7 @@ enum NewRpgStatus : int
 class PlayerbotAIConfig
 {
 public:
-    PlayerbotAIConfig(){};
+    PlayerbotAIConfig() {};
     static PlayerbotAIConfig* instance()
     {
         static PlayerbotAIConfig instance;
@@ -343,6 +343,16 @@ class PlayerbotAIConfig
     std::string autoPickReward;
     bool autoEquipUpgradeLoot;
     float equipUpgradeThreshold;
+    bool allowBoENeedIfUpgrade;  // Loot roll fine-tuning
+    bool allowBoUNeedIfUpgrade;  // Allow NEED on BoU if upgrade
+    float crossArmorExtraMargin;
+    bool crossArmorGreedIsPass;  // If true, off-armor (lower tier) GREED becomes PASS
+    bool useDEButton;              // Allow "Disenchant" on NBG if available
+    float tokenILevelMargin;       // ilvl threshold to consider the token an upgrade
+    bool smartNeedBySpec;          // Intelligent NEED (based on stats/spec)
+    bool needOnProfessionRecipes;  // If true, bots will roll NEED on profession recipes/patterns/books they can use &
+                                   // learn.
+    bool recipesIgnoreSkillRank;   // If true, ignore skill rank requirement when rolling on profession recipes
     bool twoRoundsGearInit;
     bool syncQuestWithPlayer;
     bool syncQuestForPlayer;
@@ -391,25 +401,11 @@ class PlayerbotAIConfig
     int32 addClassCommand;
     int32 addClassAccountPoolSize;
     int32 maintenanceCommand;
-    bool altMaintenanceAttunementQs,
-            altMaintenanceBags,
-            altMaintenanceAmmo,
-            altMaintenanceFood,
-            altMaintenanceReagents,
-            altMaintenanceConsumables,
-            altMaintenancePotions,
-            altMaintenanceTalentTree,
-            altMaintenancePet,
-            altMaintenancePetTalents,
-            altMaintenanceClassSpells,
-            altMaintenanceAvailableSpells,
-            altMaintenanceSkills,
-            altMaintenanceReputation,
-            altMaintenanceSpecialSpells,
-            altMaintenanceMounts,
-            altMaintenanceGlyphs,
-            altMaintenanceKeyring,
-            altMaintenanceGemsEnchants;
+    bool altMaintenanceAttunementQs, altMaintenanceBags, altMaintenanceAmmo, altMaintenanceFood, altMaintenanceReagents,
+        altMaintenanceConsumables, altMaintenancePotions, altMaintenanceTalentTree, altMaintenancePet,
+        altMaintenancePetTalents, altMaintenanceClassSpells, altMaintenanceAvailableSpells, altMaintenanceSkills,
+        altMaintenanceReputation, altMaintenanceSpecialSpells, altMaintenanceMounts, altMaintenanceGlyphs,
+        altMaintenanceKeyring, altMaintenanceGemsEnchants;
     int32 autoGearCommand, autoGearCommandAltBots, autoGearQualityLimit, autoGearScoreLimit;
 
     uint32 useGroundMountAtMinLevel;