resolved merge conflict

This commit is contained in:
zeb
2025-09-18 22:59:15 -04:00
4 changed files with 41 additions and 27 deletions

View File

@@ -19,7 +19,7 @@ Requires an AzerothCore version that is caught up to at least change set 3f46e05
## Usage
Edit the module configuration and **add a character GUID ID to the "AuctionHouseBot.GUIDs"** variable, which is sourced from your character table in the character database. These names will be visable in the auction house, so pick good names. IMPORTANT: If you are using a bot mod (like playerbots), then ensure you use regular non-bot characters for your auctionhouse character(s). After that, ensure you set **AuctionHouseBot.EnableSeller = 1**. Nothing else is required unless you want to tune stuff or enable the buyer bot, which is done with AuctionHouseBot.Buyer.Enabled.
**Before you do anything, make at least one character to use as the bot**. Edit the module configuration and **add 1 or more character GUIDs ID to the "AuctionHouseBot.GUIDs"** variable, which is sourced from your character table in the character database. These names will be visable in the auction house, so pick good names. IMPORTANT: If you are using a bot mod (like playerbots), then ensure you use regular non-bot characters for your auctionhouse character(s). After that, ensure you set **AuctionHouseBot.EnableSeller = true**. Nothing else is required unless you want to tune stuff or enable the buyer bot, which is done with AuctionHouseBot.Buyer.Enabled.
Notes:
- These accounts do not need any security level and can be a player accounts.

File diff suppressed because one or more lines are too long

View File

@@ -52,6 +52,7 @@ AuctionHouseBot::AuctionHouseBot() :
ListingExpireTimeInSecondsMin(900),
ListingExpireTimeInSecondsMax(86400),
BuyingBotAcceptablePriceModifier(1),
BuyingBotWillBidAgainstPlayers(true),
AHCharactersGUIDsForQuery(""),
ItemsPerCycle(75),
DisabledItemTextFilter(true),
@@ -1028,7 +1029,11 @@ void AuctionHouseBot::addNewAuctionBuyerBotBid(Player* AHBplayer, AHBConfig *con
return;
}
QueryResult result = CharacterDatabase.Query("SELECT id FROM auctionhouse WHERE itemowner NOT IN ({}) AND buyguid NOT IN ({})", AHCharactersGUIDsForQuery, AHCharactersGUIDsForQuery);
// Pull auctions.
string queryString = "SELECT id FROM auctionhouse WHERE itemowner NOT IN ({}) AND buyguid NOT IN ({})";
if (BuyingBotWillBidAgainstPlayers == false)
queryString = "SELECT id FROM auctionhouse WHERE itemowner NOT IN ({}) AND buyguid NOT IN ({}) AND lastbid = 0";
QueryResult result = CharacterDatabase.Query(queryString, AHCharactersGUIDsForQuery, AHCharactersGUIDsForQuery);
if (!result)
return;
@@ -1302,6 +1307,7 @@ void AuctionHouseBot::InitializeConfiguration()
PreventOverpayingForVendorItems = sConfigMgr->GetOption<bool>("AuctionHouseBot.Buyer.PreventOverpayingForVendorItems", true);
if (PreventOverpayingForVendorItems)
populateVendorItemsPrices();
BuyingBotWillBidAgainstPlayers = sConfigMgr->GetOption<bool>("AuctionHouseBot.Buyer.BidAgainstPlayers", true);
// Stack Ratios
RandomStackRatioConsumable = GetRandomStackValue("AuctionHouseBot.ListingStack.RandomRatio.Consumable", 50);

View File

@@ -132,6 +132,7 @@ private:
uint32 ListingExpireTimeInSecondsMin;
uint32 ListingExpireTimeInSecondsMax;
float BuyingBotAcceptablePriceModifier;
bool BuyingBotWillBidAgainstPlayers;
std::vector<uint32> vendorItemsPrices;
std::string AHCharactersGUIDsForQuery;
uint32 ItemsPerCycle;