feat(Misc): base rework module #57

Winfidonarleyan · 2022-03-19T06:46:24Z

Changes:

...

dedmen · 2023-10-31T12:27:13Z

src/AuctionHouseBot.cpp

+		config->SetMinPrice(ITEM_QUALITY_POOR, minpricegrey);
+		config->SetMaxPrice(ITEM_QUALITY_POOR, maxpricegrey);
+        config->SetMinPrice(ITEM_QUALITY_NORMAL, minpricewhite);
+		config->SetMaxPrice(ITEM_QUALITY_NORMAL, maxpricewhite);
+		config->SetMinPrice(ITEM_QUALITY_UNCOMMON, minpricegreen);
+		config->SetMaxPrice(ITEM_QUALITY_UNCOMMON, maxpricegreen);
+		config->SetMinPrice(ITEM_QUALITY_RARE, minpriceblue);
+		config->SetMaxPrice(ITEM_QUALITY_RARE, maxpriceblue);
+		config->SetMinPrice(ITEM_QUALITY_EPIC, minpricepurple);
+		config->SetMaxPrice(ITEM_QUALITY_EPIC, maxpricepurple);
+		config->SetMinPrice(ITEM_QUALITY_LEGENDARY, minpriceorange);
+		config->SetMaxPrice(ITEM_QUALITY_LEGENDARY, maxpriceorange);
+		config->SetMinPrice(ITEM_QUALITY_ARTIFACT, minpriceyellow);
+		config->SetMaxPrice(ITEM_QUALITY_ARTIFACT, maxpriceyellow);
+
+        // Load min and max bid prices
+		config->SetMinBidPrice(ITEM_QUALITY_POOR, minbidpricegrey);
+		config->SetMaxBidPrice(ITEM_QUALITY_POOR, maxbidpricegrey);
+		config->SetMinBidPrice(ITEM_QUALITY_NORMAL, minbidpricewhite);
+		config->SetMaxBidPrice(ITEM_QUALITY_NORMAL, maxbidpricewhite);
+		config->SetMinBidPrice(ITEM_QUALITY_UNCOMMON, minbidpricegreen);
+		config->SetMaxBidPrice(ITEM_QUALITY_UNCOMMON, maxbidpricegreen);
+		config->SetMinBidPrice(ITEM_QUALITY_RARE, minbidpriceblue);
+		config->SetMaxBidPrice(ITEM_QUALITY_RARE, maxbidpriceblue);
+		config->SetMinBidPrice(ITEM_QUALITY_EPIC, minbidpricepurple);
+		config->SetMaxBidPrice(ITEM_QUALITY_EPIC, maxbidpricepurple);
+		config->SetMinBidPrice(ITEM_QUALITY_LEGENDARY, minbidpriceorange);
+		config->SetMaxBidPrice(ITEM_QUALITY_LEGENDARY, maxbidpriceorange);
+		config->SetMinBidPrice(ITEM_QUALITY_ARTIFACT, minbidpriceyellow);
+		config->SetMaxBidPrice(ITEM_QUALITY_ARTIFACT, maxbidpriceyellow);
+
+        // Load max stacks
+		config->SetMaxStack(ITEM_QUALITY_POOR, maxstackgrey);
+		config->SetMaxStack(ITEM_QUALITY_NORMAL, maxstackwhite);
+		config->SetMaxStack(ITEM_QUALITY_UNCOMMON, maxstackgreen);
+		config->SetMaxStack(ITEM_QUALITY_RARE, maxstackblue);
+		config->SetMaxStack(ITEM_QUALITY_EPIC, maxstackpurple);
+		config->SetMaxStack(ITEM_QUALITY_LEGENDARY, maxstackorange);
+		config->SetMaxStack(ITEM_QUALITY_ARTIFACT, maxstackyellow);


Bad indent

Suggested change

config->SetMinPrice(ITEM_QUALITY_POOR, minpricegrey);

