fix: health scaling for <100%hp mobs and UNIT_MOD_HEALTH changes (#52)

Author: sogladev

src/mod_zone_difficulty_scripts.cpp

@@ -86,7 +86,7 @@ class mod_zone_difficulty_unitscript : public UnitScript
                             {
                                 if (sZoneDifficulty->SpellNerfOverrides[spellInfo->Id].find(mapId) != sZoneDifficulty->SpellNerfOverrides[spellInfo->Id].end())
                                 {
-                                    // Check if the mode of instance and SpellNerfOverride match 
+                                    // Check if the mode of instance and SpellNerfOverride match
                                     if (sZoneDifficulty->OverrideModeMatches(target->GetMap()->GetInstanceId(), spellInfo->Id, mapId))
                                         absorb = eff->GetAmount() * sZoneDifficulty->SpellNerfOverrides[spellInfo->Id][mapId].NerfPct;
                                 }
@@ -1084,7 +1084,7 @@ class mod_zone_difficulty_allcreaturescript : public AllCreatureScript
 
         CreatureBaseStats const* origCreatureStats = sObjectMgr->GetCreatureBaseStats(creature->GetLevel(), creatureTemplate->unit_class);
         uint32 baseHealth = origCreatureStats->GenerateHealth(creatureTemplate);
-        uint32 newHp = baseHealth;
+        uint32 scaledBaseHealth = baseHealth;
         uint32 entry = creature->GetEntry();
 
         uint32 phaseMask = creature->GetPhaseMask();
@@ -1095,7 +1095,7 @@ class mod_zone_difficulty_allcreaturescript : public AllCreatureScript
         {
             // Trash mobs. Apply generic tuning.
             if (!creature->IsDungeonBoss() && isMythic)
-                newHp = round(baseHealth * sZoneDifficulty->MythicmodeHpModifier);
+                scaledBaseHealth = round(baseHealth * sZoneDifficulty->MythicmodeHpModifier);
         }
         else
         {
@@ -1105,25 +1105,27 @@ class mod_zone_difficulty_allcreaturescript : public AllCreatureScript
             if (!multiplier)
                 multiplier = 1.0f; // never 0
 
-            newHp = round(baseHealth * multiplier);
+            scaledBaseHealth = round(baseHealth * multiplier);
         }
 
         if (matchingPhase != -1)
         {
-            if (creature->GetMaxHealth() == newHp)
-                return;
-
-            bool hpIsFull = false;
+            float scaledHealth = scaledBaseHealth;
+            scaledHealth *= creature->GetModifierValue(UNIT_MOD_HEALTH, BASE_PCT);
+            scaledHealth += creature->GetModifierValue(UNIT_MOD_HEALTH, TOTAL_VALUE);
+            scaledHealth *= creature->GetModifierValue(UNIT_MOD_HEALTH, TOTAL_PCT);
 
-            if (creature->GetHealthPct() >= 100)
-                hpIsFull = true;
+            if (creature->GetMaxHealth() == scaledHealth)
+                return;
 
-            creature->SetMaxHealth(newHp);
-            creature->SetCreateHealth(newHp);
-            creature->SetModifierValue(UNIT_MOD_HEALTH, BASE_VALUE, (float)newHp);
-            if (hpIsFull)
-                creature->SetHealth(newHp);
-            creature->UpdateAllStats();
+            float percent = creature->GetHealthPct();
+            creature->SetModifierValue(UNIT_MOD_HEALTH, BASE_VALUE, (float)scaledBaseHealth);
+            creature->UpdateMaxHealth();
+            if (creature->IsAlive())
+            {
+                uint32 scaledCurHealth = creature->CountPctFromMaxHealth(percent);
+                creature->SetHealth(scaledCurHealth);
+            }
             creature->ResetPlayerDamageReq();
         }
     }