nchebrov/mod-ah-bot
1
0
Fork 0
mirror of https://github.com/NathanHandley/mod-ah-bot-plus.git synced 2026-01-13 01:08:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add range-based disabled IDs

Browse Source
This commit is contained in:
NathanHandley
2023-12-27 09:33:43 -06:00
parent 1fa58eeb69
commit 941ffc7957
3 changed files with 35 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
conf/mod_ahbot.conf.dist
View File

File diff suppressed because one or more lines are too long

36
src/AuctionHouseBot.cpp
View File

@@ -784,6 +784,18 @@ uint32 AuctionHouseBot::GetRandomStackValue(std::string configKeyString, uint32
return stackValue;
}
void AuctionHouseBot::AddToDisabledItems(std::set<uint32>& workingDisabledItemIDs, uint32 disabledItemID)
{
if (workingDisabledItemIDs.find(disabledItemID) != workingDisabledItemIDs.end())
{
LOG_ERROR("module", "AuctionHouseBot: Duplicate disabled item ID of {} found, skipping", disabledItemID);
}
else
{
workingDisabledItemIDs.insert(disabledItemID);
}
}
std::set<uint32> AuctionHouseBot::LoadDisabledItems(std::string disabledItemIdString)
{
std::string delimitedValue;
@@ -796,14 +808,30 @@ std::set<uint32> AuctionHouseBot::LoadDisabledItems(std::string disabledItemIdSt
std::string valueOne;
std::stringstream itemPairStream(delimitedValue);
itemPairStream >> valueOne;
auto itemId = atoi(valueOne.c_str());
if (disabledItemIDs.find(itemId) != disabledItemIDs.end())
// If it has a hypen, then it's a range of numbers
if (valueOne.find("-") != std::string::npos)
{
LOG_ERROR("module", "AuctionHouseBot: Duplicate disabled item ID of {} found, skipping", itemId);
std::string leftIDString = valueOne.substr(0, valueOne.find("-"));
std::string rightIDString = valueOne.substr(valueOne.find("-")+1);
auto leftId = atoi(leftIDString.c_str());
auto rightId = atoi(rightIDString.c_str());
if (leftId > rightId)
{
LOG_ERROR("module", "AuctionHouseBot: Duplicate disabled item ID range of {} to {} needs to be smallest to largest, skipping", leftId, rightId);
}
else
{
disabledItemIDs.insert(itemId);
for (leftId; leftId <= rightId; ++leftId)
AddToDisabledItems(disabledItemIDs, leftId);
}
}
else
{
auto itemId = atoi(valueOne.c_str());
AddToDisabledItems(disabledItemIDs, itemId);
}
}

2
src/AuctionHouseBot.h
View File

@@ -133,7 +133,6 @@ private:
ObjectGuid::LowType AHBplayerGUID;
uint32 ItemsPerCycle;
bool DisabledItemTextFilter;
std::set<uint32> DisabledItems;
uint32 RandomStackRatioConsumable;
@@ -186,6 +185,7 @@ public:
void InitializeConfiguration();
void LoadValues(AHBConfig*);
uint32 GetRandomStackValue(std::string configKeyString, uint32 defaultValue);
void AddToDisabledItems(std::set<uint32>& workingDisabledItemIDs, uint32 disabledItemID);
std::set<uint32> LoadDisabledItems(std::string disabledItemIdString);
void Commands(uint32 command, uint32 ahMapID, char* args);
ObjectGuid::LowType GetAHBplayerGUID() { return AHBplayerGUID; };