config->SetMaxPrice(ITEM_QUALITY_POOR, maxpricegrey);

config->SetMinPrice(ITEM_QUALITY_NORMAL, minpricewhite);

config->SetMaxPrice(ITEM_QUALITY_NORMAL, maxpricewhite);

config->SetMinPrice(ITEM_QUALITY_UNCOMMON, minpricegreen);

config->SetMaxPrice(ITEM_QUALITY_UNCOMMON, maxpricegreen);

config->SetMinPrice(ITEM_QUALITY_RARE, minpriceblue);

config->SetMaxPrice(ITEM_QUALITY_RARE, maxpriceblue);

config->SetMinPrice(ITEM_QUALITY_EPIC, minpricepurple);

config->SetMaxPrice(ITEM_QUALITY_EPIC, maxpricepurple);

config->SetMinPrice(ITEM_QUALITY_LEGENDARY, minpriceorange);

config->SetMaxPrice(ITEM_QUALITY_LEGENDARY, maxpriceorange);

config->SetMinPrice(ITEM_QUALITY_ARTIFACT, minpriceyellow);

config->SetMaxPrice(ITEM_QUALITY_ARTIFACT, maxpriceyellow);

// Load min and max bid prices

config->SetMinBidPrice(ITEM_QUALITY_POOR, minbidpricegrey);

config->SetMaxBidPrice(ITEM_QUALITY_POOR, maxbidpricegrey);

config->SetMinBidPrice(ITEM_QUALITY_NORMAL, minbidpricewhite);

config->SetMaxBidPrice(ITEM_QUALITY_NORMAL, maxbidpricewhite);

config->SetMinBidPrice(ITEM_QUALITY_UNCOMMON, minbidpricegreen);

config->SetMaxBidPrice(ITEM_QUALITY_UNCOMMON, maxbidpricegreen);

config->SetMinBidPrice(ITEM_QUALITY_RARE, minbidpriceblue);

config->SetMaxBidPrice(ITEM_QUALITY_RARE, maxbidpriceblue);

config->SetMinBidPrice(ITEM_QUALITY_EPIC, minbidpricepurple);

config->SetMaxBidPrice(ITEM_QUALITY_EPIC, maxbidpricepurple);

config->SetMinBidPrice(ITEM_QUALITY_LEGENDARY, minbidpriceorange);

config->SetMaxBidPrice(ITEM_QUALITY_LEGENDARY, maxbidpriceorange);

config->SetMinBidPrice(ITEM_QUALITY_ARTIFACT, minbidpriceyellow);

config->SetMaxBidPrice(ITEM_QUALITY_ARTIFACT, maxbidpriceyellow);

// Load max stacks

config->SetMaxStack(ITEM_QUALITY_POOR, maxstackgrey);

config->SetMaxStack(ITEM_QUALITY_NORMAL, maxstackwhite);

config->SetMaxStack(ITEM_QUALITY_UNCOMMON, maxstackgreen);

config->SetMaxStack(ITEM_QUALITY_RARE, maxstackblue);

config->SetMaxStack(ITEM_QUALITY_EPIC, maxstackpurple);

config->SetMaxStack(ITEM_QUALITY_LEGENDARY, maxstackorange);

config->SetMaxStack(ITEM_QUALITY_ARTIFACT, maxstackyellow);

config->SetMinPrice(ITEM_QUALITY_POOR, minpricegrey);

config->SetMaxPrice(ITEM_QUALITY_POOR, maxpricegrey);

config->SetMinPrice(ITEM_QUALITY_NORMAL, minpricewhite);

config->SetMaxPrice(ITEM_QUALITY_NORMAL, maxpricewhite);

config->SetMinPrice(ITEM_QUALITY_UNCOMMON, minpricegreen);

config->SetMaxPrice(ITEM_QUALITY_UNCOMMON, maxpricegreen);

config->SetMinPrice(ITEM_QUALITY_RARE, minpriceblue);

