From 3a756f5840541f873022e75304effaabc1e59749 Mon Sep 17 00:00:00 2001 From: bash <31279994+hermensbas@users.noreply.github.com> Date: Mon, 9 Jun 2025 00:27:17 +0200 Subject: [PATCH] Revert "Fixed opening trade window while using DBM or Questie addon (#1363)" This reverts commit dfa87faf5e6eaddaa440197b4b980115bd440a14. --- conf/playerbots.conf.dist | 3 --- src/PlayerbotAIConfig.cpp | 2 -- src/PlayerbotAIConfig.h | 1 - src/strategy/actions/TradeAction.cpp | 5 ++--- 4 files changed, 2 insertions(+), 9 deletions(-) diff --git a/conf/playerbots.conf.dist b/conf/playerbots.conf.dist index 9b159290..fb98c77c 100644 --- a/conf/playerbots.conf.dist +++ b/conf/playerbots.conf.dist @@ -588,9 +588,6 @@ AiPlayerbot.LimitTalentsExpansion = 0 # Default: 1 (enabled) AiPlayerbot.EnableRandomBotTrading = 1 -# Configure message prefixes which will be excluded in analysis in trade action to open trade window -AiPlayerbot.TradeActionExcludedPrefixes = "RPLL_H_,DBMv4,{звезда} Questie,{rt1} Questie" - # # # diff --git a/src/PlayerbotAIConfig.cpp b/src/PlayerbotAIConfig.cpp index 237b75a9..326e2f5c 100644 --- a/src/PlayerbotAIConfig.cpp +++ b/src/PlayerbotAIConfig.cpp @@ -484,8 +484,6 @@ bool PlayerbotAIConfig::Initialize() } randomBotAccountPrefix = sConfigMgr->GetOption("AiPlayerbot.RandomBotAccountPrefix", "rndbot"); - tradeActionExcludedPrefixes = sConfigMgr->GetOption("AiPlayerbot.TradeActionExcludedPrefixes", - "RPLL_H_,DBMv4,{звезда} Questie,{rt1} Questie"); randomBotAccountCount = sConfigMgr->GetOption("AiPlayerbot.RandomBotAccountCount", 0); deleteRandomBotAccounts = sConfigMgr->GetOption("AiPlayerbot.DeleteRandomBotAccounts", false); randomBotGuildCount = sConfigMgr->GetOption("AiPlayerbot.RandomBotGuildCount", 20); diff --git a/src/PlayerbotAIConfig.h b/src/PlayerbotAIConfig.h index b29c6af2..0045d69e 100644 --- a/src/PlayerbotAIConfig.h +++ b/src/PlayerbotAIConfig.h @@ -223,7 +223,6 @@ public: std::string commandPrefix, commandSeparator; std::string randomBotAccountPrefix; - std::string tradeActionExcludedPrefixes; uint32 randomBotAccountCount; bool randomBotRandomPassword; bool deleteRandomBotAccounts; diff --git a/src/strategy/actions/TradeAction.cpp b/src/strategy/actions/TradeAction.cpp index b8adb444..c1388b66 100644 --- a/src/strategy/actions/TradeAction.cpp +++ b/src/strategy/actions/TradeAction.cpp @@ -10,14 +10,13 @@ #include "ItemCountValue.h" #include "ItemVisitors.h" #include "Playerbots.h" -#include bool TradeAction::Execute(Event event) { std::string const text = event.getParam(); - std::vector excludedPrefixes; - LoadListString>(sPlayerbotAIConfig->tradeActionExcludedPrefixes, excludedPrefixes); + // Table with prefixes to be excluded from analysis + static const std::vector excludedPrefixes = {"RPLL_H_"}; // If text starts with any excluded prefix, don't process it further. for (const auto& prefix : excludedPrefixes)