pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-16 22:58:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Code Cleanup] Optimization Code Cleanup (#4489)

Browse Source 
* Initial push

* More

* More

* Further simplify

* More cleanup

* More consolidation

* Fix

* Update

* Update npc.cpp

---------

Co-authored-by: Kinglykrab <kinglykrab@gmail.com>
This commit is contained in:
Chris Miles
2024-09-30 17:34:42 -05:00
committed by GitHub
parent 56608e84bd
commit bcd943a964
17 changed files with 309 additions and 486 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/mob.cpp
+53 -12
View File
@@ -128,8 +128,8 @@ Mob::Mob(
attack_anim_timer(500),
position_update_melee_push_timer(500),
hate_list_cleanup_timer(6000),
mob_close_scan_timer(6000),
mob_check_moving_timer(1000),
m_scan_close_mobs_timer(6000),
m_mob_check_moving_timer(1000),
bot_attack_flag_timer(10000)
{
mMovementManager = &MobMovementManager::Get();
@@ -517,7 +517,7 @@ Mob::Mob(
m_manual_follow = false;
mob_close_scan_timer.Trigger();
m_scan_close_mobs_timer.Trigger();
SetCanOpenDoors(true);
@@ -570,7 +570,7 @@ Mob::~Mob()
entity_list.RemoveMobFromCloseLists(this);
entity_list.RemoveAuraFromMobs(this);
close_mobs.clear();
m_close_mobs.clear();
LeaveHealRotationTargetPool();
}
@@ -5017,7 +5017,7 @@ void Mob::Say(const char *format, ...)
int16 distance = 200;
if (RuleB(Chat, QuestDialogueUsesDialogueWindow)) {
for (auto &e : entity_list.GetCloseMobList(talker, (distance * distance))) {
for (auto &e : talker->GetCloseMobList(distance)) {
Mob *mob = e.second;
if (!mob) {
continue;
@@ -6176,9 +6176,7 @@ int32 Mob::GetPositionalDmgTakenAmt(Mob *attacker)
void Mob::SetBottomRampageList()
{
auto &mob_list = entity_list.GetCloseMobList(this);
for (auto &e : mob_list) {
for (auto &e : GetCloseMobList()) {
auto mob = e.second;
if (!mob) {
continue;
@@ -6203,9 +6201,7 @@ void Mob::SetBottomRampageList()
void Mob::SetTopRampageList()
{
auto &mob_list = entity_list.GetCloseMobList(this);
for (auto &e : mob_list) {
for (auto &e : GetCloseMobList()) {
auto mob = e.second;
if (!mob) {
continue;
@@ -8619,7 +8615,7 @@ void Mob::SetExtraHaste(int haste, bool need_to_save)
bool Mob::IsCloseToBanker()
{
for (auto &e: entity_list.GetCloseMobList(this)) {
for (auto &e: GetCloseMobList()) {
auto mob = e.second;
if (mob && mob->IsNPC() && mob->GetClass() == Class::Banker) {
return true;
@@ -8648,3 +8644,48 @@ bool Mob::HasBotAttackFlag(Mob* tar) {
return false;
}
const uint16 scan_close_mobs_timer_moving = 6000; // 6 seconds
const uint16 scan_close_mobs_timer_idle = 60000; // 60 seconds
void Mob::CheckScanCloseMobsMovingTimer()
{
LogAIScanCloseDetail(
"Mob [{}] {}moving, scan timer [{}]",
GetCleanName(),
IsMoving() ? "" : "NOT ",
m_scan_close_mobs_timer.GetRemainingTime()
);
// If the moving timer triggers, lets see if we are moving or idle to restart the appropriate
// dynamic timer
if (m_mob_check_moving_timer.Check()) {
// If the mob is still moving, restart the moving timer
if (moving) {
if (m_scan_close_mobs_timer.GetRemainingTime() > scan_close_mobs_timer_moving) {
LogAIScanCloseDetail("Mob [{}] Restarting with moving timer", GetCleanName());
m_scan_close_mobs_timer.Disable();
m_scan_close_mobs_timer.Start(scan_close_mobs_timer_moving);
m_scan_close_mobs_timer.Trigger();
}
}
// If the mob is not moving, restart the idle timer
else if (m_scan_close_mobs_timer.GetDuration() == scan_close_mobs_timer_moving) {
LogAIScanCloseDetail("Mob [{}] Restarting with idle timer", GetCleanName());
m_scan_close_mobs_timer.Disable();
m_scan_close_mobs_timer.Start(scan_close_mobs_timer_idle);
}
}
}
void Mob::ScanCloseMobProcess()
{
if (m_scan_close_mobs_timer.Check()) {
entity_list.ScanCloseMobs(this);
}
}
std::unordered_map<uint16, Mob *> &Mob::GetCloseMobList(float distance)
{
return entity_list.GetCloseMobList(this, distance);
}