Merge pull request #6824 from Xaver-DaRed/fht

Cleanup Ghelsba Outpost mob scripts and add logic to Cyranuce M Cutauleon mob
LandSandBoat · Jan 25, 2025 · 5452d6b · 5452d6b
2 parents 9e6441a + 373489c
commit 5452d6b
Show file tree

Hide file tree

Showing 19 changed files with 22 additions and 91 deletions.
diff --git a/scripts/actions/mobskills/dread_shriek.lua b/scripts/actions/mobskills/dread_shriek.lua
@@ -13,7 +13,7 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill)
 end
 
 mobskillObject.onMobWeaponSkill = function(target, mob, skill)
-    skill:setMsg(xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.PARALYSIS, 25, 0, 60))
+    skill:setMsg(xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.PARALYSIS, 100, 0, 60))
 
     return xi.effect.PARALYSIS
 end

diff --git a/scripts/effects/paralysis.lua b/scripts/effects/paralysis.lua
@@ -5,7 +5,7 @@
 local effectObject = {}
 
 effectObject.onEffectGain = function(target, effect)
-    target:addMod(xi.mod.PARALYZE, effect:getPower())
+    effect:addMod(xi.mod.PARALYZE, effect:getPower())
 
     -- Immunobreak reset.
     target:setMod(xi.mod.PARALYZE_IMMUNOBREAK, 0)
@@ -15,7 +15,6 @@ effectObject.onEffectTick = function(target, effect)
 end
 
 effectObject.onEffectLose = function(target, effect)
-    target:delMod(xi.mod.PARALYZE, effect:getPower())
 end
 
 return effectObject
diff --git a/scripts/enum/mob_skills.lua b/scripts/enum/mob_skills.lua
@@ -38,6 +38,17 @@ xi.mobSkill =
 
     RANGED_ATTACK_2   =  412,
 
+    DISPELLING_WIND   =  813,
+    DEADLY_DRIVE      =  814,
+    WIND_WALL         =  815,
+    FANG_RUSH         =  816,
+    DREAD_SHRIEK      =  817,
+    TAIL_CRUSH        =  818,
+    BLIZZARD_BREATH   =  819,
+    THUNDER_BREATH    =  820,
+    RADIANT_BREATH    =  821,
+    CHAOS_BREATH      =  822,
+
     LIGHT_BLADE_1     =  830,
 
     HOWLING_MOON_1    =  838, -- Unknown usage.

diff --git a/scripts/zones/Ghelsba_Outpost/mobs/Colo-colo.lua b/scripts/zones/Ghelsba_Outpost/mobs/Colo-colo.lua
@@ -10,7 +10,4 @@ entity.onMobSpawn = function(mob)
     mob:setMobMod(xi.mobMod.SOUND_RANGE, 15)
 end
 
-entity.onMobDeath = function(mob, player, optParams)
-end
-
 return entity
diff --git a/scripts/zones/Ghelsba_Outpost/mobs/Cyranuce_M_Cutauleon.lua b/scripts/zones/Ghelsba_Outpost/mobs/Cyranuce_M_Cutauleon.lua
@@ -6,7 +6,15 @@
 ---@type TMobEntity
 local entity = {}
 
-entity.onMobDeath = function(mob, player, optParams)
+entity.onMobInitialize = function(mob)
+    mob:addImmunity(xi.immunity.LIGHT_SLEEP)
+    mob:addImmunity(xi.immunity.DARK_SLEEP)
+end
+
+entity.onMobWeaponSkillPrepare = function(mob, target)
+    if mob:getHPP() <= 15 then
+        return xi.mobSkill.CHAOS_BREATH
+    end
 end
 
 return entity
diff --git a/scripts/zones/Ghelsba_Outpost/mobs/Fodderchief_Vokdek.lua b/scripts/zones/Ghelsba_Outpost/mobs/Fodderchief_Vokdek.lua
@@ -10,7 +10,4 @@ entity.onMobInitialize = function(mob)
     mob:setMobMod(xi.mobMod.GIL_MAX, -1)
 end
 
-entity.onMobDeath = function(mob, player, optParams)
-end
-
 return entity
diff --git a/scripts/zones/Ghelsba_Outpost/mobs/Furies.lua b/scripts/zones/Ghelsba_Outpost/mobs/Furies.lua
@@ -11,7 +11,4 @@ entity.onMobSpawn = function(mob)
     mob:setMobMod(xi.mobMod.CHARMABLE, 1)
 end
 
-entity.onMobDeath = function(mob, player, optParams)
-end
-
 return entity
diff --git a/scripts/zones/Ghelsba_Outpost/mobs/Kalamainu.lua b/scripts/zones/Ghelsba_Outpost/mobs/Kalamainu.lua
@@ -24,7 +24,4 @@ entity.onMobWeaponSkill = function(mob, target, skill)
     end
 end
 
-entity.onMobDeath = function(mob, player, optParams)
-end
-
 return entity
