ll ![gameobject] command to add GO to skip loot list, ll -[gameobject…

…] to remove
celguar · Dec 4, 2023 · b1a06c8 · b1a06c8
1 parent 0321abf
commit b1a06c8
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 6 deletions.
diff --git a/playerbot/LootObjectStack.cpp b/playerbot/LootObjectStack.cpp
@@ -119,6 +119,9 @@ void LootObject::Refresh(Player* bot, ObjectGuid guid)
             return;
 
         uint32 goId = go->GetGOInfo()->id;
+        set<uint32>& skipGoLootList = ai->GetAiObjectContext()->GetValue<set<uint32>& >("skip go loot list")->Get();
+        if (skipGoLootList.find(goId) != skipGoLootList.end()) return;
+
         uint32 lockId = go->GetGOInfo()->GetLockId();
         LockEntry const *lockInfo = sLockStore.LookupEntry(lockId);
         if (!lockInfo)

diff --git a/playerbot/strategy/actions/LootStrategyAction.cpp b/playerbot/strategy/actions/LootStrategyAction.cpp
@@ -16,6 +16,7 @@ bool LootStrategyAction::Execute(Event& event)
     LootObjectStack* lootItems = AI_VALUE(LootObjectStack*, "available loot");
     set<uint32>& alwaysLootItems = AI_VALUE(set<uint32>&, "always loot list");
     set<uint32>& skipLootItems = AI_VALUE(set<uint32>&, "skip loot list");
+    set<uint32>& skipGoLootList = AI_VALUE(set<uint32>&, "skip go loot list");
 
     if (strategy == "?")
     {
@@ -28,6 +29,7 @@ bool LootStrategyAction::Execute(Event& event)
 
         TellLootList(requester, "always loot list");
         TellLootList(requester, "skip loot list");
+        TellGoList(requester, "skip go loot list");
     }
     else if (strategy == "clear")
     {
@@ -39,8 +41,9 @@ bool LootStrategyAction::Execute(Event& event)
     else
     {
         set<string> itemQualifiers = chat->parseItemQualifiers(strategy);
+        list<ObjectGuid> gos = chat->parseGameobjects(strategy);
 
-        if (itemQualifiers.size() == 0)
+        if (itemQualifiers.size() == 0 && gos.size() == 0)
         {
             SET_AI_VALUE(string, "loot strategy", strategy);
 
@@ -96,13 +99,34 @@ bool LootStrategyAction::Execute(Event& event)
                 alwaysLootItems.insert(itemid);
                 changes = true;
             }
+        }
+
+        for (list<ObjectGuid>::iterator i = gos.begin(); i != gos.end(); ++i)
+        {
+            GameObject *go = ai->GetGameObject(*i);
+            if (!go) continue;
+            uint32 goId = go->GetGOInfo()->id;
 
-            if (changes)
+            if (remove || add)
             {
-                TellLootList(requester, "always loot list");
-                TellLootList(requester, "skip loot list");
-                AI_VALUE(LootObjectStack*, "available loot")->Clear();
+                set<uint32>::iterator j = skipGoLootList.find(goId);
+                if (j != skipGoLootList.end()) skipGoLootList.erase(j);
+                changes = true;
             }
+
+            if (ignore)
+            {
+                skipGoLootList.insert(goId);
+                changes = true;
+            }
+        }
+
+        if (changes)
+        {
+            TellLootList(requester, "always loot list");
+            TellLootList(requester, "skip loot list");
+            TellGoList(requester, "skip go loot list");
+            AI_VALUE(LootObjectStack*, "available loot")->Clear();
         }
     }
 
@@ -127,4 +151,22 @@ void LootStrategyAction::TellLootList(Player* requester, const string& name)
     }
 
     ai->TellPlayer(requester, out);
-}
+}
+
+void LootStrategyAction::TellGoList(Player* requester, const string& name)
+{
+    set<uint32>& skipGoItems = AI_VALUE(set<uint32>&, name);
+    ostringstream out;
+    out << "My " << name << ":";
+
+    for (set<uint32>::iterator i = skipGoItems.begin(); i != skipGoItems.end(); i++)
+    {
+        uint32 id = *i;
+        GameObjectInfo const *proto = sGOStorage.LookupEntry<GameObjectInfo>(id);
+        if (!proto)
+            continue;
+
+        out << " |cFFFFFF00|Hfound:" << 0 << ":" << id << ":" <<  "|h[" << proto->name << "]|h|r";
+    }
+    ai->TellPlayer(requester, out);
+}
diff --git a/playerbot/strategy/actions/LootStrategyAction.h b/playerbot/strategy/actions/LootStrategyAction.h
@@ -12,5 +12,6 @@ namespace ai
 
     private:
         void TellLootList(Player* requester, const string& name);
+        void TellGoList(Player* requester, const string& name);
     };
 }
diff --git a/playerbot/strategy/values/ValueContext.h b/playerbot/strategy/values/ValueContext.h
@@ -184,6 +184,7 @@ namespace ai
             creators["should loot object"] = &ValueContext::should_loot_object;
             creators["always loot list"] = &ValueContext::always_loot_list;
             creators["skip loot list"] = &ValueContext::skip_loot_list;
+            creators["skip go loot list"] = &ValueContext::skip_go_loot_list;
             creators["loot strategy"] = &ValueContext::loot_strategy;
             creators["active rolls"] = &ValueContext::active_rolls;
             creators["last movement"] = &ValueContext::last_movement;
@@ -459,6 +460,7 @@ namespace ai
         static UntypedValue* should_loot_object(PlayerbotAI* ai) { return new ShouldLootObject(ai); }
         static UntypedValue* always_loot_list(PlayerbotAI* ai) { return new AlwaysLootListValue(ai, "always loot list"); }
         static UntypedValue* skip_loot_list(PlayerbotAI* ai) { return new AlwaysLootListValue(ai, "skip loot list"); }
+        static UntypedValue* skip_go_loot_list(PlayerbotAI* ai) { return new AlwaysLootListValue(ai, "skip go loot list"); }
         static UntypedValue* loot_strategy(PlayerbotAI* ai) { return new LootStrategyValue(ai); }
         static UntypedValue* active_rolls(PlayerbotAI* ai) { return new ActiveRolls(ai); }