From ba4441823cc819313e5ed8c5c7ca8918e0283976 Mon Sep 17 00:00:00 2001
From: claywar <claywar@lsb.dev>
Date: Sat, 15 Jun 2024 06:38:47 -0400
Subject: [PATCH] Remove unnecessary Lua returns

---
 scripts/zones/AlTaieu/mobs/Absolute_Virtue.lua              | 2 --
 scripts/zones/Bhaflau_Thickets/npcs/Hamta-Iramta.lua        | 1 -
 scripts/zones/Bhaflau_Thickets/npcs/_1g0.lua                | 1 -
 scripts/zones/Castle_Oztroja/npcs/_470.lua                  | 1 -
 scripts/zones/Castle_Oztroja/npcs/_471.lua                  | 1 -
 scripts/zones/Castle_Oztroja/npcs/_474.lua                  | 1 -
 scripts/zones/Castle_Oztroja/npcs/_475.lua                  | 1 -
 scripts/zones/Castle_Oztroja/npcs/_477.lua                  | 1 -
 scripts/zones/Castle_Oztroja/npcs/_479.lua                  | 1 -
 scripts/zones/Castle_Zvahl_Keep/npcs/_4i5.lua               | 1 -
 scripts/zones/Grand_Palace_of_HuXzoi/npcs/_0y0.lua          | 1 -
 scripts/zones/Grand_Palace_of_HuXzoi/npcs/_iyc.lua          | 1 -
 scripts/zones/Heavens_Tower/npcs/_6q1.lua                   | 2 --
 scripts/zones/Ilrusi_Atoll/npcs/Rune_of_Release.lua         | 2 --
 scripts/zones/Inner_Horutoto_Ruins/DefaultActions.lua       | 6 ++++++
 scripts/zones/Inner_Horutoto_Ruins/npcs/_5ca.lua            | 2 --
 scripts/zones/Inner_Horutoto_Ruins/npcs/_5cc.lua            | 4 ----
 scripts/zones/Inner_Horutoto_Ruins/npcs/_5cd.lua            | 4 ----
 scripts/zones/Inner_Horutoto_Ruins/npcs/_5ce.lua            | 4 ----
 scripts/zones/Inner_Horutoto_Ruins/npcs/_5cf.lua            | 4 ----
 scripts/zones/Inner_Horutoto_Ruins/npcs/_5cg.lua            | 4 ----
 scripts/zones/Inner_Horutoto_Ruins/npcs/_5ch.lua            | 4 ----
 scripts/zones/Lebros_Cavern/npcs/Rune_of_Release.lua        | 2 --
 scripts/zones/Leujaoam_Sanctum/npcs/Rune_of_Release.lua     | 2 --
 scripts/zones/Mamook/mobs/Chamrosh.lua                      | 2 --
 .../Mamool_Ja_Training_Grounds/npcs/Rune_of_Release.lua     | 2 --
 scripts/zones/Metalworks/DefaultActions.lua                 | 1 +
 scripts/zones/Metalworks/npcs/_6le.lua                      | 4 ----
 scripts/zones/Misareaux_Coast/npcs/_0p3.lua                 | 1 -
 scripts/zones/Periqia/npcs/Rune_of_Release.lua              | 2 --
 scripts/zones/Port_Bastok/npcs/_6k9.lua                     | 1 -
 scripts/zones/Port_Jeuno/npcs/_6u2.lua                      | 1 -
 scripts/zones/Port_Jeuno/npcs/_6u6.lua                      | 1 -
 scripts/zones/Port_Jeuno/npcs/_6uc.lua                      | 1 -
 scripts/zones/Port_Jeuno/npcs/_6ug.lua                      | 1 -
 scripts/zones/Port_San_dOria/npcs/_6g7.lua                  | 2 --
 scripts/zones/Port_Windurst/npcs/_6o7.lua                   | 1 -
 scripts/zones/Qulun_Dome/npcs/_441.lua                      | 2 --
 scripts/zones/Ranguemont_Pass/npcs/_4m0.lua                 | 1 -
 scripts/zones/Temple_of_Uggalepih/npcs/_mf1.lua             | 2 --
 scripts/zones/Temple_of_Uggalepih/npcs/_mf8.lua             | 2 --
 scripts/zones/Temple_of_Uggalepih/npcs/_mf9.lua             | 2 --
 scripts/zones/Upper_Delkfutts_Tower/npcs/_4e1.lua           | 1 -
 scripts/zones/Wajaom_Woodlands/npcs/_1f0.lua                | 1 -
 scripts/zones/Windurst_Walls/npcs/_6n8.lua                  | 2 --
 45 files changed, 7 insertions(+), 79 deletions(-)

