pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-09-02 20:56:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/eqemu-api-data-service-netstats-ws

Browse Source
This commit is contained in:
Akkadius
2019-06-23 22:51:21 +00:00
parent 18fa056a38 2e9cf7dbd7
commit 09b633e374
35 changed files with 431 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/zonedb.cpp
+3
View File
@@ -2690,6 +2690,7 @@ const NPCType* ZoneDatabase::LoadNPCTypesData(uint32 npc_type_id, bool bulk_load
temp_npctype_data->rare_spawn = atoi(row[108]) != 0;
temp_npctype_data->stuck_behavior = atoi(row[109]);
temp_npctype_data->use_model = atoi(row[110]);
temp_npctype_data->skip_auto_scale = false; // hardcoded here for now
// If NPC with duplicate NPC id already in table,
// free item we attempted to add.
@@ -2892,6 +2893,8 @@ const NPCType* ZoneDatabase::GetMercType(uint32 id, uint16 raceid, uint32 client
tmpNPCType->scalerate = atoi(row[43]);
tmpNPCType->spellscale = atoi(row[44]);
tmpNPCType->healscale = atoi(row[45]);
tmpNPCType->skip_global_loot = true;
tmpNPCType->skip_auto_scale = true;
// If Merc with duplicate NPC id already in table,
// free item we attempted to add.