mirror of
https://github.com/EQEmu/Server.git
synced 2026-03-05 21:52:26 +00:00
[Refactor] Simplify NPC Loading (#2087)
* Refactor / simplify NPC loading * Update spacing [skip ci] * Update base_npc_types_repository.h
This commit is contained in:
Chris Miles
GitHub
parent
71ae03d5bc
commit
8f0b80097e
@ -26,15 +26,16 @@ public:
|
|||||||
int race;
|
int race;
|
||||||
int class_;
|
int class_;
|
||||||
int bodytype;
|
int bodytype;
|
||||||
int hp;
|
int64 hp;
|
||||||
int mana;
|
int64 mana;
|
||||||
int gender;
|
int gender;
|
||||||
int texture;
|
int texture;
|
||||||
int helmtexture;
|
int helmtexture;
|
||||||
int herosforgemodel;
|
int herosforgemodel;
|
||||||
float size;
|
float size;
|
||||||
int hp_regen_rate;
|
int64 hp_regen_rate;
|
||||||
int mana_regen_rate;
|
int64 hp_regen_per_second;
|
||||||
|
int64 mana_regen_rate;
|
||||||
int loottable_id;
|
int loottable_id;
|
||||||
int merchant_id;
|
int merchant_id;
|
||||||
int alt_currency_id;
|
int alt_currency_id;
|
||||||
@ -167,6 +168,7 @@ public:
|
|||||||
"herosforgemodel",
|
"herosforgemodel",
|
||||||
"size",
|
"size",
|
||||||
"hp_regen_rate",
|
"hp_regen_rate",
|
||||||
|
"hp_regen_per_second",
|
||||||
"mana_regen_rate",
|
"mana_regen_rate",
|
||||||
"loottable_id",
|
"loottable_id",
|
||||||
"merchant_id",
|
"merchant_id",
|
||||||
@ -296,6 +298,7 @@ public:
|
|||||||
"herosforgemodel",
|
"herosforgemodel",
|
||||||
"size",
|
"size",
|
||||||
"hp_regen_rate",
|
"hp_regen_rate",
|
||||||
|
"hp_regen_per_second",
|
||||||
"mana_regen_rate",
|
"mana_regen_rate",
|
||||||
"loottable_id",
|
"loottable_id",
|
||||||
"merchant_id",
|
"merchant_id",
|
||||||
@ -459,6 +462,7 @@ public:
|
|||||||
entry.herosforgemodel = 0;
|
entry.herosforgemodel = 0;
|
||||||
entry.size = 0;
|
entry.size = 0;
|
||||||
entry.hp_regen_rate = 0;
|
entry.hp_regen_rate = 0;
|
||||||
|
entry.hp_regen_per_second = 0;
|
||||||
entry.mana_regen_rate = 0;
|
entry.mana_regen_rate = 0;
|
||||||
entry.loottable_id = 0;
|
entry.loottable_id = 0;
|
||||||
entry.merchant_id = 0;
|
entry.merchant_id = 0;
|
||||||
@ -609,122 +613,123 @@ public:
|
|||||||
entry.race = atoi(row[4]);
|
entry.race = atoi(row[4]);
|
||||||
entry.class_ = atoi(row[5]);
|
entry.class_ = atoi(row[5]);
|
||||||
entry.bodytype = atoi(row[6]);
|
entry.bodytype = atoi(row[6]);
|
||||||
entry.hp = atoi(row[7]);
|
entry.hp = strtoll(row[7], nullptr, 10);
|
||||||
entry.mana = atoi(row[8]);
|
entry.mana = strtoll(row[8], nullptr, 10);
|
||||||
entry.gender = atoi(row[9]);
|
entry.gender = atoi(row[9]);
|
||||||
entry.texture = atoi(row[10]);
|
entry.texture = atoi(row[10]);
|
||||||
entry.helmtexture = atoi(row[11]);
|
entry.helmtexture = atoi(row[11]);
|
||||||
entry.herosforgemodel = atoi(row[12]);
|
entry.herosforgemodel = atoi(row[12]);
|
||||||
entry.size = static_cast<float>(atof(row[13]));
|
entry.size = static_cast<float>(atof(row[13]));
|
||||||
entry.hp_regen_rate = atoi(row[14]);
|
entry.hp_regen_rate = strtoll(row[14], nullptr, 10);
|
||||||
entry.mana_regen_rate = atoi(row[15]);
|
entry.hp_regen_per_second = strtoll(row[15], nullptr, 10);
|
||||||
entry.loottable_id = atoi(row[16]);
|
entry.mana_regen_rate = strtoll(row[16], nullptr, 10);
|
||||||
entry.merchant_id = atoi(row[17]);
|
entry.loottable_id = atoi(row[17]);
|
||||||
entry.alt_currency_id = atoi(row[18]);
|
entry.merchant_id = atoi(row[18]);
|
||||||
entry.npc_spells_id = atoi(row[19]);
|
entry.alt_currency_id = atoi(row[19]);
|
||||||
entry.npc_spells_effects_id = atoi(row[20]);
|
entry.npc_spells_id = atoi(row[20]);
|
||||||
entry.npc_faction_id = atoi(row[21]);
|
entry.npc_spells_effects_id = atoi(row[21]);
|
||||||
entry.adventure_template_id = atoi(row[22]);
|
entry.npc_faction_id = atoi(row[22]);
|
||||||
entry.trap_template = atoi(row[23]);
|
entry.adventure_template_id = atoi(row[23]);
|
||||||
entry.mindmg = atoi(row[24]);
|
entry.trap_template = atoi(row[24]);
|
||||||
entry.maxdmg = atoi(row[25]);
|
entry.mindmg = atoi(row[25]);
|
||||||
entry.attack_count = atoi(row[26]);
|
entry.maxdmg = atoi(row[26]);
|
||||||
entry.npcspecialattks = row[27] ? row[27] : "";
|
entry.attack_count = atoi(row[27]);
|
||||||
entry.special_abilities = row[28] ? row[28] : "";
|
entry.npcspecialattks = row[28] ? row[28] : "";
|
||||||
entry.aggroradius = atoi(row[29]);
|
entry.special_abilities = row[29] ? row[29] : "";
|
||||||
entry.assistradius = atoi(row[30]);
|
entry.aggroradius = atoi(row[30]);
|
||||||
entry.face = atoi(row[31]);
|
entry.assistradius = atoi(row[31]);
|
||||||
entry.luclin_hairstyle = atoi(row[32]);
|
entry.face = atoi(row[32]);
|
||||||
entry.luclin_haircolor = atoi(row[33]);
|
entry.luclin_hairstyle = atoi(row[33]);
|
||||||
entry.luclin_eyecolor = atoi(row[34]);
|
entry.luclin_haircolor = atoi(row[34]);
|
||||||
entry.luclin_eyecolor2 = atoi(row[35]);
|
entry.luclin_eyecolor = atoi(row[35]);
|
||||||
entry.luclin_beardcolor = atoi(row[36]);
|
entry.luclin_eyecolor2 = atoi(row[36]);
|
||||||
entry.luclin_beard = atoi(row[37]);
|
entry.luclin_beardcolor = atoi(row[37]);
|
||||||
entry.drakkin_heritage = atoi(row[38]);
|
entry.luclin_beard = atoi(row[38]);
|
||||||
entry.drakkin_tattoo = atoi(row[39]);
|
entry.drakkin_heritage = atoi(row[39]);
|
||||||
entry.drakkin_details = atoi(row[40]);
|
entry.drakkin_tattoo = atoi(row[40]);
|
||||||
entry.armortint_id = atoi(row[41]);
|
entry.drakkin_details = atoi(row[41]);
|
||||||
entry.armortint_red = atoi(row[42]);
|
entry.armortint_id = atoi(row[42]);
|
||||||
entry.armortint_green = atoi(row[43]);
|
entry.armortint_red = atoi(row[43]);
|
||||||
entry.armortint_blue = atoi(row[44]);
|
entry.armortint_green = atoi(row[44]);
|
||||||
entry.d_melee_texture1 = atoi(row[45]);
|
entry.armortint_blue = atoi(row[45]);
|
||||||
entry.d_melee_texture2 = atoi(row[46]);
|
entry.d_melee_texture1 = atoi(row[46]);
|
||||||
entry.ammo_idfile = row[47] ? row[47] : "";
|
entry.d_melee_texture2 = atoi(row[47]);
|
||||||
entry.prim_melee_type = atoi(row[48]);
|
entry.ammo_idfile = row[48] ? row[48] : "";
|
||||||
entry.sec_melee_type = atoi(row[49]);
|
entry.prim_melee_type = atoi(row[49]);
|
||||||
entry.ranged_type = atoi(row[50]);
|
entry.sec_melee_type = atoi(row[50]);
|
||||||
entry.runspeed = static_cast<float>(atof(row[51]));
|
entry.ranged_type = atoi(row[51]);
|
||||||
entry.MR = atoi(row[52]);
|
entry.runspeed = static_cast<float>(atof(row[52]));
|
||||||
entry.CR = atoi(row[53]);
|
entry.MR = atoi(row[53]);
|
||||||
entry.DR = atoi(row[54]);
|
entry.CR = atoi(row[54]);
|
||||||
entry.FR = atoi(row[55]);
|
entry.DR = atoi(row[55]);
|
||||||
entry.PR = atoi(row[56]);
|
entry.FR = atoi(row[56]);
|
||||||
entry.Corrup = atoi(row[57]);
|
entry.PR = atoi(row[57]);
|
||||||
entry.PhR = atoi(row[58]);
|
entry.Corrup = atoi(row[58]);
|
||||||
entry.see_invis = atoi(row[59]);
|
entry.PhR = atoi(row[59]);
|
||||||
entry.see_invis_undead = atoi(row[60]);
|
entry.see_invis = atoi(row[60]);
|
||||||
entry.qglobal = atoi(row[61]);
|
entry.see_invis_undead = atoi(row[61]);
|
||||||
entry.AC = atoi(row[62]);
|
entry.qglobal = atoi(row[62]);
|
||||||
entry.npc_aggro = atoi(row[63]);
|
entry.AC = atoi(row[63]);
|
||||||
entry.spawn_limit = atoi(row[64]);
|
entry.npc_aggro = atoi(row[64]);
|
||||||
entry.attack_speed = static_cast<float>(atof(row[65]));
|
entry.spawn_limit = atoi(row[65]);
|
||||||
entry.attack_delay = atoi(row[66]);
|
entry.attack_speed = static_cast<float>(atof(row[66]));
|
||||||
entry.findable = atoi(row[67]);
|
entry.attack_delay = atoi(row[67]);
|
||||||
entry.STR = atoi(row[68]);
|
entry.findable = atoi(row[68]);
|
||||||
entry.STA = atoi(row[69]);
|
entry.STR = atoi(row[69]);
|
||||||
entry.DEX = atoi(row[70]);
|
entry.STA = atoi(row[70]);
|
||||||
entry.AGI = atoi(row[71]);
|
entry.DEX = atoi(row[71]);
|
||||||
entry._INT = atoi(row[72]);
|
entry.AGI = atoi(row[72]);
|
||||||
entry.WIS = atoi(row[73]);
|
entry._INT = atoi(row[73]);
|
||||||
entry.CHA = atoi(row[74]);
|
entry.WIS = atoi(row[74]);
|
||||||
entry.see_hide = atoi(row[75]);
|
entry.CHA = atoi(row[75]);
|
||||||
entry.see_improved_hide = atoi(row[76]);
|
entry.see_hide = atoi(row[76]);
|
||||||
entry.trackable = atoi(row[77]);
|
entry.see_improved_hide = atoi(row[77]);
|
||||||
entry.isbot = atoi(row[78]);
|
entry.trackable = atoi(row[78]);
|
||||||
entry.exclude = atoi(row[79]);
|
entry.isbot = atoi(row[79]);
|
||||||
entry.ATK = atoi(row[80]);
|
entry.exclude = atoi(row[80]);
|
||||||
entry.Accuracy = atoi(row[81]);
|
entry.ATK = atoi(row[81]);
|
||||||
entry.Avoidance = atoi(row[82]);
|
entry.Accuracy = atoi(row[82]);
|
||||||
entry.slow_mitigation = atoi(row[83]);
|
entry.Avoidance = atoi(row[83]);
|
||||||
entry.version = atoi(row[84]);
|
entry.slow_mitigation = atoi(row[84]);
|
||||||
entry.maxlevel = atoi(row[85]);
|
entry.version = atoi(row[85]);
|
||||||
entry.scalerate = atoi(row[86]);
|
entry.maxlevel = atoi(row[86]);
|
||||||
entry.private_corpse = atoi(row[87]);
|
entry.scalerate = atoi(row[87]);
|
||||||
entry.unique_spawn_by_name = atoi(row[88]);
|
entry.private_corpse = atoi(row[88]);
|
||||||
entry.underwater = atoi(row[89]);
|
entry.unique_spawn_by_name = atoi(row[89]);
|
||||||
entry.isquest = atoi(row[90]);
|
entry.underwater = atoi(row[90]);
|
||||||
entry.emoteid = atoi(row[91]);
|
entry.isquest = atoi(row[91]);
|
||||||
entry.spellscale = static_cast<float>(atof(row[92]));
|
entry.emoteid = atoi(row[92]);
|
||||||
entry.healscale = static_cast<float>(atof(row[93]));
|
entry.spellscale = static_cast<float>(atof(row[93]));
|
||||||
entry.no_target_hotkey = atoi(row[94]);
|
entry.healscale = static_cast<float>(atof(row[94]));
|
||||||
entry.raid_target = atoi(row[95]);
|
entry.no_target_hotkey = atoi(row[95]);
|
||||||
entry.armtexture = atoi(row[96]);
|
entry.raid_target = atoi(row[96]);
|
||||||
entry.bracertexture = atoi(row[97]);
|
entry.armtexture = atoi(row[97]);
|
||||||
entry.handtexture = atoi(row[98]);
|
entry.bracertexture = atoi(row[98]);
|
||||||
entry.legtexture = atoi(row[99]);
|
entry.handtexture = atoi(row[99]);
|
||||||
entry.feettexture = atoi(row[100]);
|
entry.legtexture = atoi(row[100]);
|
||||||
entry.light = atoi(row[101]);
|
entry.feettexture = atoi(row[101]);
|
||||||
entry.walkspeed = atoi(row[102]);
|
entry.light = atoi(row[102]);
|
||||||
entry.peqid = atoi(row[103]);
|
entry.walkspeed = atoi(row[103]);
|
||||||
entry.unique_ = atoi(row[104]);
|
entry.peqid = atoi(row[104]);
|
||||||
entry.fixed = atoi(row[105]);
|
entry.unique_ = atoi(row[105]);
|
||||||
entry.ignore_despawn = atoi(row[106]);
|
entry.fixed = atoi(row[106]);
|
||||||
entry.show_name = atoi(row[107]);
|
entry.ignore_despawn = atoi(row[107]);
|
||||||
entry.untargetable = atoi(row[108]);
|
entry.show_name = atoi(row[108]);
|
||||||
entry.charm_ac = atoi(row[109]);
|
entry.untargetable = atoi(row[109]);
|
||||||
entry.charm_min_dmg = atoi(row[110]);
|
entry.charm_ac = atoi(row[110]);
|
||||||
entry.charm_max_dmg = atoi(row[111]);
|
entry.charm_min_dmg = atoi(row[111]);
|
||||||
entry.charm_attack_delay = atoi(row[112]);
|
entry.charm_max_dmg = atoi(row[112]);
|
||||||
entry.charm_accuracy_rating = atoi(row[113]);
|
entry.charm_attack_delay = atoi(row[113]);
|
||||||
entry.charm_avoidance_rating = atoi(row[114]);
|
entry.charm_accuracy_rating = atoi(row[114]);
|
||||||
entry.charm_atk = atoi(row[115]);
|
entry.charm_avoidance_rating = atoi(row[115]);
|
||||||
entry.skip_global_loot = atoi(row[116]);
|
entry.charm_atk = atoi(row[116]);
|
||||||
entry.rare_spawn = atoi(row[117]);
|
entry.skip_global_loot = atoi(row[117]);
|
||||||
entry.stuck_behavior = atoi(row[118]);
|
entry.rare_spawn = atoi(row[118]);
|
||||||
entry.model = atoi(row[119]);
|
entry.stuck_behavior = atoi(row[119]);
|
||||||
entry.flymode = atoi(row[120]);
|
entry.model = atoi(row[120]);
|
||||||
entry.always_aggro = atoi(row[121]);
|
entry.flymode = atoi(row[121]);
|
||||||
entry.exp_mod = atoi(row[122]);
|
entry.always_aggro = atoi(row[122]);
|
||||||
|
entry.exp_mod = atoi(row[123]);
|
||||||
|
|
||||||
return entry;
|
return entry;
|
||||||
}
|
}
|
||||||
@ -772,114 +777,115 @@ public:
|
|||||||
update_values.push_back(columns[12] + " = " + std::to_string(npc_types_entry.herosforgemodel));
|
update_values.push_back(columns[12] + " = " + std::to_string(npc_types_entry.herosforgemodel));
|
||||||
update_values.push_back(columns[13] + " = " + std::to_string(npc_types_entry.size));
|
update_values.push_back(columns[13] + " = " + std::to_string(npc_types_entry.size));
|
||||||
update_values.push_back(columns[14] + " = " + std::to_string(npc_types_entry.hp_regen_rate));
|
update_values.push_back(columns[14] + " = " + std::to_string(npc_types_entry.hp_regen_rate));
|
||||||
update_values.push_back(columns[15] + " = " + std::to_string(npc_types_entry.mana_regen_rate));
|
update_values.push_back(columns[15] + " = " + std::to_string(npc_types_entry.hp_regen_per_second));
|
||||||
update_values.push_back(columns[16] + " = " + std::to_string(npc_types_entry.loottable_id));
|
update_values.push_back(columns[16] + " = " + std::to_string(npc_types_entry.mana_regen_rate));
|
||||||
update_values.push_back(columns[17] + " = " + std::to_string(npc_types_entry.merchant_id));
|
update_values.push_back(columns[17] + " = " + std::to_string(npc_types_entry.loottable_id));
|
||||||
update_values.push_back(columns[18] + " = " + std::to_string(npc_types_entry.alt_currency_id));
|
update_values.push_back(columns[18] + " = " + std::to_string(npc_types_entry.merchant_id));
|
||||||
update_values.push_back(columns[19] + " = " + std::to_string(npc_types_entry.npc_spells_id));
|
update_values.push_back(columns[19] + " = " + std::to_string(npc_types_entry.alt_currency_id));
|
||||||
update_values.push_back(columns[20] + " = " + std::to_string(npc_types_entry.npc_spells_effects_id));
|
update_values.push_back(columns[20] + " = " + std::to_string(npc_types_entry.npc_spells_id));
|
||||||
update_values.push_back(columns[21] + " = " + std::to_string(npc_types_entry.npc_faction_id));
|
update_values.push_back(columns[21] + " = " + std::to_string(npc_types_entry.npc_spells_effects_id));
|
||||||
update_values.push_back(columns[22] + " = " + std::to_string(npc_types_entry.adventure_template_id));
|
update_values.push_back(columns[22] + " = " + std::to_string(npc_types_entry.npc_faction_id));
|
||||||
update_values.push_back(columns[23] + " = " + std::to_string(npc_types_entry.trap_template));
|
update_values.push_back(columns[23] + " = " + std::to_string(npc_types_entry.adventure_template_id));
|
||||||
update_values.push_back(columns[24] + " = " + std::to_string(npc_types_entry.mindmg));
|
update_values.push_back(columns[24] + " = " + std::to_string(npc_types_entry.trap_template));
|
||||||
update_values.push_back(columns[25] + " = " + std::to_string(npc_types_entry.maxdmg));
|
update_values.push_back(columns[25] + " = " + std::to_string(npc_types_entry.mindmg));
|
||||||
update_values.push_back(columns[26] + " = " + std::to_string(npc_types_entry.attack_count));
|
update_values.push_back(columns[26] + " = " + std::to_string(npc_types_entry.maxdmg));
|
||||||
update_values.push_back(columns[27] + " = '" + EscapeString(npc_types_entry.npcspecialattks) + "'");
|
update_values.push_back(columns[27] + " = " + std::to_string(npc_types_entry.attack_count));
|
||||||
update_values.push_back(columns[28] + " = '" + EscapeString(npc_types_entry.special_abilities) + "'");
|
update_values.push_back(columns[28] + " = '" + EscapeString(npc_types_entry.npcspecialattks) + "'");
|
||||||
update_values.push_back(columns[29] + " = " + std::to_string(npc_types_entry.aggroradius));
|
update_values.push_back(columns[29] + " = '" + EscapeString(npc_types_entry.special_abilities) + "'");
|
||||||
update_values.push_back(columns[30] + " = " + std::to_string(npc_types_entry.assistradius));
|
update_values.push_back(columns[30] + " = " + std::to_string(npc_types_entry.aggroradius));
|
||||||
update_values.push_back(columns[31] + " = " + std::to_string(npc_types_entry.face));
|
update_values.push_back(columns[31] + " = " + std::to_string(npc_types_entry.assistradius));
|
||||||
update_values.push_back(columns[32] + " = " + std::to_string(npc_types_entry.luclin_hairstyle));
|
update_values.push_back(columns[32] + " = " + std::to_string(npc_types_entry.face));
|
||||||
update_values.push_back(columns[33] + " = " + std::to_string(npc_types_entry.luclin_haircolor));
|
update_values.push_back(columns[33] + " = " + std::to_string(npc_types_entry.luclin_hairstyle));
|
||||||
update_values.push_back(columns[34] + " = " + std::to_string(npc_types_entry.luclin_eyecolor));
|
update_values.push_back(columns[34] + " = " + std::to_string(npc_types_entry.luclin_haircolor));
|
||||||
update_values.push_back(columns[35] + " = " + std::to_string(npc_types_entry.luclin_eyecolor2));
|
update_values.push_back(columns[35] + " = " + std::to_string(npc_types_entry.luclin_eyecolor));
|
||||||
update_values.push_back(columns[36] + " = " + std::to_string(npc_types_entry.luclin_beardcolor));
|
update_values.push_back(columns[36] + " = " + std::to_string(npc_types_entry.luclin_eyecolor2));
|
||||||
update_values.push_back(columns[37] + " = " + std::to_string(npc_types_entry.luclin_beard));
|
update_values.push_back(columns[37] + " = " + std::to_string(npc_types_entry.luclin_beardcolor));
|
||||||
update_values.push_back(columns[38] + " = " + std::to_string(npc_types_entry.drakkin_heritage));
|
update_values.push_back(columns[38] + " = " + std::to_string(npc_types_entry.luclin_beard));
|
||||||
update_values.push_back(columns[39] + " = " + std::to_string(npc_types_entry.drakkin_tattoo));
|
update_values.push_back(columns[39] + " = " + std::to_string(npc_types_entry.drakkin_heritage));
|
||||||
update_values.push_back(columns[40] + " = " + std::to_string(npc_types_entry.drakkin_details));
|
update_values.push_back(columns[40] + " = " + std::to_string(npc_types_entry.drakkin_tattoo));
|
||||||
update_values.push_back(columns[41] + " = " + std::to_string(npc_types_entry.armortint_id));
|
update_values.push_back(columns[41] + " = " + std::to_string(npc_types_entry.drakkin_details));
|
||||||
update_values.push_back(columns[42] + " = " + std::to_string(npc_types_entry.armortint_red));
|
update_values.push_back(columns[42] + " = " + std::to_string(npc_types_entry.armortint_id));
|
||||||
update_values.push_back(columns[43] + " = " + std::to_string(npc_types_entry.armortint_green));
|
update_values.push_back(columns[43] + " = " + std::to_string(npc_types_entry.armortint_red));
|
||||||
update_values.push_back(columns[44] + " = " + std::to_string(npc_types_entry.armortint_blue));
|
update_values.push_back(columns[44] + " = " + std::to_string(npc_types_entry.armortint_green));
|
||||||
update_values.push_back(columns[45] + " = " + std::to_string(npc_types_entry.d_melee_texture1));
|
update_values.push_back(columns[45] + " = " + std::to_string(npc_types_entry.armortint_blue));
|
||||||
update_values.push_back(columns[46] + " = " + std::to_string(npc_types_entry.d_melee_texture2));
|
update_values.push_back(columns[46] + " = " + std::to_string(npc_types_entry.d_melee_texture1));
|
||||||
update_values.push_back(columns[47] + " = '" + EscapeString(npc_types_entry.ammo_idfile) + "'");
|
update_values.push_back(columns[47] + " = " + std::to_string(npc_types_entry.d_melee_texture2));
|
||||||
update_values.push_back(columns[48] + " = " + std::to_string(npc_types_entry.prim_melee_type));
|
update_values.push_back(columns[48] + " = '" + EscapeString(npc_types_entry.ammo_idfile) + "'");
|
||||||
update_values.push_back(columns[49] + " = " + std::to_string(npc_types_entry.sec_melee_type));
|
update_values.push_back(columns[49] + " = " + std::to_string(npc_types_entry.prim_melee_type));
|
||||||
update_values.push_back(columns[50] + " = " + std::to_string(npc_types_entry.ranged_type));
|
update_values.push_back(columns[50] + " = " + std::to_string(npc_types_entry.sec_melee_type));
|
||||||
update_values.push_back(columns[51] + " = " + std::to_string(npc_types_entry.runspeed));
|
update_values.push_back(columns[51] + " = " + std::to_string(npc_types_entry.ranged_type));
|
||||||
update_values.push_back(columns[52] + " = " + std::to_string(npc_types_entry.MR));
|
update_values.push_back(columns[52] + " = " + std::to_string(npc_types_entry.runspeed));
|
||||||
update_values.push_back(columns[53] + " = " + std::to_string(npc_types_entry.CR));
|
update_values.push_back(columns[53] + " = " + std::to_string(npc_types_entry.MR));
|
||||||
update_values.push_back(columns[54] + " = " + std::to_string(npc_types_entry.DR));
|
update_values.push_back(columns[54] + " = " + std::to_string(npc_types_entry.CR));
|
||||||
update_values.push_back(columns[55] + " = " + std::to_string(npc_types_entry.FR));
|
update_values.push_back(columns[55] + " = " + std::to_string(npc_types_entry.DR));
|
||||||
update_values.push_back(columns[56] + " = " + std::to_string(npc_types_entry.PR));
|
update_values.push_back(columns[56] + " = " + std::to_string(npc_types_entry.FR));
|
||||||
update_values.push_back(columns[57] + " = " + std::to_string(npc_types_entry.Corrup));
|
update_values.push_back(columns[57] + " = " + std::to_string(npc_types_entry.PR));
|
||||||
update_values.push_back(columns[58] + " = " + std::to_string(npc_types_entry.PhR));
|
update_values.push_back(columns[58] + " = " + std::to_string(npc_types_entry.Corrup));
|
||||||
update_values.push_back(columns[59] + " = " + std::to_string(npc_types_entry.see_invis));
|
update_values.push_back(columns[59] + " = " + std::to_string(npc_types_entry.PhR));
|
||||||
update_values.push_back(columns[60] + " = " + std::to_string(npc_types_entry.see_invis_undead));
|
update_values.push_back(columns[60] + " = " + std::to_string(npc_types_entry.see_invis));
|
||||||
update_values.push_back(columns[61] + " = " + std::to_string(npc_types_entry.qglobal));
|
update_values.push_back(columns[61] + " = " + std::to_string(npc_types_entry.see_invis_undead));
|
||||||
update_values.push_back(columns[62] + " = " + std::to_string(npc_types_entry.AC));
|
update_values.push_back(columns[62] + " = " + std::to_string(npc_types_entry.qglobal));
|
||||||
update_values.push_back(columns[63] + " = " + std::to_string(npc_types_entry.npc_aggro));
|
update_values.push_back(columns[63] + " = " + std::to_string(npc_types_entry.AC));
|
||||||
update_values.push_back(columns[64] + " = " + std::to_string(npc_types_entry.spawn_limit));
|
update_values.push_back(columns[64] + " = " + std::to_string(npc_types_entry.npc_aggro));
|
||||||
update_values.push_back(columns[65] + " = " + std::to_string(npc_types_entry.attack_speed));
|
update_values.push_back(columns[65] + " = " + std::to_string(npc_types_entry.spawn_limit));
|
||||||
update_values.push_back(columns[66] + " = " + std::to_string(npc_types_entry.attack_delay));
|
update_values.push_back(columns[66] + " = " + std::to_string(npc_types_entry.attack_speed));
|
||||||
update_values.push_back(columns[67] + " = " + std::to_string(npc_types_entry.findable));
|
update_values.push_back(columns[67] + " = " + std::to_string(npc_types_entry.attack_delay));
|
||||||
update_values.push_back(columns[68] + " = " + std::to_string(npc_types_entry.STR));
|
update_values.push_back(columns[68] + " = " + std::to_string(npc_types_entry.findable));
|
||||||
update_values.push_back(columns[69] + " = " + std::to_string(npc_types_entry.STA));
|
update_values.push_back(columns[69] + " = " + std::to_string(npc_types_entry.STR));
|
||||||
update_values.push_back(columns[70] + " = " + std::to_string(npc_types_entry.DEX));
|
update_values.push_back(columns[70] + " = " + std::to_string(npc_types_entry.STA));
|
||||||
update_values.push_back(columns[71] + " = " + std::to_string(npc_types_entry.AGI));
|
update_values.push_back(columns[71] + " = " + std::to_string(npc_types_entry.DEX));
|
||||||
update_values.push_back(columns[72] + " = " + std::to_string(npc_types_entry._INT));
|
update_values.push_back(columns[72] + " = " + std::to_string(npc_types_entry.AGI));
|
||||||
update_values.push_back(columns[73] + " = " + std::to_string(npc_types_entry.WIS));
|
update_values.push_back(columns[73] + " = " + std::to_string(npc_types_entry._INT));
|
||||||
update_values.push_back(columns[74] + " = " + std::to_string(npc_types_entry.CHA));
|
update_values.push_back(columns[74] + " = " + std::to_string(npc_types_entry.WIS));
|
||||||
update_values.push_back(columns[75] + " = " + std::to_string(npc_types_entry.see_hide));
|
update_values.push_back(columns[75] + " = " + std::to_string(npc_types_entry.CHA));
|
||||||
update_values.push_back(columns[76] + " = " + std::to_string(npc_types_entry.see_improved_hide));
|
update_values.push_back(columns[76] + " = " + std::to_string(npc_types_entry.see_hide));
|
||||||
update_values.push_back(columns[77] + " = " + std::to_string(npc_types_entry.trackable));
|
update_values.push_back(columns[77] + " = " + std::to_string(npc_types_entry.see_improved_hide));
|
||||||
update_values.push_back(columns[78] + " = " + std::to_string(npc_types_entry.isbot));
|
update_values.push_back(columns[78] + " = " + std::to_string(npc_types_entry.trackable));
|
||||||
update_values.push_back(columns[79] + " = " + std::to_string(npc_types_entry.exclude));
|
update_values.push_back(columns[79] + " = " + std::to_string(npc_types_entry.isbot));
|
||||||
update_values.push_back(columns[80] + " = " + std::to_string(npc_types_entry.ATK));
|
update_values.push_back(columns[80] + " = " + std::to_string(npc_types_entry.exclude));
|
||||||
update_values.push_back(columns[81] + " = " + std::to_string(npc_types_entry.Accuracy));
|
update_values.push_back(columns[81] + " = " + std::to_string(npc_types_entry.ATK));
|
||||||
update_values.push_back(columns[82] + " = " + std::to_string(npc_types_entry.Avoidance));
|
update_values.push_back(columns[82] + " = " + std::to_string(npc_types_entry.Accuracy));
|
||||||
update_values.push_back(columns[83] + " = " + std::to_string(npc_types_entry.slow_mitigation));
|
update_values.push_back(columns[83] + " = " + std::to_string(npc_types_entry.Avoidance));
|
||||||
update_values.push_back(columns[84] + " = " + std::to_string(npc_types_entry.version));
|
update_values.push_back(columns[84] + " = " + std::to_string(npc_types_entry.slow_mitigation));
|
||||||
update_values.push_back(columns[85] + " = " + std::to_string(npc_types_entry.maxlevel));
|
update_values.push_back(columns[85] + " = " + std::to_string(npc_types_entry.version));
|
||||||
update_values.push_back(columns[86] + " = " + std::to_string(npc_types_entry.scalerate));
|
update_values.push_back(columns[86] + " = " + std::to_string(npc_types_entry.maxlevel));
|
||||||
update_values.push_back(columns[87] + " = " + std::to_string(npc_types_entry.private_corpse));
|
update_values.push_back(columns[87] + " = " + std::to_string(npc_types_entry.scalerate));
|
||||||
update_values.push_back(columns[88] + " = " + std::to_string(npc_types_entry.unique_spawn_by_name));
|
update_values.push_back(columns[88] + " = " + std::to_string(npc_types_entry.private_corpse));
|
||||||
update_values.push_back(columns[89] + " = " + std::to_string(npc_types_entry.underwater));
|
update_values.push_back(columns[89] + " = " + std::to_string(npc_types_entry.unique_spawn_by_name));
|
||||||
update_values.push_back(columns[90] + " = " + std::to_string(npc_types_entry.isquest));
|
update_values.push_back(columns[90] + " = " + std::to_string(npc_types_entry.underwater));
|
||||||
update_values.push_back(columns[91] + " = " + std::to_string(npc_types_entry.emoteid));
|
update_values.push_back(columns[91] + " = " + std::to_string(npc_types_entry.isquest));
|
||||||
update_values.push_back(columns[92] + " = " + std::to_string(npc_types_entry.spellscale));
|
update_values.push_back(columns[92] + " = " + std::to_string(npc_types_entry.emoteid));
|
||||||
update_values.push_back(columns[93] + " = " + std::to_string(npc_types_entry.healscale));
|
update_values.push_back(columns[93] + " = " + std::to_string(npc_types_entry.spellscale));
|
||||||
update_values.push_back(columns[94] + " = " + std::to_string(npc_types_entry.no_target_hotkey));
|
update_values.push_back(columns[94] + " = " + std::to_string(npc_types_entry.healscale));
|
||||||
update_values.push_back(columns[95] + " = " + std::to_string(npc_types_entry.raid_target));
|
update_values.push_back(columns[95] + " = " + std::to_string(npc_types_entry.no_target_hotkey));
|
||||||
update_values.push_back(columns[96] + " = " + std::to_string(npc_types_entry.armtexture));
|
update_values.push_back(columns[96] + " = " + std::to_string(npc_types_entry.raid_target));
|
||||||
update_values.push_back(columns[97] + " = " + std::to_string(npc_types_entry.bracertexture));
|
update_values.push_back(columns[97] + " = " + std::to_string(npc_types_entry.armtexture));
|
||||||
update_values.push_back(columns[98] + " = " + std::to_string(npc_types_entry.handtexture));
|
update_values.push_back(columns[98] + " = " + std::to_string(npc_types_entry.bracertexture));
|
||||||
update_values.push_back(columns[99] + " = " + std::to_string(npc_types_entry.legtexture));
|
update_values.push_back(columns[99] + " = " + std::to_string(npc_types_entry.handtexture));
|
||||||
update_values.push_back(columns[100] + " = " + std::to_string(npc_types_entry.feettexture));
|
update_values.push_back(columns[100] + " = " + std::to_string(npc_types_entry.legtexture));
|
||||||
update_values.push_back(columns[101] + " = " + std::to_string(npc_types_entry.light));
|
update_values.push_back(columns[101] + " = " + std::to_string(npc_types_entry.feettexture));
|
||||||
update_values.push_back(columns[102] + " = " + std::to_string(npc_types_entry.walkspeed));
|
update_values.push_back(columns[102] + " = " + std::to_string(npc_types_entry.light));
|
||||||
update_values.push_back(columns[103] + " = " + std::to_string(npc_types_entry.peqid));
|
update_values.push_back(columns[103] + " = " + std::to_string(npc_types_entry.walkspeed));
|
||||||
update_values.push_back(columns[104] + " = " + std::to_string(npc_types_entry.unique_));
|
update_values.push_back(columns[104] + " = " + std::to_string(npc_types_entry.peqid));
|
||||||
update_values.push_back(columns[105] + " = " + std::to_string(npc_types_entry.fixed));
|
update_values.push_back(columns[105] + " = " + std::to_string(npc_types_entry.unique_));
|
||||||
update_values.push_back(columns[106] + " = " + std::to_string(npc_types_entry.ignore_despawn));
|
update_values.push_back(columns[106] + " = " + std::to_string(npc_types_entry.fixed));
|
||||||
update_values.push_back(columns[107] + " = " + std::to_string(npc_types_entry.show_name));
|
update_values.push_back(columns[107] + " = " + std::to_string(npc_types_entry.ignore_despawn));
|
||||||
update_values.push_back(columns[108] + " = " + std::to_string(npc_types_entry.untargetable));
|
update_values.push_back(columns[108] + " = " + std::to_string(npc_types_entry.show_name));
|
||||||
update_values.push_back(columns[109] + " = " + std::to_string(npc_types_entry.charm_ac));
|
update_values.push_back(columns[109] + " = " + std::to_string(npc_types_entry.untargetable));
|
||||||
update_values.push_back(columns[110] + " = " + std::to_string(npc_types_entry.charm_min_dmg));
|
update_values.push_back(columns[110] + " = " + std::to_string(npc_types_entry.charm_ac));
|
||||||
update_values.push_back(columns[111] + " = " + std::to_string(npc_types_entry.charm_max_dmg));
|
update_values.push_back(columns[111] + " = " + std::to_string(npc_types_entry.charm_min_dmg));
|
||||||
update_values.push_back(columns[112] + " = " + std::to_string(npc_types_entry.charm_attack_delay));
|
update_values.push_back(columns[112] + " = " + std::to_string(npc_types_entry.charm_max_dmg));
|
||||||
update_values.push_back(columns[113] + " = " + std::to_string(npc_types_entry.charm_accuracy_rating));
|
update_values.push_back(columns[113] + " = " + std::to_string(npc_types_entry.charm_attack_delay));
|
||||||
update_values.push_back(columns[114] + " = " + std::to_string(npc_types_entry.charm_avoidance_rating));
|
update_values.push_back(columns[114] + " = " + std::to_string(npc_types_entry.charm_accuracy_rating));
|
||||||
update_values.push_back(columns[115] + " = " + std::to_string(npc_types_entry.charm_atk));
|
update_values.push_back(columns[115] + " = " + std::to_string(npc_types_entry.charm_avoidance_rating));
|
||||||
update_values.push_back(columns[116] + " = " + std::to_string(npc_types_entry.skip_global_loot));
|
update_values.push_back(columns[116] + " = " + std::to_string(npc_types_entry.charm_atk));
|
||||||
update_values.push_back(columns[117] + " = " + std::to_string(npc_types_entry.rare_spawn));
|
update_values.push_back(columns[117] + " = " + std::to_string(npc_types_entry.skip_global_loot));
|
||||||
update_values.push_back(columns[118] + " = " + std::to_string(npc_types_entry.stuck_behavior));
|
update_values.push_back(columns[118] + " = " + std::to_string(npc_types_entry.rare_spawn));
|
||||||
update_values.push_back(columns[119] + " = " + std::to_string(npc_types_entry.model));
|
update_values.push_back(columns[119] + " = " + std::to_string(npc_types_entry.stuck_behavior));
|
||||||
update_values.push_back(columns[120] + " = " + std::to_string(npc_types_entry.flymode));
|
update_values.push_back(columns[120] + " = " + std::to_string(npc_types_entry.model));
|
||||||
update_values.push_back(columns[121] + " = " + std::to_string(npc_types_entry.always_aggro));
|
update_values.push_back(columns[121] + " = " + std::to_string(npc_types_entry.flymode));
|
||||||
update_values.push_back(columns[122] + " = " + std::to_string(npc_types_entry.exp_mod));
|
update_values.push_back(columns[122] + " = " + std::to_string(npc_types_entry.always_aggro));
|
||||||
|
update_values.push_back(columns[123] + " = " + std::to_string(npc_types_entry.exp_mod));
|
||||||
|
|
||||||
auto results = db.QueryDatabase(
|
auto results = db.QueryDatabase(
|
||||||
fmt::format(
|
fmt::format(
|
||||||
@ -916,6 +922,7 @@ public:
|
|||||||
insert_values.push_back(std::to_string(npc_types_entry.herosforgemodel));
|
insert_values.push_back(std::to_string(npc_types_entry.herosforgemodel));
|
||||||
insert_values.push_back(std::to_string(npc_types_entry.size));
|
insert_values.push_back(std::to_string(npc_types_entry.size));
|
||||||
insert_values.push_back(std::to_string(npc_types_entry.hp_regen_rate));
|
insert_values.push_back(std::to_string(npc_types_entry.hp_regen_rate));
|
||||||
|
insert_values.push_back(std::to_string(npc_types_entry.hp_regen_per_second));
|
||||||
insert_values.push_back(std::to_string(npc_types_entry.mana_regen_rate));
|
insert_values.push_back(std::to_string(npc_types_entry.mana_regen_rate));
|
||||||
insert_values.push_back(std::to_string(npc_types_entry.loottable_id));
|
insert_values.push_back(std::to_string(npc_types_entry.loottable_id));
|
||||||
insert_values.push_back(std::to_string(npc_types_entry.merchant_id));
|
insert_values.push_back(std::to_string(npc_types_entry.merchant_id));
|
||||||
@ -1068,6 +1075,7 @@ public:
|
|||||||
insert_values.push_back(std::to_string(npc_types_entry.herosforgemodel));
|
insert_values.push_back(std::to_string(npc_types_entry.herosforgemodel));
|
||||||
insert_values.push_back(std::to_string(npc_types_entry.size));
|
insert_values.push_back(std::to_string(npc_types_entry.size));
|
||||||
insert_values.push_back(std::to_string(npc_types_entry.hp_regen_rate));
|
insert_values.push_back(std::to_string(npc_types_entry.hp_regen_rate));
|
||||||
|
insert_values.push_back(std::to_string(npc_types_entry.hp_regen_per_second));
|
||||||
insert_values.push_back(std::to_string(npc_types_entry.mana_regen_rate));
|
insert_values.push_back(std::to_string(npc_types_entry.mana_regen_rate));
|
||||||
insert_values.push_back(std::to_string(npc_types_entry.loottable_id));
|
insert_values.push_back(std::to_string(npc_types_entry.loottable_id));
|
||||||
insert_values.push_back(std::to_string(npc_types_entry.merchant_id));
|
insert_values.push_back(std::to_string(npc_types_entry.merchant_id));
|
||||||
@ -1216,122 +1224,123 @@ public:
|
|||||||
entry.race = atoi(row[4]);
|
entry.race = atoi(row[4]);
|
||||||
entry.class_ = atoi(row[5]);
|
entry.class_ = atoi(row[5]);
|
||||||
entry.bodytype = atoi(row[6]);
|
entry.bodytype = atoi(row[6]);
|
||||||
entry.hp = atoi(row[7]);
|
entry.hp = strtoll(row[7], nullptr, 10);
|
||||||
entry.mana = atoi(row[8]);
|
entry.mana = strtoll(row[8], nullptr, 10);
|
||||||
entry.gender = atoi(row[9]);
|
entry.gender = atoi(row[9]);
|
||||||
entry.texture = atoi(row[10]);
|
entry.texture = atoi(row[10]);
|
||||||
entry.helmtexture = atoi(row[11]);
|
entry.helmtexture = atoi(row[11]);
|
||||||
entry.herosforgemodel = atoi(row[12]);
|
entry.herosforgemodel = atoi(row[12]);
|
||||||
entry.size = static_cast<float>(atof(row[13]));
|
entry.size = static_cast<float>(atof(row[13]));
|
||||||
entry.hp_regen_rate = atoi(row[14]);
|
entry.hp_regen_rate = strtoll(row[14], nullptr, 10);
|
||||||
entry.mana_regen_rate = atoi(row[15]);
|
entry.hp_regen_per_second = strtoll(row[15], nullptr, 10);
|
||||||
entry.loottable_id = atoi(row[16]);
|
entry.mana_regen_rate = strtoll(row[16], nullptr, 10);
|
||||||
entry.merchant_id = atoi(row[17]);
|
entry.loottable_id = atoi(row[17]);
|
||||||
entry.alt_currency_id = atoi(row[18]);
|
entry.merchant_id = atoi(row[18]);
|
||||||
entry.npc_spells_id = atoi(row[19]);
|
entry.alt_currency_id = atoi(row[19]);
|
||||||
entry.npc_spells_effects_id = atoi(row[20]);
|
entry.npc_spells_id = atoi(row[20]);
|
||||||
entry.npc_faction_id = atoi(row[21]);
|
entry.npc_spells_effects_id = atoi(row[21]);
|
||||||
entry.adventure_template_id = atoi(row[22]);
|
entry.npc_faction_id = atoi(row[22]);
|
||||||
entry.trap_template = atoi(row[23]);
|
entry.adventure_template_id = atoi(row[23]);
|
||||||
entry.mindmg = atoi(row[24]);
|
entry.trap_template = atoi(row[24]);
|
||||||
entry.maxdmg = atoi(row[25]);
|
entry.mindmg = atoi(row[25]);
|
||||||
entry.attack_count = atoi(row[26]);
|
entry.maxdmg = atoi(row[26]);
|
||||||
entry.npcspecialattks = row[27] ? row[27] : "";
|
entry.attack_count = atoi(row[27]);
|
||||||
entry.special_abilities = row[28] ? row[28] : "";
|
entry.npcspecialattks = row[28] ? row[28] : "";
|
||||||
entry.aggroradius = atoi(row[29]);
|
entry.special_abilities = row[29] ? row[29] : "";
|
||||||
entry.assistradius = atoi(row[30]);
|
entry.aggroradius = atoi(row[30]);
|
||||||
entry.face = atoi(row[31]);
|
entry.assistradius = atoi(row[31]);
|
||||||
entry.luclin_hairstyle = atoi(row[32]);
|
entry.face = atoi(row[32]);
|
||||||
entry.luclin_haircolor = atoi(row[33]);
|
entry.luclin_hairstyle = atoi(row[33]);
|
||||||
entry.luclin_eyecolor = atoi(row[34]);
|
entry.luclin_haircolor = atoi(row[34]);
|
||||||
entry.luclin_eyecolor2 = atoi(row[35]);
|
entry.luclin_eyecolor = atoi(row[35]);
|
||||||
entry.luclin_beardcolor = atoi(row[36]);
|
entry.luclin_eyecolor2 = atoi(row[36]);
|
||||||
entry.luclin_beard = atoi(row[37]);
|
entry.luclin_beardcolor = atoi(row[37]);
|
||||||
entry.drakkin_heritage = atoi(row[38]);
|
entry.luclin_beard = atoi(row[38]);
|
||||||
entry.drakkin_tattoo = atoi(row[39]);
|
entry.drakkin_heritage = atoi(row[39]);
|
||||||
entry.drakkin_details = atoi(row[40]);
|
entry.drakkin_tattoo = atoi(row[40]);
|
||||||
entry.armortint_id = atoi(row[41]);
|
entry.drakkin_details = atoi(row[41]);
|
||||||
entry.armortint_red = atoi(row[42]);
|
entry.armortint_id = atoi(row[42]);
|
||||||
entry.armortint_green = atoi(row[43]);
|
entry.armortint_red = atoi(row[43]);
|
||||||
entry.armortint_blue = atoi(row[44]);
|
entry.armortint_green = atoi(row[44]);
|
||||||
entry.d_melee_texture1 = atoi(row[45]);
|
entry.armortint_blue = atoi(row[45]);
|
||||||
entry.d_melee_texture2 = atoi(row[46]);
|
entry.d_melee_texture1 = atoi(row[46]);
|
||||||
entry.ammo_idfile = row[47] ? row[47] : "";
|
entry.d_melee_texture2 = atoi(row[47]);
|
||||||
entry.prim_melee_type = atoi(row[48]);
|
entry.ammo_idfile = row[48] ? row[48] : "";
|
||||||
entry.sec_melee_type = atoi(row[49]);
|
entry.prim_melee_type = atoi(row[49]);
|
||||||
entry.ranged_type = atoi(row[50]);
|
entry.sec_melee_type = atoi(row[50]);
|
||||||
entry.runspeed = static_cast<float>(atof(row[51]));
|
entry.ranged_type = atoi(row[51]);
|
||||||
entry.MR = atoi(row[52]);
|
entry.runspeed = static_cast<float>(atof(row[52]));
|
||||||
entry.CR = atoi(row[53]);
|
entry.MR = atoi(row[53]);
|
||||||
entry.DR = atoi(row[54]);
|
entry.CR = atoi(row[54]);
|
||||||
entry.FR = atoi(row[55]);
|
entry.DR = atoi(row[55]);
|
||||||
entry.PR = atoi(row[56]);
|
entry.FR = atoi(row[56]);
|
||||||
entry.Corrup = atoi(row[57]);
|
entry.PR = atoi(row[57]);
|
||||||
entry.PhR = atoi(row[58]);
|
entry.Corrup = atoi(row[58]);
|
||||||
entry.see_invis = atoi(row[59]);
|
entry.PhR = atoi(row[59]);
|
||||||
entry.see_invis_undead = atoi(row[60]);
|
entry.see_invis = atoi(row[60]);
|
||||||
entry.qglobal = atoi(row[61]);
|
entry.see_invis_undead = atoi(row[61]);
|
||||||
entry.AC = atoi(row[62]);
|
entry.qglobal = atoi(row[62]);
|
||||||
entry.npc_aggro = atoi(row[63]);
|
entry.AC = atoi(row[63]);
|
||||||
entry.spawn_limit = atoi(row[64]);
|
entry.npc_aggro = atoi(row[64]);
|
||||||
entry.attack_speed = static_cast<float>(atof(row[65]));
|
entry.spawn_limit = atoi(row[65]);
|
||||||
entry.attack_delay = atoi(row[66]);
|
entry.attack_speed = static_cast<float>(atof(row[66]));
|
||||||
entry.findable = atoi(row[67]);
|
entry.attack_delay = atoi(row[67]);
|
||||||
entry.STR = atoi(row[68]);
|
entry.findable = atoi(row[68]);
|
||||||
entry.STA = atoi(row[69]);
|
entry.STR = atoi(row[69]);
|
||||||
entry.DEX = atoi(row[70]);
|
entry.STA = atoi(row[70]);
|
||||||
entry.AGI = atoi(row[71]);
|
entry.DEX = atoi(row[71]);
|
||||||
entry._INT = atoi(row[72]);
|
entry.AGI = atoi(row[72]);
|
||||||
entry.WIS = atoi(row[73]);
|
entry._INT = atoi(row[73]);
|
||||||
entry.CHA = atoi(row[74]);
|
entry.WIS = atoi(row[74]);
|
||||||
entry.see_hide = atoi(row[75]);
|
entry.CHA = atoi(row[75]);
|
||||||
entry.see_improved_hide = atoi(row[76]);
|
entry.see_hide = atoi(row[76]);
|
||||||
entry.trackable = atoi(row[77]);
|
entry.see_improved_hide = atoi(row[77]);
|
||||||
entry.isbot = atoi(row[78]);
|
entry.trackable = atoi(row[78]);
|
||||||
entry.exclude = atoi(row[79]);
|
entry.isbot = atoi(row[79]);
|
||||||
entry.ATK = atoi(row[80]);
|
entry.exclude = atoi(row[80]);
|
||||||
entry.Accuracy = atoi(row[81]);
|
entry.ATK = atoi(row[81]);
|
||||||
entry.Avoidance = atoi(row[82]);
|
entry.Accuracy = atoi(row[82]);
|
||||||
entry.slow_mitigation = atoi(row[83]);
|
entry.Avoidance = atoi(row[83]);
|
||||||
entry.version = atoi(row[84]);
|
entry.slow_mitigation = atoi(row[84]);
|
||||||
entry.maxlevel = atoi(row[85]);
|
entry.version = atoi(row[85]);
|
||||||
entry.scalerate = atoi(row[86]);
|
entry.maxlevel = atoi(row[86]);
|
||||||
entry.private_corpse = atoi(row[87]);
|
entry.scalerate = atoi(row[87]);
|
||||||
entry.unique_spawn_by_name = atoi(row[88]);
|
entry.private_corpse = atoi(row[88]);
|
||||||
entry.underwater = atoi(row[89]);
|
entry.unique_spawn_by_name = atoi(row[89]);
|
||||||
entry.isquest = atoi(row[90]);
|
entry.underwater = atoi(row[90]);
|
||||||
entry.emoteid = atoi(row[91]);
|
entry.isquest = atoi(row[91]);
|
||||||
entry.spellscale = static_cast<float>(atof(row[92]));
|
entry.emoteid = atoi(row[92]);
|
||||||
entry.healscale = static_cast<float>(atof(row[93]));
|
entry.spellscale = static_cast<float>(atof(row[93]));
|
||||||
entry.no_target_hotkey = atoi(row[94]);
|
entry.healscale = static_cast<float>(atof(row[94]));
|
||||||
entry.raid_target = atoi(row[95]);
|
entry.no_target_hotkey = atoi(row[95]);
|
||||||
entry.armtexture = atoi(row[96]);
|
entry.raid_target = atoi(row[96]);
|
||||||
entry.bracertexture = atoi(row[97]);
|
entry.armtexture = atoi(row[97]);
|
||||||
entry.handtexture = atoi(row[98]);
|
entry.bracertexture = atoi(row[98]);
|
||||||
entry.legtexture = atoi(row[99]);
|
entry.handtexture = atoi(row[99]);
|
||||||
entry.feettexture = atoi(row[100]);
|
entry.legtexture = atoi(row[100]);
|
||||||
entry.light = atoi(row[101]);
|
entry.feettexture = atoi(row[101]);
|
||||||
entry.walkspeed = atoi(row[102]);
|
entry.light = atoi(row[102]);
|
||||||
entry.peqid = atoi(row[103]);
|
entry.walkspeed = atoi(row[103]);
|
||||||
entry.unique_ = atoi(row[104]);
|
entry.peqid = atoi(row[104]);
|
||||||
entry.fixed = atoi(row[105]);
|
entry.unique_ = atoi(row[105]);
|
||||||
entry.ignore_despawn = atoi(row[106]);
|
entry.fixed = atoi(row[106]);
|
||||||
entry.show_name = atoi(row[107]);
|
entry.ignore_despawn = atoi(row[107]);
|
||||||
entry.untargetable = atoi(row[108]);
|
entry.show_name = atoi(row[108]);
|
||||||
entry.charm_ac = atoi(row[109]);
|
entry.untargetable = atoi(row[109]);
|
||||||
entry.charm_min_dmg = atoi(row[110]);
|
entry.charm_ac = atoi(row[110]);
|
||||||
entry.charm_max_dmg = atoi(row[111]);
|
entry.charm_min_dmg = atoi(row[111]);
|
||||||
entry.charm_attack_delay = atoi(row[112]);
|
entry.charm_max_dmg = atoi(row[112]);
|
||||||
entry.charm_accuracy_rating = atoi(row[113]);
|
entry.charm_attack_delay = atoi(row[113]);
|
||||||
entry.charm_avoidance_rating = atoi(row[114]);
|
entry.charm_accuracy_rating = atoi(row[114]);
|
||||||
entry.charm_atk = atoi(row[115]);
|
entry.charm_avoidance_rating = atoi(row[115]);
|
||||||
entry.skip_global_loot = atoi(row[116]);
|
entry.charm_atk = atoi(row[116]);
|
||||||
entry.rare_spawn = atoi(row[117]);
|
entry.skip_global_loot = atoi(row[117]);
|
||||||
entry.stuck_behavior = atoi(row[118]);
|
entry.rare_spawn = atoi(row[118]);
|
||||||
entry.model = atoi(row[119]);
|
entry.stuck_behavior = atoi(row[119]);
|
||||||
entry.flymode = atoi(row[120]);
|
entry.model = atoi(row[120]);
|
||||||
entry.always_aggro = atoi(row[121]);
|
entry.flymode = atoi(row[121]);
|
||||||
entry.exp_mod = atoi(row[122]);
|
entry.always_aggro = atoi(row[122]);
|
||||||
|
entry.exp_mod = atoi(row[123]);
|
||||||
|
|
||||||
all_entries.push_back(entry);
|
all_entries.push_back(entry);
|
||||||
}
|
}
|
||||||
@ -1363,122 +1372,123 @@ public:
|
|||||||
entry.race = atoi(row[4]);
|
entry.race = atoi(row[4]);
|
||||||
entry.class_ = atoi(row[5]);
|
entry.class_ = atoi(row[5]);
|
||||||
entry.bodytype = atoi(row[6]);
|
entry.bodytype = atoi(row[6]);
|
||||||
entry.hp = atoi(row[7]);
|
entry.hp = strtoll(row[7], nullptr, 10);
|
||||||
entry.mana = atoi(row[8]);
|
entry.mana = strtoll(row[8], nullptr, 10);
|
||||||
entry.gender = atoi(row[9]);
|
entry.gender = atoi(row[9]);
|
||||||
entry.texture = atoi(row[10]);
|
entry.texture = atoi(row[10]);
|
||||||
entry.helmtexture = atoi(row[11]);
|
entry.helmtexture = atoi(row[11]);
|
||||||
entry.herosforgemodel = atoi(row[12]);
|
entry.herosforgemodel = atoi(row[12]);
|
||||||
entry.size = static_cast<float>(atof(row[13]));
|
entry.size = static_cast<float>(atof(row[13]));
|
||||||
entry.hp_regen_rate = atoi(row[14]);
|
entry.hp_regen_rate = strtoll(row[14], nullptr, 10);
|
||||||
entry.mana_regen_rate = atoi(row[15]);
|
entry.hp_regen_per_second = strtoll(row[15], nullptr, 10);
|
||||||
entry.loottable_id = atoi(row[16]);
|
entry.mana_regen_rate = strtoll(row[16], nullptr, 10);
|
||||||
entry.merchant_id = atoi(row[17]);
|
entry.loottable_id = atoi(row[17]);
|
||||||
entry.alt_currency_id = atoi(row[18]);
|
entry.merchant_id = atoi(row[18]);
|
||||||
entry.npc_spells_id = atoi(row[19]);
|
entry.alt_currency_id = atoi(row[19]);
|
||||||
entry.npc_spells_effects_id = atoi(row[20]);
|
entry.npc_spells_id = atoi(row[20]);
|
||||||
entry.npc_faction_id = atoi(row[21]);
|
entry.npc_spells_effects_id = atoi(row[21]);
|
||||||
entry.adventure_template_id = atoi(row[22]);
|
entry.npc_faction_id = atoi(row[22]);
|
||||||
entry.trap_template = atoi(row[23]);
|
entry.adventure_template_id = atoi(row[23]);
|
||||||
entry.mindmg = atoi(row[24]);
|
entry.trap_template = atoi(row[24]);
|
||||||
entry.maxdmg = atoi(row[25]);
|
entry.mindmg = atoi(row[25]);
|
||||||
entry.attack_count = atoi(row[26]);
|
entry.maxdmg = atoi(row[26]);
|
||||||
entry.npcspecialattks = row[27] ? row[27] : "";
|
entry.attack_count = atoi(row[27]);
|
||||||
entry.special_abilities = row[28] ? row[28] : "";
|
entry.npcspecialattks = row[28] ? row[28] : "";
|
||||||
entry.aggroradius = atoi(row[29]);
|
entry.special_abilities = row[29] ? row[29] : "";
|
||||||
entry.assistradius = atoi(row[30]);
|
entry.aggroradius = atoi(row[30]);
|
||||||
entry.face = atoi(row[31]);
|
entry.assistradius = atoi(row[31]);
|
||||||
entry.luclin_hairstyle = atoi(row[32]);
|
entry.face = atoi(row[32]);
|
||||||
entry.luclin_haircolor = atoi(row[33]);
|
entry.luclin_hairstyle = atoi(row[33]);
|
||||||
entry.luclin_eyecolor = atoi(row[34]);
|
entry.luclin_haircolor = atoi(row[34]);
|
||||||
entry.luclin_eyecolor2 = atoi(row[35]);
|
entry.luclin_eyecolor = atoi(row[35]);
|
||||||
entry.luclin_beardcolor = atoi(row[36]);
|
entry.luclin_eyecolor2 = atoi(row[36]);
|
||||||
entry.luclin_beard = atoi(row[37]);
|
entry.luclin_beardcolor = atoi(row[37]);
|
||||||
entry.drakkin_heritage = atoi(row[38]);
|
entry.luclin_beard = atoi(row[38]);
|
||||||
entry.drakkin_tattoo = atoi(row[39]);
|
entry.drakkin_heritage = atoi(row[39]);
|
||||||
entry.drakkin_details = atoi(row[40]);
|
entry.drakkin_tattoo = atoi(row[40]);
|
||||||
entry.armortint_id = atoi(row[41]);
|
entry.drakkin_details = atoi(row[41]);
|
||||||
entry.armortint_red = atoi(row[42]);
|
entry.armortint_id = atoi(row[42]);
|
||||||
entry.armortint_green = atoi(row[43]);
|
entry.armortint_red = atoi(row[43]);
|
||||||
entry.armortint_blue = atoi(row[44]);
|
entry.armortint_green = atoi(row[44]);
|
||||||
entry.d_melee_texture1 = atoi(row[45]);
|
entry.armortint_blue = atoi(row[45]);
|
||||||
entry.d_melee_texture2 = atoi(row[46]);
|
entry.d_melee_texture1 = atoi(row[46]);
|
||||||
entry.ammo_idfile = row[47] ? row[47] : "";
|
entry.d_melee_texture2 = atoi(row[47]);
|
||||||
entry.prim_melee_type = atoi(row[48]);
|
entry.ammo_idfile = row[48] ? row[48] : "";
|
||||||
entry.sec_melee_type = atoi(row[49]);
|
entry.prim_melee_type = atoi(row[49]);
|
||||||
entry.ranged_type = atoi(row[50]);
|
entry.sec_melee_type = atoi(row[50]);
|
||||||
entry.runspeed = static_cast<float>(atof(row[51]));
|
entry.ranged_type = atoi(row[51]);
|
||||||
entry.MR = atoi(row[52]);
|
entry.runspeed = static_cast<float>(atof(row[52]));
|
||||||
entry.CR = atoi(row[53]);
|
entry.MR = atoi(row[53]);
|
||||||
entry.DR = atoi(row[54]);
|
entry.CR = atoi(row[54]);
|
||||||
entry.FR = atoi(row[55]);
|
entry.DR = atoi(row[55]);
|
||||||
entry.PR = atoi(row[56]);
|
entry.FR = atoi(row[56]);
|
||||||
entry.Corrup = atoi(row[57]);
|
entry.PR = atoi(row[57]);
|
||||||
entry.PhR = atoi(row[58]);
|
entry.Corrup = atoi(row[58]);
|
||||||
entry.see_invis = atoi(row[59]);
|
entry.PhR = atoi(row[59]);
|
||||||
entry.see_invis_undead = atoi(row[60]);
|
entry.see_invis = atoi(row[60]);
|
||||||
entry.qglobal = atoi(row[61]);
|
entry.see_invis_undead = atoi(row[61]);
|
||||||
entry.AC = atoi(row[62]);
|
entry.qglobal = atoi(row[62]);
|
||||||
entry.npc_aggro = atoi(row[63]);
|
entry.AC = atoi(row[63]);
|
||||||
entry.spawn_limit = atoi(row[64]);
|
entry.npc_aggro = atoi(row[64]);
|
||||||
entry.attack_speed = static_cast<float>(atof(row[65]));
|
entry.spawn_limit = atoi(row[65]);
|
||||||
entry.attack_delay = atoi(row[66]);
|
entry.attack_speed = static_cast<float>(atof(row[66]));
|
||||||
entry.findable = atoi(row[67]);
|
entry.attack_delay = atoi(row[67]);
|
||||||
entry.STR = atoi(row[68]);
|
entry.findable = atoi(row[68]);
|
||||||
entry.STA = atoi(row[69]);
|
entry.STR = atoi(row[69]);
|
||||||
entry.DEX = atoi(row[70]);
|
entry.STA = atoi(row[70]);
|
||||||
entry.AGI = atoi(row[71]);
|
entry.DEX = atoi(row[71]);
|
||||||
entry._INT = atoi(row[72]);
|
entry.AGI = atoi(row[72]);
|
||||||
entry.WIS = atoi(row[73]);
|
entry._INT = atoi(row[73]);
|
||||||
entry.CHA = atoi(row[74]);
|
entry.WIS = atoi(row[74]);
|
||||||
entry.see_hide = atoi(row[75]);
|
entry.CHA = atoi(row[75]);
|
||||||
entry.see_improved_hide = atoi(row[76]);
|
entry.see_hide = atoi(row[76]);
|
||||||
entry.trackable = atoi(row[77]);
|
entry.see_improved_hide = atoi(row[77]);
|
||||||
entry.isbot = atoi(row[78]);
|
entry.trackable = atoi(row[78]);
|
||||||
entry.exclude = atoi(row[79]);
|
entry.isbot = atoi(row[79]);
|
||||||
entry.ATK = atoi(row[80]);
|
entry.exclude = atoi(row[80]);
|
||||||
entry.Accuracy = atoi(row[81]);
|
entry.ATK = atoi(row[81]);
|
||||||
entry.Avoidance = atoi(row[82]);
|
entry.Accuracy = atoi(row[82]);
|
||||||
entry.slow_mitigation = atoi(row[83]);
|
entry.Avoidance = atoi(row[83]);
|
||||||
entry.version = atoi(row[84]);
|
entry.slow_mitigation = atoi(row[84]);
|
||||||
entry.maxlevel = atoi(row[85]);
|
entry.version = atoi(row[85]);
|
||||||
entry.scalerate = atoi(row[86]);
|
entry.maxlevel = atoi(row[86]);
|
||||||
entry.private_corpse = atoi(row[87]);
|
entry.scalerate = atoi(row[87]);
|
||||||
entry.unique_spawn_by_name = atoi(row[88]);
|
entry.private_corpse = atoi(row[88]);
|
||||||
entry.underwater = atoi(row[89]);
|
entry.unique_spawn_by_name = atoi(row[89]);
|
||||||
entry.isquest = atoi(row[90]);
|
entry.underwater = atoi(row[90]);
|
||||||
entry.emoteid = atoi(row[91]);
|
entry.isquest = atoi(row[91]);
|
||||||
entry.spellscale = static_cast<float>(atof(row[92]));
|
entry.emoteid = atoi(row[92]);
|
||||||
entry.healscale = static_cast<float>(atof(row[93]));
|
entry.spellscale = static_cast<float>(atof(row[93]));
|
||||||
entry.no_target_hotkey = atoi(row[94]);
|
entry.healscale = static_cast<float>(atof(row[94]));
|
||||||
entry.raid_target = atoi(row[95]);
|
entry.no_target_hotkey = atoi(row[95]);
|
||||||
entry.armtexture = atoi(row[96]);
|
entry.raid_target = atoi(row[96]);
|
||||||
entry.bracertexture = atoi(row[97]);
|
entry.armtexture = atoi(row[97]);
|
||||||
entry.handtexture = atoi(row[98]);
|
entry.bracertexture = atoi(row[98]);
|
||||||
entry.legtexture = atoi(row[99]);
|
entry.handtexture = atoi(row[99]);
|
||||||
entry.feettexture = atoi(row[100]);
|
entry.legtexture = atoi(row[100]);
|
||||||
entry.light = atoi(row[101]);
|
entry.feettexture = atoi(row[101]);
|
||||||
entry.walkspeed = atoi(row[102]);
|
entry.light = atoi(row[102]);
|
||||||
entry.peqid = atoi(row[103]);
|
entry.walkspeed = atoi(row[103]);
|
||||||
entry.unique_ = atoi(row[104]);
|
entry.peqid = atoi(row[104]);
|
||||||
entry.fixed = atoi(row[105]);
|
entry.unique_ = atoi(row[105]);
|
||||||
entry.ignore_despawn = atoi(row[106]);
|
entry.fixed = atoi(row[106]);
|
||||||
entry.show_name = atoi(row[107]);
|
entry.ignore_despawn = atoi(row[107]);
|
||||||
entry.untargetable = atoi(row[108]);
|
entry.show_name = atoi(row[108]);
|
||||||
entry.charm_ac = atoi(row[109]);
|
entry.untargetable = atoi(row[109]);
|
||||||
entry.charm_min_dmg = atoi(row[110]);
|
entry.charm_ac = atoi(row[110]);
|
||||||
entry.charm_max_dmg = atoi(row[111]);
|
entry.charm_min_dmg = atoi(row[111]);
|
||||||
entry.charm_attack_delay = atoi(row[112]);
|
entry.charm_max_dmg = atoi(row[112]);
|
||||||
entry.charm_accuracy_rating = atoi(row[113]);
|
entry.charm_attack_delay = atoi(row[113]);
|
||||||
entry.charm_avoidance_rating = atoi(row[114]);
|
entry.charm_accuracy_rating = atoi(row[114]);
|
||||||
entry.charm_atk = atoi(row[115]);
|
entry.charm_avoidance_rating = atoi(row[115]);
|
||||||
entry.skip_global_loot = atoi(row[116]);
|
entry.charm_atk = atoi(row[116]);
|
||||||
entry.rare_spawn = atoi(row[117]);
|
entry.skip_global_loot = atoi(row[117]);
|
||||||
entry.stuck_behavior = atoi(row[118]);
|
entry.rare_spawn = atoi(row[118]);
|
||||||
entry.model = atoi(row[119]);
|
entry.stuck_behavior = atoi(row[119]);
|
||||||
entry.flymode = atoi(row[120]);
|
entry.model = atoi(row[120]);
|
||||||
entry.always_aggro = atoi(row[121]);
|
entry.flymode = atoi(row[121]);
|
||||||
entry.exp_mod = atoi(row[122]);
|
entry.always_aggro = atoi(row[122]);
|
||||||
|
entry.exp_mod = atoi(row[123]);
|
||||||
|
|
||||||
all_entries.push_back(entry);
|
all_entries.push_back(entry);
|
||||||
}
|
}
|
||||||
|
|||||||
446
zone/zonedb.cpp
446
zone/zonedb.cpp
@ -14,6 +14,7 @@
|
|||||||
#include "zone_store.h"
|
#include "zone_store.h"
|
||||||
#include "aura.h"
|
#include "aura.h"
|
||||||
#include "../common/repositories/criteria/content_filter_criteria.h"
|
#include "../common/repositories/criteria/content_filter_criteria.h"
|
||||||
|
#include "../common/repositories/npc_types_repository.h"
|
||||||
|
|
||||||
#include <ctime>
|
#include <ctime>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
@ -2346,253 +2347,131 @@ const NPCType *ZoneDatabase::LoadNPCTypesData(uint32 npc_type_id, bool bulk_load
|
|||||||
return itr->second;
|
return itr->second;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string where_condition = "";
|
std::string filter = fmt::format("id = {}", npc_type_id);
|
||||||
|
|
||||||
if (bulk_load) {
|
if (bulk_load) {
|
||||||
LogDebug("Performing bulk NPC Types load");
|
LogDebug("Performing bulk NPC Types load");
|
||||||
where_condition = StringFormat(
|
|
||||||
"INNER JOIN spawnentry ON npc_types.id = spawnentry.npcID "
|
filter = fmt::format(
|
||||||
"INNER JOIN spawn2 ON spawnentry.spawngroupID = spawn2.spawngroupID "
|
SQL(
|
||||||
"WHERE spawn2.zone = '%s' and spawn2.version = %u GROUP BY npc_types.id",
|
id IN (
|
||||||
|
select npcID from spawnentry where spawngroupID IN (
|
||||||
|
select spawngroupID from spawn2 where `zone` = '{}' and `version` = {}
|
||||||
|
)
|
||||||
|
)
|
||||||
|
),
|
||||||
zone->GetShortName(),
|
zone->GetShortName(),
|
||||||
zone->GetInstanceVersion());
|
zone->GetInstanceVersion()
|
||||||
}
|
);
|
||||||
else {
|
|
||||||
where_condition = StringFormat("WHERE id = %u", npc_type_id);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string query = StringFormat(
|
for (NpcTypesRepository::NpcTypes &n : NpcTypesRepository::GetWhere((Database &) content_db, filter)) {
|
||||||
"SELECT "
|
NPCType *t;
|
||||||
"npc_types.id, "
|
t = new NPCType;
|
||||||
"npc_types.name, "
|
memset(t, 0, sizeof *t);
|
||||||
"npc_types.level, "
|
|
||||||
"npc_types.race, "
|
|
||||||
"npc_types.class, "
|
|
||||||
"npc_types.hp, "
|
|
||||||
"npc_types.mana, "
|
|
||||||
"npc_types.gender, "
|
|
||||||
"npc_types.texture, "
|
|
||||||
"npc_types.helmtexture, "
|
|
||||||
"npc_types.herosforgemodel, "
|
|
||||||
"npc_types.size, "
|
|
||||||
"npc_types.loottable_id, "
|
|
||||||
"npc_types.merchant_id, "
|
|
||||||
"npc_types.alt_currency_id, "
|
|
||||||
"npc_types.adventure_template_id, "
|
|
||||||
"npc_types.trap_template, "
|
|
||||||
"npc_types.attack_speed, "
|
|
||||||
"npc_types.STR, "
|
|
||||||
"npc_types.STA, "
|
|
||||||
"npc_types.DEX, "
|
|
||||||
"npc_types.AGI, "
|
|
||||||
"npc_types._INT, "
|
|
||||||
"npc_types.WIS, "
|
|
||||||
"npc_types.CHA, "
|
|
||||||
"npc_types.MR, "
|
|
||||||
"npc_types.CR, "
|
|
||||||
"npc_types.DR, "
|
|
||||||
"npc_types.FR, "
|
|
||||||
"npc_types.PR, "
|
|
||||||
"npc_types.Corrup, "
|
|
||||||
"npc_types.PhR, "
|
|
||||||
"npc_types.mindmg, "
|
|
||||||
"npc_types.maxdmg, "
|
|
||||||
"npc_types.attack_count, "
|
|
||||||
"npc_types.special_abilities, "
|
|
||||||
"npc_types.npc_spells_id, "
|
|
||||||
"npc_types.npc_spells_effects_id, "
|
|
||||||
"npc_types.d_melee_texture1, "
|
|
||||||
"npc_types.d_melee_texture2, "
|
|
||||||
"npc_types.ammo_idfile, "
|
|
||||||
"npc_types.prim_melee_type, "
|
|
||||||
"npc_types.sec_melee_type, "
|
|
||||||
"npc_types.ranged_type, "
|
|
||||||
"npc_types.runspeed, "
|
|
||||||
"npc_types.findable, "
|
|
||||||
"npc_types.trackable, "
|
|
||||||
"npc_types.hp_regen_rate, "
|
|
||||||
"npc_types.mana_regen_rate, "
|
|
||||||
"npc_types.aggroradius, "
|
|
||||||
"npc_types.assistradius, "
|
|
||||||
"npc_types.bodytype, "
|
|
||||||
"npc_types.npc_faction_id, "
|
|
||||||
"npc_types.face, "
|
|
||||||
"npc_types.luclin_hairstyle, "
|
|
||||||
"npc_types.luclin_haircolor, "
|
|
||||||
"npc_types.luclin_eyecolor, "
|
|
||||||
"npc_types.luclin_eyecolor2, "
|
|
||||||
"npc_types.luclin_beardcolor, "
|
|
||||||
"npc_types.luclin_beard, "
|
|
||||||
"npc_types.drakkin_heritage, "
|
|
||||||
"npc_types.drakkin_tattoo, "
|
|
||||||
"npc_types.drakkin_details, "
|
|
||||||
"npc_types.armortint_id, "
|
|
||||||
"npc_types.armortint_red, "
|
|
||||||
"npc_types.armortint_green, "
|
|
||||||
"npc_types.armortint_blue, "
|
|
||||||
"npc_types.see_invis, "
|
|
||||||
"npc_types.see_invis_undead, "
|
|
||||||
"npc_types.lastname, "
|
|
||||||
"npc_types.qglobal, "
|
|
||||||
"npc_types.AC, "
|
|
||||||
"npc_types.npc_aggro, "
|
|
||||||
"npc_types.spawn_limit, "
|
|
||||||
"npc_types.see_hide, "
|
|
||||||
"npc_types.see_improved_hide, "
|
|
||||||
"npc_types.ATK, "
|
|
||||||
"npc_types.Accuracy, "
|
|
||||||
"npc_types.Avoidance, "
|
|
||||||
"npc_types.slow_mitigation, "
|
|
||||||
"npc_types.maxlevel, "
|
|
||||||
"npc_types.scalerate, "
|
|
||||||
"npc_types.private_corpse, "
|
|
||||||
"npc_types.unique_spawn_by_name, "
|
|
||||||
"npc_types.underwater, "
|
|
||||||
"npc_types.emoteid, "
|
|
||||||
"npc_types.spellscale, "
|
|
||||||
"npc_types.healscale, "
|
|
||||||
"npc_types.no_target_hotkey, "
|
|
||||||
"npc_types.raid_target, "
|
|
||||||
"npc_types.attack_delay, "
|
|
||||||
"npc_types.light, "
|
|
||||||
"npc_types.armtexture, "
|
|
||||||
"npc_types.bracertexture, "
|
|
||||||
"npc_types.handtexture, "
|
|
||||||
"npc_types.legtexture, "
|
|
||||||
"npc_types.feettexture, "
|
|
||||||
"npc_types.ignore_despawn, "
|
|
||||||
"npc_types.show_name, "
|
|
||||||
"npc_types.untargetable, "
|
|
||||||
"npc_types.charm_ac, "
|
|
||||||
"npc_types.charm_min_dmg, "
|
|
||||||
"npc_types.charm_max_dmg, "
|
|
||||||
"npc_types.charm_attack_delay, "
|
|
||||||
"npc_types.charm_accuracy_rating, "
|
|
||||||
"npc_types.charm_avoidance_rating, "
|
|
||||||
"npc_types.charm_atk, "
|
|
||||||
"npc_types.skip_global_loot, "
|
|
||||||
"npc_types.rare_spawn, "
|
|
||||||
"npc_types.stuck_behavior, "
|
|
||||||
"npc_types.model, "
|
|
||||||
"npc_types.flymode, "
|
|
||||||
"npc_types.always_aggro, "
|
|
||||||
"npc_types.exp_mod, "
|
|
||||||
"npc_types.hp_regen_per_second "
|
|
||||||
|
|
||||||
"FROM npc_types %s",
|
t->npc_id = n.id;
|
||||||
where_condition.c_str()
|
|
||||||
);
|
|
||||||
|
|
||||||
auto results = QueryDatabase(query);
|
strn0cpy(t->name, n.name.c_str(), 50);
|
||||||
if (!results.Success()) {
|
|
||||||
return nullptr;
|
|
||||||
}
|
|
||||||
|
|
||||||
for (auto row = results.begin(); row != results.end(); ++row) {
|
t->level = n.level;
|
||||||
NPCType *temp_npctype_data;
|
t->race = n.race;
|
||||||
temp_npctype_data = new NPCType;
|
t->class_ = n.class_;
|
||||||
memset(temp_npctype_data, 0, sizeof *temp_npctype_data);
|
t->max_hp = n.hp;
|
||||||
|
t->current_hp = t->max_hp;
|
||||||
|
t->Mana = n.mana;
|
||||||
|
t->gender = n.gender;
|
||||||
|
t->texture = n.texture;
|
||||||
|
t->helmtexture = n.helmtexture;
|
||||||
|
t->herosforgemodel = n.herosforgemodel;
|
||||||
|
t->size = n.size;
|
||||||
|
t->loottable_id = n.loottable_id;
|
||||||
|
t->merchanttype = n.merchant_id;
|
||||||
|
t->alt_currency_type = n.alt_currency_id;
|
||||||
|
t->adventure_template = n.adventure_template_id;
|
||||||
|
t->trap_template = n.trap_template;
|
||||||
|
t->attack_speed = n.attack_speed;
|
||||||
|
t->STR = n.STR;
|
||||||
|
t->STA = n.STA;
|
||||||
|
t->DEX = n.DEX;
|
||||||
|
t->AGI = n.AGI;
|
||||||
|
t->INT = n._INT;
|
||||||
|
t->WIS = n.WIS;
|
||||||
|
t->CHA = n.CHA;
|
||||||
|
t->MR = n.MR;
|
||||||
|
t->CR = n.CR;
|
||||||
|
t->DR = n.DR;
|
||||||
|
t->FR = n.FR;
|
||||||
|
t->PR = n.PR;
|
||||||
|
t->Corrup = n.Corrup;
|
||||||
|
t->PhR = n.PhR;
|
||||||
|
t->min_dmg = n.mindmg;
|
||||||
|
t->max_dmg = n.maxdmg;
|
||||||
|
t->attack_count = n.attack_count;
|
||||||
|
|
||||||
temp_npctype_data->npc_id = atoi(row[0]);
|
if (!n.special_abilities.empty()) {
|
||||||
|
strn0cpy(t->special_abilities, n.special_abilities.c_str(), 512);
|
||||||
strn0cpy(temp_npctype_data->name, row[1], 50);
|
|
||||||
|
|
||||||
temp_npctype_data->level = atoi(row[2]);
|
|
||||||
temp_npctype_data->race = atoi(row[3]);
|
|
||||||
temp_npctype_data->class_ = atoi(row[4]);
|
|
||||||
temp_npctype_data->max_hp = atoi(row[5]);
|
|
||||||
temp_npctype_data->current_hp = temp_npctype_data->max_hp;
|
|
||||||
temp_npctype_data->Mana = atoi(row[6]);
|
|
||||||
temp_npctype_data->gender = atoi(row[7]);
|
|
||||||
temp_npctype_data->texture = atoi(row[8]);
|
|
||||||
temp_npctype_data->helmtexture = atoi(row[9]);
|
|
||||||
temp_npctype_data->herosforgemodel = atoul(row[10]);
|
|
||||||
temp_npctype_data->size = atof(row[11]);
|
|
||||||
temp_npctype_data->loottable_id = atoi(row[12]);
|
|
||||||
temp_npctype_data->merchanttype = atoi(row[13]);
|
|
||||||
temp_npctype_data->alt_currency_type = atoi(row[14]);
|
|
||||||
temp_npctype_data->adventure_template = atoi(row[15]);
|
|
||||||
temp_npctype_data->trap_template = atoi(row[16]);
|
|
||||||
temp_npctype_data->attack_speed = atof(row[17]);
|
|
||||||
temp_npctype_data->STR = atoi(row[18]);
|
|
||||||
temp_npctype_data->STA = atoi(row[19]);
|
|
||||||
temp_npctype_data->DEX = atoi(row[20]);
|
|
||||||
temp_npctype_data->AGI = atoi(row[21]);
|
|
||||||
temp_npctype_data->INT = atoi(row[22]);
|
|
||||||
temp_npctype_data->WIS = atoi(row[23]);
|
|
||||||
temp_npctype_data->CHA = atoi(row[24]);
|
|
||||||
temp_npctype_data->MR = atoi(row[25]);
|
|
||||||
temp_npctype_data->CR = atoi(row[26]);
|
|
||||||
temp_npctype_data->DR = atoi(row[27]);
|
|
||||||
temp_npctype_data->FR = atoi(row[28]);
|
|
||||||
temp_npctype_data->PR = atoi(row[29]);
|
|
||||||
temp_npctype_data->Corrup = atoi(row[30]);
|
|
||||||
temp_npctype_data->PhR = atoi(row[31]);
|
|
||||||
temp_npctype_data->min_dmg = atoi(row[32]);
|
|
||||||
temp_npctype_data->max_dmg = atoi(row[33]);
|
|
||||||
temp_npctype_data->attack_count = atoi(row[34]);
|
|
||||||
|
|
||||||
if (row[35] != nullptr) {
|
|
||||||
strn0cpy(temp_npctype_data->special_abilities, row[35], 512);
|
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
temp_npctype_data->special_abilities[0] = '\0';
|
t->special_abilities[0] = '\0';
|
||||||
}
|
}
|
||||||
|
|
||||||
temp_npctype_data->npc_spells_id = atoi(row[36]);
|
|
||||||
temp_npctype_data->npc_spells_effects_id = atoi(row[37]);
|
t->npc_spells_id = n.npc_spells_id;
|
||||||
temp_npctype_data->d_melee_texture1 = atoi(row[38]);
|
t->npc_spells_effects_id = n.npc_spells_effects_id;
|
||||||
temp_npctype_data->d_melee_texture2 = atoi(row[39]);
|
t->d_melee_texture1 = n.d_melee_texture1;
|
||||||
strn0cpy(temp_npctype_data->ammo_idfile, row[40], 30);
|
t->d_melee_texture2 = n.d_melee_texture2;
|
||||||
temp_npctype_data->prim_melee_type = atoi(row[41]);
|
strn0cpy(t->ammo_idfile, n.ammo_idfile.c_str(), 30);
|
||||||
temp_npctype_data->sec_melee_type = atoi(row[42]);
|
t->prim_melee_type = n.prim_melee_type;
|
||||||
temp_npctype_data->ranged_type = atoi(row[43]);
|
t->sec_melee_type = n.sec_melee_type;
|
||||||
temp_npctype_data->runspeed = atof(row[44]);
|
t->ranged_type = n.ranged_type;
|
||||||
temp_npctype_data->findable = atoi(row[45]) == 0 ? false : true;
|
t->runspeed = n.runspeed;
|
||||||
temp_npctype_data->trackable = atoi(row[46]) == 0 ? false : true;
|
t->findable = n.findable != 0;
|
||||||
temp_npctype_data->hp_regen = atoi(row[47]);
|
t->trackable = n.trackable != 0;
|
||||||
temp_npctype_data->mana_regen = atoi(row[48]);
|
t->hp_regen = n.hp_regen_rate;
|
||||||
|
t->mana_regen = n.mana_regen_rate;
|
||||||
|
|
||||||
// set default value for aggroradius
|
// set default value for aggroradius
|
||||||
temp_npctype_data->aggroradius = (int32) atoi(row[49]);
|
t->aggroradius = (int32) n.aggroradius;
|
||||||
if (temp_npctype_data->aggroradius <= 0) {
|
if (t->aggroradius <= 0) {
|
||||||
temp_npctype_data->aggroradius = 70;
|
t->aggroradius = 70;
|
||||||
}
|
}
|
||||||
|
|
||||||
temp_npctype_data->assistradius = (int32) atoi(row[50]);
|
t->assistradius = (int32) n.assistradius;
|
||||||
if (temp_npctype_data->assistradius <= 0) {
|
if (t->assistradius <= 0) {
|
||||||
temp_npctype_data->assistradius = temp_npctype_data->aggroradius;
|
t->assistradius = t->aggroradius;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (row[51] && strlen(row[51])) {
|
if (n.bodytype > 0) {
|
||||||
temp_npctype_data->bodytype = (uint8) atoi(row[51]);
|
t->bodytype = n.bodytype;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
temp_npctype_data->bodytype = 0;
|
t->bodytype = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
temp_npctype_data->npc_faction_id = atoi(row[52]);
|
// facial features
|
||||||
|
t->npc_faction_id = n.npc_faction_id;
|
||||||
|
t->luclinface = n.face;
|
||||||
|
t->hairstyle = n.luclin_hairstyle;
|
||||||
|
t->haircolor = n.luclin_haircolor;
|
||||||
|
t->eyecolor1 = n.luclin_eyecolor;
|
||||||
|
t->eyecolor2 = n.luclin_eyecolor2;
|
||||||
|
t->beardcolor = n.luclin_beardcolor;
|
||||||
|
t->beard = n.luclin_beard;
|
||||||
|
t->drakkin_heritage = n.drakkin_heritage;
|
||||||
|
t->drakkin_tattoo = n.drakkin_tattoo;
|
||||||
|
t->drakkin_details = n.drakkin_details;
|
||||||
|
|
||||||
temp_npctype_data->luclinface = atoi(row[53]);
|
// armor tint
|
||||||
temp_npctype_data->hairstyle = atoi(row[54]);
|
uint32 armor_tint_id = n.armortint_id;
|
||||||
temp_npctype_data->haircolor = atoi(row[55]);
|
t->armor_tint.Head.Color = (n.armortint_red & 0xFF) << 16;
|
||||||
temp_npctype_data->eyecolor1 = atoi(row[56]);
|
t->armor_tint.Head.Color |= (n.armortint_green & 0xFF) << 8;
|
||||||
temp_npctype_data->eyecolor2 = atoi(row[57]);
|
t->armor_tint.Head.Color |= (n.armortint_blue & 0xFF);
|
||||||
temp_npctype_data->beardcolor = atoi(row[58]);
|
t->armor_tint.Head.Color |= (t->armor_tint.Head.Color) ? (0xFF << 24) : 0;
|
||||||
temp_npctype_data->beard = atoi(row[59]);
|
|
||||||
temp_npctype_data->drakkin_heritage = atoi(row[60]);
|
|
||||||
temp_npctype_data->drakkin_tattoo = atoi(row[61]);
|
|
||||||
temp_npctype_data->drakkin_details = atoi(row[62]);
|
|
||||||
|
|
||||||
uint32 armor_tint_id = atoi(row[63]);
|
|
||||||
|
|
||||||
temp_npctype_data->armor_tint.Head.Color = (atoi(row[64]) & 0xFF) << 16;
|
|
||||||
temp_npctype_data->armor_tint.Head.Color |= (atoi(row[65]) & 0xFF) << 8;
|
|
||||||
temp_npctype_data->armor_tint.Head.Color |= (atoi(row[66]) & 0xFF);
|
|
||||||
temp_npctype_data->armor_tint.Head.Color |= (temp_npctype_data->armor_tint.Head.Color) ? (0xFF << 24) : 0;
|
|
||||||
|
|
||||||
if (armor_tint_id != 0) {
|
if (armor_tint_id != 0) {
|
||||||
std::string armortint_query = StringFormat(
|
|
||||||
|
std::string armortint_query = StringFormat(
|
||||||
"SELECT red1h, grn1h, blu1h, "
|
"SELECT red1h, grn1h, blu1h, "
|
||||||
"red2c, grn2c, blu2c, "
|
"red2c, grn2c, blu2c, "
|
||||||
"red3a, grn3a, blu3a, "
|
"red3a, grn3a, blu3a, "
|
||||||
@ -2605,7 +2484,8 @@ const NPCType *ZoneDatabase::LoadNPCTypesData(uint32 npc_type_id, bool bulk_load
|
|||||||
"FROM npc_types_tint WHERE id = %d",
|
"FROM npc_types_tint WHERE id = %d",
|
||||||
armor_tint_id
|
armor_tint_id
|
||||||
);
|
);
|
||||||
auto armortint_results = QueryDatabase(armortint_query);
|
|
||||||
|
auto armortint_results = QueryDatabase(armortint_query);
|
||||||
if (!armortint_results.Success() || armortint_results.RowCount() == 0) {
|
if (!armortint_results.Success() || armortint_results.RowCount() == 0) {
|
||||||
armor_tint_id = 0;
|
armor_tint_id = 0;
|
||||||
}
|
}
|
||||||
@ -2613,10 +2493,10 @@ const NPCType *ZoneDatabase::LoadNPCTypesData(uint32 npc_type_id, bool bulk_load
|
|||||||
auto armorTint_row = armortint_results.begin();
|
auto armorTint_row = armortint_results.begin();
|
||||||
|
|
||||||
for (int index = EQ::textures::textureBegin; index <= EQ::textures::LastTexture; index++) {
|
for (int index = EQ::textures::textureBegin; index <= EQ::textures::LastTexture; index++) {
|
||||||
temp_npctype_data->armor_tint.Slot[index].Color = atoi(armorTint_row[index * 3]) << 16;
|
t->armor_tint.Slot[index].Color = atoi(armorTint_row[index * 3]) << 16;
|
||||||
temp_npctype_data->armor_tint.Slot[index].Color |= atoi(armorTint_row[index * 3 + 1]) << 8;
|
t->armor_tint.Slot[index].Color |= atoi(armorTint_row[index * 3 + 1]) << 8;
|
||||||
temp_npctype_data->armor_tint.Slot[index].Color |= atoi(armorTint_row[index * 3 + 2]);
|
t->armor_tint.Slot[index].Color |= atoi(armorTint_row[index * 3 + 2]);
|
||||||
temp_npctype_data->armor_tint.Slot[index].Color |= (temp_npctype_data->armor_tint.Slot[index].Color)
|
t->armor_tint.Slot[index].Color |= (t->armor_tint.Slot[index].Color)
|
||||||
? (0xFF << 24) : 0;
|
? (0xFF << 24) : 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -2624,78 +2504,74 @@ const NPCType *ZoneDatabase::LoadNPCTypesData(uint32 npc_type_id, bool bulk_load
|
|||||||
// Try loading npc_types tint fields if armor tint is 0 or query failed to get results
|
// Try loading npc_types tint fields if armor tint is 0 or query failed to get results
|
||||||
if (armor_tint_id == 0) {
|
if (armor_tint_id == 0) {
|
||||||
for (int index = EQ::textures::armorChest; index < EQ::textures::materialCount; index++) {
|
for (int index = EQ::textures::armorChest; index < EQ::textures::materialCount; index++) {
|
||||||
temp_npctype_data->armor_tint.Slot[index].Color = temp_npctype_data->armor_tint.Slot[0].Color; // odd way to 'zero-out' the array...
|
t->armor_tint.Slot[index].Color = t->armor_tint.Slot[0].Color; // odd way to 'zero-out' the array...
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
temp_npctype_data->see_invis = atoi(row[67]);
|
t->see_invis = n.see_invis != 0;
|
||||||
temp_npctype_data->see_invis_undead = atoi(row[68]) == 0 ? false : true; // Set see_invis_undead flag
|
t->see_invis_undead = n.see_invis_undead != 0; // Set see_invis_undead flag
|
||||||
|
|
||||||
if (row[69] != nullptr) {
|
if (!n.lastname.empty()) {
|
||||||
strn0cpy(temp_npctype_data->lastname, row[69], 32);
|
strn0cpy(t->lastname, n.lastname.c_str(), 32);
|
||||||
}
|
}
|
||||||
|
|
||||||
temp_npctype_data->qglobal = atoi(row[70]) == 0 ? false : true; // qglobal
|
t->qglobal = n.qglobal != 0; // qglobal
|
||||||
temp_npctype_data->AC = atoi(row[71]);
|
t->AC = n.AC;
|
||||||
temp_npctype_data->npc_aggro = atoi(row[72]) == 0 ? false : true;
|
t->npc_aggro = n.npc_aggro != 0;
|
||||||
temp_npctype_data->spawn_limit = atoi(row[73]);
|
t->spawn_limit = n.spawn_limit;
|
||||||
temp_npctype_data->see_hide = atoi(row[74]) == 0 ? false : true;
|
t->see_hide = n.see_hide != 0;
|
||||||
temp_npctype_data->see_improved_hide = atoi(row[75]) == 0 ? false : true;
|
t->see_improved_hide = n.see_improved_hide != 0;
|
||||||
temp_npctype_data->ATK = atoi(row[76]);
|
t->ATK = n.ATK;
|
||||||
temp_npctype_data->accuracy_rating = atoi(row[77]);
|
t->accuracy_rating = n.Accuracy;
|
||||||
temp_npctype_data->avoidance_rating = atoi(row[78]);
|
t->avoidance_rating = n.Avoidance;
|
||||||
temp_npctype_data->slow_mitigation = atoi(row[79]);
|
t->slow_mitigation = n.slow_mitigation;
|
||||||
temp_npctype_data->maxlevel = atoi(row[80]);
|
t->maxlevel = n.maxlevel;
|
||||||
temp_npctype_data->scalerate = atoi(row[81]);
|
t->scalerate = n.scalerate;
|
||||||
temp_npctype_data->private_corpse = atoi(row[82]) == 1 ? true : false;
|
t->private_corpse = n.private_corpse != 0;
|
||||||
temp_npctype_data->unique_spawn_by_name = atoi(row[83]) == 1 ? true : false;
|
t->unique_spawn_by_name = n.unique_spawn_by_name != 0;
|
||||||
temp_npctype_data->underwater = atoi(row[84]) == 1 ? true : false;
|
t->underwater = n.underwater != 0;
|
||||||
temp_npctype_data->emoteid = atoi(row[85]);
|
t->emoteid = n.emoteid;
|
||||||
temp_npctype_data->spellscale = atoi(row[86]);
|
t->spellscale = n.spellscale;
|
||||||
temp_npctype_data->healscale = atoi(row[87]);
|
t->healscale = n.healscale;
|
||||||
temp_npctype_data->no_target_hotkey = atoi(row[88]) == 1 ? true : false;
|
t->no_target_hotkey = n.no_target_hotkey != 0;
|
||||||
temp_npctype_data->raid_target = atoi(row[89]) == 0 ? false : true;
|
t->raid_target = n.raid_target != 0;
|
||||||
temp_npctype_data->attack_delay = atoi(row[90]) * 100; // TODO: fix DB
|
t->attack_delay = n.attack_delay * 100; // TODO: fix DB
|
||||||
temp_npctype_data->light = (atoi(row[91]) & 0x0F);
|
t->light = (n.light & 0x0F);
|
||||||
|
t->armtexture = n.armtexture;
|
||||||
temp_npctype_data->armtexture = atoi(row[92]);
|
t->bracertexture = n.bracertexture;
|
||||||
temp_npctype_data->bracertexture = atoi(row[93]);
|
t->handtexture = n.handtexture;
|
||||||
temp_npctype_data->handtexture = atoi(row[94]);
|
t->legtexture = n.legtexture;
|
||||||
temp_npctype_data->legtexture = atoi(row[95]);
|
t->feettexture = n.feettexture;
|
||||||
temp_npctype_data->feettexture = atoi(row[96]);
|
t->ignore_despawn = n.ignore_despawn != 0;
|
||||||
temp_npctype_data->ignore_despawn = atoi(row[97]) == 1 ? true : false;
|
t->show_name = n.show_name != 0;
|
||||||
temp_npctype_data->show_name = atoi(row[98]) != 0 ? true : false;
|
t->untargetable = n.untargetable != 0;
|
||||||
temp_npctype_data->untargetable = atoi(row[99]) != 0 ? true : false;
|
t->charm_ac = n.charm_ac;
|
||||||
|
t->charm_min_dmg = n.charm_min_dmg;
|
||||||
temp_npctype_data->charm_ac = atoi(row[100]);
|
t->charm_max_dmg = n.charm_max_dmg;
|
||||||
temp_npctype_data->charm_min_dmg = atoi(row[101]);
|
t->charm_attack_delay = n.charm_attack_delay * 100; // TODO: fix DB
|
||||||
temp_npctype_data->charm_max_dmg = atoi(row[102]);
|
t->charm_accuracy_rating = n.charm_accuracy_rating;
|
||||||
temp_npctype_data->charm_attack_delay = atoi(row[103]) * 100; // TODO: fix DB
|
t->charm_avoidance_rating = n.charm_avoidance_rating;
|
||||||
temp_npctype_data->charm_accuracy_rating = atoi(row[104]);
|
t->charm_atk = n.charm_atk;
|
||||||
temp_npctype_data->charm_avoidance_rating = atoi(row[105]);
|
t->skip_global_loot = n.skip_global_loot != 0;
|
||||||
temp_npctype_data->charm_atk = atoi(row[106]);
|
t->rare_spawn = n.rare_spawn != 0;
|
||||||
|
t->stuck_behavior = n.stuck_behavior;
|
||||||
temp_npctype_data->skip_global_loot = atoi(row[107]) != 0;
|
t->use_model = n.model;
|
||||||
temp_npctype_data->rare_spawn = atoi(row[108]) != 0;
|
t->flymode = n.flymode;
|
||||||
temp_npctype_data->stuck_behavior = atoi(row[109]);
|
t->always_aggro = n.always_aggro != 0;
|
||||||
temp_npctype_data->use_model = atoi(row[110]);
|
t->exp_mod = n.exp_mod;
|
||||||
temp_npctype_data->flymode = atoi(row[111]);
|
t->skip_auto_scale = false; // hardcoded here for now
|
||||||
temp_npctype_data->always_aggro = atoi(row[112]);
|
t->hp_regen_per_second = n.hp_regen_rate;
|
||||||
temp_npctype_data->exp_mod = atoi(row[113]);
|
|
||||||
temp_npctype_data->hp_regen_per_second = strtoll(row[114], nullptr, 10);
|
|
||||||
|
|
||||||
temp_npctype_data->skip_auto_scale = false; // hardcoded here for now
|
|
||||||
|
|
||||||
// If NPC with duplicate NPC id already in table,
|
// If NPC with duplicate NPC id already in table,
|
||||||
// free item we attempted to add.
|
// free item we attempted to add.
|
||||||
if (zone->npctable.find(temp_npctype_data->npc_id) != zone->npctable.end()) {
|
if (zone->npctable.find(t->npc_id) != zone->npctable.end()) {
|
||||||
std::cerr << "Error loading duplicate NPC " << temp_npctype_data->npc_id << std::endl;
|
std::cerr << "Error loading duplicate NPC " << t->npc_id << std::endl;
|
||||||
delete temp_npctype_data;
|
delete t;
|
||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
zone->npctable[temp_npctype_data->npc_id] = temp_npctype_data;
|
zone->npctable[t->npc_id] = t;
|
||||||
npc = temp_npctype_data;
|
npc = t;
|
||||||
}
|
}
|
||||||
|
|
||||||
return npc;
|
return npc;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user