config->SetMaxPrice(ITEM_QUALITY_RARE, maxpriceblue);

config->SetMinPrice(ITEM_QUALITY_EPIC, minpricepurple);

config->SetMaxPrice(ITEM_QUALITY_EPIC, maxpricepurple);

config->SetMinPrice(ITEM_QUALITY_LEGENDARY, minpriceorange);

config->SetMaxPrice(ITEM_QUALITY_LEGENDARY, maxpriceorange);

config->SetMinPrice(ITEM_QUALITY_ARTIFACT, minpriceyellow);

config->SetMaxPrice(ITEM_QUALITY_ARTIFACT, maxpriceyellow);

// Load min and max bid prices

config->SetMinBidPrice(ITEM_QUALITY_POOR, minbidpricegrey);

config->SetMaxBidPrice(ITEM_QUALITY_POOR, maxbidpricegrey);

config->SetMinBidPrice(ITEM_QUALITY_NORMAL, minbidpricewhite);

config->SetMaxBidPrice(ITEM_QUALITY_NORMAL, maxbidpricewhite);

config->SetMinBidPrice(ITEM_QUALITY_UNCOMMON, minbidpricegreen);

config->SetMaxBidPrice(ITEM_QUALITY_UNCOMMON, maxbidpricegreen);

config->SetMinBidPrice(ITEM_QUALITY_RARE, minbidpriceblue);

config->SetMaxBidPrice(ITEM_QUALITY_RARE, maxbidpriceblue);

config->SetMinBidPrice(ITEM_QUALITY_EPIC, minbidpricepurple);

config->SetMaxBidPrice(ITEM_QUALITY_EPIC, maxbidpricepurple);

config->SetMinBidPrice(ITEM_QUALITY_LEGENDARY, minbidpriceorange);

config->SetMaxBidPrice(ITEM_QUALITY_LEGENDARY, maxbidpriceorange);

config->SetMinBidPrice(ITEM_QUALITY_ARTIFACT, minbidpriceyellow);

config->SetMaxBidPrice(ITEM_QUALITY_ARTIFACT, maxbidpriceyellow);

// Load max stacks

config->SetMaxStack(ITEM_QUALITY_POOR, maxstackgrey);

config->SetMaxStack(ITEM_QUALITY_NORMAL, maxstackwhite);

config->SetMaxStack(ITEM_QUALITY_UNCOMMON, maxstackgreen);

config->SetMaxStack(ITEM_QUALITY_RARE, maxstackblue);

config->SetMaxStack(ITEM_QUALITY_EPIC, maxstackpurple);

config->SetMaxStack(ITEM_QUALITY_LEGENDARY, maxstackorange);

config->SetMaxStack(ITEM_QUALITY_ARTIFACT, maxstackyellow);

dedmen · 2023-10-31T12:28:10Z

src/AuctionHouseBot.cpp

-                AuctionEntry *Aentry = itr->second;
-				Item *item = sAuctionMgr->GetAItem(Aentry->item_guid);
-                if (item)
+				Item* item = sAuctionMgr->GetAItem(auction->item_guid);


Suggested change

Item* item = sAuctionMgr->GetAItem(auction->item_guid);

Item* item = sAuctionMgr->GetAItem(auction->item_guid);

dedmen · 2023-10-31T12:28:49Z

src/AuctionHouseBot.cpp

+        // Load buyer bid prices
+		config->SetBuyerPrice(ITEM_QUALITY_POOR, buyerpricegrey);
+		config->SetBuyerPrice(ITEM_QUALITY_NORMAL, buyerpricewhite);
+		config->SetBuyerPrice(ITEM_QUALITY_UNCOMMON, buyerpricegreen);
+		config->SetBuyerPrice(ITEM_QUALITY_RARE, buyerpriceblue);
+		config->SetBuyerPrice(ITEM_QUALITY_EPIC, buyerpricepurple);
+		config->SetBuyerPrice(ITEM_QUALITY_LEGENDARY, buyerpriceorange);
+		config->SetBuyerPrice(ITEM_QUALITY_ARTIFACT, buyerpriceyellow);
+
+        // Load bidding interval
+		config->SetBiddingInterval(Minutes(buyerbiddinginterval));
+
+        // Load bids per interval
+		config->SetBidsPerInterval(buyerbidsperinterval);
+


