From d19695e467a6ba9fb908e204ffbf0c68f551e1dd Mon Sep 17 00:00:00 2001 From: Xaver-DaRed Date: Fri, 24 Jan 2025 15:14:15 +0100 Subject: [PATCH 1/3] Remove unused Windurst mission 2-3 (S->B) logic --- scripts/zones/Ghelsba_Outpost/mobs/Warchief_Vatgit.lua | 9 --------- 1 file changed, 9 deletions(-) diff --git a/scripts/zones/Ghelsba_Outpost/mobs/Warchief_Vatgit.lua b/scripts/zones/Ghelsba_Outpost/mobs/Warchief_Vatgit.lua index 8878755a831..2e9143bb373 100644 --- 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 From 63446730bced58bc89697b29e71a230c5282232e Mon Sep 17 00:00:00 2001 From: Xaver-DaRed Date: Fri, 24 Jan 2025 15:18:36 +0100 Subject: [PATCH 2/3] Ghelsba: Remove unused mob files and empty functions --- scripts/zones/Ghelsba_Outpost/mobs/Colo-colo.lua | 3 --- .../Ghelsba_Outpost/mobs/Fodderchief_Vokdek.lua | 3 --- scripts/zones/Ghelsba_Outpost/mobs/Furies.lua | 3 --- scripts/zones/Ghelsba_Outpost/mobs/Kalamainu.lua | 3 --- scripts/zones/Ghelsba_Outpost/mobs/Kilioa.lua | 3 --- scripts/zones/Ghelsba_Outpost/mobs/Orcish_Grunt.lua | 3 --- .../Ghelsba_Outpost/mobs/Orcish_Neckchopper.lua | 3 --- .../Ghelsba_Outpost/mobs/Orcish_Stonechucker.lua | 3 --- .../zones/Ghelsba_Outpost/mobs/Strongarm_Zodvad.lua | 3 --- .../zones/Ghelsba_Outpost/mobs/Sureshot_Snatgat.lua | 3 --- scripts/zones/Ghelsba_Outpost/mobs/Toadbolster.lua | 12 ------------ scripts/zones/Ghelsba_Outpost/mobs/Toadcushion.lua | 12 ------------ scripts/zones/Ghelsba_Outpost/mobs/Toadpillow.lua | 12 ------------ scripts/zones/Ghelsba_Outpost/mobs/Toadsquab.lua | 12 ------------ 14 files changed, 78 deletions(-) delete mode 100644 scripts/zones/Ghelsba_Outpost/mobs/Toadbolster.lua delete mode 100644 scripts/zones/Ghelsba_Outpost/mobs/Toadcushion.lua delete mode 100644 scripts/zones/Ghelsba_Outpost/mobs/Toadpillow.lua delete mode 100644 scripts/zones/Ghelsba_Outpost/mobs/Toadsquab.lua diff --git a/scripts/zones/Ghelsba_Outpost/mobs/Colo-colo.lua b/scripts/zones/Ghelsba_Outpost/mobs/Colo-colo.lua index d0a229b7243..19831f2461d 100644 --- 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/Fodderchief_Vokdek.lua b/scripts/zones/Ghelsba_Outpost/mobs/Fodderchief_Vokdek.lua index a523907a16c..dd408bd3d62 100644 --- 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 index 77d532137e4..20957a49501 100644 --- 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 index 2057e219097..914bba7ae4a 100644 --- 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 index 4087ff0bef9..4f375150e70 100644 --- 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 index 783c6f5044a..73d0086b98e 100644 --- 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 index bd2c66e1e28..f959888ab19 100644 --- 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 index 77a794951e7..583ce1a1a20 100644 --- 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 index 6264c39ad9c..abcf05c670c 100644 --- 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 index 0a9f6ff0601..23059578175 100644 --- 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 deleted file mode 100644 index 0fe9ec0d429..00000000000 --- a/scripts/zones/Ghelsba_Outpost/mobs/Toadbolster.lua +++ /dev/null @@ -1,12 +0,0 @@ ------------------------------------ --- Area: Ghelsba Outpost --- Mob: Toadbolster --- BCNM: Toadal Recall ------------------------------------ ----@type TMobEntity -local entity = {} - -entity.onMobDeath = function(mob, player, optParams) -end - -return entity diff --git a/scripts/zones/Ghelsba_Outpost/mobs/Toadcushion.lua b/scripts/zones/Ghelsba_Outpost/mobs/Toadcushion.lua deleted file mode 100644 index d50e5c2e0a1..00000000000 --- a/scripts/zones/Ghelsba_Outpost/mobs/Toadcushion.lua +++ /dev/null @@ -1,12 +0,0 @@ ------------------------------------ --- Area: Ghelsba Outpost --- Mob: Toadcushion --- BCNM: Toadal Recall ------------------------------------ ----@type TMobEntity -local entity = {} - -entity.onMobDeath = function(mob, player, optParams) -end - -return entity diff --git a/scripts/zones/Ghelsba_Outpost/mobs/Toadpillow.lua b/scripts/zones/Ghelsba_Outpost/mobs/Toadpillow.lua deleted file mode 100644 index 8b51222978e..00000000000 --- a/scripts/zones/Ghelsba_Outpost/mobs/Toadpillow.lua +++ /dev/null @@ -1,12 +0,0 @@ ------------------------------------ --- Area: Ghelsba Outpost --- Mob: Toadpillow --- BCNM: Toadal Recall ------------------------------------ ----@type TMobEntity -local entity = {} - -entity.onMobDeath = function(mob, player, optParams) -end - -return entity diff --git a/scripts/zones/Ghelsba_Outpost/mobs/Toadsquab.lua b/scripts/zones/Ghelsba_Outpost/mobs/Toadsquab.lua deleted file mode 100644 index 749387f01af..00000000000 --- a/scripts/zones/Ghelsba_Outpost/mobs/Toadsquab.lua +++ /dev/null @@ -1,12 +0,0 @@ ------------------------------------ --- Area: Ghelsba Outpost --- Mob: Toadsquab --- BCNM: Toadal Recall ------------------------------------ ----@type TMobEntity -local entity = {} - -entity.onMobDeath = function(mob, player, optParams) -end - -return entity From 373489ce2763cf896a3571b3896dc98eda1c8ca4 Mon Sep 17 00:00:00 2001 From: Xaver-DaRed Date: Fri, 24 Jan 2025 15:30:43 +0100 Subject: [PATCH 3/3] Add logic to "Cyranuce M Cutauleon" --- scripts/actions/mobskills/dread_shriek.lua | 2 +- scripts/effects/paralysis.lua | 3 +-- scripts/enum/mob_skills.lua | 11 +++++++++++ .../Ghelsba_Outpost/mobs/Cyranuce_M_Cutauleon.lua | 10 +++++++++- 4 files changed, 22 insertions(+), 4 deletions(-) diff --git a/scripts/actions/mobskills/dread_shriek.lua b/scripts/actions/mobskills/dread_shriek.lua index 9f48385072c..0e5799e106f 100644 --- 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 index 6a572c66b9d..a28c78a8a14 100644 --- 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 index 0dc1d099090..633bf3e11e9 100644 --- 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/Cyranuce_M_Cutauleon.lua b/scripts/zones/Ghelsba_Outpost/mobs/Cyranuce_M_Cutauleon.lua index 8156e47c482..41d9df4ad7a 100644 --- 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