diff --git a/scripts/zones/AlTaieu/mobs/Absolute_Virtue.lua b/scripts/zones/AlTaieu/mobs/Absolute_Virtue.lua
index d5a813bf7a5..d3bbd94d6eb 100644
--- a/scripts/zones/AlTaieu/mobs/Absolute_Virtue.lua
+++ b/scripts/zones/AlTaieu/mobs/Absolute_Virtue.lua
@@ -46,8 +46,6 @@ entity.onMagicHit = function(caster, target, spell)
             target:addMod(xi.mod.REGEN, -2)
         end
     end
-
-    return 1
 end
 
 entity.onMobDeath = function(mob, player, optParams)
diff --git a/scripts/zones/Bhaflau_Thickets/npcs/Hamta-Iramta.lua b/scripts/zones/Bhaflau_Thickets/npcs/Hamta-Iramta.lua
index dc9f554c27e..a9c4a86bae4 100644
--- a/scripts/zones/Bhaflau_Thickets/npcs/Hamta-Iramta.lua
+++ b/scripts/zones/Bhaflau_Thickets/npcs/Hamta-Iramta.lua
@@ -14,7 +14,6 @@ entity.onTrade = function(player, npc, trade)
         player:tradeComplete()
         player:setPos(-458, -16, 0, 189) -- using the pos method until the problem below is fixed
         -- player:startEvent(135) -- << this CS goes black at the end, never fades in
-        return 1
     end
 end
 
diff --git a/scripts/zones/Bhaflau_Thickets/npcs/_1g0.lua b/scripts/zones/Bhaflau_Thickets/npcs/_1g0.lua
index da0661d2568..02295e09cb6 100644
--- a/scripts/zones/Bhaflau_Thickets/npcs/_1g0.lua
+++ b/scripts/zones/Bhaflau_Thickets/npcs/_1g0.lua
@@ -10,7 +10,6 @@ end
 
 entity.onTrigger = function(player, npc)
     player:startEvent(502)
-    return 1
 end
 
 entity.onEventUpdate = function(player, csid, option, npc)
diff --git a/scripts/zones/Castle_Oztroja/npcs/_470.lua b/scripts/zones/Castle_Oztroja/npcs/_470.lua
index 2bd75cc7bdf..7231920bc91 100644
--- a/scripts/zones/Castle_Oztroja/npcs/_470.lua
+++ b/scripts/zones/Castle_Oztroja/npcs/_470.lua
@@ -11,7 +11,6 @@ local entity = {}
 entity.onTrigger = function(player, npc)
     if npc:getAnimation() == xi.anim.CLOSE_DOOR then
         player:messageSpecial(ID.text.ITS_LOCKED)
-        return 1
     end
 end
 
diff --git a/scripts/zones/Castle_Oztroja/npcs/_471.lua b/scripts/zones/Castle_Oztroja/npcs/_471.lua
index d07b0f88d29..97f1f964cc6 100644
--- a/scripts/zones/Castle_Oztroja/npcs/_471.lua
+++ b/scripts/zones/Castle_Oztroja/npcs/_471.lua
@@ -11,7 +11,6 @@ local entity = {}
 entity.onTrigger = function(player, npc)
     if npc:getAnimation() == xi.anim.CLOSE_DOOR then
         player:messageSpecial(ID.text.ITS_LOCKED)
-        return 1
     end
 end
 
diff --git a/scripts/zones/Castle_Oztroja/npcs/_474.lua b/scripts/zones/Castle_Oztroja/npcs/_474.lua
index b03326d62ed..b9b6317735e 100644
--- a/scripts/zones/Castle_Oztroja/npcs/_474.lua
+++ b/scripts/zones/Castle_Oztroja/npcs/_474.lua
@@ -11,7 +11,6 @@ local entity = {}
 entity.onTrigger = function(player, npc)
     if npc:getAnimation() == xi.anim.CLOSE_DOOR then
         player:messageSpecial(ID.text.ITS_LOCKED)
-        return 1
     end
 end
 
diff --git a/scripts/zones/Castle_Oztroja/npcs/_475.lua b/scripts/zones/Castle_Oztroja/npcs/_475.lua
index 5f8300082eb..903ea0a91b5 100644
--- a/scripts/zones/Castle_Oztroja/npcs/_475.lua
+++ b/scripts/zones/Castle_Oztroja/npcs/_475.lua
@@ -11,7 +11,6 @@ local entity = {}
 entity.onTrigger = function(player, npc)
     if npc:getAnimation() == xi.anim.CLOSE_DOOR then
         player:messageSpecial(ID.text.ITS_LOCKED)
-        return 1
     end
 end
 
