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

Some adjustments to scale manager

Browse Source
This commit is contained in:
Akkadius 2018-12-16 02:30:53 -06:00
parent a7f2eebfdf
commit bc6109ec8f
3 changed files with 36 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
zone/mob_info.cpp
View File

@ -619,7 +619,6 @@ inline void NPCCommandsMenu(Client* client, NPC* npc)
} }
if (menu_commands.length() > 0) { if (menu_commands.length() > 0) {
// client->Message(0, "| # Show Commmands");
client->Message(0, "| [Show Commands] %s", menu_commands.c_str()); client->Message(0, "| [Show Commands] %s", menu_commands.c_str());
} }
} }

41
zone/npc_scale_manager.cpp
View File

@ -26,8 +26,9 @@
*/ */
void NpcScaleManager::ScaleNPC(NPC * npc) void NpcScaleManager::ScaleNPC(NPC * npc)
{ {
int8 npc_type = GetNPCScalingType(npc); int8 npc_type = GetNPCScalingType(npc);
int npc_level = npc->GetLevel(); int npc_level = npc->GetLevel();
bool is_auto_scaled = IsAutoScaled(npc);
global_npc_scale scale_data = GetGlobalScaleDataForTypeLevel(npc_type, npc_level); global_npc_scale scale_data = GetGlobalScaleDataForTypeLevel(npc_type, npc_level);
@ -93,10 +94,10 @@ void NpcScaleManager::ScaleNPC(NPC * npc)
if (npc->GetDR() == 0) { if (npc->GetDR() == 0) {
npc->ModifyNPCStat("dr", std::to_string(scale_data.disease_resist).c_str()); npc->ModifyNPCStat("dr", std::to_string(scale_data.disease_resist).c_str());
} }
if (npc->GetCR() == 0) { if (npc->GetCorrup() == 0) {
npc->ModifyNPCStat("cr", std::to_string(scale_data.corruption_resist).c_str()); npc->ModifyNPCStat("cr", std::to_string(scale_data.corruption_resist).c_str());
} }
if (npc->GetPR() == 0) { if (npc->GetPhR() == 0) {
npc->ModifyNPCStat("pr", std::to_string(scale_data.physical_resist).c_str()); npc->ModifyNPCStat("pr", std::to_string(scale_data.physical_resist).c_str());
} }
if (npc->GetMinDMG() == 0) { if (npc->GetMinDMG() == 0) {
@ -142,7 +143,7 @@ void NpcScaleManager::ScaleNPC(NPC * npc)
if (npc->GetHealScale() == 0) { if (npc->GetHealScale() == 0) {
npc->ModifyNPCStat("heal_scale", std::to_string(scale_data.heal_scale).c_str()); npc->ModifyNPCStat("heal_scale", std::to_string(scale_data.heal_scale).c_str());
} }
if (!npc->HasSpecialAbilities() && npc->EntityVariableExists("max_hp")) { if (!npc->HasSpecialAbilities() && is_auto_scaled) {
npc->ModifyNPCStat("special_abilities", scale_data.special_abilities.c_str()); npc->ModifyNPCStat("special_abilities", scale_data.special_abilities.c_str());
} }
@ -158,10 +159,11 @@ void NpcScaleManager::ScaleNPC(NPC * npc)
Log(Logs::General, Log(Logs::General,
Logs::NPCScaling, Logs::NPCScaling,
"(%s) level: %i type: %i Setting: %s", "(%s) level: %i type: %i Auto: %s Setting: %s",
npc->GetCleanName(), npc->GetCleanName(),
npc_level, npc_level,
npc_type, npc_type,
(is_auto_scaled ? "true" : "false"),
scale_log.c_str()); scale_log.c_str());
} }
} }
@ -444,6 +446,33 @@ std::string NpcScaleManager::GetNPCScalingTypeName(NPC *&npc)
return "Trash"; return "Trash";
} }
/**
* Determines based on minimum criteria if NPC is auto scaled for certain things to be scaled like
* special abilities. We use this so we don't blindly assume we want things to be applied
*
* @param npc
* @return
*/
bool NpcScaleManager::IsAutoScaled(NPC *npc)
{
return
(npc->GetHP() == 0 &&
npc->GetMaxDMG() == 0 &&
npc->GetMinDMG() == 0 &&
npc->GetSTR() == 0 &&
npc->GetSTA() == 0 &&
npc->GetDEX() == 0 &&
npc->GetAGI() == 0 &&
npc->GetINT() == 0 &&
npc->GetWIS() == 0 &&
npc->GetCHA() == 0 &&
npc->GetMR() == 0 &&
npc->GetFR() == 0 &&
npc->GetCR() == 0 &&
npc->GetPR() == 0 &&
npc->GetDR() == 0);
}
/** /**
* Returns false if scaling data not found * Returns false if scaling data not found
* @param npc * @param npc

2
zone/npc_scale_manager.h
View File

@ -21,7 +21,6 @@
#ifndef EQEMU_NPC_SCALE_MANAGER_H #ifndef EQEMU_NPC_SCALE_MANAGER_H
#define EQEMU_NPC_SCALE_MANAGER_H #define EQEMU_NPC_SCALE_MANAGER_H
#include "npc.h" #include "npc.h"
class NpcScaleManager { class NpcScaleManager {
@ -88,6 +87,7 @@ public:
}; };
void ScaleNPC(NPC * npc); void ScaleNPC(NPC * npc);
bool IsAutoScaled(NPC * npc);
bool LoadScaleData(); bool LoadScaleData();
global_npc_scale GetGlobalScaleDataForTypeLevel(int8 npc_type, int npc_level); global_npc_scale GetGlobalScaleDataForTypeLevel(int8 npc_type, int npc_level);