fix: a trade offer takes what the trade window takes

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

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());
}