Merge pull request LandSandBoat#10393 from UmeboshiXI/Mob_BaseDamage_Refactor

[core][lua] Mob Weapon Damage Refactor

Author: Xaver-DaRed

scripts/enum/mob_mod.lua

@@ -67,7 +67,7 @@ xi.mobMod =
     HP_STANDBACK           = 56, -- mob will always standback with hp % higher to value
     MAGIC_DELAY            = 57, -- Amount of seconds mob waits before casting first spell
     SPECIAL_DELAY          = 58, -- Amount of seconds mob waits before using first special
-    WEAPON_BONUS           = 59, -- Add a flat modifer mob weapon damage ( damage + bonus )
+    BASE_DAMAGE_MODIFIER   = 59, -- Add a flat modifer mob a mob's base damage. This is subject to multiplication by MOBMOD_BASE_DAMAGE_MULTIPLIER.
     SPAWN_ANIMATIONSUB     = 60, -- reset animationsub to this on spawn
     HP_SCALE               = 61, -- Scale the mobs max HP. ( hp_scale / 100 ) * maxhp
     NO_STANDBACK           = 62, -- Mob will never standback
@@ -94,7 +94,7 @@ xi.mobMod =
     CLAIM_TYPE             = 83, -- Changes the claim behavior of the mob. See xi.claimType enum.
     NO_SPELL_COST          = 84, -- Mob does not use MP when casting spells
     ASTRAL_PET_OFFSET      = 85, -- If non-zero, defines the offset from main mob's ID for astral flow (if zero, will assume offset of 2)
-    BASE_DAMAGE_MULTIPLIER = 86, -- Multiplies the mob's base damage. Example: 150 = x1.5
+    BASE_DAMAGE_MULTIPLIER = 86, -- Multiplies the mob's base damage. Example: 150 = x1.5. MOBMOD_DAMAGE_OFFSET/MOBMOD_RANGED_DAMAGE_OFFSET are not subject to multiplication.
     DAMAGE_OFFSET          = 87, -- Adds or subtracts the mob's base damage offset.
     RANGED_DAMAGE_OFFSET   = 88, -- Adds or subtracts the mob's ranged base damage offset.
     AVATAR_PETID           = 89, -- A value from xi.petId to select model/ability from when owner uses astral flow

scripts/mixins/families/euvhi.lua

@@ -24,13 +24,13 @@ end
 
 local function openMouth(mob)
     local damage = 1 + mob:getMainLvl() / 2
-    mob:setMobMod(xi.mobMod.WEAPON_BONUS, damage)
+    mob:setMobMod(xi.mobMod.BASE_DAMAGE_MODIFIER, damage)
     mob:setAnimationSub(2) -- TODO: the db.. mobs start with animsub 4 or 6? shouldn't even be possible
     mob:wait(2000)
 end
 
 local function closeMouth(mob)
-    mob:setMobMod(xi.mobMod.WEAPON_BONUS, 0)
+    mob:setMobMod(xi.mobMod.BASE_DAMAGE_MODIFIER, 0)
     mob:setLocalVar('[euvhi]changeTime', GetSystemTime() + 80)
     mob:setLocalVar('closeMouth', 0)
     mob:setAnimationSub(1) -- TODO: db shows animsub 5?

scripts/mixins/families/ghrah.lua

@@ -163,7 +163,7 @@ local function switchMobForm(mob, form, aggressive)
     local originalEva = mob:getLocalVar('originalEVA')
 
     -- Reset to base stats first
-    mob:setMobMod(xi.mobMod.WEAPON_BONUS, 0)
+    mob:setMobMod(xi.mobMod.BASE_DAMAGE_MODIFIER, 0)
     mob:setMod(xi.mod.ATT, originalAtt)
     mob:setMod(xi.mod.DEF, originalDef)
     mob:setMod(xi.mod.EVA, originalEva)
@@ -177,7 +177,7 @@ local function switchMobForm(mob, form, aggressive)
     elseif form == 2 then
         -- Spider form
         -- ATT and DEF traits equivalent to 75 WAR
-        mob:setMobMod(xi.mobMod.WEAPON_BONUS, mob:getMainLvl() + 2)
+        mob:setMobMod(xi.mobMod.BASE_DAMAGE_MODIFIER, mob:getMainLvl() + 2)
         mob:setMod(xi.mod.ATT, originalAtt + 11)
         mob:setMod(xi.mod.DEF, originalDef + 11)
     elseif form == 3 then

scripts/mixins/families/hpemde.lua

@@ -32,14 +32,14 @@ end
 
 -- Hpemde take 100% increased damage and deal 2x base damage in open mouth form
 local function openMouth(mob)
-    mob:setMobMod(xi.mobMod.WEAPON_BONUS, mob:getMainLvl() + 2)
+    mob:setMobMod(xi.mobMod.BASE_DAMAGE_MODIFIER, mob:getMainLvl() + 2)
     mob:setMod(xi.mod.DMG, 10000)
     mob:setAnimationSub(3)
     mob:wait(2000)
 end
 
 local function closeMouth(mob)