diff --git a/scripts/zones/Castle_Oztroja/npcs/_477.lua b/scripts/zones/Castle_Oztroja/npcs/_477.lua
index f706740739a..822701f2a2c 100644
--- a/scripts/zones/Castle_Oztroja/npcs/_477.lua
+++ b/scripts/zones/Castle_Oztroja/npcs/_477.lua
@@ -11,7 +11,6 @@ local entity = {}
 entity.onTrigger = function(player, npc)
     if npc:getAnimation() == xi.anim.CLOSE_DOOR then
         player:messageSpecial(ID.text.ITS_LOCKED)
-        return 1
     end
 end
 
diff --git a/scripts/zones/Castle_Oztroja/npcs/_479.lua b/scripts/zones/Castle_Oztroja/npcs/_479.lua
index 57a071f583e..2b86fd2ac51 100644
--- a/scripts/zones/Castle_Oztroja/npcs/_479.lua
+++ b/scripts/zones/Castle_Oztroja/npcs/_479.lua
@@ -26,7 +26,6 @@ end
 entity.onTrigger = function(player, npc)
     if npc:getAnimation() == xi.anim.CLOSE_DOOR then
         player:messageSpecial(ID.text.ITS_LOCKED)
-        return 1
     end
 end
 
diff --git a/scripts/zones/Castle_Zvahl_Keep/npcs/_4i5.lua b/scripts/zones/Castle_Zvahl_Keep/npcs/_4i5.lua
index 9cef77b4e8f..06439bbef5e 100644
--- a/scripts/zones/Castle_Zvahl_Keep/npcs/_4i5.lua
+++ b/scripts/zones/Castle_Zvahl_Keep/npcs/_4i5.lua
@@ -24,7 +24,6 @@ end
 
 entity.onTrigger = function(player, npc)
     player:startEvent(9)
-    return 1
 end
 
 entity.onEventUpdate = function(player, csid, option, npc)
diff --git a/scripts/zones/Grand_Palace_of_HuXzoi/npcs/_0y0.lua b/scripts/zones/Grand_Palace_of_HuXzoi/npcs/_0y0.lua
index 2970d246c50..5f3647612f2 100644
--- a/scripts/zones/Grand_Palace_of_HuXzoi/npcs/_0y0.lua
+++ b/scripts/zones/Grand_Palace_of_HuXzoi/npcs/_0y0.lua
@@ -10,7 +10,6 @@ end
 
 entity.onTrigger = function(player, npc)
     player:startEvent(173)
-    return 1
 end
 
 entity.onEventUpdate = function(player, csid, option, npc)
diff --git a/scripts/zones/Grand_Palace_of_HuXzoi/npcs/_iyc.lua b/scripts/zones/Grand_Palace_of_HuXzoi/npcs/_iyc.lua
index 5573ffaed14..edc6335ec88 100644
--- a/scripts/zones/Grand_Palace_of_HuXzoi/npcs/_iyc.lua
+++ b/scripts/zones/Grand_Palace_of_HuXzoi/npcs/_iyc.lua
@@ -10,7 +10,6 @@ end
 
 entity.onTrigger = function(player, npc)
     player:startEvent(172)
-    return 1
 end
 
 entity.onEventUpdate = function(player, csid, option, npc)
diff --git a/scripts/zones/Heavens_Tower/npcs/_6q1.lua b/scripts/zones/Heavens_Tower/npcs/_6q1.lua
index 4467843a7c4..fdfb4bc5a00 100644
--- a/scripts/zones/Heavens_Tower/npcs/_6q1.lua
+++ b/scripts/zones/Heavens_Tower/npcs/_6q1.lua
@@ -24,8 +24,6 @@ entity.onTrigger = function(player, npc)
     else
         player:messageSpecial(ID.text.STAIRWAY_ONLY_CITIZENS)
     end
-
-    return 1
 end
 
 entity.onEventUpdate = function(player, csid, option, npc)
diff --git a/scripts/zones/Ilrusi_Atoll/npcs/Rune_of_Release.lua b/scripts/zones/Ilrusi_Atoll/npcs/Rune_of_Release.lua
index 48d0ac7717f..3b03161e0cf 100644
--- a/scripts/zones/Ilrusi_Atoll/npcs/Rune_of_Release.lua
+++ b/scripts/zones/Ilrusi_Atoll/npcs/Rune_of_Release.lua
@@ -14,8 +14,6 @@ entity.onTrigger = function(player, npc)
     if instance:completed() then
         player:startEvent(100, 4)
     end
-
-    return 1
 end
 
 entity.onEventUpdate = function(player, csid, option, npc)
