Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Players: Improve trade exchange calculations

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/68e1dc8adb84a3df5241358be591400db39e4d62)
This commit is contained in:
hondacrx
2022-02-18 13:09:36 -05:00
parent 925cf8b8a9
commit 380aeac394
1 changed files with 59 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Player/Player.Items.cs
+57 -17
View File
@@ -915,16 +915,28 @@ namespace Game.Entities
{ {
Item item2; Item item2;
// fill space table // fill space tables, creating a mock-up of the player's inventory
// counts
uint[] inventoryCounts = new uint[InventorySlots.ItemEnd - InventorySlots.ItemStart]; uint[] inventoryCounts = new uint[InventorySlots.ItemEnd - InventorySlots.ItemStart];
uint[][] bagCounts = new uint[InventorySlots.BagEnd - InventorySlots.BagStart][]; uint[][] bagCounts = new uint[InventorySlots.BagEnd - InventorySlots.BagStart][];
// Item array
Item[] inventoryPointers = new Item[InventorySlots.ItemEnd - InventorySlots.ItemStart];
Item[][] bagPointers = new Item[InventorySlots.BagEnd - InventorySlots.BagStart][];
int inventoryEnd = InventorySlots.ItemStart + GetInventorySlotCount(); int inventoryEnd = InventorySlots.ItemStart + GetInventorySlotCount();
// filling inventory
for (byte i = InventorySlots.ItemStart; i < inventoryEnd; i++) for (byte i = InventorySlots.ItemStart; i < inventoryEnd; i++)
{ {
// build items in stock backpack
item2 = GetItemByPos(InventorySlots.Bag0, i); item2 = GetItemByPos(InventorySlots.Bag0, i);
if (item2 && !item2.IsInTrade()) if (item2 && !item2.IsInTrade())
{
inventoryCounts[i - InventorySlots.ItemStart] = item2.GetCount(); inventoryCounts[i - InventorySlots.ItemStart] = item2.GetCount();
inventoryPointers[i - InventorySlots.ItemStart] = item2;
}
} }
for (byte i = InventorySlots.BagStart; i < InventorySlots.BagEnd; i++) for (byte i = InventorySlots.BagStart; i < InventorySlots.BagEnd; i++)
@@ -933,25 +945,33 @@ namespace Game.Entities
if (pBag) if (pBag)
{ {
bagCounts[i - InventorySlots.BagStart] = new uint[ItemConst.MaxBagSize]; bagCounts[i - InventorySlots.BagStart] = new uint[ItemConst.MaxBagSize];
bagPointers[i - InventorySlots.BagStart] = new Item[ItemConst.MaxBagSize];
for (byte j = 0; j < pBag.GetBagSize(); j++) for (byte j = 0; j < pBag.GetBagSize(); j++)
{ {
// build item counts in equippable bags
item2 = GetItemByPos(i, j); item2 = GetItemByPos(i, j);
if (item2 && !item2.IsInTrade()) if (item2 && !item2.IsInTrade())
{
bagCounts[i - InventorySlots.BagStart][j] = item2.GetCount(); bagCounts[i - InventorySlots.BagStart][j] = item2.GetCount();
bagPointers[i - InventorySlots.BagStart][j] = item2;
}
} }
} }
} }
// check free space for all items // check free space for all items that we wish to add
for (int k = 0; k < count; ++k) for (int k = 0; k < count; ++k)
{ {
// Incoming item
Item item = items[k]; Item item = items[k];
// no item // no item
if (!item) if (!item)
continue; continue;
Log.outDebug(LogFilter.Player, "STORAGE: CanStoreItems {0}. item = {1}, count = {2}", k + 1, item.GetEntry(), item.GetCount()); uint remaining_count = item.GetCount();
Log.outDebug(LogFilter.Player, $"STORAGE: CanStoreItems {k + 1}. item = {item.GetEntry()}, count = {remaining_count}");
ItemTemplate pProto = item.GetTemplate(); ItemTemplate pProto = item.GetTemplate();
// strange item // strange item
@@ -979,14 +999,19 @@ namespace Game.Entities
{ {
for (byte t = InventorySlots.ItemStart; t < inventoryEnd; ++t) for (byte t = InventorySlots.ItemStart; t < inventoryEnd; ++t)
{ {
item2 = GetItemByPos(InventorySlots.Bag0, t); item2 = inventoryPointers[t - InventorySlots.ItemStart];
if (item2 && item2.CanBeMergedPartlyWith(pProto) == InventoryResult.Ok && inventoryCounts[t - InventorySlots.ItemStart] + item.GetCount() <= pProto.GetMaxStackSize()) if (item2 && item2.CanBeMergedPartlyWith(pProto) == InventoryResult.Ok && inventoryCounts[t - InventorySlots.ItemStart] < pProto.GetMaxStackSize())
{ {
inventoryCounts[t - InventorySlots.ItemStart] += item.GetCount(); inventoryCounts[t - InventorySlots.ItemStart] += remaining_count;
b_found = true; remaining_count = inventoryCounts[t - InventorySlots.ItemStart] < pProto.GetMaxStackSize() ? 0 : inventoryCounts[t - InventorySlots.ItemStart] - pProto.GetMaxStackSize();
b_found = remaining_count == 0;
// if no pieces of the stack remain, then stop checking stock bag
if (b_found)
break; break;
} }
} }
if (b_found) if (b_found)
continue; continue;
@@ -995,21 +1020,28 @@ namespace Game.Entities
Bag bag = GetBagByPos(t); Bag bag = GetBagByPos(t);
if (bag) if (bag)
{ {
if (Item.ItemCanGoIntoBag(item.GetTemplate(), bag.GetTemplate())) if (!Item.ItemCanGoIntoBag(item.GetTemplate(), bag.GetTemplate()))
{ continue;
for (byte j = 0; j < bag.GetBagSize(); j++) for (byte j = 0; j < bag.GetBagSize(); j++)
{ {
item2 = GetItemByPos(t, j); item2 = bagPointers[t - InventorySlots.BagStart][j];
if (item2 && item2.CanBeMergedPartlyWith(pProto) == InventoryResult.Ok && bagCounts[t - InventorySlots.BagStart][j] + item.GetCount() <= pProto.GetMaxStackSize()) if (item2 && item2.CanBeMergedPartlyWith(pProto) == InventoryResult.Ok && bagCounts[t - InventorySlots.BagStart][j] < pProto.GetMaxStackSize())
{ {
bagCounts[t - InventorySlots.BagStart][j] += item.GetCount(); // add count to stack so that later items in the list do not double-book
b_found = true; bagCounts[t - InventorySlots.BagStart][j] += remaining_count;
remaining_count = bagCounts[t - InventorySlots.BagStart][j] < pProto.GetMaxStackSize() ? 0 : bagCounts[t - InventorySlots.BagStart][j] - pProto.GetMaxStackSize();
b_found = remaining_count == 0;
// if no pieces of the stack remain, then stop checking equippable bags
if (b_found)
break; break;
} }
} }
} }
} }
}
if (b_found) if (b_found)
continue; continue;
} }
@@ -1032,7 +1064,9 @@ namespace Game.Entities
{ {
if (bagCounts[t - InventorySlots.BagStart][j] == 0) if (bagCounts[t - InventorySlots.BagStart][j] == 0)
{ {
bagCounts[t - InventorySlots.BagStart][j] = 1; bagCounts[t - InventorySlots.BagStart][j] = remaining_count;
bagPointers[t - InventorySlots.BagStart][j] = item;
b_found = true; b_found = true;
break; break;
} }
@@ -1040,6 +1074,7 @@ namespace Game.Entities
} }
} }
} }
if (b_found) if (b_found)
continue; continue;
} }
@@ -1051,10 +1086,13 @@ namespace Game.Entities
if (inventoryCounts[t - InventorySlots.ItemStart] == 0) if (inventoryCounts[t - InventorySlots.ItemStart] == 0)
{ {
inventoryCounts[t - InventorySlots.ItemStart] = 1; inventoryCounts[t - InventorySlots.ItemStart] = 1;
inventoryPointers[t - InventorySlots.ItemStart] = item;
b_found = true; b_found = true;
break; break;
} }
} }
if (b_found) if (b_found)
continue; continue;
@@ -1074,7 +1112,9 @@ namespace Game.Entities
{ {
if (bagCounts[t - InventorySlots.BagStart][j] == 0) if (bagCounts[t - InventorySlots.BagStart][j] == 0)
{ {
bagCounts[t - InventorySlots.BagStart][j] = 1; bagCounts[t - InventorySlots.BagStart][j] = remaining_count;
bagPointers[t - InventorySlots.BagStart][j] = item;
b_found = true; b_found = true;
break; break;
} }
@@ -1082,7 +1122,7 @@ namespace Game.Entities
} }
} }
// no free slot found? // if no free slot found for all pieces of the item, then return an error
if (!b_found) if (!b_found)
return InventoryResult.BagFull; return InventoryResult.BagFull;
} }