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

Add NPC Max Aggro Distance to zone table

Browse Source
This commit is contained in:
Michael Cook (mackal) 2018-09-08 00:22:16 -04:00
parent ec40b3dc69
commit 7836d020ce
6 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/eq_packet_structs.h
View File

@ -379,7 +379,8 @@ struct NewZone_Struct {
/*0708*/ uint32 FastRegenHP; /*0708*/ uint32 FastRegenHP;
/*0712*/ uint32 FastRegenMana; /*0712*/ uint32 FastRegenMana;
/*0716*/ uint32 FastRegenEndurance; /*0716*/ uint32 FastRegenEndurance;
/*0720*/ /*0720*/ uint32 NPCAggroMaxDist;
/*0724*/
}; };
/* /*

2
common/version.h
View File

@ -30,7 +30,7 @@
Manifest: https://github.com/EQEmu/Server/blob/master/utils/sql/db_update_manifest.txt Manifest: https://github.com/EQEmu/Server/blob/master/utils/sql/db_update_manifest.txt
*/ */
#define CURRENT_BINARY_DATABASE_VERSION 9126 #define CURRENT_BINARY_DATABASE_VERSION 9127
#ifdef BOTS #ifdef BOTS
#define CURRENT_BINARY_BOTS_DATABASE_VERSION 9019 #define CURRENT_BINARY_BOTS_DATABASE_VERSION 9019
#else #else

1
utils/sql/db_update_manifest.txt
View File

@ -380,6 +380,7 @@
9124|2018_07_09_tasks.sql|SHOW COLUMNS FROM `tasks` LIKE 'type'|empty| 9124|2018_07_09_tasks.sql|SHOW COLUMNS FROM `tasks` LIKE 'type'|empty|
9125|2018_07_20_task_emote.sql|SHOW COLUMNS FROM `tasks` LIKE 'completion_emote'|empty| 9125|2018_07_20_task_emote.sql|SHOW COLUMNS FROM `tasks` LIKE 'completion_emote'|empty|
9126|2018_09_07_FastRegen.sql|SHOW COLUMNS FROM `zone` LIKE 'fast_regen_hp'|empty| 9126|2018_09_07_FastRegen.sql|SHOW COLUMNS FROM `zone` LIKE 'fast_regen_hp'|empty|
9127|2018_09_07_NPCMaxAggroDist.sql|SHOW COLUMNS FROM `zone` LIKE 'npc_max_aggro_dist'|empty|
# Upgrade conditions: # Upgrade conditions:
# This won't be needed after this system is implemented, but it is used database that are not # This won't be needed after this system is implemented, but it is used database that are not

1
utils/sql/git/required/2018_09_07_NPCMaxAggroDist.sql Normal file
View File

@ -0,0 +1 @@
ALTER TABLE `zone` ADD `npc_max_aggro_dist` INT NOT NULL DEFAULT '600';

2
zone/mob_ai.cpp
View File

@ -1194,7 +1194,7 @@ void Mob::AI_Process() {
// NPCs will forget people after 10 mins of not interacting with them or out of range // NPCs will forget people after 10 mins of not interacting with them or out of range
// both of these maybe zone specific, hardcoded for now // both of these maybe zone specific, hardcoded for now
if (hate_list_cleanup_timer.Check()) { if (hate_list_cleanup_timer.Check()) {
hate_list.RemoveStaleEntries(600000, 600.0f); hate_list.RemoveStaleEntries(600000, static_cast<float>(zone->newzone_data.NPCAggroMaxDist));
if (hate_list.IsHateListEmpty()) { if (hate_list.IsHateListEmpty()) {
AI_Event_NoLongerEngaged(); AI_Event_NoLongerEngaged();
zone->DelAggroMob(); zone->DelAggroMob();

4
zone/zonedb.cpp
View File

@ -146,7 +146,8 @@ bool ZoneDatabase::GetZoneCFG(uint32 zoneid, uint16 instance_id, NewZone_Struct
"gravity, " // 56 "gravity, " // 56
"fast_regen_hp, " // 57 "fast_regen_hp, " // 57
"fast_regen_mana, " // 58 "fast_regen_mana, " // 58
"fast_regen_endurance " // 59 "fast_regen_endurance, " // 59
"npc_max_aggro_dist " // 60
"FROM zone WHERE zoneidnumber = %i AND version = %i", "FROM zone WHERE zoneidnumber = %i AND version = %i",
zoneid, instance_id); zoneid, instance_id);
auto results = QueryDatabase(query); auto results = QueryDatabase(query);
@ -194,6 +195,7 @@ bool ZoneDatabase::GetZoneCFG(uint32 zoneid, uint16 instance_id, NewZone_Struct
zone_data->FastRegenHP = atoi(row[57]); zone_data->FastRegenHP = atoi(row[57]);
zone_data->FastRegenMana = atoi(row[58]); zone_data->FastRegenMana = atoi(row[58]);
zone_data->FastRegenEndurance = atoi(row[59]); zone_data->FastRegenEndurance = atoi(row[59]);
zone_data->NPCAggroMaxDist = atoi(row[60]);
int bindable = 0; int bindable = 0;
bindable = atoi(row[31]); bindable = atoi(row[31]);