From b5a24c04fc3676597340de769eb22822d51fe6e2 Mon Sep 17 00:00:00 2001 From: claywar Date: Sat, 25 Jan 2025 10:45:57 -0500 Subject: [PATCH 1/4] Remove empty NPCs, add Default Actions - Gustav ~ Kamihr --- .../Gustav_Tunnel/npcs/Geomagnetic_Fount.lua | 9 --- .../zones/Gustav_Tunnel/npcs/Grounds_Tome.lua | 3 - .../Gustav_Tunnel/npcs/Treasure_Casket.lua | 3 - .../zones/Hall_of_Transference/npcs/_0e0.lua | 6 -- .../zones/Hall_of_Transference/npcs/_0e1.lua | 6 -- .../zones/Hall_of_Transference/npcs/_0e2.lua | 6 -- .../zones/Hall_of_Transference/npcs/_0e4.lua | 3 - .../zones/Hall_of_Transference/npcs/_0e6.lua | 3 - .../zones/Hall_of_Transference/npcs/_0e8.lua | 3 - .../npcs/Shimmering_Circle.lua | 9 --- scripts/zones/Hall_of_the_Gods/npcs/_6z0.lua | 9 --- scripts/zones/Halvung/npcs/Mining_Point.lua | 6 -- .../zones/Halvung/npcs/Operating_Lever_A.lua | 9 --- .../zones/Halvung/npcs/Operating_Lever_B.lua | 9 --- .../zones/Halvung/npcs/Operating_Lever_C.lua | 9 --- .../zones/Halvung/npcs/Operating_Lever_D.lua | 9 --- .../zones/Halvung/npcs/Operating_Lever_E.lua | 9 --- .../zones/Halvung/npcs/Operating_Lever_F.lua | 9 --- .../zones/Halvung/npcs/Operating_Lever_G.lua | 9 --- .../zones/Halvung/npcs/Operating_Lever_H.lua | 9 --- .../zones/Halvung/npcs/Operating_Lever_I.lua | 9 --- .../zones/Halvung/npcs/Operating_Lever_J.lua | 9 --- scripts/zones/Halvung/npcs/_1qp.lua | 6 -- scripts/zones/Halvung/npcs/qm1.lua | 6 -- scripts/zones/Halvung/npcs/qm2.lua | 6 -- scripts/zones/Halvung/npcs/qm3.lua | 6 -- scripts/zones/Halvung/npcs/qm4.lua | 6 -- scripts/zones/Halvung/npcs/qm8.lua | 6 -- .../zones/Heavens_Tower/DefaultActions.lua | 61 +++++++++++++------ scripts/zones/Heavens_Tower/npcs/Abobo.lua | 21 ------- scripts/zones/Heavens_Tower/npcs/Bebibi.lua | 21 ------- .../Heavens_Tower/npcs/Celebratory_Chest.lua | 9 --- scripts/zones/Heavens_Tower/npcs/Chumimi.lua | 3 - .../Heavens_Tower/npcs/Chuqui-Chanqui.lua | 13 ---- scripts/zones/Heavens_Tower/npcs/Damama.lua | 21 ------- scripts/zones/Heavens_Tower/npcs/Ewchichi.lua | 21 ------- scripts/zones/Heavens_Tower/npcs/Gamimi.lua | 9 --- .../Heavens_Tower/npcs/Habida-Jubida.lua | 21 ------- scripts/zones/Heavens_Tower/npcs/Hikkuku.lua | 21 ------- scripts/zones/Heavens_Tower/npcs/Jatata.lua | 9 --- scripts/zones/Heavens_Tower/npcs/Jerrett.lua | 3 - scripts/zones/Heavens_Tower/npcs/Kierron.lua | 3 - scripts/zones/Heavens_Tower/npcs/Kupipi.lua | 6 -- .../zones/Heavens_Tower/npcs/Lin_Megomifu.lua | 21 ------- scripts/zones/Heavens_Tower/npcs/Mashua.lua | 22 ------- .../Heavens_Tower/npcs/Matrimonial_Coffer.lua | 6 -- .../zones/Heavens_Tower/npcs/Mhabi_Molkot.lua | 23 ------- .../zones/Heavens_Tower/npcs/Nului-Nlui.lua | 21 ------- scripts/zones/Heavens_Tower/npcs/Parara.lua | 21 ------- .../Heavens_Tower/npcs/Rakano-Marukano.lua | 6 -- .../zones/Heavens_Tower/npcs/Rayjin-Ojin.lua | 21 ------- scripts/zones/Heavens_Tower/npcs/Ritoto.lua | 21 ------- .../Heavens_Tower/npcs/Sassa-Kotassa.lua | 21 ------- scripts/zones/Heavens_Tower/npcs/Sheelala.lua | 21 ------- .../zones/Heavens_Tower/npcs/Tamil-Hamel.lua | 21 ------- scripts/zones/Heavens_Tower/npcs/Tayaya.lua | 21 ------- .../zones/Heavens_Tower/npcs/Transporter.lua | 22 ------- .../Heavens_Tower/npcs/Urubero-Mohbero.lua | 21 ------- .../Heavens_Tower/npcs/Wabble-Mopple.lua | 21 ------- scripts/zones/Heavens_Tower/npcs/Yakuku.lua | 21 ------- scripts/zones/Heavens_Tower/npcs/Zubaba.lua | 9 --- .../zones/Heavens_Tower/npcs/Zubu-Abibu.lua | 21 ------- scripts/zones/Heavens_Tower/npcs/_6q1.lua | 9 --- scripts/zones/Horlais_Peak/npcs/relic.lua | 3 - .../Ifrits_Cauldron/npcs/Altar_of_Ashes.lua | 6 -- .../Ifrits_Cauldron/npcs/Flame_Spout.lua | 6 -- .../Ifrits_Cauldron/npcs/Grounds_Tome.lua | 3 - .../Ifrits_Cauldron/npcs/Mining_Point.lua | 6 -- .../Ifrits_Cauldron/npcs/Treasure_Casket.lua | 3 - .../Ifrits_Cauldron/npcs/Treasure_Coffer.lua | 6 -- scripts/zones/Ifrits_Cauldron/npcs/qm1.lua | 6 -- scripts/zones/Ifrits_Cauldron/npcs/qm2.lua | 6 -- scripts/zones/Ifrits_Cauldron/npcs/relic.lua | 3 - .../zones/Ilrusi_Atoll/npcs/Cursed_Chest.lua | 9 --- .../Ilrusi_Atoll/npcs/Rune_of_Release.lua | 6 -- .../npcs/Geomagnetic_Fount.lua | 9 --- .../npcs/Grounds_Tome.lua | 3 - .../npcs/Treasure_Casket.lua | 3 - .../npcs/Treasure_Chest.lua | 6 -- .../zones/Inner_Horutoto_Ruins/npcs/_5c8.lua | 9 --- .../zones/Inner_Horutoto_Ruins/npcs/_5ca.lua | 9 --- .../zones/Jugner_Forest/DefaultActions.lua | 5 +- scripts/zones/Jugner_Forest/npcs/Alexius.lua | 11 +--- .../Jugner_Forest/npcs/Beastmens_Banner.lua | 24 -------- .../Jugner_Forest/npcs/Cavernous_Maw.lua | 6 -- .../Jugner_Forest/npcs/Cavernous_Maw_2.lua | 6 -- .../zones/Jugner_Forest/npcs/Field_Manual.lua | 3 - .../Jugner_Forest/npcs/Logging_Point.lua | 6 -- scripts/zones/Jugner_Forest/npcs/Mionie.lua | 3 - scripts/zones/Jugner_Forest/npcs/Perevie.lua | 23 ------- scripts/zones/Jugner_Forest/npcs/Signpost.lua | 6 -- .../Jugner_Forest/npcs/Stone_Monument.lua | 10 --- .../Jugner_Forest/npcs/Treasure_Casket.lua | 3 - scripts/zones/Jugner_Forest/npcs/qm2.lua | 6 -- .../Jugner_Forest_[S]/DefaultActions.lua | 3 +- .../Jugner_Forest_[S]/npcs/Cavernous_Maw.lua | 6 -- .../Jugner_Forest_[S]/npcs/Gate_Sentry.lua | 22 ------- .../zones/Jugner_Forest_[S]/npcs/Helmyre.lua | 6 -- .../Jugner_Forest_[S]/npcs/Larkin_CA.lua | 9 --- .../Jugner_Forest_[S]/npcs/Logging_Point.lua | 6 -- .../Jugner_Forest_[S]/npcs/Roiloux_RK.lua | 9 --- .../Jugner_Forest_[S]/npcs/Telepoint.lua | 6 -- scripts/zones/Jugner_Forest_[S]/npcs/_2a5.lua | 6 -- .../Kamihr_Drifts/npcs/Blockaded_Path.lua | 3 - .../npcs/Liseran_Door_Entrance.lua | 6 -- 105 files changed, 49 insertions(+), 1051 deletions(-) delete mode 100644 scripts/zones/Heavens_Tower/npcs/Abobo.lua delete mode 100644 scripts/zones/Heavens_Tower/npcs/Bebibi.lua delete mode 100644 scripts/zones/Heavens_Tower/npcs/Damama.lua delete mode 100644 scripts/zones/Heavens_Tower/npcs/Ewchichi.lua delete mode 100644 scripts/zones/Heavens_Tower/npcs/Habida-Jubida.lua delete mode 100644 scripts/zones/Heavens_Tower/npcs/Hikkuku.lua delete mode 100644 scripts/zones/Heavens_Tower/npcs/Lin_Megomifu.lua delete mode 100644 scripts/zones/Heavens_Tower/npcs/Mashua.lua delete mode 100644 scripts/zones/Heavens_Tower/npcs/Mhabi_Molkot.lua delete mode 100644 scripts/zones/Heavens_Tower/npcs/Nului-Nlui.lua delete mode 100644 scripts/zones/Heavens_Tower/npcs/Parara.lua delete mode 100644 scripts/zones/Heavens_Tower/npcs/Rayjin-Ojin.lua delete mode 100644 scripts/zones/Heavens_Tower/npcs/Ritoto.lua delete mode 100644 scripts/zones/Heavens_Tower/npcs/Sassa-Kotassa.lua delete mode 100644 scripts/zones/Heavens_Tower/npcs/Sheelala.lua delete mode 100644 scripts/zones/Heavens_Tower/npcs/Tamil-Hamel.lua delete mode 100644 scripts/zones/Heavens_Tower/npcs/Tayaya.lua delete mode 100644 scripts/zones/Heavens_Tower/npcs/Transporter.lua delete mode 100644 scripts/zones/Heavens_Tower/npcs/Urubero-Mohbero.lua delete mode 100644 scripts/zones/Heavens_Tower/npcs/Wabble-Mopple.lua delete mode 100644 scripts/zones/Heavens_Tower/npcs/Yakuku.lua delete mode 100644 scripts/zones/Heavens_Tower/npcs/Zubu-Abibu.lua delete mode 100644 scripts/zones/Jugner_Forest/npcs/Beastmens_Banner.lua delete mode 100644 scripts/zones/Jugner_Forest/npcs/Perevie.lua delete mode 100644 scripts/zones/Jugner_Forest_[S]/npcs/Gate_Sentry.lua diff --git a/scripts/zones/Gustav_Tunnel/npcs/Geomagnetic_Fount.lua b/scripts/zones/Gustav_Tunnel/npcs/Geomagnetic_Fount.lua index d18b4b5fac1..5d93efcdf64 100644 --- a/scripts/zones/Gustav_Tunnel/npcs/Geomagnetic_Fount.lua +++ b/scripts/zones/Gustav_Tunnel/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/Gustav_Tunnel/npcs/Grounds_Tome.lua b/scripts/zones/Gustav_Tunnel/npcs/Grounds_Tome.lua index 80f58abdffe..9a653d86360 100644 --- a/scripts/zones/Gustav_Tunnel/npcs/Grounds_Tome.lua +++ b/scripts/zones/Gustav_Tunnel/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/Gustav_Tunnel/npcs/Treasure_Casket.lua b/scripts/zones/Gustav_Tunnel/npcs/Treasure_Casket.lua index d4a918b58e7..0e315acac6c 100644 --- a/scripts/zones/Gustav_Tunnel/npcs/Treasure_Casket.lua +++ b/scripts/zones/Gustav_Tunnel/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/Hall_of_Transference/npcs/_0e0.lua b/scripts/zones/Hall_of_Transference/npcs/_0e0.lua index 09eacedc251..f306d1f769c 100644 --- a/scripts/zones/Hall_of_Transference/npcs/_0e0.lua +++ b/scripts/zones/Hall_of_Transference/npcs/_0e0.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) -- Note: Below the Arks uses a different scheme, but the mission script blocks actions -- if the player is not currently with this memory. @@ -18,9 +15,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 == 150 and option == 1 then player:setPos(92.033, 0, 80.380, 255, 16) -- To Promyvion Holla (R) diff --git a/scripts/zones/Hall_of_Transference/npcs/_0e1.lua b/scripts/zones/Hall_of_Transference/npcs/_0e1.lua index 164e08d20bd..6f26a47404b 100644 --- a/scripts/zones/Hall_of_Transference/npcs/_0e1.lua +++ b/scripts/zones/Hall_of_Transference/npcs/_0e1.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) -- Note: Below the Arks uses a different scheme, but the mission script blocks actions -- if the player is not currently with this memory. @@ -18,9 +15,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 == 150 and option == 1 then player:setPos(185.891, 0, -52.331, 128, 18) -- To Promyvion Dem (R) diff --git a/scripts/zones/Hall_of_Transference/npcs/_0e2.lua b/scripts/zones/Hall_of_Transference/npcs/_0e2.lua index 22477759223..6b4cf1f9d99 100644 --- a/scripts/zones/Hall_of_Transference/npcs/_0e2.lua +++ b/scripts/zones/Hall_of_Transference/npcs/_0e2.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) -- Note: Below the Arks uses a different scheme, but the mission script blocks actions -- if the player is not currently with this memory. @@ -18,9 +15,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 == 150 and option == 1 then player:setPos(-93.268, 0, 170.749, 162, 20) -- To Promyvion Mea (R) diff --git a/scripts/zones/Hall_of_Transference/npcs/_0e4.lua b/scripts/zones/Hall_of_Transference/npcs/_0e4.lua index 61ed3c4a78a..b103e0bb2c7 100644 --- a/scripts/zones/Hall_of_Transference/npcs/_0e4.lua +++ b/scripts/zones/Hall_of_Transference/npcs/_0e4.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 == 166 then player:messageSpecial(ID.text.NO_RESPONSE_OFFSET + 4, xi.item.CLEAR_CHIP) -- You fit.. diff --git a/scripts/zones/Hall_of_Transference/npcs/_0e6.lua b/scripts/zones/Hall_of_Transference/npcs/_0e6.lua index 843986e3f46..844bef5f797 100644 --- a/scripts/zones/Hall_of_Transference/npcs/_0e6.lua +++ b/scripts/zones/Hall_of_Transference/npcs/_0e6.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 == 168 then player:messageSpecial(ID.text.NO_RESPONSE_OFFSET + 4, xi.item.CLEAR_CHIP) -- You fit.. diff --git a/scripts/zones/Hall_of_Transference/npcs/_0e8.lua b/scripts/zones/Hall_of_Transference/npcs/_0e8.lua index 789f147fa3f..0f524a3f21e 100644 --- a/scripts/zones/Hall_of_Transference/npcs/_0e8.lua +++ b/scripts/zones/Hall_of_Transference/npcs/_0e8.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 == 164 then player:messageSpecial(ID.text.NO_RESPONSE_OFFSET + 4, xi.item.CLEAR_CHIP) -- You fit.. diff --git a/scripts/zones/Hall_of_the_Gods/npcs/Shimmering_Circle.lua b/scripts/zones/Hall_of_the_Gods/npcs/Shimmering_Circle.lua index 29b840ade27..894703496bd 100644 --- a/scripts/zones/Hall_of_the_Gods/npcs/Shimmering_Circle.lua +++ b/scripts/zones/Hall_of_the_Gods/npcs/Shimmering_Circle.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.HALL_OF_THE_GODS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getZPos() < 200 then if player:getCurrentMission(xi.mission.log_id.ZILART) >= xi.mission.id.zilart.THE_GATE_OF_THE_GODS then @@ -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/Hall_of_the_Gods/npcs/_6z0.lua b/scripts/zones/Hall_of_the_Gods/npcs/_6z0.lua index 39f9ac5f7ac..3f78800e8ea 100644 --- a/scripts/zones/Hall_of_the_Gods/npcs/_6z0.lua +++ b/scripts/zones/Hall_of_the_Gods/npcs/_6z0.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if not player:hasKeyItem(xi.ki.CERULEAN_CRYSTAL) then player:startEvent(1) -- NOTE: This CS onEventFinish is handled by ZM10 mission script @@ -18,10 +15,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/Halvung/npcs/Mining_Point.lua b/scripts/zones/Halvung/npcs/Mining_Point.lua index f590632a857..e5073514c84 100644 --- a/scripts/zones/Halvung/npcs/Mining_Point.lua +++ b/scripts/zones/Halvung/npcs/Mining_Point.lua @@ -13,10 +13,4 @@ entity.onTrigger = function(player, npc) xi.helm.onTrigger(player, xi.helmType.MINING) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Halvung/npcs/Operating_Lever_A.lua b/scripts/zones/Halvung/npcs/Operating_Lever_A.lua index 870a3fbd189..91f0407314f 100644 --- a/scripts/zones/Halvung/npcs/Operating_Lever_A.lua +++ b/scripts/zones/Halvung/npcs/Operating_Lever_A.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.HALVUNG] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:hasKeyItem(xi.ki.BRACELET_OF_VERVE) then GetNPCByID(ID.npc.LEVER_AB_DOOR):openDoor(30) @@ -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/Halvung/npcs/Operating_Lever_B.lua b/scripts/zones/Halvung/npcs/Operating_Lever_B.lua index 07b84e027c0..24d4f984b80 100644 --- a/scripts/zones/Halvung/npcs/Operating_Lever_B.lua +++ b/scripts/zones/Halvung/npcs/Operating_Lever_B.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.HALVUNG] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:hasKeyItem(xi.ki.BRACELET_OF_VERVE) then GetNPCByID(ID.npc.LEVER_AB_DOOR):openDoor(30) @@ -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/Halvung/npcs/Operating_Lever_C.lua b/scripts/zones/Halvung/npcs/Operating_Lever_C.lua index 72b42b58463..9473c659def 100644 --- a/scripts/zones/Halvung/npcs/Operating_Lever_C.lua +++ b/scripts/zones/Halvung/npcs/Operating_Lever_C.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.HALVUNG] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:hasKeyItem(xi.ki.BRACELET_OF_VERVE) then GetNPCByID(ID.npc.LEVER_CD_DOOR):openDoor(30) @@ -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/Halvung/npcs/Operating_Lever_D.lua b/scripts/zones/Halvung/npcs/Operating_Lever_D.lua index 3a8e920cb7e..fc535009b6c 100644 --- a/scripts/zones/Halvung/npcs/Operating_Lever_D.lua +++ b/scripts/zones/Halvung/npcs/Operating_Lever_D.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.HALVUNG] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:hasKeyItem(xi.ki.BRACELET_OF_VERVE) then GetNPCByID(ID.npc.LEVER_CD_DOOR):openDoor(30) @@ -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/Halvung/npcs/Operating_Lever_E.lua b/scripts/zones/Halvung/npcs/Operating_Lever_E.lua index b003917f9c2..fde140323e5 100644 --- a/scripts/zones/Halvung/npcs/Operating_Lever_E.lua +++ b/scripts/zones/Halvung/npcs/Operating_Lever_E.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.HALVUNG] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:hasKeyItem(xi.ki.BRACELET_OF_VERVE) then GetNPCByID(ID.npc.LEVER_EF_DOOR):openDoor(30) @@ -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/Halvung/npcs/Operating_Lever_F.lua b/scripts/zones/Halvung/npcs/Operating_Lever_F.lua index 952c5d77c34..ca3ea9a0f69 100644 --- a/scripts/zones/Halvung/npcs/Operating_Lever_F.lua +++ b/scripts/zones/Halvung/npcs/Operating_Lever_F.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.HALVUNG] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:hasKeyItem(xi.ki.BRACELET_OF_VERVE) then GetNPCByID(ID.npc.LEVER_EF_DOOR):openDoor(30) @@ -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/Halvung/npcs/Operating_Lever_G.lua b/scripts/zones/Halvung/npcs/Operating_Lever_G.lua index dda84859eaf..ddcac71fd1e 100644 --- a/scripts/zones/Halvung/npcs/Operating_Lever_G.lua +++ b/scripts/zones/Halvung/npcs/Operating_Lever_G.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.HALVUNG] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:hasKeyItem(xi.ki.BRACELET_OF_VERVE) then GetNPCByID(ID.npc.LEVER_GH_DOOR):openDoor(30) @@ -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/Halvung/npcs/Operating_Lever_H.lua b/scripts/zones/Halvung/npcs/Operating_Lever_H.lua index f2abadc79b3..20165cd772e 100644 --- a/scripts/zones/Halvung/npcs/Operating_Lever_H.lua +++ b/scripts/zones/Halvung/npcs/Operating_Lever_H.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.HALVUNG] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:hasKeyItem(xi.ki.BRACELET_OF_VERVE) then GetNPCByID(ID.npc.LEVER_GH_DOOR):openDoor(30) @@ -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/Halvung/npcs/Operating_Lever_I.lua b/scripts/zones/Halvung/npcs/Operating_Lever_I.lua index bd86f2ab807..afb23faa207 100644 --- a/scripts/zones/Halvung/npcs/Operating_Lever_I.lua +++ b/scripts/zones/Halvung/npcs/Operating_Lever_I.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.HALVUNG] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:hasKeyItem(xi.ki.BRACELET_OF_VERVE) then GetNPCByID(ID.npc.LEVER_IJ_DOOR):openDoor(30) @@ -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/Halvung/npcs/Operating_Lever_J.lua b/scripts/zones/Halvung/npcs/Operating_Lever_J.lua index 391e5678db7..cb2aa32e9c8 100644 --- a/scripts/zones/Halvung/npcs/Operating_Lever_J.lua +++ b/scripts/zones/Halvung/npcs/Operating_Lever_J.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.HALVUNG] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:hasKeyItem(xi.ki.BRACELET_OF_VERVE) then GetNPCByID(ID.npc.LEVER_IJ_DOOR):openDoor(30) @@ -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/Halvung/npcs/_1qp.lua b/scripts/zones/Halvung/npcs/_1qp.lua index 0fcea4470ac..e691a280f17 100644 --- a/scripts/zones/Halvung/npcs/_1qp.lua +++ b/scripts/zones/Halvung/npcs/_1qp.lua @@ -34,10 +34,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/Halvung/npcs/qm1.lua b/scripts/zones/Halvung/npcs/qm1.lua index c86eab7cc3c..ea96ff57734 100644 --- a/scripts/zones/Halvung/npcs/qm1.lua +++ b/scripts/zones/Halvung/npcs/qm1.lua @@ -21,10 +21,4 @@ entity.onTrigger = function(player, npc) player:messageSpecial(ID.text.BLUE_FLAMES) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Halvung/npcs/qm2.lua b/scripts/zones/Halvung/npcs/qm2.lua index 4fb54800373..6908c2b7512 100644 --- a/scripts/zones/Halvung/npcs/qm2.lua +++ b/scripts/zones/Halvung/npcs/qm2.lua @@ -22,10 +22,4 @@ entity.onTrigger = function(player, npc) player:messageSpecial(ID.text.SICKLY_SWEET) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Halvung/npcs/qm3.lua b/scripts/zones/Halvung/npcs/qm3.lua index 7428732abc5..ceef57fcd68 100644 --- a/scripts/zones/Halvung/npcs/qm3.lua +++ b/scripts/zones/Halvung/npcs/qm3.lua @@ -22,10 +22,4 @@ entity.onTrigger = function(player, npc) player:messageSpecial(ID.text.THIN_LAYER_OF_CINDER) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Halvung/npcs/qm4.lua b/scripts/zones/Halvung/npcs/qm4.lua index 58ab6c982f2..c827c3fba54 100644 --- a/scripts/zones/Halvung/npcs/qm4.lua +++ b/scripts/zones/Halvung/npcs/qm4.lua @@ -22,10 +22,4 @@ entity.onTrigger = function(player, npc) player:messageSpecial(ID.text.SICKLY_SWEET) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Halvung/npcs/qm8.lua b/scripts/zones/Halvung/npcs/qm8.lua index 37ce86350f2..6349001a2fc 100644 --- a/scripts/zones/Halvung/npcs/qm8.lua +++ b/scripts/zones/Halvung/npcs/qm8.lua @@ -24,10 +24,4 @@ entity.onTrigger = function(player, npc) player:messageSpecial(ID.text.DULL_PIECE) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Heavens_Tower/DefaultActions.lua b/scripts/zones/Heavens_Tower/DefaultActions.lua index 59c26e4f9d0..04b931f66c2 100644 --- a/scripts/zones/Heavens_Tower/DefaultActions.lua +++ b/scripts/zones/Heavens_Tower/DefaultActions.lua @@ -1,23 +1,46 @@ -- local ID = zones[xi.zone.HEAVENS_TOWER] return { - ['_6q2'] = { event = 154 }, - ['Aeshushu'] = { event = 60 }, - ['Boycoco'] = { event = 57 }, - ['Churara'] = { event = 59 }, - ['Dattata'] = { event = 61 }, - ['Foo_Beibo'] = { event = 87 }, - ['Heruru'] = { event = 62 }, - ['Ikucheechee'] = { event = 63 }, - ['Kinono'] = { event = 67 }, - ['Kiwawa'] = { event = 58 }, - ['Nayutata'] = { event = 64 }, - ['Nebibi'] = { event = 68 }, - ['Rhy_Epocan'] = { event = 93 }, - ['Shaz_Norem'] = { event = 91 }, - ['Tsuryarya'] = { event = 65 }, - ['Ufu_Koromoa'] = { event = 94 }, - ['Utsuitsui'] = { event = 66 }, - ['Vahn_Paineesha'] = { event = 89 }, - ['Zubaba'] = { event = 56 }, + ['_6q2'] = { event = 154 }, + ['Abobo'] = { event = 44 }, + ['Aeshushu'] = { event = 60 }, + ['Bebibi'] = { event = 45 }, + ['Boycoco'] = { event = 57 }, + ['Chuqui-Chanqui'] = { event = 80 }, + ['Churara'] = { event = 59 }, + ['Damama'] = { event = 46 }, + ['Dattata'] = { event = 61 }, + ['Ewchichi'] = { event = 47 }, + ['Foo_Beibo'] = { event = 87 }, + ['Habida-Jubida'] = { event = 79 }, + ['Heruru'] = { event = 62 }, + ['Hikkuku'] = { event = 49 }, + ['Ikucheechee'] = { event = 63 }, + ['Kinono'] = { event = 67 }, + ['Kiwawa'] = { event = 58 }, + ['Lin_Megomifu'] = { event = 81 }, + ['Mashua'] = { event = 334 }, + ['Mhabi Molkot'] = { event = 410 }, + ['Nayutata'] = { event = 64 }, + ['Nebibi'] = { event = 68 }, + ['Nului-Nlui'] = { event = 55 }, + ['Parara'] = { event = 76 }, + ['Rayjin-Ojin'] = { event = 54 }, + ['Rhy_Epocan'] = { event = 93 }, + ['Ritoto'] = { event = 74 }, + ['Sassa-Kotassa'] = { event = 53 }, + ['Shaz_Norem'] = { event = 91 }, + ['Sheelala'] = { event = 75 }, + ['Tamil-Hamel'] = { event = 52 }, + ['Tayaya'] = { event = 253 }, + ['Transporter'] = { event = 83 }, + ['Tsuryarya'] = { event = 65 }, + ['Ufu_Koromoa'] = { event = 94 }, + ['Urubero-Mohbero'] = { event = 252 }, + ['Utsuitsui'] = { event = 66 }, + ['Vahn_Paineesha'] = { event = 89 }, + ['Wabble-Mopple'] = { event = 51 }, + ['Yakuku'] = { event = 48 }, + ['Zubaba'] = { event = 56 }, + ['Zubu-Abibu'] = { event = 50 }, } diff --git a/scripts/zones/Heavens_Tower/npcs/Abobo.lua b/scripts/zones/Heavens_Tower/npcs/Abobo.lua deleted file mode 100644 index 0e6f43db787..00000000000 --- a/scripts/zones/Heavens_Tower/npcs/Abobo.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Heaven's Tower --- NPC: Abobo ------------------------------------ ----@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/Heavens_Tower/npcs/Bebibi.lua b/scripts/zones/Heavens_Tower/npcs/Bebibi.lua deleted file mode 100644 index e77b70957c4..00000000000 --- a/scripts/zones/Heavens_Tower/npcs/Bebibi.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Heaven's Tower --- NPC: Bebibi ------------------------------------ ----@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/Heavens_Tower/npcs/Celebratory_Chest.lua b/scripts/zones/Heavens_Tower/npcs/Celebratory_Chest.lua index d5e61092623..17bf031588e 100644 --- a/scripts/zones/Heavens_Tower/npcs/Celebratory_Chest.lua +++ b/scripts/zones/Heavens_Tower/npcs/Celebratory_Chest.lua @@ -9,18 +9,9 @@ local ID = zones[xi.zone.HEAVENS_TOWER] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.shop.celebratory(player) player:messageSpecial(ID.text.CELEBRATORY_GOODS) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Heavens_Tower/npcs/Chumimi.lua b/scripts/zones/Heavens_Tower/npcs/Chumimi.lua index 10d9a0cc6e4..fcce6416099 100644 --- a/scripts/zones/Heavens_Tower/npcs/Chumimi.lua +++ b/scripts/zones/Heavens_Tower/npcs/Chumimi.lua @@ -90,9 +90,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 == 260 then -- option 3: Koru-Moru -- option 2: Shantotto -- option 1: Yoran-Oran diff --git a/scripts/zones/Heavens_Tower/npcs/Chuqui-Chanqui.lua b/scripts/zones/Heavens_Tower/npcs/Chuqui-Chanqui.lua index b6ab4f8ac78..6928ba15cfa 100644 --- a/scripts/zones/Heavens_Tower/npcs/Chuqui-Chanqui.lua +++ b/scripts/zones/Heavens_Tower/npcs/Chuqui-Chanqui.lua @@ -17,17 +17,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(80) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Heavens_Tower/npcs/Damama.lua b/scripts/zones/Heavens_Tower/npcs/Damama.lua deleted file mode 100644 index cbc77706525..00000000000 --- a/scripts/zones/Heavens_Tower/npcs/Damama.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Heaven's Tower --- NPC: Damama ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(46) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Heavens_Tower/npcs/Ewchichi.lua b/scripts/zones/Heavens_Tower/npcs/Ewchichi.lua deleted file mode 100644 index 1d78e61f666..00000000000 --- a/scripts/zones/Heavens_Tower/npcs/Ewchichi.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Heaven's Tower --- NPC: Ewchichi ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(47) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Heavens_Tower/npcs/Gamimi.lua b/scripts/zones/Heavens_Tower/npcs/Gamimi.lua index c9f33f31efc..83db74da365 100644 --- a/scripts/zones/Heavens_Tower/npcs/Gamimi.lua +++ b/scripts/zones/Heavens_Tower/npcs/Gamimi.lua @@ -7,19 +7,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) -- Currently selecting option 1 will result in a hard lock of the player requiring them to force quit the client. -- This likely needs special handling in the core. -- player:startEvent(10000) -- , 0, 0, 0, 0, 0, -1, 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/Heavens_Tower/npcs/Habida-Jubida.lua b/scripts/zones/Heavens_Tower/npcs/Habida-Jubida.lua deleted file mode 100644 index 4a5e7ae3507..00000000000 --- a/scripts/zones/Heavens_Tower/npcs/Habida-Jubida.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Heaven's Tower --- NPC: Habida-Jubida ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(79) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Heavens_Tower/npcs/Hikkuku.lua b/scripts/zones/Heavens_Tower/npcs/Hikkuku.lua deleted file mode 100644 index c977d9dd358..00000000000 --- a/scripts/zones/Heavens_Tower/npcs/Hikkuku.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Heaven's Tower --- NPC: Hikkuku ------------------------------------ ----@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/Heavens_Tower/npcs/Jatata.lua b/scripts/zones/Heavens_Tower/npcs/Jatata.lua index 489b8db6280..ba730c56213 100644 --- a/scripts/zones/Heavens_Tower/npcs/Jatata.lua +++ b/scripts/zones/Heavens_Tower/npcs/Jatata.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getNation() == xi.nation.WINDURST then player:startEvent(77) @@ -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/Heavens_Tower/npcs/Jerrett.lua b/scripts/zones/Heavens_Tower/npcs/Jerrett.lua index 473ba451b7d..e3f436e0768 100644 --- a/scripts/zones/Heavens_Tower/npcs/Jerrett.lua +++ b/scripts/zones/Heavens_Tower/npcs/Jerrett.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/Heavens_Tower/npcs/Kierron.lua b/scripts/zones/Heavens_Tower/npcs/Kierron.lua index ba55efa327b..68d6f26137f 100644 --- a/scripts/zones/Heavens_Tower/npcs/Kierron.lua +++ b/scripts/zones/Heavens_Tower/npcs/Kierron.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/Heavens_Tower/npcs/Kupipi.lua b/scripts/zones/Heavens_Tower/npcs/Kupipi.lua index f6541faf525..8e1d69e1d95 100644 --- a/scripts/zones/Heavens_Tower/npcs/Kupipi.lua +++ b/scripts/zones/Heavens_Tower/npcs/Kupipi.lua @@ -26,9 +26,6 @@ local trustMemory = function(player) return memories end -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local trustSandoria = player:getQuestStatus(xi.questLog.SANDORIA, xi.quest.id.sandoria.TRUST_SANDORIA) local trustBastok = player:getQuestStatus(xi.questLog.BASTOK, xi.quest.id.bastok.TRUST_BASTOK) @@ -77,9 +74,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) --TRUST if csid == 435 then diff --git a/scripts/zones/Heavens_Tower/npcs/Lin_Megomifu.lua b/scripts/zones/Heavens_Tower/npcs/Lin_Megomifu.lua deleted file mode 100644 index ada08f3d597..00000000000 --- a/scripts/zones/Heavens_Tower/npcs/Lin_Megomifu.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Heaven's Tower --- NPC: Lin Megomifu ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(81) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Heavens_Tower/npcs/Mashua.lua b/scripts/zones/Heavens_Tower/npcs/Mashua.lua deleted file mode 100644 index bc7afe96c87..00000000000 --- a/scripts/zones/Heavens_Tower/npcs/Mashua.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Heavens Tower --- NPC: Mashua --- !pos -7.399 -0.5 4.580 242 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(334) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Heavens_Tower/npcs/Matrimonial_Coffer.lua b/scripts/zones/Heavens_Tower/npcs/Matrimonial_Coffer.lua index d98e4f9570e..bb4bc4966b9 100644 --- a/scripts/zones/Heavens_Tower/npcs/Matrimonial_Coffer.lua +++ b/scripts/zones/Heavens_Tower/npcs/Matrimonial_Coffer.lua @@ -6,16 +6,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.matrimonialcoffer.startEvent(player) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.matrimonialcoffer.finishEvent(player, csid, option, npc) end diff --git a/scripts/zones/Heavens_Tower/npcs/Mhabi_Molkot.lua b/scripts/zones/Heavens_Tower/npcs/Mhabi_Molkot.lua deleted file mode 100644 index 7d6766fb011..00000000000 --- a/scripts/zones/Heavens_Tower/npcs/Mhabi_Molkot.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Heavens Tower --- NPC: Mhabi Molkot --- Type: Conflict Director --- !pos -3.767 -0.501 23.920 242 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(410) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Heavens_Tower/npcs/Nului-Nlui.lua b/scripts/zones/Heavens_Tower/npcs/Nului-Nlui.lua deleted file mode 100644 index 9ae72a6fb51..00000000000 --- a/scripts/zones/Heavens_Tower/npcs/Nului-Nlui.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Heaven's Tower --- NPC: Nului-Nlui ------------------------------------ ----@type TNpcEntity -local entity = {} - -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/Heavens_Tower/npcs/Parara.lua b/scripts/zones/Heavens_Tower/npcs/Parara.lua deleted file mode 100644 index 65d3090917b..00000000000 --- a/scripts/zones/Heavens_Tower/npcs/Parara.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Heaven's Tower --- NPC: Parara ------------------------------------ ----@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/Heavens_Tower/npcs/Rakano-Marukano.lua b/scripts/zones/Heavens_Tower/npcs/Rakano-Marukano.lua index c9b0da1b918..d9a4cfaecae 100644 --- a/scripts/zones/Heavens_Tower/npcs/Rakano-Marukano.lua +++ b/scripts/zones/Heavens_Tower/npcs/Rakano-Marukano.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local newNation = xi.nation.WINDURST local oldNation = player:getNation() @@ -42,9 +39,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 == 10002 and option == 1 then local newNation = xi.nation.WINDURST diff --git a/scripts/zones/Heavens_Tower/npcs/Rayjin-Ojin.lua b/scripts/zones/Heavens_Tower/npcs/Rayjin-Ojin.lua deleted file mode 100644 index cacbff86ff9..00000000000 --- a/scripts/zones/Heavens_Tower/npcs/Rayjin-Ojin.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Heaven's Tower --- NPC: Rayjin-Ojin ------------------------------------ ----@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/Heavens_Tower/npcs/Ritoto.lua b/scripts/zones/Heavens_Tower/npcs/Ritoto.lua deleted file mode 100644 index f53e2e5527b..00000000000 --- a/scripts/zones/Heavens_Tower/npcs/Ritoto.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Heaven's Tower --- NPC: Ritoto ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(74) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Heavens_Tower/npcs/Sassa-Kotassa.lua b/scripts/zones/Heavens_Tower/npcs/Sassa-Kotassa.lua deleted file mode 100644 index d2ad56e184c..00000000000 --- a/scripts/zones/Heavens_Tower/npcs/Sassa-Kotassa.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Heaven's Tower --- NPC: Sassa-Kotassa ------------------------------------ ----@type TNpcEntity -local entity = {} - -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/Heavens_Tower/npcs/Sheelala.lua b/scripts/zones/Heavens_Tower/npcs/Sheelala.lua deleted file mode 100644 index e7e20affd8d..00000000000 --- a/scripts/zones/Heavens_Tower/npcs/Sheelala.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Heaven's Tower --- NPC: Sheelala ------------------------------------ ----@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/Heavens_Tower/npcs/Tamil-Hamel.lua b/scripts/zones/Heavens_Tower/npcs/Tamil-Hamel.lua deleted file mode 100644 index 62139ca9258..00000000000 --- a/scripts/zones/Heavens_Tower/npcs/Tamil-Hamel.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Heaven's Tower --- NPC: Tamil-Hamel ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(52) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Heavens_Tower/npcs/Tayaya.lua b/scripts/zones/Heavens_Tower/npcs/Tayaya.lua deleted file mode 100644 index dd634563bb5..00000000000 --- a/scripts/zones/Heavens_Tower/npcs/Tayaya.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Heaven's Tower --- NPC: Tayaya ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(253) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Heavens_Tower/npcs/Transporter.lua b/scripts/zones/Heavens_Tower/npcs/Transporter.lua deleted file mode 100644 index e1677912a4e..00000000000 --- a/scripts/zones/Heavens_Tower/npcs/Transporter.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Heaven's Tower --- NPC: Transporter --- Standard Teleport NPC ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(83) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Heavens_Tower/npcs/Urubero-Mohbero.lua b/scripts/zones/Heavens_Tower/npcs/Urubero-Mohbero.lua deleted file mode 100644 index 1610b5cc115..00000000000 --- a/scripts/zones/Heavens_Tower/npcs/Urubero-Mohbero.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Heaven's Tower --- NPC: Urubero-Mohbero ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(252) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Heavens_Tower/npcs/Wabble-Mopple.lua b/scripts/zones/Heavens_Tower/npcs/Wabble-Mopple.lua deleted file mode 100644 index c203a44cba4..00000000000 --- a/scripts/zones/Heavens_Tower/npcs/Wabble-Mopple.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Heaven's Tower --- NPC: Wabble-Mopple ------------------------------------ ----@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/Heavens_Tower/npcs/Yakuku.lua b/scripts/zones/Heavens_Tower/npcs/Yakuku.lua deleted file mode 100644 index 767a5ba4542..00000000000 --- a/scripts/zones/Heavens_Tower/npcs/Yakuku.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Heaven's Tower --- NPC: Yakuku ------------------------------------ ----@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/Heavens_Tower/npcs/Zubaba.lua b/scripts/zones/Heavens_Tower/npcs/Zubaba.lua index f4075106939..e5ed5541513 100644 --- a/scripts/zones/Heavens_Tower/npcs/Zubaba.lua +++ b/scripts/zones/Heavens_Tower/npcs/Zubaba.lua @@ -7,19 +7,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:hasKeyItem(xi.ki.STAR_CRESTED_SUMMONS_1) then player:startEvent(157) 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/Heavens_Tower/npcs/Zubu-Abibu.lua b/scripts/zones/Heavens_Tower/npcs/Zubu-Abibu.lua deleted file mode 100644 index 588f1156f9d..00000000000 --- a/scripts/zones/Heavens_Tower/npcs/Zubu-Abibu.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Heaven's Tower --- NPC: Zubu-Abibu ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(50) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Heavens_Tower/npcs/_6q1.lua b/scripts/zones/Heavens_Tower/npcs/_6q1.lua index 94f7c9cf260..072eb387083 100644 --- a/scripts/zones/Heavens_Tower/npcs/_6q1.lua +++ b/scripts/zones/Heavens_Tower/npcs/_6q1.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.HEAVENS_TOWER] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getNation() == 2 then if player:hasKeyItem(xi.ki.STARWAY_STAIRWAY_BAUBLE) then @@ -27,10 +24,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/Horlais_Peak/npcs/relic.lua b/scripts/zones/Horlais_Peak/npcs/relic.lua index 91d537f2b00..8542525ef70 100644 --- a/scripts/zones/Horlais_Peak/npcs/relic.lua +++ b/scripts/zones/Horlais_Peak/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 == 13 and diff --git a/scripts/zones/Ifrits_Cauldron/npcs/Altar_of_Ashes.lua b/scripts/zones/Ifrits_Cauldron/npcs/Altar_of_Ashes.lua index 09c0760853e..317d37f71ca 100644 --- a/scripts/zones/Ifrits_Cauldron/npcs/Altar_of_Ashes.lua +++ b/scripts/zones/Ifrits_Cauldron/npcs/Altar_of_Ashes.lua @@ -47,10 +47,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/Ifrits_Cauldron/npcs/Flame_Spout.lua b/scripts/zones/Ifrits_Cauldron/npcs/Flame_Spout.lua index c488078caca..7a3583a9ff0 100644 --- a/scripts/zones/Ifrits_Cauldron/npcs/Flame_Spout.lua +++ b/scripts/zones/Ifrits_Cauldron/npcs/Flame_Spout.lua @@ -20,10 +20,4 @@ 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/Ifrits_Cauldron/npcs/Grounds_Tome.lua b/scripts/zones/Ifrits_Cauldron/npcs/Grounds_Tome.lua index 51138e9b3e4..3a00a9ec566 100644 --- a/scripts/zones/Ifrits_Cauldron/npcs/Grounds_Tome.lua +++ b/scripts/zones/Ifrits_Cauldron/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/Ifrits_Cauldron/npcs/Mining_Point.lua b/scripts/zones/Ifrits_Cauldron/npcs/Mining_Point.lua index 79120698ae7..de1e0902488 100644 --- a/scripts/zones/Ifrits_Cauldron/npcs/Mining_Point.lua +++ b/scripts/zones/Ifrits_Cauldron/npcs/Mining_Point.lua @@ -13,10 +13,4 @@ entity.onTrigger = function(player, npc) xi.helm.onTrigger(player, xi.helmType.MINING) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Ifrits_Cauldron/npcs/Treasure_Casket.lua b/scripts/zones/Ifrits_Cauldron/npcs/Treasure_Casket.lua index 8ec4e7aafb2..397b2c1d3a1 100644 --- a/scripts/zones/Ifrits_Cauldron/npcs/Treasure_Casket.lua +++ b/scripts/zones/Ifrits_Cauldron/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/Ifrits_Cauldron/npcs/Treasure_Coffer.lua b/scripts/zones/Ifrits_Cauldron/npcs/Treasure_Coffer.lua index 0c51d0cc8dd..35de8e95565 100644 --- a/scripts/zones/Ifrits_Cauldron/npcs/Treasure_Coffer.lua +++ b/scripts/zones/Ifrits_Cauldron/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/Ifrits_Cauldron/npcs/qm1.lua b/scripts/zones/Ifrits_Cauldron/npcs/qm1.lua index dc1a29fcd0a..7dedf1dfe0c 100644 --- a/scripts/zones/Ifrits_Cauldron/npcs/qm1.lua +++ b/scripts/zones/Ifrits_Cauldron/npcs/qm1.lua @@ -22,10 +22,4 @@ entity.onTrigger = function(player, npc) player:messageSpecial(ID.text.EGGSHELLS_LIE_SCATTERED) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Ifrits_Cauldron/npcs/qm2.lua b/scripts/zones/Ifrits_Cauldron/npcs/qm2.lua index c4810ddc61e..7683cee7af9 100644 --- a/scripts/zones/Ifrits_Cauldron/npcs/qm2.lua +++ b/scripts/zones/Ifrits_Cauldron/npcs/qm2.lua @@ -22,10 +22,4 @@ 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/Ifrits_Cauldron/npcs/relic.lua b/scripts/zones/Ifrits_Cauldron/npcs/relic.lua index f49c305fd7f..f80f27785b3 100644 --- a/scripts/zones/Ifrits_Cauldron/npcs/relic.lua +++ b/scripts/zones/Ifrits_Cauldron/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 == 32 and diff --git a/scripts/zones/Ilrusi_Atoll/npcs/Cursed_Chest.lua b/scripts/zones/Ilrusi_Atoll/npcs/Cursed_Chest.lua index a1e4898a1f1..5290b734db4 100644 --- a/scripts/zones/Ilrusi_Atoll/npcs/Cursed_Chest.lua +++ b/scripts/zones/Ilrusi_Atoll/npcs/Cursed_Chest.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.ILRUSI_ATOLL] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:messageSpecial(ID.text.CHEST) @@ -32,10 +29,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/Ilrusi_Atoll/npcs/Rune_of_Release.lua b/scripts/zones/Ilrusi_Atoll/npcs/Rune_of_Release.lua index 9d79bd8977a..f0a19cd8418 100644 --- a/scripts/zones/Ilrusi_Atoll/npcs/Rune_of_Release.lua +++ b/scripts/zones/Ilrusi_Atoll/npcs/Rune_of_Release.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local instance = npc:getInstance() @@ -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) xi.assault.instanceOnEventFinish(player, csid, xi.zone.ARRAPAGO_REEF) xi.assault.runeReleaseFinish(player, csid, option, npc) diff --git a/scripts/zones/Inner_Horutoto_Ruins/npcs/Geomagnetic_Fount.lua b/scripts/zones/Inner_Horutoto_Ruins/npcs/Geomagnetic_Fount.lua index 9b345d128f4..e7cf2215e27 100644 --- a/scripts/zones/Inner_Horutoto_Ruins/npcs/Geomagnetic_Fount.lua +++ b/scripts/zones/Inner_Horutoto_Ruins/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/Inner_Horutoto_Ruins/npcs/Grounds_Tome.lua b/scripts/zones/Inner_Horutoto_Ruins/npcs/Grounds_Tome.lua index b2744551572..9fc733a35d6 100644 --- a/scripts/zones/Inner_Horutoto_Ruins/npcs/Grounds_Tome.lua +++ b/scripts/zones/Inner_Horutoto_Ruins/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/Inner_Horutoto_Ruins/npcs/Treasure_Casket.lua b/scripts/zones/Inner_Horutoto_Ruins/npcs/Treasure_Casket.lua index 751dc976f9e..8f25484589b 100644 --- a/scripts/zones/Inner_Horutoto_Ruins/npcs/Treasure_Casket.lua +++ b/scripts/zones/Inner_Horutoto_Ruins/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/Inner_Horutoto_Ruins/npcs/Treasure_Chest.lua b/scripts/zones/Inner_Horutoto_Ruins/npcs/Treasure_Chest.lua index ff9f28cde0d..4ea719097be 100644 --- a/scripts/zones/Inner_Horutoto_Ruins/npcs/Treasure_Chest.lua +++ b/scripts/zones/Inner_Horutoto_Ruins/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/Inner_Horutoto_Ruins/npcs/_5c8.lua b/scripts/zones/Inner_Horutoto_Ruins/npcs/_5c8.lua index 102d9dbe656..c6967a5a210 100644 --- a/scripts/zones/Inner_Horutoto_Ruins/npcs/_5c8.lua +++ b/scripts/zones/Inner_Horutoto_Ruins/npcs/_5c8.lua @@ -11,9 +11,6 @@ local ID = zones[xi.zone.INNER_HORUTOTO_RUINS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if npc:getLocalVar('doorCoolDown') > os.time() then return @@ -43,10 +40,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/Inner_Horutoto_Ruins/npcs/_5ca.lua b/scripts/zones/Inner_Horutoto_Ruins/npcs/_5ca.lua index 19dd6ea58e3..61a9962d028 100644 --- a/scripts/zones/Inner_Horutoto_Ruins/npcs/_5ca.lua +++ b/scripts/zones/Inner_Horutoto_Ruins/npcs/_5ca.lua @@ -10,9 +10,6 @@ local ID = zones[xi.zone.INNER_HORUTOTO_RUINS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local makingHeadlines = player:getQuestStatus(xi.questLog.WINDURST, xi.quest.id.windurst.MAKING_HEADLINES) @@ -29,10 +26,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/Jugner_Forest/DefaultActions.lua b/scripts/zones/Jugner_Forest/DefaultActions.lua index 9ef94537d75..7bcfdc22737 100644 --- a/scripts/zones/Jugner_Forest/DefaultActions.lua +++ b/scripts/zones/Jugner_Forest/DefaultActions.lua @@ -1,5 +1,8 @@ local ID = zones[xi.zone.JUGNER_FOREST] return { - ['Metallic_Hodgepodge'] = { ID.text.NOTHING_OUT_OF_ORDINARY }, + ['Beastmens_Banner'] = { messageSpecial = ID.text.BEASTMEN_BANNER}, + ['Metallic_Hodgepodge'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, + ['Perevie'] = { event = 29 }, + ['Stone_Monument'] = { event = 900 }, } diff --git a/scripts/zones/Jugner_Forest/npcs/Alexius.lua b/scripts/zones/Jugner_Forest/npcs/Alexius.lua index 9052aedaa6c..3c3b0a84379 100644 --- a/scripts/zones/Jugner_Forest/npcs/Alexius.lua +++ b/scripts/zones/Jugner_Forest/npcs/Alexius.lua @@ -4,14 +4,9 @@ -- Involved in Quest: A purchase of Arms & Sin Hunting -- !pos 105 1 382 104 ----------------------------------- -local ID = zones[xi.zone.JUGNER_FOREST] ------------------------------------ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:hasKeyItem(xi.ki.WEAPONS_ORDER) then player:startEvent(5) @@ -20,14 +15,10 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 5 then player:delKeyItem(xi.ki.WEAPONS_ORDER) - player:addKeyItem(xi.ki.WEAPONS_RECEIPT) - player:messageSpecial(ID.text.KEYITEM_OBTAINED, xi.ki.WEAPONS_RECEIPT) + npcUtil.giveKeyItem(player, xi.ki.WEAPONS_RECEIPT) elseif csid == 10 then player:setCharVar('sinHunting', 4) end diff --git a/scripts/zones/Jugner_Forest/npcs/Beastmens_Banner.lua b/scripts/zones/Jugner_Forest/npcs/Beastmens_Banner.lua deleted file mode 100644 index b96d616cea5..00000000000 --- a/scripts/zones/Jugner_Forest/npcs/Beastmens_Banner.lua +++ /dev/null @@ -1,24 +0,0 @@ ------------------------------------ --- Area: Jugner_Forest --- NPC: Beastmen_s_Banner --- !pos 448.240 0.210 -157.228 104 ------------------------------------ -local ID = zones[xi.zone.JUGNER_FOREST] ------------------------------------ ----@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/Jugner_Forest/npcs/Cavernous_Maw.lua b/scripts/zones/Jugner_Forest/npcs/Cavernous_Maw.lua index c9b192c6089..f5110767ed4 100644 --- a/scripts/zones/Jugner_Forest/npcs/Cavernous_Maw.lua +++ b/scripts/zones/Jugner_Forest/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/Jugner_Forest/npcs/Cavernous_Maw_2.lua b/scripts/zones/Jugner_Forest/npcs/Cavernous_Maw_2.lua index 23d24361f9a..551dbc2c23c 100644 --- a/scripts/zones/Jugner_Forest/npcs/Cavernous_Maw_2.lua +++ b/scripts/zones/Jugner_Forest/npcs/Cavernous_Maw_2.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.JUGNER_FOREST] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if xi.settings.main.ENABLE_ABYSSEA == 1 and player:getMainLvl() >= 30 then if @@ -28,9 +25,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:addQuest(xi.questLog.ABYSSEA, xi.quest.id.abyssea.THE_BEAST_OF_BASTORE) diff --git a/scripts/zones/Jugner_Forest/npcs/Field_Manual.lua b/scripts/zones/Jugner_Forest/npcs/Field_Manual.lua index 9aaad7e65b8..bff0746253b 100644 --- a/scripts/zones/Jugner_Forest/npcs/Field_Manual.lua +++ b/scripts/zones/Jugner_Forest/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/Jugner_Forest/npcs/Logging_Point.lua b/scripts/zones/Jugner_Forest/npcs/Logging_Point.lua index 2a001ec2a96..6970581c1d8 100644 --- a/scripts/zones/Jugner_Forest/npcs/Logging_Point.lua +++ b/scripts/zones/Jugner_Forest/npcs/Logging_Point.lua @@ -13,10 +13,4 @@ entity.onTrigger = function(player, npc) xi.helm.onTrigger(player, xi.helmType.LOGGING) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Jugner_Forest/npcs/Mionie.lua b/scripts/zones/Jugner_Forest/npcs/Mionie.lua index d7b0dce8a52..b61b1a93b80 100644 --- a/scripts/zones/Jugner_Forest/npcs/Mionie.lua +++ b/scripts/zones/Jugner_Forest/npcs/Mionie.lua @@ -10,9 +10,6 @@ local entity = {} local vendorRegion = xi.region.NORVALLEN 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/Jugner_Forest/npcs/Perevie.lua b/scripts/zones/Jugner_Forest/npcs/Perevie.lua deleted file mode 100644 index 5013119ec24..00000000000 --- a/scripts/zones/Jugner_Forest/npcs/Perevie.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Jugner Forest --- NPC: Perevie --- Type: Armor Storer --- !pos 5.190 -0.647 11.563 104 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(29) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Jugner_Forest/npcs/Signpost.lua b/scripts/zones/Jugner_Forest/npcs/Signpost.lua index 4c4726131c4..1cce7075ab5 100644 --- a/scripts/zones/Jugner_Forest/npcs/Signpost.lua +++ b/scripts/zones/Jugner_Forest/npcs/Signpost.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local xPos = player:getXPos() local zPos = player:getZPos() @@ -54,9 +51,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 and option == 1 then player:setCharVar('CleanSignPost', utils.mask.setBit(player:getCharVar('CleanSignPost'), 0, true)) diff --git a/scripts/zones/Jugner_Forest/npcs/Stone_Monument.lua b/scripts/zones/Jugner_Forest/npcs/Stone_Monument.lua index 468801a9326..00f8c53008b 100644 --- a/scripts/zones/Jugner_Forest/npcs/Stone_Monument.lua +++ b/scripts/zones/Jugner_Forest/npcs/Stone_Monument.lua @@ -9,10 +9,6 @@ local ID = zones[xi.zone.JUGNER_FOREST] ---@type TNpcEntity local entity = {} -entity.onTrigger = function(player, npc) - player:startEvent(900) -end - entity.onTrade = function(player, npc, trade) if trade:getItemCount() == 1 and @@ -25,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/Jugner_Forest/npcs/Treasure_Casket.lua b/scripts/zones/Jugner_Forest/npcs/Treasure_Casket.lua index 34297d7e1bb..e2e2d4a07a3 100644 --- a/scripts/zones/Jugner_Forest/npcs/Treasure_Casket.lua +++ b/scripts/zones/Jugner_Forest/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/Jugner_Forest/npcs/qm2.lua b/scripts/zones/Jugner_Forest/npcs/qm2.lua index 83ec8555f22..167a5ff9e35 100644 --- a/scripts/zones/Jugner_Forest/npcs/qm2.lua +++ b/scripts/zones/Jugner_Forest/npcs/qm2.lua @@ -7,18 +7,12 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getCharVar('sinHunting') == 4 then player:startEvent(13, 0, 1107) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 13 then player:setCharVar('sinHunting', 5) diff --git a/scripts/zones/Jugner_Forest_[S]/DefaultActions.lua b/scripts/zones/Jugner_Forest_[S]/DefaultActions.lua index c9aaa63980a..7f1aad86bcd 100644 --- a/scripts/zones/Jugner_Forest_[S]/DefaultActions.lua +++ b/scripts/zones/Jugner_Forest_[S]/DefaultActions.lua @@ -1,11 +1,12 @@ local ID = zones[xi.zone.JUGNER_FOREST_S] return { + ['blank_fork'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, ['qm6'] = { messageSpecial = ID.text.YOU_FIND_NOTHING_ORDINARY }, ['qm8'] = { event = 207 }, - ['blank_fork'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, ['Elegant_Footprints'] = { messageSpecial = ID.text.ELEGANT_FOOTPRINTS }, ['Felled_Trees'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, + ['Gate Sentry'] = { event = 253 }, ['Glowing_Pebbles'] = { messageSpecial = ID.text.YOU_FIND_SPARKLING_STONE }, ['Mossy_Stump'] = { messageSpecial = ID.text.NO_RESPONSE }, } diff --git a/scripts/zones/Jugner_Forest_[S]/npcs/Cavernous_Maw.lua b/scripts/zones/Jugner_Forest_[S]/npcs/Cavernous_Maw.lua index e34ed27a40e..6e69180145e 100644 --- a/scripts/zones/Jugner_Forest_[S]/npcs/Cavernous_Maw.lua +++ b/scripts/zones/Jugner_Forest_[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/Jugner_Forest_[S]/npcs/Gate_Sentry.lua b/scripts/zones/Jugner_Forest_[S]/npcs/Gate_Sentry.lua deleted file mode 100644 index 7d7ff8f0ec2..00000000000 --- a/scripts/zones/Jugner_Forest_[S]/npcs/Gate_Sentry.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Jugner Forest (S) --- NPC: Gate Sentry --- !pos -265.235 -2.399 405.246 82 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(253) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Jugner_Forest_[S]/npcs/Helmyre.lua b/scripts/zones/Jugner_Forest_[S]/npcs/Helmyre.lua index 3f3df3beca0..24f5ebe78a9 100644 --- a/scripts/zones/Jugner_Forest_[S]/npcs/Helmyre.lua +++ b/scripts/zones/Jugner_Forest_[S]/npcs/Helmyre.lua @@ -10,16 +10,10 @@ local entity = {} local eventSucceed = 208 local eventFail = 209 -entity.onTrade = function(player, npc, trade) -end - 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/Jugner_Forest_[S]/npcs/Larkin_CA.lua b/scripts/zones/Jugner_Forest_[S]/npcs/Larkin_CA.lua index 7948a95d755..5b32480345c 100644 --- a/scripts/zones/Jugner_Forest_[S]/npcs/Larkin_CA.lua +++ b/scripts/zones/Jugner_Forest_[S]/npcs/Larkin_CA.lua @@ -7,17 +7,8 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(453) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Jugner_Forest_[S]/npcs/Logging_Point.lua b/scripts/zones/Jugner_Forest_[S]/npcs/Logging_Point.lua index 586aa465b53..86566a20b23 100644 --- a/scripts/zones/Jugner_Forest_[S]/npcs/Logging_Point.lua +++ b/scripts/zones/Jugner_Forest_[S]/npcs/Logging_Point.lua @@ -13,10 +13,4 @@ entity.onTrigger = function(player, npc) xi.helm.onTrigger(player, xi.helmType.LOGGING) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Jugner_Forest_[S]/npcs/Roiloux_RK.lua b/scripts/zones/Jugner_Forest_[S]/npcs/Roiloux_RK.lua index 63b62e6b34c..b6fe852a036 100644 --- a/scripts/zones/Jugner_Forest_[S]/npcs/Roiloux_RK.lua +++ b/scripts/zones/Jugner_Forest_[S]/npcs/Roiloux_RK.lua @@ -7,17 +7,8 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(450) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Jugner_Forest_[S]/npcs/Telepoint.lua b/scripts/zones/Jugner_Forest_[S]/npcs/Telepoint.lua index 4e1f3393f26..9c6610978af 100644 --- a/scripts/zones/Jugner_Forest_[S]/npcs/Telepoint.lua +++ b/scripts/zones/Jugner_Forest_[S]/npcs/Telepoint.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.JUGNER_FOREST_S] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if not player:hasKeyItem(xi.ki.JUGNER_GATE_CRYSTAL) then player:startEvent(1) @@ -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 == 1 then npcUtil.giveKeyItem(player, xi.ki.JUGNER_GATE_CRYSTAL) diff --git a/scripts/zones/Jugner_Forest_[S]/npcs/_2a5.lua b/scripts/zones/Jugner_Forest_[S]/npcs/_2a5.lua index 5132e6c4ed7..c76511d594c 100644 --- a/scripts/zones/Jugner_Forest_[S]/npcs/_2a5.lua +++ b/scripts/zones/Jugner_Forest_[S]/npcs/_2a5.lua @@ -6,16 +6,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(104) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if option == 1 then player:setPos(231.029, -0.083, 19.975, 128, xi.zone.LA_VAULE_S) diff --git a/scripts/zones/Kamihr_Drifts/npcs/Blockaded_Path.lua b/scripts/zones/Kamihr_Drifts/npcs/Blockaded_Path.lua index 1f98ab50b7a..4fbe71defea 100644 --- a/scripts/zones/Kamihr_Drifts/npcs/Blockaded_Path.lua +++ b/scripts/zones/Kamihr_Drifts/npcs/Blockaded_Path.lua @@ -17,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 == 57 and option == 1 then player:setPos(16.725, 0.493, -19.652, 131, xi.zone.LEAFALLIA) diff --git a/scripts/zones/Kamihr_Drifts/npcs/Liseran_Door_Entrance.lua b/scripts/zones/Kamihr_Drifts/npcs/Liseran_Door_Entrance.lua index 7bcfe30f701..ff7f58538e3 100644 --- a/scripts/zones/Kamihr_Drifts/npcs/Liseran_Door_Entrance.lua +++ b/scripts/zones/Kamihr_Drifts/npcs/Liseran_Door_Entrance.lua @@ -7,16 +7,10 @@ ---@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) if csid == 34 and option == 1 then player:setPos(-39.846, -179.333, -19.921, 131, 274) From cf57812f62d48515a98406c13a685499ab3c7015 Mon Sep 17 00:00:00 2001 From: claywar Date: Sat, 25 Jan 2025 11:23:33 -0500 Subject: [PATCH 2/4] Remove empty NPCs, add Default Actions - Escha Ru'Aun ~ Gusgen Mines --- .../Escha_RuAun/npcs/Eschan_Portal_#1.lua | 3 --- .../Escha_RuAun/npcs/Eschan_Portal_#10.lua | 3 --- .../Escha_RuAun/npcs/Eschan_Portal_#11.lua | 3 --- .../Escha_RuAun/npcs/Eschan_Portal_#12.lua | 3 --- .../Escha_RuAun/npcs/Eschan_Portal_#13.lua | 3 --- .../Escha_RuAun/npcs/Eschan_Portal_#14.lua | 3 --- .../Escha_RuAun/npcs/Eschan_Portal_#15.lua | 3 --- .../Escha_RuAun/npcs/Eschan_Portal_#2.lua | 3 --- .../Escha_RuAun/npcs/Eschan_Portal_#3.lua | 3 --- .../Escha_RuAun/npcs/Eschan_Portal_#4.lua | 3 --- .../Escha_RuAun/npcs/Eschan_Portal_#5.lua | 3 --- .../Escha_RuAun/npcs/Eschan_Portal_#6.lua | 3 --- .../Escha_RuAun/npcs/Eschan_Portal_#7.lua | 3 --- .../Escha_RuAun/npcs/Eschan_Portal_#8.lua | 3 --- .../Escha_RuAun/npcs/Eschan_Portal_#9.lua | 3 --- .../npcs/Undulating_Confluence.lua | 6 ----- .../Escha_ZiTah/npcs/Eschan_Portal_#1.lua | 3 --- .../Escha_ZiTah/npcs/Eschan_Portal_#2.lua | 3 --- .../Escha_ZiTah/npcs/Eschan_Portal_#3.lua | 3 --- .../Escha_ZiTah/npcs/Eschan_Portal_#4.lua | 3 --- .../Escha_ZiTah/npcs/Eschan_Portal_#5.lua | 3 --- .../Escha_ZiTah/npcs/Eschan_Portal_#6.lua | 3 --- .../Escha_ZiTah/npcs/Eschan_Portal_#7.lua | 3 --- .../Escha_ZiTah/npcs/Eschan_Portal_#8.lua | 3 --- .../npcs/Undulating_Confluence.lua | 6 ----- scripts/zones/FeiYin/npcs/Dry_Fountain.lua | 3 --- .../zones/FeiYin/npcs/Geomantic_Reservoir.lua | 6 ----- scripts/zones/FeiYin/npcs/Grounds_Tome.lua | 3 --- scripts/zones/FeiYin/npcs/Seed_Afterglow.lua | 6 ----- .../zones/FeiYin/npcs/Strange_Apparatus.lua | 6 ----- scripts/zones/FeiYin/npcs/Treasure_Casket.lua | 3 --- scripts/zones/FeiYin/npcs/Treasure_Chest.lua | 6 ----- .../zones/FeiYin/npcs/Underground_Pool.lua | 6 ----- scripts/zones/FeiYin/npcs/qm1.lua | 9 -------- scripts/zones/Feretory/npcs/Suibhne.lua | 9 -------- .../npcs/Geomantic_Reservoir.lua | 6 ----- .../Fort_Ghelsba/npcs/Treasure_Chest.lua | 6 ----- scripts/zones/Fort_Ghelsba/npcs/_3x1.lua | 9 -------- scripts/zones/Fort_Ghelsba/npcs/_3x2.lua | 9 -------- .../npcs/Indescript_Markings.lua | 9 -------- .../npcs/Logging_Point.lua | 6 ----- .../Fort_Karugo-Narugo_[S]/npcs/Mortimer.lua | 9 -------- .../npcs/Pecca-Pocca.lua | 6 ----- .../npcs/Rotih_Moalghett.lua | 6 ----- .../Fort_Karugo-Narugo_[S]/npcs/Spondulix.lua | 9 -------- .../zones/Fort_Karugo-Narugo_[S]/npcs/qm6.lua | 6 ----- scripts/zones/GM_Home/npcs/Janken.lua | 9 -------- scripts/zones/GM_Home/npcs/Listener.lua | 9 -------- scripts/zones/GM_Home/npcs/Speaker.lua | 9 -------- scripts/zones/GM_Home/npcs/Trader.lua | 6 ----- .../zones/Garlaige_Citadel/DefaultActions.lua | 17 +++++++------- .../npcs/Geomagnetic_Fount.lua | 9 -------- .../npcs/Geomantic_Reservoir.lua | 6 ----- .../npcs/Goblin_Footprint.lua | 3 --- .../Garlaige_Citadel/npcs/Grounds_Tome.lua | 3 --- .../Garlaige_Citadel/npcs/Lyco_Sparkles.lua | 3 --- .../zones/Garlaige_Citadel/npcs/Mashira.lua | 6 ----- .../zones/Garlaige_Citadel/npcs/Oaken_Box.lua | 3 --- .../Garlaige_Citadel/npcs/Treasure_Casket.lua | 3 --- .../Garlaige_Citadel/npcs/Treasure_Chest.lua | 6 ----- .../Garlaige_Citadel/npcs/Treasure_Coffer.lua | 6 ----- .../Garlaige_Citadel/npcs/Wanzo-Unzozo.lua | 22 ------------------- scripts/zones/Garlaige_Citadel/npcs/_5k0.lua | 9 -------- scripts/zones/Garlaige_Citadel/npcs/_5k9.lua | 9 -------- scripts/zones/Garlaige_Citadel/npcs/_5ki.lua | 9 -------- scripts/zones/Garlaige_Citadel/npcs/_5kr.lua | 6 ----- scripts/zones/Garlaige_Citadel/npcs/qm17.lua | 6 ----- .../Garlaige_Citadel_[S]/npcs/Fondactiont.lua | 6 ----- .../Garlaige_Citadel_[S]/npcs/Lycopodium.lua | 6 ----- .../Garlaige_Citadel_[S]/npcs/Randecque.lua | 9 -------- .../Ghelsba_Outpost/npcs/Logging_Point.lua | 6 ----- .../zones/Giddeus/npcs/Altar_of_Offerings.lua | 6 ----- .../zones/Giddeus/npcs/Harvesting_Point.lua | 6 ----- scripts/zones/Giddeus/npcs/Treasure_Chest.lua | 6 ----- .../Grand_Palace_of_HuXzoi/DefaultActions.lua | 7 ++++++ .../npcs/Cermet_Alcove.lua | 6 ----- .../npcs/Quasilumin.lua | 9 -------- .../Grand_Palace_of_HuXzoi/npcs/_0y0.lua | 22 ------------------- .../Grand_Palace_of_HuXzoi/npcs/_iya.lua | 6 ----- .../Grand_Palace_of_HuXzoi/npcs/_iyb.lua | 22 ------------------- .../Grand_Palace_of_HuXzoi/npcs/_iyc.lua | 22 ------------------- .../npcs/qm_ixaern_mnk.lua | 9 -------- scripts/zones/Grauberg_[S]/DefaultActions.lua | 1 + .../Grauberg_[S]/npcs/Harvesting_Point.lua | 6 ----- .../Grauberg_[S]/npcs/Indescript_Markings.lua | 9 -------- scripts/zones/Grauberg_[S]/npcs/qm2.lua | 13 ----------- scripts/zones/Grauberg_[S]/npcs/qm5.lua | 6 ----- scripts/zones/Gusgen_Mines/DefaultActions.lua | 5 +++-- scripts/zones/Gusgen_Mines/npcs/Clay.lua | 22 ++----------------- scripts/zones/Gusgen_Mines/npcs/Degga.lua | 6 ----- .../Gusgen_Mines/npcs/Geomagnetic_Fount.lua | 9 -------- .../Gusgen_Mines/npcs/Geomantic_Reservoir.lua | 6 ----- .../zones/Gusgen_Mines/npcs/Grounds_Tome.lua | 3 --- .../zones/Gusgen_Mines/npcs/Mining_Point.lua | 6 ----- .../Gusgen_Mines/npcs/Treasure_Casket.lua | 3 --- .../Gusgen_Mines/npcs/Treasure_Chest.lua | 6 ----- scripts/zones/Gusgen_Mines/npcs/_5g0.lua | 11 ---------- scripts/zones/Gusgen_Mines/npcs/_5g1.lua | 11 ---------- scripts/zones/Gusgen_Mines/npcs/_5g2.lua | 11 ---------- scripts/zones/Gusgen_Mines/npcs/_5g3.lua | 11 ---------- scripts/zones/Gusgen_Mines/npcs/_5g4.lua | 11 ---------- scripts/zones/Gusgen_Mines/npcs/_5g5.lua | 11 ---------- scripts/zones/Gusgen_Mines/npcs/_5ga.lua | 9 -------- scripts/zones/Gusgen_Mines/npcs/_5gb.lua | 9 -------- scripts/zones/Gusgen_Mines/npcs/_5gc.lua | 9 -------- scripts/zones/Gusgen_Mines/npcs/_5gd.lua | 9 -------- scripts/zones/Gusgen_Mines/npcs/_5ge.lua | 9 -------- scripts/zones/Gusgen_Mines/npcs/_5gf.lua | 9 -------- scripts/zones/Gusgen_Mines/npcs/qm1.lua | 9 -------- scripts/zones/Gusgen_Mines/npcs/qm3.lua | 9 -------- scripts/zones/Gusgen_Mines/npcs/qm5.lua | 9 -------- 111 files changed, 22 insertions(+), 752 deletions(-) delete mode 100644 scripts/zones/Garlaige_Citadel/npcs/Wanzo-Unzozo.lua create mode 100644 scripts/zones/Grand_Palace_of_HuXzoi/DefaultActions.lua delete mode 100644 scripts/zones/Grand_Palace_of_HuXzoi/npcs/_0y0.lua delete mode 100644 scripts/zones/Grand_Palace_of_HuXzoi/npcs/_iyb.lua delete mode 100644 scripts/zones/Grand_Palace_of_HuXzoi/npcs/_iyc.lua diff --git a/scripts/zones/Escha_RuAun/npcs/Eschan_Portal_#1.lua b/scripts/zones/Escha_RuAun/npcs/Eschan_Portal_#1.lua index 3392e5a74a5..0b4d126e7fd 100644 --- a/scripts/zones/Escha_RuAun/npcs/Eschan_Portal_#1.lua +++ b/scripts/zones/Escha_RuAun/npcs/Eschan_Portal_#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, 8) end diff --git a/scripts/zones/Escha_RuAun/npcs/Eschan_Portal_#10.lua b/scripts/zones/Escha_RuAun/npcs/Eschan_Portal_#10.lua index 409a332aed8..e993f0d8a77 100644 --- a/scripts/zones/Escha_RuAun/npcs/Eschan_Portal_#10.lua +++ b/scripts/zones/Escha_RuAun/npcs/Eschan_Portal_#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, 17) end diff --git a/scripts/zones/Escha_RuAun/npcs/Eschan_Portal_#11.lua b/scripts/zones/Escha_RuAun/npcs/Eschan_Portal_#11.lua index 69d79db21c1..2e131586768 100644 --- a/scripts/zones/Escha_RuAun/npcs/Eschan_Portal_#11.lua +++ b/scripts/zones/Escha_RuAun/npcs/Eschan_Portal_#11.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, 18) end diff --git a/scripts/zones/Escha_RuAun/npcs/Eschan_Portal_#12.lua b/scripts/zones/Escha_RuAun/npcs/Eschan_Portal_#12.lua index a95965eb8cc..a08a6345b9f 100644 --- a/scripts/zones/Escha_RuAun/npcs/Eschan_Portal_#12.lua +++ b/scripts/zones/Escha_RuAun/npcs/Eschan_Portal_#12.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, 19) end diff --git a/scripts/zones/Escha_RuAun/npcs/Eschan_Portal_#13.lua b/scripts/zones/Escha_RuAun/npcs/Eschan_Portal_#13.lua index 373585517ef..77516746e22 100644 --- a/scripts/zones/Escha_RuAun/npcs/Eschan_Portal_#13.lua +++ b/scripts/zones/Escha_RuAun/npcs/Eschan_Portal_#13.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, 20) end diff --git a/scripts/zones/Escha_RuAun/npcs/Eschan_Portal_#14.lua b/scripts/zones/Escha_RuAun/npcs/Eschan_Portal_#14.lua index 5f991dfb35c..d8e3d7ee93b 100644 --- a/scripts/zones/Escha_RuAun/npcs/Eschan_Portal_#14.lua +++ b/scripts/zones/Escha_RuAun/npcs/Eschan_Portal_#14.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, 21) end diff --git a/scripts/zones/Escha_RuAun/npcs/Eschan_Portal_#15.lua b/scripts/zones/Escha_RuAun/npcs/Eschan_Portal_#15.lua index d211bdf5376..3def98ea846 100644 --- a/scripts/zones/Escha_RuAun/npcs/Eschan_Portal_#15.lua +++ b/scripts/zones/Escha_RuAun/npcs/Eschan_Portal_#15.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, 22) end diff --git a/scripts/zones/Escha_RuAun/npcs/Eschan_Portal_#2.lua b/scripts/zones/Escha_RuAun/npcs/Eschan_Portal_#2.lua index d9da9b751ff..40727ebc4bf 100644 --- a/scripts/zones/Escha_RuAun/npcs/Eschan_Portal_#2.lua +++ b/scripts/zones/Escha_RuAun/npcs/Eschan_Portal_#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, 9) end diff --git a/scripts/zones/Escha_RuAun/npcs/Eschan_Portal_#3.lua b/scripts/zones/Escha_RuAun/npcs/Eschan_Portal_#3.lua index 213eb948f15..07ae81b4f7f 100644 --- a/scripts/zones/Escha_RuAun/npcs/Eschan_Portal_#3.lua +++ b/scripts/zones/Escha_RuAun/npcs/Eschan_Portal_#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, 10) end diff --git a/scripts/zones/Escha_RuAun/npcs/Eschan_Portal_#4.lua b/scripts/zones/Escha_RuAun/npcs/Eschan_Portal_#4.lua index f54458ec377..c33b450d97c 100644 --- a/scripts/zones/Escha_RuAun/npcs/Eschan_Portal_#4.lua +++ b/scripts/zones/Escha_RuAun/npcs/Eschan_Portal_#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, 11) end diff --git a/scripts/zones/Escha_RuAun/npcs/Eschan_Portal_#5.lua b/scripts/zones/Escha_RuAun/npcs/Eschan_Portal_#5.lua index 2eec5ae0d5f..0bb16d4e51c 100644 --- a/scripts/zones/Escha_RuAun/npcs/Eschan_Portal_#5.lua +++ b/scripts/zones/Escha_RuAun/npcs/Eschan_Portal_#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, 12) end diff --git a/scripts/zones/Escha_RuAun/npcs/Eschan_Portal_#6.lua b/scripts/zones/Escha_RuAun/npcs/Eschan_Portal_#6.lua index c411ba7d47f..5fd2bc99a4b 100644 --- a/scripts/zones/Escha_RuAun/npcs/Eschan_Portal_#6.lua +++ b/scripts/zones/Escha_RuAun/npcs/Eschan_Portal_#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, 13) end diff --git a/scripts/zones/Escha_RuAun/npcs/Eschan_Portal_#7.lua b/scripts/zones/Escha_RuAun/npcs/Eschan_Portal_#7.lua index 10c16d81deb..cec675526bc 100644 --- a/scripts/zones/Escha_RuAun/npcs/Eschan_Portal_#7.lua +++ b/scripts/zones/Escha_RuAun/npcs/Eschan_Portal_#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, 14) end diff --git a/scripts/zones/Escha_RuAun/npcs/Eschan_Portal_#8.lua b/scripts/zones/Escha_RuAun/npcs/Eschan_Portal_#8.lua index 5753045aa12..e67e822eaaa 100644 --- a/scripts/zones/Escha_RuAun/npcs/Eschan_Portal_#8.lua +++ b/scripts/zones/Escha_RuAun/npcs/Eschan_Portal_#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, 15) end diff --git a/scripts/zones/Escha_RuAun/npcs/Eschan_Portal_#9.lua b/scripts/zones/Escha_RuAun/npcs/Eschan_Portal_#9.lua index b9aac21e1ab..29c3c464c77 100644 --- a/scripts/zones/Escha_RuAun/npcs/Eschan_Portal_#9.lua +++ b/scripts/zones/Escha_RuAun/npcs/Eschan_Portal_#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, 16) end diff --git a/scripts/zones/Escha_RuAun/npcs/Undulating_Confluence.lua b/scripts/zones/Escha_RuAun/npcs/Undulating_Confluence.lua index 7795143acad..a868b5e2673 100644 --- a/scripts/zones/Escha_RuAun/npcs/Undulating_Confluence.lua +++ b/scripts/zones/Escha_RuAun/npcs/Undulating_Confluence.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 == 1 then xi.teleport.to(player, xi.teleport.id.MISAREAUX_CONFLUENCE) diff --git a/scripts/zones/Escha_ZiTah/npcs/Eschan_Portal_#1.lua b/scripts/zones/Escha_ZiTah/npcs/Eschan_Portal_#1.lua index a9eab897b44..6466c2f811d 100644 --- a/scripts/zones/Escha_ZiTah/npcs/Eschan_Portal_#1.lua +++ b/scripts/zones/Escha_ZiTah/npcs/Eschan_Portal_#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, 0) end diff --git a/scripts/zones/Escha_ZiTah/npcs/Eschan_Portal_#2.lua b/scripts/zones/Escha_ZiTah/npcs/Eschan_Portal_#2.lua index 5f11a6ef233..bf58fec5893 100644 --- a/scripts/zones/Escha_ZiTah/npcs/Eschan_Portal_#2.lua +++ b/scripts/zones/Escha_ZiTah/npcs/Eschan_Portal_#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, 1) end diff --git a/scripts/zones/Escha_ZiTah/npcs/Eschan_Portal_#3.lua b/scripts/zones/Escha_ZiTah/npcs/Eschan_Portal_#3.lua index ed16a8d37c4..3c27bc57747 100644 --- a/scripts/zones/Escha_ZiTah/npcs/Eschan_Portal_#3.lua +++ b/scripts/zones/Escha_ZiTah/npcs/Eschan_Portal_#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, 2) end diff --git a/scripts/zones/Escha_ZiTah/npcs/Eschan_Portal_#4.lua b/scripts/zones/Escha_ZiTah/npcs/Eschan_Portal_#4.lua index 5c26e11f4e3..6e45f97fa97 100644 --- a/scripts/zones/Escha_ZiTah/npcs/Eschan_Portal_#4.lua +++ b/scripts/zones/Escha_ZiTah/npcs/Eschan_Portal_#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, 3) end diff --git a/scripts/zones/Escha_ZiTah/npcs/Eschan_Portal_#5.lua b/scripts/zones/Escha_ZiTah/npcs/Eschan_Portal_#5.lua index e7485299fa6..f4d0a04fa21 100644 --- a/scripts/zones/Escha_ZiTah/npcs/Eschan_Portal_#5.lua +++ b/scripts/zones/Escha_ZiTah/npcs/Eschan_Portal_#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, 4) end diff --git a/scripts/zones/Escha_ZiTah/npcs/Eschan_Portal_#6.lua b/scripts/zones/Escha_ZiTah/npcs/Eschan_Portal_#6.lua index 0b8aa074acc..0e262b05b8e 100644 --- a/scripts/zones/Escha_ZiTah/npcs/Eschan_Portal_#6.lua +++ b/scripts/zones/Escha_ZiTah/npcs/Eschan_Portal_#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, 5) end diff --git a/scripts/zones/Escha_ZiTah/npcs/Eschan_Portal_#7.lua b/scripts/zones/Escha_ZiTah/npcs/Eschan_Portal_#7.lua index 75993296928..5ffe8d9ddce 100644 --- a/scripts/zones/Escha_ZiTah/npcs/Eschan_Portal_#7.lua +++ b/scripts/zones/Escha_ZiTah/npcs/Eschan_Portal_#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, 6) end diff --git a/scripts/zones/Escha_ZiTah/npcs/Eschan_Portal_#8.lua b/scripts/zones/Escha_ZiTah/npcs/Eschan_Portal_#8.lua index 7f422d57c64..b0beec70eea 100644 --- a/scripts/zones/Escha_ZiTah/npcs/Eschan_Portal_#8.lua +++ b/scripts/zones/Escha_ZiTah/npcs/Eschan_Portal_#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, 7) end diff --git a/scripts/zones/Escha_ZiTah/npcs/Undulating_Confluence.lua b/scripts/zones/Escha_ZiTah/npcs/Undulating_Confluence.lua index 6ef9a8ca689..d9375b74c21 100644 --- a/scripts/zones/Escha_ZiTah/npcs/Undulating_Confluence.lua +++ b/scripts/zones/Escha_ZiTah/npcs/Undulating_Confluence.lua @@ -6,16 +6,10 @@ ---@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) if csid == 4 and option == 1 then xi.teleport.to(player, xi.teleport.id.QUFIM_CONFLUENCE) diff --git a/scripts/zones/FeiYin/npcs/Dry_Fountain.lua b/scripts/zones/FeiYin/npcs/Dry_Fountain.lua index eea830579e8..44f8b3f1642 100644 --- a/scripts/zones/FeiYin/npcs/Dry_Fountain.lua +++ b/scripts/zones/FeiYin/npcs/Dry_Fountain.lua @@ -24,9 +24,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 == 17 then player:tradeComplete() diff --git a/scripts/zones/FeiYin/npcs/Geomantic_Reservoir.lua b/scripts/zones/FeiYin/npcs/Geomantic_Reservoir.lua index 73825015bd6..1a6def8c6f1 100644 --- a/scripts/zones/FeiYin/npcs/Geomantic_Reservoir.lua +++ b/scripts/zones/FeiYin/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_PARALYSIS) 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_PARALYSIS) end diff --git a/scripts/zones/FeiYin/npcs/Grounds_Tome.lua b/scripts/zones/FeiYin/npcs/Grounds_Tome.lua index be9ff8349d7..12b6ffd292e 100644 --- a/scripts/zones/FeiYin/npcs/Grounds_Tome.lua +++ b/scripts/zones/FeiYin/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/FeiYin/npcs/Seed_Afterglow.lua b/scripts/zones/FeiYin/npcs/Seed_Afterglow.lua index 37c1728ffaf..e39b84e6208 100644 --- a/scripts/zones/FeiYin/npcs/Seed_Afterglow.lua +++ b/scripts/zones/FeiYin/npcs/Seed_Afterglow.lua @@ -17,9 +17,6 @@ local ID = zones[xi.zone.FEIYIN] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local offset = npc:getID() - ID.npc.AFTERGRLOW_OFFSET local aCrystallineProphecy = player:getCurrentMission(xi.mission.log_id.ACP) @@ -63,9 +60,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 == 28 then player:delStatusEffectSilent(xi.effect.MARK_OF_SEED) diff --git a/scripts/zones/FeiYin/npcs/Strange_Apparatus.lua b/scripts/zones/FeiYin/npcs/Strange_Apparatus.lua index 7f2b16685aa..3cd0707c83a 100644 --- a/scripts/zones/FeiYin/npcs/Strange_Apparatus.lua +++ b/scripts/zones/FeiYin/npcs/Strange_Apparatus.lua @@ -14,10 +14,4 @@ entity.onTrigger = function(player, npc) player:startEvent(25, 0, 0, 1474, 0, 0, 0, 0, player:getZoneID()) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/FeiYin/npcs/Treasure_Casket.lua b/scripts/zones/FeiYin/npcs/Treasure_Casket.lua index 9fa07bb2c07..296c4de8f16 100644 --- a/scripts/zones/FeiYin/npcs/Treasure_Casket.lua +++ b/scripts/zones/FeiYin/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/FeiYin/npcs/Treasure_Chest.lua b/scripts/zones/FeiYin/npcs/Treasure_Chest.lua index 30778b9229e..c316a87585a 100644 --- a/scripts/zones/FeiYin/npcs/Treasure_Chest.lua +++ b/scripts/zones/FeiYin/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/FeiYin/npcs/Underground_Pool.lua b/scripts/zones/FeiYin/npcs/Underground_Pool.lua index 28e51035fb3..2f691ba8a96 100644 --- a/scripts/zones/FeiYin/npcs/Underground_Pool.lua +++ b/scripts/zones/FeiYin/npcs/Underground_Pool.lua @@ -11,9 +11,6 @@ local ID = zones[xi.zone.FEIYIN] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local offset = npc:getID() - ID.npc.UNDERGROUND_POOL_OFFSET @@ -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 == 18 then player:delKeyItem(xi.ki.AQUAFLORA3) diff --git a/scripts/zones/FeiYin/npcs/qm1.lua b/scripts/zones/FeiYin/npcs/qm1.lua index ac29fa56396..d3e98b18c7d 100644 --- a/scripts/zones/FeiYin/npcs/qm1.lua +++ b/scripts/zones/FeiYin/npcs/qm1.lua @@ -22,13 +22,4 @@ 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) -end - return entity diff --git a/scripts/zones/Feretory/npcs/Suibhne.lua b/scripts/zones/Feretory/npcs/Suibhne.lua index bf8a25b9ec1..ad721191ed1 100644 --- a/scripts/zones/Feretory/npcs/Suibhne.lua +++ b/scripts/zones/Feretory/npcs/Suibhne.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if xi.settings.main.ENABLE_MONSTROSITY ~= 1 then return @@ -17,10 +14,4 @@ entity.onTrigger = function(player, npc) player:startEvent(11) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Foret_de_Hennetiel/npcs/Geomantic_Reservoir.lua b/scripts/zones/Foret_de_Hennetiel/npcs/Geomantic_Reservoir.lua index 2e9be37b4cf..d150d5c8018 100644 --- a/scripts/zones/Foret_de_Hennetiel/npcs/Geomantic_Reservoir.lua +++ b/scripts/zones/Foret_de_Hennetiel/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_GRAVITY) 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_GRAVITY) end diff --git a/scripts/zones/Fort_Ghelsba/npcs/Treasure_Chest.lua b/scripts/zones/Fort_Ghelsba/npcs/Treasure_Chest.lua index 2626235617f..d370b8875af 100644 --- a/scripts/zones/Fort_Ghelsba/npcs/Treasure_Chest.lua +++ b/scripts/zones/Fort_Ghelsba/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/Fort_Ghelsba/npcs/_3x1.lua b/scripts/zones/Fort_Ghelsba/npcs/_3x1.lua index 80f48d8e617..d332956d02b 100644 --- a/scripts/zones/Fort_Ghelsba/npcs/_3x1.lua +++ b/scripts/zones/Fort_Ghelsba/npcs/_3x1.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) -- local vars to reduce repeat calls.. local lever = npc:getID() @@ -40,10 +37,4 @@ entity.onTrigger = function(player, npc) RunElevator(xi.elevator.FORT_GHELSBA_LIFT) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Fort_Ghelsba/npcs/_3x2.lua b/scripts/zones/Fort_Ghelsba/npcs/_3x2.lua index 669375717a5..1ff724b39a5 100644 --- a/scripts/zones/Fort_Ghelsba/npcs/_3x2.lua +++ b/scripts/zones/Fort_Ghelsba/npcs/_3x2.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) -- local vars to reduce repeat calls.. local lever = npc:getID() @@ -40,10 +37,4 @@ entity.onTrigger = function(player, npc) RunElevator(xi.elevator.FORT_GHELSBA_LIFT) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Fort_Karugo-Narugo_[S]/npcs/Indescript_Markings.lua b/scripts/zones/Fort_Karugo-Narugo_[S]/npcs/Indescript_Markings.lua index 23abb8432b9..05f6a0a6fa5 100644 --- a/scripts/zones/Fort_Karugo-Narugo_[S]/npcs/Indescript_Markings.lua +++ b/scripts/zones/Fort_Karugo-Narugo_[S]/npcs/Indescript_Markings.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.FORT_KARUGO_NARUGO_S] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local loafersQuestProgress = player:getCharVar('AF_SCH_BOOTS') @@ -50,10 +47,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/Fort_Karugo-Narugo_[S]/npcs/Logging_Point.lua b/scripts/zones/Fort_Karugo-Narugo_[S]/npcs/Logging_Point.lua index 4015eefc4f0..f1e2081bb07 100644 --- a/scripts/zones/Fort_Karugo-Narugo_[S]/npcs/Logging_Point.lua +++ b/scripts/zones/Fort_Karugo-Narugo_[S]/npcs/Logging_Point.lua @@ -13,10 +13,4 @@ entity.onTrigger = function(player, npc) xi.helm.onTrigger(player, xi.helmType.LOGGING) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Fort_Karugo-Narugo_[S]/npcs/Mortimer.lua b/scripts/zones/Fort_Karugo-Narugo_[S]/npcs/Mortimer.lua index 36c9579a8c1..0f5822c250c 100644 --- a/scripts/zones/Fort_Karugo-Narugo_[S]/npcs/Mortimer.lua +++ b/scripts/zones/Fort_Karugo-Narugo_[S]/npcs/Mortimer.lua @@ -9,18 +9,9 @@ local ID = zones[xi.zone.FORT_KARUGO_NARUGO_S] ---@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/Fort_Karugo-Narugo_[S]/npcs/Pecca-Pocca.lua b/scripts/zones/Fort_Karugo-Narugo_[S]/npcs/Pecca-Pocca.lua index 150e46accc3..bfc0f711231 100644 --- a/scripts/zones/Fort_Karugo-Narugo_[S]/npcs/Pecca-Pocca.lua +++ b/scripts/zones/Fort_Karugo-Narugo_[S]/npcs/Pecca-Pocca.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getQuestStatus(xi.questLog.CRYSTAL_WAR, xi.quest.id.crystalWar.REQUIEM_FOR_THE_DEPARTED) == xi.questStatus.QUEST_ACCEPTED then if player:hasKeyItem(xi.ki.SHEAF_OF_HANDMADE_INCENSE) then @@ -22,9 +19,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 == 234 then npcUtil.giveKeyItem(player, xi.ki.SHEAF_OF_HANDMADE_INCENSE) diff --git a/scripts/zones/Fort_Karugo-Narugo_[S]/npcs/Rotih_Moalghett.lua b/scripts/zones/Fort_Karugo-Narugo_[S]/npcs/Rotih_Moalghett.lua index dbd231ef2d1..95adb6e364b 100644 --- a/scripts/zones/Fort_Karugo-Narugo_[S]/npcs/Rotih_Moalghett.lua +++ b/scripts/zones/Fort_Karugo-Narugo_[S]/npcs/Rotih_Moalghett.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getQuestStatus(xi.questLog.CRYSTAL_WAR, xi.quest.id.crystalWar.THE_TIGRESS_STRIKES) == xi.questStatus.QUEST_ACCEPTED then if player:getCharVar('TigressStrikesProg') == 1 then @@ -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 == 104 then player:setCharVar('TigressStrikesProg', 1) diff --git a/scripts/zones/Fort_Karugo-Narugo_[S]/npcs/Spondulix.lua b/scripts/zones/Fort_Karugo-Narugo_[S]/npcs/Spondulix.lua index 124e271a5d0..c0eab5e2a31 100644 --- a/scripts/zones/Fort_Karugo-Narugo_[S]/npcs/Spondulix.lua +++ b/scripts/zones/Fort_Karugo-Narugo_[S]/npcs/Spondulix.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.FORT_KARUGO_NARUGO_S] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -22,10 +19,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/Fort_Karugo-Narugo_[S]/npcs/qm6.lua b/scripts/zones/Fort_Karugo-Narugo_[S]/npcs/qm6.lua index 19c025b6a41..5b091928998 100644 --- a/scripts/zones/Fort_Karugo-Narugo_[S]/npcs/qm6.lua +++ b/scripts/zones/Fort_Karugo-Narugo_[S]/npcs/qm6.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.FORT_KARUGO_NARUGO_S] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local ttsStat = player:getCharVar('TigressStrikesProg') @@ -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 == 102 then player:setCharVar('TigressStrikesProg', 2) diff --git a/scripts/zones/GM_Home/npcs/Janken.lua b/scripts/zones/GM_Home/npcs/Janken.lua index ebc63dca385..3d25e678159 100644 --- a/scripts/zones/GM_Home/npcs/Janken.lua +++ b/scripts/zones/GM_Home/npcs/Janken.lua @@ -6,17 +6,8 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(139) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/GM_Home/npcs/Listener.lua b/scripts/zones/GM_Home/npcs/Listener.lua index da3bc0b54be..9a77a81f8c1 100644 --- a/scripts/zones/GM_Home/npcs/Listener.lua +++ b/scripts/zones/GM_Home/npcs/Listener.lua @@ -6,17 +6,8 @@ ---@type TNpcEntity local entity = {} -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/GM_Home/npcs/Speaker.lua b/scripts/zones/GM_Home/npcs/Speaker.lua index 14764d48a88..32422283dbb 100644 --- a/scripts/zones/GM_Home/npcs/Speaker.lua +++ b/scripts/zones/GM_Home/npcs/Speaker.lua @@ -6,17 +6,8 @@ ---@type TNpcEntity local entity = {} -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/GM_Home/npcs/Trader.lua b/scripts/zones/GM_Home/npcs/Trader.lua index da7b5fc0f13..e4188f801fa 100644 --- a/scripts/zones/GM_Home/npcs/Trader.lua +++ b/scripts/zones/GM_Home/npcs/Trader.lua @@ -16,10 +16,4 @@ 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/Garlaige_Citadel/DefaultActions.lua b/scripts/zones/Garlaige_Citadel/DefaultActions.lua index db8964b90a0..89842851016 100644 --- a/scripts/zones/Garlaige_Citadel/DefaultActions.lua +++ b/scripts/zones/Garlaige_Citadel/DefaultActions.lua @@ -1,12 +1,13 @@ local ID = zones[xi.zone.GARLAIGE_CITADEL] return { - ['qm1'] = { messageSpecial = ID.text.YOU_FIND_NOTHING }, - ['qm5'] = { messageSpecial = ID.text.HOLE_IN_THE_CEILING }, - ['qm6'] = { messageSpecial = ID.text.HOLE_IN_THE_CEILING }, - ['qm9'] = { messageSpecial = ID.text.HOLE_IN_THE_CEILING }, - ['qm10'] = { messageSpecial = ID.text.HOLE_IN_THE_CEILING }, - ['qm12'] = { messageSpecial = ID.text.HOLE_IN_THE_CEILING }, - ['qm13'] = { messageSpecial = ID.text.HOLE_IN_THE_CEILING }, - ['qm15'] = { messageSpecial = ID.text.HOLE_IN_THE_CEILING }, + ['qm1'] = { messageSpecial = ID.text.YOU_FIND_NOTHING }, + ['qm5'] = { messageSpecial = ID.text.HOLE_IN_THE_CEILING }, + ['qm6'] = { messageSpecial = ID.text.HOLE_IN_THE_CEILING }, + ['qm9'] = { messageSpecial = ID.text.HOLE_IN_THE_CEILING }, + ['qm10'] = { messageSpecial = ID.text.HOLE_IN_THE_CEILING }, + ['qm12'] = { messageSpecial = ID.text.HOLE_IN_THE_CEILING }, + ['qm13'] = { messageSpecial = ID.text.HOLE_IN_THE_CEILING }, + ['qm15'] = { messageSpecial = ID.text.HOLE_IN_THE_CEILING }, + ['Wanzo-Unzozo'] = { event = 60 }, } diff --git a/scripts/zones/Garlaige_Citadel/npcs/Geomagnetic_Fount.lua b/scripts/zones/Garlaige_Citadel/npcs/Geomagnetic_Fount.lua index 8361f503693..db21b51cd3a 100644 --- a/scripts/zones/Garlaige_Citadel/npcs/Geomagnetic_Fount.lua +++ b/scripts/zones/Garlaige_Citadel/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/Garlaige_Citadel/npcs/Geomantic_Reservoir.lua b/scripts/zones/Garlaige_Citadel/npcs/Geomantic_Reservoir.lua index 02935dac507..78a8813608d 100644 --- a/scripts/zones/Garlaige_Citadel/npcs/Geomantic_Reservoir.lua +++ b/scripts/zones/Garlaige_Citadel/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_VIT) 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_VIT) end diff --git a/scripts/zones/Garlaige_Citadel/npcs/Goblin_Footprint.lua b/scripts/zones/Garlaige_Citadel/npcs/Goblin_Footprint.lua index 921da2b452c..80f29f27a1a 100644 --- a/scripts/zones/Garlaige_Citadel/npcs/Goblin_Footprint.lua +++ b/scripts/zones/Garlaige_Citadel/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/Garlaige_Citadel/npcs/Grounds_Tome.lua b/scripts/zones/Garlaige_Citadel/npcs/Grounds_Tome.lua index 4d1f16b2701..f1783496955 100644 --- a/scripts/zones/Garlaige_Citadel/npcs/Grounds_Tome.lua +++ b/scripts/zones/Garlaige_Citadel/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/Garlaige_Citadel/npcs/Lyco_Sparkles.lua b/scripts/zones/Garlaige_Citadel/npcs/Lyco_Sparkles.lua index e8421a3ddbc..8acd060608e 100644 --- a/scripts/zones/Garlaige_Citadel/npcs/Lyco_Sparkles.lua +++ b/scripts/zones/Garlaige_Citadel/npcs/Lyco_Sparkles.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 == 101 then player:confirmTrade() diff --git a/scripts/zones/Garlaige_Citadel/npcs/Mashira.lua b/scripts/zones/Garlaige_Citadel/npcs/Mashira.lua index e2094df00ad..d677820ae2f 100644 --- a/scripts/zones/Garlaige_Citadel/npcs/Mashira.lua +++ b/scripts/zones/Garlaige_Citadel/npcs/Mashira.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.GARLAIGE_CITADEL] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getQuestStatus(xi.questLog.JEUNO, xi.quest.id.jeuno.RUBBISH_DAY) == xi.questStatus.QUEST_ACCEPTED and @@ -28,9 +25,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) local rubbishDay = player:getQuestStatus(xi.questLog.JEUNO, xi.quest.id.jeuno.RUBBISH_DAY) local makingAmens = player:getQuestStatus(xi.questLog.WINDURST, xi.quest.id.windurst.MAKING_AMENS) diff --git a/scripts/zones/Garlaige_Citadel/npcs/Oaken_Box.lua b/scripts/zones/Garlaige_Citadel/npcs/Oaken_Box.lua index c2548d1ef87..02c9cb5399d 100644 --- a/scripts/zones/Garlaige_Citadel/npcs/Oaken_Box.lua +++ b/scripts/zones/Garlaige_Citadel/npcs/Oaken_Box.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 == 14 then player:confirmTrade() diff --git a/scripts/zones/Garlaige_Citadel/npcs/Treasure_Casket.lua b/scripts/zones/Garlaige_Citadel/npcs/Treasure_Casket.lua index 8e212d1c9ba..f63c43dc669 100644 --- a/scripts/zones/Garlaige_Citadel/npcs/Treasure_Casket.lua +++ b/scripts/zones/Garlaige_Citadel/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/Garlaige_Citadel/npcs/Treasure_Chest.lua b/scripts/zones/Garlaige_Citadel/npcs/Treasure_Chest.lua index e98f0a0251d..6647a81be4a 100644 --- a/scripts/zones/Garlaige_Citadel/npcs/Treasure_Chest.lua +++ b/scripts/zones/Garlaige_Citadel/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/Garlaige_Citadel/npcs/Treasure_Coffer.lua b/scripts/zones/Garlaige_Citadel/npcs/Treasure_Coffer.lua index 43c0762740c..ba4beff5167 100644 --- a/scripts/zones/Garlaige_Citadel/npcs/Treasure_Coffer.lua +++ b/scripts/zones/Garlaige_Citadel/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/Garlaige_Citadel/npcs/Wanzo-Unzozo.lua b/scripts/zones/Garlaige_Citadel/npcs/Wanzo-Unzozo.lua deleted file mode 100644 index 3d07472bb0d..00000000000 --- a/scripts/zones/Garlaige_Citadel/npcs/Wanzo-Unzozo.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Garlaige Citadel --- NPC: Wanzo-Unzozo --- !pos -379.420 -10.749 383.312 200 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(60) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Garlaige_Citadel/npcs/_5k0.lua b/scripts/zones/Garlaige_Citadel/npcs/_5k0.lua index e3f97c7fc7e..161843daf49 100644 --- a/scripts/zones/Garlaige_Citadel/npcs/_5k0.lua +++ b/scripts/zones/Garlaige_Citadel/npcs/_5k0.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.GARLAIGE_CITADEL] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:hasKeyItem(xi.ki.POUCH_OF_WEIGHTED_STONES) then -- Door opens from both sides. @@ -28,10 +25,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/Garlaige_Citadel/npcs/_5k9.lua b/scripts/zones/Garlaige_Citadel/npcs/_5k9.lua index 3cf937c9253..e78627e2ff0 100644 --- a/scripts/zones/Garlaige_Citadel/npcs/_5k9.lua +++ b/scripts/zones/Garlaige_Citadel/npcs/_5k9.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.GARLAIGE_CITADEL] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:hasKeyItem(xi.ki.POUCH_OF_WEIGHTED_STONES) then -- Door opens from both sides. @@ -28,10 +25,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/Garlaige_Citadel/npcs/_5ki.lua b/scripts/zones/Garlaige_Citadel/npcs/_5ki.lua index ee34490a870..8c0022677ee 100644 --- a/scripts/zones/Garlaige_Citadel/npcs/_5ki.lua +++ b/scripts/zones/Garlaige_Citadel/npcs/_5ki.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.GARLAIGE_CITADEL] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:hasKeyItem(xi.ki.POUCH_OF_WEIGHTED_STONES) then -- Door opens from both sides. @@ -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/Garlaige_Citadel/npcs/_5kr.lua b/scripts/zones/Garlaige_Citadel/npcs/_5kr.lua index 53127b2f93a..8b978014914 100644 --- a/scripts/zones/Garlaige_Citadel/npcs/_5kr.lua +++ b/scripts/zones/Garlaige_Citadel/npcs/_5kr.lua @@ -29,10 +29,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/Garlaige_Citadel/npcs/qm17.lua b/scripts/zones/Garlaige_Citadel/npcs/qm17.lua index 948dabe23ef..e85d26354bd 100644 --- a/scripts/zones/Garlaige_Citadel/npcs/qm17.lua +++ b/scripts/zones/Garlaige_Citadel/npcs/qm17.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.GARLAIGE_CITADEL] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if not player:hasKeyItem(xi.ki.POUCH_OF_WEIGHTED_STONES) then player:startEvent(23) -- Key Item name hardcoded in the event. @@ -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 == 23 and option == 1 then npcUtil.giveKeyItem(player, xi.ki.POUCH_OF_WEIGHTED_STONES) diff --git a/scripts/zones/Garlaige_Citadel_[S]/npcs/Fondactiont.lua b/scripts/zones/Garlaige_Citadel_[S]/npcs/Fondactiont.lua index bc14b183fde..b5226f8a881 100644 --- a/scripts/zones/Garlaige_Citadel_[S]/npcs/Fondactiont.lua +++ b/scripts/zones/Garlaige_Citadel_[S]/npcs/Fondactiont.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local theFumblingFriar = player:getQuestStatus(xi.questLog.CRYSTAL_WAR, xi.quest.id.crystalWar.THE_FUMBLING_FRIAR) @@ -33,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 == 26 then player:addQuest(xi.questLog.CRYSTAL_WAR, xi.quest.id.crystalWar.THE_FUMBLING_FRIAR) diff --git a/scripts/zones/Garlaige_Citadel_[S]/npcs/Lycopodium.lua b/scripts/zones/Garlaige_Citadel_[S]/npcs/Lycopodium.lua index 7a1b9904598..b034e7ae11e 100644 --- a/scripts/zones/Garlaige_Citadel_[S]/npcs/Lycopodium.lua +++ b/scripts/zones/Garlaige_Citadel_[S]/npcs/Lycopodium.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.GARLAIGE_CITADEL_S] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:messageSpecial(ID.text.LYCOPODIUM_ENTRANCED) @@ -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 == 30 then player:setCharVar('LycopodiumTeleport_Mask', utils.mask.setBit(player:getCharVar('LycopodiumTeleport_Mask'), 0, true)) diff --git a/scripts/zones/Garlaige_Citadel_[S]/npcs/Randecque.lua b/scripts/zones/Garlaige_Citadel_[S]/npcs/Randecque.lua index df84ff690d9..290de068ace 100644 --- a/scripts/zones/Garlaige_Citadel_[S]/npcs/Randecque.lua +++ b/scripts/zones/Garlaige_Citadel_[S]/npcs/Randecque.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getCampaignAllegiance() > 0 then if player:getCampaignAllegiance() == 2 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/Ghelsba_Outpost/npcs/Logging_Point.lua b/scripts/zones/Ghelsba_Outpost/npcs/Logging_Point.lua index 95e33e4f352..59d0415ac13 100644 --- a/scripts/zones/Ghelsba_Outpost/npcs/Logging_Point.lua +++ b/scripts/zones/Ghelsba_Outpost/npcs/Logging_Point.lua @@ -13,10 +13,4 @@ entity.onTrigger = function(player, npc) xi.helm.onTrigger(player, xi.helmType.LOGGING) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Giddeus/npcs/Altar_of_Offerings.lua b/scripts/zones/Giddeus/npcs/Altar_of_Offerings.lua index 6220dd31c1d..ee596728f98 100644 --- a/scripts/zones/Giddeus/npcs/Altar_of_Offerings.lua +++ b/scripts/zones/Giddeus/npcs/Altar_of_Offerings.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.GIDDEUS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local crisisstatus = player:getQuestStatus(xi.questLog.WINDURST, xi.quest.id.windurst.A_CRISIS_IN_THE_MAKING) if crisisstatus >= 1 and player:getCharVar('QuestCrisisMaking_var') == 1 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 == 53 and option == 1 then player:addKeyItem(xi.ki.OFF_OFFERING) diff --git a/scripts/zones/Giddeus/npcs/Harvesting_Point.lua b/scripts/zones/Giddeus/npcs/Harvesting_Point.lua index af57669c277..f52588bf1b0 100644 --- a/scripts/zones/Giddeus/npcs/Harvesting_Point.lua +++ b/scripts/zones/Giddeus/npcs/Harvesting_Point.lua @@ -13,10 +13,4 @@ entity.onTrigger = function(player, npc) xi.helm.onTrigger(player, xi.helmType.HARVESTING) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Giddeus/npcs/Treasure_Chest.lua b/scripts/zones/Giddeus/npcs/Treasure_Chest.lua index 5f0e768ed48..5b06750c02b 100644 --- a/scripts/zones/Giddeus/npcs/Treasure_Chest.lua +++ b/scripts/zones/Giddeus/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/Grand_Palace_of_HuXzoi/DefaultActions.lua b/scripts/zones/Grand_Palace_of_HuXzoi/DefaultActions.lua new file mode 100644 index 00000000000..a16ec58c23a --- /dev/null +++ b/scripts/zones/Grand_Palace_of_HuXzoi/DefaultActions.lua @@ -0,0 +1,7 @@ +-- local ID = zones[xi.zone.GRAND_PALACE_OF_HUXZOI] + +return { + ['_0y0'] = { event = 173 }, + ['_iyb'] = { event = 56 }, + ['_iyc'] = { event = 172 }, +} diff --git a/scripts/zones/Grand_Palace_of_HuXzoi/npcs/Cermet_Alcove.lua b/scripts/zones/Grand_Palace_of_HuXzoi/npcs/Cermet_Alcove.lua index 534291d2423..38da4528f0c 100644 --- a/scripts/zones/Grand_Palace_of_HuXzoi/npcs/Cermet_Alcove.lua +++ b/scripts/zones/Grand_Palace_of_HuXzoi/npcs/Cermet_Alcove.lua @@ -81,10 +81,4 @@ entity.onTrigger = function(player, npc) quasilumin:showText(quasilumin, ID.text.REQUEST_CONFIRMED) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Grand_Palace_of_HuXzoi/npcs/Quasilumin.lua b/scripts/zones/Grand_Palace_of_HuXzoi/npcs/Quasilumin.lua index 36978842d7d..ac0299868af 100644 --- a/scripts/zones/Grand_Palace_of_HuXzoi/npcs/Quasilumin.lua +++ b/scripts/zones/Grand_Palace_of_HuXzoi/npcs/Quasilumin.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.GRAND_PALACE_OF_HUXZOI] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local index = npc:getID() - ID.npc.QUASILUMIN_OFFSET @@ -31,10 +28,4 @@ entity.onTrigger = function(player, npc) player:showText(npc, ID.text.QUASILUMIN_MAP_QUEST_OFFSET + index) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Grand_Palace_of_HuXzoi/npcs/_0y0.lua b/scripts/zones/Grand_Palace_of_HuXzoi/npcs/_0y0.lua deleted file mode 100644 index 49a94e26174..00000000000 --- a/scripts/zones/Grand_Palace_of_HuXzoi/npcs/_0y0.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Grand Palace of Hu'Xzoi --- NPC: Particle Gate --- !pos -483 0 259 34 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(173) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Grand_Palace_of_HuXzoi/npcs/_iya.lua b/scripts/zones/Grand_Palace_of_HuXzoi/npcs/_iya.lua index 8b42b9d7259..7697be553e2 100644 --- a/scripts/zones/Grand_Palace_of_HuXzoi/npcs/_iya.lua +++ b/scripts/zones/Grand_Palace_of_HuXzoi/npcs/_iya.lua @@ -6,16 +6,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(52) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 52 and option == 1 then player:setPos(-419.995, 0, 248.483, 191, 35) -- To The Garden of RuHmet diff --git a/scripts/zones/Grand_Palace_of_HuXzoi/npcs/_iyb.lua b/scripts/zones/Grand_Palace_of_HuXzoi/npcs/_iyb.lua deleted file mode 100644 index 7d73b985166..00000000000 --- a/scripts/zones/Grand_Palace_of_HuXzoi/npcs/_iyb.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Grand Palace of Hu'Xzoi --- NPC: Particle Gate --- !pos 1 0.1 -320 34 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(56) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Grand_Palace_of_HuXzoi/npcs/_iyc.lua b/scripts/zones/Grand_Palace_of_HuXzoi/npcs/_iyc.lua deleted file mode 100644 index 09495d5a19d..00000000000 --- a/scripts/zones/Grand_Palace_of_HuXzoi/npcs/_iyc.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Grand Palace of Hu'Xzoi --- NPC: Particle Gate --- !pos -39 0 -319 34 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(172) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Grand_Palace_of_HuXzoi/npcs/qm_ixaern_mnk.lua b/scripts/zones/Grand_Palace_of_HuXzoi/npcs/qm_ixaern_mnk.lua index 24331e8565e..dd7df3d0422 100644 --- a/scripts/zones/Grand_Palace_of_HuXzoi/npcs/qm_ixaern_mnk.lua +++ b/scripts/zones/Grand_Palace_of_HuXzoi/npcs/qm_ixaern_mnk.lua @@ -50,13 +50,4 @@ 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) -end - return entity diff --git a/scripts/zones/Grauberg_[S]/DefaultActions.lua b/scripts/zones/Grauberg_[S]/DefaultActions.lua index 65d9d7351bb..785911aa61d 100644 --- a/scripts/zones/Grauberg_[S]/DefaultActions.lua +++ b/scripts/zones/Grauberg_[S]/DefaultActions.lua @@ -1,6 +1,7 @@ local ID = zones[xi.zone.GRAUBERG_S] return { + ['qm2'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, ['qm3'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, ['qm_reset'] = { messageSpecial = ID.text.AIR_WARPED_AND_DISTORTED }, ['Childerich'] = { event = 10 }, diff --git a/scripts/zones/Grauberg_[S]/npcs/Harvesting_Point.lua b/scripts/zones/Grauberg_[S]/npcs/Harvesting_Point.lua index cd6a68a5d9f..90962a5c807 100644 --- a/scripts/zones/Grauberg_[S]/npcs/Harvesting_Point.lua +++ b/scripts/zones/Grauberg_[S]/npcs/Harvesting_Point.lua @@ -15,10 +15,4 @@ entity.onTrigger = function(player, npc) player:messageSpecial(ID.text.HARVESTING_IS_POSSIBLE_HERE, 1020) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Grauberg_[S]/npcs/Indescript_Markings.lua b/scripts/zones/Grauberg_[S]/npcs/Indescript_Markings.lua index 564ddd2df30..d2b93c130b1 100644 --- a/scripts/zones/Grauberg_[S]/npcs/Indescript_Markings.lua +++ b/scripts/zones/Grauberg_[S]/npcs/Indescript_Markings.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.GRAUBERG_S] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local gownQuestProgress = player:getCharVar('AF_SCH_BODY') @@ -47,10 +44,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/Grauberg_[S]/npcs/qm2.lua b/scripts/zones/Grauberg_[S]/npcs/qm2.lua index 0535efe1817..dde0b29d6c0 100644 --- a/scripts/zones/Grauberg_[S]/npcs/qm2.lua +++ b/scripts/zones/Grauberg_[S]/npcs/qm2.lua @@ -4,29 +4,16 @@ -- Involved In Quest: The Fumbling Friar -- !pos 80 -1 457 89 ----------------------------------- -local ID = zones[xi.zone.GRAUBERG_S] ------------------------------------ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getQuestStatus(xi.questLog.CRYSTAL_WAR, xi.quest.id.crystalWar.THE_FUMBLING_FRIAR) == xi.questStatus.QUEST_ACCEPTED and not player:hasKeyItem(xi.ki.ORNATE_PACKAGE) then npcUtil.giveKeyItem(player, xi.ki.ORNATE_PACKAGE) - else - player:messageSpecial(ID.text.NOTHING_OUT_OF_ORDINARY) 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/Grauberg_[S]/npcs/qm5.lua b/scripts/zones/Grauberg_[S]/npcs/qm5.lua index fb8e2ae365c..6ba7c7656fd 100644 --- a/scripts/zones/Grauberg_[S]/npcs/qm5.lua +++ b/scripts/zones/Grauberg_[S]/npcs/qm5.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getQuestStatus(xi.questLog.CRYSTAL_WAR, xi.quest.id.crystalWar.FIRES_OF_DISCONTENT) == xi.questStatus.QUEST_ACCEPTED and @@ -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 == 11 then player:setCharVar('FiresOfDiscProg', 4) diff --git a/scripts/zones/Gusgen_Mines/DefaultActions.lua b/scripts/zones/Gusgen_Mines/DefaultActions.lua index 56ac43221d3..3ffca23b81e 100644 --- a/scripts/zones/Gusgen_Mines/DefaultActions.lua +++ b/scripts/zones/Gusgen_Mines/DefaultActions.lua @@ -1,6 +1,7 @@ local ID = zones[xi.zone.GUSGEN_MINES] return { - ['qm2'] = { messageSpecial = ID.text.SEE_MONSTER_TRACKS }, - ['qm4'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, + ['Clay'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, + ['qm2'] = { messageSpecial = ID.text.SEE_MONSTER_TRACKS }, + ['qm4'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, } diff --git a/scripts/zones/Gusgen_Mines/npcs/Clay.lua b/scripts/zones/Gusgen_Mines/npcs/Clay.lua index 03a237b6867..6a16f11f773 100644 --- a/scripts/zones/Gusgen_Mines/npcs/Clay.lua +++ b/scripts/zones/Gusgen_Mines/npcs/Clay.lua @@ -9,28 +9,10 @@ local ID = zones[xi.zone.GUSGEN_MINES] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) - local gusgenClayID = 569 - - if not player:hasItem(gusgenClayID) then - if player:getFreeSlotsCount() == 0 then - player:messageSpecial(ID.text.ITEM_CANNOT_BE_OBTAINED, gusgenClayID) - else - player:addItem(gusgenClayID) - player:messageSpecial(ID.text.ITEM_OBTAINED, gusgenClayID) - end - else - player:messageSpecial(ID.text.NOTHING_OUT_OF_ORDINARY) + if not player:hasItem(xi.item.DISH_OF_GUSGEN_CLAY) then + npcUtil.giveItem(player, xi.item.DISH_OF_GUSGEN_CLAY) 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/Gusgen_Mines/npcs/Degga.lua b/scripts/zones/Gusgen_Mines/npcs/Degga.lua index b121d1bcfc8..747c2074698 100644 --- a/scripts/zones/Gusgen_Mines/npcs/Degga.lua +++ b/scripts/zones/Gusgen_Mines/npcs/Degga.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getCharVar('EcoStatus') == 101 then if not player:hasStatusEffect(xi.effect.LEVEL_RESTRICTION) then @@ -23,9 +20,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 == 13 and option == 1 then player:addStatusEffect(xi.effect.LEVEL_RESTRICTION, 25, 0, 0) diff --git a/scripts/zones/Gusgen_Mines/npcs/Geomagnetic_Fount.lua b/scripts/zones/Gusgen_Mines/npcs/Geomagnetic_Fount.lua index 0b266e638cf..54d72fbb941 100644 --- a/scripts/zones/Gusgen_Mines/npcs/Geomagnetic_Fount.lua +++ b/scripts/zones/Gusgen_Mines/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/Gusgen_Mines/npcs/Geomantic_Reservoir.lua b/scripts/zones/Gusgen_Mines/npcs/Geomantic_Reservoir.lua index a2dc436daab..39b6b39030f 100644 --- a/scripts/zones/Gusgen_Mines/npcs/Geomantic_Reservoir.lua +++ b/scripts/zones/Gusgen_Mines/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_FOCUS) 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_FOCUS) end diff --git a/scripts/zones/Gusgen_Mines/npcs/Grounds_Tome.lua b/scripts/zones/Gusgen_Mines/npcs/Grounds_Tome.lua index 3a44e154816..a7a7b460606 100644 --- a/scripts/zones/Gusgen_Mines/npcs/Grounds_Tome.lua +++ b/scripts/zones/Gusgen_Mines/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/Gusgen_Mines/npcs/Mining_Point.lua b/scripts/zones/Gusgen_Mines/npcs/Mining_Point.lua index bb8182ce0fe..29de20f96dc 100644 --- a/scripts/zones/Gusgen_Mines/npcs/Mining_Point.lua +++ b/scripts/zones/Gusgen_Mines/npcs/Mining_Point.lua @@ -13,10 +13,4 @@ entity.onTrigger = function(player, npc) xi.helm.onTrigger(player, xi.helmType.MINING) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Gusgen_Mines/npcs/Treasure_Casket.lua b/scripts/zones/Gusgen_Mines/npcs/Treasure_Casket.lua index fdb70b61ddd..66a27443639 100644 --- a/scripts/zones/Gusgen_Mines/npcs/Treasure_Casket.lua +++ b/scripts/zones/Gusgen_Mines/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/Gusgen_Mines/npcs/Treasure_Chest.lua b/scripts/zones/Gusgen_Mines/npcs/Treasure_Chest.lua index 9bcaa2f569d..e363ee9d473 100644 --- a/scripts/zones/Gusgen_Mines/npcs/Treasure_Chest.lua +++ b/scripts/zones/Gusgen_Mines/npcs/Treasure_Chest.lua @@ -15,10 +15,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/Gusgen_Mines/npcs/_5g0.lua b/scripts/zones/Gusgen_Mines/npcs/_5g0.lua index d3cc0f022d5..e9de3905a32 100644 --- a/scripts/zones/Gusgen_Mines/npcs/_5g0.lua +++ b/scripts/zones/Gusgen_Mines/npcs/_5g0.lua @@ -8,21 +8,10 @@ local ID = zones[xi.zone.GUSGEN_MINES] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if npc:getAnimation() == 9 then player:messageSpecial(ID.text.LOCK_OTHER_DEVICE) - else - return 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/Gusgen_Mines/npcs/_5g1.lua b/scripts/zones/Gusgen_Mines/npcs/_5g1.lua index c9ad616ab6d..9adcccb1644 100644 --- a/scripts/zones/Gusgen_Mines/npcs/_5g1.lua +++ b/scripts/zones/Gusgen_Mines/npcs/_5g1.lua @@ -8,21 +8,10 @@ local ID = zones[xi.zone.GUSGEN_MINES] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if npc:getAnimation() == 9 then player:messageSpecial(ID.text.LOCK_OTHER_DEVICE) - else - return 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/Gusgen_Mines/npcs/_5g2.lua b/scripts/zones/Gusgen_Mines/npcs/_5g2.lua index 03cd0ddc77f..1e0f1c8888a 100644 --- a/scripts/zones/Gusgen_Mines/npcs/_5g2.lua +++ b/scripts/zones/Gusgen_Mines/npcs/_5g2.lua @@ -8,21 +8,10 @@ local ID = zones[xi.zone.GUSGEN_MINES] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if npc:getAnimation() == 9 then player:messageSpecial(ID.text.LOCK_OTHER_DEVICE) - else - return 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/Gusgen_Mines/npcs/_5g3.lua b/scripts/zones/Gusgen_Mines/npcs/_5g3.lua index fe16a77a4f8..97e4dc4384d 100644 --- a/scripts/zones/Gusgen_Mines/npcs/_5g3.lua +++ b/scripts/zones/Gusgen_Mines/npcs/_5g3.lua @@ -8,21 +8,10 @@ local ID = zones[xi.zone.GUSGEN_MINES] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if npc:getAnimation() == 9 then player:messageSpecial(ID.text.LOCK_OTHER_DEVICE) - else - return 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/Gusgen_Mines/npcs/_5g4.lua b/scripts/zones/Gusgen_Mines/npcs/_5g4.lua index 77d9cd4789f..c309350895f 100644 --- a/scripts/zones/Gusgen_Mines/npcs/_5g4.lua +++ b/scripts/zones/Gusgen_Mines/npcs/_5g4.lua @@ -8,21 +8,10 @@ local ID = zones[xi.zone.GUSGEN_MINES] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if npc:getAnimation() == 9 then player:messageSpecial(ID.text.LOCK_OTHER_DEVICE) - else - return 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/Gusgen_Mines/npcs/_5g5.lua b/scripts/zones/Gusgen_Mines/npcs/_5g5.lua index 994e2cadc4e..8495a8e99a6 100644 --- a/scripts/zones/Gusgen_Mines/npcs/_5g5.lua +++ b/scripts/zones/Gusgen_Mines/npcs/_5g5.lua @@ -8,21 +8,10 @@ local ID = zones[xi.zone.GUSGEN_MINES] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if npc:getAnimation() == 9 then player:messageSpecial(ID.text.LOCK_OTHER_DEVICE) - else - return 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/Gusgen_Mines/npcs/_5ga.lua b/scripts/zones/Gusgen_Mines/npcs/_5ga.lua index 095450a2d88..2faaeb24a8d 100644 --- a/scripts/zones/Gusgen_Mines/npcs/_5ga.lua +++ b/scripts/zones/Gusgen_Mines/npcs/_5ga.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) npc:openDoor(2) -- Lever animation @@ -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/Gusgen_Mines/npcs/_5gb.lua b/scripts/zones/Gusgen_Mines/npcs/_5gb.lua index 3a3956b922b..befec70049a 100644 --- a/scripts/zones/Gusgen_Mines/npcs/_5gb.lua +++ b/scripts/zones/Gusgen_Mines/npcs/_5gb.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) npc:openDoor(2) -- Lever animation @@ -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/Gusgen_Mines/npcs/_5gc.lua b/scripts/zones/Gusgen_Mines/npcs/_5gc.lua index e93816b500d..90a2af05756 100644 --- a/scripts/zones/Gusgen_Mines/npcs/_5gc.lua +++ b/scripts/zones/Gusgen_Mines/npcs/_5gc.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) npc:openDoor(2) -- Lever animation @@ -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/Gusgen_Mines/npcs/_5gd.lua b/scripts/zones/Gusgen_Mines/npcs/_5gd.lua index f9b1ed90661..e26acdea64a 100644 --- a/scripts/zones/Gusgen_Mines/npcs/_5gd.lua +++ b/scripts/zones/Gusgen_Mines/npcs/_5gd.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) npc:openDoor(2) -- Lever animation @@ -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/Gusgen_Mines/npcs/_5ge.lua b/scripts/zones/Gusgen_Mines/npcs/_5ge.lua index b6f18dddf87..890ab779136 100644 --- a/scripts/zones/Gusgen_Mines/npcs/_5ge.lua +++ b/scripts/zones/Gusgen_Mines/npcs/_5ge.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) npc:openDoor(2) -- Lever animation @@ -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/Gusgen_Mines/npcs/_5gf.lua b/scripts/zones/Gusgen_Mines/npcs/_5gf.lua index 5865bd69db8..f0ba033ffba 100644 --- a/scripts/zones/Gusgen_Mines/npcs/_5gf.lua +++ b/scripts/zones/Gusgen_Mines/npcs/_5gf.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) npc:openDoor(2) -- Lever animation @@ -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/Gusgen_Mines/npcs/qm1.lua b/scripts/zones/Gusgen_Mines/npcs/qm1.lua index 674f1754195..9a3718b3cbc 100644 --- a/scripts/zones/Gusgen_Mines/npcs/qm1.lua +++ b/scripts/zones/Gusgen_Mines/npcs/qm1.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.GUSGEN_MINES] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local playerRace = player:getRace() local raceOffset = 0 @@ -44,10 +41,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/Gusgen_Mines/npcs/qm3.lua b/scripts/zones/Gusgen_Mines/npcs/qm3.lua index eba80320826..4de1d7cfc06 100644 --- a/scripts/zones/Gusgen_Mines/npcs/qm3.lua +++ b/scripts/zones/Gusgen_Mines/npcs/qm3.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.GUSGEN_MINES] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local healingTheLand = player:getQuestStatus(xi.questLog.SANDORIA, xi.quest.id.sandoria.HEALING_THE_LAND) @@ -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/Gusgen_Mines/npcs/qm5.lua b/scripts/zones/Gusgen_Mines/npcs/qm5.lua index c6afe40b0d1..609eefff08e 100644 --- a/scripts/zones/Gusgen_Mines/npcs/qm5.lua +++ b/scripts/zones/Gusgen_Mines/npcs/qm5.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.GUSGEN_MINES] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local pudding = ID.mob.PUDDING_OFFSET @@ -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 From d3668ca130b6107e219674892949d025d9fc9e1b Mon Sep 17 00:00:00 2001 From: claywar Date: Sat, 25 Jan 2025 12:19:29 -0500 Subject: [PATCH 3/4] Remove empty NPCs, add Default Actions - Chocobo Circuit ~ E. Altepa --- .../zones/Chocobo_Circuit/DefaultActions.lua | 33 +++++++++++++++++++ scripts/zones/Chocobo_Circuit/npcs/Adrian.lua | 21 ------------ .../zones/Chocobo_Circuit/npcs/Amaduralle.lua | 22 ------------- .../zones/Chocobo_Circuit/npcs/Channon.lua | 21 ------------ .../Chocobo_Circuit/npcs/Chaquoillons.lua | 22 ------------- scripts/zones/Chocobo_Circuit/npcs/Curtis.lua | 21 ------------ .../zones/Chocobo_Circuit/npcs/Cyphaireau.lua | 22 ------------- scripts/zones/Chocobo_Circuit/npcs/Cyril.lua | 22 ------------- .../zones/Chocobo_Circuit/npcs/Delaulne.lua | 21 ------------ .../zones/Chocobo_Circuit/npcs/Faboise.lua | 22 ------------- .../zones/Chocobo_Circuit/npcs/Gustavo.lua | 21 ------------ .../zones/Chocobo_Circuit/npcs/Joilevin.lua | 22 ------------- .../zones/Chocobo_Circuit/npcs/Jolande.lua | 22 ------------- scripts/zones/Chocobo_Circuit/npcs/Khatri.lua | 22 ------------- .../zones/Chocobo_Circuit/npcs/Lisette.lua | 22 ------------- scripts/zones/Chocobo_Circuit/npcs/Luca.lua | 22 ------------- scripts/zones/Chocobo_Circuit/npcs/Magali.lua | 22 ------------- scripts/zones/Chocobo_Circuit/npcs/Maxine.lua | 22 ------------- .../Chocobo_Circuit/npcs/Mediverchanne.lua | 22 ------------- .../zones/Chocobo_Circuit/npcs/Mercedes.lua | 21 ------------ scripts/zones/Chocobo_Circuit/npcs/Ove.lua | 22 ------------- .../zones/Chocobo_Circuit/npcs/Pollante.lua | 22 ------------- scripts/zones/Chocobo_Circuit/npcs/Raquel.lua | 22 ------------- .../zones/Chocobo_Circuit/npcs/Rodrigo.lua | 22 ------------- scripts/zones/Chocobo_Circuit/npcs/Russel.lua | 21 ------------ .../Chocobo_Circuit/npcs/Synergy_Engineer.lua | 22 ------------- .../npcs/Synergy_Enthusiast.lua | 22 ------------- .../zones/Chocobo_Circuit/npcs/Timothy.lua | 22 ------------- .../zones/Chocobo_Circuit/npcs/Vaihilique.lua | 22 ------------- .../zones/Chocobo_Circuit/npcs/Valerio.lua | 22 ------------- .../zones/Cloister_of_Tremors/npcs/qm2.lua | 9 ----- .../zones/Crawlers_Nest/DefaultActions.lua | 3 +- .../Crawlers_Nest/npcs/Geomagnetic_Fount.lua | 9 ----- .../npcs/Geomantic_Reservoir.lua | 6 ---- .../zones/Crawlers_Nest/npcs/Grounds_Tome.lua | 3 -- scripts/zones/Crawlers_Nest/npcs/Olavia.lua | 23 ------------- .../Crawlers_Nest/npcs/Treasure_Casket.lua | 3 -- .../Crawlers_Nest/npcs/Treasure_Chest.lua | 6 ---- .../Crawlers_Nest/npcs/Treasure_Coffer.lua | 6 ---- scripts/zones/Crawlers_Nest/npcs/qm1.lua | 3 -- scripts/zones/Crawlers_Nest/npcs/qm2.lua | 3 -- scripts/zones/Crawlers_Nest/npcs/qm3.lua | 3 -- scripts/zones/Crawlers_Nest/npcs/qm4.lua | 3 -- scripts/zones/Crawlers_Nest/npcs/qm5.lua | 3 -- scripts/zones/Crawlers_Nest/npcs/qm6.lua | 3 -- scripts/zones/Crawlers_Nest/npcs/qm7.lua | 3 -- scripts/zones/Crawlers_Nest/npcs/qm9.lua | 9 ----- .../Crawlers_Nest_[S]/npcs/Chodopopo.lua | 9 ----- .../Crawlers_Nest_[S]/npcs/Kalsu-Kalasu.lua | 6 ---- .../Crawlers_Nest_[S]/npcs/Rodeupansat.lua | 6 ---- .../Dangruf_Wadi/npcs/Geomagnetic_Fount.lua | 9 ----- .../zones/Dangruf_Wadi/npcs/Grounds_Tome.lua | 3 -- .../Dangruf_Wadi/npcs/Treasure_Casket.lua | 3 -- .../Dangruf_Wadi/npcs/Treasure_Chest.lua | 6 ---- scripts/zones/Dangruf_Wadi/npcs/qm1.lua | 6 ---- scripts/zones/Dangruf_Wadi/npcs/qm2.lua | 6 ---- .../zones/Davoi/npcs/Geomantic_Reservoir.lua | 6 ---- scripts/zones/Davoi/npcs/Quemaricond.lua | 9 ----- scripts/zones/Davoi/npcs/Treasure_Chest.lua | 6 ---- scripts/zones/Davoi/npcs/Village_Well.lua | 3 -- scripts/zones/Davoi/npcs/_451.lua | 9 ----- scripts/zones/Davoi/npcs/_452.lua | 9 ----- scripts/zones/Davoi/npcs/_459.lua | 9 ----- scripts/zones/Davoi/npcs/_45d.lua | 6 ---- scripts/zones/Davoi/npcs/qm1.lua | 9 ----- .../zones/Den_of_Rancor/DefaultActions.lua | 5 ++- .../zones/Den_of_Rancor/npcs/Grounds_Tome.lua | 3 -- scripts/zones/Den_of_Rancor/npcs/Switch.lua | 3 -- .../Den_of_Rancor/npcs/Treasure_Casket.lua | 3 -- .../Den_of_Rancor/npcs/Treasure_Coffer.lua | 6 ---- scripts/zones/Den_of_Rancor/npcs/_4g0.lua | 18 ---------- scripts/zones/Den_of_Rancor/npcs/_4g1.lua | 18 ---------- scripts/zones/Den_of_Rancor/npcs/_4g2.lua | 18 ---------- scripts/zones/Den_of_Rancor/npcs/qm1.lua | 3 -- scripts/zones/Dragons_Aery/npcs/qm0.lua | 9 ----- scripts/zones/Dragons_Aery/npcs/relic.lua | 3 -- .../Dynamis-Bastok/npcs/Somnial_Threshold.lua | 3 -- .../npcs/Somnial_Threshold.lua | 3 -- .../npcs/Somnial_Threshold.lua | 3 -- .../Dynamis-Jeuno/npcs/Somnial_Threshold.lua | 3 -- .../Dynamis-Qufim/npcs/Somnial_Threshold.lua | 3 -- .../npcs/Somnial_Threshold.lua | 3 -- .../npcs/Somnial_Threshold.lua | 3 -- .../npcs/Somnial_Threshold.lua | 3 -- .../npcs/Somnial_Threshold.lua | 3 -- .../npcs/Somnial_Threshold.lua | 3 -- .../zones/East_Ronfaure/DefaultActions.lua | 7 ++-- .../East_Ronfaure/npcs/Cavernous_Maw.lua | 6 ---- .../zones/East_Ronfaure/npcs/Croteillard.lua | 25 -------------- .../zones/East_Ronfaure/npcs/Field_Manual.lua | 3 -- .../npcs/Geomantic_Reservoir.lua | 6 ---- .../East_Ronfaure/npcs/Logging_Point.lua | 6 ---- .../zones/East_Ronfaure/npcs/Rayochindot.lua | 25 -------------- scripts/zones/East_Ronfaure/npcs/Signpost.lua | 6 ---- .../East_Ronfaure/npcs/Stone_Monument.lua | 10 ------ .../East_Ronfaure/npcs/Treasure_Casket.lua | 3 -- .../East_Ronfaure_[S]/npcs/Cavernous_Maw.lua | 6 ---- .../East_Ronfaure_[S]/npcs/Logging_Point.lua | 6 ---- .../East_Sarutabaruta/DefaultActions.lua | 10 ++++-- .../East_Sarutabaruta/npcs/Field_Manual.lua | 3 -- .../East_Sarutabaruta/npcs/Heih_Porhiaap.lua | 24 -------------- .../npcs/Kesha_Shopehllok.lua | 23 ------------- .../zones/East_Sarutabaruta/npcs/Signpost.lua | 9 ----- .../East_Sarutabaruta/npcs/Stone_Monument.lua | 10 ------ .../East_Sarutabaruta/npcs/Taby_Canatahey.lua | 24 -------------- .../npcs/Treasure_Casket.lua | 3 -- .../Eastern_Adoulin/npcs/Auction_Counter.lua | 9 ----- .../zones/Eastern_Adoulin/npcs/Inthius.lua | 9 ----- .../zones/Eastern_Adoulin/npcs/Octavien.lua | 3 -- .../zones/Eastern_Adoulin/npcs/Sifa_Alani.lua | 6 ---- .../npcs/Symphonic_Curator.lua | 3 -- .../Eastern_Adoulin/npcs/Ujlei_Zelekko.lua | 6 ---- .../Eastern_Altepa_Desert/DefaultActions.lua | 1 + .../npcs/Beastmens_Banner.lua | 24 -------------- .../Eastern_Altepa_Desert/npcs/Eulaclaire.lua | 3 -- .../npcs/Field_Manual.lua | 3 -- .../Eastern_Altepa_Desert/npcs/Sowande.lua | 3 -- .../Eastern_Altepa_Desert/npcs/Telepoint.lua | 3 -- .../npcs/Treasure_Casket.lua | 3 -- .../zones/Eastern_Altepa_Desert/npcs/qm.lua | 9 ----- .../zones/Eastern_Altepa_Desert/npcs/qm2.lua | 9 ----- 121 files changed, 52 insertions(+), 1258 deletions(-) create mode 100644 scripts/zones/Chocobo_Circuit/DefaultActions.lua delete mode 100644 scripts/zones/Chocobo_Circuit/npcs/Adrian.lua delete mode 100644 scripts/zones/Chocobo_Circuit/npcs/Amaduralle.lua delete mode 100644 scripts/zones/Chocobo_Circuit/npcs/Channon.lua delete mode 100644 scripts/zones/Chocobo_Circuit/npcs/Chaquoillons.lua delete mode 100644 scripts/zones/Chocobo_Circuit/npcs/Curtis.lua delete mode 100644 scripts/zones/Chocobo_Circuit/npcs/Cyphaireau.lua delete mode 100644 scripts/zones/Chocobo_Circuit/npcs/Cyril.lua delete mode 100644 scripts/zones/Chocobo_Circuit/npcs/Delaulne.lua delete mode 100644 scripts/zones/Chocobo_Circuit/npcs/Faboise.lua delete mode 100644 scripts/zones/Chocobo_Circuit/npcs/Gustavo.lua delete mode 100644 scripts/zones/Chocobo_Circuit/npcs/Joilevin.lua delete mode 100644 scripts/zones/Chocobo_Circuit/npcs/Jolande.lua delete mode 100644 scripts/zones/Chocobo_Circuit/npcs/Khatri.lua delete mode 100644 scripts/zones/Chocobo_Circuit/npcs/Lisette.lua delete mode 100644 scripts/zones/Chocobo_Circuit/npcs/Luca.lua delete mode 100644 scripts/zones/Chocobo_Circuit/npcs/Magali.lua delete mode 100644 scripts/zones/Chocobo_Circuit/npcs/Maxine.lua delete mode 100644 scripts/zones/Chocobo_Circuit/npcs/Mediverchanne.lua delete mode 100644 scripts/zones/Chocobo_Circuit/npcs/Mercedes.lua delete mode 100644 scripts/zones/Chocobo_Circuit/npcs/Ove.lua delete mode 100644 scripts/zones/Chocobo_Circuit/npcs/Pollante.lua delete mode 100644 scripts/zones/Chocobo_Circuit/npcs/Raquel.lua delete mode 100644 scripts/zones/Chocobo_Circuit/npcs/Rodrigo.lua delete mode 100644 scripts/zones/Chocobo_Circuit/npcs/Russel.lua delete mode 100644 scripts/zones/Chocobo_Circuit/npcs/Synergy_Engineer.lua delete mode 100644 scripts/zones/Chocobo_Circuit/npcs/Synergy_Enthusiast.lua delete mode 100644 scripts/zones/Chocobo_Circuit/npcs/Timothy.lua delete mode 100644 scripts/zones/Chocobo_Circuit/npcs/Vaihilique.lua delete mode 100644 scripts/zones/Chocobo_Circuit/npcs/Valerio.lua delete mode 100644 scripts/zones/Crawlers_Nest/npcs/Olavia.lua delete mode 100644 scripts/zones/Den_of_Rancor/npcs/_4g0.lua delete mode 100644 scripts/zones/Den_of_Rancor/npcs/_4g1.lua delete mode 100644 scripts/zones/Den_of_Rancor/npcs/_4g2.lua delete mode 100644 scripts/zones/East_Ronfaure/npcs/Croteillard.lua delete mode 100644 scripts/zones/East_Ronfaure/npcs/Rayochindot.lua delete mode 100644 scripts/zones/East_Sarutabaruta/npcs/Heih_Porhiaap.lua delete mode 100644 scripts/zones/East_Sarutabaruta/npcs/Kesha_Shopehllok.lua delete mode 100644 scripts/zones/East_Sarutabaruta/npcs/Taby_Canatahey.lua delete mode 100644 scripts/zones/Eastern_Altepa_Desert/npcs/Beastmens_Banner.lua diff --git a/scripts/zones/Chocobo_Circuit/DefaultActions.lua b/scripts/zones/Chocobo_Circuit/DefaultActions.lua new file mode 100644 index 00000000000..3a13812af4e --- /dev/null +++ b/scripts/zones/Chocobo_Circuit/DefaultActions.lua @@ -0,0 +1,33 @@ +-- local ID = zones[xi.zone.CHOCOBO_CIRCUIT] + +return { + ['Adrian'] = { event = 1 }, + ['Amaduralle'] = { event = 241 }, + ['Channon'] = { event = 342 }, + ['Chaquoillons'] = { event = 238 }, + ['Curtis'] = { event = 211 }, + ['Cyphaireau'] = { event = 240 }, + ['Cyril'] = { event = 0 }, + ['Delaulne'] = { event = 340 }, + ['Faboise'] = { event = 239 }, + ['Gustavo'] = { event = 226 }, + ['Joilevin'] = { event = 236 }, + ['Jolande'] = { event = 346 }, + ['Khatri'] = { event = 339 }, + ['Lisette'] = { event = 348 }, + ['Luca'] = { event = 338 }, + ['Magali'] = { event = 350 }, + ['Maxine'] = { event = 352 }, + ['Mediverchanne'] = { event = 242 }, + ['Mercedes'] = { event = 343 }, + ['Ove'] = { event = 353 }, + ['Pollante'] = { event = 237 }, + ['Raquel'] = { event = 354 }, + ['Rodrigo'] = { event = 347 }, + ['Russel'] = { event = 227 }, + ['Synergy_Engineer'] = { event = 11001 }, + ['Synergy_Enthusiast'] = { event = 12001 }, + ['Timothy'] = { event = 349 }, + ['Vaihilique'] = { event = 243 }, + ['Valerio'] = { event = 351 }, +} diff --git a/scripts/zones/Chocobo_Circuit/npcs/Adrian.lua b/scripts/zones/Chocobo_Circuit/npcs/Adrian.lua deleted file mode 100644 index 22283da0b89..00000000000 --- a/scripts/zones/Chocobo_Circuit/npcs/Adrian.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Chocobo_Circuit --- NPC: Adrian ------------------------------------ ----@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) -end - -return entity diff --git a/scripts/zones/Chocobo_Circuit/npcs/Amaduralle.lua b/scripts/zones/Chocobo_Circuit/npcs/Amaduralle.lua deleted file mode 100644 index fa843c7b985..00000000000 --- a/scripts/zones/Chocobo_Circuit/npcs/Amaduralle.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Chocobo_Circuit --- NPC: Amaduralle --- !pos -369.286 -4.000 -464.873 70 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(241) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Chocobo_Circuit/npcs/Channon.lua b/scripts/zones/Chocobo_Circuit/npcs/Channon.lua deleted file mode 100644 index 0c0649eab86..00000000000 --- a/scripts/zones/Chocobo_Circuit/npcs/Channon.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Chocobo_Circuit --- NPC: Channon ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(342) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Chocobo_Circuit/npcs/Chaquoillons.lua b/scripts/zones/Chocobo_Circuit/npcs/Chaquoillons.lua deleted file mode 100644 index 21ead865023..00000000000 --- a/scripts/zones/Chocobo_Circuit/npcs/Chaquoillons.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Chocobo_Circuit --- NPC: Chaquoillons --- !pos -270.716 -4.000 -465.199 70 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(238) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Chocobo_Circuit/npcs/Curtis.lua b/scripts/zones/Chocobo_Circuit/npcs/Curtis.lua deleted file mode 100644 index 1320c359f8a..00000000000 --- a/scripts/zones/Chocobo_Circuit/npcs/Curtis.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Chocobo_Circuit --- NPC: Curtis ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(211) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Chocobo_Circuit/npcs/Cyphaireau.lua b/scripts/zones/Chocobo_Circuit/npcs/Cyphaireau.lua deleted file mode 100644 index 9c77d581563..00000000000 --- a/scripts/zones/Chocobo_Circuit/npcs/Cyphaireau.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Chocobo_Circuit --- NPC: Cyphaireau --- !pos -369.391 -4.000 -495.073 70 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(240) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Chocobo_Circuit/npcs/Cyril.lua b/scripts/zones/Chocobo_Circuit/npcs/Cyril.lua deleted file mode 100644 index 72094268342..00000000000 --- a/scripts/zones/Chocobo_Circuit/npcs/Cyril.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Chocobo_Circuit --- NPC: Cyril --- !pos -331.617 0.000 -467.548 70 ------------------------------------ ----@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/Chocobo_Circuit/npcs/Delaulne.lua b/scripts/zones/Chocobo_Circuit/npcs/Delaulne.lua deleted file mode 100644 index 0764c3cc1d9..00000000000 --- a/scripts/zones/Chocobo_Circuit/npcs/Delaulne.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Chocobo_Circuit --- NPC: Delaulne ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(340) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Chocobo_Circuit/npcs/Faboise.lua b/scripts/zones/Chocobo_Circuit/npcs/Faboise.lua deleted file mode 100644 index 21dc3dac9d8..00000000000 --- a/scripts/zones/Chocobo_Circuit/npcs/Faboise.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Chocobo_Circuit --- NPC: Faboise --- !pos -270.953 -4.000 -495.218 70 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(239) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Chocobo_Circuit/npcs/Gustavo.lua b/scripts/zones/Chocobo_Circuit/npcs/Gustavo.lua deleted file mode 100644 index d97929b686e..00000000000 --- a/scripts/zones/Chocobo_Circuit/npcs/Gustavo.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Chocobo_Circuit --- NPC: Gustavo ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(226) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Chocobo_Circuit/npcs/Joilevin.lua b/scripts/zones/Chocobo_Circuit/npcs/Joilevin.lua deleted file mode 100644 index c75d675c278..00000000000 --- a/scripts/zones/Chocobo_Circuit/npcs/Joilevin.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Chocobo_Circuit --- NPC: Joilevin --- !pos -319.937 0.000 -467.799 70 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(236) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Chocobo_Circuit/npcs/Jolande.lua b/scripts/zones/Chocobo_Circuit/npcs/Jolande.lua deleted file mode 100644 index a8bc51caa99..00000000000 --- a/scripts/zones/Chocobo_Circuit/npcs/Jolande.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Chocobo_Circuit --- NPC: Jolande --- !pos -499.440 0.000 -371.312 70 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(346) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Chocobo_Circuit/npcs/Khatri.lua b/scripts/zones/Chocobo_Circuit/npcs/Khatri.lua deleted file mode 100644 index 4d4e4f26d33..00000000000 --- a/scripts/zones/Chocobo_Circuit/npcs/Khatri.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Chocobo_Circuit --- NPC: Khatri --- !pos -322.411 0.000 -484.819 70 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(339) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Chocobo_Circuit/npcs/Lisette.lua b/scripts/zones/Chocobo_Circuit/npcs/Lisette.lua deleted file mode 100644 index 187b5f1ae02..00000000000 --- a/scripts/zones/Chocobo_Circuit/npcs/Lisette.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Chocobo_Circuit --- NPC: Lisette --- !pos -150.073 0.000 -377.292 70 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(348) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Chocobo_Circuit/npcs/Luca.lua b/scripts/zones/Chocobo_Circuit/npcs/Luca.lua deleted file mode 100644 index 36d45f6990e..00000000000 --- a/scripts/zones/Chocobo_Circuit/npcs/Luca.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Chocobo_Circuit --- NPC: Luca --- !pos -317.406 0.000 -485.091 70 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(338) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Chocobo_Circuit/npcs/Magali.lua b/scripts/zones/Chocobo_Circuit/npcs/Magali.lua deleted file mode 100644 index af700a0d538..00000000000 --- a/scripts/zones/Chocobo_Circuit/npcs/Magali.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Chocobo_Circuit --- NPC: Magali --- !pos -328.947 0.000 -295.444 70 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(350) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Chocobo_Circuit/npcs/Maxine.lua b/scripts/zones/Chocobo_Circuit/npcs/Maxine.lua deleted file mode 100644 index 33240d2fb2e..00000000000 --- a/scripts/zones/Chocobo_Circuit/npcs/Maxine.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Chocobo_Circuit --- NPC: Maxine --- !pos -492.890 0.000 -530.576 70 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(352) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Chocobo_Circuit/npcs/Mediverchanne.lua b/scripts/zones/Chocobo_Circuit/npcs/Mediverchanne.lua deleted file mode 100644 index 6c8a509b820..00000000000 --- a/scripts/zones/Chocobo_Circuit/npcs/Mediverchanne.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Chocobo_Circuit --- NPC: Mediverchanne --- !pos -266.977 3.999 -524.848 70 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(242) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Chocobo_Circuit/npcs/Mercedes.lua b/scripts/zones/Chocobo_Circuit/npcs/Mercedes.lua deleted file mode 100644 index 7745ca4d4da..00000000000 --- a/scripts/zones/Chocobo_Circuit/npcs/Mercedes.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Chocobo_Circuit --- NPC: Mercedes ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(343) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Chocobo_Circuit/npcs/Ove.lua b/scripts/zones/Chocobo_Circuit/npcs/Ove.lua deleted file mode 100644 index daf1ba94199..00000000000 --- a/scripts/zones/Chocobo_Circuit/npcs/Ove.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Chocobo_Circuit --- NPC: Ove --- !pos -160.484 0.000 -374.533 70 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(353) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Chocobo_Circuit/npcs/Pollante.lua b/scripts/zones/Chocobo_Circuit/npcs/Pollante.lua deleted file mode 100644 index 1d804079350..00000000000 --- a/scripts/zones/Chocobo_Circuit/npcs/Pollante.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Chocobo_Circuit --- NPC: Pollante --- !pos -325.119 -4.000 -430.698 70 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(237) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Chocobo_Circuit/npcs/Raquel.lua b/scripts/zones/Chocobo_Circuit/npcs/Raquel.lua deleted file mode 100644 index 15eefaefc36..00000000000 --- a/scripts/zones/Chocobo_Circuit/npcs/Raquel.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Chocobo_Circuit --- NPC: Raquel --- !pos -146.168 0.000 -541.022 70 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(354) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Chocobo_Circuit/npcs/Rodrigo.lua b/scripts/zones/Chocobo_Circuit/npcs/Rodrigo.lua deleted file mode 100644 index 11d2b7107fc..00000000000 --- a/scripts/zones/Chocobo_Circuit/npcs/Rodrigo.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Chocobo_Circuit --- NPC: Rodrigo --- !pos -502.384 0.000 -536.281 70 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(347) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Chocobo_Circuit/npcs/Russel.lua b/scripts/zones/Chocobo_Circuit/npcs/Russel.lua deleted file mode 100644 index a0c9a09a7bb..00000000000 --- a/scripts/zones/Chocobo_Circuit/npcs/Russel.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Chocobo_Circuit --- NPC: Gustavo ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(227) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Chocobo_Circuit/npcs/Synergy_Engineer.lua b/scripts/zones/Chocobo_Circuit/npcs/Synergy_Engineer.lua deleted file mode 100644 index c83d769e65e..00000000000 --- a/scripts/zones/Chocobo_Circuit/npcs/Synergy_Engineer.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Chocobo Circuit --- NPC: Synergy Engineer --- !pos -325.376 0.000 -524.698 70 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(11001) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Chocobo_Circuit/npcs/Synergy_Enthusiast.lua b/scripts/zones/Chocobo_Circuit/npcs/Synergy_Enthusiast.lua deleted file mode 100644 index 97f8b947ae4..00000000000 --- a/scripts/zones/Chocobo_Circuit/npcs/Synergy_Enthusiast.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Chocobo_Circuit --- NPC: Synergy_Enthusiast --- !pos -324.546 0.000 -524.753 70 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(12001) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Chocobo_Circuit/npcs/Timothy.lua b/scripts/zones/Chocobo_Circuit/npcs/Timothy.lua deleted file mode 100644 index 2c9bfce67e1..00000000000 --- a/scripts/zones/Chocobo_Circuit/npcs/Timothy.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Chocobo_Circuit --- NPC: Timothy --- !pos -135.653 0.000 -538.552 70 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(349) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Chocobo_Circuit/npcs/Vaihilique.lua b/scripts/zones/Chocobo_Circuit/npcs/Vaihilique.lua deleted file mode 100644 index 187f78b3d9f..00000000000 --- a/scripts/zones/Chocobo_Circuit/npcs/Vaihilique.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Chocobo_Circuit --- NPC: Vaihilique --- !pos -372.943 3.999 -524.775 70 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(243) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Chocobo_Circuit/npcs/Valerio.lua b/scripts/zones/Chocobo_Circuit/npcs/Valerio.lua deleted file mode 100644 index b510e6e107b..00000000000 --- a/scripts/zones/Chocobo_Circuit/npcs/Valerio.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Chocobo_Circuit --- NPC: Valerio --- !pos -502.155 0.000 -360.685 70 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(351) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Cloister_of_Tremors/npcs/qm2.lua b/scripts/zones/Cloister_of_Tremors/npcs/qm2.lua index e1f156facd7..b2769372250 100644 --- a/scripts/zones/Cloister_of_Tremors/npcs/qm2.lua +++ b/scripts/zones/Cloister_of_Tremors/npcs/qm2.lua @@ -8,17 +8,8 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) npcUtil.giveItem(player, xi.item.TREMORSTONE) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Crawlers_Nest/DefaultActions.lua b/scripts/zones/Crawlers_Nest/DefaultActions.lua index cd017a2cefe..5f7f2c33992 100644 --- a/scripts/zones/Crawlers_Nest/DefaultActions.lua +++ b/scripts/zones/Crawlers_Nest/DefaultActions.lua @@ -1,5 +1,6 @@ local ID = zones[xi.zone.CRAWLERS_NEST] return { - ['qm8'] = { messageSpecial = ID.text.SOMEONE_HAS_BEEN_DIGGING_HERE }, + ['Olavia'] = { event = 6 }, + ['qm8'] = { messageSpecial = ID.text.SOMEONE_HAS_BEEN_DIGGING_HERE }, } diff --git a/scripts/zones/Crawlers_Nest/npcs/Geomagnetic_Fount.lua b/scripts/zones/Crawlers_Nest/npcs/Geomagnetic_Fount.lua index c0f64ade567..78ee1a0c81b 100644 --- a/scripts/zones/Crawlers_Nest/npcs/Geomagnetic_Fount.lua +++ b/scripts/zones/Crawlers_Nest/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/Crawlers_Nest/npcs/Geomantic_Reservoir.lua b/scripts/zones/Crawlers_Nest/npcs/Geomantic_Reservoir.lua index 600b4399317..fa0420e4f97 100644 --- a/scripts/zones/Crawlers_Nest/npcs/Geomantic_Reservoir.lua +++ b/scripts/zones/Crawlers_Nest/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_STR) 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_STR) end diff --git a/scripts/zones/Crawlers_Nest/npcs/Grounds_Tome.lua b/scripts/zones/Crawlers_Nest/npcs/Grounds_Tome.lua index 76a8c4b3788..13bb3273dde 100644 --- a/scripts/zones/Crawlers_Nest/npcs/Grounds_Tome.lua +++ b/scripts/zones/Crawlers_Nest/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/Crawlers_Nest/npcs/Olavia.lua b/scripts/zones/Crawlers_Nest/npcs/Olavia.lua deleted file mode 100644 index a696be19083..00000000000 --- a/scripts/zones/Crawlers_Nest/npcs/Olavia.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Crawlers' Nest --- NPC: Olavia --- Type: Escort NPC --- !pos 379.638 -33.051 -0.533 197 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(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/Crawlers_Nest/npcs/Treasure_Casket.lua b/scripts/zones/Crawlers_Nest/npcs/Treasure_Casket.lua index 73c90cf9d1a..529c43b47f7 100644 --- a/scripts/zones/Crawlers_Nest/npcs/Treasure_Casket.lua +++ b/scripts/zones/Crawlers_Nest/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/Crawlers_Nest/npcs/Treasure_Chest.lua b/scripts/zones/Crawlers_Nest/npcs/Treasure_Chest.lua index 0e4f97de9bc..e9f1493bad6 100644 --- a/scripts/zones/Crawlers_Nest/npcs/Treasure_Chest.lua +++ b/scripts/zones/Crawlers_Nest/npcs/Treasure_Chest.lua @@ -15,10 +15,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/Crawlers_Nest/npcs/Treasure_Coffer.lua b/scripts/zones/Crawlers_Nest/npcs/Treasure_Coffer.lua index 9178d5ed4e5..f1ae5033902 100644 --- a/scripts/zones/Crawlers_Nest/npcs/Treasure_Coffer.lua +++ b/scripts/zones/Crawlers_Nest/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/Crawlers_Nest/npcs/qm1.lua b/scripts/zones/Crawlers_Nest/npcs/qm1.lua index 17e6a89e84c..4f17dd08b8c 100644 --- a/scripts/zones/Crawlers_Nest/npcs/qm1.lua +++ b/scripts/zones/Crawlers_Nest/npcs/qm1.lua @@ -20,7 +20,4 @@ entity.onTrade = function(player, npc, trade) end end -entity.onTrigger = function(player, npc) -end - return entity diff --git a/scripts/zones/Crawlers_Nest/npcs/qm2.lua b/scripts/zones/Crawlers_Nest/npcs/qm2.lua index b8dd3618dd8..43a328d17e9 100644 --- a/scripts/zones/Crawlers_Nest/npcs/qm2.lua +++ b/scripts/zones/Crawlers_Nest/npcs/qm2.lua @@ -20,7 +20,4 @@ entity.onTrade = function(player, npc, trade) end end -entity.onTrigger = function(player, npc) -end - return entity diff --git a/scripts/zones/Crawlers_Nest/npcs/qm3.lua b/scripts/zones/Crawlers_Nest/npcs/qm3.lua index 24e919d6164..193238a9cf3 100644 --- a/scripts/zones/Crawlers_Nest/npcs/qm3.lua +++ b/scripts/zones/Crawlers_Nest/npcs/qm3.lua @@ -20,7 +20,4 @@ entity.onTrade = function(player, npc, trade) end end -entity.onTrigger = function(player, npc) -end - return entity diff --git a/scripts/zones/Crawlers_Nest/npcs/qm4.lua b/scripts/zones/Crawlers_Nest/npcs/qm4.lua index 80b9abbbdbc..5fa3a36f111 100644 --- a/scripts/zones/Crawlers_Nest/npcs/qm4.lua +++ b/scripts/zones/Crawlers_Nest/npcs/qm4.lua @@ -20,7 +20,4 @@ entity.onTrade = function(player, npc, trade) end end -entity.onTrigger = function(player, npc) -end - return entity diff --git a/scripts/zones/Crawlers_Nest/npcs/qm5.lua b/scripts/zones/Crawlers_Nest/npcs/qm5.lua index 73059d13b8c..011c015e78d 100644 --- a/scripts/zones/Crawlers_Nest/npcs/qm5.lua +++ b/scripts/zones/Crawlers_Nest/npcs/qm5.lua @@ -20,7 +20,4 @@ entity.onTrade = function(player, npc, trade) end end -entity.onTrigger = function(player, npc) -end - return entity diff --git a/scripts/zones/Crawlers_Nest/npcs/qm6.lua b/scripts/zones/Crawlers_Nest/npcs/qm6.lua index d1a075256dd..0e7d7102e77 100644 --- a/scripts/zones/Crawlers_Nest/npcs/qm6.lua +++ b/scripts/zones/Crawlers_Nest/npcs/qm6.lua @@ -20,7 +20,4 @@ entity.onTrade = function(player, npc, trade) end end -entity.onTrigger = function(player, npc) -end - return entity diff --git a/scripts/zones/Crawlers_Nest/npcs/qm7.lua b/scripts/zones/Crawlers_Nest/npcs/qm7.lua index 70f8675529d..d7d23fe8faf 100644 --- a/scripts/zones/Crawlers_Nest/npcs/qm7.lua +++ b/scripts/zones/Crawlers_Nest/npcs/qm7.lua @@ -20,7 +20,4 @@ entity.onTrade = function(player, npc, trade) end end -entity.onTrigger = function(player, npc) -end - return entity diff --git a/scripts/zones/Crawlers_Nest/npcs/qm9.lua b/scripts/zones/Crawlers_Nest/npcs/qm9.lua index c02b723df3c..9e4abd7f005 100644 --- a/scripts/zones/Crawlers_Nest/npcs/qm9.lua +++ b/scripts/zones/Crawlers_Nest/npcs/qm9.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.CRAWLERS_NEST] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getQuestStatus(xi.questLog.SANDORIA, xi.quest.id.sandoria.A_BOY_S_DREAM) == xi.questStatus.QUEST_ACCEPTED and @@ -32,10 +29,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/Crawlers_Nest_[S]/npcs/Chodopopo.lua b/scripts/zones/Crawlers_Nest_[S]/npcs/Chodopopo.lua index c8586c0c0b5..c3a85768764 100644 --- a/scripts/zones/Crawlers_Nest_[S]/npcs/Chodopopo.lua +++ b/scripts/zones/Crawlers_Nest_[S]/npcs/Chodopopo.lua @@ -9,18 +9,9 @@ local ID = zones[xi.zone.CRAWLERS_NEST_S] ---@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/Crawlers_Nest_[S]/npcs/Kalsu-Kalasu.lua b/scripts/zones/Crawlers_Nest_[S]/npcs/Kalsu-Kalasu.lua index 89e00cce2a9..cee89e42639 100644 --- a/scripts/zones/Crawlers_Nest_[S]/npcs/Kalsu-Kalasu.lua +++ b/scripts/zones/Crawlers_Nest_[S]/npcs/Kalsu-Kalasu.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.CRAWLERS_NEST_S] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getCampaignAllegiance() > 0 then if player:getCampaignAllegiance() == 2 then @@ -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 == 1 and option == 0 then player:addKeyItem(xi.ki.GREEN_RECOMMENDATION_LETTER) diff --git a/scripts/zones/Crawlers_Nest_[S]/npcs/Rodeupansat.lua b/scripts/zones/Crawlers_Nest_[S]/npcs/Rodeupansat.lua index e0db8b13214..83bfe595ffa 100644 --- a/scripts/zones/Crawlers_Nest_[S]/npcs/Rodeupansat.lua +++ b/scripts/zones/Crawlers_Nest_[S]/npcs/Rodeupansat.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local evilAtTheInlet = player:getQuestStatus(xi.questLog.CRYSTAL_WAR, xi.quest.id.crystalWar.EVIL_AT_THE_INLET) @@ -33,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 == 107 then player:addQuest(xi.questLog.CRYSTAL_WAR, xi.quest.id.crystalWar.EVIL_AT_THE_INLET) diff --git a/scripts/zones/Dangruf_Wadi/npcs/Geomagnetic_Fount.lua b/scripts/zones/Dangruf_Wadi/npcs/Geomagnetic_Fount.lua index db183ed46dd..95ee74a698b 100644 --- a/scripts/zones/Dangruf_Wadi/npcs/Geomagnetic_Fount.lua +++ b/scripts/zones/Dangruf_Wadi/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/Dangruf_Wadi/npcs/Grounds_Tome.lua b/scripts/zones/Dangruf_Wadi/npcs/Grounds_Tome.lua index c88036d0aca..6a4b2e107c4 100644 --- a/scripts/zones/Dangruf_Wadi/npcs/Grounds_Tome.lua +++ b/scripts/zones/Dangruf_Wadi/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/Dangruf_Wadi/npcs/Treasure_Casket.lua b/scripts/zones/Dangruf_Wadi/npcs/Treasure_Casket.lua index 8a00f83ef7f..b2aebfe3342 100644 --- a/scripts/zones/Dangruf_Wadi/npcs/Treasure_Casket.lua +++ b/scripts/zones/Dangruf_Wadi/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/Dangruf_Wadi/npcs/Treasure_Chest.lua b/scripts/zones/Dangruf_Wadi/npcs/Treasure_Chest.lua index 88e58f80431..94223c602c4 100644 --- a/scripts/zones/Dangruf_Wadi/npcs/Treasure_Chest.lua +++ b/scripts/zones/Dangruf_Wadi/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/Dangruf_Wadi/npcs/qm1.lua b/scripts/zones/Dangruf_Wadi/npcs/qm1.lua index 944a997ee47..d8cabe58390 100644 --- a/scripts/zones/Dangruf_Wadi/npcs/qm1.lua +++ b/scripts/zones/Dangruf_Wadi/npcs/qm1.lua @@ -31,10 +31,4 @@ entity.onTrigger = function(player, npc) player:messageSpecial(ID.text.SMALL_HOLE) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Dangruf_Wadi/npcs/qm2.lua b/scripts/zones/Dangruf_Wadi/npcs/qm2.lua index afedde2752a..c8bc3d91ac4 100644 --- a/scripts/zones/Dangruf_Wadi/npcs/qm2.lua +++ b/scripts/zones/Dangruf_Wadi/npcs/qm2.lua @@ -9,16 +9,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(110) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 110 and option == 0 then npcUtil.giveItem(player, xi.item.DANGRUF_STONE) diff --git a/scripts/zones/Davoi/npcs/Geomantic_Reservoir.lua b/scripts/zones/Davoi/npcs/Geomantic_Reservoir.lua index 6d8293146eb..7c7a4b876e4 100644 --- a/scripts/zones/Davoi/npcs/Geomantic_Reservoir.lua +++ b/scripts/zones/Davoi/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_FEND) 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_FEND) end diff --git a/scripts/zones/Davoi/npcs/Quemaricond.lua b/scripts/zones/Davoi/npcs/Quemaricond.lua index c82ce644910..6713bef6733 100644 --- a/scripts/zones/Davoi/npcs/Quemaricond.lua +++ b/scripts/zones/Davoi/npcs/Quemaricond.lua @@ -25,9 +25,6 @@ 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:showText(npc, ID.text.QUEMARICOND_DIALOG) npc:clearPath(true) @@ -35,10 +32,4 @@ entity.onTrigger = function(player, npc) npc:continuePath() end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Davoi/npcs/Treasure_Chest.lua b/scripts/zones/Davoi/npcs/Treasure_Chest.lua index 99e028c9eb6..999c15eab2e 100644 --- a/scripts/zones/Davoi/npcs/Treasure_Chest.lua +++ b/scripts/zones/Davoi/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/Davoi/npcs/Village_Well.lua b/scripts/zones/Davoi/npcs/Village_Well.lua index b8fa489c6cf..96f138febc6 100644 --- a/scripts/zones/Davoi/npcs/Village_Well.lua +++ b/scripts/zones/Davoi/npcs/Village_Well.lua @@ -39,9 +39,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 == 113 then player:confirmTrade() diff --git a/scripts/zones/Davoi/npcs/_451.lua b/scripts/zones/Davoi/npcs/_451.lua index 2bfd9eaaefd..175b139b122 100644 --- a/scripts/zones/Davoi/npcs/_451.lua +++ b/scripts/zones/Davoi/npcs/_451.lua @@ -6,18 +6,9 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) npc:openDoor(3) -- lever animation RunElevator(xi.elevator.DAVOI_LIFT) -- elevator @450 (actual npc script is _454) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Davoi/npcs/_452.lua b/scripts/zones/Davoi/npcs/_452.lua index 9fa2f9ae88b..e8045ad153f 100644 --- a/scripts/zones/Davoi/npcs/_452.lua +++ b/scripts/zones/Davoi/npcs/_452.lua @@ -6,18 +6,9 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) npc:openDoor(3) -- lever animation RunElevator(xi.elevator.DAVOI_LIFT) -- elevator @450 (actual npc script is _454) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Davoi/npcs/_459.lua b/scripts/zones/Davoi/npcs/_459.lua index c5f2b5393e9..69a1e8748ce 100644 --- a/scripts/zones/Davoi/npcs/_459.lua +++ b/scripts/zones/Davoi/npcs/_459.lua @@ -7,19 +7,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:hasKeyItem(xi.ki.CREST_OF_DAVOI) then player:startEvent(54) 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/Davoi/npcs/_45d.lua b/scripts/zones/Davoi/npcs/_45d.lua index 4ba45f2442a..5226a2c248a 100644 --- a/scripts/zones/Davoi/npcs/_45d.lua +++ b/scripts/zones/Davoi/npcs/_45d.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.DAVOI] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if npc:getAnimation() == xi.animation.CLOSE_DOOR then if player:hasKeyItem(xi.ki.CRIMSON_ORB) then @@ -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 == 42 and diff --git a/scripts/zones/Davoi/npcs/qm1.lua b/scripts/zones/Davoi/npcs/qm1.lua index 2075410f666..62200e9089c 100644 --- a/scripts/zones/Davoi/npcs/qm1.lua +++ b/scripts/zones/Davoi/npcs/qm1.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.DAVOI] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local toCureaCough = player:getQuestStatus(xi.questLog.SANDORIA, xi.quest.id.sandoria.TO_CURE_A_COUGH) @@ -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/Den_of_Rancor/DefaultActions.lua b/scripts/zones/Den_of_Rancor/DefaultActions.lua index 68af7393b08..3c5ad6a0292 100644 --- a/scripts/zones/Den_of_Rancor/DefaultActions.lua +++ b/scripts/zones/Den_of_Rancor/DefaultActions.lua @@ -1,5 +1,8 @@ local ID = zones[xi.zone.DEN_OF_RANCOR] return { - ['qm2'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, + ['_4g0'] = { messageSpecial = ID.text.LANTERN_OFFSET }, + ['_4g1'] = { messageSpecial = ID.text.LANTERN_OFFSET }, + ['_4g2'] = { messageSpecial = ID.text.LANTERN_OFFSET }, + ['qm2'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, } diff --git a/scripts/zones/Den_of_Rancor/npcs/Grounds_Tome.lua b/scripts/zones/Den_of_Rancor/npcs/Grounds_Tome.lua index e734a29c746..cb674456803 100644 --- a/scripts/zones/Den_of_Rancor/npcs/Grounds_Tome.lua +++ b/scripts/zones/Den_of_Rancor/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/Den_of_Rancor/npcs/Switch.lua b/scripts/zones/Den_of_Rancor/npcs/Switch.lua index a84247d2d34..562c068647e 100644 --- a/scripts/zones/Den_of_Rancor/npcs/Switch.lua +++ b/scripts/zones/Den_of_Rancor/npcs/Switch.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.DEN_OF_RANCOR] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getZPos() > 35 then GetNPCByID(ID.npc.DROP_GATE):openDoor() -- drop gate to Sacrificial Chamber diff --git a/scripts/zones/Den_of_Rancor/npcs/Treasure_Casket.lua b/scripts/zones/Den_of_Rancor/npcs/Treasure_Casket.lua index 76b20684369..9dcd8024b18 100644 --- a/scripts/zones/Den_of_Rancor/npcs/Treasure_Casket.lua +++ b/scripts/zones/Den_of_Rancor/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/Den_of_Rancor/npcs/Treasure_Coffer.lua b/scripts/zones/Den_of_Rancor/npcs/Treasure_Coffer.lua index d17619f41f3..197169a8d37 100644 --- a/scripts/zones/Den_of_Rancor/npcs/Treasure_Coffer.lua +++ b/scripts/zones/Den_of_Rancor/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/Den_of_Rancor/npcs/_4g0.lua b/scripts/zones/Den_of_Rancor/npcs/_4g0.lua deleted file mode 100644 index 4efaf47ba1a..00000000000 --- a/scripts/zones/Den_of_Rancor/npcs/_4g0.lua +++ /dev/null @@ -1,18 +0,0 @@ ------------------------------------ --- Area: Den of Rancor --- NPC: Drop Gate (by Sacrificial Chamber) --- !pos -60 46 32 160 ------------------------------------ -local ID = zones[xi.zone.DEN_OF_RANCOR] ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:messageSpecial(ID.text.LANTERN_OFFSET) -- The grating will not budge. -end - -return entity diff --git a/scripts/zones/Den_of_Rancor/npcs/_4g1.lua b/scripts/zones/Den_of_Rancor/npcs/_4g1.lua deleted file mode 100644 index 11f9bde3a15..00000000000 --- a/scripts/zones/Den_of_Rancor/npcs/_4g1.lua +++ /dev/null @@ -1,18 +0,0 @@ ------------------------------------ --- Area: Den of Rancor --- NPC: Drop Gate (by Hakutaku) --- !pos 5.044 23.590 -299.976 160 ------------------------------------ -local ID = zones[xi.zone.DEN_OF_RANCOR] ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:messageSpecial(ID.text.LANTERN_OFFSET) -- The grating will not budge. -end - -return entity diff --git a/scripts/zones/Den_of_Rancor/npcs/_4g2.lua b/scripts/zones/Den_of_Rancor/npcs/_4g2.lua deleted file mode 100644 index 18811e0efba..00000000000 --- a/scripts/zones/Den_of_Rancor/npcs/_4g2.lua +++ /dev/null @@ -1,18 +0,0 @@ ------------------------------------ --- Area: Den of Rancor --- NPC: Drop Gate (by Tonberry Decapitator) --- !pos -139.976 3.591 -165.043 160 ------------------------------------ -local ID = zones[xi.zone.DEN_OF_RANCOR] ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:messageSpecial(ID.text.LANTERN_OFFSET) -- The grating will not budge. -end - -return entity diff --git a/scripts/zones/Den_of_Rancor/npcs/qm1.lua b/scripts/zones/Den_of_Rancor/npcs/qm1.lua index 477e126952e..a6166d827fa 100644 --- a/scripts/zones/Den_of_Rancor/npcs/qm1.lua +++ b/scripts/zones/Den_of_Rancor/npcs/qm1.lua @@ -17,7 +17,4 @@ entity.onTrade = function(player, npc, trade) end end -entity.onTrigger = function(player, npc) -end - return entity diff --git a/scripts/zones/Dragons_Aery/npcs/qm0.lua b/scripts/zones/Dragons_Aery/npcs/qm0.lua index e621afd7376..0ffc6dd6569 100644 --- a/scripts/zones/Dragons_Aery/npcs/qm0.lua +++ b/scripts/zones/Dragons_Aery/npcs/qm0.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.DRAGONS_AERY] ---@type TNpcEntity local entity = {} -entity.onSpawn = function(npc) -end - entity.onTrade = function(player, npc, trade) if not GetMobByID(ID.mob.FAFNIR):isSpawned() and @@ -35,10 +32,4 @@ 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/Dragons_Aery/npcs/relic.lua b/scripts/zones/Dragons_Aery/npcs/relic.lua index 60aab7f775c..5908ba54e0e 100644 --- a/scripts/zones/Dragons_Aery/npcs/relic.lua +++ b/scripts/zones/Dragons_Aery/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 == 3 and diff --git a/scripts/zones/Dynamis-Bastok/npcs/Somnial_Threshold.lua b/scripts/zones/Dynamis-Bastok/npcs/Somnial_Threshold.lua index 96ce707b48e..2a9d34bf465 100644 --- a/scripts/zones/Dynamis-Bastok/npcs/Somnial_Threshold.lua +++ b/scripts/zones/Dynamis-Bastok/npcs/Somnial_Threshold.lua @@ -9,9 +9,6 @@ entity.onTrigger = function(player, npc) xi.dynamis.somnialThresholdOnTrigger(player, npc) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.dynamis.somnialThresholdOnEventFinish(player, csid, option, npc) end diff --git a/scripts/zones/Dynamis-Beaucedine/npcs/Somnial_Threshold.lua b/scripts/zones/Dynamis-Beaucedine/npcs/Somnial_Threshold.lua index 96ce707b48e..2a9d34bf465 100644 --- a/scripts/zones/Dynamis-Beaucedine/npcs/Somnial_Threshold.lua +++ b/scripts/zones/Dynamis-Beaucedine/npcs/Somnial_Threshold.lua @@ -9,9 +9,6 @@ entity.onTrigger = function(player, npc) xi.dynamis.somnialThresholdOnTrigger(player, npc) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.dynamis.somnialThresholdOnEventFinish(player, csid, option, npc) end diff --git a/scripts/zones/Dynamis-Buburimu/npcs/Somnial_Threshold.lua b/scripts/zones/Dynamis-Buburimu/npcs/Somnial_Threshold.lua index 96ce707b48e..2a9d34bf465 100644 --- a/scripts/zones/Dynamis-Buburimu/npcs/Somnial_Threshold.lua +++ b/scripts/zones/Dynamis-Buburimu/npcs/Somnial_Threshold.lua @@ -9,9 +9,6 @@ entity.onTrigger = function(player, npc) xi.dynamis.somnialThresholdOnTrigger(player, npc) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.dynamis.somnialThresholdOnEventFinish(player, csid, option, npc) end diff --git a/scripts/zones/Dynamis-Jeuno/npcs/Somnial_Threshold.lua b/scripts/zones/Dynamis-Jeuno/npcs/Somnial_Threshold.lua index 96ce707b48e..2a9d34bf465 100644 --- a/scripts/zones/Dynamis-Jeuno/npcs/Somnial_Threshold.lua +++ b/scripts/zones/Dynamis-Jeuno/npcs/Somnial_Threshold.lua @@ -9,9 +9,6 @@ entity.onTrigger = function(player, npc) xi.dynamis.somnialThresholdOnTrigger(player, npc) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.dynamis.somnialThresholdOnEventFinish(player, csid, option, npc) end diff --git a/scripts/zones/Dynamis-Qufim/npcs/Somnial_Threshold.lua b/scripts/zones/Dynamis-Qufim/npcs/Somnial_Threshold.lua index 96ce707b48e..2a9d34bf465 100644 --- a/scripts/zones/Dynamis-Qufim/npcs/Somnial_Threshold.lua +++ b/scripts/zones/Dynamis-Qufim/npcs/Somnial_Threshold.lua @@ -9,9 +9,6 @@ entity.onTrigger = function(player, npc) xi.dynamis.somnialThresholdOnTrigger(player, npc) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.dynamis.somnialThresholdOnEventFinish(player, csid, option, npc) end diff --git a/scripts/zones/Dynamis-San_dOria/npcs/Somnial_Threshold.lua b/scripts/zones/Dynamis-San_dOria/npcs/Somnial_Threshold.lua index 96ce707b48e..2a9d34bf465 100644 --- a/scripts/zones/Dynamis-San_dOria/npcs/Somnial_Threshold.lua +++ b/scripts/zones/Dynamis-San_dOria/npcs/Somnial_Threshold.lua @@ -9,9 +9,6 @@ entity.onTrigger = function(player, npc) xi.dynamis.somnialThresholdOnTrigger(player, npc) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.dynamis.somnialThresholdOnEventFinish(player, csid, option, npc) end diff --git a/scripts/zones/Dynamis-Tavnazia/npcs/Somnial_Threshold.lua b/scripts/zones/Dynamis-Tavnazia/npcs/Somnial_Threshold.lua index 96ce707b48e..2a9d34bf465 100644 --- a/scripts/zones/Dynamis-Tavnazia/npcs/Somnial_Threshold.lua +++ b/scripts/zones/Dynamis-Tavnazia/npcs/Somnial_Threshold.lua @@ -9,9 +9,6 @@ entity.onTrigger = function(player, npc) xi.dynamis.somnialThresholdOnTrigger(player, npc) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.dynamis.somnialThresholdOnEventFinish(player, csid, option, npc) end diff --git a/scripts/zones/Dynamis-Valkurm/npcs/Somnial_Threshold.lua b/scripts/zones/Dynamis-Valkurm/npcs/Somnial_Threshold.lua index 96ce707b48e..2a9d34bf465 100644 --- a/scripts/zones/Dynamis-Valkurm/npcs/Somnial_Threshold.lua +++ b/scripts/zones/Dynamis-Valkurm/npcs/Somnial_Threshold.lua @@ -9,9 +9,6 @@ entity.onTrigger = function(player, npc) xi.dynamis.somnialThresholdOnTrigger(player, npc) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.dynamis.somnialThresholdOnEventFinish(player, csid, option, npc) end diff --git a/scripts/zones/Dynamis-Windurst/npcs/Somnial_Threshold.lua b/scripts/zones/Dynamis-Windurst/npcs/Somnial_Threshold.lua index 96ce707b48e..2a9d34bf465 100644 --- a/scripts/zones/Dynamis-Windurst/npcs/Somnial_Threshold.lua +++ b/scripts/zones/Dynamis-Windurst/npcs/Somnial_Threshold.lua @@ -9,9 +9,6 @@ entity.onTrigger = function(player, npc) xi.dynamis.somnialThresholdOnTrigger(player, npc) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.dynamis.somnialThresholdOnEventFinish(player, csid, option, npc) end diff --git a/scripts/zones/Dynamis-Xarcabard/npcs/Somnial_Threshold.lua b/scripts/zones/Dynamis-Xarcabard/npcs/Somnial_Threshold.lua index 96ce707b48e..2a9d34bf465 100644 --- a/scripts/zones/Dynamis-Xarcabard/npcs/Somnial_Threshold.lua +++ b/scripts/zones/Dynamis-Xarcabard/npcs/Somnial_Threshold.lua @@ -9,9 +9,6 @@ entity.onTrigger = function(player, npc) xi.dynamis.somnialThresholdOnTrigger(player, npc) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.dynamis.somnialThresholdOnEventFinish(player, csid, option, npc) end diff --git a/scripts/zones/East_Ronfaure/DefaultActions.lua b/scripts/zones/East_Ronfaure/DefaultActions.lua index 40a80a2dc46..f0adf6436e6 100644 --- a/scripts/zones/East_Ronfaure/DefaultActions.lua +++ b/scripts/zones/East_Ronfaure/DefaultActions.lua @@ -1,6 +1,9 @@ local ID = zones[xi.zone.EAST_RONFAURE] return { - ['Andelain'] = { text = ID.text.ANDELAIN_DIALOG }, - ['Cheval_River'] = { messageSpecial = ID.text.THE_WATER_SPARKLES }, + ['Andelain'] = { text = ID.text.ANDELAIN_DIALOG }, + ['Cheval_River'] = { messageSpecial = ID.text.THE_WATER_SPARKLES }, + ['Croteillard'] = { text = ID.text.CROTEILLARD_DIALOG }, + ['Rayochindot'] = { text = ID.text.RAYOCHINDOT_DIALOG }, + ['Stone_Monument'] = { event = 900 }, } diff --git a/scripts/zones/East_Ronfaure/npcs/Cavernous_Maw.lua b/scripts/zones/East_Ronfaure/npcs/Cavernous_Maw.lua index c45e4009566..7f6fd91cd7c 100644 --- a/scripts/zones/East_Ronfaure/npcs/Cavernous_Maw.lua +++ b/scripts/zones/East_Ronfaure/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/East_Ronfaure/npcs/Croteillard.lua b/scripts/zones/East_Ronfaure/npcs/Croteillard.lua deleted file mode 100644 index af5b38d081c..00000000000 --- a/scripts/zones/East_Ronfaure/npcs/Croteillard.lua +++ /dev/null @@ -1,25 +0,0 @@ ------------------------------------ --- Area: East Ronfaure --- NPC: Croteillard --- Type: Gate Guard --- !pos 87.426 -62.999 266.709 101 ------------------------------------ -local ID = zones[xi.zone.EAST_RONFAURE] ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:showText(npc, ID.text.CROTEILLARD_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/East_Ronfaure/npcs/Field_Manual.lua b/scripts/zones/East_Ronfaure/npcs/Field_Manual.lua index 53d57437713..526d8fa43b4 100644 --- a/scripts/zones/East_Ronfaure/npcs/Field_Manual.lua +++ b/scripts/zones/East_Ronfaure/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/East_Ronfaure/npcs/Geomantic_Reservoir.lua b/scripts/zones/East_Ronfaure/npcs/Geomantic_Reservoir.lua index 7b6de0d67fe..a8cfd8bc8bd 100644 --- a/scripts/zones/East_Ronfaure/npcs/Geomantic_Reservoir.lua +++ b/scripts/zones/East_Ronfaure/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_POISON) 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_POISON) end diff --git a/scripts/zones/East_Ronfaure/npcs/Logging_Point.lua b/scripts/zones/East_Ronfaure/npcs/Logging_Point.lua index 7ddb36e8f5f..7dd5d41ecbd 100644 --- a/scripts/zones/East_Ronfaure/npcs/Logging_Point.lua +++ b/scripts/zones/East_Ronfaure/npcs/Logging_Point.lua @@ -13,10 +13,4 @@ entity.onTrigger = function(player, npc) xi.helm.onTrigger(player, xi.helmType.LOGGING) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/East_Ronfaure/npcs/Rayochindot.lua b/scripts/zones/East_Ronfaure/npcs/Rayochindot.lua deleted file mode 100644 index 3613e4e1ea0..00000000000 --- a/scripts/zones/East_Ronfaure/npcs/Rayochindot.lua +++ /dev/null @@ -1,25 +0,0 @@ ------------------------------------ --- Area: East Ronfaure --- NPC: Rayochindot --- Type: Gate Guard --- !pos 93.159 -62.999 272.601 101 ------------------------------------ -local ID = zones[xi.zone.EAST_RONFAURE] ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:showText(npc, ID.text.RAYOCHINDOT_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/East_Ronfaure/npcs/Signpost.lua b/scripts/zones/East_Ronfaure/npcs/Signpost.lua index 282e9ee0708..f2dda25c48c 100644 --- a/scripts/zones/East_Ronfaure/npcs/Signpost.lua +++ b/scripts/zones/East_Ronfaure/npcs/Signpost.lua @@ -37,9 +37,6 @@ local function isNpcInBounds(npcXpos, npcZpos, signPostTable) return false end -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local xPos = npc:getXPos() local zPos = npc:getZPos() @@ -56,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 == 20 then player:delKeyItem(xi.ki.SCROLL_OF_TREASURE) diff --git a/scripts/zones/East_Ronfaure/npcs/Stone_Monument.lua b/scripts/zones/East_Ronfaure/npcs/Stone_Monument.lua index b1b2f7992b3..884cbb85f9e 100644 --- a/scripts/zones/East_Ronfaure/npcs/Stone_Monument.lua +++ b/scripts/zones/East_Ronfaure/npcs/Stone_Monument.lua @@ -9,10 +9,6 @@ local ID = zones[xi.zone.EAST_RONFAURE] ---@type TNpcEntity local entity = {} -entity.onTrigger = function(player, npc) - player:startEvent(900) -end - entity.onTrade = function(player, npc, trade) if trade:getItemCount() == 1 and @@ -25,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/East_Ronfaure/npcs/Treasure_Casket.lua b/scripts/zones/East_Ronfaure/npcs/Treasure_Casket.lua index 67b477ff880..ae2ce4f2ae3 100644 --- a/scripts/zones/East_Ronfaure/npcs/Treasure_Casket.lua +++ b/scripts/zones/East_Ronfaure/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/East_Ronfaure_[S]/npcs/Cavernous_Maw.lua b/scripts/zones/East_Ronfaure_[S]/npcs/Cavernous_Maw.lua index 30707a0decc..1af0d073934 100644 --- a/scripts/zones/East_Ronfaure_[S]/npcs/Cavernous_Maw.lua +++ b/scripts/zones/East_Ronfaure_[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/East_Ronfaure_[S]/npcs/Logging_Point.lua b/scripts/zones/East_Ronfaure_[S]/npcs/Logging_Point.lua index 5c1b0e3846e..020401e9065 100644 --- a/scripts/zones/East_Ronfaure_[S]/npcs/Logging_Point.lua +++ b/scripts/zones/East_Ronfaure_[S]/npcs/Logging_Point.lua @@ -13,10 +13,4 @@ entity.onTrigger = function(player, npc) xi.helm.onTrigger(player, xi.helmType.LOGGING) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/East_Sarutabaruta/DefaultActions.lua b/scripts/zones/East_Sarutabaruta/DefaultActions.lua index 6aab501cb61..a1b575f50e8 100644 --- a/scripts/zones/East_Sarutabaruta/DefaultActions.lua +++ b/scripts/zones/East_Sarutabaruta/DefaultActions.lua @@ -1,7 +1,11 @@ local ID = zones[xi.zone.EAST_SARUTABARUTA] return { - ['Pore-Ohre'] = { event = 45 }, - ['Quh_Berhuja'] = { text = ID.text.QUH_BERHUJA_DIALOG }, - ['Sama_Gohjima'] = { event = 43 }, + ['Heih_Porhiaap'] = { text = ID.text.HEIH_PORHIAAP_DIALOG }, + ['Kesha_Shopehllok'] = { event = 55 }, + ['Pore-Ohre'] = { event = 45 }, + ['Quh_Berhuja'] = { text = ID.text.QUH_BERHUJA_DIALOG }, + ['Sama_Gohjima'] = { event = 43 }, + ['Stone_Monument'] = { event = 900 }, + ['Taby_Canatahey'] = { text = ID.text.TABY_CANATAHEY_DIALOG }, } diff --git a/scripts/zones/East_Sarutabaruta/npcs/Field_Manual.lua b/scripts/zones/East_Sarutabaruta/npcs/Field_Manual.lua index dcf897315ea..9a3bbb57525 100644 --- a/scripts/zones/East_Sarutabaruta/npcs/Field_Manual.lua +++ b/scripts/zones/East_Sarutabaruta/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/East_Sarutabaruta/npcs/Heih_Porhiaap.lua b/scripts/zones/East_Sarutabaruta/npcs/Heih_Porhiaap.lua deleted file mode 100644 index 5171dcb202e..00000000000 --- a/scripts/zones/East_Sarutabaruta/npcs/Heih_Porhiaap.lua +++ /dev/null @@ -1,24 +0,0 @@ ------------------------------------ --- Area: East Sarutabaruta --- NPC: Heih Porhiaap --- !pos -118.876 -4.088 -515.731 116 ------------------------------------ -local ID = zones[xi.zone.EAST_SARUTABARUTA] ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:showText(npc, ID.text.HEIH_PORHIAAP_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/East_Sarutabaruta/npcs/Kesha_Shopehllok.lua b/scripts/zones/East_Sarutabaruta/npcs/Kesha_Shopehllok.lua deleted file mode 100644 index d13da542c9a..00000000000 --- a/scripts/zones/East_Sarutabaruta/npcs/Kesha_Shopehllok.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: East Sarutabaruta --- NPC: Kesha Shopehllok --- Type: Goldfish Scooping --- !pos -22.316 -2.79 -50.815 116 ------------------------------------ ----@type TNpcEntity -local entity = {} - -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/East_Sarutabaruta/npcs/Signpost.lua b/scripts/zones/East_Sarutabaruta/npcs/Signpost.lua index ac686d9c85d..2573e25e4b1 100644 --- a/scripts/zones/East_Sarutabaruta/npcs/Signpost.lua +++ b/scripts/zones/East_Sarutabaruta/npcs/Signpost.lua @@ -38,9 +38,6 @@ local function isNpcInBounds(npcXpos, npcZpos, signPostTable) return false end -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local xPos = npc:getXPos() local zPos = npc:getZPos() @@ -52,10 +49,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/East_Sarutabaruta/npcs/Stone_Monument.lua b/scripts/zones/East_Sarutabaruta/npcs/Stone_Monument.lua index c09a7d795b5..d8923319e4e 100644 --- a/scripts/zones/East_Sarutabaruta/npcs/Stone_Monument.lua +++ b/scripts/zones/East_Sarutabaruta/npcs/Stone_Monument.lua @@ -9,10 +9,6 @@ local ID = zones[xi.zone.EAST_SARUTABARUTA] ---@type TNpcEntity local entity = {} -entity.onTrigger = function(player, npc) - player:startEvent(900) -end - entity.onTrade = function(player, npc, trade) if trade:getItemCount() == 1 and @@ -25,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/East_Sarutabaruta/npcs/Taby_Canatahey.lua b/scripts/zones/East_Sarutabaruta/npcs/Taby_Canatahey.lua deleted file mode 100644 index a7379c32bb5..00000000000 --- a/scripts/zones/East_Sarutabaruta/npcs/Taby_Canatahey.lua +++ /dev/null @@ -1,24 +0,0 @@ ------------------------------------ --- Area: East Sarutabaruta --- NPC: Taby Canatahey --- !pos -119.119 -4.106 -524.347 116 ------------------------------------ -local ID = zones[xi.zone.EAST_SARUTABARUTA] ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:showText(npc, ID.text.TABY_CANATAHEY_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/East_Sarutabaruta/npcs/Treasure_Casket.lua b/scripts/zones/East_Sarutabaruta/npcs/Treasure_Casket.lua index df3af78068d..dc3eb09c205 100644 --- a/scripts/zones/East_Sarutabaruta/npcs/Treasure_Casket.lua +++ b/scripts/zones/East_Sarutabaruta/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/Eastern_Adoulin/npcs/Auction_Counter.lua b/scripts/zones/Eastern_Adoulin/npcs/Auction_Counter.lua index a85c4a5bc33..c4aafc46c6a 100644 --- a/scripts/zones/Eastern_Adoulin/npcs/Auction_Counter.lua +++ b/scripts/zones/Eastern_Adoulin/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(xi.menuType.AUCTION) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Eastern_Adoulin/npcs/Inthius.lua b/scripts/zones/Eastern_Adoulin/npcs/Inthius.lua index 9669f1e0a71..ffb1cdde490 100644 --- a/scripts/zones/Eastern_Adoulin/npcs/Inthius.lua +++ b/scripts/zones/Eastern_Adoulin/npcs/Inthius.lua @@ -7,17 +7,8 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(4, 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/Eastern_Adoulin/npcs/Octavien.lua b/scripts/zones/Eastern_Adoulin/npcs/Octavien.lua index 7ee5cfc5f92..2498d28e4f2 100644 --- a/scripts/zones/Eastern_Adoulin/npcs/Octavien.lua +++ b/scripts/zones/Eastern_Adoulin/npcs/Octavien.lua @@ -25,9 +25,6 @@ local cotrStates = REWARD_PENDING = 3 } -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) -- CHILDREN OF THE RUNE local cotrQuestStatus = player:getQuestStatus(xi.questLog.ADOULIN, xi.quest.id.adoulin.CHILDREN_OF_THE_RUNE) diff --git a/scripts/zones/Eastern_Adoulin/npcs/Sifa_Alani.lua b/scripts/zones/Eastern_Adoulin/npcs/Sifa_Alani.lua index 6744dfa0fad..55c39bcc65d 100644 --- a/scripts/zones/Eastern_Adoulin/npcs/Sifa_Alani.lua +++ b/scripts/zones/Eastern_Adoulin/npcs/Sifa_Alani.lua @@ -30,9 +30,6 @@ local mapList = { xi.ki.MAP_OF_RAKAZNAR, 2000 }, } -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) -- Event Parameter options: -- 0 : Unknown (Does not appear to impact CS) @@ -59,9 +56,6 @@ entity.onTrigger = function(player, npc) player:startEvent(7530, 0, mapMask, frontierMask, playerBayld) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) local eventOption = bit.band(option, 0xF) local eventSelection = bit.rshift(option, 8) + 1 diff --git a/scripts/zones/Eastern_Adoulin/npcs/Symphonic_Curator.lua b/scripts/zones/Eastern_Adoulin/npcs/Symphonic_Curator.lua index 1f207df2bd3..78532bbf338 100644 --- a/scripts/zones/Eastern_Adoulin/npcs/Symphonic_Curator.lua +++ b/scripts/zones/Eastern_Adoulin/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/Eastern_Adoulin/npcs/Ujlei_Zelekko.lua b/scripts/zones/Eastern_Adoulin/npcs/Ujlei_Zelekko.lua index f4411d4a4dd..4fd67943f9a 100644 --- a/scripts/zones/Eastern_Adoulin/npcs/Ujlei_Zelekko.lua +++ b/scripts/zones/Eastern_Adoulin/npcs/Ujlei_Zelekko.lua @@ -22,9 +22,6 @@ local items = [2308] = { cost = 2000, id = xi.item.CIPHER_OF_MORIMARS_ALTER_EGO }, } -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local active = xi.extravaganza.campaignActive() local bayld = player:getCurrency('bayld') @@ -44,9 +41,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) local bayld = player:getCurrency('bayld') local ID = zones[player:getZoneID()] diff --git a/scripts/zones/Eastern_Altepa_Desert/DefaultActions.lua b/scripts/zones/Eastern_Altepa_Desert/DefaultActions.lua index ade01b2bf52..48e113121c3 100644 --- a/scripts/zones/Eastern_Altepa_Desert/DefaultActions.lua +++ b/scripts/zones/Eastern_Altepa_Desert/DefaultActions.lua @@ -1,6 +1,7 @@ local ID = zones[xi.zone.EASTERN_ALTEPA_DESERT] return { + ['Beastmens_Banner'] = { messageSpecial = ID.text.BEASTMEN_BANNER }, ['Lokpix'] = { event = 24 }, ['qm'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, ['qm2'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, diff --git a/scripts/zones/Eastern_Altepa_Desert/npcs/Beastmens_Banner.lua b/scripts/zones/Eastern_Altepa_Desert/npcs/Beastmens_Banner.lua deleted file mode 100644 index 8733f78520f..00000000000 --- a/scripts/zones/Eastern_Altepa_Desert/npcs/Beastmens_Banner.lua +++ /dev/null @@ -1,24 +0,0 @@ ------------------------------------ --- Area: Eastern Altepa Desert --- NPC: Beastmen_s_Banner --- !pos -257 8 -249 114 ------------------------------------ -local ID = zones[xi.zone.EASTERN_ALTEPA_DESERT] ------------------------------------ ----@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/Eastern_Altepa_Desert/npcs/Eulaclaire.lua b/scripts/zones/Eastern_Altepa_Desert/npcs/Eulaclaire.lua index f12f630af80..a27a52220e7 100644 --- a/scripts/zones/Eastern_Altepa_Desert/npcs/Eulaclaire.lua +++ b/scripts/zones/Eastern_Altepa_Desert/npcs/Eulaclaire.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/Eastern_Altepa_Desert/npcs/Field_Manual.lua b/scripts/zones/Eastern_Altepa_Desert/npcs/Field_Manual.lua index 86ceb618774..dc3b58685c1 100644 --- a/scripts/zones/Eastern_Altepa_Desert/npcs/Field_Manual.lua +++ b/scripts/zones/Eastern_Altepa_Desert/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/Eastern_Altepa_Desert/npcs/Sowande.lua b/scripts/zones/Eastern_Altepa_Desert/npcs/Sowande.lua index 772f51c3fda..7300a56c185 100644 --- a/scripts/zones/Eastern_Altepa_Desert/npcs/Sowande.lua +++ b/scripts/zones/Eastern_Altepa_Desert/npcs/Sowande.lua @@ -10,9 +10,6 @@ local entity = {} local vendorRegion = xi.region.KUZOTZ 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/Eastern_Altepa_Desert/npcs/Telepoint.lua b/scripts/zones/Eastern_Altepa_Desert/npcs/Telepoint.lua index c01d4613622..ceec519d54b 100644 --- a/scripts/zones/Eastern_Altepa_Desert/npcs/Telepoint.lua +++ b/scripts/zones/Eastern_Altepa_Desert/npcs/Telepoint.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 == 1 then npcUtil.giveKeyItem(player, xi.ki.ALTEPA_GATE_CRYSTAL) diff --git a/scripts/zones/Eastern_Altepa_Desert/npcs/Treasure_Casket.lua b/scripts/zones/Eastern_Altepa_Desert/npcs/Treasure_Casket.lua index f3b1c21c05b..16b28021954 100644 --- a/scripts/zones/Eastern_Altepa_Desert/npcs/Treasure_Casket.lua +++ b/scripts/zones/Eastern_Altepa_Desert/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/Eastern_Altepa_Desert/npcs/qm.lua b/scripts/zones/Eastern_Altepa_Desert/npcs/qm.lua index 6fafa12c4f9..6a7d610879d 100644 --- a/scripts/zones/Eastern_Altepa_Desert/npcs/qm.lua +++ b/scripts/zones/Eastern_Altepa_Desert/npcs/qm.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.EASTERN_ALTEPA_DESERT] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local decurioKilled = player:getCharVar('Decurio_I_IIIKilled') @@ -29,10 +26,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/Eastern_Altepa_Desert/npcs/qm2.lua b/scripts/zones/Eastern_Altepa_Desert/npcs/qm2.lua index 2702eeca440..56fbfb89e27 100644 --- a/scripts/zones/Eastern_Altepa_Desert/npcs/qm2.lua +++ b/scripts/zones/Eastern_Altepa_Desert/npcs/qm2.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.EASTERN_ALTEPA_DESERT] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local twentyInPirateYearsCS = player:getCharVar('twentyInPirateYearsCS') local tsuchigumoKilled = player:getCharVar('TsuchigumoKilled') @@ -33,10 +30,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 From 65185939c218b2751f1c2bb86ea4a00f2309d280 Mon Sep 17 00:00:00 2001 From: claywar Date: Sat, 25 Jan 2025 13:16:03 -0500 Subject: [PATCH 4/4] Remove empty NPCs, add Default Actions - Caedarva ~ Chateau Remove unused local in Gusgen Mines "Clay" NPC Fix DefaultActions brace styling in Jugner Forest --- .../zones/Caedarva_Mire/DefaultActions.lua | 7 ++++-- scripts/zones/Caedarva_Mire/npcs/Kwadaaf.lua | 3 --- .../Caedarva_Mire/npcs/Logging_Point.lua | 6 ----- scripts/zones/Caedarva_Mire/npcs/Nahshib.lua | 6 ----- scripts/zones/Caedarva_Mire/npcs/Nareema.lua | 6 ----- scripts/zones/Caedarva_Mire/npcs/Nasheefa.lua | 3 --- scripts/zones/Caedarva_Mire/npcs/Nuimahn.lua | 3 --- .../npcs/Runic_Portal_Azouph.lua | 6 ----- .../npcs/Runic_Portal_Dvucca.lua | 6 ----- .../npcs/Seaprinces_Tombstone.lua | 25 ------------------- scripts/zones/Caedarva_Mire/npcs/Tyamah.lua | 3 --- scripts/zones/Caedarva_Mire/npcs/_270.lua | 9 ------- scripts/zones/Caedarva_Mire/npcs/_271.lua | 9 ------- scripts/zones/Caedarva_Mire/npcs/_272.lua | 3 --- scripts/zones/Caedarva_Mire/npcs/_273.lua | 8 +----- scripts/zones/Caedarva_Mire/npcs/_27a.lua | 6 ----- scripts/zones/Caedarva_Mire/npcs/_27b.lua | 22 ---------------- scripts/zones/Caedarva_Mire/npcs/qm1.lua | 6 ----- scripts/zones/Caedarva_Mire/npcs/qm10.lua | 6 ----- scripts/zones/Caedarva_Mire/npcs/qm2.lua | 6 ----- scripts/zones/Caedarva_Mire/npcs/qm3.lua | 6 ----- scripts/zones/Caedarva_Mire/npcs/qm4.lua | 6 ----- scripts/zones/Caedarva_Mire/npcs/qm5.lua | 25 ------------------- scripts/zones/Caedarva_Mire/npcs/qm8.lua | 9 ------- scripts/zones/Caedarva_Mire/npcs/qm9.lua | 6 ----- .../zones/Cape_Teriggan/DefaultActions.lua | 3 ++- .../Cape_Teriggan/npcs/Beastmens_Banner.lua | 24 ------------------ .../zones/Cape_Teriggan/npcs/Bright_Moon.lua | 3 --- .../zones/Cape_Teriggan/npcs/Field_Manual.lua | 3 --- .../Cape_Teriggan/npcs/Treasure_Casket.lua | 3 --- scripts/zones/Cape_Teriggan/npcs/relic.lua | 3 --- .../Carpenters_Landing/DefaultActions.lua | 5 ++++ .../Carpenters_Landing/npcs/Beugungel.lua | 9 ------- .../zones/Carpenters_Landing/npcs/Chuaie.lua | 23 ----------------- .../Carpenters_Landing/npcs/Cofisephe.lua | 9 ------- .../Carpenters_Landing/npcs/Coupulie.lua | 9 ------- .../Carpenters_Landing/npcs/Felourie.lua | 22 ---------------- .../Carpenters_Landing/npcs/Guilloud.lua | 23 ----------------- .../Carpenters_Landing/npcs/Logging_Point.lua | 6 ----- .../Carpenters_Landing/npcs/Lourdaude.lua | 22 ---------------- .../Carpenters_Landing/npcs/Ratoulle.lua | 23 ----------------- .../zones/Carpenters_Landing/npcs/relic.lua | 3 --- .../zones/Castle_Oztroja/DefaultActions.lua | 2 ++ .../Castle_Oztroja/npcs/Brass_Statue.lua | 3 --- .../Castle_Oztroja/npcs/Daa_Bola_the_Seer.lua | 22 ---------------- .../npcs/Geomantic_Reservoir.lua | 6 ----- scripts/zones/Castle_Oztroja/npcs/Tebhi.lua | 9 ------- .../Castle_Oztroja/npcs/Treasure_Chest.lua | 6 ----- .../Castle_Oztroja/npcs/Treasure_Coffer.lua | 6 ----- scripts/zones/Castle_Oztroja/npcs/_470.lua | 6 ----- scripts/zones/Castle_Oztroja/npcs/_471.lua | 6 ----- scripts/zones/Castle_Oztroja/npcs/_472.lua | 6 ----- scripts/zones/Castle_Oztroja/npcs/_473.lua | 6 ----- scripts/zones/Castle_Oztroja/npcs/_474.lua | 6 ----- scripts/zones/Castle_Oztroja/npcs/_475.lua | 6 ----- scripts/zones/Castle_Oztroja/npcs/_476.lua | 6 ----- scripts/zones/Castle_Oztroja/npcs/_477.lua | 6 ----- scripts/zones/Castle_Oztroja/npcs/_479.lua | 6 ----- scripts/zones/Castle_Oztroja/npcs/_47b.lua | 6 ----- scripts/zones/Castle_Oztroja/npcs/_47c.lua | 6 ----- scripts/zones/Castle_Oztroja/npcs/_47d.lua | 6 ----- scripts/zones/Castle_Oztroja/npcs/_47e.lua | 6 ----- scripts/zones/Castle_Oztroja/npcs/_47f.lua | 6 ----- scripts/zones/Castle_Oztroja/npcs/_47g.lua | 6 ----- scripts/zones/Castle_Oztroja/npcs/_47h.lua | 6 ----- scripts/zones/Castle_Oztroja/npcs/_47i.lua | 6 ----- scripts/zones/Castle_Oztroja/npcs/_47j.lua | 3 --- scripts/zones/Castle_Oztroja/npcs/_47k.lua | 3 --- scripts/zones/Castle_Oztroja/npcs/_47l.lua | 3 --- scripts/zones/Castle_Oztroja/npcs/_47m.lua | 3 --- scripts/zones/Castle_Oztroja/npcs/_47n.lua | 6 ----- scripts/zones/Castle_Oztroja/npcs/_47o.lua | 6 ----- scripts/zones/Castle_Oztroja/npcs/_47p.lua | 6 ----- scripts/zones/Castle_Oztroja/npcs/_47r.lua | 21 ---------------- scripts/zones/Castle_Oztroja/npcs/_47u.lua | 6 ----- scripts/zones/Castle_Oztroja/npcs/_47v.lua | 6 ----- scripts/zones/Castle_Oztroja/npcs/_47w.lua | 6 ----- scripts/zones/Castle_Oztroja/npcs/_47x.lua | 6 ----- scripts/zones/Castle_Oztroja/npcs/_47y.lua | 3 --- scripts/zones/Castle_Oztroja/npcs/_47z.lua | 3 --- scripts/zones/Castle_Oztroja/npcs/_m70.lua | 9 ------- scripts/zones/Castle_Oztroja/npcs/_m71.lua | 9 ------- scripts/zones/Castle_Oztroja/npcs/_m72.lua | 3 --- scripts/zones/Castle_Oztroja/npcs/_m73.lua | 3 --- scripts/zones/Castle_Oztroja/npcs/_m74.lua | 3 --- scripts/zones/Castle_Oztroja/npcs/_m75.lua | 3 --- scripts/zones/Castle_Oztroja/npcs/relic.lua | 3 --- .../zones/Castle_Zvahl_Baileys/npcs/Torch.lua | 9 ------- .../npcs/Treasure_Chest.lua | 6 ----- .../npcs/Treasure_Coffer.lua | 6 ----- .../Castle_Zvahl_Baileys_[S]/npcs/_3u3.lua | 6 ----- .../npcs/Goblin_Footprint.lua | 3 --- .../Castle_Zvahl_Keep/npcs/Treasure_Chest.lua | 6 ----- scripts/zones/Castle_Zvahl_Keep/npcs/_4i5.lua | 3 --- .../npcs/Geomantic_Reservoir.lua | 6 ----- .../Ceizak_Battlegrounds/npcs/qm_mastop.lua | 9 ------- .../Ceizak_Battlegrounds/npcs/qm_supernal.lua | 9 ------- .../Ceizak_Battlegrounds/npcs/qm_taxet.lua | 9 ------- .../npcs/qm_transcendent_s.lua | 9 ------- .../npcs/qm_unfettered.lua | 9 ------- .../zones/Chamber_of_Oracles/npcs/_4o0.lua | 9 ------- .../Chateau_dOraguille/DefaultActions.lua | 11 ++++++++ .../Chateau_dOraguille/npcs/Aladoverre.lua | 21 ---------------- .../Chateau_dOraguille/npcs/Aramaviont.lua | 21 ---------------- .../Chateau_dOraguille/npcs/Atoranne.lua | 21 ---------------- .../npcs/Celebratory_Chest.lua | 9 ------- .../Chateau_dOraguille/npcs/Chaloutte.lua | 23 ----------------- .../Chateau_dOraguille/npcs/Chalvatot.lua | 3 --- .../zones/Chateau_dOraguille/npcs/Cotelle.lua | 21 ---------------- .../zones/Chateau_dOraguille/npcs/Curilla.lua | 3 --- .../zones/Chateau_dOraguille/npcs/Doumina.lua | 21 ---------------- .../zones/Chateau_dOraguille/npcs/Faurie.lua | 6 ----- .../zones/Chateau_dOraguille/npcs/Halver.lua | 6 ----- .../npcs/Matrimonial_Coffer.lua | 6 ----- .../Chateau_dOraguille/npcs/Michilca.lua | 21 ---------------- .../Chateau_dOraguille/npcs/Milchupain.lua | 21 ---------------- .../Chateau_dOraguille/npcs/Mistaravant.lua | 22 ---------------- .../zones/Chateau_dOraguille/npcs/Nachou.lua | 22 ---------------- .../Chateau_dOraguille/npcs/Perfaumand.lua | 6 ----- .../zones/Chateau_dOraguille/npcs/Rahal.lua | 6 ----- .../Chateau_dOraguille/npcs/Tombstone.lua | 23 ----------------- .../zones/Chateau_dOraguille/npcs/_6h0.lua | 6 ----- .../zones/Chateau_dOraguille/npcs/_6h1.lua | 6 ----- scripts/zones/Gusgen_Mines/npcs/Clay.lua | 2 -- .../zones/Jugner_Forest/DefaultActions.lua | 2 +- .../npcs/Cermet_Door.lua | 4 +-- 126 files changed, 29 insertions(+), 1047 deletions(-) delete mode 100644 scripts/zones/Caedarva_Mire/npcs/Seaprinces_Tombstone.lua delete mode 100644 scripts/zones/Caedarva_Mire/npcs/_27b.lua delete mode 100644 scripts/zones/Caedarva_Mire/npcs/qm5.lua delete mode 100644 scripts/zones/Cape_Teriggan/npcs/Beastmens_Banner.lua delete mode 100644 scripts/zones/Carpenters_Landing/npcs/Chuaie.lua delete mode 100644 scripts/zones/Carpenters_Landing/npcs/Felourie.lua delete mode 100644 scripts/zones/Carpenters_Landing/npcs/Guilloud.lua delete mode 100644 scripts/zones/Carpenters_Landing/npcs/Lourdaude.lua delete mode 100644 scripts/zones/Carpenters_Landing/npcs/Ratoulle.lua delete mode 100644 scripts/zones/Castle_Oztroja/npcs/Daa_Bola_the_Seer.lua delete mode 100644 scripts/zones/Castle_Oztroja/npcs/_47r.lua delete mode 100644 scripts/zones/Chateau_dOraguille/npcs/Aladoverre.lua delete mode 100644 scripts/zones/Chateau_dOraguille/npcs/Aramaviont.lua delete mode 100644 scripts/zones/Chateau_dOraguille/npcs/Atoranne.lua delete mode 100644 scripts/zones/Chateau_dOraguille/npcs/Chaloutte.lua delete mode 100644 scripts/zones/Chateau_dOraguille/npcs/Cotelle.lua delete mode 100644 scripts/zones/Chateau_dOraguille/npcs/Doumina.lua delete mode 100644 scripts/zones/Chateau_dOraguille/npcs/Michilca.lua delete mode 100644 scripts/zones/Chateau_dOraguille/npcs/Milchupain.lua delete mode 100644 scripts/zones/Chateau_dOraguille/npcs/Mistaravant.lua delete mode 100644 scripts/zones/Chateau_dOraguille/npcs/Nachou.lua delete mode 100644 scripts/zones/Chateau_dOraguille/npcs/Tombstone.lua diff --git a/scripts/zones/Caedarva_Mire/DefaultActions.lua b/scripts/zones/Caedarva_Mire/DefaultActions.lua index da7c46a2e71..e8170f9e065 100644 --- a/scripts/zones/Caedarva_Mire/DefaultActions.lua +++ b/scripts/zones/Caedarva_Mire/DefaultActions.lua @@ -1,6 +1,9 @@ local ID = zones[xi.zone.CAEDARVA_MIRE] return { - ['Jazaraats_Headstone'] = { messageSpecial = ID.text.JAZARAATS_HEADSTONE }, -- Overwritten In scripts/missions/toau/13_Lost_Kingdom.lua - ['qm12'] = { messageSpecial = ID.text.NOTHING_HAPPENS }, + ['_27b'] = { event = 305 }, + ['Jazaraats_Headstone'] = { messageSpecial = ID.text.JAZARAATS_HEADSTONE }, -- Overwritten In scripts/missions/toau/13_Lost_Kingdom.lua + ['qm5'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, + ['qm12'] = { messageSpecial = ID.text.NOTHING_HAPPENS }, + ['Seaprinces_Tombstone'] = { messageSpecial = ID.text.SEAPRINCES_TOMBSTONE }, } diff --git a/scripts/zones/Caedarva_Mire/npcs/Kwadaaf.lua b/scripts/zones/Caedarva_Mire/npcs/Kwadaaf.lua index 937fefdd6be..58858c4695f 100644 --- a/scripts/zones/Caedarva_Mire/npcs/Kwadaaf.lua +++ b/scripts/zones/Caedarva_Mire/npcs/Kwadaaf.lua @@ -32,9 +32,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 == 223 then player:setPos(-235, -4, 220, 0, 72) diff --git a/scripts/zones/Caedarva_Mire/npcs/Logging_Point.lua b/scripts/zones/Caedarva_Mire/npcs/Logging_Point.lua index e89e6d4e027..e8d1a237ad7 100644 --- a/scripts/zones/Caedarva_Mire/npcs/Logging_Point.lua +++ b/scripts/zones/Caedarva_Mire/npcs/Logging_Point.lua @@ -13,10 +13,4 @@ entity.onTrigger = function(player, npc) xi.helm.onTrigger(player, xi.helmType.LOGGING) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Caedarva_Mire/npcs/Nahshib.lua b/scripts/zones/Caedarva_Mire/npcs/Nahshib.lua index 95dcbb4c58d..4c56f5d8cdd 100644 --- a/scripts/zones/Caedarva_Mire/npcs/Nahshib.lua +++ b/scripts/zones/Caedarva_Mire/npcs/Nahshib.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.CAEDARVA_MIRE] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local toauMission = player:getCurrentMission(xi.mission.log_id.TOAU) @@ -34,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) -- ASSAULT if csid == 148 and option == 1 then diff --git a/scripts/zones/Caedarva_Mire/npcs/Nareema.lua b/scripts/zones/Caedarva_Mire/npcs/Nareema.lua index 78f4af4b0a8..a45f2228fb7 100644 --- a/scripts/zones/Caedarva_Mire/npcs/Nareema.lua +++ b/scripts/zones/Caedarva_Mire/npcs/Nareema.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.CAEDARVA_MIRE] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local toauMission = player:getCurrentMission(xi.mission.log_id.TOAU) @@ -34,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) -- ASSAULT if csid == 149 and option == 1 then diff --git a/scripts/zones/Caedarva_Mire/npcs/Nasheefa.lua b/scripts/zones/Caedarva_Mire/npcs/Nasheefa.lua index 01af619c2c5..b0c589092a7 100644 --- a/scripts/zones/Caedarva_Mire/npcs/Nasheefa.lua +++ b/scripts/zones/Caedarva_Mire/npcs/Nasheefa.lua @@ -32,9 +32,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 == 183 then player:setPos(-219.977, -4, 474.522, 64, 72) -- To Alzadaal Undersea Ruins (R) diff --git a/scripts/zones/Caedarva_Mire/npcs/Nuimahn.lua b/scripts/zones/Caedarva_Mire/npcs/Nuimahn.lua index 01f390c4c63..45ae0cf295c 100644 --- a/scripts/zones/Caedarva_Mire/npcs/Nuimahn.lua +++ b/scripts/zones/Caedarva_Mire/npcs/Nuimahn.lua @@ -32,9 +32,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 == 203 then player:setPos(-515, -6.5, 740, 0, 72) diff --git a/scripts/zones/Caedarva_Mire/npcs/Runic_Portal_Azouph.lua b/scripts/zones/Caedarva_Mire/npcs/Runic_Portal_Azouph.lua index e4ab7554cba..a8c31d4dcde 100644 --- a/scripts/zones/Caedarva_Mire/npcs/Runic_Portal_Azouph.lua +++ b/scripts/zones/Caedarva_Mire/npcs/Runic_Portal_Azouph.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.CAEDARVA_MIRE] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getCurrentMission(xi.mission.log_id.TOAU) >= xi.mission.id.toau.IMMORTAL_SENTRIES 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 option == 1 then if csid == 124 then diff --git a/scripts/zones/Caedarva_Mire/npcs/Runic_Portal_Dvucca.lua b/scripts/zones/Caedarva_Mire/npcs/Runic_Portal_Dvucca.lua index 95ef4865c9b..2b98ec66563 100644 --- a/scripts/zones/Caedarva_Mire/npcs/Runic_Portal_Dvucca.lua +++ b/scripts/zones/Caedarva_Mire/npcs/Runic_Portal_Dvucca.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.CAEDARVA_MIRE] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getCurrentMission(xi.mission.log_id.TOAU) >= xi.mission.id.toau.IMMORTAL_SENTRIES 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 option == 1 then if csid == 125 then diff --git a/scripts/zones/Caedarva_Mire/npcs/Seaprinces_Tombstone.lua b/scripts/zones/Caedarva_Mire/npcs/Seaprinces_Tombstone.lua deleted file mode 100644 index daa1124b964..00000000000 --- a/scripts/zones/Caedarva_Mire/npcs/Seaprinces_Tombstone.lua +++ /dev/null @@ -1,25 +0,0 @@ ------------------------------------ --- Area: Caedarva Mire --- NPC: Seaprince's Tombstone --- Involved in quest: Forging a New Myth --- !pos -433 7 -586 79 ------------------------------------ -local ID = zones[xi.zone.CAEDARVA_MIRE] ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:messageSpecial(ID.text.SEAPRINCES_TOMBSTONE) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Caedarva_Mire/npcs/Tyamah.lua b/scripts/zones/Caedarva_Mire/npcs/Tyamah.lua index f55ac2843a1..d33e727d88c 100644 --- a/scripts/zones/Caedarva_Mire/npcs/Tyamah.lua +++ b/scripts/zones/Caedarva_Mire/npcs/Tyamah.lua @@ -32,9 +32,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 == 163 then player:setPos(-20, -4, 835, 64, 72) diff --git a/scripts/zones/Caedarva_Mire/npcs/_270.lua b/scripts/zones/Caedarva_Mire/npcs/_270.lua index f76739832dd..06cc030438b 100644 --- a/scripts/zones/Caedarva_Mire/npcs/_270.lua +++ b/scripts/zones/Caedarva_Mire/npcs/_270.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.CAEDARVA_MIRE] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:checkDistance(npc) < 3 then if player:getZPos() > -438 then @@ -29,10 +26,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/Caedarva_Mire/npcs/_271.lua b/scripts/zones/Caedarva_Mire/npcs/_271.lua index 2a544a404c2..ad85ad82fcd 100644 --- a/scripts/zones/Caedarva_Mire/npcs/_271.lua +++ b/scripts/zones/Caedarva_Mire/npcs/_271.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.CAEDARVA_MIRE] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:checkDistance(npc) < 3 then if player:getZPos() < -78 then @@ -29,10 +26,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/Caedarva_Mire/npcs/_272.lua b/scripts/zones/Caedarva_Mire/npcs/_272.lua index 12d580ddb7e..ce887fab74a 100644 --- a/scripts/zones/Caedarva_Mire/npcs/_272.lua +++ b/scripts/zones/Caedarva_Mire/npcs/_272.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.CAEDARVA_MIRE] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if not xi.instance.onTrigger(player, npc, xi.zone.LEUJAOAM_SANCTUM) then player:messageSpecial(ID.text.NOTHING_HAPPENS) diff --git a/scripts/zones/Caedarva_Mire/npcs/_273.lua b/scripts/zones/Caedarva_Mire/npcs/_273.lua index 83fa8e72d85..23fd9782511 100644 --- a/scripts/zones/Caedarva_Mire/npcs/_273.lua +++ b/scripts/zones/Caedarva_Mire/npcs/_273.lua @@ -8,14 +8,8 @@ local ID = zones[xi.zone.CAEDARVA_MIRE] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) ---[[ if player:hasKeyItem(xi.ki.PERIQIA_ASSAULT_AREA_ENTRY_PERMIT) then - player:setCharVar('ShadesOfVengeance', 1) - player:startEvent(143, 79, -6, 0, 99, 3, 0) - else]]if not xi.instance.onTrigger(player, npc, xi.zone.PERIQIA) then + if not xi.instance.onTrigger(player, npc, xi.zone.PERIQIA) then player:messageSpecial(ID.text.NOTHING_HAPPENS) end end diff --git a/scripts/zones/Caedarva_Mire/npcs/_27a.lua b/scripts/zones/Caedarva_Mire/npcs/_27a.lua index 27a14b651af..37d809f1638 100644 --- a/scripts/zones/Caedarva_Mire/npcs/_27a.lua +++ b/scripts/zones/Caedarva_Mire/npcs/_27a.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:hasKeyItem(xi.ki.CYAN_DEEP_SALT) then player:startEvent(304) @@ -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 == 304 and option == 1 then player:delKeyItem(xi.ki.CYAN_DEEP_SALT) diff --git a/scripts/zones/Caedarva_Mire/npcs/_27b.lua b/scripts/zones/Caedarva_Mire/npcs/_27b.lua deleted file mode 100644 index 9837b77f1e8..00000000000 --- a/scripts/zones/Caedarva_Mire/npcs/_27b.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Caedarva Mire --- NPC: Engraved Tablet --- !pos -719 -13 765 79 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(305) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Caedarva_Mire/npcs/qm1.lua b/scripts/zones/Caedarva_Mire/npcs/qm1.lua index 6f060e2ab7d..33028f4dd1e 100644 --- a/scripts/zones/Caedarva_Mire/npcs/qm1.lua +++ b/scripts/zones/Caedarva_Mire/npcs/qm1.lua @@ -22,10 +22,4 @@ entity.onTrigger = function(player, npc) player:messageSpecial(ID.text.SICKLY_SWEET) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Caedarva_Mire/npcs/qm10.lua b/scripts/zones/Caedarva_Mire/npcs/qm10.lua index 926f0b71c17..7a523dc4a1b 100644 --- a/scripts/zones/Caedarva_Mire/npcs/qm10.lua +++ b/scripts/zones/Caedarva_Mire/npcs/qm10.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.CAEDARVA_MIRE] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local operationTeatime = player:getQuestStatus(xi.questLog.AHT_URHGAN, xi.quest.id.ahtUrhgan.OPERATION_TEATIME) local operationTeatimeProgress = player:getCharVar('OperationTeatimeProgress') @@ -26,9 +23,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 == 15 then npcUtil.completeQuest(player, xi.questLog.AHT_URHGAN, xi.quest.id.ahtUrhgan.OPERATION_TEATIME, { item = 15602, var = 'OperationTeatimeProgress' }) diff --git a/scripts/zones/Caedarva_Mire/npcs/qm2.lua b/scripts/zones/Caedarva_Mire/npcs/qm2.lua index 1b2a4b39150..6f40512013c 100644 --- a/scripts/zones/Caedarva_Mire/npcs/qm2.lua +++ b/scripts/zones/Caedarva_Mire/npcs/qm2.lua @@ -22,10 +22,4 @@ entity.onTrigger = function(player, npc) player:messageSpecial(ID.text.SHED_LEAVES) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Caedarva_Mire/npcs/qm3.lua b/scripts/zones/Caedarva_Mire/npcs/qm3.lua index 67caa57b9a6..67a1eaa5203 100644 --- a/scripts/zones/Caedarva_Mire/npcs/qm3.lua +++ b/scripts/zones/Caedarva_Mire/npcs/qm3.lua @@ -22,10 +22,4 @@ entity.onTrigger = function(player, npc) player:messageSpecial(ID.text.SHREDDED_SCRAPS) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Caedarva_Mire/npcs/qm4.lua b/scripts/zones/Caedarva_Mire/npcs/qm4.lua index abee3f72670..86e1e1830dd 100644 --- a/scripts/zones/Caedarva_Mire/npcs/qm4.lua +++ b/scripts/zones/Caedarva_Mire/npcs/qm4.lua @@ -22,10 +22,4 @@ entity.onTrigger = function(player, npc) player:messageSpecial(ID.text.STIFLING_STENCH) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Caedarva_Mire/npcs/qm5.lua b/scripts/zones/Caedarva_Mire/npcs/qm5.lua deleted file mode 100644 index d956407160a..00000000000 --- a/scripts/zones/Caedarva_Mire/npcs/qm5.lua +++ /dev/null @@ -1,25 +0,0 @@ ------------------------------------ --- Area: Caedarva Mire --- NPC: qm5 --- Involved in quest: Get the Picture --- !pos -389 6 -597 79 ------------------------------------ -local ID = zones[xi.zone.CAEDARVA_MIRE] ------------------------------------ ----@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/Caedarva_Mire/npcs/qm8.lua b/scripts/zones/Caedarva_Mire/npcs/qm8.lua index fae9befa9a8..41e44437cb0 100644 --- a/scripts/zones/Caedarva_Mire/npcs/qm8.lua +++ b/scripts/zones/Caedarva_Mire/npcs/qm8.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.CAEDARVA_MIRE] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getCharVar('[TIMER]Lamian_Fang_Key') ~= VanadielDayOfTheYear() then if npcUtil.giveItem(player, xi.item.LAMIAN_FANG_KEY) 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/Caedarva_Mire/npcs/qm9.lua b/scripts/zones/Caedarva_Mire/npcs/qm9.lua index 4ee494fe0e2..60618e5d5b6 100644 --- a/scripts/zones/Caedarva_Mire/npcs/qm9.lua +++ b/scripts/zones/Caedarva_Mire/npcs/qm9.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.CAEDARVA_MIRE] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local theWaywardAutomaton = player:getQuestStatus(xi.questLog.AHT_URHGAN, xi.quest.id.ahtUrhgan.THE_WAYWARD_AUTOMATON) local theWaywardAutomatonProgress = player:getCharVar('TheWaywardAutomatonProgress') @@ -30,9 +27,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 == 14 then player:setCharVar('TheWaywardAutomatonProgress', 3) diff --git a/scripts/zones/Cape_Teriggan/DefaultActions.lua b/scripts/zones/Cape_Teriggan/DefaultActions.lua index 2914ec46fdc..87a8d0b7e3c 100644 --- a/scripts/zones/Cape_Teriggan/DefaultActions.lua +++ b/scripts/zones/Cape_Teriggan/DefaultActions.lua @@ -1,6 +1,7 @@ local ID = zones[xi.zone.CAPE_TERIGGAN] return { - ['qm1'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, + ['Beastmens_Banner'] = { messageSpecial = ID.text.BEASTMEN_BANNER }, ['Cermet_Headstone'] = { messageSpecial = ID.text.CANNOT_REMOVE_FRAG }, + ['qm1'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, } diff --git a/scripts/zones/Cape_Teriggan/npcs/Beastmens_Banner.lua b/scripts/zones/Cape_Teriggan/npcs/Beastmens_Banner.lua deleted file mode 100644 index 64e98bcb07c..00000000000 --- a/scripts/zones/Cape_Teriggan/npcs/Beastmens_Banner.lua +++ /dev/null @@ -1,24 +0,0 @@ ------------------------------------ --- Area: Cape_Teriggan --- NPC: Beastmen_s_Banner --- !pos 162.059 -0.859 250.538 113 ------------------------------------ -local ID = zones[xi.zone.CAPE_TERIGGAN] ------------------------------------ ----@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/Cape_Teriggan/npcs/Bright_Moon.lua b/scripts/zones/Cape_Teriggan/npcs/Bright_Moon.lua index 8457eb04415..211a005098f 100644 --- a/scripts/zones/Cape_Teriggan/npcs/Bright_Moon.lua +++ b/scripts/zones/Cape_Teriggan/npcs/Bright_Moon.lua @@ -10,9 +10,6 @@ local entity = {} local vendorRegion = xi.region.VOLLBOW 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/Cape_Teriggan/npcs/Field_Manual.lua b/scripts/zones/Cape_Teriggan/npcs/Field_Manual.lua index 173b85c4475..1f6f582199b 100644 --- a/scripts/zones/Cape_Teriggan/npcs/Field_Manual.lua +++ b/scripts/zones/Cape_Teriggan/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/Cape_Teriggan/npcs/Treasure_Casket.lua b/scripts/zones/Cape_Teriggan/npcs/Treasure_Casket.lua index fa98f7500be..2b93ed19db3 100644 --- a/scripts/zones/Cape_Teriggan/npcs/Treasure_Casket.lua +++ b/scripts/zones/Cape_Teriggan/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/Cape_Teriggan/npcs/relic.lua b/scripts/zones/Cape_Teriggan/npcs/relic.lua index b584d3c2f54..241ebc9b03d 100644 --- a/scripts/zones/Cape_Teriggan/npcs/relic.lua +++ b/scripts/zones/Cape_Teriggan/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 == 18 and diff --git a/scripts/zones/Carpenters_Landing/DefaultActions.lua b/scripts/zones/Carpenters_Landing/DefaultActions.lua index 193b3f06538..54ff24deba6 100644 --- a/scripts/zones/Carpenters_Landing/DefaultActions.lua +++ b/scripts/zones/Carpenters_Landing/DefaultActions.lua @@ -2,6 +2,11 @@ local ID = zones[xi.zone.CARPENTERS_LANDING] return { ['Anguenet'] = { event = 21 }, + ['Chuaie'] = { event = 18 }, + ['Felourie'] = { event = 20 }, + ['Guilloud'] = { event = 1 }, + ['Lourdaude'] = { event = 26 }, ['qm_cryptonberries'] = { messageSpecial = ID.text.CRYPTONBERRY_FALLEN_TREE }, ['qm_para'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, + ['Ratoulle'] = { event = 19 }, } diff --git a/scripts/zones/Carpenters_Landing/npcs/Beugungel.lua b/scripts/zones/Carpenters_Landing/npcs/Beugungel.lua index 7e3d915beb4..707977fae2a 100644 --- a/scripts/zones/Carpenters_Landing/npcs/Beugungel.lua +++ b/scripts/zones/Carpenters_Landing/npcs/Beugungel.lua @@ -9,19 +9,10 @@ local ID = zones[xi.zone.CARPENTERS_LANDING] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:sendGuild(534, 5, 22, 0) then player:showText(npc, ID.text.BEUGUNGEL_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/Carpenters_Landing/npcs/Chuaie.lua b/scripts/zones/Carpenters_Landing/npcs/Chuaie.lua deleted file mode 100644 index 63a5087aba7..00000000000 --- a/scripts/zones/Carpenters_Landing/npcs/Chuaie.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Carpenters' Landing --- NPC: Chuaie --- Type: Adventurer's Assistant --- !pos 231.384 -3 -531.830 2 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(18) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Carpenters_Landing/npcs/Cofisephe.lua b/scripts/zones/Carpenters_Landing/npcs/Cofisephe.lua index 9f4891f9c98..a88376b48e6 100644 --- a/scripts/zones/Carpenters_Landing/npcs/Cofisephe.lua +++ b/scripts/zones/Carpenters_Landing/npcs/Cofisephe.lua @@ -7,17 +7,8 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(31, 618, 652, 50, 300) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Carpenters_Landing/npcs/Coupulie.lua b/scripts/zones/Carpenters_Landing/npcs/Coupulie.lua index 494c3b6249b..10ae045c1dc 100644 --- a/scripts/zones/Carpenters_Landing/npcs/Coupulie.lua +++ b/scripts/zones/Carpenters_Landing/npcs/Coupulie.lua @@ -6,17 +6,8 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(32, 618, 652, 50, 300) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Carpenters_Landing/npcs/Felourie.lua b/scripts/zones/Carpenters_Landing/npcs/Felourie.lua deleted file mode 100644 index 922e14e0f84..00000000000 --- a/scripts/zones/Carpenters_Landing/npcs/Felourie.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Carpenters' Landing --- NPC: Felourie --- !pos -300.134 -2.999 505.016 2 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(20) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Carpenters_Landing/npcs/Guilloud.lua b/scripts/zones/Carpenters_Landing/npcs/Guilloud.lua deleted file mode 100644 index 2ddcccc0cba..00000000000 --- a/scripts/zones/Carpenters_Landing/npcs/Guilloud.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Carpenters' Landing --- NPC: Guilloud --- Involved with mission "The Road Forks" --- !pos -123.770 -6.654 -469.062 2 ------------------------------------ ----@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) -end - -return entity diff --git a/scripts/zones/Carpenters_Landing/npcs/Logging_Point.lua b/scripts/zones/Carpenters_Landing/npcs/Logging_Point.lua index f36555774e8..0672889ccf7 100644 --- a/scripts/zones/Carpenters_Landing/npcs/Logging_Point.lua +++ b/scripts/zones/Carpenters_Landing/npcs/Logging_Point.lua @@ -13,10 +13,4 @@ entity.onTrigger = function(player, npc) xi.helm.onTrigger(player, xi.helmType.LOGGING) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Carpenters_Landing/npcs/Lourdaude.lua b/scripts/zones/Carpenters_Landing/npcs/Lourdaude.lua deleted file mode 100644 index c7c9d34ff03..00000000000 --- a/scripts/zones/Carpenters_Landing/npcs/Lourdaude.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Carpenters' Landing --- NPC: Lourdaude --- !pos 215.597 -2.689 -526.021 2 ------------------------------------ ----@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/Carpenters_Landing/npcs/Ratoulle.lua b/scripts/zones/Carpenters_Landing/npcs/Ratoulle.lua deleted file mode 100644 index b454e4bc5d0..00000000000 --- a/scripts/zones/Carpenters_Landing/npcs/Ratoulle.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Carpenters' Landing --- NPC: Ratoulle --- Type: Adventurer's Assistant --- !pos -133.959 -3 60.839 2 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(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/Carpenters_Landing/npcs/relic.lua b/scripts/zones/Carpenters_Landing/npcs/relic.lua index c9d1257e06d..bbe4115c3fd 100644 --- a/scripts/zones/Carpenters_Landing/npcs/relic.lua +++ b/scripts/zones/Carpenters_Landing/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 == 44 and diff --git a/scripts/zones/Castle_Oztroja/DefaultActions.lua b/scripts/zones/Castle_Oztroja/DefaultActions.lua index e1c1507ee82..e32001726b4 100644 --- a/scripts/zones/Castle_Oztroja/DefaultActions.lua +++ b/scripts/zones/Castle_Oztroja/DefaultActions.lua @@ -1,6 +1,8 @@ local ID = zones[xi.zone.CASTLE_OZTROJA] return { + ['_47r'] = { messageSpecial = ID.text.PROBABLY_WORKS_WITH_SOMETHING_ELSE }, + ['Daa_Bola_the_Seer'] = { event = 86 }, ['Kaa_Toru_the_Just'] = { event = 46 }, ['qm_truestrength'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, ['qm2'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, diff --git a/scripts/zones/Castle_Oztroja/npcs/Brass_Statue.lua b/scripts/zones/Castle_Oztroja/npcs/Brass_Statue.lua index aab11a6e0da..c4f3e272c4f 100644 --- a/scripts/zones/Castle_Oztroja/npcs/Brass_Statue.lua +++ b/scripts/zones/Castle_Oztroja/npcs/Brass_Statue.lua @@ -25,9 +25,6 @@ local passwordTable = [8] = { [1] = { 17, 'Mjuu' }, [2] = { 19, 'Ouzi' }, [3] = { 23, 'Buxu' } }, } -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local statue = npc:getID() local passwordIndex = GetNPCByID(ID.npc.TRAP_DOOR_FLOOR_4):getLocalVar('password') diff --git a/scripts/zones/Castle_Oztroja/npcs/Daa_Bola_the_Seer.lua b/scripts/zones/Castle_Oztroja/npcs/Daa_Bola_the_Seer.lua deleted file mode 100644 index bcb4609400c..00000000000 --- a/scripts/zones/Castle_Oztroja/npcs/Daa_Bola_the_Seer.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Castle Oztroja --- NPC: Daa Bola the Seer --- !pos -157.978 -18.179 193.458 151 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(86) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Castle_Oztroja/npcs/Geomantic_Reservoir.lua b/scripts/zones/Castle_Oztroja/npcs/Geomantic_Reservoir.lua index d2357b6da02..e96391ce46f 100644 --- a/scripts/zones/Castle_Oztroja/npcs/Geomantic_Reservoir.lua +++ b/scripts/zones/Castle_Oztroja/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_AGI) 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_AGI) end diff --git a/scripts/zones/Castle_Oztroja/npcs/Tebhi.lua b/scripts/zones/Castle_Oztroja/npcs/Tebhi.lua index feae6d11025..64040ae7200 100644 --- a/scripts/zones/Castle_Oztroja/npcs/Tebhi.lua +++ b/scripts/zones/Castle_Oztroja/npcs/Tebhi.lua @@ -17,13 +17,4 @@ 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) -end - return entity diff --git a/scripts/zones/Castle_Oztroja/npcs/Treasure_Chest.lua b/scripts/zones/Castle_Oztroja/npcs/Treasure_Chest.lua index 4d1845e5f95..31ef37000ad 100644 --- a/scripts/zones/Castle_Oztroja/npcs/Treasure_Chest.lua +++ b/scripts/zones/Castle_Oztroja/npcs/Treasure_Chest.lua @@ -15,10 +15,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/Castle_Oztroja/npcs/Treasure_Coffer.lua b/scripts/zones/Castle_Oztroja/npcs/Treasure_Coffer.lua index 16eae906e6f..4d3347b48c7 100644 --- a/scripts/zones/Castle_Oztroja/npcs/Treasure_Coffer.lua +++ b/scripts/zones/Castle_Oztroja/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/Castle_Oztroja/npcs/_470.lua b/scripts/zones/Castle_Oztroja/npcs/_470.lua index 6ad11e302c4..912899a690f 100644 --- a/scripts/zones/Castle_Oztroja/npcs/_470.lua +++ b/scripts/zones/Castle_Oztroja/npcs/_470.lua @@ -15,10 +15,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/Castle_Oztroja/npcs/_471.lua b/scripts/zones/Castle_Oztroja/npcs/_471.lua index 54792b448c5..71e7434714e 100644 --- a/scripts/zones/Castle_Oztroja/npcs/_471.lua +++ b/scripts/zones/Castle_Oztroja/npcs/_471.lua @@ -15,10 +15,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/Castle_Oztroja/npcs/_472.lua b/scripts/zones/Castle_Oztroja/npcs/_472.lua index 4d3cfbb8f19..cc7bad88ab4 100644 --- a/scripts/zones/Castle_Oztroja/npcs/_472.lua +++ b/scripts/zones/Castle_Oztroja/npcs/_472.lua @@ -15,10 +15,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/Castle_Oztroja/npcs/_473.lua b/scripts/zones/Castle_Oztroja/npcs/_473.lua index fcb658e4d97..8ebe9992c71 100644 --- a/scripts/zones/Castle_Oztroja/npcs/_473.lua +++ b/scripts/zones/Castle_Oztroja/npcs/_473.lua @@ -15,10 +15,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/Castle_Oztroja/npcs/_474.lua b/scripts/zones/Castle_Oztroja/npcs/_474.lua index 3c74a32bc06..cb652773591 100644 --- a/scripts/zones/Castle_Oztroja/npcs/_474.lua +++ b/scripts/zones/Castle_Oztroja/npcs/_474.lua @@ -15,10 +15,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/Castle_Oztroja/npcs/_475.lua b/scripts/zones/Castle_Oztroja/npcs/_475.lua index d3201b301e6..fb3cf4bef12 100644 --- a/scripts/zones/Castle_Oztroja/npcs/_475.lua +++ b/scripts/zones/Castle_Oztroja/npcs/_475.lua @@ -15,10 +15,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/Castle_Oztroja/npcs/_476.lua b/scripts/zones/Castle_Oztroja/npcs/_476.lua index 33320512f28..212d89eb8fc 100644 --- a/scripts/zones/Castle_Oztroja/npcs/_476.lua +++ b/scripts/zones/Castle_Oztroja/npcs/_476.lua @@ -10,10 +10,4 @@ entity.onTrigger = function(player, npc) npc:openDoor(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/Castle_Oztroja/npcs/_477.lua b/scripts/zones/Castle_Oztroja/npcs/_477.lua index 087f3457d49..b81be0fac2f 100644 --- a/scripts/zones/Castle_Oztroja/npcs/_477.lua +++ b/scripts/zones/Castle_Oztroja/npcs/_477.lua @@ -15,10 +15,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/Castle_Oztroja/npcs/_479.lua b/scripts/zones/Castle_Oztroja/npcs/_479.lua index 2ff9c227bc3..f1d595f9ab1 100644 --- a/scripts/zones/Castle_Oztroja/npcs/_479.lua +++ b/scripts/zones/Castle_Oztroja/npcs/_479.lua @@ -30,10 +30,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/Castle_Oztroja/npcs/_47b.lua b/scripts/zones/Castle_Oztroja/npcs/_47b.lua index 28dc5f54bed..2b8670fe91b 100644 --- a/scripts/zones/Castle_Oztroja/npcs/_47b.lua +++ b/scripts/zones/Castle_Oztroja/npcs/_47b.lua @@ -49,10 +49,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/Castle_Oztroja/npcs/_47c.lua b/scripts/zones/Castle_Oztroja/npcs/_47c.lua index f1506f10321..370d32f6cb3 100644 --- a/scripts/zones/Castle_Oztroja/npcs/_47c.lua +++ b/scripts/zones/Castle_Oztroja/npcs/_47c.lua @@ -49,10 +49,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/Castle_Oztroja/npcs/_47d.lua b/scripts/zones/Castle_Oztroja/npcs/_47d.lua index 54844c7e38d..8b49974a521 100644 --- a/scripts/zones/Castle_Oztroja/npcs/_47d.lua +++ b/scripts/zones/Castle_Oztroja/npcs/_47d.lua @@ -19,10 +19,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/Castle_Oztroja/npcs/_47e.lua b/scripts/zones/Castle_Oztroja/npcs/_47e.lua index f2dd3bc3cc8..b6e5e43ede6 100644 --- a/scripts/zones/Castle_Oztroja/npcs/_47e.lua +++ b/scripts/zones/Castle_Oztroja/npcs/_47e.lua @@ -22,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/Castle_Oztroja/npcs/_47f.lua b/scripts/zones/Castle_Oztroja/npcs/_47f.lua index d6f30a765af..c32f93404fb 100644 --- a/scripts/zones/Castle_Oztroja/npcs/_47f.lua +++ b/scripts/zones/Castle_Oztroja/npcs/_47f.lua @@ -13,10 +13,4 @@ entity.onTrigger = function(player, npc) oztrojaGlobal.handleOnTrigger(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/Castle_Oztroja/npcs/_47g.lua b/scripts/zones/Castle_Oztroja/npcs/_47g.lua index 81386cf91e9..a42972e5c74 100644 --- a/scripts/zones/Castle_Oztroja/npcs/_47g.lua +++ b/scripts/zones/Castle_Oztroja/npcs/_47g.lua @@ -13,10 +13,4 @@ entity.onTrigger = function(player, npc) oztrojaGlobal.handleOnTrigger(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/Castle_Oztroja/npcs/_47h.lua b/scripts/zones/Castle_Oztroja/npcs/_47h.lua index 6a92fe4879c..934a101705b 100644 --- a/scripts/zones/Castle_Oztroja/npcs/_47h.lua +++ b/scripts/zones/Castle_Oztroja/npcs/_47h.lua @@ -13,10 +13,4 @@ entity.onTrigger = function(player, npc) oztrojaGlobal.handleOnTrigger(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/Castle_Oztroja/npcs/_47i.lua b/scripts/zones/Castle_Oztroja/npcs/_47i.lua index 0e2b1cbe4eb..f6a0a7f6ce8 100644 --- a/scripts/zones/Castle_Oztroja/npcs/_47i.lua +++ b/scripts/zones/Castle_Oztroja/npcs/_47i.lua @@ -13,10 +13,4 @@ entity.onTrigger = function(player, npc) oztrojaGlobal.handleOnTrigger(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/Castle_Oztroja/npcs/_47j.lua b/scripts/zones/Castle_Oztroja/npcs/_47j.lua index 7343417ac87..9f71fdf2147 100644 --- a/scripts/zones/Castle_Oztroja/npcs/_47j.lua +++ b/scripts/zones/Castle_Oztroja/npcs/_47j.lua @@ -21,9 +21,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) local brassDoor = GetNPCByID(ID.npc.FIRST_PASSWORD_STATUE - 2) local torch1 = GetNPCByID(ID.npc.FIRST_PASSWORD_STATUE + 1) diff --git a/scripts/zones/Castle_Oztroja/npcs/_47k.lua b/scripts/zones/Castle_Oztroja/npcs/_47k.lua index 378ca9a90b0..9975d9048bd 100644 --- a/scripts/zones/Castle_Oztroja/npcs/_47k.lua +++ b/scripts/zones/Castle_Oztroja/npcs/_47k.lua @@ -21,9 +21,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) local brassDoor = GetNPCByID(ID.npc.FIRST_PASSWORD_STATUE - 2) local torch1 = GetNPCByID(ID.npc.FIRST_PASSWORD_STATUE + 1) diff --git a/scripts/zones/Castle_Oztroja/npcs/_47l.lua b/scripts/zones/Castle_Oztroja/npcs/_47l.lua index e2d94ad5878..2e08615aad6 100644 --- a/scripts/zones/Castle_Oztroja/npcs/_47l.lua +++ b/scripts/zones/Castle_Oztroja/npcs/_47l.lua @@ -21,9 +21,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) local brassDoor = GetNPCByID(ID.npc.SECOND_PASSWORD_STATUE - 2) local torch1 = GetNPCByID(ID.npc.SECOND_PASSWORD_STATUE + 1) diff --git a/scripts/zones/Castle_Oztroja/npcs/_47m.lua b/scripts/zones/Castle_Oztroja/npcs/_47m.lua index 20675cb8f65..a19c8e21c1a 100644 --- a/scripts/zones/Castle_Oztroja/npcs/_47m.lua +++ b/scripts/zones/Castle_Oztroja/npcs/_47m.lua @@ -21,9 +21,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) local brassDoor = GetNPCByID(ID.npc.SECOND_PASSWORD_STATUE - 2) local torch1 = GetNPCByID(ID.npc.SECOND_PASSWORD_STATUE + 1) diff --git a/scripts/zones/Castle_Oztroja/npcs/_47n.lua b/scripts/zones/Castle_Oztroja/npcs/_47n.lua index 3d6f201206c..c6266ce9a6e 100644 --- a/scripts/zones/Castle_Oztroja/npcs/_47n.lua +++ b/scripts/zones/Castle_Oztroja/npcs/_47n.lua @@ -10,10 +10,4 @@ entity.onTrigger = function(player, npc) npc:openDoor(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/Castle_Oztroja/npcs/_47o.lua b/scripts/zones/Castle_Oztroja/npcs/_47o.lua index d200f347f4a..3bcefad51ea 100644 --- a/scripts/zones/Castle_Oztroja/npcs/_47o.lua +++ b/scripts/zones/Castle_Oztroja/npcs/_47o.lua @@ -10,10 +10,4 @@ entity.onTrigger = function(player, npc) npc:openDoor(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/Castle_Oztroja/npcs/_47p.lua b/scripts/zones/Castle_Oztroja/npcs/_47p.lua index fd33e6449ef..03a9a9809b1 100644 --- a/scripts/zones/Castle_Oztroja/npcs/_47p.lua +++ b/scripts/zones/Castle_Oztroja/npcs/_47p.lua @@ -22,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/Castle_Oztroja/npcs/_47r.lua b/scripts/zones/Castle_Oztroja/npcs/_47r.lua deleted file mode 100644 index 96605b5d55c..00000000000 --- a/scripts/zones/Castle_Oztroja/npcs/_47r.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Castle Oztroja --- NPC: _47r --- !pos 20.000 24.168 -25.000 151 ------------------------------------ -local ID = zones[xi.zone.CASTLE_OZTROJA] ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrigger = function(player, npc) - player:messageSpecial(ID.text.PROBABLY_WORKS_WITH_SOMETHING_ELSE) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Castle_Oztroja/npcs/_47u.lua b/scripts/zones/Castle_Oztroja/npcs/_47u.lua index 0d3e007e1a6..ea43e27c994 100644 --- a/scripts/zones/Castle_Oztroja/npcs/_47u.lua +++ b/scripts/zones/Castle_Oztroja/npcs/_47u.lua @@ -22,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/Castle_Oztroja/npcs/_47v.lua b/scripts/zones/Castle_Oztroja/npcs/_47v.lua index e42e249ac2a..1ed8adc214a 100644 --- a/scripts/zones/Castle_Oztroja/npcs/_47v.lua +++ b/scripts/zones/Castle_Oztroja/npcs/_47v.lua @@ -22,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/Castle_Oztroja/npcs/_47w.lua b/scripts/zones/Castle_Oztroja/npcs/_47w.lua index ada82662a36..7081477fd5f 100644 --- a/scripts/zones/Castle_Oztroja/npcs/_47w.lua +++ b/scripts/zones/Castle_Oztroja/npcs/_47w.lua @@ -22,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/Castle_Oztroja/npcs/_47x.lua b/scripts/zones/Castle_Oztroja/npcs/_47x.lua index 983e1225055..52fbd7bdb11 100644 --- a/scripts/zones/Castle_Oztroja/npcs/_47x.lua +++ b/scripts/zones/Castle_Oztroja/npcs/_47x.lua @@ -22,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/Castle_Oztroja/npcs/_47y.lua b/scripts/zones/Castle_Oztroja/npcs/_47y.lua index a163585891e..b993bd54007 100644 --- a/scripts/zones/Castle_Oztroja/npcs/_47y.lua +++ b/scripts/zones/Castle_Oztroja/npcs/_47y.lua @@ -21,9 +21,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) local brassDoor = GetNPCByID(ID.npc.THIRD_PASSWORD_STATUE - 2) local torch1 = GetNPCByID(ID.npc.THIRD_PASSWORD_STATUE + 1) diff --git a/scripts/zones/Castle_Oztroja/npcs/_47z.lua b/scripts/zones/Castle_Oztroja/npcs/_47z.lua index 1a655c8a644..72b48832d65 100644 --- a/scripts/zones/Castle_Oztroja/npcs/_47z.lua +++ b/scripts/zones/Castle_Oztroja/npcs/_47z.lua @@ -21,9 +21,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) local brassDoor = GetNPCByID(ID.npc.THIRD_PASSWORD_STATUE - 2) local torch1 = GetNPCByID(ID.npc.THIRD_PASSWORD_STATUE + 1) diff --git a/scripts/zones/Castle_Oztroja/npcs/_m70.lua b/scripts/zones/Castle_Oztroja/npcs/_m70.lua index 673701c4b87..5eafdbc92a9 100644 --- a/scripts/zones/Castle_Oztroja/npcs/_m70.lua +++ b/scripts/zones/Castle_Oztroja/npcs/_m70.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.CASTLE_OZTROJA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:hasKeyItem(xi.ki.YAGUDO_TORCH) then player:startEvent(11) @@ -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/Castle_Oztroja/npcs/_m71.lua b/scripts/zones/Castle_Oztroja/npcs/_m71.lua index acaf2d84ec2..bf43f6a3425 100644 --- a/scripts/zones/Castle_Oztroja/npcs/_m71.lua +++ b/scripts/zones/Castle_Oztroja/npcs/_m71.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.CASTLE_OZTROJA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:hasKeyItem(xi.ki.YAGUDO_TORCH) then player:startEvent(11) @@ -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/Castle_Oztroja/npcs/_m72.lua b/scripts/zones/Castle_Oztroja/npcs/_m72.lua index b2ce1dc810e..fc4b23f540c 100644 --- a/scripts/zones/Castle_Oztroja/npcs/_m72.lua +++ b/scripts/zones/Castle_Oztroja/npcs/_m72.lua @@ -23,9 +23,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if option == 1 then local brassDoor = GetNPCByID(ID.npc.BRASS_DOOR_FLOOR_4_H7) diff --git a/scripts/zones/Castle_Oztroja/npcs/_m73.lua b/scripts/zones/Castle_Oztroja/npcs/_m73.lua index b3db51800ad..d381b877602 100644 --- a/scripts/zones/Castle_Oztroja/npcs/_m73.lua +++ b/scripts/zones/Castle_Oztroja/npcs/_m73.lua @@ -23,9 +23,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if option == 1 then local brassDoor = GetNPCByID(ID.npc.BRASS_DOOR_FLOOR_4_H7) diff --git a/scripts/zones/Castle_Oztroja/npcs/_m74.lua b/scripts/zones/Castle_Oztroja/npcs/_m74.lua index 887ae0902bd..9d2534d1ed9 100644 --- a/scripts/zones/Castle_Oztroja/npcs/_m74.lua +++ b/scripts/zones/Castle_Oztroja/npcs/_m74.lua @@ -23,9 +23,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if option == 1 then local brassDoor = GetNPCByID(ID.npc.BRASS_DOOR_FLOOR_4_H7) diff --git a/scripts/zones/Castle_Oztroja/npcs/_m75.lua b/scripts/zones/Castle_Oztroja/npcs/_m75.lua index dc6534804f2..21372e6983a 100644 --- a/scripts/zones/Castle_Oztroja/npcs/_m75.lua +++ b/scripts/zones/Castle_Oztroja/npcs/_m75.lua @@ -23,9 +23,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if option == 1 then local brassDoor = GetNPCByID(ID.npc.BRASS_DOOR_FLOOR_4_H7) diff --git a/scripts/zones/Castle_Oztroja/npcs/relic.lua b/scripts/zones/Castle_Oztroja/npcs/relic.lua index 66c749beac1..1061b1bcd76 100644 --- a/scripts/zones/Castle_Oztroja/npcs/relic.lua +++ b/scripts/zones/Castle_Oztroja/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 == 59 and diff --git a/scripts/zones/Castle_Zvahl_Baileys/npcs/Torch.lua b/scripts/zones/Castle_Zvahl_Baileys/npcs/Torch.lua index 4a7f2a5e56b..5e05b7da510 100644 --- a/scripts/zones/Castle_Zvahl_Baileys/npcs/Torch.lua +++ b/scripts/zones/Castle_Zvahl_Baileys/npcs/Torch.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.CASTLE_ZVAHL_BAILEYS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) -- killed Dark Spark and clicked same torch used to spawn if player:getCharVar('BorghertzSparkKilled') == 1 then @@ -34,10 +31,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/Castle_Zvahl_Baileys/npcs/Treasure_Chest.lua b/scripts/zones/Castle_Zvahl_Baileys/npcs/Treasure_Chest.lua index 85005ef7c90..43e475a808c 100644 --- a/scripts/zones/Castle_Zvahl_Baileys/npcs/Treasure_Chest.lua +++ b/scripts/zones/Castle_Zvahl_Baileys/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/Castle_Zvahl_Baileys/npcs/Treasure_Coffer.lua b/scripts/zones/Castle_Zvahl_Baileys/npcs/Treasure_Coffer.lua index fffa817ba2c..0e5f1e4429a 100644 --- a/scripts/zones/Castle_Zvahl_Baileys/npcs/Treasure_Coffer.lua +++ b/scripts/zones/Castle_Zvahl_Baileys/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/Castle_Zvahl_Baileys_[S]/npcs/_3u3.lua b/scripts/zones/Castle_Zvahl_Baileys_[S]/npcs/_3u3.lua index 2fd31a065f4..596b3234531 100644 --- a/scripts/zones/Castle_Zvahl_Baileys_[S]/npcs/_3u3.lua +++ b/scripts/zones/Castle_Zvahl_Baileys_[S]/npcs/_3u3.lua @@ -9,10 +9,4 @@ entity.onTrigger = function(player, npc) npc:openDoor(18) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Castle_Zvahl_Keep/npcs/Goblin_Footprint.lua b/scripts/zones/Castle_Zvahl_Keep/npcs/Goblin_Footprint.lua index b594b375462..b86579c96f6 100644 --- a/scripts/zones/Castle_Zvahl_Keep/npcs/Goblin_Footprint.lua +++ b/scripts/zones/Castle_Zvahl_Keep/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/Castle_Zvahl_Keep/npcs/Treasure_Chest.lua b/scripts/zones/Castle_Zvahl_Keep/npcs/Treasure_Chest.lua index e1828331bd9..509b14c5ce7 100644 --- a/scripts/zones/Castle_Zvahl_Keep/npcs/Treasure_Chest.lua +++ b/scripts/zones/Castle_Zvahl_Keep/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/Castle_Zvahl_Keep/npcs/_4i5.lua b/scripts/zones/Castle_Zvahl_Keep/npcs/_4i5.lua index d08cf209a6f..8bcdcc48c15 100644 --- a/scripts/zones/Castle_Zvahl_Keep/npcs/_4i5.lua +++ b/scripts/zones/Castle_Zvahl_Keep/npcs/_4i5.lua @@ -27,9 +27,6 @@ entity.onTrigger = function(player, npc) player:startEvent(9) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 8 then player:tradeComplete() diff --git a/scripts/zones/Ceizak_Battlegrounds/npcs/Geomantic_Reservoir.lua b/scripts/zones/Ceizak_Battlegrounds/npcs/Geomantic_Reservoir.lua index a38bab8ff39..74d4b2ff3cc 100644 --- a/scripts/zones/Ceizak_Battlegrounds/npcs/Geomantic_Reservoir.lua +++ b/scripts/zones/Ceizak_Battlegrounds/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_FRAILTY) 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_FRAILTY) end diff --git a/scripts/zones/Ceizak_Battlegrounds/npcs/qm_mastop.lua b/scripts/zones/Ceizak_Battlegrounds/npcs/qm_mastop.lua index 2205b1e86a9..182b0f78b70 100644 --- a/scripts/zones/Ceizak_Battlegrounds/npcs/qm_mastop.lua +++ b/scripts/zones/Ceizak_Battlegrounds/npcs/qm_mastop.lua @@ -17,13 +17,4 @@ 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) -end - return entity diff --git a/scripts/zones/Ceizak_Battlegrounds/npcs/qm_supernal.lua b/scripts/zones/Ceizak_Battlegrounds/npcs/qm_supernal.lua index 16d0d7634e2..3f692f8bc7e 100644 --- a/scripts/zones/Ceizak_Battlegrounds/npcs/qm_supernal.lua +++ b/scripts/zones/Ceizak_Battlegrounds/npcs/qm_supernal.lua @@ -17,13 +17,4 @@ 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) -end - return entity diff --git a/scripts/zones/Ceizak_Battlegrounds/npcs/qm_taxet.lua b/scripts/zones/Ceizak_Battlegrounds/npcs/qm_taxet.lua index eef9039db44..3cfa9ccd400 100644 --- a/scripts/zones/Ceizak_Battlegrounds/npcs/qm_taxet.lua +++ b/scripts/zones/Ceizak_Battlegrounds/npcs/qm_taxet.lua @@ -17,13 +17,4 @@ 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) -end - return entity diff --git a/scripts/zones/Ceizak_Battlegrounds/npcs/qm_transcendent_s.lua b/scripts/zones/Ceizak_Battlegrounds/npcs/qm_transcendent_s.lua index fce4e52eccd..e95d05feb7f 100644 --- a/scripts/zones/Ceizak_Battlegrounds/npcs/qm_transcendent_s.lua +++ b/scripts/zones/Ceizak_Battlegrounds/npcs/qm_transcendent_s.lua @@ -17,13 +17,4 @@ 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) -end - return entity diff --git a/scripts/zones/Ceizak_Battlegrounds/npcs/qm_unfettered.lua b/scripts/zones/Ceizak_Battlegrounds/npcs/qm_unfettered.lua index 5feb7d65f41..9a708e55dc9 100644 --- a/scripts/zones/Ceizak_Battlegrounds/npcs/qm_unfettered.lua +++ b/scripts/zones/Ceizak_Battlegrounds/npcs/qm_unfettered.lua @@ -18,13 +18,4 @@ 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) -end - return entity diff --git a/scripts/zones/Chamber_of_Oracles/npcs/_4o0.lua b/scripts/zones/Chamber_of_Oracles/npcs/_4o0.lua index 101175b8a2b..ffc2db61d36 100644 --- a/scripts/zones/Chamber_of_Oracles/npcs/_4o0.lua +++ b/scripts/zones/Chamber_of_Oracles/npcs/_4o0.lua @@ -6,19 +6,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:hasKeyItem(xi.ki.PRISMATIC_FRAGMENT) then player:startEvent(2, xi.ki.PRISMATIC_FRAGMENT, 300, 200, 100, 168) 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/Chateau_dOraguille/DefaultActions.lua b/scripts/zones/Chateau_dOraguille/DefaultActions.lua index b1e5410a5ce..06b90762d02 100644 --- a/scripts/zones/Chateau_dOraguille/DefaultActions.lua +++ b/scripts/zones/Chateau_dOraguille/DefaultActions.lua @@ -3,9 +3,20 @@ local ID = zones[xi.zone.CHATEAU_DORAGUILLE] return { ['_6h0'] = { text = ID.text.ITS_LOCKED }, ['_6h4'] = { text = ID.text.ITS_LOCKED_TIGHT }, + ['Aladoverre'] = { event = 515 }, + ['Aramaviont'] = { event = 518 }, ['Arsha'] = { event = 513 }, + ['Atoranne'] = { event = 519 }, + ['Chaloutte'] = { event = 557 }, ['Chaphoire'] = { event = 512 }, ['Chupaile'] = { event = 514 }, + ['Cotelle'] = { event = 520 }, + ['Doumina'] = { event = 521 }, ['Ferdechiond'] = { event = 511 }, ['Halver'] = { text = ID.text.HALVER_OFFSET + 1092 }, + ['Michilca'] = { event = 517 }, + ['Milchupain'] = { event = 516 }, + ['Mistaravant'] = { event = 524 }, + ['Nachou'] = { event = 523 }, + ['Tombstone'] = { messageSpecial = ID.text.TOMBSTONE }, } diff --git a/scripts/zones/Chateau_dOraguille/npcs/Aladoverre.lua b/scripts/zones/Chateau_dOraguille/npcs/Aladoverre.lua deleted file mode 100644 index f697d2bbee0..00000000000 --- a/scripts/zones/Chateau_dOraguille/npcs/Aladoverre.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Chateau d'Oraguille --- NPC: Aladoverre ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(515) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Chateau_dOraguille/npcs/Aramaviont.lua b/scripts/zones/Chateau_dOraguille/npcs/Aramaviont.lua deleted file mode 100644 index a4372961a92..00000000000 --- a/scripts/zones/Chateau_dOraguille/npcs/Aramaviont.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Chateau d'Oraguille --- NPC: Aramaviont ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(518) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Chateau_dOraguille/npcs/Atoranne.lua b/scripts/zones/Chateau_dOraguille/npcs/Atoranne.lua deleted file mode 100644 index 50742159e27..00000000000 --- a/scripts/zones/Chateau_dOraguille/npcs/Atoranne.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Chateau d'Oraguille --- NPC: Atoranne ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(519) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Chateau_dOraguille/npcs/Celebratory_Chest.lua b/scripts/zones/Chateau_dOraguille/npcs/Celebratory_Chest.lua index d56297841fb..fa94f844641 100644 --- a/scripts/zones/Chateau_dOraguille/npcs/Celebratory_Chest.lua +++ b/scripts/zones/Chateau_dOraguille/npcs/Celebratory_Chest.lua @@ -9,18 +9,9 @@ local ID = zones[xi.zone.CHATEAU_DORAGUILLE] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.shop.celebratory(player) player:messageSpecial(ID.text.CELEBRATORY_GOODS) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Chateau_dOraguille/npcs/Chaloutte.lua b/scripts/zones/Chateau_dOraguille/npcs/Chaloutte.lua deleted file mode 100644 index 457b8498911..00000000000 --- a/scripts/zones/Chateau_dOraguille/npcs/Chaloutte.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Chateau d'Oraguille --- NPC: Chaloutte --- Type: Event Scene Replayer --- !pos 10.450 -1 -11.985 233 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(557) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Chateau_dOraguille/npcs/Chalvatot.lua b/scripts/zones/Chateau_dOraguille/npcs/Chalvatot.lua index 9babd5debfb..3cdebccf793 100644 --- a/scripts/zones/Chateau_dOraguille/npcs/Chalvatot.lua +++ b/scripts/zones/Chateau_dOraguille/npcs/Chalvatot.lua @@ -65,9 +65,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) -- CIRCLE OF TIME if csid == 99 and option == 0 then diff --git a/scripts/zones/Chateau_dOraguille/npcs/Cotelle.lua b/scripts/zones/Chateau_dOraguille/npcs/Cotelle.lua deleted file mode 100644 index 6ddf7099b5b..00000000000 --- a/scripts/zones/Chateau_dOraguille/npcs/Cotelle.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Chateau d'Oraguille --- NPC: Cotelle ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(520) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Chateau_dOraguille/npcs/Curilla.lua b/scripts/zones/Chateau_dOraguille/npcs/Curilla.lua index 1a300b57a98..fa635a0c390 100644 --- a/scripts/zones/Chateau_dOraguille/npcs/Curilla.lua +++ b/scripts/zones/Chateau_dOraguille/npcs/Curilla.lua @@ -41,9 +41,6 @@ local trustMemory = function(player) return memories end -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local mLvl = player:getMainLvl() local mJob = player:getMainJob() diff --git a/scripts/zones/Chateau_dOraguille/npcs/Doumina.lua b/scripts/zones/Chateau_dOraguille/npcs/Doumina.lua deleted file mode 100644 index 401f8f3d09b..00000000000 --- a/scripts/zones/Chateau_dOraguille/npcs/Doumina.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Chateau d'Oraguille --- NPC: Doumina ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(521) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Chateau_dOraguille/npcs/Faurie.lua b/scripts/zones/Chateau_dOraguille/npcs/Faurie.lua index 44e3e24cb0d..514acdf6f8c 100644 --- a/scripts/zones/Chateau_dOraguille/npcs/Faurie.lua +++ b/scripts/zones/Chateau_dOraguille/npcs/Faurie.lua @@ -6,16 +6,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(506) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if option == 0 then player:setPos(0, 0, 100, 64, 231) diff --git a/scripts/zones/Chateau_dOraguille/npcs/Halver.lua b/scripts/zones/Chateau_dOraguille/npcs/Halver.lua index 7004d5cc2a3..ab0b0ff7d81 100644 --- a/scripts/zones/Chateau_dOraguille/npcs/Halver.lua +++ b/scripts/zones/Chateau_dOraguille/npcs/Halver.lua @@ -10,9 +10,6 @@ local ID = zones[xi.zone.CHATEAU_DORAGUILLE] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local pNation = player:getNation() local wildcatSandy = player:getCharVar('WildcatSandy') @@ -44,9 +41,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 == 558 then player:setCharVar('WildcatSandy', utils.mask.setBit(player:getCharVar('WildcatSandy'), 16, true)) diff --git a/scripts/zones/Chateau_dOraguille/npcs/Matrimonial_Coffer.lua b/scripts/zones/Chateau_dOraguille/npcs/Matrimonial_Coffer.lua index a1d45eecbcc..d51110ac5a2 100644 --- a/scripts/zones/Chateau_dOraguille/npcs/Matrimonial_Coffer.lua +++ b/scripts/zones/Chateau_dOraguille/npcs/Matrimonial_Coffer.lua @@ -6,16 +6,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.matrimonialcoffer.startEvent(player) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.matrimonialcoffer.finishEvent(player, csid, option, npc) end diff --git a/scripts/zones/Chateau_dOraguille/npcs/Michilca.lua b/scripts/zones/Chateau_dOraguille/npcs/Michilca.lua deleted file mode 100644 index 4b0aed805b7..00000000000 --- a/scripts/zones/Chateau_dOraguille/npcs/Michilca.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Chateau d'Oraguille --- NPC: Michilca ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(517) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Chateau_dOraguille/npcs/Milchupain.lua b/scripts/zones/Chateau_dOraguille/npcs/Milchupain.lua deleted file mode 100644 index 35bc98cccdc..00000000000 --- a/scripts/zones/Chateau_dOraguille/npcs/Milchupain.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Chateau d'Oraguille --- NPC: Milchupain ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(516) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Chateau_dOraguille/npcs/Mistaravant.lua b/scripts/zones/Chateau_dOraguille/npcs/Mistaravant.lua deleted file mode 100644 index 224356869eb..00000000000 --- a/scripts/zones/Chateau_dOraguille/npcs/Mistaravant.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Chateau d'Oraguille --- NPC: Mistaravant --- !pos 7.097 -3.999 67.988 233 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(524) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Chateau_dOraguille/npcs/Nachou.lua b/scripts/zones/Chateau_dOraguille/npcs/Nachou.lua deleted file mode 100644 index 650dcb87cee..00000000000 --- a/scripts/zones/Chateau_dOraguille/npcs/Nachou.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Chateau d'Oraguille --- NPC: Nachou --- !pos -39.965 -3.999 34.292 233 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(523) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Chateau_dOraguille/npcs/Perfaumand.lua b/scripts/zones/Chateau_dOraguille/npcs/Perfaumand.lua index 908bb5596f8..08693286664 100644 --- a/scripts/zones/Chateau_dOraguille/npcs/Perfaumand.lua +++ b/scripts/zones/Chateau_dOraguille/npcs/Perfaumand.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local wildcatSandy = player:getCharVar('WildcatSandy') @@ -25,9 +22,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 == 560 then player:setCharVar('WildcatSandy', utils.mask.setBit(player:getCharVar('WildcatSandy'), 18, true)) diff --git a/scripts/zones/Chateau_dOraguille/npcs/Rahal.lua b/scripts/zones/Chateau_dOraguille/npcs/Rahal.lua index dfa7fc9df3d..08644ae1dad 100644 --- a/scripts/zones/Chateau_dOraguille/npcs/Rahal.lua +++ b/scripts/zones/Chateau_dOraguille/npcs/Rahal.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.CHATEAU_DORAGUILLE] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local crestProgress = player:getCharVar('TheHolyCrest_Event') local hasDragonCurseRemedy = player:hasKeyItem(xi.ki.DRAGON_CURSE_REMEDY) @@ -60,9 +57,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 then player:addKeyItem(xi.ki.DRAGON_CURSE_REMEDY) diff --git a/scripts/zones/Chateau_dOraguille/npcs/Tombstone.lua b/scripts/zones/Chateau_dOraguille/npcs/Tombstone.lua deleted file mode 100644 index 4e47cfdcad2..00000000000 --- a/scripts/zones/Chateau_dOraguille/npcs/Tombstone.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Chateau d'Oraguille --- NPC: Tombstone ------------------------------------ -local ID = zones[xi.zone.CHATEAU_DORAGUILLE] ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:messageSpecial(ID.text.TOMBSTONE) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Chateau_dOraguille/npcs/_6h0.lua b/scripts/zones/Chateau_dOraguille/npcs/_6h0.lua index 3f88fe7ae75..dcba5758677 100644 --- a/scripts/zones/Chateau_dOraguille/npcs/_6h0.lua +++ b/scripts/zones/Chateau_dOraguille/npcs/_6h0.lua @@ -39,9 +39,6 @@ local function TrustMemory(player) return memories end -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local mLvl = player:getMainLvl() local aBoysDream = player:getQuestStatus(xi.questLog.SANDORIA, xi.quest.id.sandoria.A_BOY_S_DREAM) @@ -77,9 +74,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 == 88 then if player:getFreeSlotsCount() == 0 then diff --git a/scripts/zones/Chateau_dOraguille/npcs/_6h1.lua b/scripts/zones/Chateau_dOraguille/npcs/_6h1.lua index d823f5bdd35..e230169e3b7 100644 --- a/scripts/zones/Chateau_dOraguille/npcs/_6h1.lua +++ b/scripts/zones/Chateau_dOraguille/npcs/_6h1.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local sandyQuests = xi.quest.id.sandoria local whmAf1 = player:getQuestStatus(xi.questLog.SANDORIA, sandyQuests.MESSENGER_FROM_BEYOND) @@ -46,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 == 551 then player:addQuest(xi.questLog.SANDORIA, xi.quest.id.sandoria.PRELUDE_OF_BLACK_AND_WHITE) diff --git a/scripts/zones/Gusgen_Mines/npcs/Clay.lua b/scripts/zones/Gusgen_Mines/npcs/Clay.lua index 6a16f11f773..764bc7643ae 100644 --- a/scripts/zones/Gusgen_Mines/npcs/Clay.lua +++ b/scripts/zones/Gusgen_Mines/npcs/Clay.lua @@ -4,8 +4,6 @@ -- Involved in Quest: A Potter's Preference -- !pos 117 -21 432 196 ----------------------------------- -local ID = zones[xi.zone.GUSGEN_MINES] ------------------------------------ ---@type TNpcEntity local entity = {} diff --git a/scripts/zones/Jugner_Forest/DefaultActions.lua b/scripts/zones/Jugner_Forest/DefaultActions.lua index 7bcfdc22737..83db084fa35 100644 --- a/scripts/zones/Jugner_Forest/DefaultActions.lua +++ b/scripts/zones/Jugner_Forest/DefaultActions.lua @@ -1,7 +1,7 @@ local ID = zones[xi.zone.JUGNER_FOREST] return { - ['Beastmens_Banner'] = { messageSpecial = ID.text.BEASTMEN_BANNER}, + ['Beastmens_Banner'] = { messageSpecial = ID.text.BEASTMEN_BANNER }, ['Metallic_Hodgepodge'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, ['Perevie'] = { event = 29 }, ['Stone_Monument'] = { event = 900 }, diff --git a/scripts/zones/Lower_Delkfutts_Tower/npcs/Cermet_Door.lua b/scripts/zones/Lower_Delkfutts_Tower/npcs/Cermet_Door.lua index 3bdbdf67e30..3b05828e350 100644 --- a/scripts/zones/Lower_Delkfutts_Tower/npcs/Cermet_Door.lua +++ b/scripts/zones/Lower_Delkfutts_Tower/npcs/Cermet_Door.lua @@ -8,12 +8,12 @@ local entity = {} entity.onTrigger = function(player, npc) - player:startEvent(20) -- missing walk-through animation, but it's the best I could find. + player:startEvent(20) end entity.onEventFinish = function(player, csid, option, npc) if csid == 20 and option == 1 then - player:setPos(313, 16, 20, 128, 158) -- to Upper Delkfutt's Tower + player:setPos(314.053, 16, 19.944, 128, xi.zone.UPPER_DELKFUTTS_TOWER) end end