mirror of
https://github.com/EQEmu/Server.git
synced 2026-04-08 05:52:26 +00:00
GetNPCSpells converted to QueryDatabase
This commit is contained in:
Arthur Ice
parent
87efd22394
commit
52344bfe24
195
zone/MobAI.cpp
195
zone/MobAI.cpp
@ -2627,7 +2627,7 @@ void NPC::AISpellsList(Client *c)
|
|||||||
|
|
||||||
DBnpcspells_Struct* ZoneDatabase::GetNPCSpells(uint32 iDBSpellsID) {
|
DBnpcspells_Struct* ZoneDatabase::GetNPCSpells(uint32 iDBSpellsID) {
|
||||||
if (iDBSpellsID == 0)
|
if (iDBSpellsID == 0)
|
||||||
return 0;
|
return nullptr;
|
||||||
|
|
||||||
if (!npc_spells_cache) {
|
if (!npc_spells_cache) {
|
||||||
npc_spells_maxid = GetMaxNPCSpellsID();
|
npc_spells_maxid = GetMaxNPCSpellsID();
|
||||||
@ -2640,112 +2640,109 @@ DBnpcspells_Struct* ZoneDatabase::GetNPCSpells(uint32 iDBSpellsID) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (iDBSpellsID > npc_spells_maxid)
|
if (iDBSpellsID > npc_spells_maxid)
|
||||||
return 0;
|
return nullptr;
|
||||||
if (npc_spells_cache[iDBSpellsID]) { // it's in the cache, easy =)
|
if (npc_spells_cache[iDBSpellsID]) { // it's in the cache, easy =)
|
||||||
return npc_spells_cache[iDBSpellsID];
|
return npc_spells_cache[iDBSpellsID];
|
||||||
}
|
}
|
||||||
|
|
||||||
else if (!npc_spells_loadtried[iDBSpellsID]) { // no reason to ask the DB again if we have failed once already
|
else if (!npc_spells_loadtried[iDBSpellsID]) { // no reason to ask the DB again if we have failed once already
|
||||||
npc_spells_loadtried[iDBSpellsID] = true;
|
npc_spells_loadtried[iDBSpellsID] = true;
|
||||||
char errbuf[MYSQL_ERRMSG_SIZE];
|
|
||||||
char *query = 0;
|
|
||||||
MYSQL_RES *result;
|
|
||||||
MYSQL_ROW row;
|
|
||||||
|
|
||||||
if (RunQuery(query, MakeAnyLenString(&query, "SELECT id, parent_list, attack_proc, proc_chance, range_proc, rproc_chance, defensive_proc, dproc_chance, fail_recast, engaged_no_sp_recast_min, engaged_no_sp_recast_max, engaged_b_self_chance, engaged_b_other_chance, engaged_d_chance, pursue_no_sp_recast_min, pursue_no_sp_recast_max, pursue_d_chance, idle_no_sp_recast_min, idle_no_sp_recast_max, idle_b_chance from npc_spells where id=%d", iDBSpellsID), errbuf, &result)) {
|
std::string query = StringFormat("SELECT id, parent_list, attack_proc, proc_chance, "
|
||||||
safe_delete_array(query);
|
"range_proc, rproc_chance, defensive_proc, dproc_chance, "
|
||||||
if (mysql_num_rows(result) == 1) {
|
"fail_recast, engaged_no_sp_recast_min, engaged_no_sp_recast_max, "
|
||||||
row = mysql_fetch_row(result);
|
"engaged_b_self_chance, engaged_b_other_chance, engaged_d_chance, "
|
||||||
uint32 tmpparent_list = atoi(row[1]);
|
"pursue_no_sp_recast_min, pursue_no_sp_recast_max, "
|
||||||
uint16 tmpattack_proc = atoi(row[2]);
|
"pursue_d_chance, idle_no_sp_recast_min, idle_no_sp_recast_max, "
|
||||||
uint8 tmpproc_chance = atoi(row[3]);
|
"idle_b_chance FROM npc_spells WHERE id=%d", iDBSpellsID);
|
||||||
uint16 tmprange_proc = atoi(row[4]);
|
auto results = QueryDatabase(query);
|
||||||
int16 tmprproc_chance = atoi(row[5]);
|
if (!results.Success()) {
|
||||||
uint16 tmpdefensive_proc = atoi(row[6]);
|
std::cerr << "Error in AddNPCSpells query1 '" << query << "' " << results.ErrorMessage() << std::endl;
|
||||||
int16 tmpdproc_chance = atoi(row[7]);
|
return nullptr;
|
||||||
uint32 tmppfail_recast = atoi(row[8]);
|
}
|
||||||
uint32 tmpengaged_no_sp_recast_min = atoi(row[9]);
|
|
||||||
uint32 tmpengaged_no_sp_recast_max = atoi(row[10]);
|
|
||||||
uint8 tmpengaged_b_self_chance = atoi(row[11]);
|
|
||||||
uint8 tmpengaged_b_other_chance = atoi(row[12]);
|
|
||||||
uint8 tmpengaged_d_chance = atoi(row[13]);
|
|
||||||
uint32 tmppursue_no_sp_recast_min = atoi(row[14]);
|
|
||||||
uint32 tmppursue_no_sp_recast_max = atoi(row[15]);
|
|
||||||
uint8 tmppursue_d_chance = atoi(row[16]);
|
|
||||||
uint32 tmpidle_no_sp_recast_min = atoi(row[17]);
|
|
||||||
uint32 tmpidle_no_sp_recast_max = atoi(row[18]);
|
|
||||||
uint8 tmpidle_b_chance = atoi(row[19]);
|
|
||||||
mysql_free_result(result);
|
|
||||||
if (RunQuery(query, MakeAnyLenString(&query, "SELECT spellid, type, minlevel, maxlevel, manacost, recast_delay, priority, resist_adjust from npc_spells_entries where npc_spells_id=%d ORDER BY minlevel", iDBSpellsID), errbuf, &result)) {
|
|
||||||
safe_delete_array(query);
|
|
||||||
uint32 tmpSize = sizeof(DBnpcspells_Struct) + (sizeof(DBnpcspells_entries_Struct) * mysql_num_rows(result));
|
|
||||||
npc_spells_cache[iDBSpellsID] = (DBnpcspells_Struct*) new uchar[tmpSize];
|
|
||||||
memset(npc_spells_cache[iDBSpellsID], 0, tmpSize);
|
|
||||||
npc_spells_cache[iDBSpellsID]->parent_list = tmpparent_list;
|
|
||||||
npc_spells_cache[iDBSpellsID]->attack_proc = tmpattack_proc;
|
|
||||||
npc_spells_cache[iDBSpellsID]->proc_chance = tmpproc_chance;
|
|
||||||
npc_spells_cache[iDBSpellsID]->range_proc = tmprange_proc;
|
|
||||||
npc_spells_cache[iDBSpellsID]->rproc_chance = tmpdproc_chance;
|
|
||||||
npc_spells_cache[iDBSpellsID]->defensive_proc = tmpdefensive_proc;
|
|
||||||
npc_spells_cache[iDBSpellsID]->dproc_chance = tmpdproc_chance;
|
|
||||||
npc_spells_cache[iDBSpellsID]->fail_recast = tmppfail_recast;
|
|
||||||
npc_spells_cache[iDBSpellsID]->engaged_no_sp_recast_min = tmpengaged_no_sp_recast_min;
|
|
||||||
npc_spells_cache[iDBSpellsID]->engaged_no_sp_recast_max = tmpengaged_no_sp_recast_max;
|
|
||||||
npc_spells_cache[iDBSpellsID]->engaged_beneficial_self_chance = tmpengaged_b_self_chance;
|
|
||||||
npc_spells_cache[iDBSpellsID]->engaged_beneficial_other_chance = tmpengaged_b_other_chance;
|
|
||||||
npc_spells_cache[iDBSpellsID]->engaged_detrimental_chance = tmpengaged_d_chance;
|
|
||||||
npc_spells_cache[iDBSpellsID]->pursue_no_sp_recast_min = tmppursue_no_sp_recast_min;
|
|
||||||
npc_spells_cache[iDBSpellsID]->pursue_no_sp_recast_max = tmppursue_no_sp_recast_max;
|
|
||||||
npc_spells_cache[iDBSpellsID]->pursue_detrimental_chance = tmppursue_d_chance;
|
|
||||||
npc_spells_cache[iDBSpellsID]->idle_no_sp_recast_min = tmpidle_no_sp_recast_min;
|
|
||||||
npc_spells_cache[iDBSpellsID]->idle_no_sp_recast_max = tmpidle_no_sp_recast_max;
|
|
||||||
npc_spells_cache[iDBSpellsID]->idle_beneficial_chance = tmpidle_b_chance;
|
|
||||||
npc_spells_cache[iDBSpellsID]->numentries = mysql_num_rows(result);
|
|
||||||
int j = 0;
|
|
||||||
while ((row = mysql_fetch_row(result))) {
|
|
||||||
int spell_id = atoi(row[0]);
|
|
||||||
npc_spells_cache[iDBSpellsID]->entries[j].spellid = spell_id;
|
|
||||||
npc_spells_cache[iDBSpellsID]->entries[j].type = atoi(row[1]);
|
|
||||||
npc_spells_cache[iDBSpellsID]->entries[j].minlevel = atoi(row[2]);
|
|
||||||
npc_spells_cache[iDBSpellsID]->entries[j].maxlevel = atoi(row[3]);
|
|
||||||
npc_spells_cache[iDBSpellsID]->entries[j].manacost = atoi(row[4]);
|
|
||||||
npc_spells_cache[iDBSpellsID]->entries[j].recast_delay = atoi(row[5]);
|
|
||||||
npc_spells_cache[iDBSpellsID]->entries[j].priority = atoi(row[6]);
|
|
||||||
if(row[7])
|
|
||||||
{
|
|
||||||
npc_spells_cache[iDBSpellsID]->entries[j].resist_adjust = atoi(row[7]);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if(IsValidSpell(spell_id))
|
|
||||||
{
|
|
||||||
npc_spells_cache[iDBSpellsID]->entries[j].resist_adjust = spells[spell_id].ResistDiff;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
j++;
|
|
||||||
}
|
|
||||||
mysql_free_result(result);
|
|
||||||
return npc_spells_cache[iDBSpellsID];
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
std::cerr << "Error in AddNPCSpells query1 '" << query << "' " << errbuf << std::endl;
|
|
||||||
safe_delete_array(query);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
mysql_free_result(result);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
std::cerr << "Error in AddNPCSpells query1 '" << query << "' " << errbuf << std::endl;
|
|
||||||
safe_delete_array(query);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
if (results.RowCount() != 1)
|
||||||
}
|
return nullptr;
|
||||||
return 0;
|
|
||||||
|
auto row = results.begin();
|
||||||
|
uint32 tmpparent_list = atoi(row[1]);
|
||||||
|
uint16 tmpattack_proc = atoi(row[2]);
|
||||||
|
uint8 tmpproc_chance = atoi(row[3]);
|
||||||
|
uint16 tmprange_proc = atoi(row[4]);
|
||||||
|
int16 tmprproc_chance = atoi(row[5]);
|
||||||
|
uint16 tmpdefensive_proc = atoi(row[6]);
|
||||||
|
int16 tmpdproc_chance = atoi(row[7]);
|
||||||
|
uint32 tmppfail_recast = atoi(row[8]);
|
||||||
|
uint32 tmpengaged_no_sp_recast_min = atoi(row[9]);
|
||||||
|
uint32 tmpengaged_no_sp_recast_max = atoi(row[10]);
|
||||||
|
uint8 tmpengaged_b_self_chance = atoi(row[11]);
|
||||||
|
uint8 tmpengaged_b_other_chance = atoi(row[12]);
|
||||||
|
uint8 tmpengaged_d_chance = atoi(row[13]);
|
||||||
|
uint32 tmppursue_no_sp_recast_min = atoi(row[14]);
|
||||||
|
uint32 tmppursue_no_sp_recast_max = atoi(row[15]);
|
||||||
|
uint8 tmppursue_d_chance = atoi(row[16]);
|
||||||
|
uint32 tmpidle_no_sp_recast_min = atoi(row[17]);
|
||||||
|
uint32 tmpidle_no_sp_recast_max = atoi(row[18]);
|
||||||
|
uint8 tmpidle_b_chance = atoi(row[19]);
|
||||||
|
|
||||||
|
query = StringFormat("SELECT spellid, type, minlevel, maxlevel, "
|
||||||
|
"manacost, recast_delay, priority, resist_adjust "
|
||||||
|
"FROM npc_spells_entries "
|
||||||
|
"WHERE npc_spells_id=%d ORDER BY minlevel", iDBSpellsID);
|
||||||
|
results = QueryDatabase(query);
|
||||||
|
|
||||||
|
if (!results.Success())
|
||||||
|
{
|
||||||
|
std::cerr << "Error in AddNPCSpells query1 '" << query << "' " << results.ErrorMessage() << std::endl;
|
||||||
|
return nullptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
uint32 tmpSize = sizeof(DBnpcspells_Struct) + (sizeof(DBnpcspells_entries_Struct) * results.RowCount());
|
||||||
|
npc_spells_cache[iDBSpellsID] = (DBnpcspells_Struct*) new uchar[tmpSize];
|
||||||
|
memset(npc_spells_cache[iDBSpellsID], 0, tmpSize);
|
||||||
|
npc_spells_cache[iDBSpellsID]->parent_list = tmpparent_list;
|
||||||
|
npc_spells_cache[iDBSpellsID]->attack_proc = tmpattack_proc;
|
||||||
|
npc_spells_cache[iDBSpellsID]->proc_chance = tmpproc_chance;
|
||||||
|
npc_spells_cache[iDBSpellsID]->range_proc = tmprange_proc;
|
||||||
|
npc_spells_cache[iDBSpellsID]->rproc_chance = tmpdproc_chance;
|
||||||
|
npc_spells_cache[iDBSpellsID]->defensive_proc = tmpdefensive_proc;
|
||||||
|
npc_spells_cache[iDBSpellsID]->dproc_chance = tmpdproc_chance;
|
||||||
|
npc_spells_cache[iDBSpellsID]->fail_recast = tmppfail_recast;
|
||||||
|
npc_spells_cache[iDBSpellsID]->engaged_no_sp_recast_min = tmpengaged_no_sp_recast_min;
|
||||||
|
npc_spells_cache[iDBSpellsID]->engaged_no_sp_recast_max = tmpengaged_no_sp_recast_max;
|
||||||
|
npc_spells_cache[iDBSpellsID]->engaged_beneficial_self_chance = tmpengaged_b_self_chance;
|
||||||
|
npc_spells_cache[iDBSpellsID]->engaged_beneficial_other_chance = tmpengaged_b_other_chance;
|
||||||
|
npc_spells_cache[iDBSpellsID]->engaged_detrimental_chance = tmpengaged_d_chance;
|
||||||
|
npc_spells_cache[iDBSpellsID]->pursue_no_sp_recast_min = tmppursue_no_sp_recast_min;
|
||||||
|
npc_spells_cache[iDBSpellsID]->pursue_no_sp_recast_max = tmppursue_no_sp_recast_max;
|
||||||
|
npc_spells_cache[iDBSpellsID]->pursue_detrimental_chance = tmppursue_d_chance;
|
||||||
|
npc_spells_cache[iDBSpellsID]->idle_no_sp_recast_min = tmpidle_no_sp_recast_min;
|
||||||
|
npc_spells_cache[iDBSpellsID]->idle_no_sp_recast_max = tmpidle_no_sp_recast_max;
|
||||||
|
npc_spells_cache[iDBSpellsID]->idle_beneficial_chance = tmpidle_b_chance;
|
||||||
|
npc_spells_cache[iDBSpellsID]->numentries = results.RowCount();
|
||||||
|
|
||||||
|
int entryIndex = 0;
|
||||||
|
for (row = results.begin(); row != results.end(); ++row, ++entryIndex)
|
||||||
|
{
|
||||||
|
int spell_id = atoi(row[0]);
|
||||||
|
npc_spells_cache[iDBSpellsID]->entries[entryIndex].spellid = spell_id;
|
||||||
|
npc_spells_cache[iDBSpellsID]->entries[entryIndex].type = atoi(row[1]);
|
||||||
|
npc_spells_cache[iDBSpellsID]->entries[entryIndex].minlevel = atoi(row[2]);
|
||||||
|
npc_spells_cache[iDBSpellsID]->entries[entryIndex].maxlevel = atoi(row[3]);
|
||||||
|
npc_spells_cache[iDBSpellsID]->entries[entryIndex].manacost = atoi(row[4]);
|
||||||
|
npc_spells_cache[iDBSpellsID]->entries[entryIndex].recast_delay = atoi(row[5]);
|
||||||
|
npc_spells_cache[iDBSpellsID]->entries[entryIndex].priority = atoi(row[6]);
|
||||||
|
|
||||||
|
if(row[7])
|
||||||
|
npc_spells_cache[iDBSpellsID]->entries[entryIndex].resist_adjust = atoi(row[7]);
|
||||||
|
else if(IsValidSpell(spell_id))
|
||||||
|
npc_spells_cache[iDBSpellsID]->entries[entryIndex].resist_adjust = spells[spell_id].ResistDiff;
|
||||||
|
}
|
||||||
|
|
||||||
|
return npc_spells_cache[iDBSpellsID];
|
||||||
|
}
|
||||||
|
|
||||||
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
uint32 ZoneDatabase::GetMaxNPCSpellsID() {
|
uint32 ZoneDatabase::GetMaxNPCSpellsID() {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user