Suggested change

// Load buyer bid prices

config->SetBuyerPrice(ITEM_QUALITY_POOR, buyerpricegrey);

config->SetBuyerPrice(ITEM_QUALITY_NORMAL, buyerpricewhite);

config->SetBuyerPrice(ITEM_QUALITY_UNCOMMON, buyerpricegreen);

config->SetBuyerPrice(ITEM_QUALITY_RARE, buyerpriceblue);

config->SetBuyerPrice(ITEM_QUALITY_EPIC, buyerpricepurple);

config->SetBuyerPrice(ITEM_QUALITY_LEGENDARY, buyerpriceorange);

config->SetBuyerPrice(ITEM_QUALITY_ARTIFACT, buyerpriceyellow);

// Load bidding interval

config->SetBiddingInterval(Minutes(buyerbiddinginterval));

// Load bids per interval

config->SetBidsPerInterval(buyerbidsperinterval);

// Load buyer bid prices

config->SetBuyerPrice(ITEM_QUALITY_POOR, buyerpricegrey);

config->SetBuyerPrice(ITEM_QUALITY_NORMAL, buyerpricewhite);

config->SetBuyerPrice(ITEM_QUALITY_UNCOMMON, buyerpricegreen);

config->SetBuyerPrice(ITEM_QUALITY_RARE, buyerpriceblue);

config->SetBuyerPrice(ITEM_QUALITY_EPIC, buyerpricepurple);

config->SetBuyerPrice(ITEM_QUALITY_LEGENDARY, buyerpriceorange);

config->SetBuyerPrice(ITEM_QUALITY_ARTIFACT, buyerpriceyellow);

// Load bidding interval

config->SetBiddingInterval(Minutes(buyerbiddinginterval));

// Load bids per interval

config->SetBidsPerInterval(buyerbidsperinterval);

dedmen · 2023-10-31T12:30:28Z

src/AuctionHouseBotConfig.cpp

+    }
+    else if (totalPercent != 100)
+    {
+        _itemsPercent[ITEM_QUALITY_POOR]            = 0;


Should print a warning log message here?

Or re-normalize the values

80+80 = 160
value*(100/160)
so it becomes 50+50

dedmen · 2023-10-31T12:32:33Z

What is holding this back? looks good to me

Winfidonarleyan · 2023-11-01T03:23:08Z

I don't remember if I finished everything here or forgot something

dedmen · 2023-11-01T19:20:50Z

If I find time I'll deploy this on my server on the weekend.
I want to make some additions (real price data from a real server with median/stddev) for which I'll need that cleanup first.
I'll probably find more things to clean up with that

src/AuctionHouseBot.cpp

dedmen · 2023-11-02T23:26:38Z

src/AuctionHouseBotConfig.h

+        return _buyerBiddingInterval;
+    }
+
+    void CalculatePercents();


That is a bad name
This doesn't calculate "Percents", it calculates the maximum number of items per quality level.
I will probably rename to "CalculateMaxCounts" later

In general naming is bad all over the place.
"SetMinPrice" doesn't set the min price. It sets the minimum price multiplier in percent with 0-100 value.

dedmen · 2023-11-03T00:19:49Z

src/AuctionHouseBot.cpp

        return;
    }

-    QueryResult result = CharacterDatabase.Query("SELECT id FROM auctionhouse WHERE itemowner<>{} AND buyguid<>{}", AHBplayerGUID, AHBplayerGUID);
+    auto sharedConfig = std::make_shared<AHBConfig>(*config);