diff --git a/scripts/zones/Inner_Horutoto_Ruins/DefaultActions.lua b/scripts/zones/Inner_Horutoto_Ruins/DefaultActions.lua
index 4828c784432..681a977a52e 100644
--- a/scripts/zones/Inner_Horutoto_Ruins/DefaultActions.lua
+++ b/scripts/zones/Inner_Horutoto_Ruins/DefaultActions.lua
@@ -3,6 +3,12 @@ local ID = zones[xi.zone.INNER_HORUTOTO_RUINS]
 return {
     ['_5ca'] = { event = 44 },
     ['_5cb'] = { messageSpecial = ID.text.DOOR_FIRMLY_CLOSED },
+    ['_5cc'] = { messageSpecial = ID.text.DOOR_FIRMLY_CLOSED },
+    ['_5cd'] = { messageSpecial = ID.text.DOOR_FIRMLY_CLOSED },
+    ['_5ce'] = { messageSpecial = ID.text.DOOR_FIRMLY_CLOSED },
+    ['_5cf'] = { messageSpecial = ID.text.DOOR_FIRMLY_CLOSED },
+    ['_5cg'] = { messageSpecial = ID.text.DOOR_FIRMLY_CLOSED },
+    ['_5ch'] = { messageSpecial = ID.text.DOOR_FIRMLY_CLOSED },
     ['_5ci'] = { messageSpecial = ID.text.DOOR_FIRMLY_CLOSED },
     ['_5c5'] = { messageSpecial = ID.text.DOOR_FIRMLY_CLOSED },
 }
diff --git a/scripts/zones/Inner_Horutoto_Ruins/npcs/_5ca.lua b/scripts/zones/Inner_Horutoto_Ruins/npcs/_5ca.lua
index 07e5b3cced7..36430ac37d0 100644
--- a/scripts/zones/Inner_Horutoto_Ruins/npcs/_5ca.lua
+++ b/scripts/zones/Inner_Horutoto_Ruins/npcs/_5ca.lua
@@ -26,8 +26,6 @@ entity.onTrigger = function(player, npc)
         player:messageSpecial(ID.text.CAT_BURGLARS_HIDEOUT, 1, xi.ki.WINDURST_WOODS_SCOOP) -- Confirm Story
         player:setCharVar('QuestMakingHeadlines_var', utils.mask.setBit(prog, 4, true))
     end
-
-    return 1
 end
 
 entity.onEventUpdate = function(player, csid, option, npc)
diff --git a/scripts/zones/Inner_Horutoto_Ruins/npcs/_5cc.lua b/scripts/zones/Inner_Horutoto_Ruins/npcs/_5cc.lua
index 393fe5c1fe9..a4c43ccecd6 100644
--- a/scripts/zones/Inner_Horutoto_Ruins/npcs/_5cc.lua
+++ b/scripts/zones/Inner_Horutoto_Ruins/npcs/_5cc.lua
@@ -3,16 +3,12 @@
 --  NPC: _5cc (Gate of Ice)
 -- !pos -228 0 99 192
 -----------------------------------
-local ID = zones[xi.zone.INNER_HORUTOTO_RUINS]
------------------------------------
 local entity = {}
 
 entity.onTrade = function(player, npc, trade)
 end
 
 entity.onTrigger = function(player, npc)
-    player:messageSpecial(ID.text.DOOR_FIRMLY_CLOSED)
-    return 1
 end
 
 entity.onEventUpdate = function(player, csid, option, npc)
diff --git a/scripts/zones/Inner_Horutoto_Ruins/npcs/_5cd.lua b/scripts/zones/Inner_Horutoto_Ruins/npcs/_5cd.lua
index 34f4b4b6a2b..2e8ffd9e9a2 100644
--- a/scripts/zones/Inner_Horutoto_Ruins/npcs/_5cd.lua
+++ b/scripts/zones/Inner_Horutoto_Ruins/npcs/_5cd.lua
@@ -3,16 +3,12 @@
 --  NPC: _5cd (Gate of Water)
 -- !pos -228 0 140 192
 -----------------------------------
-local ID = zones[xi.zone.INNER_HORUTOTO_RUINS]
------------------------------------
 local entity = {}
 
 entity.onTrade = function(player, npc, trade)
 end
 
 entity.onTrigger = function(player, npc)
-    player:messageSpecial(ID.text.DOOR_FIRMLY_CLOSED)
-    return 1
 end
 
 entity.onEventUpdate = function(player, csid, option, npc)
