From 21dd80fcfa7e42e4795b617d59e7f5ebf38a3bb8 Mon Sep 17 00:00:00 2001
From: ThrisStraizo <45871917+ThrisStraizo@users.noreply.github.com>
Date: Sun, 22 Mar 2026 16:21:00 -0700
Subject: [PATCH] Yazquhl ws message placement fix

This PR fixes my mistake of placing the weaponskill messaging and relocates it from onmobskillchoose to onMobWeaponSkill so the message won't play multiple times if the mob is at range.
---
 scripts/zones/The_Ashu_Talif/mobs/Yazquhl.lua | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/scripts/zones/The_Ashu_Talif/mobs/Yazquhl.lua b/scripts/zones/The_Ashu_Talif/mobs/Yazquhl.lua
index 77fc99fa000..d10fb060e95 100644
--- a/scripts/zones/The_Ashu_Talif/mobs/Yazquhl.lua
+++ b/scripts/zones/The_Ashu_Talif/mobs/Yazquhl.lua
@@ -70,7 +70,6 @@ entity.onMobFight = function(mob, target)
         end
 
         yazquhlMob:useMobAbility(xi.mobSkill.VORPAL_BLADE_1, scTarget)
-        mob:showText(mob, ID.text.REST_BENEATH)
 
         -- Only add Emnity if the skillchain closer target is different than its current target
         if
@@ -112,23 +111,13 @@ entity.onMobMobskillChoose = function(mob, target, skillId)
         table.insert(tpTable, xi.mobSkill.VORPAL_BLADE_1)
     end
 
-    local weaponskillMessage =
-    {
-        [1] = ID.text.TAKE_THIS,
-        [2] = ID.text.REST_BENEATH,
-        [3] = ID.text.STOP_US,
-    }
-
-    if mob:isEngaged() then
-        mob:showText(mob, weaponskillMessage[math.random(1, #weaponskillMessage)])
-    end
-
     return tpTable[math.random(1, #tpTable)]
 end
 
 entity.onMobWeaponSkill = function(mob, target, skill, action)
     if skill:getID() == xi.mobSkill.MIGHTY_STRIKES_1 then
         mob:showText(mob, ID.text.YOU_WILL_REGRET)
+        return
     end
 
     mob:setMobAbilityEnabled(true)
@@ -138,6 +127,17 @@ entity.onMobWeaponSkill = function(mob, target, skill, action)
         return
     end
 
+    local weaponskillMessage =
+    {
+        [1] = ID.text.TAKE_THIS,
+        [2] = ID.text.REST_BENEATH,
+        [3] = ID.text.STOP_US,
+    }
+
+    if mob:isEngaged() then
+        mob:showText(mob, weaponskillMessage[math.random(1, #weaponskillMessage)])
+    end
+
     local gowam = GetMobByID(ID.mob.GOWAM, instance)
     if
         gowam and