Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2026-11-14 07:47:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: a trade offer takes what the trade window takes

Browse Source 
The client's trade window has 8 slots for each player and takes neither
a bound item nor an equipped one. An offer with more than 8 items, a
bound item or an equipped item is now refused like the other offers the
window can not make, when it arrives and again when the trade
completes.

Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
This commit is contained in:
Aaron Kimbrell
2026-11-10 15:37:33 -06:00
parent e164f9aaed
commit 6f7fd5f84e
4 changed files with 53 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
dGame/TradingManager.cpp
View File

@@ -36,12 +36,14 @@ std::optional<std::vector<TradeItem>> Trade::ResolveOffer(
resolved.reserve(offered.size());
std::set<LWOOBJID> seen;
if (offered.size() > MaxOfferedItems) return std::nullopt;
for (const auto& tradeItem : offered) {
// The client keeps its offer by item ID, so an item is only ever in it once
if (tradeItem.itemCount == 0 || !seen.insert(tradeItem.itemId).second) return std::nullopt;
const auto held = findHeld(tradeItem.itemId);
if (!held || held->count == 0) return std::nullopt;
if (!held || held->count == 0 || held->bound || held->equipped) return std::nullopt;
resolved.push_back({ tradeItem.itemId, held->lot, std::min(tradeItem.itemCount, held->count) });
}
@@ -49,6 +51,14 @@ std::optional<std::vector<TradeItem>> Trade::ResolveOffer(
return resolved;
}
std::function<std::optional<HeldTradeItem>(LWOOBJID)> Trade::HeldIn(const InventoryComponent& inventory) {
return [&inventory](const LWOOBJID itemId) -> std::optional<HeldTradeItem> {
const auto* const item = inventory.FindItemById(itemId);
if (!item) return std::nullopt;
return HeldTradeItem{ item->GetLot(), item->GetCount(), item->GetBound(), item->IsEquipped() };
};
}
Trade::~Trade() {
}
@@ -172,15 +182,7 @@ void Trade::Complete() {
}
// The inventories may have changed since the offers were made, so check the offers against them again
const auto holds = [](const InventoryComponent* const inventory) {
return [inventory](const LWOOBJID itemId) -> std::optional<HeldTradeItem> {
const auto* const item = inventory->FindItemById(itemId);
if (!item) return std::nullopt;
return HeldTradeItem{ item->GetLot(), item->GetCount() };
};
};
if (ResolveOffer(m_ItemsA, holds(inventoryA)) != m_ItemsA || ResolveOffer(m_ItemsB, holds(inventoryB)) != m_ItemsB) {
if (ResolveOffer(m_ItemsA, HeldIn(*inventoryA)) != m_ItemsA || ResolveOffer(m_ItemsB, HeldIn(*inventoryB)) != m_ItemsB) {
LOG("The items offered by %s and %s no longer match what they hold, aborting trade", characterA->GetName().c_str(), characterB->GetName().c_str());
return;
}

16
dGame/TradingManager.h
View File

@@ -20,8 +20,13 @@ struct TradeItem {
struct HeldTradeItem {
LOT lot;
uint32_t count;
// The trade window takes neither a bound item nor an equipped one
bool bound = false;
bool equipped = false;
};
class InventoryComponent;
class Trade {
public:
/**
@@ -29,12 +34,21 @@ public:
* @param offered the items as the player sent them
* @param findHeld gives the held item with an ID, or nothing if the player has no such item
* @return the offer with every LOT taken from the held item and every count limited to the held count,
* or nothing if the offer names an item the player does not hold, the same item twice or a count of 0
* or nothing if the offer names an item the player does not hold, the same item twice, a count of 0,
* a bound or equipped item, or more items than the trade window has slots
*/
static std::optional<std::vector<TradeItem>> ResolveOffer(
const std::vector<TradeItem>& offered,
const std::function<std::optional<HeldTradeItem>(LWOOBJID)>& findHeld);
/**
* Gives the lookup ResolveOffer needs for the items in an inventory
*/
static std::function<std::optional<HeldTradeItem>(LWOOBJID)> HeldIn(const InventoryComponent& inventory);
// The slots one side of the trade window has
static constexpr uint32_t MaxOfferedItems = 8;
explicit Trade(LWOOBJID tradeId, LWOOBJID participantA, LWOOBJID participantB);
~Trade();

6
dGame/dGameMessages/TradeMessages.cpp
View File

@@ -247,11 +247,7 @@ namespace GameMessages {
if (!inventoryComponent) return;
// The LOT and the count the trade works with come from the items the player holds
const auto resolvedItems = Trade::ResolveOffer(items, [inventoryComponent](const LWOOBJID itemId) -> std::optional<HeldTradeItem> {
const auto* const item = inventoryComponent->FindItemById(itemId);
if (!item) return std::nullopt;
return HeldTradeItem{ item->GetLot(), item->GetCount() };
});
const auto resolvedItems = Trade::ResolveOffer(items, Trade::HeldIn(*inventoryComponent));
if (!resolvedItems) {
LOG("Trade update from (%llu) does not match the items they hold, ignoring it", entity.GetObjectID());

26
tests/dGameTests/dGameMessagesTests/TradeOfferTests.cpp
View File

@@ -8,6 +8,8 @@ namespace {
const std::map<LWOOBJID, HeldTradeItem> g_Held = {
{ 100, { 1727, 5 } },
{ 200, { 3040, 1 } },
{ 300, { 1727, 2, true, false } },
{ 400, { 1727, 2, false, true } },
};
std::optional<HeldTradeItem> FindHeld(const LWOOBJID itemId) {
@@ -50,9 +52,31 @@ TEST(TradeOfferTest, AnItemOfferedTwiceIsRefused) {
}
TEST(TradeOfferTest, AnItemThePlayerDoesNotHoldIsRefused) {
EXPECT_FALSE(Trade::ResolveOffer({ { 300, 1727, 1 } }, FindHeld).has_value());
EXPECT_FALSE(Trade::ResolveOffer({ { 900, 1727, 1 } }, FindHeld).has_value());
}
TEST(TradeOfferTest, ACountOfZeroIsRefused) {
EXPECT_FALSE(Trade::ResolveOffer({ { 100, 1727, 0 } }, FindHeld).has_value());
}
TEST(TradeOfferTest, ABoundItemIsRefused) {
EXPECT_FALSE(Trade::ResolveOffer({ { 300, 1727, 1 } }, FindHeld).has_value());
EXPECT_FALSE(Trade::ResolveOffer({ { 100, 1727, 1 }, { 300, 1727, 1 } }, FindHeld).has_value());
}
TEST(TradeOfferTest, AnEquippedItemIsRefused) {
EXPECT_FALSE(Trade::ResolveOffer({ { 400, 1727, 1 } }, FindHeld).has_value());
}
TEST(TradeOfferTest, AnOfferFillsTheSlotsOfTheTradeWindowAtMost) {
const auto findAny = [](const LWOOBJID) -> std::optional<HeldTradeItem> {
return HeldTradeItem{ 1727, 1 };
};
std::vector<TradeItem> offered;
for (LWOOBJID itemId = 1; itemId <= Trade::MaxOfferedItems; itemId++) offered.push_back({ itemId, 1727, 1 });
EXPECT_TRUE(Trade::ResolveOffer(offered, findAny).has_value());
offered.push_back({ Trade::MaxOfferedItems + 1, 1727, 1 });
EXPECT_FALSE(Trade::ResolveOffer(offered, findAny).has_value());
}