diff --git a/scripts/zones/Inner_Horutoto_Ruins/npcs/_5ce.lua b/scripts/zones/Inner_Horutoto_Ruins/npcs/_5ce.lua
index 42974bdd706..d0c1db673dd 100644
--- a/scripts/zones/Inner_Horutoto_Ruins/npcs/_5ce.lua
+++ b/scripts/zones/Inner_Horutoto_Ruins/npcs/_5ce.lua
@@ -3,16 +3,12 @@
 --  NPC: _5ce (Gate of Earth)
 -- !pos -228 0 140 192
 -----------------------------------
-local ID = zones[xi.zone.INNER_HORUTOTO_RUINS]
------------------------------------
 local entity = {}
 
 entity.onTrade = function(player, npc, trade)
 end
 
 entity.onTrigger = function(player, npc)
-    player:messageSpecial(ID.text.DOOR_FIRMLY_CLOSED)
-    return 1
 end
 
 entity.onEventUpdate = function(player, csid, option, npc)
diff --git a/scripts/zones/Inner_Horutoto_Ruins/npcs/_5cf.lua b/scripts/zones/Inner_Horutoto_Ruins/npcs/_5cf.lua
index fb30e825917..26717353dbe 100644
--- a/scripts/zones/Inner_Horutoto_Ruins/npcs/_5cf.lua
+++ b/scripts/zones/Inner_Horutoto_Ruins/npcs/_5cf.lua
@@ -3,16 +3,12 @@
 --  NPC: _5cf (Gate of Wind)
 -- !pos -332 0 99 192
 -----------------------------------
-local ID = zones[xi.zone.INNER_HORUTOTO_RUINS]
------------------------------------
 local entity = {}
 
 entity.onTrade = function(player, npc, trade)
 end
 
 entity.onTrigger = function(player, npc)
-    player:messageSpecial(ID.text.DOOR_FIRMLY_CLOSED)
-    return 1
 end
 
 entity.onEventUpdate = function(player, csid, option, npc)
diff --git a/scripts/zones/Inner_Horutoto_Ruins/npcs/_5cg.lua b/scripts/zones/Inner_Horutoto_Ruins/npcs/_5cg.lua
index 22755716a8a..8a35e510eb5 100644
--- a/scripts/zones/Inner_Horutoto_Ruins/npcs/_5cg.lua
+++ b/scripts/zones/Inner_Horutoto_Ruins/npcs/_5cg.lua
@@ -3,16 +3,12 @@
 --  NPC: _5cg (Gate of Fire)
 -- !pos -332 0 99 192
 -----------------------------------
-local ID = zones[xi.zone.INNER_HORUTOTO_RUINS]
------------------------------------
 local entity = {}
 
 entity.onTrade = function(player, npc, trade)
 end
 
 entity.onTrigger = function(player, npc)
-    player:messageSpecial(ID.text.DOOR_FIRMLY_CLOSED)
-    return 1
 end
 
 entity.onEventUpdate = function(player, csid, option, npc)
diff --git a/scripts/zones/Inner_Horutoto_Ruins/npcs/_5ch.lua b/scripts/zones/Inner_Horutoto_Ruins/npcs/_5ch.lua
index 0a57c0e0681..d7d1b3189b3 100644
--- a/scripts/zones/Inner_Horutoto_Ruins/npcs/_5ch.lua
+++ b/scripts/zones/Inner_Horutoto_Ruins/npcs/_5ch.lua
@@ -3,16 +3,12 @@
 --  NPC: _5ch (Gate of Thunder)
 -- !pos -331 0 139 192
 -----------------------------------
-local ID = zones[xi.zone.INNER_HORUTOTO_RUINS]
------------------------------------
 local entity = {}
 
 entity.onTrade = function(player, npc, trade)
 end
 
 entity.onTrigger = function(player, npc)
-    player:messageSpecial(ID.text.DOOR_FIRMLY_CLOSED)
-    return 1
 end
 
 entity.onEventUpdate = function(player, csid, option, npc)
diff --git a/scripts/zones/Lebros_Cavern/npcs/Rune_of_Release.lua b/scripts/zones/Lebros_Cavern/npcs/Rune_of_Release.lua
index 7d0e7012fb4..31d50060909 100644
--- a/scripts/zones/Lebros_Cavern/npcs/Rune_of_Release.lua
+++ b/scripts/zones/Lebros_Cavern/npcs/Rune_of_Release.lua
@@ -12,8 +12,6 @@ entity.onTrigger = function(player, npc)
     if instance:completed() then
         player:startEvent(100, 2)
     end
-
-    return 1
 end
 
 entity.onEventUpdate = function(player, csid, option, npc)
