pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-13 23:01:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

More work on salvage, added some extra checks and won't return stacks of items

Browse Source
This commit is contained in:
mackal 2013-04-08 14:16:08 -04:00
parent 91c817d9dd
commit 81ca7a1bfd
2 changed files with 39 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
zone/tradeskills.cpp
View File

@ -1063,11 +1063,14 @@ bool Client::TradeskillExecute(DBTradeskillRecipe_Struct *spec) {
// Rolls on each item, is possible to return everything // Rolls on each item, is possible to return everything
int SalvageChance = aabonuses.SalvageChance + itembonuses.SalvageChance + spellbonuses.SalvageChance; int SalvageChance = aabonuses.SalvageChance + itembonuses.SalvageChance + spellbonuses.SalvageChance;
if(SalvageChance) { // Skip check if not a normal TS or if a quest recipe these should be nofail, but check amyways
itr = spec->onsalvage.begin(); if(SalvageChance && spec->tradeskill != 75 && !spec->quest) {
while(itr != spec->onsalvage.end()) { itr = spec->salvage.begin();
uint8 sc = 0;
while(itr != spec->salvage.end()) {
for(sc = 0; sc < itr->second; sc++)
if(MakeRandomInt(0,99) < SalvageChance) if(MakeRandomInt(0,99) < SalvageChance)
SummonItem(itr->first, itr->second); SummonItem(itr->first, 1);
itr++; itr++;
} }
} }
@ -1421,7 +1424,9 @@ bool ZoneDatabase::GetTradeRecipe(uint32 recipe_id, uint8 c_type, uint32 some_id
qlen = MakeAnyLenString(&query, "SELECT item_id,salvagecount FROM tradeskill_recipe_entries" qlen = MakeAnyLenString(&query, "SELECT item_id,salvagecount FROM tradeskill_recipe_entries"
" WHERE salvagecount>0 AND recipe_id=%u", recipe_id); " WHERE salvagecount>0 AND recipe_id=%u", recipe_id);
spec->onsalvage.clear(); spec->salvage.clear();
// Don't bother with the query if TS is nofail
if (!spec->nofail) {
if (RunQuery(query, qlen, errbuf, &result)) { if (RunQuery(query, qlen, errbuf, &result)) {
qcount = mysql_num_rows(result); qcount = mysql_num_rows(result);
uint8 r; uint8 r;
@ -1429,10 +1434,28 @@ bool ZoneDatabase::GetTradeRecipe(uint32 recipe_id, uint8 c_type, uint32 some_id
row = mysql_fetch_row(result); row = mysql_fetch_row(result);
uint32 item = (uint32)atoi(row[0]); uint32 item = (uint32)atoi(row[0]);
uint8 num = (uint8)atoi(row[1]); uint8 num = (uint8)atoi(row[1]);
spec->onsalvage.push_back(pair<uint32,uint8>(item, num)); spec->salvage.push_back(pair<uint32,uint8>(item, num));
} }
mysql_free_result(result); mysql_free_result(result);
} }
// Previous query returned nothing, default to component list
if (!spec->salvage.size()) {
qlen = MakeAnyLenString(&query, "SELECT item_id,componentcount FROM tradeskill_recipe_entries"
" WHERE componentcount>0 AND recipe_id=%u", recipe_id);
if (RunQuery(query, qlen, errbuf, &result)) {
qcount = mysql_num_rows(result);
uint8 r;
for(r =0; r < qcount; r++) {
row = mysql_fetch_row(result);
uint32 item = (uint32)atoi(row[0]);
uint8 num = (uint8)atoi(row[1]);
spec->salvage.push_back(pair<uint32,uint8>(item, num));
}
mysql_free_result(result);
}
}
}
safe_delete_array(query); safe_delete_array(query);
return(true); return(true);

2
zone/zonedb.h
View File

@ -46,7 +46,7 @@ struct DBTradeskillRecipe_Struct {
bool replace_container; bool replace_container;
vector< pair<uint32,uint8> > onsuccess; vector< pair<uint32,uint8> > onsuccess;
vector< pair<uint32,uint8> > onfail; vector< pair<uint32,uint8> > onfail;
vector< pair<uint32,uint8> > onsalvage; vector< pair<uint32,uint8> > salvage;
string name; string name;
uint8 must_learn; uint8 must_learn;
bool has_learnt; bool has_learnt;