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

[Bug Fix] Mob scaling issue with min dmg set to zero while max dmg is not (#3351)

Browse Source 
* fix for mob scaling issue with min dmg set to zero while max dmg is not.

* Cleanup

---------

Co-authored-by: Kinglykrab <kinglykrab@gmail.com>
This commit is contained in:
RekkasGit 2023-05-19 22:11:11 -04:00 committed by GitHub
parent cd82bd8472
commit b8c91cf4f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
zone/npc.cpp
View File

@ -2611,15 +2611,31 @@ void NPC::ModifyNPCStat(const std::string& stat, const std::string& value)
return; return;
} }
else if (stat_lower == "min_hit") { else if (stat_lower == "min_hit") {
min_dmg = Strings::ToInt(value); min_dmg = Strings::ToInt(value);
// TODO: fix DB // TODO: fix DB
if (min_dmg > max_dmg) {
const auto temporary_damage = max_dmg;
max_dmg = min_dmg;
min_dmg = temporary_damage;
}
base_damage = round((max_dmg - min_dmg) / 1.9); base_damage = round((max_dmg - min_dmg) / 1.9);
min_damage = min_dmg - round(base_damage / 10.0); min_damage = min_dmg - round(base_damage / 10.0);
return; return;
} }
else if (stat_lower == "max_hit") { else if (stat_lower == "max_hit") {
max_dmg = Strings::ToInt(value); max_dmg = Strings::ToInt(value);
// TODO: fix DB // TODO: fix DB
if (max_dmg < min_dmg) {
const auto temporary_damage = min_dmg;
min_dmg = max_dmg;
max_dmg = temporary_damage;
}
base_damage = round((max_dmg - min_dmg) / 1.9); base_damage = round((max_dmg - min_dmg) / 1.9);
min_damage = min_dmg - round(base_damage / 10.0); min_damage = min_dmg - round(base_damage / 10.0);
return; return;

5
zone/npc_scale_manager.cpp
View File

@ -135,6 +135,8 @@ void NpcScaleManager::ScaleNPC(
npc->ModifyNPCStat("phr", std::to_string(scale_data.physical_resist)); npc->ModifyNPCStat("phr", std::to_string(scale_data.physical_resist));
} }
auto min_damage_set = false;
if (always_scale || npc->GetMinDMG() == 0) { if (always_scale || npc->GetMinDMG() == 0) {
int64 min_dmg = scale_data.min_dmg; int64 min_dmg = scale_data.min_dmg;
if (RuleB(Combat, UseNPCDamageClassLevelMods)) { if (RuleB(Combat, UseNPCDamageClassLevelMods)) {
@ -145,9 +147,10 @@ void NpcScaleManager::ScaleNPC(
} }
npc->ModifyNPCStat("min_hit", std::to_string(min_dmg)); npc->ModifyNPCStat("min_hit", std::to_string(min_dmg));
min_damage_set = true;
} }
if (always_scale || npc->GetMaxDMG() == 0) { if (always_scale || npc->GetMaxDMG() == 0 || min_damage_set) {
int64 max_dmg = scale_data.max_dmg; int64 max_dmg = scale_data.max_dmg;
if (RuleB(Combat, UseNPCDamageClassLevelMods)) { if (RuleB(Combat, UseNPCDamageClassLevelMods)) {
uint32 class_level_damage_mod = GetClassLevelDamageMod(npc->GetLevel(), npc->GetClass()); uint32 class_level_damage_mod = GetClassLevelDamageMod(npc->GetLevel(), npc->GetClass());