diff --git a/scripts/zones/Leujaoam_Sanctum/npcs/Rune_of_Release.lua b/scripts/zones/Leujaoam_Sanctum/npcs/Rune_of_Release.lua
index 90c03f2e051..7a29b1b2912 100644
--- a/scripts/zones/Leujaoam_Sanctum/npcs/Rune_of_Release.lua
+++ b/scripts/zones/Leujaoam_Sanctum/npcs/Rune_of_Release.lua
@@ -13,8 +13,6 @@ entity.onTrigger = function(player, npc)
     if instance:completed() then
         player:startEvent(100, 0)
     end
-
-    return 1
 end
 
 entity.onEventUpdate = function(player, csid, option, npc)
diff --git a/scripts/zones/Mamook/mobs/Chamrosh.lua b/scripts/zones/Mamook/mobs/Chamrosh.lua
index b0591b3f432..30e0c268fd1 100644
--- a/scripts/zones/Mamook/mobs/Chamrosh.lua
+++ b/scripts/zones/Mamook/mobs/Chamrosh.lua
@@ -66,8 +66,6 @@ entity.onMagicHit = function(caster, target, spell)
         target:setLocalVar('COPY_SPELL', spell:getID())
         target:setLocalVar('LAST_CAST', target:getBattleTime())
     end
-
-    return 1
 end
 
 entity.onMobDeath = function(mob, player, optParams)
diff --git a/scripts/zones/Mamool_Ja_Training_Grounds/npcs/Rune_of_Release.lua b/scripts/zones/Mamool_Ja_Training_Grounds/npcs/Rune_of_Release.lua
index f437c4f0a1b..2ba609f5fa2 100644
--- a/scripts/zones/Mamool_Ja_Training_Grounds/npcs/Rune_of_Release.lua
+++ b/scripts/zones/Mamool_Ja_Training_Grounds/npcs/Rune_of_Release.lua
@@ -12,8 +12,6 @@ entity.onTrigger = function(player, npc)
     if instance:completed() then
         player:startEvent(100, 1)
     end
-
-    return 1
 end
 
 entity.onEventUpdate = function(player, csid, option, npc)