-    mob:setMobMod(xi.mobMod.WEAPON_BONUS, 0)
+    mob:setMobMod(xi.mobMod.BASE_DAMAGE_MODIFIER, 0)
     mob:setMod(xi.mod.DMG, 0)
     mob:setLocalVar('[hpemde]changeTime', mob:getBattleTime() + 30)
     mob:setAnimationSub(6)

scripts/specs/core/CBaseEntity.lua

@@ -3875,8 +3875,9 @@ function CBaseEntity:setDelay(delay)
 end
 
 ---@param damage integer
+---@param slot xi.slot
 ---@return nil
-function CBaseEntity:setDamage(damage)
+function CBaseEntity:setDamage(damage, slot)
 end
 
 ---@nodiscard

scripts/zones/AlTaieu/mobs/Jailer_of_Hope.lua

@@ -25,7 +25,7 @@ entity.onMobInitialize = function(mob)
 end
 
 entity.onMobSpawn = function(mob)
-    mob:setMobMod(xi.mobMod.WEAPON_BONUS, 78) -- 175 total weapon damage
+    mob:setMobMod(xi.mobMod.BASE_DAMAGE_MODIFIER, 78) -- 175 total weapon damage
     mob:addMod(xi.mod.EVA, 30)
     mob:addMod(xi.mod.DEFP, 50)
     mob:addMod(xi.mod.ATTP, 50)

scripts/zones/AlTaieu/mobs/Jailer_of_Prudence.lua

@@ -46,7 +46,7 @@ entity.onMobSpawn = function(mob)
     mob:setMod(xi.mod.TRIPLE_ATTACK, 20)
     mob:addMod(xi.mod.DEFP, 33)
     mob:addMod(xi.mod.MOVE_SPEED_STACKABLE, 20)
-    mob:addMobMod(xi.mobMod.WEAPON_BONUS, 72) -- 180 total weapon damage
+    mob:addMobMod(xi.mobMod.BASE_DAMAGE_MODIFIER, 72) -- 180 total weapon damage
 end
 
 local teleportToTarget = function(mob, target, currentTargetId)

scripts/zones/AlTaieu/mobs/Omyovra.lua

@@ -12,7 +12,7 @@ end
 
 entity.onMobSpawn = function(mob)
     mob:setMod(xi.mod.REGEN, 50)
-    mob:setMobMod(xi.mobMod.WEAPON_BONUS, mob:getMainLvl() - 2) -- Base damage is level * 2
+    mob:setMobMod(xi.mobMod.BASE_DAMAGE_MODIFIER, mob:getMainLvl() - 2) -- Base damage is level * 2
     mob:setMod(xi.mod.AGI, 76 - mob:getStat(xi.mod.AGI))        -- Jimmy indicates AGI for Omyovra should be 76 or so
     -- Yovra have a +50% bonus to defense
     mob:addMod(xi.mod.DEF, mob:getStat(xi.mod.DEF) * 0.5)

scripts/zones/AlTaieu/mobs/Qnhpemde.lua

@@ -22,7 +22,7 @@ entity.onMobFight = function(mob, target)
     if mob:getAnimationSub() == 6 and mob:getBattleTime() - changeTime > 30 then
         mob:setAnimationSub(3) -- Mouth Open
         -- Double the mob weapon damage
-        mob:setMobMod(xi.mobMod.WEAPON_BONUS, mob:getMainLvl())
+        mob:setMobMod(xi.mobMod.BASE_DAMAGE_MODIFIER, mob:getMainLvl())
         -- Boost all damage taken by 50%
         mob:setMod(xi.mod.UDMGPHYS, 5000)
         mob:setMod(xi.mod.UDMGRANGE, 5000)
@@ -32,7 +32,7 @@ entity.onMobFight = function(mob, target)
 
     elseif mob:getAnimationSub() == 3 and mob:getBattleTime() - changeTime > 30 then
         mob:setAnimationSub(6) -- Mouth Closed
-        mob:setMobMod(xi.mobMod.WEAPON_BONUS, 0)
+        mob:setMobMod(xi.mobMod.BASE_DAMAGE_MODIFIER, 0)
         mob:setMod(xi.mod.UDMGPHYS, 0)
         mob:setMod(xi.mod.UDMGRANGE, 0)
         mob:setMod(xi.mod.UDMGMAGIC, 0)

scripts/zones/AlTaieu/mobs/Ulyovra.lua

@@ -12,7 +12,7 @@ end
 
 entity.onMobSpawn = function(mob)
     mob:setMod(xi.mod.REGEN, 50)
-    mob:setMobMod(xi.mobMod.WEAPON_BONUS, mob:getMainLvl() - 2) -- Base damage is level * 2
+    mob:setMobMod(xi.mobMod.BASE_DAMAGE_MODIFIER, mob:getMainLvl() - 2) -- Base damage is level * 2
     -- Yovra have a +50% bonus to defense.
     mob:addMod(xi.mod.DEF, mob:getStat(xi.mod.DEF) * 0.5)
     mob:hideName(true)