From cce8f8cd2919b633ac0f920215f5a2ce1d686f87 Mon Sep 17 00:00:00 2001 From: claywar Date: Sun, 19 Jan 2025 15:28:51 -0500 Subject: [PATCH 1/3] Remove empty NPCs, add Default Actions - Sacrarium ~ Ships --- .../zones/Sacrarium/npcs/Large_Keyhole.lua | 6 ----- .../zones/Sacrarium/npcs/Small_Keyhole.lua | 3 --- scripts/zones/Sacrarium/npcs/Stale_Draft.lua | 6 ----- .../zones/Sacrarium/npcs/Treasure_Chest.lua | 6 ----- scripts/zones/Sacrarium/npcs/_0s0.lua | 6 ----- scripts/zones/Sacrarium/npcs/_0s1.lua | 6 ----- scripts/zones/Sacrarium/npcs/_0s2.lua | 6 ----- scripts/zones/Sacrarium/npcs/_0s3.lua | 6 ----- scripts/zones/Sacrarium/npcs/_0s4.lua | 6 ----- scripts/zones/Sacrarium/npcs/_0s5.lua | 6 ----- scripts/zones/Sacrarium/npcs/_0s6.lua | 6 ----- scripts/zones/Sacrarium/npcs/_0s7.lua | 6 ----- scripts/zones/Sacrarium/npcs/_0s9.lua | 6 ----- scripts/zones/Sacrarium/npcs/_0st.lua | 6 ----- scripts/zones/Sacrarium/npcs/_0sv.lua | 6 ----- scripts/zones/Sacrarium/npcs/_0sw.lua | 6 ----- scripts/zones/Sacrarium/npcs/qm_prof_0.lua | 9 ------- scripts/zones/Sacrarium/npcs/qm_prof_1.lua | 9 ------- scripts/zones/Sacrarium/npcs/qm_prof_2.lua | 9 ------- scripts/zones/Sacrarium/npcs/qm_prof_3.lua | 9 ------- scripts/zones/Sacrarium/npcs/qm_prof_4.lua | 9 ------- scripts/zones/Sacrarium/npcs/qm_prof_5.lua | 9 ------- .../San_dOria-Jeuno_Airship/npcs/Nigel.lua | 9 ------- .../San_dOria-Jeuno_Airship/npcs/Ricaldo.lua | 9 ------- .../npcs/Cavernous_Maw.lua | 6 ----- .../npcs/Field_Manual.lua | 3 --- .../npcs/Geomantic_Reservoir.lua | 6 ----- .../npcs/Stone_Monument.lua | 6 ----- .../npcs/Treasure_Casket.lua | 3 --- .../zones/Sauromugue_Champaign/npcs/qm1.lua | 9 ------- .../npcs/Bulwark_Gate.lua | 3 --- .../npcs/Cavernous_Maw.lua | 6 ----- .../Sauromugue_Champaign_[S]/npcs/_2q6.lua | 6 ----- .../Sea_Serpent_Grotto/DefaultActions.lua | 4 +-- .../npcs/Bou_the_Righteous.lua | 9 ------- .../Sea_Serpent_Grotto/npcs/Grounds_Tome.lua | 3 --- .../npcs/Hurr_the_Betrayer.lua | 3 --- .../npcs/Treasure_Casket.lua | 3 --- .../npcs/Treasure_Chest.lua | 6 ----- .../npcs/Treasure_Coffer.lua | 6 ----- .../zones/Sea_Serpent_Grotto/npcs/_4w3.lua | 6 ----- .../zones/Sea_Serpent_Grotto/npcs/_4w4.lua | 6 ----- .../zones/Sea_Serpent_Grotto/npcs/_4w5.lua | 6 ----- .../zones/Sea_Serpent_Grotto/npcs/_4wa.lua | 6 ----- scripts/zones/Sea_Serpent_Grotto/npcs/qm3.lua | 9 ------- .../zones/Sea_Serpent_Grotto/npcs/relic.lua | 3 --- scripts/zones/Sealions_Den/DefaultActions.lua | 5 ++-- .../zones/Sealions_Den/npcs/Jovial_Rat.lua | 22 ---------------- scripts/zones/Selbina/DefaultActions.lua | 14 ++++++++++ scripts/zones/Selbina/npcs/Abelard.lua | 3 --- scripts/zones/Selbina/npcs/Aleria.lua | 9 ------- scripts/zones/Selbina/npcs/Battal.lua | 23 ---------------- scripts/zones/Selbina/npcs/Boris.lua | 9 ------- scripts/zones/Selbina/npcs/Bretta.lua | 9 ------- scripts/zones/Selbina/npcs/Catus.lua | 9 ------- scripts/zones/Selbina/npcs/Chutarmire.lua | 9 ------- scripts/zones/Selbina/npcs/Diederik.lua | 21 --------------- scripts/zones/Selbina/npcs/Dohdjuma.lua | 9 ------- .../zones/Selbina/npcs/Explorer_Moogle.lua | 6 ----- scripts/zones/Selbina/npcs/Falgima.lua | 9 ------- scripts/zones/Selbina/npcs/Flandiace.lua | 23 ---------------- scripts/zones/Selbina/npcs/Gabwaleid.lua | 23 ---------------- scripts/zones/Selbina/npcs/Gibol.lua | 9 ------- scripts/zones/Selbina/npcs/Graegham.lua | 9 ------- scripts/zones/Selbina/npcs/Herminia.lua | 9 ------- scripts/zones/Selbina/npcs/Humilitie.lua | 9 ------- scripts/zones/Selbina/npcs/Isacio.lua | 3 --- scripts/zones/Selbina/npcs/Lombaria.lua | 6 ----- scripts/zones/Selbina/npcs/Lucia.lua | 6 ----- scripts/zones/Selbina/npcs/Manfried.lua | 21 --------------- scripts/zones/Selbina/npcs/Mathilde.lua | 10 +------ scripts/zones/Selbina/npcs/Meldivon.lua | 21 --------------- scripts/zones/Selbina/npcs/Melyon.lua | 3 --- scripts/zones/Selbina/npcs/Mendoline.lua | 9 ------- scripts/zones/Selbina/npcs/Moreche.lua | 21 --------------- scripts/zones/Selbina/npcs/Nomad_Moogle.lua | 9 ------- scripts/zones/Selbina/npcs/Oleg.lua | 21 --------------- scripts/zones/Selbina/npcs/Orithyia.lua | 21 --------------- scripts/zones/Selbina/npcs/Pacomart.lua | 6 ----- scripts/zones/Selbina/npcs/Pascaut.lua | 21 --------------- scripts/zones/Selbina/npcs/Pomulus.lua | 21 --------------- scripts/zones/Selbina/npcs/Quelpia.lua | 9 ------- scripts/zones/Selbina/npcs/Raging_Tiger.lua | 9 ------- scripts/zones/Selbina/npcs/Ramona.lua | 22 ---------------- scripts/zones/Selbina/npcs/Romeo.lua | 3 --- .../zones/Selbina/npcs/Sleeping_Lizard.lua | 9 ------- scripts/zones/Selbina/npcs/Tilala.lua | 9 ------- scripts/zones/Selbina/npcs/Torapiont.lua | 9 ------- scripts/zones/Selbina/npcs/Valgeir.lua | 26 ------------------- scripts/zones/Selbina/npcs/Velema.lua | 22 ---------------- scripts/zones/Selbina/npcs/Vobo.lua | 23 ---------------- scripts/zones/Selbina/npcs/Vuntar.lua | 3 --- scripts/zones/Selbina/npcs/Wachiwi.lua | 9 ------- scripts/zones/Selbina/npcs/Wenzel.lua | 9 ------- scripts/zones/Selbina/npcs/Yulon-Polon.lua | 6 ----- scripts/zones/Selbina/npcs/Zaldon.lua | 6 ----- .../Ship_bound_for_Mhaura/DefaultActions.lua | 5 ++++ .../Ship_bound_for_Mhaura/npcs/Chhaya.lua | 9 ------- .../Ship_bound_for_Mhaura/npcs/Lokhong.lua | 9 ------- .../zones/Ship_bound_for_Mhaura/npcs/Map.lua | 22 ---------------- .../zones/Ship_bound_for_Mhaura/npcs/Sahn.lua | 9 ------- .../DefaultActions.lua | 5 ++++ .../npcs/Chhaya.lua | 9 ------- .../npcs/Lokhong.lua | 9 ------- .../npcs/Map.lua | 22 ---------------- .../npcs/Sahn.lua | 9 ------- .../Ship_bound_for_Selbina/DefaultActions.lua | 5 ++++ .../Ship_bound_for_Selbina/npcs/Bhagirath.lua | 9 ------- .../Ship_bound_for_Selbina/npcs/Maera.lua | 9 ------- .../zones/Ship_bound_for_Selbina/npcs/Map.lua | 22 ---------------- .../Ship_bound_for_Selbina/npcs/Rajmonda.lua | 9 ------- .../DefaultActions.lua | 5 ++++ .../npcs/Bhagirath.lua | 9 ------- .../npcs/Maera.lua | 9 ------- .../npcs/Map.lua | 22 ---------------- .../npcs/Rajmonda.lua | 9 ------- .../DefaultActions.lua | 5 ++++ .../Silver_Sea_route_to_Al_Zahbi/npcs/Map.lua | 22 ---------------- .../npcs/Shadeeu.lua | 9 ------- .../npcs/Yahliq.lua | 9 ------- .../DefaultActions.lua | 5 ++++ .../npcs/Jidwahn.lua | 9 ------- .../Silver_Sea_route_to_Nashmau/npcs/Map.lua | 22 ---------------- .../npcs/Qudamahf.lua | 9 ------- 124 files changed, 50 insertions(+), 1151 deletions(-) delete mode 100644 scripts/zones/Sealions_Den/npcs/Jovial_Rat.lua delete mode 100644 scripts/zones/Selbina/npcs/Battal.lua delete mode 100644 scripts/zones/Selbina/npcs/Diederik.lua delete mode 100644 scripts/zones/Selbina/npcs/Flandiace.lua delete mode 100644 scripts/zones/Selbina/npcs/Gabwaleid.lua delete mode 100644 scripts/zones/Selbina/npcs/Manfried.lua delete mode 100644 scripts/zones/Selbina/npcs/Meldivon.lua delete mode 100644 scripts/zones/Selbina/npcs/Moreche.lua delete mode 100644 scripts/zones/Selbina/npcs/Oleg.lua delete mode 100644 scripts/zones/Selbina/npcs/Orithyia.lua delete mode 100644 scripts/zones/Selbina/npcs/Pascaut.lua delete mode 100644 scripts/zones/Selbina/npcs/Pomulus.lua delete mode 100644 scripts/zones/Selbina/npcs/Ramona.lua delete mode 100644 scripts/zones/Selbina/npcs/Valgeir.lua delete mode 100644 scripts/zones/Selbina/npcs/Velema.lua delete mode 100644 scripts/zones/Selbina/npcs/Vobo.lua create mode 100644 scripts/zones/Ship_bound_for_Mhaura/DefaultActions.lua delete mode 100644 scripts/zones/Ship_bound_for_Mhaura/npcs/Map.lua create mode 100644 scripts/zones/Ship_bound_for_Mhaura_Pirates/DefaultActions.lua delete mode 100644 scripts/zones/Ship_bound_for_Mhaura_Pirates/npcs/Map.lua create mode 100644 scripts/zones/Ship_bound_for_Selbina/DefaultActions.lua delete mode 100644 scripts/zones/Ship_bound_for_Selbina/npcs/Map.lua create mode 100644 scripts/zones/Ship_bound_for_Selbina_Pirates/DefaultActions.lua delete mode 100644 scripts/zones/Ship_bound_for_Selbina_Pirates/npcs/Map.lua create mode 100644 scripts/zones/Silver_Sea_route_to_Al_Zahbi/DefaultActions.lua delete mode 100644 scripts/zones/Silver_Sea_route_to_Al_Zahbi/npcs/Map.lua create mode 100644 scripts/zones/Silver_Sea_route_to_Nashmau/DefaultActions.lua delete mode 100644 scripts/zones/Silver_Sea_route_to_Nashmau/npcs/Map.lua diff --git a/scripts/zones/Sacrarium/npcs/Large_Keyhole.lua b/scripts/zones/Sacrarium/npcs/Large_Keyhole.lua index ff9d471e61f..1e37ccf7d13 100644 --- a/scripts/zones/Sacrarium/npcs/Large_Keyhole.lua +++ b/scripts/zones/Sacrarium/npcs/Large_Keyhole.lua @@ -33,10 +33,4 @@ entity.onTrade = function(player, npc, trade) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Sacrarium/npcs/Small_Keyhole.lua b/scripts/zones/Sacrarium/npcs/Small_Keyhole.lua index 0d0038d6232..9fe4151d119 100644 --- a/scripts/zones/Sacrarium/npcs/Small_Keyhole.lua +++ b/scripts/zones/Sacrarium/npcs/Small_Keyhole.lua @@ -27,9 +27,6 @@ entity.onTrade = function(player, npc, trade) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 100 then GetNPCByID(ID.npc.SMALL_KEYHOLE):setLocalVar('canTradeSecondKey', 0) diff --git a/scripts/zones/Sacrarium/npcs/Stale_Draft.lua b/scripts/zones/Sacrarium/npcs/Stale_Draft.lua index 4dd090cd9e6..b59ab8e32f5 100644 --- a/scripts/zones/Sacrarium/npcs/Stale_Draft.lua +++ b/scripts/zones/Sacrarium/npcs/Stale_Draft.lua @@ -55,10 +55,4 @@ entity.onTrade = function(player, npc, trade) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Sacrarium/npcs/Treasure_Chest.lua b/scripts/zones/Sacrarium/npcs/Treasure_Chest.lua index 98879db0e5e..3c5a177987d 100644 --- a/scripts/zones/Sacrarium/npcs/Treasure_Chest.lua +++ b/scripts/zones/Sacrarium/npcs/Treasure_Chest.lua @@ -14,10 +14,4 @@ entity.onTrigger = function(player, npc) xi.treasure.onTrigger(player, xi.treasure.type.CHEST) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Sacrarium/npcs/_0s0.lua b/scripts/zones/Sacrarium/npcs/_0s0.lua index 5085a8212be..98d585c5927 100644 --- a/scripts/zones/Sacrarium/npcs/_0s0.lua +++ b/scripts/zones/Sacrarium/npcs/_0s0.lua @@ -12,10 +12,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Sacrarium/npcs/_0s1.lua b/scripts/zones/Sacrarium/npcs/_0s1.lua index 47535801ec6..d3c125fdc19 100644 --- a/scripts/zones/Sacrarium/npcs/_0s1.lua +++ b/scripts/zones/Sacrarium/npcs/_0s1.lua @@ -12,10 +12,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Sacrarium/npcs/_0s2.lua b/scripts/zones/Sacrarium/npcs/_0s2.lua index 55c45b9f4b5..d49791027b9 100644 --- a/scripts/zones/Sacrarium/npcs/_0s2.lua +++ b/scripts/zones/Sacrarium/npcs/_0s2.lua @@ -12,10 +12,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Sacrarium/npcs/_0s3.lua b/scripts/zones/Sacrarium/npcs/_0s3.lua index 39066afd24a..122765a2934 100644 --- a/scripts/zones/Sacrarium/npcs/_0s3.lua +++ b/scripts/zones/Sacrarium/npcs/_0s3.lua @@ -12,10 +12,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Sacrarium/npcs/_0s4.lua b/scripts/zones/Sacrarium/npcs/_0s4.lua index 013139951f4..677bbc1c6e3 100644 --- a/scripts/zones/Sacrarium/npcs/_0s4.lua +++ b/scripts/zones/Sacrarium/npcs/_0s4.lua @@ -12,10 +12,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Sacrarium/npcs/_0s5.lua b/scripts/zones/Sacrarium/npcs/_0s5.lua index fdb74801b75..be47dfeab9d 100644 --- a/scripts/zones/Sacrarium/npcs/_0s5.lua +++ b/scripts/zones/Sacrarium/npcs/_0s5.lua @@ -12,10 +12,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Sacrarium/npcs/_0s6.lua b/scripts/zones/Sacrarium/npcs/_0s6.lua index 9223b74e060..15019154b2d 100644 --- a/scripts/zones/Sacrarium/npcs/_0s6.lua +++ b/scripts/zones/Sacrarium/npcs/_0s6.lua @@ -12,10 +12,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Sacrarium/npcs/_0s7.lua b/scripts/zones/Sacrarium/npcs/_0s7.lua index c8f7895831f..663295e2b2a 100644 --- a/scripts/zones/Sacrarium/npcs/_0s7.lua +++ b/scripts/zones/Sacrarium/npcs/_0s7.lua @@ -12,10 +12,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Sacrarium/npcs/_0s9.lua b/scripts/zones/Sacrarium/npcs/_0s9.lua index 8a1631f9cfc..35bd26a6851 100644 --- a/scripts/zones/Sacrarium/npcs/_0s9.lua +++ b/scripts/zones/Sacrarium/npcs/_0s9.lua @@ -16,10 +16,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Sacrarium/npcs/_0st.lua b/scripts/zones/Sacrarium/npcs/_0st.lua index 42fd5ca18a7..333fbfc8a89 100644 --- a/scripts/zones/Sacrarium/npcs/_0st.lua +++ b/scripts/zones/Sacrarium/npcs/_0st.lua @@ -17,10 +17,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Sacrarium/npcs/_0sv.lua b/scripts/zones/Sacrarium/npcs/_0sv.lua index 87a509d594a..94ba6427102 100644 --- a/scripts/zones/Sacrarium/npcs/_0sv.lua +++ b/scripts/zones/Sacrarium/npcs/_0sv.lua @@ -18,10 +18,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Sacrarium/npcs/_0sw.lua b/scripts/zones/Sacrarium/npcs/_0sw.lua index 7a5f824bca4..917262d8ce0 100644 --- a/scripts/zones/Sacrarium/npcs/_0sw.lua +++ b/scripts/zones/Sacrarium/npcs/_0sw.lua @@ -16,10 +16,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Sacrarium/npcs/qm_prof_0.lua b/scripts/zones/Sacrarium/npcs/qm_prof_0.lua index ea5c3a0f4cd..9b6e707eb18 100644 --- a/scripts/zones/Sacrarium/npcs/qm_prof_0.lua +++ b/scripts/zones/Sacrarium/npcs/qm_prof_0.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.SACRARIUM] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local isSpawnPoint = npc:getLocalVar('hasProfessorMariselle') == 1 @@ -23,10 +20,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Sacrarium/npcs/qm_prof_1.lua b/scripts/zones/Sacrarium/npcs/qm_prof_1.lua index 71c0298d682..2fd7e7c5ec8 100644 --- a/scripts/zones/Sacrarium/npcs/qm_prof_1.lua +++ b/scripts/zones/Sacrarium/npcs/qm_prof_1.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.SACRARIUM] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local isSpawnPoint = npc:getLocalVar('hasProfessorMariselle') == 1 @@ -23,10 +20,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Sacrarium/npcs/qm_prof_2.lua b/scripts/zones/Sacrarium/npcs/qm_prof_2.lua index 0bd9c49fea2..cad573d6d5d 100644 --- a/scripts/zones/Sacrarium/npcs/qm_prof_2.lua +++ b/scripts/zones/Sacrarium/npcs/qm_prof_2.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.SACRARIUM] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local isSpawnPoint = npc:getLocalVar('hasProfessorMariselle') == 1 @@ -23,10 +20,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Sacrarium/npcs/qm_prof_3.lua b/scripts/zones/Sacrarium/npcs/qm_prof_3.lua index 8152b2f38ff..2736e01a8ec 100644 --- a/scripts/zones/Sacrarium/npcs/qm_prof_3.lua +++ b/scripts/zones/Sacrarium/npcs/qm_prof_3.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.SACRARIUM] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local isSpawnPoint = npc:getLocalVar('hasProfessorMariselle') == 1 @@ -23,10 +20,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Sacrarium/npcs/qm_prof_4.lua b/scripts/zones/Sacrarium/npcs/qm_prof_4.lua index 4db7433f5d4..ab2b7c0d5ef 100644 --- a/scripts/zones/Sacrarium/npcs/qm_prof_4.lua +++ b/scripts/zones/Sacrarium/npcs/qm_prof_4.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.SACRARIUM] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local isSpawnPoint = npc:getLocalVar('hasProfessorMariselle') == 1 @@ -23,10 +20,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Sacrarium/npcs/qm_prof_5.lua b/scripts/zones/Sacrarium/npcs/qm_prof_5.lua index 7c7d59b2918..a3d0efa11a1 100644 --- a/scripts/zones/Sacrarium/npcs/qm_prof_5.lua +++ b/scripts/zones/Sacrarium/npcs/qm_prof_5.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.SACRARIUM] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local isSpawnPoint = npc:getLocalVar('hasProfessorMariselle') == 1 @@ -23,10 +20,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/San_dOria-Jeuno_Airship/npcs/Nigel.lua b/scripts/zones/San_dOria-Jeuno_Airship/npcs/Nigel.lua index 12dacdaa099..6a7546a1948 100644 --- a/scripts/zones/San_dOria-Jeuno_Airship/npcs/Nigel.lua +++ b/scripts/zones/San_dOria-Jeuno_Airship/npcs/Nigel.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.SAN_DORIA_JEUNO_AIRSHIP] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local vHour = VanadielHour() local vMin = VanadielMinute() @@ -63,10 +60,4 @@ entity.onTrigger = function(player, npc) player:messageSpecial(message, math.floor((2.4 * vMinutes) / 60), math.floor(vMinutes / 60 + 0.5)) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/San_dOria-Jeuno_Airship/npcs/Ricaldo.lua b/scripts/zones/San_dOria-Jeuno_Airship/npcs/Ricaldo.lua index c42b1ce5667..239e2427b02 100644 --- a/scripts/zones/San_dOria-Jeuno_Airship/npcs/Ricaldo.lua +++ b/scripts/zones/San_dOria-Jeuno_Airship/npcs/Ricaldo.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.SAN_DORIA_JEUNO_AIRSHIP] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local vHour = VanadielHour() local vMin = VanadielMinute() @@ -63,10 +60,4 @@ entity.onTrigger = function(player, npc) player:messageSpecial(message, math.floor((2.4 * vMinutes) / 60), math.floor(vMinutes / 60 + 0.5)) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Sauromugue_Champaign/npcs/Cavernous_Maw.lua b/scripts/zones/Sauromugue_Champaign/npcs/Cavernous_Maw.lua index 22c85485fdc..e4544de9e42 100644 --- a/scripts/zones/Sauromugue_Champaign/npcs/Cavernous_Maw.lua +++ b/scripts/zones/Sauromugue_Champaign/npcs/Cavernous_Maw.lua @@ -7,16 +7,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.maws.onTrigger(player, npc) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.maws.onEventFinish(player, csid, option, npc) end diff --git a/scripts/zones/Sauromugue_Champaign/npcs/Field_Manual.lua b/scripts/zones/Sauromugue_Champaign/npcs/Field_Manual.lua index 8bfe1d37d68..51b0afea099 100644 --- a/scripts/zones/Sauromugue_Champaign/npcs/Field_Manual.lua +++ b/scripts/zones/Sauromugue_Champaign/npcs/Field_Manual.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.regime.bookOnTrigger(player, xi.regime.type.FIELDS) end diff --git a/scripts/zones/Sauromugue_Champaign/npcs/Geomantic_Reservoir.lua b/scripts/zones/Sauromugue_Champaign/npcs/Geomantic_Reservoir.lua index 3ea26e19e3b..6f2cbbc6ea2 100644 --- a/scripts/zones/Sauromugue_Champaign/npcs/Geomantic_Reservoir.lua +++ b/scripts/zones/Sauromugue_Champaign/npcs/Geomantic_Reservoir.lua @@ -7,16 +7,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.geomanticReservoir.onTrigger(player, npc, xi.magic.spell.GEO_FURY) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.geomanticReservoir.onEventFinish(player, csid, xi.magic.spell.GEO_FURY) end diff --git a/scripts/zones/Sauromugue_Champaign/npcs/Stone_Monument.lua b/scripts/zones/Sauromugue_Champaign/npcs/Stone_Monument.lua index 2010af4015c..0d2d8f31359 100644 --- a/scripts/zones/Sauromugue_Champaign/npcs/Stone_Monument.lua +++ b/scripts/zones/Sauromugue_Champaign/npcs/Stone_Monument.lua @@ -21,10 +21,4 @@ entity.onTrade = function(player, npc, trade) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Sauromugue_Champaign/npcs/Treasure_Casket.lua b/scripts/zones/Sauromugue_Champaign/npcs/Treasure_Casket.lua index eb99a04e29f..eb58cb02746 100644 --- a/scripts/zones/Sauromugue_Champaign/npcs/Treasure_Casket.lua +++ b/scripts/zones/Sauromugue_Champaign/npcs/Treasure_Casket.lua @@ -13,9 +13,6 @@ entity.onTrade = function(player, npc, trade) xi.caskets.onTrade(player, npc, trade) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.caskets.onEventFinish(player, csid, option, npc) end diff --git a/scripts/zones/Sauromugue_Champaign/npcs/qm1.lua b/scripts/zones/Sauromugue_Champaign/npcs/qm1.lua index 0788351c386..fcbb85e389c 100644 --- a/scripts/zones/Sauromugue_Champaign/npcs/qm1.lua +++ b/scripts/zones/Sauromugue_Champaign/npcs/qm1.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.SAUROMUGUE_CHAMPAIGN] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if not GetMobByID(ID.mob.DRIBBLIX_GREASEMAW):isSpawned() and @@ -25,10 +22,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Sauromugue_Champaign_[S]/npcs/Bulwark_Gate.lua b/scripts/zones/Sauromugue_Champaign_[S]/npcs/Bulwark_Gate.lua index a6d12428a87..c1a23b29ae5 100644 --- a/scripts/zones/Sauromugue_Champaign_[S]/npcs/Bulwark_Gate.lua +++ b/scripts/zones/Sauromugue_Champaign_[S]/npcs/Bulwark_Gate.lua @@ -29,9 +29,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 105 then player:setCharVar('KnotQuiteThere', 1) diff --git a/scripts/zones/Sauromugue_Champaign_[S]/npcs/Cavernous_Maw.lua b/scripts/zones/Sauromugue_Champaign_[S]/npcs/Cavernous_Maw.lua index 832304de5d8..fa6ee1f04f6 100644 --- a/scripts/zones/Sauromugue_Champaign_[S]/npcs/Cavernous_Maw.lua +++ b/scripts/zones/Sauromugue_Champaign_[S]/npcs/Cavernous_Maw.lua @@ -7,16 +7,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.maws.onTrigger(player, npc) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.maws.onEventFinish(player, csid, option, npc) end diff --git a/scripts/zones/Sauromugue_Champaign_[S]/npcs/_2q6.lua b/scripts/zones/Sauromugue_Champaign_[S]/npcs/_2q6.lua index f4eb39fd714..f033b6e3a6f 100644 --- a/scripts/zones/Sauromugue_Champaign_[S]/npcs/_2q6.lua +++ b/scripts/zones/Sauromugue_Champaign_[S]/npcs/_2q6.lua @@ -6,16 +6,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(103) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 103 and diff --git a/scripts/zones/Sea_Serpent_Grotto/DefaultActions.lua b/scripts/zones/Sea_Serpent_Grotto/DefaultActions.lua index d26a831ede5..4283ba60bbd 100644 --- a/scripts/zones/Sea_Serpent_Grotto/DefaultActions.lua +++ b/scripts/zones/Sea_Serpent_Grotto/DefaultActions.lua @@ -1,7 +1,7 @@ local ID = zones[xi.zone.SEA_SERPENT_GROTTO] return { - ['qm1'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, - ['Shady_Sconce'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, + ['qm1'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, + ['Shady_Sconce'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, ['Waterfall_Basin'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY_2 }, } diff --git a/scripts/zones/Sea_Serpent_Grotto/npcs/Bou_the_Righteous.lua b/scripts/zones/Sea_Serpent_Grotto/npcs/Bou_the_Righteous.lua index e21fe9f2885..5e818d82285 100644 --- a/scripts/zones/Sea_Serpent_Grotto/npcs/Bou_the_Righteous.lua +++ b/scripts/zones/Sea_Serpent_Grotto/npcs/Bou_the_Righteous.lua @@ -7,18 +7,9 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(108) player:setCharVar('SahaginKeyProgress', 2) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Sea_Serpent_Grotto/npcs/Grounds_Tome.lua b/scripts/zones/Sea_Serpent_Grotto/npcs/Grounds_Tome.lua index 85f5d12ed11..c2b5d333e4a 100644 --- a/scripts/zones/Sea_Serpent_Grotto/npcs/Grounds_Tome.lua +++ b/scripts/zones/Sea_Serpent_Grotto/npcs/Grounds_Tome.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.regime.bookOnTrigger(player, xi.regime.type.GROUNDS) end diff --git a/scripts/zones/Sea_Serpent_Grotto/npcs/Hurr_the_Betrayer.lua b/scripts/zones/Sea_Serpent_Grotto/npcs/Hurr_the_Betrayer.lua index 2c7a1c71f3b..81d46278a90 100644 --- a/scripts/zones/Sea_Serpent_Grotto/npcs/Hurr_the_Betrayer.lua +++ b/scripts/zones/Sea_Serpent_Grotto/npcs/Hurr_the_Betrayer.lua @@ -59,9 +59,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 107 and diff --git a/scripts/zones/Sea_Serpent_Grotto/npcs/Treasure_Casket.lua b/scripts/zones/Sea_Serpent_Grotto/npcs/Treasure_Casket.lua index 6085edab106..fb88de45f12 100644 --- a/scripts/zones/Sea_Serpent_Grotto/npcs/Treasure_Casket.lua +++ b/scripts/zones/Sea_Serpent_Grotto/npcs/Treasure_Casket.lua @@ -13,9 +13,6 @@ entity.onTrade = function(player, npc, trade) xi.caskets.onTrade(player, npc, trade) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.caskets.onEventFinish(player, csid, option, npc) end diff --git a/scripts/zones/Sea_Serpent_Grotto/npcs/Treasure_Chest.lua b/scripts/zones/Sea_Serpent_Grotto/npcs/Treasure_Chest.lua index 3b5200b7bee..b177d0f12ad 100644 --- a/scripts/zones/Sea_Serpent_Grotto/npcs/Treasure_Chest.lua +++ b/scripts/zones/Sea_Serpent_Grotto/npcs/Treasure_Chest.lua @@ -14,10 +14,4 @@ entity.onTrigger = function(player, npc) xi.treasure.onTrigger(player, xi.treasure.type.CHEST) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Sea_Serpent_Grotto/npcs/Treasure_Coffer.lua b/scripts/zones/Sea_Serpent_Grotto/npcs/Treasure_Coffer.lua index a28cf62994b..f0db1325ba7 100644 --- a/scripts/zones/Sea_Serpent_Grotto/npcs/Treasure_Coffer.lua +++ b/scripts/zones/Sea_Serpent_Grotto/npcs/Treasure_Coffer.lua @@ -14,10 +14,4 @@ entity.onTrigger = function(player, npc) xi.treasure.onTrigger(player, xi.treasure.type.COFFER) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Sea_Serpent_Grotto/npcs/_4w3.lua b/scripts/zones/Sea_Serpent_Grotto/npcs/_4w3.lua index 0958208d6b4..f8d648a4a33 100644 --- a/scripts/zones/Sea_Serpent_Grotto/npcs/_4w3.lua +++ b/scripts/zones/Sea_Serpent_Grotto/npcs/_4w3.lua @@ -50,10 +50,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Sea_Serpent_Grotto/npcs/_4w4.lua b/scripts/zones/Sea_Serpent_Grotto/npcs/_4w4.lua index 815c5672209..274ff0b91d4 100644 --- a/scripts/zones/Sea_Serpent_Grotto/npcs/_4w4.lua +++ b/scripts/zones/Sea_Serpent_Grotto/npcs/_4w4.lua @@ -50,10 +50,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Sea_Serpent_Grotto/npcs/_4w5.lua b/scripts/zones/Sea_Serpent_Grotto/npcs/_4w5.lua index 567cf8fb39e..3e33dedd412 100644 --- a/scripts/zones/Sea_Serpent_Grotto/npcs/_4w5.lua +++ b/scripts/zones/Sea_Serpent_Grotto/npcs/_4w5.lua @@ -50,10 +50,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Sea_Serpent_Grotto/npcs/_4wa.lua b/scripts/zones/Sea_Serpent_Grotto/npcs/_4wa.lua index 7f28a28477e..b504d1b7ad8 100644 --- a/scripts/zones/Sea_Serpent_Grotto/npcs/_4wa.lua +++ b/scripts/zones/Sea_Serpent_Grotto/npcs/_4wa.lua @@ -27,10 +27,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Sea_Serpent_Grotto/npcs/qm3.lua b/scripts/zones/Sea_Serpent_Grotto/npcs/qm3.lua index 57e4c14b287..19653cc1352 100644 --- a/scripts/zones/Sea_Serpent_Grotto/npcs/qm3.lua +++ b/scripts/zones/Sea_Serpent_Grotto/npcs/qm3.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.SEA_SERPENT_GROTTO] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getQuestStatus(xi.questLog.OUTLANDS, xi.quest.id.outlands.ITS_NOT_YOUR_VAULT) == xi.questStatus.QUEST_ACCEPTED and @@ -21,10 +18,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Sea_Serpent_Grotto/npcs/relic.lua b/scripts/zones/Sea_Serpent_Grotto/npcs/relic.lua index 4c882b49f24..2706694e292 100644 --- a/scripts/zones/Sea_Serpent_Grotto/npcs/relic.lua +++ b/scripts/zones/Sea_Serpent_Grotto/npcs/relic.lua @@ -22,9 +22,6 @@ entity.onTrigger = function(player, npc) player:messageSpecial(ID.text.NOTHING_OUT_OF_ORDINARY) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 11 and diff --git a/scripts/zones/Sealions_Den/DefaultActions.lua b/scripts/zones/Sealions_Den/DefaultActions.lua index 71df9d819e0..986c62ae1c1 100644 --- a/scripts/zones/Sealions_Den/DefaultActions.lua +++ b/scripts/zones/Sealions_Den/DefaultActions.lua @@ -1,6 +1,7 @@ local ID = zones[xi.zone.SEALIONS_DEN] return { - ['_0w0'] = { messageSpecial = ID.text.IRON_GATE_LOCKED }, - ['Sueleen'] = { event = 20 }, + ['_0w0'] = { messageSpecial = ID.text.IRON_GATE_LOCKED }, + ['Jovial_Rat'] = { event = 4 }, + ['Sueleen'] = { event = 20 }, } diff --git a/scripts/zones/Sealions_Den/npcs/Jovial_Rat.lua b/scripts/zones/Sealions_Den/npcs/Jovial_Rat.lua deleted file mode 100644 index 4ce7fb6374b..00000000000 --- a/scripts/zones/Sealions_Den/npcs/Jovial_Rat.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Sealion's Den --- NPC: Jovial Rat --- Type: Past Event Watcher ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(4) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Selbina/DefaultActions.lua b/scripts/zones/Selbina/DefaultActions.lua index 2dbe1697f44..d57a39aa8f3 100644 --- a/scripts/zones/Selbina/DefaultActions.lua +++ b/scripts/zones/Selbina/DefaultActions.lua @@ -2,14 +2,28 @@ local ID = zones[xi.zone.SELBINA] return { ['Abelard'] = { text = ID.text.ABELARD_DIALOG }, + ['Battal'] = { event = 1102 }, ['Elfriede'] = { event = 25 }, ['Devean'] = { event = 124 }, + ['Diederik'] = { event = 1111 }, + ['Flandiace'] = { event = 12 }, + ['Gabwaleid'] = { event = 600 }, ['Jimaida'] = { event = 152 }, + ['Manfried'] = { event = 15 }, + ['Meldivon'] = { event = 720 }, + ['Moreche'] = { event = 740 }, ['Naillina'] = { event = 14 }, + ['Oleg'] = { event = 151 }, + ['Orithyia'] = { event = 730 }, ['Oswald'] = { event = 30 }, ['Pacomart'] = { event = 180 }, + ['Pascaut'] = { event = 26 }, + ['Pomulus'] = { event = 700 }, + ['Ramona'] = { event = 170 }, ['Thunder_Hawk'] = { event = 84 }, ['Valgeir'] = { event = 140 }, + ['Velema'] = { event = 10 }, + ['Vobo'] = { event = 710 }, ['Yaya'] = { event = 153 }, ['Zaldon'] = { event = 150 }, } diff --git a/scripts/zones/Selbina/npcs/Abelard.lua b/scripts/zones/Selbina/npcs/Abelard.lua index 588b82db46f..307dd58a2f1 100644 --- a/scripts/zones/Selbina/npcs/Abelard.lua +++ b/scripts/zones/Selbina/npcs/Abelard.lua @@ -99,9 +99,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) -- AN EXPLORER'S FOOTSTEPS if diff --git a/scripts/zones/Selbina/npcs/Aleria.lua b/scripts/zones/Selbina/npcs/Aleria.lua index d7c9a3ecff9..cf5e5869821 100644 --- a/scripts/zones/Selbina/npcs/Aleria.lua +++ b/scripts/zones/Selbina/npcs/Aleria.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getZPos() < -28.750 then player:startEvent(223) @@ -16,10 +13,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Selbina/npcs/Battal.lua b/scripts/zones/Selbina/npcs/Battal.lua deleted file mode 100644 index 556dd049a7f..00000000000 --- a/scripts/zones/Selbina/npcs/Battal.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Selbina --- NPC: Battal --- Type: Event Scene Replayer --- !pos -17.429 -11.604 25.966 248 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(1102) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Selbina/npcs/Boris.lua b/scripts/zones/Selbina/npcs/Boris.lua index 2fc56985a81..3a9ae48c25f 100644 --- a/scripts/zones/Selbina/npcs/Boris.lua +++ b/scripts/zones/Selbina/npcs/Boris.lua @@ -9,18 +9,9 @@ local ID = zones[xi.zone.SELBINA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:showText(npc, ID.text.BORIS_DELIVERY_DIALOG) player:openSendBox() end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Selbina/npcs/Bretta.lua b/scripts/zones/Selbina/npcs/Bretta.lua index 625b4030f10..2752ffd8890 100644 --- a/scripts/zones/Selbina/npcs/Bretta.lua +++ b/scripts/zones/Selbina/npcs/Bretta.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getZPos() > -28.750 then player:startEvent(1133, 1152 - ((os.time() - 1009810584) % 1152)) @@ -17,10 +14,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Selbina/npcs/Catus.lua b/scripts/zones/Selbina/npcs/Catus.lua index 83a9413a88e..a898ca7ddd5 100644 --- a/scripts/zones/Selbina/npcs/Catus.lua +++ b/scripts/zones/Selbina/npcs/Catus.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getZPos() < -28.750 then player:startEvent(220) @@ -16,10 +13,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Selbina/npcs/Chutarmire.lua b/scripts/zones/Selbina/npcs/Chutarmire.lua index ea193391a6a..ec67fd51a90 100644 --- a/scripts/zones/Selbina/npcs/Chutarmire.lua +++ b/scripts/zones/Selbina/npcs/Chutarmire.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.SELBINA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -35,10 +32,4 @@ entity.onTrigger = function(player, npc) xi.shop.general(player, stock) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Selbina/npcs/Diederik.lua b/scripts/zones/Selbina/npcs/Diederik.lua deleted file mode 100644 index b01bcd6e71c..00000000000 --- a/scripts/zones/Selbina/npcs/Diederik.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Selbina --- NPC: Diederik ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(1111) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Selbina/npcs/Dohdjuma.lua b/scripts/zones/Selbina/npcs/Dohdjuma.lua index 2ce62c02e64..0b07b34a049 100644 --- a/scripts/zones/Selbina/npcs/Dohdjuma.lua +++ b/scripts/zones/Selbina/npcs/Dohdjuma.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.SELBINA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -30,10 +27,4 @@ entity.onTrigger = function(player, npc) xi.shop.general(player, stock) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Selbina/npcs/Explorer_Moogle.lua b/scripts/zones/Selbina/npcs/Explorer_Moogle.lua index f516cd75a22..36d3c38f189 100644 --- a/scripts/zones/Selbina/npcs/Explorer_Moogle.lua +++ b/scripts/zones/Selbina/npcs/Explorer_Moogle.lua @@ -7,16 +7,10 @@ local entity = {} local eventId = 1135 -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.teleport.explorerMoogleOnTrigger(player, eventId) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.teleport.explorerMoogleOnEventFinish(player, csid, option, eventId) end diff --git a/scripts/zones/Selbina/npcs/Falgima.lua b/scripts/zones/Selbina/npcs/Falgima.lua index bfb585f5cc6..bbeac6a598c 100644 --- a/scripts/zones/Selbina/npcs/Falgima.lua +++ b/scripts/zones/Selbina/npcs/Falgima.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.SELBINA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -23,10 +20,4 @@ entity.onTrigger = function(player, npc) xi.shop.general(player, stock) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Selbina/npcs/Flandiace.lua b/scripts/zones/Selbina/npcs/Flandiace.lua deleted file mode 100644 index b464feb03f0..00000000000 --- a/scripts/zones/Selbina/npcs/Flandiace.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Selbina --- NPC: Flandiace --- Type: Adventurer's Assistant --- !pos 21.313 -15.558 84.298 248 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(12) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Selbina/npcs/Gabwaleid.lua b/scripts/zones/Selbina/npcs/Gabwaleid.lua deleted file mode 100644 index 35f92744b1c..00000000000 --- a/scripts/zones/Selbina/npcs/Gabwaleid.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Selbina --- NPC: Gabwaleid --- Involved in Quest: Riding on the Clouds --- !pos -17 -7 11 248 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(600) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Selbina/npcs/Gibol.lua b/scripts/zones/Selbina/npcs/Gibol.lua index fd1062e7277..1c1d5902f29 100644 --- a/scripts/zones/Selbina/npcs/Gibol.lua +++ b/scripts/zones/Selbina/npcs/Gibol.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.SELBINA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local guildSkillId = xi.skill.CLOTHCRAFT local stock = xi.shop.generalGuildStock[guildSkillId] @@ -19,10 +16,4 @@ entity.onTrigger = function(player, npc) player:showText(npc, ID.text.CLOTHCRAFT_SHOP_DIALOG) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Selbina/npcs/Graegham.lua b/scripts/zones/Selbina/npcs/Graegham.lua index 5ae6dddb5bd..cf57897a689 100644 --- a/scripts/zones/Selbina/npcs/Graegham.lua +++ b/scripts/zones/Selbina/npcs/Graegham.lua @@ -9,19 +9,10 @@ local ID = zones[xi.zone.SELBINA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:sendGuild(5182, 3, 18, 5) then player:showText(npc, ID.text.FISHING_SHOP_DIALOG) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Selbina/npcs/Herminia.lua b/scripts/zones/Selbina/npcs/Herminia.lua index 67b9124b029..cdaf718cdbb 100644 --- a/scripts/zones/Selbina/npcs/Herminia.lua +++ b/scripts/zones/Selbina/npcs/Herminia.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.SELBINA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -27,10 +24,4 @@ entity.onTrigger = function(player, npc) xi.shop.general(player, stock) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Selbina/npcs/Humilitie.lua b/scripts/zones/Selbina/npcs/Humilitie.lua index ba59b97945d..c304b636260 100644 --- a/scripts/zones/Selbina/npcs/Humilitie.lua +++ b/scripts/zones/Selbina/npcs/Humilitie.lua @@ -29,17 +29,8 @@ entity.onTimeTrigger = function(npc, triggerID) xi.transport.dockMessage(npc, triggerID, messages, 'selbina') end -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.transport.onDockTimekeeperTrigger(player, xi.transport.routes.SELBINA_MHAURA, 231) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Selbina/npcs/Isacio.lua b/scripts/zones/Selbina/npcs/Isacio.lua index 7380198a0df..23709f5df2e 100644 --- a/scripts/zones/Selbina/npcs/Isacio.lua +++ b/scripts/zones/Selbina/npcs/Isacio.lua @@ -62,9 +62,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 111 and option == 40 then player:addQuest(xi.questLog.OTHER_AREAS, xi.quest.id.otherAreas.ELDER_MEMORIES) diff --git a/scripts/zones/Selbina/npcs/Lombaria.lua b/scripts/zones/Selbina/npcs/Lombaria.lua index c1a9508b86a..38bfc0ebc1b 100644 --- a/scripts/zones/Selbina/npcs/Lombaria.lua +++ b/scripts/zones/Selbina/npcs/Lombaria.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.maps.onTrigger(player, npc) end @@ -17,7 +14,4 @@ entity.onEventUpdate = function(player, csid, option, npc) xi.maps.onEventUpdate(player, csid, option, npc) end -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Selbina/npcs/Lucia.lua b/scripts/zones/Selbina/npcs/Lucia.lua index 1027b4dffef..e02f37ebe92 100644 --- a/scripts/zones/Selbina/npcs/Lucia.lua +++ b/scripts/zones/Selbina/npcs/Lucia.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getZPos() > -28.750 then player:startEvent(221, player:getGil(), 100) @@ -17,9 +14,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 221 and player:getZPos() < -28.750 then player:delGil(100) diff --git a/scripts/zones/Selbina/npcs/Manfried.lua b/scripts/zones/Selbina/npcs/Manfried.lua deleted file mode 100644 index e0352ba7f5c..00000000000 --- a/scripts/zones/Selbina/npcs/Manfried.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Selbina --- NPC: Manfried ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(15) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Selbina/npcs/Mathilde.lua b/scripts/zones/Selbina/npcs/Mathilde.lua index c31d163af58..7762aaa8486 100644 --- a/scripts/zones/Selbina/npcs/Mathilde.lua +++ b/scripts/zones/Selbina/npcs/Mathilde.lua @@ -7,20 +7,12 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) -- Note: Event 173 is shown once on the first time when talking to Mathilde. Followup event -- that repeats is event 174. + -- TODO: Implement this as a unique event -- Former implementation defaulted to event 171, which was not observed. end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Selbina/npcs/Meldivon.lua b/scripts/zones/Selbina/npcs/Meldivon.lua deleted file mode 100644 index 95c35eaed83..00000000000 --- a/scripts/zones/Selbina/npcs/Meldivon.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Selbina --- NPC: Meldivon ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(720) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Selbina/npcs/Melyon.lua b/scripts/zones/Selbina/npcs/Melyon.lua index b78e0d2c8c4..895371c241a 100644 --- a/scripts/zones/Selbina/npcs/Melyon.lua +++ b/scripts/zones/Selbina/npcs/Melyon.lua @@ -28,9 +28,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 60 and option == 10 then player:addQuest(xi.questLog.OTHER_AREAS, xi.quest.id.otherAreas.ONLY_THE_BEST) diff --git a/scripts/zones/Selbina/npcs/Mendoline.lua b/scripts/zones/Selbina/npcs/Mendoline.lua index 136a15671bb..e3c460175d7 100644 --- a/scripts/zones/Selbina/npcs/Mendoline.lua +++ b/scripts/zones/Selbina/npcs/Mendoline.lua @@ -9,19 +9,10 @@ local ID = zones[xi.zone.SELBINA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:sendGuild(5182, 3, 18, 5) then player:showText(npc, ID.text.FISHING_SHOP_DIALOG) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Selbina/npcs/Moreche.lua b/scripts/zones/Selbina/npcs/Moreche.lua deleted file mode 100644 index 083d29d5e6b..00000000000 --- a/scripts/zones/Selbina/npcs/Moreche.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Selbina --- NPC: Moreche ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(740) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Selbina/npcs/Nomad_Moogle.lua b/scripts/zones/Selbina/npcs/Nomad_Moogle.lua index c15f1a9afdd..59542fd012c 100644 --- a/scripts/zones/Selbina/npcs/Nomad_Moogle.lua +++ b/scripts/zones/Selbina/npcs/Nomad_Moogle.lua @@ -7,18 +7,9 @@ local ID = zones[xi.zone.SELBINA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:showText(npc, ID.text.NOMAD_MOOGLE_DIALOG) player:sendMenu(1) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Selbina/npcs/Oleg.lua b/scripts/zones/Selbina/npcs/Oleg.lua deleted file mode 100644 index 19a7c7151ee..00000000000 --- a/scripts/zones/Selbina/npcs/Oleg.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Selbina --- NPC: Oleg ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(151) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Selbina/npcs/Orithyia.lua b/scripts/zones/Selbina/npcs/Orithyia.lua deleted file mode 100644 index 75e3244b847..00000000000 --- a/scripts/zones/Selbina/npcs/Orithyia.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Selbina --- NPC: Orithyia ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(730) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Selbina/npcs/Pacomart.lua b/scripts/zones/Selbina/npcs/Pacomart.lua index 11f573d0743..66756e7a161 100644 --- a/scripts/zones/Selbina/npcs/Pacomart.lua +++ b/scripts/zones/Selbina/npcs/Pacomart.lua @@ -6,18 +6,12 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getCurrentMission(xi.mission.log_id.ROV) >= xi.mission.id.rov.FLAMES_OF_PRAYER then player:startEvent(179) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 179 and option == 1 then player:setPos(0, 0, 0, 0, 252) diff --git a/scripts/zones/Selbina/npcs/Pascaut.lua b/scripts/zones/Selbina/npcs/Pascaut.lua deleted file mode 100644 index a80a0dc3071..00000000000 --- a/scripts/zones/Selbina/npcs/Pascaut.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Selbina --- NPC: Pascaut ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(26) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Selbina/npcs/Pomulus.lua b/scripts/zones/Selbina/npcs/Pomulus.lua deleted file mode 100644 index fab739fe730..00000000000 --- a/scripts/zones/Selbina/npcs/Pomulus.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Selbina --- NPC: Pomulus ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(700) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Selbina/npcs/Quelpia.lua b/scripts/zones/Selbina/npcs/Quelpia.lua index e9b4a16a8ba..fc3d63288f0 100644 --- a/scripts/zones/Selbina/npcs/Quelpia.lua +++ b/scripts/zones/Selbina/npcs/Quelpia.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.SELBINA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -35,10 +32,4 @@ entity.onTrigger = function(player, npc) xi.shop.general(player, stock) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Selbina/npcs/Raging_Tiger.lua b/scripts/zones/Selbina/npcs/Raging_Tiger.lua index 2685a5de0be..ba36c579ad1 100644 --- a/scripts/zones/Selbina/npcs/Raging_Tiger.lua +++ b/scripts/zones/Selbina/npcs/Raging_Tiger.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getZPos() > -28.750 then player:startEvent(214) @@ -16,10 +13,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Selbina/npcs/Ramona.lua b/scripts/zones/Selbina/npcs/Ramona.lua deleted file mode 100644 index 6bafd9be468..00000000000 --- a/scripts/zones/Selbina/npcs/Ramona.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Selbina --- NPC: Ramona --- !pos 12.511 -7.287 2.939 248 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(170) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Selbina/npcs/Romeo.lua b/scripts/zones/Selbina/npcs/Romeo.lua index 1577a742f5c..e99b408c15f 100644 --- a/scripts/zones/Selbina/npcs/Romeo.lua +++ b/scripts/zones/Selbina/npcs/Romeo.lua @@ -34,9 +34,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 20 then player:addQuest(xi.questLog.OTHER_AREAS, xi.quest.id.otherAreas.DONATE_TO_RECYCLING) diff --git a/scripts/zones/Selbina/npcs/Sleeping_Lizard.lua b/scripts/zones/Selbina/npcs/Sleeping_Lizard.lua index 0b6207e729b..31f304c2fcb 100644 --- a/scripts/zones/Selbina/npcs/Sleeping_Lizard.lua +++ b/scripts/zones/Selbina/npcs/Sleeping_Lizard.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getZPos() < -28.750 then player:startEvent(213) @@ -16,10 +13,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Selbina/npcs/Tilala.lua b/scripts/zones/Selbina/npcs/Tilala.lua index 48d9d686a27..10ff2f87b0a 100644 --- a/scripts/zones/Selbina/npcs/Tilala.lua +++ b/scripts/zones/Selbina/npcs/Tilala.lua @@ -9,19 +9,10 @@ local ID = zones[xi.zone.SELBINA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:sendGuild(516, 6, 21, 0) then player:showText(npc, ID.text.CLOTHCRAFT_SHOP_DIALOG) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Selbina/npcs/Torapiont.lua b/scripts/zones/Selbina/npcs/Torapiont.lua index 12e63ccdfde..bc30ec476e7 100644 --- a/scripts/zones/Selbina/npcs/Torapiont.lua +++ b/scripts/zones/Selbina/npcs/Torapiont.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.SELBINA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -32,10 +29,4 @@ entity.onTrigger = function(player, npc) xi.shop.general(player, stock) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Selbina/npcs/Valgeir.lua b/scripts/zones/Selbina/npcs/Valgeir.lua deleted file mode 100644 index b86df171f59..00000000000 --- a/scripts/zones/Selbina/npcs/Valgeir.lua +++ /dev/null @@ -1,26 +0,0 @@ ------------------------------------ --- Area: Selbina --- NPC: Valgeir ------------------------------------ --- Used in: scripts/quests/otherAreas/His_Name_is_Valgeir.lua --- Used in: scripts/quests/otherAreas/Expertise.lua --- Used in: scripts/quests/otherAreas/The_Basics.lua ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - -- STANDARD DIALOG - -- player:startEvent(140) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Selbina/npcs/Velema.lua b/scripts/zones/Selbina/npcs/Velema.lua deleted file mode 100644 index 1b65712d6bf..00000000000 --- a/scripts/zones/Selbina/npcs/Velema.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Selbina --- NPC: Velema --- !pos 28.164 -3.947 -12.788 248 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(10) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Selbina/npcs/Vobo.lua b/scripts/zones/Selbina/npcs/Vobo.lua deleted file mode 100644 index df822b5520e..00000000000 --- a/scripts/zones/Selbina/npcs/Vobo.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Selbina --- NPC: Vobo --- Involved in Quest: Riding on the Clouds --- !pos 37 -14 81 248 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(710) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Selbina/npcs/Vuntar.lua b/scripts/zones/Selbina/npcs/Vuntar.lua index a4d221694a8..7c8963b9a07 100644 --- a/scripts/zones/Selbina/npcs/Vuntar.lua +++ b/scripts/zones/Selbina/npcs/Vuntar.lua @@ -36,9 +36,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 50 then player:addQuest(xi.questLog.OTHER_AREAS, xi.quest.id.otherAreas.CARGO) diff --git a/scripts/zones/Selbina/npcs/Wachiwi.lua b/scripts/zones/Selbina/npcs/Wachiwi.lua index 3f6476d6478..68daf978b21 100644 --- a/scripts/zones/Selbina/npcs/Wachiwi.lua +++ b/scripts/zones/Selbina/npcs/Wachiwi.lua @@ -6,17 +6,8 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(502, 0, 0, 0, 0, 0, 0, 0, VanadielTime()) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Selbina/npcs/Wenzel.lua b/scripts/zones/Selbina/npcs/Wenzel.lua index 0f4eec616a6..6b621dfe1b6 100644 --- a/scripts/zones/Selbina/npcs/Wenzel.lua +++ b/scripts/zones/Selbina/npcs/Wenzel.lua @@ -9,18 +9,9 @@ local ID = zones[xi.zone.SELBINA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:showText(npc, ID.text.WENZEL_DELIVERY_DIALOG) player:openSendBox() end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Selbina/npcs/Yulon-Polon.lua b/scripts/zones/Selbina/npcs/Yulon-Polon.lua index 6eef205ec8c..c80cf41db86 100644 --- a/scripts/zones/Selbina/npcs/Yulon-Polon.lua +++ b/scripts/zones/Selbina/npcs/Yulon-Polon.lua @@ -116,16 +116,10 @@ local titleInfo = }, } -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.titleChanger.onTrigger(player, eventId, titleInfo) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.titleChanger.onEventFinish(player, csid, option, eventId, titleInfo) end diff --git a/scripts/zones/Selbina/npcs/Zaldon.lua b/scripts/zones/Selbina/npcs/Zaldon.lua index 51b28644b91..68d9f2ca11a 100644 --- a/scripts/zones/Selbina/npcs/Zaldon.lua +++ b/scripts/zones/Selbina/npcs/Zaldon.lua @@ -18,12 +18,6 @@ entity.onTrade = function(player, npc, trade) end end -entity.onTrigger = function(player, npc) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) -- A BOY'S DREAM if csid == 85 then diff --git a/scripts/zones/Ship_bound_for_Mhaura/DefaultActions.lua b/scripts/zones/Ship_bound_for_Mhaura/DefaultActions.lua new file mode 100644 index 00000000000..ad6ad646fdb --- /dev/null +++ b/scripts/zones/Ship_bound_for_Mhaura/DefaultActions.lua @@ -0,0 +1,5 @@ +-- local ID = zones[xi.zone.SHIP_BOUND_FOR_MHAURA] + +return { + ['Map'] = { event = 1024 }, +} diff --git a/scripts/zones/Ship_bound_for_Mhaura/npcs/Chhaya.lua b/scripts/zones/Ship_bound_for_Mhaura/npcs/Chhaya.lua index d6c8f737d1c..926ebc53ef6 100644 --- a/scripts/zones/Ship_bound_for_Mhaura/npcs/Chhaya.lua +++ b/scripts/zones/Ship_bound_for_Mhaura/npcs/Chhaya.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.SHIP_BOUND_FOR_MHAURA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -25,10 +22,4 @@ entity.onTrigger = function(player, npc) xi.shop.general(player, stock) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Ship_bound_for_Mhaura/npcs/Lokhong.lua b/scripts/zones/Ship_bound_for_Mhaura/npcs/Lokhong.lua index ca08d33c038..5eaec49037a 100644 --- a/scripts/zones/Ship_bound_for_Mhaura/npcs/Lokhong.lua +++ b/scripts/zones/Ship_bound_for_Mhaura/npcs/Lokhong.lua @@ -9,19 +9,10 @@ local ID = zones[xi.zone.SHIP_BOUND_FOR_MHAURA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:sendGuild(521, 1, 23, 5) then player:showText(npc, ID.text.LOKHONG_SHOP_DIALOG) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Ship_bound_for_Mhaura/npcs/Map.lua b/scripts/zones/Ship_bound_for_Mhaura/npcs/Map.lua deleted file mode 100644 index 4e932435e7e..00000000000 --- a/scripts/zones/Ship_bound_for_Mhaura/npcs/Map.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Ship_bound_for_Mhaura --- NPC: Map --- !pos 0.278 -14.707 -1.411 221 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(1024) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Ship_bound_for_Mhaura/npcs/Sahn.lua b/scripts/zones/Ship_bound_for_Mhaura/npcs/Sahn.lua index 1477557c56a..72859b95d00 100644 --- a/scripts/zones/Ship_bound_for_Mhaura/npcs/Sahn.lua +++ b/scripts/zones/Ship_bound_for_Mhaura/npcs/Sahn.lua @@ -9,17 +9,8 @@ local ID = zones[xi.zone.SHIP_BOUND_FOR_MHAURA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.transport.onBoatTimekeeperTrigger(player, xi.transport.routes.SELBINA_MHAURA, ID.text.ON_WAY_TO_MHAURA, ID.text.ARRIVING_SOON_MHAURA) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Ship_bound_for_Mhaura_Pirates/DefaultActions.lua b/scripts/zones/Ship_bound_for_Mhaura_Pirates/DefaultActions.lua new file mode 100644 index 00000000000..c8a9b255199 --- /dev/null +++ b/scripts/zones/Ship_bound_for_Mhaura_Pirates/DefaultActions.lua @@ -0,0 +1,5 @@ +-- local ID = zones[xi.zone.SHIP_BOUND_FOR_MHAURA_PIRATES] + +return { + ['Map'] = { event = 1024 }, +} diff --git a/scripts/zones/Ship_bound_for_Mhaura_Pirates/npcs/Chhaya.lua b/scripts/zones/Ship_bound_for_Mhaura_Pirates/npcs/Chhaya.lua index c905f7a3f34..12da0b99e73 100644 --- a/scripts/zones/Ship_bound_for_Mhaura_Pirates/npcs/Chhaya.lua +++ b/scripts/zones/Ship_bound_for_Mhaura_Pirates/npcs/Chhaya.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.SHIP_BOUND_FOR_MHAURA_PIRATES] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -25,10 +22,4 @@ entity.onTrigger = function(player, npc) xi.shop.general(player, stock) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Ship_bound_for_Mhaura_Pirates/npcs/Lokhong.lua b/scripts/zones/Ship_bound_for_Mhaura_Pirates/npcs/Lokhong.lua index eb469f849c7..2d2d09fbd70 100644 --- a/scripts/zones/Ship_bound_for_Mhaura_Pirates/npcs/Lokhong.lua +++ b/scripts/zones/Ship_bound_for_Mhaura_Pirates/npcs/Lokhong.lua @@ -9,19 +9,10 @@ local ID = zones[xi.zone.SHIP_BOUND_FOR_MHAURA_PIRATES] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:sendGuild(521, 1, 23, 5) then player:showText(npc, ID.text.LOKHONG_SHOP_DIALOG) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Ship_bound_for_Mhaura_Pirates/npcs/Map.lua b/scripts/zones/Ship_bound_for_Mhaura_Pirates/npcs/Map.lua deleted file mode 100644 index 7f44fc4a2ae..00000000000 --- a/scripts/zones/Ship_bound_for_Mhaura_Pirates/npcs/Map.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Ship bound for Mhaura Pirates --- NPC: Map --- !pos 0.28 -14.0 -1.411 221 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(1024) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Ship_bound_for_Mhaura_Pirates/npcs/Sahn.lua b/scripts/zones/Ship_bound_for_Mhaura_Pirates/npcs/Sahn.lua index aebf8d9df02..4a99d0b59da 100644 --- a/scripts/zones/Ship_bound_for_Mhaura_Pirates/npcs/Sahn.lua +++ b/scripts/zones/Ship_bound_for_Mhaura_Pirates/npcs/Sahn.lua @@ -9,17 +9,8 @@ local ID = zones[xi.zone.SHIP_BOUND_FOR_MHAURA_PIRATES] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.transport.onBoatTimekeeperTrigger(player, xi.transport.routes.SELBINA_MHAURA, ID.text.ON_WAY_TO_MHAURA, ID.text.ARRIVING_SOON_MHAURA) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Ship_bound_for_Selbina/DefaultActions.lua b/scripts/zones/Ship_bound_for_Selbina/DefaultActions.lua new file mode 100644 index 00000000000..dc11926f7be --- /dev/null +++ b/scripts/zones/Ship_bound_for_Selbina/DefaultActions.lua @@ -0,0 +1,5 @@ +-- local ID = zones[xi.zone.SHIP_BOUND_FOR_SELBINA] + +return { + ['Map'] = { event = 1024 }, +} diff --git a/scripts/zones/Ship_bound_for_Selbina/npcs/Bhagirath.lua b/scripts/zones/Ship_bound_for_Selbina/npcs/Bhagirath.lua index ecdd83e79f7..b8b95ac6f7e 100644 --- a/scripts/zones/Ship_bound_for_Selbina/npcs/Bhagirath.lua +++ b/scripts/zones/Ship_bound_for_Selbina/npcs/Bhagirath.lua @@ -9,17 +9,8 @@ local ID = zones[xi.zone.SHIP_BOUND_FOR_SELBINA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.transport.onBoatTimekeeperTrigger(player, xi.transport.routes.SELBINA_MHAURA, ID.text.ON_WAY_TO_SELBINA, ID.text.ARRIVING_SOON_SELBINA) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Ship_bound_for_Selbina/npcs/Maera.lua b/scripts/zones/Ship_bound_for_Selbina/npcs/Maera.lua index 245730a7eef..105ef07eeda 100644 --- a/scripts/zones/Ship_bound_for_Selbina/npcs/Maera.lua +++ b/scripts/zones/Ship_bound_for_Selbina/npcs/Maera.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.SHIP_BOUND_FOR_SELBINA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -25,10 +22,4 @@ entity.onTrigger = function(player, npc) xi.shop.general(player, stock) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Ship_bound_for_Selbina/npcs/Map.lua b/scripts/zones/Ship_bound_for_Selbina/npcs/Map.lua deleted file mode 100644 index 2b321c2f0fa..00000000000 --- a/scripts/zones/Ship_bound_for_Selbina/npcs/Map.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Ship_bound_for_Selbina --- NPC: Map --- !pos 0.278 -14.707 -1.411 220 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(1024) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Ship_bound_for_Selbina/npcs/Rajmonda.lua b/scripts/zones/Ship_bound_for_Selbina/npcs/Rajmonda.lua index c1bef311009..0e9069c7e94 100644 --- a/scripts/zones/Ship_bound_for_Selbina/npcs/Rajmonda.lua +++ b/scripts/zones/Ship_bound_for_Selbina/npcs/Rajmonda.lua @@ -9,19 +9,10 @@ local ID = zones[xi.zone.SHIP_BOUND_FOR_SELBINA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:sendGuild(520, 1, 23, 5) then player:showText(npc, ID.text.RAJMONDA_SHOP_DIALOG) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Ship_bound_for_Selbina_Pirates/DefaultActions.lua b/scripts/zones/Ship_bound_for_Selbina_Pirates/DefaultActions.lua new file mode 100644 index 00000000000..f4e30753139 --- /dev/null +++ b/scripts/zones/Ship_bound_for_Selbina_Pirates/DefaultActions.lua @@ -0,0 +1,5 @@ +-- local ID = zones[xi.zone.SHIP_BOUND_FOR_SELBINA_PIRATES] + +return { + ['Map'] = { event = 1024 }, +} diff --git a/scripts/zones/Ship_bound_for_Selbina_Pirates/npcs/Bhagirath.lua b/scripts/zones/Ship_bound_for_Selbina_Pirates/npcs/Bhagirath.lua index 8083d409312..a84b4cc568a 100644 --- a/scripts/zones/Ship_bound_for_Selbina_Pirates/npcs/Bhagirath.lua +++ b/scripts/zones/Ship_bound_for_Selbina_Pirates/npcs/Bhagirath.lua @@ -9,17 +9,8 @@ local ID = zones[xi.zone.SHIP_BOUND_FOR_SELBINA_PIRATES] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.transport.onBoatTimekeeperTrigger(player, xi.transport.routes.SELBINA_MHAURA, ID.text.ON_WAY_TO_SELBINA, ID.text.ARRIVING_SOON_SELBINA) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Ship_bound_for_Selbina_Pirates/npcs/Maera.lua b/scripts/zones/Ship_bound_for_Selbina_Pirates/npcs/Maera.lua index cca7bd05dc9..f7ee1c7f1f3 100644 --- a/scripts/zones/Ship_bound_for_Selbina_Pirates/npcs/Maera.lua +++ b/scripts/zones/Ship_bound_for_Selbina_Pirates/npcs/Maera.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.SHIP_BOUND_FOR_SELBINA_PIRATES] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -25,10 +22,4 @@ entity.onTrigger = function(player, npc) xi.shop.general(player, stock) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Ship_bound_for_Selbina_Pirates/npcs/Map.lua b/scripts/zones/Ship_bound_for_Selbina_Pirates/npcs/Map.lua deleted file mode 100644 index 2b321c2f0fa..00000000000 --- a/scripts/zones/Ship_bound_for_Selbina_Pirates/npcs/Map.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Ship_bound_for_Selbina --- NPC: Map --- !pos 0.278 -14.707 -1.411 220 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(1024) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Ship_bound_for_Selbina_Pirates/npcs/Rajmonda.lua b/scripts/zones/Ship_bound_for_Selbina_Pirates/npcs/Rajmonda.lua index e044466bbe6..3300f02267c 100644 --- a/scripts/zones/Ship_bound_for_Selbina_Pirates/npcs/Rajmonda.lua +++ b/scripts/zones/Ship_bound_for_Selbina_Pirates/npcs/Rajmonda.lua @@ -8,19 +8,10 @@ local ID = zones[xi.zone.SHIP_BOUND_FOR_SELBINA_PIRATES] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:sendGuild(520, 1, 23, 5) then player:showText(npc, ID.text.RAJMONDA_SHOP_DIALOG) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Silver_Sea_route_to_Al_Zahbi/DefaultActions.lua b/scripts/zones/Silver_Sea_route_to_Al_Zahbi/DefaultActions.lua new file mode 100644 index 00000000000..af18b3b7691 --- /dev/null +++ b/scripts/zones/Silver_Sea_route_to_Al_Zahbi/DefaultActions.lua @@ -0,0 +1,5 @@ +-- local ID = zones[xi.zone.SILVER_SEA_ROUTE_TO_AL_ZAHBI] + +return { + ['Map'] = { event = 1024 }, +} diff --git a/scripts/zones/Silver_Sea_route_to_Al_Zahbi/npcs/Map.lua b/scripts/zones/Silver_Sea_route_to_Al_Zahbi/npcs/Map.lua deleted file mode 100644 index 821b12e1925..00000000000 --- a/scripts/zones/Silver_Sea_route_to_Al_Zahbi/npcs/Map.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Silver_Sea_route_to_Al_Zahbi --- NPC: Map --- !pos 0.340 -12.232 -4.120 58 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(1024) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Silver_Sea_route_to_Al_Zahbi/npcs/Shadeeu.lua b/scripts/zones/Silver_Sea_route_to_Al_Zahbi/npcs/Shadeeu.lua index 145b7d4ff2e..af4a3107ce6 100644 --- a/scripts/zones/Silver_Sea_route_to_Al_Zahbi/npcs/Shadeeu.lua +++ b/scripts/zones/Silver_Sea_route_to_Al_Zahbi/npcs/Shadeeu.lua @@ -24,17 +24,8 @@ entity.onTimeTrigger = function(npc, triggerID) xi.transport.captainMessage(npc, triggerID, messages) end -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.transport.onBoatTimekeeperTrigger(player, xi.transport.routes.SILVER_SEA, ID.text.ON_WAY_TO_AL_ZAHBI, ID.text.ARRIVING_SOON_AL_ZAHBI) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Silver_Sea_route_to_Al_Zahbi/npcs/Yahliq.lua b/scripts/zones/Silver_Sea_route_to_Al_Zahbi/npcs/Yahliq.lua index e627ce4e16f..8017bb9e40a 100644 --- a/scripts/zones/Silver_Sea_route_to_Al_Zahbi/npcs/Yahliq.lua +++ b/scripts/zones/Silver_Sea_route_to_Al_Zahbi/npcs/Yahliq.lua @@ -9,19 +9,10 @@ local ID = zones[xi.zone.SILVER_SEA_ROUTE_TO_AL_ZAHBI] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:sendGuild(525, 1, 23, 5) then player:showText(npc, ID.text.YAHLIQ_SHOP_DIALOG) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Silver_Sea_route_to_Nashmau/DefaultActions.lua b/scripts/zones/Silver_Sea_route_to_Nashmau/DefaultActions.lua new file mode 100644 index 00000000000..3b112b3576c --- /dev/null +++ b/scripts/zones/Silver_Sea_route_to_Nashmau/DefaultActions.lua @@ -0,0 +1,5 @@ +-- local ID = zones[xi.zone.SILVER_SEA_ROUTE_TO_NASHMAU] + +return { + ['Map'] = { event = 1024 }, +} diff --git a/scripts/zones/Silver_Sea_route_to_Nashmau/npcs/Jidwahn.lua b/scripts/zones/Silver_Sea_route_to_Nashmau/npcs/Jidwahn.lua index b07a4fc0408..88f532dc03a 100644 --- a/scripts/zones/Silver_Sea_route_to_Nashmau/npcs/Jidwahn.lua +++ b/scripts/zones/Silver_Sea_route_to_Nashmau/npcs/Jidwahn.lua @@ -9,19 +9,10 @@ local ID = zones[xi.zone.SILVER_SEA_ROUTE_TO_NASHMAU] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:sendGuild(524, 1, 23, 5) then player:showText(npc, ID.text.JIDWAHN_SHOP_DIALOG) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Silver_Sea_route_to_Nashmau/npcs/Map.lua b/scripts/zones/Silver_Sea_route_to_Nashmau/npcs/Map.lua deleted file mode 100644 index 22286467130..00000000000 --- a/scripts/zones/Silver_Sea_route_to_Nashmau/npcs/Map.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Silver_Sea_route_to_Nashmau --- NPC: Map --- !pos 0.340 -12.232 -4.120 58 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(1024) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Silver_Sea_route_to_Nashmau/npcs/Qudamahf.lua b/scripts/zones/Silver_Sea_route_to_Nashmau/npcs/Qudamahf.lua index 7f671633eaf..b7449e7000e 100644 --- a/scripts/zones/Silver_Sea_route_to_Nashmau/npcs/Qudamahf.lua +++ b/scripts/zones/Silver_Sea_route_to_Nashmau/npcs/Qudamahf.lua @@ -24,17 +24,8 @@ entity.onTimeTrigger = function(npc, triggerID) xi.transport.captainMessage(npc, triggerID, messages) end -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.transport.onBoatTimekeeperTrigger(player, xi.transport.routes.SILVER_SEA, ID.text.ON_WAY_TO_NASHMAU, ID.text.ARRIVING_SOON_NASHMAU) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity From fc0a7cbc223847c63e47965e291d049d4e722a3a Mon Sep 17 00:00:00 2001 From: claywar Date: Sun, 19 Jan 2025 16:38:49 -0500 Subject: [PATCH 2/3] Remove empty NPCs, add Default Actions - Reisenjima ~ Ru'Lude --- .../Reisenjima/npcs/Ethereal_Ingress_#1.lua | 3 - .../Reisenjima/npcs/Ethereal_Ingress_#10.lua | 3 - .../Reisenjima/npcs/Ethereal_Ingress_#2.lua | 3 - .../Reisenjima/npcs/Ethereal_Ingress_#3.lua | 3 - .../Reisenjima/npcs/Ethereal_Ingress_#4.lua | 3 - .../Reisenjima/npcs/Ethereal_Ingress_#5.lua | 3 - .../Reisenjima/npcs/Ethereal_Ingress_#6.lua | 3 - .../Reisenjima/npcs/Ethereal_Ingress_#7.lua | 3 - .../Reisenjima/npcs/Ethereal_Ingress_#8.lua | 3 - .../Reisenjima/npcs/Ethereal_Ingress_#9.lua | 3 - .../Reisenjima/npcs/qm_ethereal_droplet.lua | 9 --- .../zones/Riverne-Site_A01/DefaultActions.lua | 1 + .../npcs/Spatial_Displacement.lua | 6 -- .../Riverne-Site_A01/npcs/Stone_Monument.lua | 23 -------- scripts/zones/Riverne-Site_A01/npcs/_0u1.lua | 6 -- scripts/zones/Riverne-Site_A01/npcs/_0u2.lua | 6 -- scripts/zones/Riverne-Site_A01/npcs/_0u3.lua | 6 -- scripts/zones/Riverne-Site_A01/npcs/_0u4.lua | 6 -- .../zones/Riverne-Site_B01/DefaultActions.lua | 2 + .../npcs/Spatial_Displacement.lua | 6 -- .../Riverne-Site_B01/npcs/Stone_Monument.lua | 23 -------- scripts/zones/Riverne-Site_B01/npcs/_0t1.lua | 6 -- scripts/zones/Riverne-Site_B01/npcs/_0t2.lua | 6 -- scripts/zones/Riverne-Site_B01/npcs/_0t3.lua | 6 -- .../npcs/qm_unstable_cluster.lua | 10 ---- scripts/zones/RoMaeve/DefaultActions.lua | 1 + scripts/zones/RoMaeve/npcs/Field_Manual.lua | 3 - .../zones/RoMaeve/npcs/Goblin_Footprint.lua | 3 - .../zones/RoMaeve/npcs/Treasure_Casket.lua | 3 - scripts/zones/RoMaeve/npcs/_3e0.lua | 9 --- scripts/zones/RoMaeve/npcs/_3e1.lua | 9 --- scripts/zones/RoMaeve/npcs/qm3.lua | 9 --- .../Rolanberry_Fields/npcs/Cavernous_Maw.lua | 6 -- .../Rolanberry_Fields/npcs/Field_Manual.lua | 3 - .../npcs/Geomantic_Reservoir.lua | 6 -- .../Rolanberry_Fields/npcs/Legion_Tome.lua | 23 -------- .../zones/Rolanberry_Fields/npcs/Mayuyu.lua | 10 ---- .../zones/Rolanberry_Fields/npcs/Saarlan.lua | 6 -- .../zones/Rolanberry_Fields/npcs/Signpost.lua | 23 -------- .../Rolanberry_Fields/npcs/Stone_Monument.lua | 6 -- .../npcs/Treasure_Casket.lua | 3 - scripts/zones/Rolanberry_Fields/npcs/qm1.lua | 9 --- .../npcs/Cavernous_Maw.lua | 6 -- .../zones/RuAun_Gardens/DefaultActions.lua | 5 ++ .../zones/RuAun_Gardens/npcs/Field_Manual.lua | 3 - .../RuAun_Gardens/npcs/Goblin_Footprint.lua | 21 ------- .../zones/RuAun_Gardens/npcs/Pincerstone.lua | 9 --- .../RuAun_Gardens/npcs/Treasure_Casket.lua | 3 - .../RuAun_Gardens/npcs/Treasure_Coffer.lua | 6 -- scripts/zones/RuAun_Gardens/npcs/_3m0.lua | 9 --- scripts/zones/RuAun_Gardens/npcs/qm1.lua | 6 -- scripts/zones/RuAun_Gardens/npcs/qm2.lua | 6 -- scripts/zones/RuAun_Gardens/npcs/qm3.lua | 6 -- scripts/zones/RuAun_Gardens/npcs/qm4.lua | 6 -- scripts/zones/RuAun_Gardens/npcs/relic.lua | 3 - .../zones/RuLude_Gardens/DefaultActions.lua | 58 ++++++++++++++----- .../zones/RuLude_Gardens/npcs/Ajahkeem.lua | 21 ------- scripts/zones/RuLude_Gardens/npcs/Akta.lua | 21 ------- scripts/zones/RuLude_Gardens/npcs/Anoop.lua | 21 ------- .../zones/RuLude_Gardens/npcs/Archanne.lua | 23 -------- scripts/zones/RuLude_Gardens/npcs/Arenuel.lua | 13 ----- .../RuLude_Gardens/npcs/Assai_Nybaem.lua | 3 - .../RuLude_Gardens/npcs/Auction_Counter.lua | 9 --- .../RuLude_Gardens/npcs/Dabih_Jajalioh.lua | 9 --- .../RuLude_Gardens/npcs/Delivery_Crate.lua | 3 - .../zones/RuLude_Gardens/npcs/Diradour.lua | 21 ------- scripts/zones/RuLude_Gardens/npcs/Dugga.lua | 9 --- .../RuLude_Gardens/npcs/Elevator_Button.lua | 22 ------- .../npcs/Enigmatic_Footprints.lua | 24 -------- .../RuLude_Gardens/npcs/Explorer_Moogle.lua | 3 - scripts/zones/RuLude_Gardens/npcs/Fabien.lua | 3 - scripts/zones/RuLude_Gardens/npcs/Falreze.lua | 21 ------- .../RuLude_Gardens/npcs/Ghye_Dachanthu.lua | 9 --- scripts/zones/RuLude_Gardens/npcs/Goggehn.lua | 9 --- .../zones/RuLude_Gardens/npcs/High_Wind.lua | 21 ------- .../RuLude_Gardens/npcs/Hunt_Registry.lua | 3 - scripts/zones/RuLude_Gardens/npcs/Kayle.lua | 21 ------- scripts/zones/RuLude_Gardens/npcs/Laityn.lua | 6 -- scripts/zones/RuLude_Gardens/npcs/Leis.lua | 13 ----- scripts/zones/RuLude_Gardens/npcs/Maat.lua | 6 -- .../RuLude_Gardens/npcs/Macchi_Gazlitah.lua | 9 --- .../npcs/Magian_Moogle_Green.lua | 3 - .../RuLude_Gardens/npcs/Main-Harmain.lua | 21 ------- scripts/zones/RuLude_Gardens/npcs/Marshal.lua | 22 ------- .../zones/RuLude_Gardens/npcs/Nelcabrit.lua | 9 --- scripts/zones/RuLude_Gardens/npcs/Nuria.lua | 22 ------- .../RuLude_Gardens/npcs/Pakh_Jatalfih.lua | 9 --- .../RuLude_Gardens/npcs/Perisa-Neburusa.lua | 23 -------- scripts/zones/RuLude_Gardens/npcs/Petva.lua | 21 ------- .../zones/RuLude_Gardens/npcs/Pherimociel.lua | 29 ---------- .../RuLude_Gardens/npcs/Pitenorelieu.lua | 21 ------- .../zones/RuLude_Gardens/npcs/Pursuivant.lua | 22 ------- .../zones/RuLude_Gardens/npcs/Rainhard.lua | 22 ------- .../zones/RuLude_Gardens/npcs/Sitting_Ram.lua | 21 ------- .../RuLude_Gardens/npcs/Splintery_Chest.lua | 6 -- .../RuLude_Gardens/npcs/Symphonic_Curator.lua | 3 - .../zones/RuLude_Gardens/npcs/Taillegeas.lua | 21 ------- .../zones/RuLude_Gardens/npcs/Tillecoe.lua | 22 ------- .../RuLude_Gardens/npcs/Trail_Markings.lua | 6 -- scripts/zones/RuLude_Gardens/npcs/Tsugumi.lua | 21 ------- scripts/zones/RuLude_Gardens/npcs/Venessa.lua | 21 ------- scripts/zones/RuLude_Gardens/npcs/Vincent.lua | 3 - .../zones/RuLude_Gardens/npcs/Yavoraile.lua | 12 ---- scripts/zones/RuLude_Gardens/npcs/_6r2.lua | 9 --- scripts/zones/RuLude_Gardens/npcs/_6r5.lua | 9 --- scripts/zones/RuLude_Gardens/npcs/_6r8.lua | 9 --- scripts/zones/RuLude_Gardens/npcs/_6r9.lua | 9 --- scripts/zones/RuLude_Gardens/npcs/qm1.lua | 24 -------- scripts/zones/RuLude_Gardens/npcs/relic.lua | 3 - 109 files changed, 51 insertions(+), 1126 deletions(-) delete mode 100644 scripts/zones/Riverne-Site_A01/npcs/Stone_Monument.lua delete mode 100644 scripts/zones/Riverne-Site_B01/npcs/Stone_Monument.lua delete mode 100644 scripts/zones/Rolanberry_Fields/npcs/Legion_Tome.lua delete mode 100644 scripts/zones/Rolanberry_Fields/npcs/Signpost.lua create mode 100644 scripts/zones/RuAun_Gardens/DefaultActions.lua delete mode 100644 scripts/zones/RuAun_Gardens/npcs/Goblin_Footprint.lua delete mode 100644 scripts/zones/RuLude_Gardens/npcs/Ajahkeem.lua delete mode 100644 scripts/zones/RuLude_Gardens/npcs/Akta.lua delete mode 100644 scripts/zones/RuLude_Gardens/npcs/Anoop.lua delete mode 100644 scripts/zones/RuLude_Gardens/npcs/Archanne.lua delete mode 100644 scripts/zones/RuLude_Gardens/npcs/Diradour.lua delete mode 100644 scripts/zones/RuLude_Gardens/npcs/Elevator_Button.lua delete mode 100644 scripts/zones/RuLude_Gardens/npcs/Enigmatic_Footprints.lua delete mode 100644 scripts/zones/RuLude_Gardens/npcs/Falreze.lua delete mode 100644 scripts/zones/RuLude_Gardens/npcs/High_Wind.lua delete mode 100644 scripts/zones/RuLude_Gardens/npcs/Kayle.lua delete mode 100644 scripts/zones/RuLude_Gardens/npcs/Main-Harmain.lua delete mode 100644 scripts/zones/RuLude_Gardens/npcs/Marshal.lua delete mode 100644 scripts/zones/RuLude_Gardens/npcs/Nuria.lua delete mode 100644 scripts/zones/RuLude_Gardens/npcs/Perisa-Neburusa.lua delete mode 100644 scripts/zones/RuLude_Gardens/npcs/Petva.lua delete mode 100644 scripts/zones/RuLude_Gardens/npcs/Pherimociel.lua delete mode 100644 scripts/zones/RuLude_Gardens/npcs/Pitenorelieu.lua delete mode 100644 scripts/zones/RuLude_Gardens/npcs/Pursuivant.lua delete mode 100644 scripts/zones/RuLude_Gardens/npcs/Rainhard.lua delete mode 100644 scripts/zones/RuLude_Gardens/npcs/Sitting_Ram.lua delete mode 100644 scripts/zones/RuLude_Gardens/npcs/Taillegeas.lua delete mode 100644 scripts/zones/RuLude_Gardens/npcs/Tillecoe.lua delete mode 100644 scripts/zones/RuLude_Gardens/npcs/Tsugumi.lua delete mode 100644 scripts/zones/RuLude_Gardens/npcs/Venessa.lua delete mode 100644 scripts/zones/RuLude_Gardens/npcs/qm1.lua diff --git a/scripts/zones/Reisenjima/npcs/Ethereal_Ingress_#1.lua b/scripts/zones/Reisenjima/npcs/Ethereal_Ingress_#1.lua index b926c510bd5..8a56a3d3fcb 100644 --- a/scripts/zones/Reisenjima/npcs/Ethereal_Ingress_#1.lua +++ b/scripts/zones/Reisenjima/npcs/Ethereal_Ingress_#1.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.escha.portals.eschanPortalOnTrigger(player, npc, 23) end diff --git a/scripts/zones/Reisenjima/npcs/Ethereal_Ingress_#10.lua b/scripts/zones/Reisenjima/npcs/Ethereal_Ingress_#10.lua index 69c40fda530..7fe0a08a1f4 100644 --- a/scripts/zones/Reisenjima/npcs/Ethereal_Ingress_#10.lua +++ b/scripts/zones/Reisenjima/npcs/Ethereal_Ingress_#10.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.escha.portals.eschanPortalOnTrigger(player, npc, 32) end diff --git a/scripts/zones/Reisenjima/npcs/Ethereal_Ingress_#2.lua b/scripts/zones/Reisenjima/npcs/Ethereal_Ingress_#2.lua index 791f0299dd8..dd6c8e4e14f 100644 --- a/scripts/zones/Reisenjima/npcs/Ethereal_Ingress_#2.lua +++ b/scripts/zones/Reisenjima/npcs/Ethereal_Ingress_#2.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.escha.portals.eschanPortalOnTrigger(player, npc, 24) end diff --git a/scripts/zones/Reisenjima/npcs/Ethereal_Ingress_#3.lua b/scripts/zones/Reisenjima/npcs/Ethereal_Ingress_#3.lua index a44d42744ca..cf81d5ba1d7 100644 --- a/scripts/zones/Reisenjima/npcs/Ethereal_Ingress_#3.lua +++ b/scripts/zones/Reisenjima/npcs/Ethereal_Ingress_#3.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.escha.portals.eschanPortalOnTrigger(player, npc, 25) end diff --git a/scripts/zones/Reisenjima/npcs/Ethereal_Ingress_#4.lua b/scripts/zones/Reisenjima/npcs/Ethereal_Ingress_#4.lua index fa0b37986fd..9a70b3da4cd 100644 --- a/scripts/zones/Reisenjima/npcs/Ethereal_Ingress_#4.lua +++ b/scripts/zones/Reisenjima/npcs/Ethereal_Ingress_#4.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.escha.portals.eschanPortalOnTrigger(player, npc, 26) end diff --git a/scripts/zones/Reisenjima/npcs/Ethereal_Ingress_#5.lua b/scripts/zones/Reisenjima/npcs/Ethereal_Ingress_#5.lua index 65a1e332ad2..8f8ee3c8eea 100644 --- a/scripts/zones/Reisenjima/npcs/Ethereal_Ingress_#5.lua +++ b/scripts/zones/Reisenjima/npcs/Ethereal_Ingress_#5.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.escha.portals.eschanPortalOnTrigger(player, npc, 27) end diff --git a/scripts/zones/Reisenjima/npcs/Ethereal_Ingress_#6.lua b/scripts/zones/Reisenjima/npcs/Ethereal_Ingress_#6.lua index be7472380a2..99f4be20b2a 100644 --- a/scripts/zones/Reisenjima/npcs/Ethereal_Ingress_#6.lua +++ b/scripts/zones/Reisenjima/npcs/Ethereal_Ingress_#6.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.escha.portals.eschanPortalOnTrigger(player, npc, 28) end diff --git a/scripts/zones/Reisenjima/npcs/Ethereal_Ingress_#7.lua b/scripts/zones/Reisenjima/npcs/Ethereal_Ingress_#7.lua index f8fc9fbd06b..fa05dce1315 100644 --- a/scripts/zones/Reisenjima/npcs/Ethereal_Ingress_#7.lua +++ b/scripts/zones/Reisenjima/npcs/Ethereal_Ingress_#7.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.escha.portals.eschanPortalOnTrigger(player, npc, 29) end diff --git a/scripts/zones/Reisenjima/npcs/Ethereal_Ingress_#8.lua b/scripts/zones/Reisenjima/npcs/Ethereal_Ingress_#8.lua index 6c31aff2cec..97e9fff2721 100644 --- a/scripts/zones/Reisenjima/npcs/Ethereal_Ingress_#8.lua +++ b/scripts/zones/Reisenjima/npcs/Ethereal_Ingress_#8.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.escha.portals.eschanPortalOnTrigger(player, npc, 30) end diff --git a/scripts/zones/Reisenjima/npcs/Ethereal_Ingress_#9.lua b/scripts/zones/Reisenjima/npcs/Ethereal_Ingress_#9.lua index fb48e3eeae7..c136075ea3a 100644 --- a/scripts/zones/Reisenjima/npcs/Ethereal_Ingress_#9.lua +++ b/scripts/zones/Reisenjima/npcs/Ethereal_Ingress_#9.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.escha.portals.eschanPortalOnTrigger(player, npc, 31) end diff --git a/scripts/zones/Reisenjima/npcs/qm_ethereal_droplet.lua b/scripts/zones/Reisenjima/npcs/qm_ethereal_droplet.lua index fb5d5d623a8..b13efc6e04f 100644 --- a/scripts/zones/Reisenjima/npcs/qm_ethereal_droplet.lua +++ b/scripts/zones/Reisenjima/npcs/qm_ethereal_droplet.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.REISENJIMA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:hasItem(xi.item.ETHEREAL_DROPLET, xi.inv.TEMPITEMS) then player:messageSpecial(ID.text.NOTHING_OUT_OF_ORDINARY) @@ -20,10 +17,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Riverne-Site_A01/DefaultActions.lua b/scripts/zones/Riverne-Site_A01/DefaultActions.lua index ba204258d7d..3bcaa88922d 100644 --- a/scripts/zones/Riverne-Site_A01/DefaultActions.lua +++ b/scripts/zones/Riverne-Site_A01/DefaultActions.lua @@ -1,5 +1,6 @@ local ID = zones[xi.zone.RIVERNE_SITE_A01] return { + ['Stone_Monument'] = { messageSpecial = ID.text.MONUMENT }, ['Unstable_Displacement'] = { messageSpecial = ID.text.A_GLOWING_MIST }, } diff --git a/scripts/zones/Riverne-Site_A01/npcs/Spatial_Displacement.lua b/scripts/zones/Riverne-Site_A01/npcs/Spatial_Displacement.lua index dd82b3d6e02..ef2bde8a4ec 100644 --- a/scripts/zones/Riverne-Site_A01/npcs/Spatial_Displacement.lua +++ b/scripts/zones/Riverne-Site_A01/npcs/Spatial_Displacement.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.RIVERNE_SITE_A01] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local offset = npc:getID() - ID.npc.DISPLACEMENT_OFFSET if offset >= 0 and offset <= 2 then @@ -19,9 +16,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 35 and option == 1 then player:setPos(12.527, 0.345, -539.602, 127, 31) -- to Monarch Linn (Retail confirmed) diff --git a/scripts/zones/Riverne-Site_A01/npcs/Stone_Monument.lua b/scripts/zones/Riverne-Site_A01/npcs/Stone_Monument.lua deleted file mode 100644 index 1b8141d3bdc..00000000000 --- a/scripts/zones/Riverne-Site_A01/npcs/Stone_Monument.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Riverne Site #A01 --- NPC: Stone Monument ------------------------------------ -local ID = zones[xi.zone.RIVERNE_SITE_A01] ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:messageSpecial(ID.text.MONUMENT) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Riverne-Site_A01/npcs/_0u1.lua b/scripts/zones/Riverne-Site_A01/npcs/_0u1.lua index 433770669cc..732e810c171 100644 --- a/scripts/zones/Riverne-Site_A01/npcs/_0u1.lua +++ b/scripts/zones/Riverne-Site_A01/npcs/_0u1.lua @@ -15,10 +15,4 @@ entity.onTrigger = function(player, npc) riverneAGlobal.unstableDisplacementTrigger(player, npc, 6) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Riverne-Site_A01/npcs/_0u2.lua b/scripts/zones/Riverne-Site_A01/npcs/_0u2.lua index b705e692b71..37ea9f584ad 100644 --- a/scripts/zones/Riverne-Site_A01/npcs/_0u2.lua +++ b/scripts/zones/Riverne-Site_A01/npcs/_0u2.lua @@ -15,10 +15,4 @@ entity.onTrigger = function(player, npc) riverneAGlobal.unstableDisplacementTrigger(player, npc, 17) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Riverne-Site_A01/npcs/_0u3.lua b/scripts/zones/Riverne-Site_A01/npcs/_0u3.lua index 00547684f5a..3b6f5c6f540 100644 --- a/scripts/zones/Riverne-Site_A01/npcs/_0u3.lua +++ b/scripts/zones/Riverne-Site_A01/npcs/_0u3.lua @@ -15,10 +15,4 @@ entity.onTrigger = function(player, npc) riverneAGlobal.unstableDisplacementTrigger(player, npc, 19) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Riverne-Site_A01/npcs/_0u4.lua b/scripts/zones/Riverne-Site_A01/npcs/_0u4.lua index c37dcbd5c19..d09cf3ea94e 100644 --- a/scripts/zones/Riverne-Site_A01/npcs/_0u4.lua +++ b/scripts/zones/Riverne-Site_A01/npcs/_0u4.lua @@ -15,10 +15,4 @@ entity.onTrigger = function(player, npc) riverneAGlobal.unstableDisplacementTrigger(player, npc, 32) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Riverne-Site_B01/DefaultActions.lua b/scripts/zones/Riverne-Site_B01/DefaultActions.lua index 5c7e69a617f..a3bced50738 100644 --- a/scripts/zones/Riverne-Site_B01/DefaultActions.lua +++ b/scripts/zones/Riverne-Site_B01/DefaultActions.lua @@ -1,5 +1,7 @@ local ID = zones[xi.zone.RIVERNE_SITE_B01] return { + ['qm_unstable_cluster'] = { messageSpecial = ID.text.GROUND_GIVING_HEAT }, + ['Stone_Monument'] = { messageSpecial = ID.text.MONUMENT }, ['Unstable_Displacement'] = { messageSpecial = ID.text.SPACE_SEEMS_DISTORTED }, } diff --git a/scripts/zones/Riverne-Site_B01/npcs/Spatial_Displacement.lua b/scripts/zones/Riverne-Site_B01/npcs/Spatial_Displacement.lua index d3e1d159de3..23640d32f16 100644 --- a/scripts/zones/Riverne-Site_B01/npcs/Spatial_Displacement.lua +++ b/scripts/zones/Riverne-Site_B01/npcs/Spatial_Displacement.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.RIVERNE_SITE_B01] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local offset = npc:getID() - ID.npc.DISPLACEMENT_OFFSET if offset >= 0 and offset <= 31 then @@ -21,9 +18,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 33 and option == 1 then player:setPos(12.527, 0.345, -539.602, 127, 31) -- to Monarch Linn (Retail confirmed) diff --git a/scripts/zones/Riverne-Site_B01/npcs/Stone_Monument.lua b/scripts/zones/Riverne-Site_B01/npcs/Stone_Monument.lua deleted file mode 100644 index 81457301613..00000000000 --- a/scripts/zones/Riverne-Site_B01/npcs/Stone_Monument.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Riverne Site #B01 --- NPC: Stone Monument ------------------------------------ -local ID = zones[xi.zone.RIVERNE_SITE_B01] ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:messageSpecial(ID.text.MONUMENT) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Riverne-Site_B01/npcs/_0t1.lua b/scripts/zones/Riverne-Site_B01/npcs/_0t1.lua index 95aa1ba2c04..87279810726 100644 --- a/scripts/zones/Riverne-Site_B01/npcs/_0t1.lua +++ b/scripts/zones/Riverne-Site_B01/npcs/_0t1.lua @@ -15,10 +15,4 @@ entity.onTrigger = function(player, npc) riverneBGlobal.unstableDisplacementTrigger(player, npc, 7) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Riverne-Site_B01/npcs/_0t2.lua b/scripts/zones/Riverne-Site_B01/npcs/_0t2.lua index 03dbd99338c..b8f4663d671 100644 --- a/scripts/zones/Riverne-Site_B01/npcs/_0t2.lua +++ b/scripts/zones/Riverne-Site_B01/npcs/_0t2.lua @@ -15,10 +15,4 @@ entity.onTrigger = function(player, npc) riverneBGlobal.unstableDisplacementTrigger(player, npc, 22) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Riverne-Site_B01/npcs/_0t3.lua b/scripts/zones/Riverne-Site_B01/npcs/_0t3.lua index 58807844de6..6c89559a81c 100644 --- a/scripts/zones/Riverne-Site_B01/npcs/_0t3.lua +++ b/scripts/zones/Riverne-Site_B01/npcs/_0t3.lua @@ -15,10 +15,4 @@ entity.onTrigger = function(player, npc) riverneBGlobal.unstableDisplacementTrigger(player, npc, 38) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Riverne-Site_B01/npcs/qm_unstable_cluster.lua b/scripts/zones/Riverne-Site_B01/npcs/qm_unstable_cluster.lua index d7966f081ab..875b47ee759 100644 --- a/scripts/zones/Riverne-Site_B01/npcs/qm_unstable_cluster.lua +++ b/scripts/zones/Riverne-Site_B01/npcs/qm_unstable_cluster.lua @@ -17,14 +17,4 @@ entity.onTrade = function(player, npc, trade) end end -entity.onTrigger = function(player, npc) - player:messageSpecial(ID.text.GROUND_GIVING_HEAT) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/RoMaeve/DefaultActions.lua b/scripts/zones/RoMaeve/DefaultActions.lua index 6cc63d31ce3..9acee414eab 100644 --- a/scripts/zones/RoMaeve/DefaultActions.lua +++ b/scripts/zones/RoMaeve/DefaultActions.lua @@ -4,4 +4,5 @@ return { ['qm1'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, ['qm2'] = { messageSpecial = ID.text.PILE_OF_RUBBLE }, ['QuHau_Spring'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, + ['Signpost'] = { messageSpecial = ID.text.SIGN }, } diff --git a/scripts/zones/RoMaeve/npcs/Field_Manual.lua b/scripts/zones/RoMaeve/npcs/Field_Manual.lua index 5bb2aba58d8..00d242c1f32 100644 --- a/scripts/zones/RoMaeve/npcs/Field_Manual.lua +++ b/scripts/zones/RoMaeve/npcs/Field_Manual.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.regime.bookOnTrigger(player, xi.regime.type.FIELDS) end diff --git a/scripts/zones/RoMaeve/npcs/Goblin_Footprint.lua b/scripts/zones/RoMaeve/npcs/Goblin_Footprint.lua index 4ab0144380d..3437119d0b1 100644 --- a/scripts/zones/RoMaeve/npcs/Goblin_Footprint.lua +++ b/scripts/zones/RoMaeve/npcs/Goblin_Footprint.lua @@ -14,9 +14,6 @@ entity.onTrigger = function(player, npc) xi.goblinfootprint.rewatch(player, true) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.goblinfootprint.startEvent(player, csid, option, npc) end diff --git a/scripts/zones/RoMaeve/npcs/Treasure_Casket.lua b/scripts/zones/RoMaeve/npcs/Treasure_Casket.lua index 861a215d4e1..ffb59f9bd95 100644 --- a/scripts/zones/RoMaeve/npcs/Treasure_Casket.lua +++ b/scripts/zones/RoMaeve/npcs/Treasure_Casket.lua @@ -13,9 +13,6 @@ entity.onTrade = function(player, npc, trade) xi.caskets.onTrade(player, npc, trade) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.caskets.onEventFinish(player, csid, option, npc) end diff --git a/scripts/zones/RoMaeve/npcs/_3e0.lua b/scripts/zones/RoMaeve/npcs/_3e0.lua index ba522d14b2c..639da5c4854 100644 --- a/scripts/zones/RoMaeve/npcs/_3e0.lua +++ b/scripts/zones/RoMaeve/npcs/_3e0.lua @@ -11,13 +11,4 @@ entity.onTrigger = function(player, npc) end end -entity.onTrade = function(player, npc, trade) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/RoMaeve/npcs/_3e1.lua b/scripts/zones/RoMaeve/npcs/_3e1.lua index 81728fc3503..6c726b0d442 100644 --- a/scripts/zones/RoMaeve/npcs/_3e1.lua +++ b/scripts/zones/RoMaeve/npcs/_3e1.lua @@ -11,13 +11,4 @@ entity.onTrigger = function(player, npc) end end -entity.onTrade = function(player, npc, trade) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/RoMaeve/npcs/qm3.lua b/scripts/zones/RoMaeve/npcs/qm3.lua index fa0a79ea527..e4b0aee0848 100644 --- a/scripts/zones/RoMaeve/npcs/qm3.lua +++ b/scripts/zones/RoMaeve/npcs/qm3.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.ROMAEVE] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:hasKeyItem(xi.ki.MOONGATE_PASS) then player:messageSpecial(ID.text.NOTHING_OUT_OF_ORDINARY) @@ -30,10 +27,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Rolanberry_Fields/npcs/Cavernous_Maw.lua b/scripts/zones/Rolanberry_Fields/npcs/Cavernous_Maw.lua index 49ba94bbfed..3ddfdadfeb4 100644 --- a/scripts/zones/Rolanberry_Fields/npcs/Cavernous_Maw.lua +++ b/scripts/zones/Rolanberry_Fields/npcs/Cavernous_Maw.lua @@ -7,16 +7,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.maws.onTrigger(player, npc) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.maws.onEventFinish(player, csid, option, npc) end diff --git a/scripts/zones/Rolanberry_Fields/npcs/Field_Manual.lua b/scripts/zones/Rolanberry_Fields/npcs/Field_Manual.lua index c5886a55057..c5cab3c04e7 100644 --- a/scripts/zones/Rolanberry_Fields/npcs/Field_Manual.lua +++ b/scripts/zones/Rolanberry_Fields/npcs/Field_Manual.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.regime.bookOnTrigger(player, xi.regime.type.FIELDS) end diff --git a/scripts/zones/Rolanberry_Fields/npcs/Geomantic_Reservoir.lua b/scripts/zones/Rolanberry_Fields/npcs/Geomantic_Reservoir.lua index 4ce6041d6f6..8f0cec96397 100644 --- a/scripts/zones/Rolanberry_Fields/npcs/Geomantic_Reservoir.lua +++ b/scripts/zones/Rolanberry_Fields/npcs/Geomantic_Reservoir.lua @@ -7,16 +7,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.geomanticReservoir.onTrigger(player, npc, xi.magic.spell.GEO_MND) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.geomanticReservoir.onEventFinish(player, csid, xi.magic.spell.GEO_MND) end diff --git a/scripts/zones/Rolanberry_Fields/npcs/Legion_Tome.lua b/scripts/zones/Rolanberry_Fields/npcs/Legion_Tome.lua deleted file mode 100644 index 0dcd78dfd65..00000000000 --- a/scripts/zones/Rolanberry_Fields/npcs/Legion_Tome.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Rolanberry Fields --- NPC: Legion Tome --- Legion NPC --- !pos 238 24 469 110 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - -- player:startEvent(8009) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Rolanberry_Fields/npcs/Mayuyu.lua b/scripts/zones/Rolanberry_Fields/npcs/Mayuyu.lua index 85dfdbd5d77..c7a396f9942 100644 --- a/scripts/zones/Rolanberry_Fields/npcs/Mayuyu.lua +++ b/scripts/zones/Rolanberry_Fields/npcs/Mayuyu.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local legendary = player:hasTitle(xi.title.LEGENDARY_LEGIONNAIRE) and 1 or 0 local capacity = @@ -19,11 +16,4 @@ entity.onTrigger = function(player, npc) player:startEvent(8008, 0, legendary, capacity) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) - -- Event needs work, also the Legion Pass item is "tagged" via fields not yet implemented in core. -end - return entity diff --git a/scripts/zones/Rolanberry_Fields/npcs/Saarlan.lua b/scripts/zones/Rolanberry_Fields/npcs/Saarlan.lua index b0c2c985a68..a8e5d20826a 100644 --- a/scripts/zones/Rolanberry_Fields/npcs/Saarlan.lua +++ b/scripts/zones/Rolanberry_Fields/npcs/Saarlan.lua @@ -51,9 +51,6 @@ local wares = [0x00210002] = { item = xi.item.MEDIATORS_RING, lp = 6000, title = xi.title.LEGENDARY_LEGIONNAIRE }, } -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getCharVar('LegionStatus') == 0 then player:startEvent(8004) @@ -73,9 +70,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 8004 then player:setCharVar('LegionStatus', 1) diff --git a/scripts/zones/Rolanberry_Fields/npcs/Signpost.lua b/scripts/zones/Rolanberry_Fields/npcs/Signpost.lua deleted file mode 100644 index 691e859c3c9..00000000000 --- a/scripts/zones/Rolanberry_Fields/npcs/Signpost.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Rolanberry Fields --- NPC: Signpost ------------------------------------ -local ID = zones[xi.zone.ROLANBERRY_FIELDS] ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrigger = function(player, npc) - player:messageSpecial(ID.text.SIGN) -end - -entity.onTrade = function(player, npc, trade) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Rolanberry_Fields/npcs/Stone_Monument.lua b/scripts/zones/Rolanberry_Fields/npcs/Stone_Monument.lua index 315de11ac2d..091e8011bb2 100644 --- a/scripts/zones/Rolanberry_Fields/npcs/Stone_Monument.lua +++ b/scripts/zones/Rolanberry_Fields/npcs/Stone_Monument.lua @@ -21,10 +21,4 @@ entity.onTrade = function(player, npc, trade) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Rolanberry_Fields/npcs/Treasure_Casket.lua b/scripts/zones/Rolanberry_Fields/npcs/Treasure_Casket.lua index 45b1df0b114..31da52106d4 100644 --- a/scripts/zones/Rolanberry_Fields/npcs/Treasure_Casket.lua +++ b/scripts/zones/Rolanberry_Fields/npcs/Treasure_Casket.lua @@ -13,9 +13,6 @@ entity.onTrade = function(player, npc, trade) xi.caskets.onTrade(player, npc, trade) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.caskets.onEventFinish(player, csid, option, npc) end diff --git a/scripts/zones/Rolanberry_Fields/npcs/qm1.lua b/scripts/zones/Rolanberry_Fields/npcs/qm1.lua index dc1789db022..7af7a9d40c8 100644 --- a/scripts/zones/Rolanberry_Fields/npcs/qm1.lua +++ b/scripts/zones/Rolanberry_Fields/npcs/qm1.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.ROLANBERRY_FIELDS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if not GetMobByID(ID.mob.CHUGLIX_BERRYPAWS):isSpawned() and @@ -25,10 +22,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Rolanberry_Fields_[S]/npcs/Cavernous_Maw.lua b/scripts/zones/Rolanberry_Fields_[S]/npcs/Cavernous_Maw.lua index a738bccdb96..030207ec98e 100644 --- a/scripts/zones/Rolanberry_Fields_[S]/npcs/Cavernous_Maw.lua +++ b/scripts/zones/Rolanberry_Fields_[S]/npcs/Cavernous_Maw.lua @@ -7,16 +7,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.maws.onTrigger(player, npc) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.maws.onEventFinish(player, csid, option, npc) end diff --git a/scripts/zones/RuAun_Gardens/DefaultActions.lua b/scripts/zones/RuAun_Gardens/DefaultActions.lua new file mode 100644 index 00000000000..ea1738558ad --- /dev/null +++ b/scripts/zones/RuAun_Gardens/DefaultActions.lua @@ -0,0 +1,5 @@ +local ID = zones[xi.zone.RUAUN_GARDENS] + +return { + ['Goblin_Footprint'] = { event = 0 }, +} diff --git a/scripts/zones/RuAun_Gardens/npcs/Field_Manual.lua b/scripts/zones/RuAun_Gardens/npcs/Field_Manual.lua index 17bc5a98a9d..46695d3740b 100644 --- a/scripts/zones/RuAun_Gardens/npcs/Field_Manual.lua +++ b/scripts/zones/RuAun_Gardens/npcs/Field_Manual.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.regime.bookOnTrigger(player, xi.regime.type.FIELDS) end diff --git a/scripts/zones/RuAun_Gardens/npcs/Goblin_Footprint.lua b/scripts/zones/RuAun_Gardens/npcs/Goblin_Footprint.lua deleted file mode 100644 index 14a40f72451..00000000000 --- a/scripts/zones/RuAun_Gardens/npcs/Goblin_Footprint.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Ru'Aun Gardens --- NPC: Goblin Footprint ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(0) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/RuAun_Gardens/npcs/Pincerstone.lua b/scripts/zones/RuAun_Gardens/npcs/Pincerstone.lua index d6983b45ac1..2488f9322bf 100644 --- a/scripts/zones/RuAun_Gardens/npcs/Pincerstone.lua +++ b/scripts/zones/RuAun_Gardens/npcs/Pincerstone.lua @@ -23,9 +23,6 @@ local pincerstoneTable = [ID.npc.PINCERSTONE_OFFSET + 18] = ID.npc.PORTAL_OFFSET + 13, -- Main Island to SW Island } -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local npcId = npc:getID() local portalId = pincerstoneTable[npcId] @@ -42,10 +39,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/RuAun_Gardens/npcs/Treasure_Casket.lua b/scripts/zones/RuAun_Gardens/npcs/Treasure_Casket.lua index 90fdfbd8201..271a0b526a9 100644 --- a/scripts/zones/RuAun_Gardens/npcs/Treasure_Casket.lua +++ b/scripts/zones/RuAun_Gardens/npcs/Treasure_Casket.lua @@ -13,9 +13,6 @@ entity.onTrade = function(player, npc, trade) xi.caskets.onTrade(player, npc, trade) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.caskets.onEventFinish(player, csid, option, npc) end diff --git a/scripts/zones/RuAun_Gardens/npcs/Treasure_Coffer.lua b/scripts/zones/RuAun_Gardens/npcs/Treasure_Coffer.lua index 2c1e256f371..ad4fc039048 100644 --- a/scripts/zones/RuAun_Gardens/npcs/Treasure_Coffer.lua +++ b/scripts/zones/RuAun_Gardens/npcs/Treasure_Coffer.lua @@ -14,10 +14,4 @@ entity.onTrigger = function(player, npc) xi.treasure.onTrigger(player, xi.treasure.type.COFFER) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/RuAun_Gardens/npcs/_3m0.lua b/scripts/zones/RuAun_Gardens/npcs/_3m0.lua index 6466e6e5fbd..7436be39a58 100644 --- a/scripts/zones/RuAun_Gardens/npcs/_3m0.lua +++ b/scripts/zones/RuAun_Gardens/npcs/_3m0.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local DoorID = npc:getID() @@ -17,10 +14,4 @@ entity.onTrigger = function(player, npc) GetNPCByID(DoorID + 2):openDoor(7) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/RuAun_Gardens/npcs/qm1.lua b/scripts/zones/RuAun_Gardens/npcs/qm1.lua index 8f7a9ac7f48..79007f2d46a 100644 --- a/scripts/zones/RuAun_Gardens/npcs/qm1.lua +++ b/scripts/zones/RuAun_Gardens/npcs/qm1.lua @@ -23,10 +23,4 @@ entity.onTrigger = function(player, npc) player:messageSpecial(ID.text.SKY_GOD_OFFSET) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/RuAun_Gardens/npcs/qm2.lua b/scripts/zones/RuAun_Gardens/npcs/qm2.lua index 01358fc2877..d137b7a497a 100644 --- a/scripts/zones/RuAun_Gardens/npcs/qm2.lua +++ b/scripts/zones/RuAun_Gardens/npcs/qm2.lua @@ -23,10 +23,4 @@ entity.onTrigger = function(player, npc) player:messageSpecial(ID.text.SKY_GOD_OFFSET + 1) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/RuAun_Gardens/npcs/qm3.lua b/scripts/zones/RuAun_Gardens/npcs/qm3.lua index b7af2664649..af433f7cc64 100644 --- a/scripts/zones/RuAun_Gardens/npcs/qm3.lua +++ b/scripts/zones/RuAun_Gardens/npcs/qm3.lua @@ -23,10 +23,4 @@ entity.onTrigger = function(player, npc) player:messageSpecial(ID.text.SKY_GOD_OFFSET + 2) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/RuAun_Gardens/npcs/qm4.lua b/scripts/zones/RuAun_Gardens/npcs/qm4.lua index 7269e96b8de..f42f4928257 100644 --- a/scripts/zones/RuAun_Gardens/npcs/qm4.lua +++ b/scripts/zones/RuAun_Gardens/npcs/qm4.lua @@ -23,10 +23,4 @@ entity.onTrigger = function(player, npc) player:messageSpecial(ID.text.SKY_GOD_OFFSET + 3) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/RuAun_Gardens/npcs/relic.lua b/scripts/zones/RuAun_Gardens/npcs/relic.lua index d0e68784363..572be892d82 100644 --- a/scripts/zones/RuAun_Gardens/npcs/relic.lua +++ b/scripts/zones/RuAun_Gardens/npcs/relic.lua @@ -21,9 +21,6 @@ entity.onTrigger = function(player, npc) player:messageSpecial(ID.text.NOTHING_OUT_OF_ORDINARY) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 60 and diff --git a/scripts/zones/RuLude_Gardens/DefaultActions.lua b/scripts/zones/RuLude_Gardens/DefaultActions.lua index 3f9b538075b..2e8436baef7 100644 --- a/scripts/zones/RuLude_Gardens/DefaultActions.lua +++ b/scripts/zones/RuLude_Gardens/DefaultActions.lua @@ -1,20 +1,46 @@ local ID = zones[xi.zone.RULUDE_GARDENS] return { - ['Adolie'] = { event = 30 }, - ['Albiona'] = { event = 146 }, - ['Auchefort'] = { event = 145 }, - ['Baran'] = { event = 150 }, - ['Chapi_Galepilai'] = { event = 148 }, - ['Colti'] = { event = 153 }, - ['Crooked_Arrow'] = { event = 149 }, - ['Delivery_Crate'] = { messageSpecial = ID.text.DELIVERY_CRATE_TEXT }, - ['Harith'] = { event = 111 }, - ['Maat'] = { messageSpecial = ID.text.MAAT_DIALOG }, - ['Muhoho'] = { event = 152 }, - ['Neraf-Najiruf'] = { event = 156 }, - ['Nomad_Moogle'] = { event = 10045, options = { 0, 2, 0, 0 } }, - ['Pherimociel'] = { event = 155 }, - ['Radeivepart'] = { event = 159 }, - ['Yavoraile'] = { event = 118 }, + ['Adolie'] = { event = 30 }, + ['Ajahkeem'] = { event = 10106 }, + ['Akta'] = { event = 116 }, + ['Albiona'] = { event = 146 }, + ['Anoop'] = { event = 154 }, + ['Archanne'] = { event = 10007 }, + ['Arenuel'] = { event = 120 }, + ['Auchefort'] = { event = 145 }, + ['Baran'] = { event = 150 }, + ['Chapi_Galepilai'] = { event = 148 }, + ['Colti'] = { event = 153 }, + ['Crooked_Arrow'] = { event = 149 }, + ['Delivery_Crate'] = { messageSpecial = ID.text.DELIVERY_CRATE_TEXT }, + ['Diradour'] = { event = 10000 }, + ['Elevator_Button'] = { event = 75 }, + ['Enigmatic_Footprints'] = { messageSpecial = ID.text.TEAR_IN_FABRIC_OF_SPACE }, + ['Falreze'] = { event = 121 }, + ['Harith'] = { event = 111 }, + ['High_Wind'] = { event = 33 }, + ['Kayle'] = { event = 125 }, + ['Leis'] = { event = 119 }, + ['Maat'] = { messageSpecial = ID.text.MAAT_DIALOG }, + ['Main-Harmain'] = { event = 147 }, + ['Marshal'] = { event = 44 }, + ['Muhoho'] = { event = 152 }, + ['Neraf-Najiruf'] = { event = 156 }, + ['Nomad_Moogle'] = { event = 10045, options = { 0, 2, 0, 0 } }, + ['Nuria'] = { event = 10095 }, + ['Perisa-Neburusa'] = { event = 76 }, + ['Petva'] = { event = 151 }, + ['Pherimociel'] = { event = 155 }, + ['Pitenorelieu'] = { event = 77 }, + ['Pursuivant'] = { event = 69 }, + ['qm1'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, + ['Radeivepart'] = { event = 159 }, + ['Rainhard'] = { event = 34 }, + ['Sitting_Ram'] = { event = 115 }, + ['Taillegeas'] = { event = 10061 }, + ['Tillecoe'] = { event = 70 }, + ['Tsugumi'] = { event = 163 }, + ['Venessa'] = { event = 10064 }, + ['Yavoraile'] = { event = 118 }, } diff --git a/scripts/zones/RuLude_Gardens/npcs/Ajahkeem.lua b/scripts/zones/RuLude_Gardens/npcs/Ajahkeem.lua deleted file mode 100644 index 57bd1189427..00000000000 --- a/scripts/zones/RuLude_Gardens/npcs/Ajahkeem.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Ru'Lude Gardens --- NPC: Ajahkeem ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(10106) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/RuLude_Gardens/npcs/Akta.lua b/scripts/zones/RuLude_Gardens/npcs/Akta.lua deleted file mode 100644 index 0f55c4d8a50..00000000000 --- a/scripts/zones/RuLude_Gardens/npcs/Akta.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Ru'Lude Gardens --- NPC: Akta ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(116) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/RuLude_Gardens/npcs/Anoop.lua b/scripts/zones/RuLude_Gardens/npcs/Anoop.lua deleted file mode 100644 index 20efe93b962..00000000000 --- a/scripts/zones/RuLude_Gardens/npcs/Anoop.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Ru'Lude Gardens --- NPC: Anoop ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(154) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/RuLude_Gardens/npcs/Archanne.lua b/scripts/zones/RuLude_Gardens/npcs/Archanne.lua deleted file mode 100644 index 3f9d1e34919..00000000000 --- a/scripts/zones/RuLude_Gardens/npcs/Archanne.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Ru'Lude Gardens --- NPC: Archanne --- Type: Event Scene Replayer --- !pos -54.104 10.999 -34.144 243 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(10007) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/RuLude_Gardens/npcs/Arenuel.lua b/scripts/zones/RuLude_Gardens/npcs/Arenuel.lua index c9be639a9be..c7d6abe798a 100644 --- a/scripts/zones/RuLude_Gardens/npcs/Arenuel.lua +++ b/scripts/zones/RuLude_Gardens/npcs/Arenuel.lua @@ -18,17 +18,4 @@ entity.onSpawn = function(npc) npc:pathThrough(pathNodes, xi.path.flag.PATROL) end -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(120) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/RuLude_Gardens/npcs/Assai_Nybaem.lua b/scripts/zones/RuLude_Gardens/npcs/Assai_Nybaem.lua index 62699058afd..73a9ca7134d 100644 --- a/scripts/zones/RuLude_Gardens/npcs/Assai_Nybaem.lua +++ b/scripts/zones/RuLude_Gardens/npcs/Assai_Nybaem.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.voidwalker.npcOnTrigger(player, npc) end diff --git a/scripts/zones/RuLude_Gardens/npcs/Auction_Counter.lua b/scripts/zones/RuLude_Gardens/npcs/Auction_Counter.lua index 075c885975b..04051c98177 100644 --- a/scripts/zones/RuLude_Gardens/npcs/Auction_Counter.lua +++ b/scripts/zones/RuLude_Gardens/npcs/Auction_Counter.lua @@ -5,17 +5,8 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:sendMenu(3) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/RuLude_Gardens/npcs/Dabih_Jajalioh.lua b/scripts/zones/RuLude_Gardens/npcs/Dabih_Jajalioh.lua index 821200dfb42..29fffd57ee9 100755 --- a/scripts/zones/RuLude_Gardens/npcs/Dabih_Jajalioh.lua +++ b/scripts/zones/RuLude_Gardens/npcs/Dabih_Jajalioh.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.RULUDE_GARDENS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -40,10 +37,4 @@ entity.onTrigger = function(player, npc) xi.shop.general(player, stock, xi.fameArea.JEUNO) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/RuLude_Gardens/npcs/Delivery_Crate.lua b/scripts/zones/RuLude_Gardens/npcs/Delivery_Crate.lua index 9b97d2aeac3..23a63f045b2 100644 --- a/scripts/zones/RuLude_Gardens/npcs/Delivery_Crate.lua +++ b/scripts/zones/RuLude_Gardens/npcs/Delivery_Crate.lua @@ -11,9 +11,6 @@ entity.onTrade = function(player, npc, trade) xi.magian.deliveryCrateOnTrade(player, npc, trade) end -entity.onTrigger = function(player, npc) -end - entity.onEventUpdate = function(player, csid, option, npc) xi.magian.deliveryCrateOnEventUpdate(player, csid, option, npc) end diff --git a/scripts/zones/RuLude_Gardens/npcs/Diradour.lua b/scripts/zones/RuLude_Gardens/npcs/Diradour.lua deleted file mode 100644 index bc45a84f78d..00000000000 --- a/scripts/zones/RuLude_Gardens/npcs/Diradour.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Ru'Lude Gardens --- NPC: Diradour ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(10000) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/RuLude_Gardens/npcs/Dugga.lua b/scripts/zones/RuLude_Gardens/npcs/Dugga.lua index 4bc78ba965c..4e1e3e94b7b 100644 --- a/scripts/zones/RuLude_Gardens/npcs/Dugga.lua +++ b/scripts/zones/RuLude_Gardens/npcs/Dugga.lua @@ -9,18 +9,9 @@ local ID = zones[xi.zone.RULUDE_GARDENS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:showText(npc, ID.text.ITEM_DELIVERY_DIALOG) player:openSendBox() end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/RuLude_Gardens/npcs/Elevator_Button.lua b/scripts/zones/RuLude_Gardens/npcs/Elevator_Button.lua deleted file mode 100644 index 078fe8055de..00000000000 --- a/scripts/zones/RuLude_Gardens/npcs/Elevator_Button.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Ru'Lude Gardens --- NPC: Elevator Button --- Mog House Enterance ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(75) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/RuLude_Gardens/npcs/Enigmatic_Footprints.lua b/scripts/zones/RuLude_Gardens/npcs/Enigmatic_Footprints.lua deleted file mode 100644 index 594a0db4439..00000000000 --- a/scripts/zones/RuLude_Gardens/npcs/Enigmatic_Footprints.lua +++ /dev/null @@ -1,24 +0,0 @@ ------------------------------------ --- Area: Ru'Lude Gardens --- NPC: Enigmatic Footprints --- Entry NPC for Dynamis Divergence ------------------------------------ -local ID = zones[xi.zone.RULUDE_GARDENS] ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:messageSpecial(ID.text.TEAR_IN_FABRIC_OF_SPACE) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/RuLude_Gardens/npcs/Explorer_Moogle.lua b/scripts/zones/RuLude_Gardens/npcs/Explorer_Moogle.lua index 6616e2a9343..26542e5a505 100644 --- a/scripts/zones/RuLude_Gardens/npcs/Explorer_Moogle.lua +++ b/scripts/zones/RuLude_Gardens/npcs/Explorer_Moogle.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.mogTablet.moogleOnTrigger(player, npc) end diff --git a/scripts/zones/RuLude_Gardens/npcs/Fabien.lua b/scripts/zones/RuLude_Gardens/npcs/Fabien.lua index ed50e026127..0f5ef71ffda 100644 --- a/scripts/zones/RuLude_Gardens/npcs/Fabien.lua +++ b/scripts/zones/RuLude_Gardens/npcs/Fabien.lua @@ -8,9 +8,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.traverserNPCOnTrigger(player, npc) end diff --git a/scripts/zones/RuLude_Gardens/npcs/Falreze.lua b/scripts/zones/RuLude_Gardens/npcs/Falreze.lua deleted file mode 100644 index c2eb48fc63d..00000000000 --- a/scripts/zones/RuLude_Gardens/npcs/Falreze.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Ru'Lude Gardens --- NPC: Falreze ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(121) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/RuLude_Gardens/npcs/Ghye_Dachanthu.lua b/scripts/zones/RuLude_Gardens/npcs/Ghye_Dachanthu.lua index 065814d4b0d..3c6c81e095b 100644 --- a/scripts/zones/RuLude_Gardens/npcs/Ghye_Dachanthu.lua +++ b/scripts/zones/RuLude_Gardens/npcs/Ghye_Dachanthu.lua @@ -9,18 +9,9 @@ local ID = zones[xi.zone.RULUDE_GARDENS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:showText(npc, ID.text.ITEM_DELIVERY_DIALOG) player:openSendBox() end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/RuLude_Gardens/npcs/Goggehn.lua b/scripts/zones/RuLude_Gardens/npcs/Goggehn.lua index 956ce41b185..306e437b87d 100644 --- a/scripts/zones/RuLude_Gardens/npcs/Goggehn.lua +++ b/scripts/zones/RuLude_Gardens/npcs/Goggehn.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local pNation = player:getNation() @@ -26,10 +23,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/RuLude_Gardens/npcs/High_Wind.lua b/scripts/zones/RuLude_Gardens/npcs/High_Wind.lua deleted file mode 100644 index 9c51f8e8410..00000000000 --- a/scripts/zones/RuLude_Gardens/npcs/High_Wind.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Ru'Lude Gardens --- NPC: High Wind ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(33) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/RuLude_Gardens/npcs/Hunt_Registry.lua b/scripts/zones/RuLude_Gardens/npcs/Hunt_Registry.lua index 82ddad9b823..97119c157d7 100644 --- a/scripts/zones/RuLude_Gardens/npcs/Hunt_Registry.lua +++ b/scripts/zones/RuLude_Gardens/npcs/Hunt_Registry.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.hunts.onTrigger(player, npc) end diff --git a/scripts/zones/RuLude_Gardens/npcs/Kayle.lua b/scripts/zones/RuLude_Gardens/npcs/Kayle.lua deleted file mode 100644 index b8cde5fe15f..00000000000 --- a/scripts/zones/RuLude_Gardens/npcs/Kayle.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Ru'Lud Gardens --- NPC: Kayle ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(125) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/RuLude_Gardens/npcs/Laityn.lua b/scripts/zones/RuLude_Gardens/npcs/Laityn.lua index cbcddc5c193..3a20ad32271 100644 --- a/scripts/zones/RuLude_Gardens/npcs/Laityn.lua +++ b/scripts/zones/RuLude_Gardens/npcs/Laityn.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getQuestStatus(xi.questLog.WINDURST, xi.quest.id.windurst.RECOLLECTIONS) == xi.questStatus.QUEST_ACCEPTED and @@ -20,9 +17,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 10003 then player:setCharVar('recollectionsQuest', 1) diff --git a/scripts/zones/RuLude_Gardens/npcs/Leis.lua b/scripts/zones/RuLude_Gardens/npcs/Leis.lua index b2cb228f867..875624036ae 100644 --- a/scripts/zones/RuLude_Gardens/npcs/Leis.lua +++ b/scripts/zones/RuLude_Gardens/npcs/Leis.lua @@ -22,17 +22,4 @@ entity.onSpawn = function(npc) npc:pathThrough(pathNodes, xi.path.flag.PATROL) end -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(119) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/RuLude_Gardens/npcs/Maat.lua b/scripts/zones/RuLude_Gardens/npcs/Maat.lua index a0029ba976b..252d17e1afa 100644 --- a/scripts/zones/RuLude_Gardens/npcs/Maat.lua +++ b/scripts/zones/RuLude_Gardens/npcs/Maat.lua @@ -8,18 +8,12 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getCharVar('BeatAroundTheBushin') == 5 then player:startEvent(117) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 117 then player:setCharVar('BeatAroundTheBushin', 6) diff --git a/scripts/zones/RuLude_Gardens/npcs/Macchi_Gazlitah.lua b/scripts/zones/RuLude_Gardens/npcs/Macchi_Gazlitah.lua index b238b74a7f5..6066027cce7 100644 --- a/scripts/zones/RuLude_Gardens/npcs/Macchi_Gazlitah.lua +++ b/scripts/zones/RuLude_Gardens/npcs/Macchi_Gazlitah.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.RULUDE_GARDENS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -37,10 +34,4 @@ entity.onTrigger = function(player, npc) xi.shop.general(player, stock, xi.fameArea.JEUNO) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/RuLude_Gardens/npcs/Magian_Moogle_Green.lua b/scripts/zones/RuLude_Gardens/npcs/Magian_Moogle_Green.lua index 07027a7b10a..6e3a538a972 100644 --- a/scripts/zones/RuLude_Gardens/npcs/Magian_Moogle_Green.lua +++ b/scripts/zones/RuLude_Gardens/npcs/Magian_Moogle_Green.lua @@ -50,9 +50,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 10160 and option == 1 then if not player:hasKeyItem(xi.ki.MAGIAN_TRIAL_LOG) then diff --git a/scripts/zones/RuLude_Gardens/npcs/Main-Harmain.lua b/scripts/zones/RuLude_Gardens/npcs/Main-Harmain.lua deleted file mode 100644 index 63018c8452a..00000000000 --- a/scripts/zones/RuLude_Gardens/npcs/Main-Harmain.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Ru'Lude Gardens --- NPC: Main-Harmain ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(147) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/RuLude_Gardens/npcs/Marshal.lua b/scripts/zones/RuLude_Gardens/npcs/Marshal.lua deleted file mode 100644 index 62f7bb46f0e..00000000000 --- a/scripts/zones/RuLude_Gardens/npcs/Marshal.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Ru'Lude Gardens --- NPC: Marshal --- !pos 41.143 -0.998 -26.566 243 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(44) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/RuLude_Gardens/npcs/Nelcabrit.lua b/scripts/zones/RuLude_Gardens/npcs/Nelcabrit.lua index 1b12f86245e..013b6c9f3f6 100644 --- a/scripts/zones/RuLude_Gardens/npcs/Nelcabrit.lua +++ b/scripts/zones/RuLude_Gardens/npcs/Nelcabrit.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local pNation = player:getNation() @@ -26,10 +23,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/RuLude_Gardens/npcs/Nuria.lua b/scripts/zones/RuLude_Gardens/npcs/Nuria.lua deleted file mode 100644 index ae7cc09782d..00000000000 --- a/scripts/zones/RuLude_Gardens/npcs/Nuria.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Ru'Lude Gardens --- NPC: Nuria --- Map Marker ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(10095) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/RuLude_Gardens/npcs/Pakh_Jatalfih.lua b/scripts/zones/RuLude_Gardens/npcs/Pakh_Jatalfih.lua index 60dffb74b21..5f0f277134f 100644 --- a/scripts/zones/RuLude_Gardens/npcs/Pakh_Jatalfih.lua +++ b/scripts/zones/RuLude_Gardens/npcs/Pakh_Jatalfih.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local pNation = player:getNation() @@ -26,10 +23,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/RuLude_Gardens/npcs/Perisa-Neburusa.lua b/scripts/zones/RuLude_Gardens/npcs/Perisa-Neburusa.lua deleted file mode 100644 index 690aa7512e4..00000000000 --- a/scripts/zones/RuLude_Gardens/npcs/Perisa-Neburusa.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Ru'Lude Gardens --- NPC: Perisa-Neburusa --- Type: Residence Renter --- !pos 54.651 8.999 -74.372 243 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(76) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/RuLude_Gardens/npcs/Petva.lua b/scripts/zones/RuLude_Gardens/npcs/Petva.lua deleted file mode 100644 index d53357a0764..00000000000 --- a/scripts/zones/RuLude_Gardens/npcs/Petva.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Ru'Lude Gardens --- NPC: Petva ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(151) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/RuLude_Gardens/npcs/Pherimociel.lua b/scripts/zones/RuLude_Gardens/npcs/Pherimociel.lua deleted file mode 100644 index 728abf7c58a..00000000000 --- a/scripts/zones/RuLude_Gardens/npcs/Pherimociel.lua +++ /dev/null @@ -1,29 +0,0 @@ ------------------------------------ --- Area: Ru'Lude Gardens --- NPC: Pherimociel --- !pos -31.627 1.002 67.956 243 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - -- Removed pending confirmation - -- local hrandom = math.random() - - -- if hrandom < 0.2 then - -- player:startEvent(27) -- Observed while Three Paths is active - -- else - -- player:startEvent(29) - -- end -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/RuLude_Gardens/npcs/Pitenorelieu.lua b/scripts/zones/RuLude_Gardens/npcs/Pitenorelieu.lua deleted file mode 100644 index 56be05bdc5e..00000000000 --- a/scripts/zones/RuLude_Gardens/npcs/Pitenorelieu.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Ru'Lude Gardens --- NPC: Pitenorelieu ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(77) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/RuLude_Gardens/npcs/Pursuivant.lua b/scripts/zones/RuLude_Gardens/npcs/Pursuivant.lua deleted file mode 100644 index 63ef18b4509..00000000000 --- a/scripts/zones/RuLude_Gardens/npcs/Pursuivant.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Ru'Lude Gardens --- NPC: Pursuivant --- !pos 52.020 -1 -17.813 243 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(69) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/RuLude_Gardens/npcs/Rainhard.lua b/scripts/zones/RuLude_Gardens/npcs/Rainhard.lua deleted file mode 100644 index 25246db4b0a..00000000000 --- a/scripts/zones/RuLude_Gardens/npcs/Rainhard.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Ru'Lude Gardens --- NPC: Rainhard --- !pos -2.397 -5.999 68.749 243 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(34) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/RuLude_Gardens/npcs/Sitting_Ram.lua b/scripts/zones/RuLude_Gardens/npcs/Sitting_Ram.lua deleted file mode 100644 index 94ed26e87f4..00000000000 --- a/scripts/zones/RuLude_Gardens/npcs/Sitting_Ram.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Ru'Lud Gardens --- NPC: Sitting Ram ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(115) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/RuLude_Gardens/npcs/Splintery_Chest.lua b/scripts/zones/RuLude_Gardens/npcs/Splintery_Chest.lua index b10cf69dd27..1600a21f5d0 100644 --- a/scripts/zones/RuLude_Gardens/npcs/Splintery_Chest.lua +++ b/scripts/zones/RuLude_Gardens/npcs/Splintery_Chest.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.RULUDE_GARDENS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if xi.settings.main.ENABLE_MAGIAN_TRIALS ~= 1 then return @@ -18,9 +15,6 @@ entity.onTrigger = function(player, npc) player:startEvent(10133) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) local optionTable = { diff --git a/scripts/zones/RuLude_Gardens/npcs/Symphonic_Curator.lua b/scripts/zones/RuLude_Gardens/npcs/Symphonic_Curator.lua index 8ad7361a91a..05524468228 100644 --- a/scripts/zones/RuLude_Gardens/npcs/Symphonic_Curator.lua +++ b/scripts/zones/RuLude_Gardens/npcs/Symphonic_Curator.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.symphonic_curator.onTrigger(player, npc) end diff --git a/scripts/zones/RuLude_Gardens/npcs/Taillegeas.lua b/scripts/zones/RuLude_Gardens/npcs/Taillegeas.lua deleted file mode 100644 index 2cc4c855e57..00000000000 --- a/scripts/zones/RuLude_Gardens/npcs/Taillegeas.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Ru'Lude Gardens --- NPC: Taillegeas ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(10061) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/RuLude_Gardens/npcs/Tillecoe.lua b/scripts/zones/RuLude_Gardens/npcs/Tillecoe.lua deleted file mode 100644 index 7d060a6f286..00000000000 --- a/scripts/zones/RuLude_Gardens/npcs/Tillecoe.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Ru'Lude Gardens --- NPC: Tillecoe --- !pos 38.528 -0.997 -6.363 243 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(70) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/RuLude_Gardens/npcs/Trail_Markings.lua b/scripts/zones/RuLude_Gardens/npcs/Trail_Markings.lua index 8da20a3df70..603faa83a8b 100644 --- a/scripts/zones/RuLude_Gardens/npcs/Trail_Markings.lua +++ b/scripts/zones/RuLude_Gardens/npcs/Trail_Markings.lua @@ -7,16 +7,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.dynamis.entryNpcOnTrigger(player, npc) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.dynamis.entryNpcOnEventFinish(player, csid, option, npc) end diff --git a/scripts/zones/RuLude_Gardens/npcs/Tsugumi.lua b/scripts/zones/RuLude_Gardens/npcs/Tsugumi.lua deleted file mode 100644 index a06d8b756ab..00000000000 --- a/scripts/zones/RuLude_Gardens/npcs/Tsugumi.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Ru'Lude Gardens --- NPC: Tsugumi ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(163) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/RuLude_Gardens/npcs/Venessa.lua b/scripts/zones/RuLude_Gardens/npcs/Venessa.lua deleted file mode 100644 index 494d68387f1..00000000000 --- a/scripts/zones/RuLude_Gardens/npcs/Venessa.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Ru'Lud Gardens --- NPC: Venessa ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(10064) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/RuLude_Gardens/npcs/Vincent.lua b/scripts/zones/RuLude_Gardens/npcs/Vincent.lua index 30aeb3551da..66715f3ba8d 100644 --- a/scripts/zones/RuLude_Gardens/npcs/Vincent.lua +++ b/scripts/zones/RuLude_Gardens/npcs/Vincent.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.warpNPCOnTrigger(player, npc) end diff --git a/scripts/zones/RuLude_Gardens/npcs/Yavoraile.lua b/scripts/zones/RuLude_Gardens/npcs/Yavoraile.lua index 1a336966ec6..79ee14f6387 100644 --- a/scripts/zones/RuLude_Gardens/npcs/Yavoraile.lua +++ b/scripts/zones/RuLude_Gardens/npcs/Yavoraile.lua @@ -18,16 +18,4 @@ entity.onSpawn = function(npc) npc:pathThrough(pathNodes, xi.path.flag.PATROL) end -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/RuLude_Gardens/npcs/_6r2.lua b/scripts/zones/RuLude_Gardens/npcs/_6r2.lua index 5cca592b307..4cf4546ac04 100644 --- a/scripts/zones/RuLude_Gardens/npcs/_6r2.lua +++ b/scripts/zones/RuLude_Gardens/npcs/_6r2.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.RULUDE_GARDENS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local pNation = player:getNation() @@ -24,10 +21,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/RuLude_Gardens/npcs/_6r5.lua b/scripts/zones/RuLude_Gardens/npcs/_6r5.lua index bc3c66f7174..9eeb8535431 100644 --- a/scripts/zones/RuLude_Gardens/npcs/_6r5.lua +++ b/scripts/zones/RuLude_Gardens/npcs/_6r5.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.RULUDE_GARDENS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local pNation = player:getNation() @@ -24,10 +21,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/RuLude_Gardens/npcs/_6r8.lua b/scripts/zones/RuLude_Gardens/npcs/_6r8.lua index 557ed7d8b57..fd6b8cb3bb8 100644 --- a/scripts/zones/RuLude_Gardens/npcs/_6r8.lua +++ b/scripts/zones/RuLude_Gardens/npcs/_6r8.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.RULUDE_GARDENS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getNation() == xi.nation.WINDURST and @@ -23,10 +20,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/RuLude_Gardens/npcs/_6r9.lua b/scripts/zones/RuLude_Gardens/npcs/_6r9.lua index 2a0f505b32e..1e093e3d448 100644 --- a/scripts/zones/RuLude_Gardens/npcs/_6r9.lua +++ b/scripts/zones/RuLude_Gardens/npcs/_6r9.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.RULUDE_GARDENS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:hasKeyItem(xi.ki.ARCHDUCAL_AUDIENCE_PERMIT) then player:messageSpecial(ID.text.SOVEREIGN_WITHOUT_AN_APPOINTMENT) @@ -20,10 +17,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/RuLude_Gardens/npcs/qm1.lua b/scripts/zones/RuLude_Gardens/npcs/qm1.lua deleted file mode 100644 index 4d1138dcc58..00000000000 --- a/scripts/zones/RuLude_Gardens/npcs/qm1.lua +++ /dev/null @@ -1,24 +0,0 @@ ------------------------------------ --- Area: Ru'Lude Gardens --- NPC: ??? --- NPC for Dynamis Divergence Quest ------------------------------------ -local ID = zones[xi.zone.RULUDE_GARDENS] ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:messageSpecial(ID.text.NOTHING_OUT_OF_ORDINARY) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/RuLude_Gardens/npcs/relic.lua b/scripts/zones/RuLude_Gardens/npcs/relic.lua index c97e9ee1c3e..4dfecf96768 100644 --- a/scripts/zones/RuLude_Gardens/npcs/relic.lua +++ b/scripts/zones/RuLude_Gardens/npcs/relic.lua @@ -21,9 +21,6 @@ entity.onTrigger = function(player, npc) player:messageSpecial(ID.text.NOTHING_OUT_OF_ORDINARY) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 10035 and From 05fa46d40b8265c0520849c54a503a9d5407d645 Mon Sep 17 00:00:00 2001 From: claywar Date: Sun, 19 Jan 2025 18:48:03 -0500 Subject: [PATCH 3/3] Remove empty NPCs, add Default Actions - Promyvion Dem ~ Ranguemont Comment unused IDs local --- scripts/zones/Promyvion-Dem/npcs/qm_map.lua | 3 --- scripts/zones/Promyvion-Holla/npcs/qm_map.lua | 3 --- scripts/zones/Promyvion-Mea/npcs/qm_map.lua | 3 --- scripts/zones/Promyvion-Vahzl/npcs/qm_map.lua | 3 --- scripts/zones/PsoXja/DefaultActions.lua | 9 +++++++ scripts/zones/PsoXja/npcs/Treasure_Chest.lua | 6 ----- scripts/zones/PsoXja/npcs/_090.lua | 3 --- scripts/zones/PsoXja/npcs/_091.lua | 3 --- scripts/zones/PsoXja/npcs/_092.lua | 3 --- scripts/zones/PsoXja/npcs/_093.lua | 3 --- scripts/zones/PsoXja/npcs/_094.lua | 3 --- scripts/zones/PsoXja/npcs/_095.lua | 3 --- scripts/zones/PsoXja/npcs/_096.lua | 3 --- scripts/zones/PsoXja/npcs/_097.lua | 3 --- scripts/zones/PsoXja/npcs/_098.lua | 3 --- scripts/zones/PsoXja/npcs/_099.lua | 3 --- scripts/zones/PsoXja/npcs/_09a.lua | 3 --- scripts/zones/PsoXja/npcs/_09b.lua | 3 --- scripts/zones/PsoXja/npcs/_09c.lua | 3 --- scripts/zones/PsoXja/npcs/_09d.lua | 3 --- scripts/zones/PsoXja/npcs/_09e.lua | 3 --- scripts/zones/PsoXja/npcs/_09f.lua | 3 --- scripts/zones/PsoXja/npcs/_09g.lua | 23 ---------------- scripts/zones/PsoXja/npcs/_09h.lua | 23 ---------------- scripts/zones/PsoXja/npcs/_i94.lua | 9 ------- scripts/zones/PsoXja/npcs/_i96.lua | 9 ------- scripts/zones/PsoXja/npcs/_i97.lua | 9 ------- scripts/zones/PsoXja/npcs/_i98.lua | 9 ------- scripts/zones/PsoXja/npcs/_i99.lua | 23 ---------------- scripts/zones/PsoXja/npcs/_i9y.lua | 6 ----- .../zones/PsoXja/npcs/qm_blue_bracelet.lua | 24 ----------------- scripts/zones/PsoXja/npcs/qm_culberry.lua | 6 ----- .../zones/PsoXja/npcs/qm_green_bracelet.lua | 24 ----------------- .../zones/QuBia_Arena/npcs/Burning_Circle.lua | 6 ----- scripts/zones/Qufim_Island/DefaultActions.lua | 8 ++++++ .../Qufim_Island/npcs/Beastmens_Banner.lua | 24 ----------------- .../zones/Qufim_Island/npcs/Field_Manual.lua | 3 --- .../Qufim_Island/npcs/Geomantic_Reservoir.lua | 6 ----- .../Qufim_Island/npcs/Giant_Footprint.lua | 25 ------------------ .../zones/Qufim_Island/npcs/Hieroglyphics.lua | 6 ----- scripts/zones/Qufim_Island/npcs/Jiwon.lua | 3 --- scripts/zones/Qufim_Island/npcs/Luck_Rune.lua | 25 ------------------ .../zones/Qufim_Island/npcs/Nightflowers.lua | 9 ------- .../Qufim_Island/npcs/Swirling_Vortex.lua | 6 ----- .../Qufim_Island/npcs/Treasure_Casket.lua | 3 --- .../zones/Qufim_Island/npcs/Trodden_Snow.lua | 26 ------------------- .../npcs/Undulating_Confluence.lua | 6 ----- scripts/zones/Qufim_Island/npcs/qm3.lua | 3 --- .../zones/Quicksand_Caves/DefaultActions.lua | 4 ++- .../Quicksand_Caves/npcs/Grounds_Tome.lua | 3 --- .../Quicksand_Caves/npcs/Treasure_Casket.lua | 3 --- .../Quicksand_Caves/npcs/Treasure_Coffer.lua | 6 ----- scripts/zones/Quicksand_Caves/npcs/_5s0.lua | 9 ------- scripts/zones/Quicksand_Caves/npcs/_5s1.lua | 9 ------- scripts/zones/Quicksand_Caves/npcs/_5s2.lua | 9 ------- scripts/zones/Quicksand_Caves/npcs/_5s3.lua | 9 ------- scripts/zones/Quicksand_Caves/npcs/_5s4.lua | 9 ------- scripts/zones/Quicksand_Caves/npcs/_5s5.lua | 9 ------- scripts/zones/Quicksand_Caves/npcs/_5s6.lua | 9 ------- scripts/zones/Quicksand_Caves/npcs/_5s7.lua | 9 ------- scripts/zones/Quicksand_Caves/npcs/_5s8.lua | 9 ------- scripts/zones/Quicksand_Caves/npcs/_5s9.lua | 9 ------- scripts/zones/Quicksand_Caves/npcs/_5sa.lua | 9 ------- scripts/zones/Quicksand_Caves/npcs/_5sb.lua | 9 ------- scripts/zones/Quicksand_Caves/npcs/_5sc.lua | 9 ------- scripts/zones/Quicksand_Caves/npcs/qm2.lua | 10 ------- scripts/zones/Quicksand_Caves/npcs/qm5.lua | 6 ----- scripts/zones/Quicksand_Caves/npcs/qm7.lua | 25 ------------------ scripts/zones/Qulun_Dome/npcs/The_Mute.lua | 9 ------- scripts/zones/Qulun_Dome/npcs/_440.lua | 6 ----- scripts/zones/Qulun_Dome/npcs/_441.lua | 9 ------- .../npcs/Vertical_Transit_Device_1.lua | 3 --- scripts/zones/RaKaznar_Turris/npcs/_7p1.lua | 6 ----- scripts/zones/Rabao/DefaultActions.lua | 24 ++++++++++++++--- scripts/zones/Rabao/npcs/Agado-Pugado.lua | 6 ----- scripts/zones/Rabao/npcs/Alfesar.lua | 6 ----- scripts/zones/Rabao/npcs/Amaja-Kumaja.lua | 9 ------- scripts/zones/Rabao/npcs/Angry_Goat.lua | 21 --------------- scripts/zones/Rabao/npcs/Ashu_Bolkhomo.lua | 6 ----- scripts/zones/Rabao/npcs/Bald_Aurochs.lua | 13 ---------- scripts/zones/Rabao/npcs/Brave_Ox.lua | 9 ------- scripts/zones/Rabao/npcs/Brave_Wolf.lua | 9 ------- scripts/zones/Rabao/npcs/Cavalgrinne.lua | 9 ------- scripts/zones/Rabao/npcs/Chamaja-Tamaja.lua | 21 --------------- scripts/zones/Rabao/npcs/Cothric.lua | 21 --------------- scripts/zones/Rabao/npcs/Datta.lua | 21 --------------- scripts/zones/Rabao/npcs/Edigey.lua | 3 --- scripts/zones/Rabao/npcs/Eflatun.lua | 13 ---------- scripts/zones/Rabao/npcs/Generoit.lua | 9 ------- scripts/zones/Rabao/npcs/Golden_Condor.lua | 21 --------------- scripts/zones/Rabao/npcs/Guinavie.lua | 3 --- scripts/zones/Rabao/npcs/Hunt_Registry.lua | 3 --- scripts/zones/Rabao/npcs/Hyesun.lua | 9 ------- scripts/zones/Rabao/npcs/Irmilant.lua | 3 --- scripts/zones/Rabao/npcs/Iron_Muscles.lua | 21 --------------- scripts/zones/Rabao/npcs/Kedhareshvar.lua | 21 --------------- scripts/zones/Rabao/npcs/Leodarion.lua | 3 --- scripts/zones/Rabao/npcs/Maryoh_Comyujah.lua | 23 ---------------- scripts/zones/Rabao/npcs/Mileon.lua | 23 ---------------- scripts/zones/Rabao/npcs/Nomad_Moogle.lua | 9 ------- scripts/zones/Rabao/npcs/Pakhi_Churhebi.lua | 9 ------- scripts/zones/Rabao/npcs/Rahi_Fohlatti.lua | 3 --- scripts/zones/Rabao/npcs/Rudolfo.lua | 21 --------------- scripts/zones/Rabao/npcs/Scamplix.lua | 9 ------- scripts/zones/Rabao/npcs/Shiny_Teeth.lua | 9 ------- scripts/zones/Rabao/npcs/Shupah_Mujuuk.lua | 6 ----- scripts/zones/Rabao/npcs/Skeea.lua | 21 --------------- scripts/zones/Rabao/npcs/Smiling_Rat.lua | 9 ------- scripts/zones/Rabao/npcs/Spirit_Singer.lua | 9 ------- scripts/zones/Rabao/npcs/Waylea.lua | 9 ------- scripts/zones/Rabao/npcs/Yabehbeh.lua | 21 --------------- scripts/zones/Rabao/npcs/Zoriboh.lua | 21 --------------- scripts/zones/Rabao/npcs/Zungutt.lua | 21 --------------- .../zones/Rala_Waterways/DefaultActions.lua | 1 + .../npcs/Antiquated_Sluice_Gate.lua | 3 --- .../Rala_Waterways/npcs/Sluice_Gate_2.lua | 9 ------- .../Rala_Waterways/npcs/Sluice_Gate_7.lua | 22 ---------------- .../npcs/Geomagnetic_Fount.lua | 9 ------- .../Ranguemont_Pass/npcs/Grounds_Tome.lua | 3 --- .../zones/Ranguemont_Pass/npcs/Myffore.lua | 6 ----- .../zones/Ranguemont_Pass/npcs/Perchond.lua | 3 --- .../Ranguemont_Pass/npcs/Treasure_Casket.lua | 3 --- .../npcs/Waters_of_Oblivion.lua | 6 ----- .../zones/RuAun_Gardens/DefaultActions.lua | 2 +- 124 files changed, 42 insertions(+), 1138 deletions(-) create mode 100644 scripts/zones/PsoXja/DefaultActions.lua delete mode 100644 scripts/zones/PsoXja/npcs/_09g.lua delete mode 100644 scripts/zones/PsoXja/npcs/_09h.lua delete mode 100644 scripts/zones/PsoXja/npcs/_i99.lua delete mode 100644 scripts/zones/PsoXja/npcs/qm_blue_bracelet.lua delete mode 100644 scripts/zones/PsoXja/npcs/qm_green_bracelet.lua create mode 100644 scripts/zones/Qufim_Island/DefaultActions.lua delete mode 100644 scripts/zones/Qufim_Island/npcs/Beastmens_Banner.lua delete mode 100644 scripts/zones/Qufim_Island/npcs/Giant_Footprint.lua delete mode 100644 scripts/zones/Qufim_Island/npcs/Luck_Rune.lua delete mode 100644 scripts/zones/Qufim_Island/npcs/Trodden_Snow.lua delete mode 100644 scripts/zones/Quicksand_Caves/npcs/qm7.lua delete mode 100644 scripts/zones/Rabao/npcs/Angry_Goat.lua delete mode 100644 scripts/zones/Rabao/npcs/Chamaja-Tamaja.lua delete mode 100644 scripts/zones/Rabao/npcs/Cothric.lua delete mode 100644 scripts/zones/Rabao/npcs/Datta.lua delete mode 100644 scripts/zones/Rabao/npcs/Golden_Condor.lua delete mode 100644 scripts/zones/Rabao/npcs/Iron_Muscles.lua delete mode 100644 scripts/zones/Rabao/npcs/Kedhareshvar.lua delete mode 100644 scripts/zones/Rabao/npcs/Maryoh_Comyujah.lua delete mode 100644 scripts/zones/Rabao/npcs/Mileon.lua delete mode 100644 scripts/zones/Rabao/npcs/Rudolfo.lua delete mode 100644 scripts/zones/Rabao/npcs/Skeea.lua delete mode 100644 scripts/zones/Rabao/npcs/Yabehbeh.lua delete mode 100644 scripts/zones/Rabao/npcs/Zoriboh.lua delete mode 100644 scripts/zones/Rabao/npcs/Zungutt.lua delete mode 100644 scripts/zones/Rala_Waterways/npcs/Sluice_Gate_7.lua diff --git a/scripts/zones/Promyvion-Dem/npcs/qm_map.lua b/scripts/zones/Promyvion-Dem/npcs/qm_map.lua index ca0c4ab9a36..c059aa04daf 100644 --- a/scripts/zones/Promyvion-Dem/npcs/qm_map.lua +++ b/scripts/zones/Promyvion-Dem/npcs/qm_map.lua @@ -30,9 +30,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 49 then player:confirmTrade() diff --git a/scripts/zones/Promyvion-Holla/npcs/qm_map.lua b/scripts/zones/Promyvion-Holla/npcs/qm_map.lua index 18ec0e786bc..6f72c973127 100644 --- a/scripts/zones/Promyvion-Holla/npcs/qm_map.lua +++ b/scripts/zones/Promyvion-Holla/npcs/qm_map.lua @@ -29,9 +29,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 49 then player:confirmTrade() diff --git a/scripts/zones/Promyvion-Mea/npcs/qm_map.lua b/scripts/zones/Promyvion-Mea/npcs/qm_map.lua index 34ac2852751..e83ebdc4969 100644 --- a/scripts/zones/Promyvion-Mea/npcs/qm_map.lua +++ b/scripts/zones/Promyvion-Mea/npcs/qm_map.lua @@ -30,9 +30,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 49 then player:confirmTrade() diff --git a/scripts/zones/Promyvion-Vahzl/npcs/qm_map.lua b/scripts/zones/Promyvion-Vahzl/npcs/qm_map.lua index 0116db08172..d1cc0c31864 100644 --- a/scripts/zones/Promyvion-Vahzl/npcs/qm_map.lua +++ b/scripts/zones/Promyvion-Vahzl/npcs/qm_map.lua @@ -29,9 +29,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 48 then player:confirmTrade() diff --git a/scripts/zones/PsoXja/DefaultActions.lua b/scripts/zones/PsoXja/DefaultActions.lua new file mode 100644 index 00000000000..bd806c50026 --- /dev/null +++ b/scripts/zones/PsoXja/DefaultActions.lua @@ -0,0 +1,9 @@ +local ID = zones[xi.zone.PSOXJA] + +return { + ['_09g'] = { messageSpecial = ID.text.DOOR_LOCKED }, + ['_09h'] = { messageSpecial = ID.text.DOOR_LOCKED }, + ['_i99'] = { messageSpecial = ID.text.DOOR_LOCKED }, + ['qm_blue_bracelet'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, + ['qm_green_bracelet'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, +} diff --git a/scripts/zones/PsoXja/npcs/Treasure_Chest.lua b/scripts/zones/PsoXja/npcs/Treasure_Chest.lua index f57f687f1ad..e8edd364efc 100644 --- a/scripts/zones/PsoXja/npcs/Treasure_Chest.lua +++ b/scripts/zones/PsoXja/npcs/Treasure_Chest.lua @@ -14,10 +14,4 @@ entity.onTrigger = function(player, npc) xi.treasure.onTrigger(player, xi.treasure.type.CHEST) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/PsoXja/npcs/_090.lua b/scripts/zones/PsoXja/npcs/_090.lua index f7a6a598f0e..7545e9bc25a 100644 --- a/scripts/zones/PsoXja/npcs/_090.lua +++ b/scripts/zones/PsoXja/npcs/_090.lua @@ -27,9 +27,6 @@ entity.onTrigger = function(player, npc) psoXjaGlobal.attemptOpenDoor(player, npc, player:getXPos() <= 341) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 26 and option == 1 then player:setPos(260, -0.25, -20, 254, 111) diff --git a/scripts/zones/PsoXja/npcs/_091.lua b/scripts/zones/PsoXja/npcs/_091.lua index 7b01e0c30d6..18dd370b1ae 100644 --- a/scripts/zones/PsoXja/npcs/_091.lua +++ b/scripts/zones/PsoXja/npcs/_091.lua @@ -27,9 +27,6 @@ entity.onTrigger = function(player, npc) psoXjaGlobal.attemptOpenDoor(player, npc, player:getZPos() >= -61) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 26 and option == 1 then player:setPos(260, -0.25, -20, 254, 111) diff --git a/scripts/zones/PsoXja/npcs/_092.lua b/scripts/zones/PsoXja/npcs/_092.lua index 67b570add6f..250947ba92e 100644 --- a/scripts/zones/PsoXja/npcs/_092.lua +++ b/scripts/zones/PsoXja/npcs/_092.lua @@ -27,9 +27,6 @@ entity.onTrigger = function(player, npc) psoXjaGlobal.attemptOpenDoor(player, npc, player:getXPos() >= 339) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 26 and option == 1 then player:setPos(260, -0.25, -20, 254, 111) diff --git a/scripts/zones/PsoXja/npcs/_093.lua b/scripts/zones/PsoXja/npcs/_093.lua index 68e8165080d..d0ab15b1a53 100644 --- a/scripts/zones/PsoXja/npcs/_093.lua +++ b/scripts/zones/PsoXja/npcs/_093.lua @@ -27,9 +27,6 @@ entity.onTrigger = function(player, npc) psoXjaGlobal.attemptOpenDoor(player, npc, player:getXPos() >= 322) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 26 and option == 1 then player:setPos(260, -0.25, -20, 254, 111) diff --git a/scripts/zones/PsoXja/npcs/_094.lua b/scripts/zones/PsoXja/npcs/_094.lua index 5aa2385de02..cdd895e1f3c 100644 --- a/scripts/zones/PsoXja/npcs/_094.lua +++ b/scripts/zones/PsoXja/npcs/_094.lua @@ -27,9 +27,6 @@ entity.onTrigger = function(player, npc) psoXjaGlobal.attemptOpenDoor(player, npc, player:getZPos() >= -101) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 26 and option == 1 then player:setPos(260, -0.25, -20, 254, 111) diff --git a/scripts/zones/PsoXja/npcs/_095.lua b/scripts/zones/PsoXja/npcs/_095.lua index d87881b4416..49c91dbf274 100644 --- a/scripts/zones/PsoXja/npcs/_095.lua +++ b/scripts/zones/PsoXja/npcs/_095.lua @@ -27,9 +27,6 @@ entity.onTrigger = function(player, npc) psoXjaGlobal.attemptOpenDoor(player, npc, player:getXPos() >= 299) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 26 and option == 1 then player:setPos(260, -0.25, -20, 254, 111) diff --git a/scripts/zones/PsoXja/npcs/_096.lua b/scripts/zones/PsoXja/npcs/_096.lua index 983d483a6b3..673916a72bb 100644 --- a/scripts/zones/PsoXja/npcs/_096.lua +++ b/scripts/zones/PsoXja/npcs/_096.lua @@ -27,9 +27,6 @@ entity.onTrigger = function(player, npc) psoXjaGlobal.attemptOpenDoor(player, npc, player:getZPos() <= -99) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 26 and option == 1 then player:setPos(260, -0.25, -20, 254, 111) diff --git a/scripts/zones/PsoXja/npcs/_097.lua b/scripts/zones/PsoXja/npcs/_097.lua index 3effb737855..ec6fa33606d 100644 --- a/scripts/zones/PsoXja/npcs/_097.lua +++ b/scripts/zones/PsoXja/npcs/_097.lua @@ -27,9 +27,6 @@ entity.onTrigger = function(player, npc) psoXjaGlobal.attemptOpenDoor(player, npc, player:getZPos() <= -82) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 26 and option == 1 then player:setPos(260, -0.25, -20, 254, 111) diff --git a/scripts/zones/PsoXja/npcs/_098.lua b/scripts/zones/PsoXja/npcs/_098.lua index cf8f07178bc..4c29a20d5f2 100644 --- a/scripts/zones/PsoXja/npcs/_098.lua +++ b/scripts/zones/PsoXja/npcs/_098.lua @@ -27,9 +27,6 @@ entity.onTrigger = function(player, npc) psoXjaGlobal.attemptOpenDoor(player, npc, player:getXPos() >= 259) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 26 and option == 1 then player:setPos(260, -0.25, -20, 254, 111) diff --git a/scripts/zones/PsoXja/npcs/_099.lua b/scripts/zones/PsoXja/npcs/_099.lua index cd5db9f2f67..b57e1b7df77 100644 --- a/scripts/zones/PsoXja/npcs/_099.lua +++ b/scripts/zones/PsoXja/npcs/_099.lua @@ -27,9 +27,6 @@ entity.onTrigger = function(player, npc) psoXjaGlobal.attemptOpenDoor(player, npc, player:getZPos() <= -59) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 26 and option == 1 then player:setPos(260, -0.25, -20, 254, 111) diff --git a/scripts/zones/PsoXja/npcs/_09a.lua b/scripts/zones/PsoXja/npcs/_09a.lua index 82258edcba9..ad942e1e14c 100644 --- a/scripts/zones/PsoXja/npcs/_09a.lua +++ b/scripts/zones/PsoXja/npcs/_09a.lua @@ -27,9 +27,6 @@ entity.onTrigger = function(player, npc) psoXjaGlobal.attemptOpenDoor(player, npc, player:getXPos() <= 261) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 26 and option == 1 then player:setPos(260, -0.25, -20, 254, 111) diff --git a/scripts/zones/PsoXja/npcs/_09b.lua b/scripts/zones/PsoXja/npcs/_09b.lua index 24b6091b2b8..3fd95a0feed 100644 --- a/scripts/zones/PsoXja/npcs/_09b.lua +++ b/scripts/zones/PsoXja/npcs/_09b.lua @@ -27,9 +27,6 @@ entity.onTrigger = function(player, npc) psoXjaGlobal.attemptOpenDoor(player, npc, player:getXPos() <= 278) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 26 and option == 1 then player:setPos(260, -0.25, -20, 254, 111) diff --git a/scripts/zones/PsoXja/npcs/_09c.lua b/scripts/zones/PsoXja/npcs/_09c.lua index a23ba5d0c88..11eeeff429c 100644 --- a/scripts/zones/PsoXja/npcs/_09c.lua +++ b/scripts/zones/PsoXja/npcs/_09c.lua @@ -27,9 +27,6 @@ entity.onTrigger = function(player, npc) psoXjaGlobal.attemptOpenDoor(player, npc, player:getZPos() <= -19) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 26 and option == 1 then player:setPos(260, -0.25, -20, 254, 111) diff --git a/scripts/zones/PsoXja/npcs/_09d.lua b/scripts/zones/PsoXja/npcs/_09d.lua index c98310370cd..ae52444c0ad 100644 --- a/scripts/zones/PsoXja/npcs/_09d.lua +++ b/scripts/zones/PsoXja/npcs/_09d.lua @@ -27,9 +27,6 @@ entity.onTrigger = function(player, npc) psoXjaGlobal.attemptOpenDoor(player, npc, player:getXPos() <= 301) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 26 and option == 1 then player:setPos(260, -0.25, -20, 254, 111) diff --git a/scripts/zones/PsoXja/npcs/_09e.lua b/scripts/zones/PsoXja/npcs/_09e.lua index fbe86e109d8..ab157c1cdf1 100644 --- a/scripts/zones/PsoXja/npcs/_09e.lua +++ b/scripts/zones/PsoXja/npcs/_09e.lua @@ -27,9 +27,6 @@ entity.onTrigger = function(player, npc) psoXjaGlobal.attemptOpenDoor(player, npc, player:getZPos() >= -21) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 26 and option == 1 then player:setPos(260, -0.25, -20, 254, 111) diff --git a/scripts/zones/PsoXja/npcs/_09f.lua b/scripts/zones/PsoXja/npcs/_09f.lua index 701c0f6369d..253c44f9721 100644 --- a/scripts/zones/PsoXja/npcs/_09f.lua +++ b/scripts/zones/PsoXja/npcs/_09f.lua @@ -27,9 +27,6 @@ entity.onTrigger = function(player, npc) psoXjaGlobal.attemptOpenDoor(player, npc, player:getZPos() >= -38) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 26 and option == 1 then player:setPos(260, -0.25, -20, 254, 111) diff --git a/scripts/zones/PsoXja/npcs/_09g.lua b/scripts/zones/PsoXja/npcs/_09g.lua deleted file mode 100644 index 9f29aed83fb..00000000000 --- a/scripts/zones/PsoXja/npcs/_09g.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Pso'Xja --- NPC: Avatars Gate ------------------------------------ -local ID = zones[xi.zone.PSOXJA] ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:messageSpecial(ID.text.DOOR_LOCKED) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/PsoXja/npcs/_09h.lua b/scripts/zones/PsoXja/npcs/_09h.lua deleted file mode 100644 index 9f29aed83fb..00000000000 --- a/scripts/zones/PsoXja/npcs/_09h.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Pso'Xja --- NPC: Avatars Gate ------------------------------------ -local ID = zones[xi.zone.PSOXJA] ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:messageSpecial(ID.text.DOOR_LOCKED) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/PsoXja/npcs/_i94.lua b/scripts/zones/PsoXja/npcs/_i94.lua index 41ef0d3e627..44059629b2a 100644 --- a/scripts/zones/PsoXja/npcs/_i94.lua +++ b/scripts/zones/PsoXja/npcs/_i94.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.PSOXJA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local zPos = player:getZPos() @@ -26,10 +23,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/PsoXja/npcs/_i96.lua b/scripts/zones/PsoXja/npcs/_i96.lua index b2a25dc85ac..a3e71e6ca75 100644 --- a/scripts/zones/PsoXja/npcs/_i96.lua +++ b/scripts/zones/PsoXja/npcs/_i96.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.PSOXJA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local zPos = player:getZPos() @@ -26,10 +23,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/PsoXja/npcs/_i97.lua b/scripts/zones/PsoXja/npcs/_i97.lua index 63433d3c489..3fac6bb0f15 100644 --- a/scripts/zones/PsoXja/npcs/_i97.lua +++ b/scripts/zones/PsoXja/npcs/_i97.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.PSOXJA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local posZ = player:getZPos() if player:hasKeyItem(xi.ki.PSOXJA_PASS) and posZ >= 25 then @@ -21,10 +18,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/PsoXja/npcs/_i98.lua b/scripts/zones/PsoXja/npcs/_i98.lua index 6f9a889bb9c..606e11d6aec 100644 --- a/scripts/zones/PsoXja/npcs/_i98.lua +++ b/scripts/zones/PsoXja/npcs/_i98.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.PSOXJA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:hasCompletedMission(xi.mission.log_id.COP, xi.mission.id.cop.THE_ENDURING_TUMULT_OF_WAR) or @@ -25,10 +22,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/PsoXja/npcs/_i99.lua b/scripts/zones/PsoXja/npcs/_i99.lua deleted file mode 100644 index 049616e3043..00000000000 --- a/scripts/zones/PsoXja/npcs/_i99.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Pso'Xja --- NPC: Stone Gate ------------------------------------ -local ID = zones[xi.zone.PSOXJA] ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:messageSpecial(ID.text.DOOR_LOCKED) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/PsoXja/npcs/_i9y.lua b/scripts/zones/PsoXja/npcs/_i9y.lua index 953d1cf1d2d..3ba610a8d25 100644 --- a/scripts/zones/PsoXja/npcs/_i9y.lua +++ b/scripts/zones/PsoXja/npcs/_i9y.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.PSOXJA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if npc:getAnimation() == 9 then player:startEvent(58) @@ -19,9 +16,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 58 then local crystalOperator = npc:getID() diff --git a/scripts/zones/PsoXja/npcs/qm_blue_bracelet.lua b/scripts/zones/PsoXja/npcs/qm_blue_bracelet.lua deleted file mode 100644 index f0df2650bc8..00000000000 --- a/scripts/zones/PsoXja/npcs/qm_blue_bracelet.lua +++ /dev/null @@ -1,24 +0,0 @@ ------------------------------------ --- Area: Pso'xja --- NPC: ??? --- !pos -282.742 -3.600 -210.000 9 ------------------------------------ -local ID = zones[xi.zone.PSOXJA] ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:messageSpecial(ID.text.NOTHING_OUT_OF_ORDINARY) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/PsoXja/npcs/qm_culberry.lua b/scripts/zones/PsoXja/npcs/qm_culberry.lua index add67ca3b22..1436fe525af 100644 --- a/scripts/zones/PsoXja/npcs/qm_culberry.lua +++ b/scripts/zones/PsoXja/npcs/qm_culberry.lua @@ -31,10 +31,4 @@ entity.onTrigger = function(player, npc) player:messageSpecial(ID.text.BROKEN_KNIFE) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/PsoXja/npcs/qm_green_bracelet.lua b/scripts/zones/PsoXja/npcs/qm_green_bracelet.lua deleted file mode 100644 index 2446878041b..00000000000 --- a/scripts/zones/PsoXja/npcs/qm_green_bracelet.lua +++ /dev/null @@ -1,24 +0,0 @@ ------------------------------------ --- Area: Pso'xja --- NPC: ??? --- !pos -329.980 28.300 -163.000 9 ------------------------------------ -local ID = zones[xi.zone.PSOXJA] ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:messageSpecial(ID.text.NOTHING_OUT_OF_ORDINARY) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/QuBia_Arena/npcs/Burning_Circle.lua b/scripts/zones/QuBia_Arena/npcs/Burning_Circle.lua index 82719a0a02c..6492f633db2 100644 --- a/scripts/zones/QuBia_Arena/npcs/Burning_Circle.lua +++ b/scripts/zones/QuBia_Arena/npcs/Burning_Circle.lua @@ -6,18 +6,12 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) -- if player:hasKeyItem(xi.ki.MARK_OF_SEED) and player:getCurrentMission(xi.mission.log_id.ACP) == xi.mission.id.acp.THOSE_WHO_LURK_IN_SHADOWS_II then -- player:startEvent(5) -- Temp disabled pending fixes for the BCNM mobs. end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 5 then player:completeMission(xi.mission.log_id.ACP, xi.mission.id.acp.THOSE_WHO_LURK_IN_SHADOWS_II) diff --git a/scripts/zones/Qufim_Island/DefaultActions.lua b/scripts/zones/Qufim_Island/DefaultActions.lua new file mode 100644 index 00000000000..d0d93f3ba5e --- /dev/null +++ b/scripts/zones/Qufim_Island/DefaultActions.lua @@ -0,0 +1,8 @@ +local ID = zones[xi.zone.QUFIM_ISLAND] + +return { + ['Beastmens_Banner'] = { messageSpecial = ID.text.BEASTMEN_BANNER }, + ['Giant_Footprint'] = { messageSpecial = ID.text.GIGANTIC_FOOTPRINT }, + ['Luck_Rune'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, + ['Trodden_Snow'] = { messageSpecial = ID.text.ASA_SNOW }, +} diff --git a/scripts/zones/Qufim_Island/npcs/Beastmens_Banner.lua b/scripts/zones/Qufim_Island/npcs/Beastmens_Banner.lua deleted file mode 100644 index 2f04bf02f9d..00000000000 --- a/scripts/zones/Qufim_Island/npcs/Beastmens_Banner.lua +++ /dev/null @@ -1,24 +0,0 @@ ------------------------------------ --- Area: Qufim_Island --- NPC: Beastmen_s_Banner --- !pos 0.348 -20.126 73.479 126 ------------------------------------ -local ID = zones[xi.zone.QUFIM_ISLAND] ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:messageSpecial(ID.text.BEASTMEN_BANNER) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Qufim_Island/npcs/Field_Manual.lua b/scripts/zones/Qufim_Island/npcs/Field_Manual.lua index eb3ed1b6715..376090c25ff 100644 --- a/scripts/zones/Qufim_Island/npcs/Field_Manual.lua +++ b/scripts/zones/Qufim_Island/npcs/Field_Manual.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.regime.bookOnTrigger(player, xi.regime.type.FIELDS) end diff --git a/scripts/zones/Qufim_Island/npcs/Geomantic_Reservoir.lua b/scripts/zones/Qufim_Island/npcs/Geomantic_Reservoir.lua index 49ab7d55862..bfa495e5704 100644 --- a/scripts/zones/Qufim_Island/npcs/Geomantic_Reservoir.lua +++ b/scripts/zones/Qufim_Island/npcs/Geomantic_Reservoir.lua @@ -7,16 +7,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.geomanticReservoir.onTrigger(player, npc, xi.magic.spell.GEO_ATTUNEMENT) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.geomanticReservoir.onEventFinish(player, csid, xi.magic.spell.GEO_ATTUNEMENT) end diff --git a/scripts/zones/Qufim_Island/npcs/Giant_Footprint.lua b/scripts/zones/Qufim_Island/npcs/Giant_Footprint.lua deleted file mode 100644 index a1b06cd15c8..00000000000 --- a/scripts/zones/Qufim_Island/npcs/Giant_Footprint.lua +++ /dev/null @@ -1,25 +0,0 @@ ------------------------------------ --- Area: Qufim Island --- NPC: Giant Footprint --- Involved in quest: Regaining Trust --- !pos 501 -11 354 126 ------------------------------------ -local ID = zones[xi.zone.QUFIM_ISLAND] ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:messageSpecial(ID.text.GIGANTIC_FOOTPRINT) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Qufim_Island/npcs/Hieroglyphics.lua b/scripts/zones/Qufim_Island/npcs/Hieroglyphics.lua index d07e7bc0da0..abcf773bdd9 100644 --- a/scripts/zones/Qufim_Island/npcs/Hieroglyphics.lua +++ b/scripts/zones/Qufim_Island/npcs/Hieroglyphics.lua @@ -7,16 +7,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.dynamis.entryNpcOnTrigger(player, npc) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.dynamis.entryNpcOnEventFinish(player, csid, option, npc) end diff --git a/scripts/zones/Qufim_Island/npcs/Jiwon.lua b/scripts/zones/Qufim_Island/npcs/Jiwon.lua index 825f4bc090c..b892cf2731b 100644 --- a/scripts/zones/Qufim_Island/npcs/Jiwon.lua +++ b/scripts/zones/Qufim_Island/npcs/Jiwon.lua @@ -10,9 +10,6 @@ local entity = {} local vendorRegion = xi.region.QUFIMISLAND local vendorEvent = 32756 -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conquest.vendorOnTrigger(player, vendorRegion, vendorEvent) end diff --git a/scripts/zones/Qufim_Island/npcs/Luck_Rune.lua b/scripts/zones/Qufim_Island/npcs/Luck_Rune.lua deleted file mode 100644 index 3b5491a03a3..00000000000 --- a/scripts/zones/Qufim_Island/npcs/Luck_Rune.lua +++ /dev/null @@ -1,25 +0,0 @@ ------------------------------------ --- Area: Qufim Island --- NPC: Luck Rune --- Involved in Quest: Mhaura Fortune --- !pos -612.948 12.573 461.963 126 ------------------------------------ -local ID = zones[xi.zone.QUFIM_ISLAND] ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:messageSpecial(ID.text.NOTHING_OUT_OF_ORDINARY) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Qufim_Island/npcs/Nightflowers.lua b/scripts/zones/Qufim_Island/npcs/Nightflowers.lua index 644580ab837..b4cce42ee6f 100755 --- a/scripts/zones/Qufim_Island/npcs/Nightflowers.lua +++ b/scripts/zones/Qufim_Island/npcs/Nightflowers.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.QUFIM_ISLAND] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local vanadielClockTime = utils.vanadielClockTime() @@ -24,10 +21,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Qufim_Island/npcs/Swirling_Vortex.lua b/scripts/zones/Qufim_Island/npcs/Swirling_Vortex.lua index 1ff2f86dedf..165b9f230b3 100644 --- a/scripts/zones/Qufim_Island/npcs/Swirling_Vortex.lua +++ b/scripts/zones/Qufim_Island/npcs/Swirling_Vortex.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.QUFIM_ISLAND] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:hasCompletedMission(xi.mission.log_id.COP, xi.mission.id.cop.THE_MOTHERCRYSTALS) then player:startEvent(300) @@ -20,9 +17,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 300 and option == 1 then xi.teleport.to(player, xi.teleport.id.MISAREAUX_VORTEX) diff --git a/scripts/zones/Qufim_Island/npcs/Treasure_Casket.lua b/scripts/zones/Qufim_Island/npcs/Treasure_Casket.lua index 6737f750584..5f1bbc34d59 100644 --- a/scripts/zones/Qufim_Island/npcs/Treasure_Casket.lua +++ b/scripts/zones/Qufim_Island/npcs/Treasure_Casket.lua @@ -13,9 +13,6 @@ entity.onTrade = function(player, npc, trade) xi.caskets.onTrade(player, npc, trade) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.caskets.onEventFinish(player, csid, option, npc) end diff --git a/scripts/zones/Qufim_Island/npcs/Trodden_Snow.lua b/scripts/zones/Qufim_Island/npcs/Trodden_Snow.lua deleted file mode 100644 index 05ee47bbcec..00000000000 --- a/scripts/zones/Qufim_Island/npcs/Trodden_Snow.lua +++ /dev/null @@ -1,26 +0,0 @@ ------------------------------------ --- Area: Qufim Island --- NPC: Trodden Snow --- Mission: ASA - THAT_WHICH_CURDLES_BLOOD --- Mission: ASA - SUGAR_COATED_DIRECTIVE --- !pos -19 -17 104 126 ------------------------------------ -local ID = zones[xi.zone.QUFIM_ISLAND] ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:messageSpecial(ID.text.ASA_SNOW) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Qufim_Island/npcs/Undulating_Confluence.lua b/scripts/zones/Qufim_Island/npcs/Undulating_Confluence.lua index f66d155d9de..776b314a5c7 100644 --- a/scripts/zones/Qufim_Island/npcs/Undulating_Confluence.lua +++ b/scripts/zones/Qufim_Island/npcs/Undulating_Confluence.lua @@ -6,18 +6,12 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getCurrentMission(xi.mission.log_id.ROV) >= xi.mission.id.rov.SET_FREE then player:startEvent(65) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 65 and option == 1 then xi.teleport.to(player, xi.teleport.id.ESCHA_ZITAH) diff --git a/scripts/zones/Qufim_Island/npcs/qm3.lua b/scripts/zones/Qufim_Island/npcs/qm3.lua index 1c430cc1725..3c79cf9e584 100644 --- a/scripts/zones/Qufim_Island/npcs/qm3.lua +++ b/scripts/zones/Qufim_Island/npcs/qm3.lua @@ -71,9 +71,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 31 then player:completeMission(xi.mission.log_id.ACP, xi.mission.id.acp.THE_ECHO_AWAKENS) diff --git a/scripts/zones/Quicksand_Caves/DefaultActions.lua b/scripts/zones/Quicksand_Caves/DefaultActions.lua index eed7f4e198b..1daab89ee77 100644 --- a/scripts/zones/Quicksand_Caves/DefaultActions.lua +++ b/scripts/zones/Quicksand_Caves/DefaultActions.lua @@ -1,9 +1,11 @@ local ID = zones[xi.zone.QUICKSAND_CAVES] return { - ['qm_amk'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, + ['qm_amk'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, + ['qm2'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, ['qm3'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, ['qm4'] = { messageSpecial = ID.text.YOU_FIND_NOTHING_OUT }, ['qm6'] = { messageSpecial = ID.text.ANCIENT_LETTERS_UNREAD }, + ['qm7'] = { messageSpecial = ID.text.SOMETHING_IS_BURIED }, ['Fountain_of_Kings'] = { messageSpecial = ID.text.POOL_OF_WATER }, } diff --git a/scripts/zones/Quicksand_Caves/npcs/Grounds_Tome.lua b/scripts/zones/Quicksand_Caves/npcs/Grounds_Tome.lua index 5d6fd96d420..7fd76523aad 100644 --- a/scripts/zones/Quicksand_Caves/npcs/Grounds_Tome.lua +++ b/scripts/zones/Quicksand_Caves/npcs/Grounds_Tome.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.regime.bookOnTrigger(player, xi.regime.type.GROUNDS) end diff --git a/scripts/zones/Quicksand_Caves/npcs/Treasure_Casket.lua b/scripts/zones/Quicksand_Caves/npcs/Treasure_Casket.lua index cb7a8dac260..a15ac3173fa 100644 --- a/scripts/zones/Quicksand_Caves/npcs/Treasure_Casket.lua +++ b/scripts/zones/Quicksand_Caves/npcs/Treasure_Casket.lua @@ -13,9 +13,6 @@ entity.onTrade = function(player, npc, trade) xi.caskets.onTrade(player, npc, trade) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.caskets.onEventFinish(player, csid, option, npc) end diff --git a/scripts/zones/Quicksand_Caves/npcs/Treasure_Coffer.lua b/scripts/zones/Quicksand_Caves/npcs/Treasure_Coffer.lua index 6ffa341ab6e..7e064f89335 100644 --- a/scripts/zones/Quicksand_Caves/npcs/Treasure_Coffer.lua +++ b/scripts/zones/Quicksand_Caves/npcs/Treasure_Coffer.lua @@ -14,10 +14,4 @@ entity.onTrigger = function(player, npc) xi.treasure.onTrigger(player, xi.treasure.type.COFFER) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Quicksand_Caves/npcs/_5s0.lua b/scripts/zones/Quicksand_Caves/npcs/_5s0.lua index 90df26ac4ab..c1471b064b6 100644 --- a/scripts/zones/Quicksand_Caves/npcs/_5s0.lua +++ b/scripts/zones/Quicksand_Caves/npcs/_5s0.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.QUICKSAND_CAVES] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local difX = player:getXPos() - (-30) local difZ = player:getZPos() - (-60) @@ -23,10 +20,4 @@ entity.onTrigger = function(player, npc) player:messageSpecial(ID.text.DOOR_FIRMLY_SHUT) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Quicksand_Caves/npcs/_5s1.lua b/scripts/zones/Quicksand_Caves/npcs/_5s1.lua index a96b231c27c..30173a6af4f 100644 --- a/scripts/zones/Quicksand_Caves/npcs/_5s1.lua +++ b/scripts/zones/Quicksand_Caves/npcs/_5s1.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.QUICKSAND_CAVES] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local difX = player:getXPos()-(30) local difZ = player:getZPos()-(-180) @@ -23,10 +20,4 @@ entity.onTrigger = function(player, npc) player:messageSpecial(ID.text.DOOR_FIRMLY_SHUT) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Quicksand_Caves/npcs/_5s2.lua b/scripts/zones/Quicksand_Caves/npcs/_5s2.lua index 2f1f354d635..0a6f4d9133c 100644 --- a/scripts/zones/Quicksand_Caves/npcs/_5s2.lua +++ b/scripts/zones/Quicksand_Caves/npcs/_5s2.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.QUICKSAND_CAVES] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local difX = player:getXPos()-(-565) local difZ = player:getZPos()-(-420) @@ -23,10 +20,4 @@ entity.onTrigger = function(player, npc) player:messageSpecial(ID.text.DOOR_FIRMLY_SHUT) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Quicksand_Caves/npcs/_5s3.lua b/scripts/zones/Quicksand_Caves/npcs/_5s3.lua index 0d15ae08615..84024aaa920 100644 --- a/scripts/zones/Quicksand_Caves/npcs/_5s3.lua +++ b/scripts/zones/Quicksand_Caves/npcs/_5s3.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.QUICKSAND_CAVES] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local difX = player:getXPos()-(-685) local difZ = player:getZPos()-(-420) @@ -23,10 +20,4 @@ entity.onTrigger = function(player, npc) player:messageSpecial(ID.text.DOOR_FIRMLY_SHUT) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Quicksand_Caves/npcs/_5s4.lua b/scripts/zones/Quicksand_Caves/npcs/_5s4.lua index 86e7e44c993..0e2755c294f 100644 --- a/scripts/zones/Quicksand_Caves/npcs/_5s4.lua +++ b/scripts/zones/Quicksand_Caves/npcs/_5s4.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.QUICKSAND_CAVES] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local difX = player:getXPos()-(-714) local difZ = player:getZPos()-(-380) @@ -23,10 +20,4 @@ entity.onTrigger = function(player, npc) player:messageSpecial(ID.text.DOOR_FIRMLY_SHUT) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Quicksand_Caves/npcs/_5s5.lua b/scripts/zones/Quicksand_Caves/npcs/_5s5.lua index 2ebb696a959..8dfe73f8929 100644 --- a/scripts/zones/Quicksand_Caves/npcs/_5s5.lua +++ b/scripts/zones/Quicksand_Caves/npcs/_5s5.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.QUICKSAND_CAVES] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local difX = player:getXPos()-(-780) local difZ = player:getZPos()-(-446) @@ -23,10 +20,4 @@ entity.onTrigger = function(player, npc) player:messageSpecial(ID.text.DOOR_FIRMLY_SHUT) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Quicksand_Caves/npcs/_5s6.lua b/scripts/zones/Quicksand_Caves/npcs/_5s6.lua index 39bb87872a2..43434376de6 100644 --- a/scripts/zones/Quicksand_Caves/npcs/_5s6.lua +++ b/scripts/zones/Quicksand_Caves/npcs/_5s6.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.QUICKSAND_CAVES] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local difX = player:getXPos()-(-833) local difZ = player:getZPos()-(-380) @@ -23,10 +20,4 @@ entity.onTrigger = function(player, npc) player:messageSpecial(ID.text.DOOR_FIRMLY_SHUT) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Quicksand_Caves/npcs/_5s7.lua b/scripts/zones/Quicksand_Caves/npcs/_5s7.lua index a928ff362e9..c869be70d12 100644 --- a/scripts/zones/Quicksand_Caves/npcs/_5s7.lua +++ b/scripts/zones/Quicksand_Caves/npcs/_5s7.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.QUICKSAND_CAVES] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local difX = player:getXPos()-(-260) local difZ = player:getZPos()-(754) @@ -23,10 +20,4 @@ entity.onTrigger = function(player, npc) player:messageSpecial(ID.text.DOOR_FIRMLY_SHUT) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Quicksand_Caves/npcs/_5s8.lua b/scripts/zones/Quicksand_Caves/npcs/_5s8.lua index 7d9c2c201fb..d36ef508b2f 100644 --- a/scripts/zones/Quicksand_Caves/npcs/_5s8.lua +++ b/scripts/zones/Quicksand_Caves/npcs/_5s8.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.QUICKSAND_CAVES] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local difX = player:getXPos()-(-326) local difZ = player:getZPos()-(660) @@ -23,10 +20,4 @@ entity.onTrigger = function(player, npc) player:messageSpecial(ID.text.DOOR_FIRMLY_SHUT) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Quicksand_Caves/npcs/_5s9.lua b/scripts/zones/Quicksand_Caves/npcs/_5s9.lua index 3a893d3f697..f0f78309a93 100644 --- a/scripts/zones/Quicksand_Caves/npcs/_5s9.lua +++ b/scripts/zones/Quicksand_Caves/npcs/_5s9.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.QUICKSAND_CAVES] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local difX = player:getXPos()-(-352) local difZ = player:getZPos()-(820) @@ -23,10 +20,4 @@ entity.onTrigger = function(player, npc) player:messageSpecial(ID.text.DOOR_FIRMLY_SHUT) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Quicksand_Caves/npcs/_5sa.lua b/scripts/zones/Quicksand_Caves/npcs/_5sa.lua index 956cb4f6728..184a5d125df 100644 --- a/scripts/zones/Quicksand_Caves/npcs/_5sa.lua +++ b/scripts/zones/Quicksand_Caves/npcs/_5sa.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.QUICKSAND_CAVES] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local difX = player:getXPos()-(-425) local difZ = player:getZPos()-(790) @@ -23,10 +20,4 @@ entity.onTrigger = function(player, npc) player:messageSpecial(ID.text.DOOR_FIRMLY_SHUT) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Quicksand_Caves/npcs/_5sb.lua b/scripts/zones/Quicksand_Caves/npcs/_5sb.lua index d0d332d19cf..419684c0677 100644 --- a/scripts/zones/Quicksand_Caves/npcs/_5sb.lua +++ b/scripts/zones/Quicksand_Caves/npcs/_5sb.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.QUICKSAND_CAVES] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local difX = player:getXPos()-(-420) local difZ = player:getZPos()-(726) @@ -23,10 +20,4 @@ entity.onTrigger = function(player, npc) player:messageSpecial(ID.text.DOOR_FIRMLY_SHUT) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Quicksand_Caves/npcs/_5sc.lua b/scripts/zones/Quicksand_Caves/npcs/_5sc.lua index cc2f787327e..09c9c3dbec5 100644 --- a/scripts/zones/Quicksand_Caves/npcs/_5sc.lua +++ b/scripts/zones/Quicksand_Caves/npcs/_5sc.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.QUICKSAND_CAVES] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local difX = player:getXPos()-(-410) local difZ = player:getZPos()-(654) @@ -23,10 +20,4 @@ entity.onTrigger = function(player, npc) player:messageSpecial(ID.text.DOOR_FIRMLY_SHUT) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Quicksand_Caves/npcs/qm2.lua b/scripts/zones/Quicksand_Caves/npcs/qm2.lua index 515c1b6b9f0..58595fda0af 100644 --- a/scripts/zones/Quicksand_Caves/npcs/qm2.lua +++ b/scripts/zones/Quicksand_Caves/npcs/qm2.lua @@ -18,14 +18,4 @@ entity.onTrade = function(player, npc, trade) end end -entity.onTrigger = function(player, npc) - player:messageSpecial(ID.text.NOTHING_OUT_OF_ORDINARY) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Quicksand_Caves/npcs/qm5.lua b/scripts/zones/Quicksand_Caves/npcs/qm5.lua index 1340da6af08..e51e3fafccc 100644 --- a/scripts/zones/Quicksand_Caves/npcs/qm5.lua +++ b/scripts/zones/Quicksand_Caves/npcs/qm5.lua @@ -50,10 +50,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Quicksand_Caves/npcs/qm7.lua b/scripts/zones/Quicksand_Caves/npcs/qm7.lua deleted file mode 100644 index bb8a56af3dc..00000000000 --- a/scripts/zones/Quicksand_Caves/npcs/qm7.lua +++ /dev/null @@ -1,25 +0,0 @@ ------------------------------------ --- Area: Quicksand Caves --- NPC: ??? --- Involved in Mission: The Mithra and the Crystal (Zilart 12) --- !pos -504 20 -419 208 ------------------------------------ -local ID = zones[xi.zone.QUICKSAND_CAVES] ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:messageSpecial(ID.text.SOMETHING_IS_BURIED) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Qulun_Dome/npcs/The_Mute.lua b/scripts/zones/Qulun_Dome/npcs/The_Mute.lua index ec7ab7a48e6..2736fe0f7d3 100644 --- a/scripts/zones/Qulun_Dome/npcs/The_Mute.lua +++ b/scripts/zones/Qulun_Dome/npcs/The_Mute.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local duration = math.random(600, 900) @@ -17,10 +14,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Qulun_Dome/npcs/_440.lua b/scripts/zones/Qulun_Dome/npcs/_440.lua index 336a672d21f..9e15e6b0f4b 100644 --- a/scripts/zones/Qulun_Dome/npcs/_440.lua +++ b/scripts/zones/Qulun_Dome/npcs/_440.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.QULUN_DOME] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:hasKeyItem(xi.ki.SILVER_BELL) and @@ -27,9 +24,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if (csid == 50 or csid == 51) and option == 1 then player:messageSpecial(ID.text.THE_3_ITEMS_GLOW_FAINTLY, xi.ki.SILVER_BELL, xi.ki.CORUSCANT_ROSARY, xi.ki.BLACK_MATINEE_NECKLACE) diff --git a/scripts/zones/Qulun_Dome/npcs/_441.lua b/scripts/zones/Qulun_Dome/npcs/_441.lua index 4dad2cb9565..c139ff1fb85 100644 --- a/scripts/zones/Qulun_Dome/npcs/_441.lua +++ b/scripts/zones/Qulun_Dome/npcs/_441.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.QULUN_DOME] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if npc:getAnimation() == 9 then if player:getZPos() < 46 then @@ -31,10 +28,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/RaKaznar_Inner_Court/npcs/Vertical_Transit_Device_1.lua b/scripts/zones/RaKaznar_Inner_Court/npcs/Vertical_Transit_Device_1.lua index 59541a1cf78..f87804deaef 100644 --- a/scripts/zones/RaKaznar_Inner_Court/npcs/Vertical_Transit_Device_1.lua +++ b/scripts/zones/RaKaznar_Inner_Court/npcs/Vertical_Transit_Device_1.lua @@ -10,9 +10,6 @@ entity.onTrigger = function(player, npc) player:startEvent(82, 0, 300, 0, 100, 322090, 1, 222935, 2) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 82 and option == 4 then player:setPos(70, -30, 20, 0, xi.zone.RAKAZNAR_TURRIS) diff --git a/scripts/zones/RaKaznar_Turris/npcs/_7p1.lua b/scripts/zones/RaKaznar_Turris/npcs/_7p1.lua index 6de12f5c6d2..786f30ee989 100644 --- a/scripts/zones/RaKaznar_Turris/npcs/_7p1.lua +++ b/scripts/zones/RaKaznar_Turris/npcs/_7p1.lua @@ -10,10 +10,4 @@ entity.onTrigger = function(player, npc) npc:openDoor(15) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Rabao/DefaultActions.lua b/scripts/zones/Rabao/DefaultActions.lua index 99d226ef40b..6777b1e7345 100644 --- a/scripts/zones/Rabao/DefaultActions.lua +++ b/scripts/zones/Rabao/DefaultActions.lua @@ -1,8 +1,24 @@ -- local ID = zones[xi.zone.RABAO] return { - ['Alfesar'] = { event = 52 }, - ['Dancing_Wolf'] = { event = 106 }, - ['Irmilant'] = { event = 76 }, - ['Rahi_Fohlatti'] = { event = 71 }, + ['Alfesar'] = { event = 52 }, + ['Angry_Goat'] = { event = 40 }, + ['Bald_Aurochs'] = { event = 53 }, + ['Chamaja-Tamaja'] = { event = 45 }, + ['Cothric'] = { event = 44 }, + ['Dancing_Wolf'] = { event = 106 }, + ['Datta'] = { event = 73 }, + ['Eflatun'] = { event = 55 }, + ['Golden_Condor'] = { event = 49 }, + ['Irmilant'] = { event = 76 }, + ['Iron_Muscles'] = { event = 54 }, + ['Kedhareshvar'] = { event = 51 }, + ['Maryoh_Comyujah'] = { event = 43 }, + ['Mileon'] = { event = 100 }, + ['Rahi_Fohlatti'] = { event = 71 }, + ['Rudolfo'] = { event = 125 }, + ['Skeea'] = { event = 48 }, + ['Yabehbeh'] = { event = 41 }, + ['Zoriboh'] = { event = 127 }, + ['Zungutt'] = { event = 101 }, } diff --git a/scripts/zones/Rabao/npcs/Agado-Pugado.lua b/scripts/zones/Rabao/npcs/Agado-Pugado.lua index 9a8714b2395..10641843c7d 100644 --- a/scripts/zones/Rabao/npcs/Agado-Pugado.lua +++ b/scripts/zones/Rabao/npcs/Agado-Pugado.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.RABAO] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local trialByWind = player:getQuestStatus(xi.questLog.OUTLANDS, xi.quest.id.outlands.TRIAL_BY_WIND) local carbuncleDebacle = player:getQuestStatus(xi.questLog.WINDURST, xi.quest.id.windurst.CARBUNCLE_DEBACLE) @@ -84,9 +81,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 66 and option == 1 then if player:getQuestStatus(xi.questLog.OUTLANDS, xi.quest.id.outlands.TRIAL_BY_WIND) == xi.questStatus.QUEST_COMPLETED then diff --git a/scripts/zones/Rabao/npcs/Alfesar.lua b/scripts/zones/Rabao/npcs/Alfesar.lua index 6a9d5cf5632..86a5a84edb0 100644 --- a/scripts/zones/Rabao/npcs/Alfesar.lua +++ b/scripts/zones/Rabao/npcs/Alfesar.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.RABAO] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local theMissingPiece = player:getQuestStatus(xi.questLog.OUTLANDS, xi.quest.id.outlands.THE_MISSING_PIECE) local fame = player:getFameLevel(xi.fameArea.SELBINA_RABAO) @@ -38,9 +35,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 6 then player:addQuest(xi.questLog.OUTLANDS, xi.quest.id.outlands.THE_MISSING_PIECE) diff --git a/scripts/zones/Rabao/npcs/Amaja-Kumaja.lua b/scripts/zones/Rabao/npcs/Amaja-Kumaja.lua index 3e5864243ee..4f86eaf31e5 100644 --- a/scripts/zones/Rabao/npcs/Amaja-Kumaja.lua +++ b/scripts/zones/Rabao/npcs/Amaja-Kumaja.lua @@ -6,17 +6,8 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(1005, 0, 0, 0, 0, 0, 0, 0, VanadielTime()) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Rabao/npcs/Angry_Goat.lua b/scripts/zones/Rabao/npcs/Angry_Goat.lua deleted file mode 100644 index 69c685a4be6..00000000000 --- a/scripts/zones/Rabao/npcs/Angry_Goat.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Rabao --- NPC: Angry Goat ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(40) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Rabao/npcs/Ashu_Bolkhomo.lua b/scripts/zones/Rabao/npcs/Ashu_Bolkhomo.lua index f11a2c395d3..06c6bcb9312 100644 --- a/scripts/zones/Rabao/npcs/Ashu_Bolkhomo.lua +++ b/scripts/zones/Rabao/npcs/Ashu_Bolkhomo.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.maps.onTrigger(player, npc) end @@ -17,7 +14,4 @@ entity.onEventUpdate = function(player, csid, option, npc) xi.maps.onEventUpdate(player, csid, option, npc) end -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Rabao/npcs/Bald_Aurochs.lua b/scripts/zones/Rabao/npcs/Bald_Aurochs.lua index 0120b2c8889..1f44d7e5e6b 100644 --- a/scripts/zones/Rabao/npcs/Bald_Aurochs.lua +++ b/scripts/zones/Rabao/npcs/Bald_Aurochs.lua @@ -20,17 +20,4 @@ entity.onSpawn = function(npc) npc:pathThrough(pathNodes, xi.path.flag.PATROL) end -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(53) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Rabao/npcs/Brave_Ox.lua b/scripts/zones/Rabao/npcs/Brave_Ox.lua index 4638da2a6c4..05e9d870ae4 100644 --- a/scripts/zones/Rabao/npcs/Brave_Ox.lua +++ b/scripts/zones/Rabao/npcs/Brave_Ox.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.RABAO] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -35,10 +32,4 @@ entity.onTrigger = function(player, npc) xi.shop.general(player, stock) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Rabao/npcs/Brave_Wolf.lua b/scripts/zones/Rabao/npcs/Brave_Wolf.lua index 170f0f81d84..2d0aa52ec93 100644 --- a/scripts/zones/Rabao/npcs/Brave_Wolf.lua +++ b/scripts/zones/Rabao/npcs/Brave_Wolf.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.RABAO] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -34,10 +31,4 @@ entity.onTrigger = function(player, npc) xi.shop.general(player, stock) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Rabao/npcs/Cavalgrinne.lua b/scripts/zones/Rabao/npcs/Cavalgrinne.lua index 3b90e662244..9a0d425fae5 100644 --- a/scripts/zones/Rabao/npcs/Cavalgrinne.lua +++ b/scripts/zones/Rabao/npcs/Cavalgrinne.lua @@ -5,17 +5,8 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:sendMenu(3) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Rabao/npcs/Chamaja-Tamaja.lua b/scripts/zones/Rabao/npcs/Chamaja-Tamaja.lua deleted file mode 100644 index 1ccece66553..00000000000 --- a/scripts/zones/Rabao/npcs/Chamaja-Tamaja.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Rabao --- NPC: Chamaja-Tamaja ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(45) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Rabao/npcs/Cothric.lua b/scripts/zones/Rabao/npcs/Cothric.lua deleted file mode 100644 index fe52161e853..00000000000 --- a/scripts/zones/Rabao/npcs/Cothric.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Rabao --- NPC: Cothric ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(44) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Rabao/npcs/Datta.lua b/scripts/zones/Rabao/npcs/Datta.lua deleted file mode 100644 index ef3f082c801..00000000000 --- a/scripts/zones/Rabao/npcs/Datta.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Rabao --- NPC: Datta ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(73) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Rabao/npcs/Edigey.lua b/scripts/zones/Rabao/npcs/Edigey.lua index d5f0754156d..bb81ec13cf8 100644 --- a/scripts/zones/Rabao/npcs/Edigey.lua +++ b/scripts/zones/Rabao/npcs/Edigey.lua @@ -37,9 +37,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 2 and option == 1 then player:addQuest(xi.questLog.OUTLANDS, xi.quest.id.outlands.DONT_FORGET_THE_ANTIDOTE) diff --git a/scripts/zones/Rabao/npcs/Eflatun.lua b/scripts/zones/Rabao/npcs/Eflatun.lua index 45dc998eb52..e009623fd9f 100644 --- a/scripts/zones/Rabao/npcs/Eflatun.lua +++ b/scripts/zones/Rabao/npcs/Eflatun.lua @@ -21,17 +21,4 @@ entity.onSpawn = function(npc) npc:pathThrough(pathNodes, xi.path.flag.PATROL) end -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(55) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Rabao/npcs/Generoit.lua b/scripts/zones/Rabao/npcs/Generoit.lua index 03aaaf35030..60e6fa2d714 100644 --- a/scripts/zones/Rabao/npcs/Generoit.lua +++ b/scripts/zones/Rabao/npcs/Generoit.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.RABAO] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -28,10 +25,4 @@ entity.onTrigger = function(player, npc) xi.shop.general(player, stock) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Rabao/npcs/Golden_Condor.lua b/scripts/zones/Rabao/npcs/Golden_Condor.lua deleted file mode 100644 index 298be67da64..00000000000 --- a/scripts/zones/Rabao/npcs/Golden_Condor.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Rabao --- NPC: Golden Condor ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(49) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Rabao/npcs/Guinavie.lua b/scripts/zones/Rabao/npcs/Guinavie.lua index cde4a93534e..eb6c68e49d7 100644 --- a/scripts/zones/Rabao/npcs/Guinavie.lua +++ b/scripts/zones/Rabao/npcs/Guinavie.lua @@ -18,9 +18,6 @@ entity.onTrigger = function(player, npc) xi.chocobo.renterOnTrigger(player, npc, eventSucceed, eventFail) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.chocobo.renterOnEventFinish(player, csid, option, eventSucceed) end diff --git a/scripts/zones/Rabao/npcs/Hunt_Registry.lua b/scripts/zones/Rabao/npcs/Hunt_Registry.lua index 0f39e820d5c..9151c8b25f9 100644 --- a/scripts/zones/Rabao/npcs/Hunt_Registry.lua +++ b/scripts/zones/Rabao/npcs/Hunt_Registry.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.hunts.onTrigger(player, npc) end diff --git a/scripts/zones/Rabao/npcs/Hyesun.lua b/scripts/zones/Rabao/npcs/Hyesun.lua index 7ddd097ea4e..5c0e0494fd6 100644 --- a/scripts/zones/Rabao/npcs/Hyesun.lua +++ b/scripts/zones/Rabao/npcs/Hyesun.lua @@ -5,17 +5,8 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:sendMenu(3) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Rabao/npcs/Irmilant.lua b/scripts/zones/Rabao/npcs/Irmilant.lua index 68d0518b0a1..9b6e3ac871e 100644 --- a/scripts/zones/Rabao/npcs/Irmilant.lua +++ b/scripts/zones/Rabao/npcs/Irmilant.lua @@ -48,9 +48,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 77 then player:addQuest(xi.questLog.OUTLANDS, xi.quest.id.outlands.THE_IMMORTAL_LU_SHANG) diff --git a/scripts/zones/Rabao/npcs/Iron_Muscles.lua b/scripts/zones/Rabao/npcs/Iron_Muscles.lua deleted file mode 100644 index 92b12a8e3f9..00000000000 --- a/scripts/zones/Rabao/npcs/Iron_Muscles.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Rabao --- NPC: Iron Muscles ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(54) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Rabao/npcs/Kedhareshvar.lua b/scripts/zones/Rabao/npcs/Kedhareshvar.lua deleted file mode 100644 index 784cc027324..00000000000 --- a/scripts/zones/Rabao/npcs/Kedhareshvar.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Rabao --- NPC: Kedhareshvar ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(51) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Rabao/npcs/Leodarion.lua b/scripts/zones/Rabao/npcs/Leodarion.lua index ae6eac57123..160eac5144e 100644 --- a/scripts/zones/Rabao/npcs/Leodarion.lua +++ b/scripts/zones/Rabao/npcs/Leodarion.lua @@ -53,9 +53,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 90 then player:setCharVar('illTakeTheBigBoxCS', 2) diff --git a/scripts/zones/Rabao/npcs/Maryoh_Comyujah.lua b/scripts/zones/Rabao/npcs/Maryoh_Comyujah.lua deleted file mode 100644 index 56cf0ddce58..00000000000 --- a/scripts/zones/Rabao/npcs/Maryoh_Comyujah.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Rabao --- NPC: Maryoh Comyujah --- Involved in Mission: The Mithra and the Crystal (Zilart 12) --- !pos 0 8 73 247 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(43) -- Standard dialog -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Rabao/npcs/Mileon.lua b/scripts/zones/Rabao/npcs/Mileon.lua deleted file mode 100644 index ebc0f8f23c6..00000000000 --- a/scripts/zones/Rabao/npcs/Mileon.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Rabao --- NPC: Mileon --- Type: Lucky Roll Gambler --- !pos 26.080 8.201 65.297 247 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(100) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Rabao/npcs/Nomad_Moogle.lua b/scripts/zones/Rabao/npcs/Nomad_Moogle.lua index 60c37df12ee..6b0225060a1 100644 --- a/scripts/zones/Rabao/npcs/Nomad_Moogle.lua +++ b/scripts/zones/Rabao/npcs/Nomad_Moogle.lua @@ -7,18 +7,9 @@ local ID = zones[xi.zone.RABAO] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:showText(npc, ID.text.NOMAD_MOOGLE_DIALOG) player:sendMenu(1) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Rabao/npcs/Pakhi_Churhebi.lua b/scripts/zones/Rabao/npcs/Pakhi_Churhebi.lua index 91fb7116e02..04af1cdb4a6 100644 --- a/scripts/zones/Rabao/npcs/Pakhi_Churhebi.lua +++ b/scripts/zones/Rabao/npcs/Pakhi_Churhebi.lua @@ -9,18 +9,9 @@ local ID = zones[xi.zone.RABAO] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:showText(npc, ID.text.PAKHI_DELIVERY_DIALOG) player:openSendBox() end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Rabao/npcs/Rahi_Fohlatti.lua b/scripts/zones/Rabao/npcs/Rahi_Fohlatti.lua index 45fffd3e5b7..debe2421006 100644 --- a/scripts/zones/Rabao/npcs/Rahi_Fohlatti.lua +++ b/scripts/zones/Rabao/npcs/Rahi_Fohlatti.lua @@ -43,9 +43,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 108 and option == 1 then if player:getFreeSlotsCount() == 0 then diff --git a/scripts/zones/Rabao/npcs/Rudolfo.lua b/scripts/zones/Rabao/npcs/Rudolfo.lua deleted file mode 100644 index 1be0e1f9a31..00000000000 --- a/scripts/zones/Rabao/npcs/Rudolfo.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Rabao --- NPC: Rudolfo ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(125) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Rabao/npcs/Scamplix.lua b/scripts/zones/Rabao/npcs/Scamplix.lua index b68d1c7bf29..32c1a69693e 100644 --- a/scripts/zones/Rabao/npcs/Scamplix.lua +++ b/scripts/zones/Rabao/npcs/Scamplix.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.RABAO] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -32,10 +29,4 @@ entity.onTrigger = function(player, npc) xi.shop.general(player, stock) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Rabao/npcs/Shiny_Teeth.lua b/scripts/zones/Rabao/npcs/Shiny_Teeth.lua index 576a0d40dc4..af17c497cca 100644 --- a/scripts/zones/Rabao/npcs/Shiny_Teeth.lua +++ b/scripts/zones/Rabao/npcs/Shiny_Teeth.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.RABAO] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -34,10 +31,4 @@ entity.onTrigger = function(player, npc) xi.shop.general(player, stock) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Rabao/npcs/Shupah_Mujuuk.lua b/scripts/zones/Rabao/npcs/Shupah_Mujuuk.lua index 3084429809a..e634472c3df 100644 --- a/scripts/zones/Rabao/npcs/Shupah_Mujuuk.lua +++ b/scripts/zones/Rabao/npcs/Shupah_Mujuuk.lua @@ -103,16 +103,10 @@ local titleInfo = }, } -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.titleChanger.onTrigger(player, eventId, titleInfo) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.titleChanger.onEventFinish(player, csid, option, eventId, titleInfo) end diff --git a/scripts/zones/Rabao/npcs/Skeea.lua b/scripts/zones/Rabao/npcs/Skeea.lua deleted file mode 100644 index 45fb23505c1..00000000000 --- a/scripts/zones/Rabao/npcs/Skeea.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Rabao --- NPC: Skeea ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(48) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Rabao/npcs/Smiling_Rat.lua b/scripts/zones/Rabao/npcs/Smiling_Rat.lua index 85d0c082f0b..70b9d027c4a 100644 --- a/scripts/zones/Rabao/npcs/Smiling_Rat.lua +++ b/scripts/zones/Rabao/npcs/Smiling_Rat.lua @@ -5,17 +5,8 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:sendMenu(3) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Rabao/npcs/Spirit_Singer.lua b/scripts/zones/Rabao/npcs/Spirit_Singer.lua index a4d8fd6f0aa..16d863434f6 100644 --- a/scripts/zones/Rabao/npcs/Spirit_Singer.lua +++ b/scripts/zones/Rabao/npcs/Spirit_Singer.lua @@ -9,18 +9,9 @@ local ID = zones[xi.zone.RABAO] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:showText(npc, ID.text.SPIRIT_DELIVERY_DIALOG) player:openSendBox() end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Rabao/npcs/Waylea.lua b/scripts/zones/Rabao/npcs/Waylea.lua index 460db154f40..9be000eae60 100644 --- a/scripts/zones/Rabao/npcs/Waylea.lua +++ b/scripts/zones/Rabao/npcs/Waylea.lua @@ -7,17 +7,8 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(57 + (player:getFameLevel(4) - 1)) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Rabao/npcs/Yabehbeh.lua b/scripts/zones/Rabao/npcs/Yabehbeh.lua deleted file mode 100644 index 6f0dfbbac32..00000000000 --- a/scripts/zones/Rabao/npcs/Yabehbeh.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Rabao --- NPC: Yabehbeh ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(41) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Rabao/npcs/Zoriboh.lua b/scripts/zones/Rabao/npcs/Zoriboh.lua deleted file mode 100644 index 7b4c395666a..00000000000 --- a/scripts/zones/Rabao/npcs/Zoriboh.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Rabao --- NPC: Zoriboh ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(127) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Rabao/npcs/Zungutt.lua b/scripts/zones/Rabao/npcs/Zungutt.lua deleted file mode 100644 index 2fc037d94d6..00000000000 --- a/scripts/zones/Rabao/npcs/Zungutt.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Rabao --- NPC: Zungutt ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(101) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Rala_Waterways/DefaultActions.lua b/scripts/zones/Rala_Waterways/DefaultActions.lua index d0b4ede87ff..547a6a9b030 100644 --- a/scripts/zones/Rala_Waterways/DefaultActions.lua +++ b/scripts/zones/Rala_Waterways/DefaultActions.lua @@ -9,6 +9,7 @@ return { ['Royal_Sepulcher'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, ['Saldinor'] = { event = 329 }, ['Sluice_Gate_6'] = { messageSpecial = ID.text.NOTHING_HAPPENS }, + ['Sluice_Gate_7'] = { event = 362 }, ['Yeggha_Dolashi'] = { event = 319 }, -- TODO: ['Storage_Container'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, } diff --git a/scripts/zones/Rala_Waterways/npcs/Antiquated_Sluice_Gate.lua b/scripts/zones/Rala_Waterways/npcs/Antiquated_Sluice_Gate.lua index 8b0aa5523c5..823ae9d2a8a 100644 --- a/scripts/zones/Rala_Waterways/npcs/Antiquated_Sluice_Gate.lua +++ b/scripts/zones/Rala_Waterways/npcs/Antiquated_Sluice_Gate.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) -- player:startEvent(5511, 0, 8) if not xi.instance.onTrigger(player, npc, xi.zone.RALA_WATERWAYS_U) then diff --git a/scripts/zones/Rala_Waterways/npcs/Sluice_Gate_2.lua b/scripts/zones/Rala_Waterways/npcs/Sluice_Gate_2.lua index 1269f99b96a..074e2f69117 100644 --- a/scripts/zones/Rala_Waterways/npcs/Sluice_Gate_2.lua +++ b/scripts/zones/Rala_Waterways/npcs/Sluice_Gate_2.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local zone = npc:getZone() if not zone then @@ -19,10 +16,4 @@ entity.onTrigger = function(player, npc) resultTable[1]:openDoor(15) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Rala_Waterways/npcs/Sluice_Gate_7.lua b/scripts/zones/Rala_Waterways/npcs/Sluice_Gate_7.lua deleted file mode 100644 index 250e04766cc..00000000000 --- a/scripts/zones/Rala_Waterways/npcs/Sluice_Gate_7.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Rala Waterways (258) --- NPC: Sluice Gate #7 (Secret Hideout Exit) --- !pos TODO 258 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(362) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Ranguemont_Pass/npcs/Geomagnetic_Fount.lua b/scripts/zones/Ranguemont_Pass/npcs/Geomagnetic_Fount.lua index f57ff0ae2ab..51d676866fc 100644 --- a/scripts/zones/Ranguemont_Pass/npcs/Geomagnetic_Fount.lua +++ b/scripts/zones/Ranguemont_Pass/npcs/Geomagnetic_Fount.lua @@ -6,17 +6,8 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.geomagneticFount.checkFount(player, npc) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Ranguemont_Pass/npcs/Grounds_Tome.lua b/scripts/zones/Ranguemont_Pass/npcs/Grounds_Tome.lua index 673bf0a756e..43902c48ecf 100644 --- a/scripts/zones/Ranguemont_Pass/npcs/Grounds_Tome.lua +++ b/scripts/zones/Ranguemont_Pass/npcs/Grounds_Tome.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.regime.bookOnTrigger(player, xi.regime.type.GROUNDS) end diff --git a/scripts/zones/Ranguemont_Pass/npcs/Myffore.lua b/scripts/zones/Ranguemont_Pass/npcs/Myffore.lua index 0ff7a0f0760..d5d762b5e15 100644 --- a/scripts/zones/Ranguemont_Pass/npcs/Myffore.lua +++ b/scripts/zones/Ranguemont_Pass/npcs/Myffore.lua @@ -6,16 +6,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(1) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 1 and option == 0 then local DoorID = npc:getID() + 1 diff --git a/scripts/zones/Ranguemont_Pass/npcs/Perchond.lua b/scripts/zones/Ranguemont_Pass/npcs/Perchond.lua index 88395e77f53..de18fe9c212 100644 --- a/scripts/zones/Ranguemont_Pass/npcs/Perchond.lua +++ b/scripts/zones/Ranguemont_Pass/npcs/Perchond.lua @@ -31,9 +31,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 3 then player:setCharVar('sinHunting', 2) diff --git a/scripts/zones/Ranguemont_Pass/npcs/Treasure_Casket.lua b/scripts/zones/Ranguemont_Pass/npcs/Treasure_Casket.lua index af051df7eba..cd221612bac 100644 --- a/scripts/zones/Ranguemont_Pass/npcs/Treasure_Casket.lua +++ b/scripts/zones/Ranguemont_Pass/npcs/Treasure_Casket.lua @@ -13,9 +13,6 @@ entity.onTrade = function(player, npc, trade) xi.caskets.onTrade(player, npc, trade) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.caskets.onEventFinish(player, csid, option, npc) end diff --git a/scripts/zones/Ranguemont_Pass/npcs/Waters_of_Oblivion.lua b/scripts/zones/Ranguemont_Pass/npcs/Waters_of_Oblivion.lua index 59f3fc9a2e2..29c5678dfa7 100644 --- a/scripts/zones/Ranguemont_Pass/npcs/Waters_of_Oblivion.lua +++ b/scripts/zones/Ranguemont_Pass/npcs/Waters_of_Oblivion.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.RANGUEMONT_PASS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local trosKilled = player:getCharVar('TrosKilled') @@ -29,9 +26,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 8 then if npcUtil.completeQuest(player, xi.questLog.JEUNO, xi.quest.id.jeuno.PAINFUL_MEMORY, { item = 16766 }) then diff --git a/scripts/zones/RuAun_Gardens/DefaultActions.lua b/scripts/zones/RuAun_Gardens/DefaultActions.lua index ea1738558ad..84a71e5291f 100644 --- a/scripts/zones/RuAun_Gardens/DefaultActions.lua +++ b/scripts/zones/RuAun_Gardens/DefaultActions.lua @@ -1,4 +1,4 @@ -local ID = zones[xi.zone.RUAUN_GARDENS] +-- local ID = zones[xi.zone.RUAUN_GARDENS] return { ['Goblin_Footprint'] = { event = 0 },