|
@@ -926,7 +926,7 @@ void WorldDatabase::LoadNPCs(ZoneServer* zone){
|
|
|
NPC* npc = 0;
|
|
|
int32 id = 0;
|
|
|
int32 total = 0;
|
|
|
- MYSQL_RES* result = query.RunQuery2(Q_SELECT,"SELECT npc.spawn_id, s.name, npc.min_level, npc.max_level, npc.enc_level, s.race, s.model_type, npc.class_, npc.gender, s.command_primary, s.command_secondary, s.show_name, npc.min_group_size, npc.max_group_size, npc.hair_type_id, npc.facial_hair_type_id, npc.wing_type_id, npc.chest_type_id, npc.legs_type_id, npc.soga_hair_type_id, npc.soga_facial_hair_type_id, s.attackable, s.show_level, s.targetable, s.show_command_icon, s.display_hand_icon, s.hp, s.power, s.size, s.collision_radius, npc.action_state, s.visual_state, npc.mood_state, npc.initial_state, npc.activity_status, s.faction_id, s.sub_title, s.merchant_id, s.merchant_type, s.size_offset, npc.attack_type, npc.ai_strategy+0, npc.spell_list_id, npc.secondary_spell_list_id, npc.skill_list_id, npc.secondary_skill_list_id, npc.equipment_list_id, npc.str, npc.sta, npc.wis, npc.intel, npc.agi, npc.heat, npc.cold, npc.magic, npc.mental, npc.divine, npc.disease, npc.poison, npc.aggro_radius, npc.cast_percentage, npc.randomize, npc.soga_model_type, npc.heroic_flag, npc.alignment, npc.elemental, npc.arcane, npc.noxious, s.savagery, s.dissonance, npc.hide_hood, npc.emote_state, s.prefix, s.suffix, s.last_name, s.expansion_flag, s.holiday_flag, s.disable_sounds, s.merchant_min_level, s.merchant_max_level, s.aaxp_rewards, npc.water_type, npc.flying_type\n"
|
|
|
+ MYSQL_RES* result = query.RunQuery2(Q_SELECT,"SELECT npc.spawn_id, s.name, npc.min_level, npc.max_level, npc.enc_level, s.race, s.model_type, npc.class_, npc.gender, s.command_primary, s.command_secondary, s.show_name, npc.min_group_size, npc.max_group_size, npc.hair_type_id, npc.facial_hair_type_id, npc.wing_type_id, npc.chest_type_id, npc.legs_type_id, npc.soga_hair_type_id, npc.soga_facial_hair_type_id, s.attackable, s.show_level, s.targetable, s.show_command_icon, s.display_hand_icon, s.hp, s.power, s.size, s.collision_radius, npc.action_state, s.visual_state, npc.mood_state, npc.initial_state, npc.activity_status, s.faction_id, s.sub_title, s.merchant_id, s.merchant_type, s.size_offset, npc.attack_type, npc.ai_strategy+0, npc.spell_list_id, npc.secondary_spell_list_id, npc.skill_list_id, npc.secondary_skill_list_id, npc.equipment_list_id, npc.str, npc.sta, npc.wis, npc.intel, npc.agi, npc.heat, npc.cold, npc.magic, npc.mental, npc.divine, npc.disease, npc.poison, npc.aggro_radius, npc.cast_percentage, npc.randomize, npc.soga_model_type, npc.heroic_flag, npc.alignment, npc.elemental, npc.arcane, npc.noxious, s.savagery, s.dissonance, npc.hide_hood, npc.emote_state, s.prefix, s.suffix, s.last_name, s.expansion_flag, s.holiday_flag, s.disable_sounds, s.merchant_min_level, s.merchant_max_level, s.aaxp_rewards, npc.water_type, npc.flying_type, s.loot_tier\n"
|
|
|
"FROM spawn s\n"
|
|
|
"INNER JOIN spawn_npcs npc\n"
|
|
|
"ON s.id = npc.spawn_id\n"
|
|
@@ -1082,6 +1082,8 @@ void WorldDatabase::LoadNPCs(ZoneServer* zone){
|
|
|
|
|
|
info->set_water_type(atoul(row[81]));
|
|
|
info->set_flying_type(atoul(row[82]));
|
|
|
+
|
|
|
+ npc->SetLootTier(atoul(row[83]));
|
|
|
|
|
|
zone->AddNPC(id, npc);
|
|
|
total++;
|
|
@@ -1206,7 +1208,7 @@ void WorldDatabase::LoadSigns(ZoneServer* zone){
|
|
|
Sign* sign = 0;
|
|
|
int32 id = 0;
|
|
|
int32 total = 0;
|
|
|
- MYSQL_RES* result = query.RunQuery2(Q_SELECT, "SELECT ss.spawn_id, s.name, s.model_type, s.size, s.show_command_icon, ss.widget_id, ss.widget_x, ss.widget_y, ss.widget_z, s.command_primary, s.command_secondary, s.collision_radius, ss.icon, ss.type, ss.title, ss.description, ss.sign_distance, ss.zone_id, ss.zone_x, ss.zone_y, ss.zone_z, ss.zone_heading, ss.include_heading, ss.include_location, s.transport_id, s.size_offset, s.display_hand_icon, s.visual_state, s.expansion_flag, s.holiday_flag, s.disable_sounds, s.merchant_min_level, s.merchant_max_level, s.aaxp_rewards\n"
|
|
|
+ MYSQL_RES* result = query.RunQuery2(Q_SELECT, "SELECT ss.spawn_id, s.name, s.model_type, s.size, s.show_command_icon, ss.widget_id, ss.widget_x, ss.widget_y, ss.widget_z, s.command_primary, s.command_secondary, s.collision_radius, ss.icon, ss.type, ss.title, ss.description, ss.sign_distance, ss.zone_id, ss.zone_x, ss.zone_y, ss.zone_z, ss.zone_heading, ss.include_heading, ss.include_location, s.transport_id, s.size_offset, s.display_hand_icon, s.visual_state, s.expansion_flag, s.holiday_flag, s.disable_sounds, s.merchant_min_level, s.merchant_max_level, s.aaxp_rewards, s.loot_tier\n"
|
|
|
"FROM spawn s\n"
|
|
|
"INNER JOIN spawn_signs ss\n"
|
|
|
"ON s.id = ss.spawn_id\n"
|
|
@@ -1281,6 +1283,8 @@ void WorldDatabase::LoadSigns(ZoneServer* zone){
|
|
|
|
|
|
sign->SetAAXPRewards(atoul(row[33]));
|
|
|
|
|
|
+ sign->SetLootTier(atoul(row[34]));
|
|
|
+
|
|
|
zone->AddSign(id, sign);
|
|
|
total++;
|
|
|
|
|
@@ -1296,7 +1300,7 @@ void WorldDatabase::LoadWidgets(ZoneServer* zone){
|
|
|
Widget* widget = 0;
|
|
|
int32 id = 0;
|
|
|
int32 total = 0;
|
|
|
- MYSQL_RES* result = query.RunQuery2(Q_SELECT, "SELECT sw.spawn_id, s.name, s.model_type, s.size, s.show_command_icon, sw.widget_id, sw.widget_x, sw.widget_y, sw.widget_z, s.command_primary, s.command_secondary, s.collision_radius, sw.include_heading, sw.include_location, sw.icon, sw.type, sw.open_heading, sw.open_y, sw.action_spawn_id, sw.open_sound_file, sw.close_sound_file, sw.open_duration, sw.closed_heading, sw.linked_spawn_id, sw.close_y, s.transport_id, s.size_offset, sw.house_id, sw.open_x, sw.open_z, sw.close_x, sw.close_z, s.display_hand_icon, s.expansion_flag, s.holiday_flag, s.disable_sounds, s.merchant_min_level, s.merchant_max_level, s.aaxp_rewards\n"
|
|
|
+ MYSQL_RES* result = query.RunQuery2(Q_SELECT, "SELECT sw.spawn_id, s.name, s.model_type, s.size, s.show_command_icon, sw.widget_id, sw.widget_x, sw.widget_y, sw.widget_z, s.command_primary, s.command_secondary, s.collision_radius, sw.include_heading, sw.include_location, sw.icon, sw.type, sw.open_heading, sw.open_y, sw.action_spawn_id, sw.open_sound_file, sw.close_sound_file, sw.open_duration, sw.closed_heading, sw.linked_spawn_id, sw.close_y, s.transport_id, s.size_offset, sw.house_id, sw.open_x, sw.open_z, sw.close_x, sw.close_z, s.display_hand_icon, s.expansion_flag, s.holiday_flag, s.disable_sounds, s.merchant_min_level, s.merchant_max_level, s.aaxp_rewards, s.loot_tier\n"
|
|
|
"FROM spawn s\n"
|
|
|
"INNER JOIN spawn_widgets sw\n"
|
|
|
"ON s.id = sw.spawn_id\n"
|
|
@@ -1385,6 +1389,8 @@ void WorldDatabase::LoadWidgets(ZoneServer* zone){
|
|
|
|
|
|
widget->SetAAXPRewards(atoul(row[38]));
|
|
|
|
|
|
+ widget->SetLootTier(atoul(row[39]));
|
|
|
+
|
|
|
zone->AddWidget(id, widget);
|
|
|
total++;
|
|
|
|
|
@@ -1400,7 +1406,7 @@ void WorldDatabase::LoadObjects(ZoneServer* zone){
|
|
|
Object* object = 0;
|
|
|
int32 id = 0;
|
|
|
int32 total = 0;
|
|
|
- MYSQL_RES* result = query.RunQuery2(Q_SELECT, "SELECT so.spawn_id, s.name, s.race, s.model_type, s.command_primary, s.command_secondary, s.targetable, s.size, s.show_name, s.visual_state, s.attackable, s.show_level, s.show_command_icon, s.display_hand_icon, s.faction_id, s.collision_radius, s.transport_id, s.size_offset, so.device_id, s.expansion_flag, s.holiday_flag, s.disable_sounds, s.merchant_min_level, s.merchant_max_level, s.aaxp_rewards\n"
|
|
|
+ MYSQL_RES* result = query.RunQuery2(Q_SELECT, "SELECT so.spawn_id, s.name, s.race, s.model_type, s.command_primary, s.command_secondary, s.targetable, s.size, s.show_name, s.visual_state, s.attackable, s.show_level, s.show_command_icon, s.display_hand_icon, s.faction_id, s.collision_radius, s.transport_id, s.size_offset, so.device_id, s.expansion_flag, s.holiday_flag, s.disable_sounds, s.merchant_min_level, s.merchant_max_level, s.aaxp_rewards, s.loot_tier\n"
|
|
|
"FROM spawn s\n"
|
|
|
"INNER JOIN spawn_objects so\n"
|
|
|
"ON s.id = so.spawn_id\n"
|
|
@@ -1462,6 +1468,8 @@ void WorldDatabase::LoadObjects(ZoneServer* zone){
|
|
|
|
|
|
object->SetAAXPRewards(atoul(row[24]));
|
|
|
|
|
|
+ object->SetLootTier(atoul(row[25]));
|
|
|
+
|
|
|
zone->AddObject(id, object);
|
|
|
total++;
|
|
|
|
|
@@ -1477,7 +1485,7 @@ void WorldDatabase::LoadGroundSpawns(ZoneServer* zone){
|
|
|
GroundSpawn* spawn = 0;
|
|
|
int32 id = 0;
|
|
|
int32 total = 0;
|
|
|
- MYSQL_RES* result = query.RunQuery2(Q_SELECT, "SELECT sg.spawn_id, s.name, s.race, s.model_type, s.command_primary, s.command_secondary, s.targetable, s.size, s.show_name, s.visual_state, s.attackable, s.show_level, s.show_command_icon, s.display_hand_icon, s.faction_id, s.collision_radius, sg.number_harvests, sg.num_attempts_per_harvest, sg.groundspawn_id, sg.collection_skill, s.size_offset, s.expansion_flag, s.holiday_flag, s.disable_sounds, s.aaxp_rewards\n"
|
|
|
+ MYSQL_RES* result = query.RunQuery2(Q_SELECT, "SELECT sg.spawn_id, s.name, s.race, s.model_type, s.command_primary, s.command_secondary, s.targetable, s.size, s.show_name, s.visual_state, s.attackable, s.show_level, s.show_command_icon, s.display_hand_icon, s.faction_id, s.collision_radius, sg.number_harvests, sg.num_attempts_per_harvest, sg.groundspawn_id, sg.collection_skill, s.size_offset, s.expansion_flag, s.holiday_flag, s.disable_sounds, s.aaxp_rewards, s.loot_tier\n"
|
|
|
"FROM spawn s\n"
|
|
|
"INNER JOIN spawn_ground sg\n"
|
|
|
"ON s.id = sg.spawn_id\n"
|
|
@@ -1540,6 +1548,8 @@ void WorldDatabase::LoadGroundSpawns(ZoneServer* zone){
|
|
|
|
|
|
spawn->SetAAXPRewards(atoul(row[24]));
|
|
|
|
|
|
+ spawn->SetLootTier(atoul(row[25]));
|
|
|
+
|
|
|
zone->AddGroundSpawn(id, spawn);
|
|
|
total++;
|
|
|
LogWrite(GROUNDSPAWN__DEBUG, 5, "GSpawn", "---Loading GroundSpawn: '%s' (%u)", spawn->appearance.name, id);
|
|
@@ -6305,7 +6315,7 @@ bool WorldDatabase::LoadSign(ZoneServer* zone, int32 spawn_id) {
|
|
|
Sign* sign = 0;
|
|
|
int32 id = 0;
|
|
|
DatabaseResult result;
|
|
|
- database_new.Select(&result, "SELECT ss.spawn_id, s.name, s.model_type, s.size, s.show_command_icon, ss.widget_id, ss.widget_x, ss.widget_y, ss.widget_z, s.command_primary, s.command_secondary, s.collision_radius, ss.icon, ss.type, ss.title, ss.description, ss.sign_distance, ss.zone_id, ss.zone_x, ss.zone_y, ss.zone_z, ss.zone_heading, ss.include_heading, ss.include_location, s.transport_id, s.size_offset, s.display_hand_icon, s.visual_state, s.disable_sounds, s.merchant_min_level, s.merchant_max_level, s.aaxp_rewards\n"
|
|
|
+ database_new.Select(&result, "SELECT ss.spawn_id, s.name, s.model_type, s.size, s.show_command_icon, ss.widget_id, ss.widget_x, ss.widget_y, ss.widget_z, s.command_primary, s.command_secondary, s.collision_radius, ss.icon, ss.type, ss.title, ss.description, ss.sign_distance, ss.zone_id, ss.zone_x, ss.zone_y, ss.zone_z, ss.zone_heading, ss.include_heading, ss.include_location, s.transport_id, s.size_offset, s.display_hand_icon, s.visual_state, s.disable_sounds, s.merchant_min_level, s.merchant_max_level, s.aaxp_rewards, s.loot_tier\n"
|
|
|
"FROM spawn s\n"
|
|
|
"INNER JOIN spawn_signs ss\n"
|
|
|
"ON ss.spawn_id = s.id\n"
|
|
@@ -6363,6 +6373,8 @@ bool WorldDatabase::LoadSign(ZoneServer* zone, int32 spawn_id) {
|
|
|
|
|
|
sign->SetAAXPRewards(result.GetInt32(31));
|
|
|
|
|
|
+ sign->SetLootTier(result.GetInt32(32));
|
|
|
+
|
|
|
zone->AddSign(id, sign);
|
|
|
|
|
|
|
|
@@ -6378,7 +6390,7 @@ bool WorldDatabase::LoadWidget(ZoneServer* zone, int32 spawn_id) {
|
|
|
int32 id = 0;
|
|
|
DatabaseResult result;
|
|
|
|
|
|
- database_new.Select(&result, "SELECT sw.spawn_id, s.name, s.model_type, s.size, s.show_command_icon, sw.widget_id, sw.widget_x, sw.widget_y, sw.widget_z, s.command_primary, s.command_secondary, s.collision_radius, sw.include_heading, sw.include_location, sw.icon, sw.type, sw.open_heading, sw.open_y, sw.action_spawn_id, sw.open_sound_file, sw.close_sound_file, sw.open_duration, sw.closed_heading, sw.linked_spawn_id, sw.close_y, s.transport_id, s.size_offset, sw.house_id, sw.open_x, sw.open_z, sw.close_x, sw.close_z, s.display_hand_icon, s.disable_sounds, s.merchant_min_level, s.merchant_max_level, s.aaxp_rewards\n"
|
|
|
+ database_new.Select(&result, "SELECT sw.spawn_id, s.name, s.model_type, s.size, s.show_command_icon, sw.widget_id, sw.widget_x, sw.widget_y, sw.widget_z, s.command_primary, s.command_secondary, s.collision_radius, sw.include_heading, sw.include_location, sw.icon, sw.type, sw.open_heading, sw.open_y, sw.action_spawn_id, sw.open_sound_file, sw.close_sound_file, sw.open_duration, sw.closed_heading, sw.linked_spawn_id, sw.close_y, s.transport_id, s.size_offset, sw.house_id, sw.open_x, sw.open_z, sw.close_x, sw.close_z, s.display_hand_icon, s.disable_sounds, s.merchant_min_level, s.merchant_max_level, s.aaxp_rewards, s.loot_tier\n"
|
|
|
"FROM spawn s\n"
|
|
|
"INNER JOIN spawn_widgets sw\n"
|
|
|
"ON sw.spawn_id = s.id\n"
|
|
@@ -6443,6 +6455,8 @@ bool WorldDatabase::LoadWidget(ZoneServer* zone, int32 spawn_id) {
|
|
|
|
|
|
widget->SetAAXPRewards(result.GetInt32(36));
|
|
|
|
|
|
+ widget->SetLootTier(result.GetInt32(37));
|
|
|
+
|
|
|
zone->AddWidget(id, widget);
|
|
|
|
|
|
LogWrite(WIDGET__DEBUG, 0, "Widget", "Loaded Widget: '%s' (%u).", widget->appearance.name, spawn_id);
|
|
@@ -6458,7 +6472,7 @@ bool WorldDatabase::LoadObject(ZoneServer* zone, int32 spawn_id) {
|
|
|
int32 id = 0;
|
|
|
DatabaseResult result;
|
|
|
|
|
|
- database_new.Select(&result, "SELECT so.spawn_id, s.name, s.race, s.model_type, s.command_primary, s.command_secondary, s.targetable, s.size, s.show_name, s.visual_state, s.attackable, s.show_level, s.show_command_icon, s.display_hand_icon, s.faction_id, s.collision_radius, s.transport_id, s.size_offset, so.device_id, s.disable_sounds, s.merchant_min_level, s.merchant_max_level, s.aaxp_rewards\n"
|
|
|
+ database_new.Select(&result, "SELECT so.spawn_id, s.name, s.race, s.model_type, s.command_primary, s.command_secondary, s.targetable, s.size, s.show_name, s.visual_state, s.attackable, s.show_level, s.show_command_icon, s.display_hand_icon, s.faction_id, s.collision_radius, s.transport_id, s.size_offset, so.device_id, s.disable_sounds, s.merchant_min_level, s.merchant_max_level, s.aaxp_rewards, s.loot_tier\n"
|
|
|
"FROM spawn s\n"
|
|
|
"INNER JOIN spawn_objects so\n"
|
|
|
"ON so.spawn_id = s.id\n"
|
|
@@ -6501,6 +6515,8 @@ bool WorldDatabase::LoadObject(ZoneServer* zone, int32 spawn_id) {
|
|
|
|
|
|
object->SetAAXPRewards(result.GetInt32(22));
|
|
|
|
|
|
+ object->SetLootTier(result.GetInt32(23));
|
|
|
+
|
|
|
zone->AddObject(id, object);
|
|
|
|
|
|
LogWrite(OBJECT__DEBUG, 0, "Object", "Loaded Object: '%s' (%u).", object->appearance.name, spawn_id);
|
|
@@ -6516,7 +6532,7 @@ bool WorldDatabase::LoadGroundSpawn(ZoneServer* zone, int32 spawn_id) {
|
|
|
int32 id = 0;
|
|
|
DatabaseResult result;
|
|
|
|
|
|
- database_new.Select(&result, "SELECT sg.spawn_id, s.name, s.race, s.model_type, s.command_primary, s.command_secondary, s.targetable, s.size, s.show_name, s.visual_state, s.attackable, s.show_level, s.show_command_icon, s.display_hand_icon, s.faction_id, s.collision_radius, sg.number_harvests, sg.num_attempts_per_harvest, sg.groundspawn_id, sg.collection_skill, s.size_offset\n"
|
|
|
+ database_new.Select(&result, "SELECT sg.spawn_id, s.name, s.race, s.model_type, s.command_primary, s.command_secondary, s.targetable, s.size, s.show_name, s.visual_state, s.attackable, s.show_level, s.show_command_icon, s.display_hand_icon, s.faction_id, s.collision_radius, sg.number_harvests, sg.num_attempts_per_harvest, sg.groundspawn_id, sg.collection_skill, s.size_offset, s.disable_sounds, s.aaxp_rewards, s.loot_tier\n"
|
|
|
"FROM spawn s\n"
|
|
|
"INNER JOIN spawn_ground sg\n"
|
|
|
"ON sg.spawn_id = s.id\n"
|
|
@@ -6555,6 +6571,11 @@ bool WorldDatabase::LoadGroundSpawn(ZoneServer* zone, int32 spawn_id) {
|
|
|
spawn->SetGroundSpawnEntryID(result.GetInt32(18));
|
|
|
spawn->SetCollectionSkill(result.GetString(19));
|
|
|
spawn->SetSizeOffset(result.GetInt8(20));
|
|
|
+
|
|
|
+ spawn->SetSoundsDisabled(result.GetInt8(21));
|
|
|
+ spawn->SetAAXPRewards(result.GetInt32(22));
|
|
|
+
|
|
|
+ spawn->SetLootTier(result.GetInt32(23));
|
|
|
|
|
|
zone->AddGroundSpawn(id, spawn);
|
|
|
|
|
@@ -6610,7 +6631,7 @@ bool WorldDatabase::LoadNPC(ZoneServer* zone, int32 spawn_id) {
|
|
|
int32 id = 0;
|
|
|
DatabaseResult result;
|
|
|
|
|
|
- database_new.Select(&result, "SELECT npc.spawn_id, s.name, npc.min_level, npc.max_level, npc.enc_level, s.race, s.model_type, npc.class_, npc.gender, s.command_primary, s.command_secondary, s.show_name, npc.min_group_size, npc.max_group_size, npc.hair_type_id, npc.facial_hair_type_id, npc.wing_type_id, npc.chest_type_id, npc.legs_type_id, npc.soga_hair_type_id, npc.soga_facial_hair_type_id, s.attackable, s.show_level, s.targetable, s.show_command_icon, s.display_hand_icon, s.hp, s.power, s.size, s.collision_radius, npc.action_state, s.visual_state, npc.mood_state, npc.initial_state, npc.activity_status, s.faction_id, s.sub_title, s.merchant_id, s.merchant_type, s.size_offset, npc.attack_type, npc.ai_strategy+0, npc.spell_list_id, npc.secondary_spell_list_id, npc.skill_list_id, npc.secondary_skill_list_id, npc.equipment_list_id, npc.str, npc.sta, npc.wis, npc.intel, npc.agi, npc.heat, npc.cold, npc.magic, npc.mental, npc.divine, npc.disease, npc.poison, npc.aggro_radius, npc.cast_percentage, npc.randomize, npc.soga_model_type, npc.heroic_flag, npc.alignment, npc.elemental, npc.arcane, npc.noxious, s.savagery, s.dissonance, npc.hide_hood, npc.emote_state, s.prefix, s.suffix, s.last_name, s.disable_sounds, s.merchant_min_level, s.merchant_max_level, s.aaxp_rewards\n"
|
|
|
+ database_new.Select(&result, "SELECT npc.spawn_id, s.name, npc.min_level, npc.max_level, npc.enc_level, s.race, s.model_type, npc.class_, npc.gender, s.command_primary, s.command_secondary, s.show_name, npc.min_group_size, npc.max_group_size, npc.hair_type_id, npc.facial_hair_type_id, npc.wing_type_id, npc.chest_type_id, npc.legs_type_id, npc.soga_hair_type_id, npc.soga_facial_hair_type_id, s.attackable, s.show_level, s.targetable, s.show_command_icon, s.display_hand_icon, s.hp, s.power, s.size, s.collision_radius, npc.action_state, s.visual_state, npc.mood_state, npc.initial_state, npc.activity_status, s.faction_id, s.sub_title, s.merchant_id, s.merchant_type, s.size_offset, npc.attack_type, npc.ai_strategy+0, npc.spell_list_id, npc.secondary_spell_list_id, npc.skill_list_id, npc.secondary_skill_list_id, npc.equipment_list_id, npc.str, npc.sta, npc.wis, npc.intel, npc.agi, npc.heat, npc.cold, npc.magic, npc.mental, npc.divine, npc.disease, npc.poison, npc.aggro_radius, npc.cast_percentage, npc.randomize, npc.soga_model_type, npc.heroic_flag, npc.alignment, npc.elemental, npc.arcane, npc.noxious, s.savagery, s.dissonance, npc.hide_hood, npc.emote_state, s.prefix, s.suffix, s.last_name, s.disable_sounds, s.merchant_min_level, s.merchant_max_level, s.aaxp_rewards, s.loot_tier\n"
|
|
|
"FROM spawn s\n"
|
|
|
"INNER JOIN spawn_npcs npc\n"
|
|
|
"ON npc.spawn_id = s.id\n"
|
|
@@ -6740,6 +6761,8 @@ bool WorldDatabase::LoadNPC(ZoneServer* zone, int32 spawn_id) {
|
|
|
|
|
|
npc->SetAAXPRewards(result.GetInt32(78));
|
|
|
|
|
|
+ npc->SetLootTier(result.GetInt32(79));
|
|
|
+
|
|
|
zone->AddNPC(id, npc);
|
|
|
|
|
|
//skipped spells/skills/equipment as it is all loaded, the following rely on a spawn to load
|