diff --git a/scripts/zones/Metalworks/DefaultActions.lua b/scripts/zones/Metalworks/DefaultActions.lua
index 1dbf0510665..ba69bbde156 100644
--- a/scripts/zones/Metalworks/DefaultActions.lua
+++ b/scripts/zones/Metalworks/DefaultActions.lua
@@ -2,6 +2,7 @@ local ID = zones[xi.zone.METALWORKS]
 
 return {
     ['_6ld']        = { event = 604 },
+    ['_6le']        = { messageSpecial = ID.text.ITS_LOCKED },
     ['_6lg']        = { messageSpecial = ID.text.ITS_LOCKED },
     ['Alois']       = { event = 370 },
     ['Ayame']       = { event = 701 },
diff --git a/scripts/zones/Metalworks/npcs/_6le.lua b/scripts/zones/Metalworks/npcs/_6le.lua
index 19ede17d9bb..76a3b82fcfa 100644
--- a/scripts/zones/Metalworks/npcs/_6le.lua
+++ b/scripts/zones/Metalworks/npcs/_6le.lua
@@ -3,16 +3,12 @@
 -- Door: _6le (Presidential Suite)
 -- !pos 113 -20 8 237
 -----------------------------------
-local ID = zones[xi.zone.METALWORKS]
------------------------------------
 local entity = {}
 
 entity.onTrade = function(player, npc, trade)
 end
 
 entity.onTrigger = function(player, npc)
-    player:messageSpecial(ID.text.ITS_LOCKED)
-    return 1
 end
 
 entity.onEventUpdate = function(player, csid, option, npc)
diff --git a/scripts/zones/Misareaux_Coast/npcs/_0p3.lua b/scripts/zones/Misareaux_Coast/npcs/_0p3.lua
index 0436333f310..117b36d6065 100644
--- a/scripts/zones/Misareaux_Coast/npcs/_0p3.lua
+++ b/scripts/zones/Misareaux_Coast/npcs/_0p3.lua
@@ -10,7 +10,6 @@ end
 
 entity.onTrigger = function(player, npc)
     player:startEvent(553)
-    return 1
 end
 
 entity.onEventUpdate = function(player, csid, option, npc)
diff --git a/scripts/zones/Periqia/npcs/Rune_of_Release.lua b/scripts/zones/Periqia/npcs/Rune_of_Release.lua
index 8992ae143ae..4ff3e071001 100644
--- a/scripts/zones/Periqia/npcs/Rune_of_Release.lua
+++ b/scripts/zones/Periqia/npcs/Rune_of_Release.lua
@@ -14,8 +14,6 @@ entity.onTrigger = function(player, npc)
     if instance:completed() then
         player:startEvent(100, 3)
     end
-
-    return 1
 end
 
 entity.onEventUpdate = function(player, csid, option, npc)
diff --git a/scripts/zones/Port_Bastok/npcs/_6k9.lua b/scripts/zones/Port_Bastok/npcs/_6k9.lua
index 5e62e0eed1c..a0ebaa29d3e 100644
--- a/scripts/zones/Port_Bastok/npcs/_6k9.lua
+++ b/scripts/zones/Port_Bastok/npcs/_6k9.lua
@@ -10,7 +10,6 @@ end
 
 entity.onTrigger = function(player, npc)
     player:startEvent(140)
-    return 1
 end
 
 entity.onEventUpdate = function(player, csid, option, npc)
diff --git a/scripts/zones/Port_Jeuno/npcs/_6u2.lua b/scripts/zones/Port_Jeuno/npcs/_6u2.lua
index 7fd7a8dafb0..25fd32afa6c 100644
--- a/scripts/zones/Port_Jeuno/npcs/_6u2.lua
+++ b/scripts/zones/Port_Jeuno/npcs/_6u2.lua
@@ -9,7 +9,6 @@ end
 
 entity.onTrigger = function(player, npc)
     player:startEvent(54)
-    return 1
 end
 
 entity.onEventUpdate = function(player, csid, option, npc)
diff --git a/scripts/zones/Port_Jeuno/npcs/_6u6.lua b/scripts/zones/Port_Jeuno/npcs/_6u6.lua
index 1148354108b..f23c8e2c3d0 100644
--- a/scripts/zones/Port_Jeuno/npcs/_6u6.lua
+++ b/scripts/zones/Port_Jeuno/npcs/_6u6.lua
@@ -9,7 +9,6 @@ end
 
 entity.onTrigger = function(player, npc)
     player:startEvent(53)
-    return 1
 end
 
 entity.onEventUpdate = function(player, csid, option, npc)
diff --git a/scripts/zones/Port_Jeuno/npcs/_6uc.lua b/scripts/zones/Port_Jeuno/npcs/_6uc.lua
index 49c6a6e8c83..862dff9eba2 100644
--- a/scripts/zones/Port_Jeuno/npcs/_6uc.lua
+++ b/scripts/zones/Port_Jeuno/npcs/_6uc.lua
@@ -9,7 +9,6 @@ end
 
 entity.onTrigger = function(player, npc)
     player:startEvent(52)
-    return 1
 end
 
 entity.onEventUpdate = function(player, csid, option, npc)
diff --git a/scripts/zones/Port_Jeuno/npcs/_6ug.lua b/scripts/zones/Port_Jeuno/npcs/_6ug.lua
index 5eb61e43b21..276a0fa4421 100644
--- a/scripts/zones/Port_Jeuno/npcs/_6ug.lua
+++ b/scripts/zones/Port_Jeuno/npcs/_6ug.lua
@@ -9,7 +9,6 @@ end
 
 entity.onTrigger = function(player, npc)
     player:startEvent(55)
-    return 1
 end
 
 entity.onEventUpdate = function(player, csid, option, npc)
diff --git a/scripts/zones/Port_San_dOria/npcs/_6g7.lua b/scripts/zones/Port_San_dOria/npcs/_6g7.lua
index 5f1b1b185af..279c2fb25c9 100644
--- a/scripts/zones/Port_San_dOria/npcs/_6g7.lua
+++ b/scripts/zones/Port_San_dOria/npcs/_6g7.lua
@@ -12,8 +12,6 @@ entity.onTrigger = function(player, npc)
     if player:getZPos() >= 12 then
         player:startEvent(518)
     end
-
-    return 1
 end
 
 entity.onEventUpdate = function(player, csid, option, npc)
diff --git a/scripts/zones/Port_Windurst/npcs/_6o7.lua b/scripts/zones/Port_Windurst/npcs/_6o7.lua
index a41285ade0f..9ff4829913e 100644
--- a/scripts/zones/Port_Windurst/npcs/_6o7.lua
+++ b/scripts/zones/Port_Windurst/npcs/_6o7.lua
@@ -10,7 +10,6 @@ end
 
 entity.onTrigger = function(player, npc)
     player:startEvent(182)
-    return 1
 end
 
 entity.onEventUpdate = function(player, csid, option, npc)
diff --git a/scripts/zones/Qulun_Dome/npcs/_441.lua b/scripts/zones/Qulun_Dome/npcs/_441.lua
index 0a56e61c092..f30ba841b21 100644
--- a/scripts/zones/Qulun_Dome/npcs/_441.lua
+++ b/scripts/zones/Qulun_Dome/npcs/_441.lua
@@ -28,8 +28,6 @@ entity.onTrigger = function(player, npc)
             player:messageSpecial(ID.text.CANNOT_BE_OPENED_FROM_THIS_SIDE)
         end
     end
-
-    return 1
 end
 
 entity.onEventUpdate = function(player, csid, option, npc)
diff --git a/scripts/zones/Ranguemont_Pass/npcs/_4m0.lua b/scripts/zones/Ranguemont_Pass/npcs/_4m0.lua
index 0a1d656308e..6f1b418f858 100644
--- a/scripts/zones/Ranguemont_Pass/npcs/_4m0.lua
+++ b/scripts/zones/Ranguemont_Pass/npcs/_4m0.lua
@@ -7,7 +7,6 @@
 local entity = {}
 
 entity.onTrigger = function(player, npc)
-    return 1
 end
 
 return entity
diff --git a/scripts/zones/Temple_of_Uggalepih/npcs/_mf1.lua b/scripts/zones/Temple_of_Uggalepih/npcs/_mf1.lua
index cf54209deff..21f2f2d0b8b 100644
--- a/scripts/zones/Temple_of_Uggalepih/npcs/_mf1.lua
+++ b/scripts/zones/Temple_of_Uggalepih/npcs/_mf1.lua
@@ -21,8 +21,6 @@ entity.onTrigger = function(player, npc)
     if guardian ~= nil and guardian:getHP() > 0 and guardian:getTarget() == nil then
         guardian:updateClaim(player)
     end
-
-    return 1
 end
 
 entity.onEventUpdate = function(player, csid, option, npc)
diff --git a/scripts/zones/Temple_of_Uggalepih/npcs/_mf8.lua b/scripts/zones/Temple_of_Uggalepih/npcs/_mf8.lua
index 90a61702032..e9bb40055f5 100644
--- a/scripts/zones/Temple_of_Uggalepih/npcs/_mf8.lua
+++ b/scripts/zones/Temple_of_Uggalepih/npcs/_mf8.lua
@@ -22,8 +22,6 @@ entity.onTrigger = function(player, npc)
     else
         npc:openDoor(11) -- retail timed
     end
-
-    return 1
 end
 
 entity.onEventUpdate = function(player, csid, option, npc)
diff --git a/scripts/zones/Temple_of_Uggalepih/npcs/_mf9.lua b/scripts/zones/Temple_of_Uggalepih/npcs/_mf9.lua
index c21a294e54d..1e19c28ca21 100644
--- a/scripts/zones/Temple_of_Uggalepih/npcs/_mf9.lua
+++ b/scripts/zones/Temple_of_Uggalepih/npcs/_mf9.lua
@@ -22,8 +22,6 @@ entity.onTrigger = function(player, npc)
     else
         npc:openDoor(11) -- retail timed
     end
-
-    return 1
 end
 
 entity.onEventUpdate = function(player, csid, option, npc)
diff --git a/scripts/zones/Upper_Delkfutts_Tower/npcs/_4e1.lua b/scripts/zones/Upper_Delkfutts_Tower/npcs/_4e1.lua
index 404bcd82286..4a92480c79a 100644
--- a/scripts/zones/Upper_Delkfutts_Tower/npcs/_4e1.lua
+++ b/scripts/zones/Upper_Delkfutts_Tower/npcs/_4e1.lua
@@ -10,7 +10,6 @@ end
 
 entity.onTrigger = function(player, npc)
     player:startEvent(2)
-    return 1
 end
 
 entity.onEventUpdate = function(player, csid, option, npc)
diff --git a/scripts/zones/Wajaom_Woodlands/npcs/_1f0.lua b/scripts/zones/Wajaom_Woodlands/npcs/_1f0.lua
index a044413e242..4db16601a39 100644
--- a/scripts/zones/Wajaom_Woodlands/npcs/_1f0.lua
+++ b/scripts/zones/Wajaom_Woodlands/npcs/_1f0.lua
@@ -10,7 +10,6 @@ end
 
 entity.onTrigger = function(player, npc)
     player:startEvent(502)
-    return 1
 end
 
 entity.onEventUpdate = function(player, csid, option, npc)
diff --git a/scripts/zones/Windurst_Walls/npcs/_6n8.lua b/scripts/zones/Windurst_Walls/npcs/_6n8.lua
index e366b21f745..ab6d4ec5dd6 100644
--- a/scripts/zones/Windurst_Walls/npcs/_6n8.lua
+++ b/scripts/zones/Windurst_Walls/npcs/_6n8.lua
@@ -21,8 +21,6 @@ entity.onTrigger = function(player, npc)
     else
         player:startEvent(395)
     end
-
-    return 1
 end
 
 entity.onEventUpdate = function(player, csid, option, npc)