Every time we add new auctions, we copy the whole config.
The config should've been a shared_ptr to begin with..

I'll rework that later

Co-authored-by: Dedmen Miller <[email protected]>

dedmen · 2023-11-03T17:42:15Z

src/AuctionHouseBotConfig.h

+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+


Missing include guard, including this file twice will break stuff

dedmen · 2023-11-03T18:31:44Z

src/AuctionHouseBot.cpp

                        isVendorItem = true;
                }

                if (isVendorItem)
                    continue;
            }

-            if ((Vendor_TGs == 0) && (itr->second.Class == ITEM_CLASS_TRADE_GOODS))


BUG!
Class check went from == to !=

There are more of these here

dedmen · 2023-11-03T18:37:20Z

src/AuctionHouseBot.cpp

                        isLootTG = true;
                }

                if (isLootTG)
                    continue;
            }

-            if ((Other_Items == 0) && !(itr->second.Class == ITEM_CLASS_TRADE_GOODS))


more bug.
Other_Items == 0 turned into OtherItems

dedmen · 2023-11-03T19:31:08Z

Please merge my indent fixes.
I will make a PR to fix the filtering issues

dedmen · 2023-11-03T23:40:57Z

I'm now running this plus my PR on my server, no issues so far 🤞

* chore: switch to reusable module workflow (#58) * chore(Module/Structure): update structure (#72) * chore(Bot): add db env include * Split item indexing into separate files * Fixed copyright headers * Remove unused variable --------- Co-authored-by: Patrick Lewis <[email protected]> Co-authored-by: Walter Pagani <[email protected]> Co-authored-by: Winfidonarleyan <[email protected]>

Winfidonarleyan added 2 commits March 19, 2022 13:41

feat(Misc): base rework module

44ab5fc

chore(Core/Misc): code cleanup

dad83c3

dedmen reviewed Oct 31, 2023

View reviewed changes

dedmen reviewed Nov 2, 2023

View reviewed changes

src/AuctionHouseBot.cpp Show resolved Hide resolved

dedmen reviewed Nov 2, 2023

View reviewed changes

dedmen reviewed Nov 3, 2023

View reviewed changes

Update src/AuctionHouseBot.cpp

a25c3f0

Co-authored-by: Dedmen Miller <[email protected]>

dedmen reviewed Nov 3, 2023

View reviewed changes

dedmen mentioned this pull request Nov 3, 2023

Split item filtering into separate source file #75

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(Misc): base rework module #57

feat(Misc): base rework module #57

Winfidonarleyan commented Mar 19, 2022 •

edited

Loading

dedmen Oct 31, 2023

dedmen Oct 31, 2023

dedmen Oct 31, 2023

dedmen Oct 31, 2023

dedmen commented Oct 31, 2023

Winfidonarleyan commented Nov 1, 2023

dedmen commented Nov 1, 2023

dedmen Nov 2, 2023

dedmen Nov 3, 2023

dedmen Nov 3, 2023 •

edited

Loading

dedmen Nov 3, 2023

dedmen Nov 3, 2023

dedmen Nov 3, 2023

dedmen commented Nov 3, 2023

dedmen commented Nov 3, 2023

	Item* item = sAuctionMgr->GetAItem(auction->item_guid);
	Item* item = sAuctionMgr->GetAItem(auction->item_guid);

feat(Misc): base rework module #57

Are you sure you want to change the base?

feat(Misc): base rework module #57

Conversation

Winfidonarleyan commented Mar 19, 2022 • edited Loading

Changes:

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dedmen commented Oct 31, 2023

Winfidonarleyan commented Nov 1, 2023

dedmen commented Nov 1, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dedmen Nov 3, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dedmen commented Nov 3, 2023

dedmen commented Nov 3, 2023

Winfidonarleyan commented Mar 19, 2022 •

edited

Loading

dedmen Nov 3, 2023 •

edited

Loading