diff --git a/scripts/zones/Ghelsba_Outpost/mobs/Kilioa.lua b/scripts/zones/Ghelsba_Outpost/mobs/Kilioa.lua
@@ -24,7 +24,4 @@ entity.onMobWeaponSkill = function(mob, target, skill)
     end
 end
 
-entity.onMobDeath = function(mob, player, optParams)
-end
-
 return entity
diff --git a/scripts/zones/Ghelsba_Outpost/mobs/Orcish_Grunt.lua b/scripts/zones/Ghelsba_Outpost/mobs/Orcish_Grunt.lua
@@ -13,9 +13,6 @@ local thousandarmPHTable =
     [ID.mob.THOUSANDARM_DESHGLESH - 7] = ID.mob.THOUSANDARM_DESHGLESH, -- 98.658 -0.319 328.269
 }
 
-entity.onMobDeath = function(mob, player, optParams)
-end
-
 entity.onMobDespawn = function(mob)
     xi.mob.phOnDespawn(mob, thousandarmPHTable, 5, 3600) -- 1 hour minimum
 end

diff --git a/scripts/zones/Ghelsba_Outpost/mobs/Orcish_Neckchopper.lua b/scripts/zones/Ghelsba_Outpost/mobs/Orcish_Neckchopper.lua
@@ -15,9 +15,6 @@ local thousandarmPHTable =
     [ID.mob.THOUSANDARM_DESHGLESH - 1] = ID.mob.THOUSANDARM_DESHGLESH, -- 123.357 -0.102 332.706
 }
 
-entity.onMobDeath = function(mob, player, optParams)
-end
-
 entity.onMobDespawn = function(mob)
     xi.mob.phOnDespawn(mob, thousandarmPHTable, 5, 3600) -- 1 hour minimum
 end

diff --git a/scripts/zones/Ghelsba_Outpost/mobs/Orcish_Stonechucker.lua b/scripts/zones/Ghelsba_Outpost/mobs/Orcish_Stonechucker.lua
@@ -15,9 +15,6 @@ local thousandarmPHTable =
     [ID.mob.THOUSANDARM_DESHGLESH - 2] = ID.mob.THOUSANDARM_DESHGLESH, -- 82.000 -0.500 366.000
 }
 
-entity.onMobDeath = function(mob, player, optParams)
-end
-
 entity.onMobDespawn = function(mob)
     xi.mob.phOnDespawn(mob, thousandarmPHTable, 5, 3600) -- 1 hour minimum
 end

diff --git a/scripts/zones/Ghelsba_Outpost/mobs/Strongarm_Zodvad.lua b/scripts/zones/Ghelsba_Outpost/mobs/Strongarm_Zodvad.lua
@@ -10,7 +10,4 @@ entity.onMobInitialize = function(mob)
     mob:setMobMod(xi.mobMod.GIL_MAX, -1)
 end
 
-entity.onMobDeath = function(mob, player, optParams)
-end
-
 return entity
diff --git a/scripts/zones/Ghelsba_Outpost/mobs/Sureshot_Snatgat.lua b/scripts/zones/Ghelsba_Outpost/mobs/Sureshot_Snatgat.lua
@@ -10,7 +10,4 @@ entity.onMobInitialize = function(mob)
     mob:setMobMod(xi.mobMod.GIL_MAX, -1)
 end
 
-entity.onMobDeath = function(mob, player, optParams)
-end
-
 return entity
diff --git a/scripts/zones/Ghelsba_Outpost/mobs/Toadbolster.lua b/scripts/zones/Ghelsba_Outpost/mobs/Toadbolster.lua
diff --git a/scripts/zones/Ghelsba_Outpost/mobs/Toadcushion.lua b/scripts/zones/Ghelsba_Outpost/mobs/Toadcushion.lua
diff --git a/scripts/zones/Ghelsba_Outpost/mobs/Toadpillow.lua b/scripts/zones/Ghelsba_Outpost/mobs/Toadpillow.lua
diff --git a/scripts/zones/Ghelsba_Outpost/mobs/Toadsquab.lua b/scripts/zones/Ghelsba_Outpost/mobs/Toadsquab.lua
diff --git a/scripts/zones/Ghelsba_Outpost/mobs/Warchief_Vatgit.lua b/scripts/zones/Ghelsba_Outpost/mobs/Warchief_Vatgit.lua
@@ -7,15 +7,6 @@
 local entity = {}
 
 entity.onMobDeath = function(mob, player, optParams)
-    if
-        player:getCurrentMission(player:getNation()) == xi.mission.id.nation.RANK2 and
-        player:getNation() == xi.nation.WINDURST
-    then
-        if player:getMissionStatus(player:getNation()) == 4 then
-            player:setMissionStatus(player:getNation(), 5)
-        end
-    end
-
     player:addTitle(xi.title.WARCHIEF_WRECKER)
 end
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,7 +24,4 @@ entity.onMobWeaponSkill = function(mob, target, skill) @@
         end
     end
-    entity.onMobDeath = function(mob, player, optParams)
-    end
     return entity