Skip to content

Fix tradeskill stack counting #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Barathos wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix tradeskill stack counting #7

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions zone/tradeskills.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1309,8 +1309,8 @@ bool ZoneDatabase::GetTradeRecipe(
//just increment sum and count accordingly
bool first = true;
std::string buf2;
uint32 count = 0;
uint32 sum = 0;
uint32 count = 0;
uint32 sum = 0;

for (uint8 slot_id = EQ::invbag::SLOT_BEGIN; slot_id < EQ::invbag::SLOT_COUNT; slot_id++) { // <watch> TODO: need to determine if this is bound to world/item container size
LogTradeskills("Fetching item [{}]", slot_id);
Expand All @@ -1325,8 +1325,8 @@ bool ZoneDatabase::GetTradeRecipe(
return false;
}

const auto item = database.GetItem(inst->GetItem()->ID);
if (!item) {
const auto item = database.GetItem(inst->GetItem()->ID);
if (!item) {
LogTradeskills("item [{}] not found!", inst->GetItem()->ID);
continue;
}
Expand All @@ -1338,8 +1338,9 @@ bool ZoneDatabase::GetTradeRecipe(
buf2 += fmt::format(", {}", item->ID);
}

sum += item->ID;
count++;
uint32 qty = inst->IsStackable() ? std::max<int16>(1, inst->GetCharges()) : 1;
sum += item->ID * qty;
count += qty;

LogTradeskills(
"Item in container index [{}] item [{}] found [{}]",
Expand Down Expand Up @@ -1495,9 +1496,10 @@ bool ZoneDatabase::GetTradeRecipe(
continue;
}

if (item->ID == Strings::ToUnsignedInt(row[0])) {
component_count++;
}
uint32 qty = inst->IsStackable() ? std::max<int16>(1, inst->GetCharges()) : 1;
if (item->ID == Strings::ToUnsignedInt(row[0])) {
component_count += qty;
}

LogTradeskills(
"Component count loop [{}] item [{}] recipe component_count [{}]",
Expand Down