mirror of
https://github.com/DarkflameUniverse/DarkflameServer.git
synced 2026-10-02 10:53:44 +00:00
c759bd1a40
The buyback inventory grew by 9 slots whenever it was nearly full, so the vendor's buyback page kept resizing. Live kept 27 items: a 2014 capture of 29 sales shows that on the 28th, the server sent RemoveItemFromInventory (buyback inventory) for the first item sold, then added the new one. The buyback inventory now keeps its size. Before a sale needs a new buyback slot and the inventory holds 27 or more items, the oldest items (lowest object ID: each sale gives a new, higher ID) are removed. Sales that fit on an existing buyback stack remove nothing. The removal is not counted again by the economy ledger, which counted the items as gone when they were sold. Fixes issue 1129. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
80 lines
3.0 KiB
C++
80 lines
3.0 KiB
C++
#include "GameDependencies.h"
|
|
|
|
#include "CDClientManager.h"
|
|
#include "CDComponentsRegistryTable.h"
|
|
#include "CDItemComponentTable.h"
|
|
#include "Entity.h"
|
|
#include "InventoryComponent.h"
|
|
#include "Item.h"
|
|
#include "VendorComponent.h"
|
|
#include "eReplicaComponentType.h"
|
|
|
|
#include <gtest/gtest.h>
|
|
|
|
class VendorBuybackTests : public GameDependenciesTest {
|
|
protected:
|
|
std::unique_ptr<Entity> entity;
|
|
InventoryComponent* inventory{};
|
|
Inventory* buyback{};
|
|
LWOOBJID nextId = 0x7000;
|
|
|
|
void SetUp() override {
|
|
SetUpDependencies();
|
|
RegisterLot(3001, 1); // one per slot
|
|
RegisterLot(3002, 10); // stacks
|
|
CDClientManager::GetEntriesMutable<CDComponentsRegistryTable>().insert_or_assign(static_cast<uint64_t>(info.lot), 0);
|
|
entity = std::make_unique<Entity>(1, info);
|
|
inventory = entity->AddComponent<InventoryComponent>(-1);
|
|
buyback = inventory->GetInventory(eInventoryType::VENDOR_BUYBACK);
|
|
}
|
|
|
|
void TearDown() override {
|
|
entity.reset();
|
|
TearDownDependencies();
|
|
}
|
|
|
|
static void RegisterLot(const LOT lot, const int32_t stackSize) {
|
|
const auto componentID = static_cast<uint32_t>(96000 + lot);
|
|
auto& registry = CDClientManager::GetEntriesMutable<CDComponentsRegistryTable>();
|
|
registry.insert_or_assign(static_cast<uint64_t>(lot), componentID);
|
|
registry.insert_or_assign(static_cast<uint64_t>(eReplicaComponentType::ITEM) << 32 | static_cast<uint64_t>(lot), componentID);
|
|
CDItemComponent component{};
|
|
component.id = componentID;
|
|
component.stackSize = stackSize;
|
|
CDClientManager::GetEntriesMutable<CDItemComponentTable>().insert_or_assign(componentID, component);
|
|
}
|
|
|
|
// The inventory owns the item
|
|
Item* Give(Inventory* to, const LOT lot, const uint32_t count = 1) {
|
|
return new Item(nextId++, lot, to, static_cast<uint32_t>(to->GetItems().size()), count, false, {}, LWOOBJID_EMPTY, LWOOBJID_EMPTY, eLootSourceType::NONE);
|
|
}
|
|
};
|
|
|
|
TEST_F(VendorBuybackTests, KeepsTheSizeWhenFull) {
|
|
for (size_t i = 0; i < VendorComponent::BUYBACK_SIZE; i++) Give(buyback, 3001);
|
|
EXPECT_EQ(buyback->FindEmptySlot(), -1);
|
|
EXPECT_EQ(buyback->GetSize(), VendorComponent::BUYBACK_SIZE);
|
|
}
|
|
|
|
TEST_F(VendorBuybackTests, SellingToAFullBuybackDropsTheOldest) {
|
|
const auto oldest = nextId;
|
|
for (size_t i = 0; i < VendorComponent::BUYBACK_SIZE; i++) Give(buyback, 3001);
|
|
auto* const sold = Give(inventory->GetInventory(eInventoryType::ITEMS), 3001);
|
|
|
|
VendorComponent::MakeRoomInBuyback(*inventory, *sold, 1);
|
|
EXPECT_EQ(buyback->GetItems().size(), VendorComponent::BUYBACK_SIZE - 1);
|
|
EXPECT_FALSE(buyback->GetItems().contains(oldest));
|
|
EXPECT_TRUE(buyback->GetItems().contains(oldest + 1));
|
|
}
|
|
|
|
TEST_F(VendorBuybackTests, RoomLeftOnAStackKeepsEverything) {
|
|
Give(buyback, 3002, 5);
|
|
for (size_t i = 1; i < VendorComponent::BUYBACK_SIZE; i++) Give(buyback, 3001);
|
|
auto* const sold = Give(inventory->GetInventory(eInventoryType::ITEMS), 3002, 5);
|
|
|
|
VendorComponent::MakeRoomInBuyback(*inventory, *sold, 5);
|
|
EXPECT_EQ(buyback->GetItems().size(), VendorComponent::BUYBACK_SIZE);
|
|
VendorComponent::MakeRoomInBuyback(*inventory, *sold, 6);
|
|
EXPECT_EQ(buyback->GetItems().size(), VendorComponent::BUYBACK_SIZE - 1);
|
|
}
|