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

Establish default order for merchantlist items.

Browse Source 
Allow merchants to use 80th slot.
This commit is contained in:
JJ 2014-10-09 23:11:18 -04:00
parent c328829610
commit ea4c23efcf
2 changed files with 77 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
zone/client_process.cpp
View File

@ -983,7 +983,7 @@ void Client::BulkSendMerchantInventory(int merchant_id, int npcid) {
uint32 i = 1; uint32 i = 1;
uint8 handychance = 0; uint8 handychance = 0;
for (itr = merlist.begin(); itr != merlist.end() && i < numItemSlots; ++itr) { for (itr = merlist.begin(); itr != merlist.end() && i <= numItemSlots; ++itr) {
MerchantList ml = *itr; MerchantList ml = *itr;
if (merch->CastToNPC()->GetMerchantProbability() > ml.probability) if (merch->CastToNPC()->GetMerchantProbability() > ml.probability)
continue; continue;
@ -1028,12 +1028,15 @@ void Client::BulkSendMerchantInventory(int merchant_id, int npcid) {
} }
} }
// Account for merchant lists with gaps. // Account for merchant lists with gaps.
if(ml.slot >= i) if (ml.slot >= i) {
if (ml.slot > i)
LogFile->write(EQEMuLog::Debug, "(WARNING) Merchantlist contains gap at slot %d. Merchant: %d, NPC: %d", i, merchant_id, npcid);
i = ml.slot + 1; i = ml.slot + 1;
} }
}
std::list<TempMerchantList> origtmp_merlist = zone->tmpmerchanttable[npcid]; std::list<TempMerchantList> origtmp_merlist = zone->tmpmerchanttable[npcid];
tmp_merlist.clear(); tmp_merlist.clear();
for(tmp_itr = origtmp_merlist.begin();tmp_itr != origtmp_merlist.end() && i<numItemSlots;++tmp_itr){ for (tmp_itr = origtmp_merlist.begin(); tmp_itr != origtmp_merlist.end() && i <= numItemSlots; ++tmp_itr) {
TempMerchantList ml = *tmp_itr; TempMerchantList ml = *tmp_itr;
item = database.GetItem(ml.item); item = database.GetItem(ml.item);
ml.slot = i; ml.slot = i;

14
zone/zone.cpp
View File

@ -320,7 +320,6 @@ int Zone::SaveTempItem(uint32 merchantid, uint32 npcid, uint32 item, int32 charg
// Account for merchant lists with gaps in them. // Account for merchant lists with gaps in them.
if (ml.slot >= i) if (ml.slot >= i)
i = ml.slot + 1; i = ml.slot + 1;
} }
std::list<TempMerchantList> tmp_merlist = tmpmerchanttable[npcid]; std::list<TempMerchantList> tmp_merlist = tmpmerchanttable[npcid];
std::list<TempMerchantList>::const_iterator tmp_itr; std::list<TempMerchantList>::const_iterator tmp_itr;
@ -412,7 +411,8 @@ void Zone::LoadTempMerchantData(){
"WHERE " "WHERE "
"ml.npcid = se.npcid " "ml.npcid = se.npcid "
"AND se.spawngroupid = s2.spawngroupid " "AND se.spawngroupid = s2.spawngroupid "
"AND s2.zone = '%s' AND s2.version = %i", GetShortName(), GetInstanceVersion()); "AND s2.zone = '%s' AND s2.version = %i"
"ORDER BY ml.slot ", GetShortName(), GetInstanceVersion());
auto results = database.QueryDatabase(query); auto results = database.QueryDatabase(query);
if (!results.Success()) { if (!results.Success()) {
LogFile->write(EQEMuLog::Error, "Error in LoadTempMerchantData query '%s' %s", query.c_str(), results.ErrorMessage().c_str()); LogFile->write(EQEMuLog::Error, "Error in LoadTempMerchantData query '%s' %s", query.c_str(), results.ErrorMessage().c_str());
@ -445,7 +445,7 @@ void Zone::LoadNewMerchantData(uint32 merchantid){
std::list<MerchantList> merlist; std::list<MerchantList> merlist;
std::string query = StringFormat("SELECT item, slot, faction_required, level_required, alt_currency_cost, " std::string query = StringFormat("SELECT item, slot, faction_required, level_required, alt_currency_cost, "
"classes_required FROM merchantlist WHERE merchantid=%d", merchantid); "classes_required FROM merchantlist WHERE merchantid=%d ORDER BY slot", merchantid);
auto results = database.QueryDatabase(query); auto results = database.QueryDatabase(query);
if (!results.Success()) { if (!results.Success()) {
LogFile->write(EQEMuLog::Error, "Error in LoadNewMerchantData query '%s' %s", query.c_str(), results.ErrorMessage().c_str()); LogFile->write(EQEMuLog::Error, "Error in LoadNewMerchantData query '%s' %s", query.c_str(), results.ErrorMessage().c_str());
@ -485,11 +485,15 @@ void Zone::GetMerchantDataForZoneLoad(){
"spawnentry AS se, " "spawnentry AS se, "
"spawn2 AS s2 " "spawn2 AS s2 "
"WHERE nt.merchant_id = ml.merchantid AND nt.id = se.npcid " "WHERE nt.merchant_id = ml.merchantid AND nt.id = se.npcid "
"AND se.spawngroupid = s2.spawngroupid AND s2.zone = '%s' AND s2.version = %i ", GetShortName(), GetInstanceVersion()); "AND se.spawngroupid = s2.spawngroupid AND s2.zone = '%s' AND s2.version = %i "
"ORDER BY ml.slot ", GetShortName(), GetInstanceVersion());
auto results = database.QueryDatabase(query); auto results = database.QueryDatabase(query);
std::map<uint32, std::list<MerchantList> >::iterator cur; std::map<uint32, std::list<MerchantList> >::iterator cur;
uint32 npcid = 0; uint32 npcid = 0;
if (results.RowCount() == 0){ LogFile->write(EQEMuLog::Error, "Error in loading Merchant Data for zone"); return; } if (results.RowCount() == 0) {
LogFile->write(EQEMuLog::Error, "Error in loading Merchant Data for zone");
return;
}
for (auto row = results.begin(); row != results.end(); ++row) { for (auto row = results.begin(); row != results.end(); ++row) {
MerchantList ml; MerchantList ml;
ml.id = atoul(row[0]); ml.id = atoul(row[0]);