From 364613c83d499ac45596a2be4df3c61fdb7f47ba Mon Sep 17 00:00:00 2001
From: ThrisStraizo <45871917+ThrisStraizo@users.noreply.github.com>
Date: Wed, 6 May 2026 16:12:13 -0700
Subject: [PATCH] Give Peace a Chance Full inv event

This PR updates Give Peace a chance with the missing event to skip the previous event if your inv was full.
---
 .../quests/ahtUrhgan/Give_Peace_a_Chance.lua  | 20 +++++++++++++++----
 .../Aht_Urhgan_Whitegate/DefaultActions.lua   |  2 +-
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/scripts/quests/ahtUrhgan/Give_Peace_a_Chance.lua b/scripts/quests/ahtUrhgan/Give_Peace_a_Chance.lua
index 322b9528f94..99b969edae3 100644
--- a/scripts/quests/ahtUrhgan/Give_Peace_a_Chance.lua
+++ b/scripts/quests/ahtUrhgan/Give_Peace_a_Chance.lua
@@ -51,14 +51,17 @@ quest.sections =
             ['Mishhar'] =
             {
                 onTrigger = function(player, npc)
-                    if quest:getVar(player, 'Prog') == 0 then
+                    local questProgress = quest:getVar(player, 'Prog')
+                    if questProgress == 0 then
                         return quest:event(587)
-                    elseif quest:getVar(player, 'Prog') == 1 then
+                    elseif questProgress == 1 then
                         return quest:progressEvent(575)
-                    elseif quest:getVar(player, 'Prog') == 2 then
+                    elseif questProgress == 2 then
                         return quest:event(588)
-                    elseif quest:getVar(player, 'Prog') == 3 then
+                    elseif questProgress == 3 then
                         return quest:progressEvent(576)
+                    elseif questProgress == 4 then
+                        return quest:progressEvent(589)
                     end
                 end,
             },
@@ -70,6 +73,15 @@ quest.sections =
                 end,
 
                 [576] = function(player, csid, option, npc)
+                    if quest:complete(player) then
+                        player:needToZone(true)
+                        player:setVar('Quest[6][30]Stage', JstMidnight())
+                    else
+                        quest:setVar(player, 'Prog', 4)
+                    end
+                end,
+
+                [589] = function(player, csid, option, npc)
                     if quest:complete(player) then
                         player:needToZone(true)
                         player:setVar('Quest[6][30]Stage', JstMidnight())
diff --git a/scripts/zones/Aht_Urhgan_Whitegate/DefaultActions.lua b/scripts/zones/Aht_Urhgan_Whitegate/DefaultActions.lua
index 24b44a36d36..0c55507e07f 100644
--- a/scripts/zones/Aht_Urhgan_Whitegate/DefaultActions.lua
+++ b/scripts/zones/Aht_Urhgan_Whitegate/DefaultActions.lua
@@ -35,7 +35,7 @@ return {
     ['Maudaal']            = { event = 240 },
     ['Mhasbaf']            = { event = 542 },
     ['Milazahn']           = { event = 594 },
-    ['Mishhar']            = { event = 562 },
+    ['Mishhar']            = { event = 590 },
     ['Musdahl']            = { event = 242 },
     ['Mushayra']           = { event = 519 },
     ['Nadee_Periyaha']     = { event =  90 },