From c25309566ba2656cbd5c4b9ff6cdeab523fd9b38 Mon Sep 17 00:00:00 2001 From: claywar Date: Mon, 20 Jan 2025 20:44:55 -0500 Subject: [PATCH 1/3] Remove empty NPCs, add Default Actions - Nyzul ~ Phomiuna --- scripts/zones/Nyzul_Isle/npcs/Runic_Lamp.lua | 3 --- scripts/zones/Nyzul_Isle/npcs/Vending_Box.lua | 3 --- .../Oldton_Movalpolos/DefaultActions.lua | 6 ++++- .../zones/Oldton_Movalpolos/npcs/Bartabaq.lua | 23 ----------------- .../Oldton_Movalpolos/npcs/Brakobrik.lua | 22 ---------------- .../npcs/GuZho_Thunderblade.lua | 22 ---------------- .../zones/Oldton_Movalpolos/npcs/Koblakiq.lua | 22 ---------------- .../Oldton_Movalpolos/npcs/Mining_Point.lua | 6 ----- .../npcs/Scrawled_Writing.lua | 9 ------- .../zones/Oldton_Movalpolos/npcs/Tarnotik.lua | 3 --- .../Oldton_Movalpolos/npcs/Treasure_Chest.lua | 6 ----- .../Oldton_Movalpolos/npcs/Twinkbrix.lua | 3 --- .../DefaultActions.lua | 5 ++++ .../npcs/Adeben.lua | 9 ------- .../npcs/Cehn_Teyohngo.lua | 9 ------- .../Open_sea_route_to_Al_Zahbi/npcs/Map.lua | 22 ---------------- .../DefaultActions.lua | 5 ++++ .../Open_sea_route_to_Mhaura/npcs/Map.lua | 22 ---------------- .../npcs/Pashi_Maccaleh.lua | 9 ------- .../Open_sea_route_to_Mhaura/npcs/Sheadon.lua | 9 ------- .../Ordelles_Caves/npcs/Geomagnetic_Fount.lua | 9 ------- .../Ordelles_Caves/npcs/Grounds_Tome.lua | 3 --- .../zones/Ordelles_Caves/npcs/Rojaireaut.lua | 6 ----- .../zones/Ordelles_Caves/npcs/Ruillont.lua | 9 ------- .../zones/Ordelles_Caves/npcs/Stalagmite.lua | 9 ------- .../Ordelles_Caves/npcs/Treasure_Casket.lua | 3 --- .../Ordelles_Caves/npcs/Treasure_Chest.lua | 8 ------ scripts/zones/Ordelles_Caves/npcs/qm1.lua | 9 ------- scripts/zones/Ordelles_Caves/npcs/qm7.lua | 9 ------- .../npcs/Geomagnetic_Fount.lua | 9 ------- .../npcs/Grounds_Tome.lua | 3 --- .../npcs/Treasure_Casket.lua | 3 --- .../npcs/Treasure_Chest.lua | 6 ----- .../Outer_RaKaznar/npcs/Entwined_Roots_1.lua | 6 ----- .../Outer_RaKaznar/npcs/Entwined_Roots_3.lua | 6 ----- .../Outer_RaKaznar/npcs/Entwined_Roots_4.lua | 6 ----- .../Outer_RaKaznar/npcs/Entwined_Roots_5.lua | 6 ----- .../Outer_RaKaznar/npcs/Entwined_Roots_6.lua | 6 ----- .../Outer_RaKaznar/npcs/Liseran_Door_Exit.lua | 6 ----- .../npcs/Vertical_Transit_Device_1.lua | 6 ----- .../npcs/Vertical_Transit_Device_2.lua | 6 ----- .../npcs/Vertical_Transit_Device_3.lua | 6 ----- .../npcs/Vertical_Transit_Device_4.lua | 6 ----- .../npcs/Vertical_Transit_Device_5.lua | 6 ----- .../npcs/Vertical_Transit_Device_6.lua | 6 ----- .../npcs/Vertical_Transit_Device_7.lua | 6 ----- scripts/zones/Outer_RaKaznar/npcs/_7mk.lua | 9 ------- .../zones/Palborough_Mines/DefaultActions.lua | 1 + .../npcs/Geomagnetic_Fount.lua | 9 ------- .../Palborough_Mines/npcs/Mining_Point.lua | 6 ----- .../Palborough_Mines/npcs/Mythril_Seam.lua | 3 --- .../Palborough_Mines/npcs/Treasure_Chest.lua | 6 ----- scripts/zones/Palborough_Mines/npcs/_3z2.lua | 6 ----- scripts/zones/Palborough_Mines/npcs/_3z6.lua | 6 ----- scripts/zones/Palborough_Mines/npcs/_3z7.lua | 6 ----- scripts/zones/Palborough_Mines/npcs/_3z8.lua | 9 ------- scripts/zones/Palborough_Mines/npcs/_3z9.lua | 9 ------- scripts/zones/Palborough_Mines/npcs/_3za.lua | 10 -------- .../Pashhow_Marshlands/DefaultActions.lua | 4 +++ .../npcs/Beastmens_Banner.lua | 24 ------------------ .../Pashhow_Marshlands/npcs/Cavernous_Maw.lua | 6 ----- .../Pashhow_Marshlands/npcs/Field_Manual.lua | 3 --- .../Pashhow_Marshlands/npcs/Luck_Rune.lua | 25 ------------------- .../Pashhow_Marshlands/npcs/Meh_Nbolo.lua | 23 ----------------- .../npcs/Stone_Monument.lua | 10 -------- .../zones/Pashhow_Marshlands/npcs/Tahmasp.lua | 3 --- .../npcs/Treasure_Casket.lua | 3 --- .../npcs/Cavernous_Maw.lua | 6 ----- .../npcs/Corroded_Door.lua | 3 --- .../npcs/Corroded_Gate.lua | 6 ----- .../npcs/Indescript_Markings.lua | 9 ------- .../Pashhow_Marshlands_[S]/npcs/Milloure.lua | 6 ----- .../Pashhow_Marshlands_[S]/npcs/Telepoint.lua | 6 ----- .../zones/Pashhow_Marshlands_[S]/npcs/qm1.lua | 9 ------- .../zones/Periqia/npcs/Rune_of_Release.lua | 6 ----- .../zones/Phanauet_Channel/DefaultActions.lua | 7 ++++++ .../Phanauet_Channel/npcs/Ineuteniace.lua | 22 ---------------- .../Phanauet_Channel/npcs/Laiteconce.lua | 22 ---------------- .../Phanauet_Channel/npcs/Luquillaue.lua | 23 ----------------- .../Phomiuna_Aqueducts/DefaultActions.lua | 3 ++- .../Phomiuna_Aqueducts/npcs/Wooden_Ladder.lua | 6 ----- .../zones/Phomiuna_Aqueducts/npcs/_0r0.lua | 9 ------- .../zones/Phomiuna_Aqueducts/npcs/_0r1.lua | 9 ------- .../zones/Phomiuna_Aqueducts/npcs/_0r2.lua | 9 ------- .../zones/Phomiuna_Aqueducts/npcs/_0r4.lua | 9 ------- .../zones/Phomiuna_Aqueducts/npcs/_0r6.lua | 9 ------- .../zones/Phomiuna_Aqueducts/npcs/_0r7.lua | 9 ------- .../zones/Phomiuna_Aqueducts/npcs/_0r8.lua | 9 ------- .../zones/Phomiuna_Aqueducts/npcs/_0r9.lua | 6 ----- .../zones/Phomiuna_Aqueducts/npcs/_0ra.lua | 9 ------- .../zones/Phomiuna_Aqueducts/npcs/_0rb.lua | 9 ------- .../zones/Phomiuna_Aqueducts/npcs/_0rm.lua | 9 ------- .../zones/Phomiuna_Aqueducts/npcs/_0rn.lua | 9 ------- .../zones/Phomiuna_Aqueducts/npcs/_0ro.lua | 9 ------- .../zones/Phomiuna_Aqueducts/npcs/_0rp.lua | 9 ------- .../zones/Phomiuna_Aqueducts/npcs/_0rq.lua | 9 ------- .../zones/Phomiuna_Aqueducts/npcs/_0rr.lua | 9 ------- .../zones/Phomiuna_Aqueducts/npcs/_0rs.lua | 9 ------- .../zones/Phomiuna_Aqueducts/npcs/_0rt.lua | 9 ------- .../zones/Phomiuna_Aqueducts/npcs/_0ru.lua | 9 ------- .../zones/Phomiuna_Aqueducts/npcs/_0rv.lua | 9 ------- .../zones/Phomiuna_Aqueducts/npcs/_0rw.lua | 9 ------- .../zones/Phomiuna_Aqueducts/npcs/_0rx.lua | 9 ------- .../zones/Phomiuna_Aqueducts/npcs/_0ry.lua | 9 ------- .../zones/Phomiuna_Aqueducts/npcs/_0rz.lua | 9 ------- .../zones/Phomiuna_Aqueducts/npcs/_ir0.lua | 9 ------- .../zones/Phomiuna_Aqueducts/npcs/_ir1.lua | 9 ------- .../zones/Phomiuna_Aqueducts/npcs/_ir2.lua | 9 ------- .../zones/Phomiuna_Aqueducts/npcs/_ir3.lua | 9 ------- .../zones/Phomiuna_Aqueducts/npcs/_ir4.lua | 9 ------- .../zones/Phomiuna_Aqueducts/npcs/_ir5.lua | 9 ------- .../zones/Phomiuna_Aqueducts/npcs/_ir7.lua | 6 ----- .../zones/Phomiuna_Aqueducts/npcs/_ir9.lua | 6 ----- .../npcs/qm_east_door_f7.lua | 6 ----- .../npcs/qm_east_door_f8.lua | 9 ------- .../npcs/qm_map_of_aqueducts.lua | 9 ------- .../npcs/qm_north_door_j9.lua | 9 ------- .../npcs/qm_south_door_f7.lua | 6 ----- .../npcs/qm_torches_hint.lua | 23 ----------------- .../npcs/qm_west_door_j8.lua | 9 ------- .../npcs/qm_west_door_j9.lua | 9 ------- 121 files changed, 29 insertions(+), 1027 deletions(-) delete mode 100644 scripts/zones/Oldton_Movalpolos/npcs/Bartabaq.lua delete mode 100644 scripts/zones/Oldton_Movalpolos/npcs/Brakobrik.lua delete mode 100644 scripts/zones/Oldton_Movalpolos/npcs/GuZho_Thunderblade.lua delete mode 100644 scripts/zones/Oldton_Movalpolos/npcs/Koblakiq.lua create mode 100644 scripts/zones/Open_sea_route_to_Al_Zahbi/DefaultActions.lua delete mode 100644 scripts/zones/Open_sea_route_to_Al_Zahbi/npcs/Map.lua create mode 100644 scripts/zones/Open_sea_route_to_Mhaura/DefaultActions.lua delete mode 100644 scripts/zones/Open_sea_route_to_Mhaura/npcs/Map.lua delete mode 100644 scripts/zones/Pashhow_Marshlands/npcs/Beastmens_Banner.lua delete mode 100644 scripts/zones/Pashhow_Marshlands/npcs/Luck_Rune.lua delete mode 100644 scripts/zones/Pashhow_Marshlands/npcs/Meh_Nbolo.lua create mode 100644 scripts/zones/Phanauet_Channel/DefaultActions.lua delete mode 100644 scripts/zones/Phanauet_Channel/npcs/Ineuteniace.lua delete mode 100644 scripts/zones/Phanauet_Channel/npcs/Laiteconce.lua delete mode 100644 scripts/zones/Phanauet_Channel/npcs/Luquillaue.lua delete mode 100644 scripts/zones/Phomiuna_Aqueducts/npcs/qm_torches_hint.lua diff --git a/scripts/zones/Nyzul_Isle/npcs/Runic_Lamp.lua b/scripts/zones/Nyzul_Isle/npcs/Runic_Lamp.lua index d5dac69b355..90775a2475e 100644 --- a/scripts/zones/Nyzul_Isle/npcs/Runic_Lamp.lua +++ b/scripts/zones/Nyzul_Isle/npcs/Runic_Lamp.lua @@ -63,9 +63,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -- TODO: Reduce complexity -- Disable cyclomatic complexity check for this function: -- luacheck: ignore 561 diff --git a/scripts/zones/Nyzul_Isle/npcs/Vending_Box.lua b/scripts/zones/Nyzul_Isle/npcs/Vending_Box.lua index bec9b9e8f27..cc618cfb30c 100644 --- a/scripts/zones/Nyzul_Isle/npcs/Vending_Box.lua +++ b/scripts/zones/Nyzul_Isle/npcs/Vending_Box.lua @@ -14,7 +14,4 @@ entity.onEventUpdate = function(player, csid, option, npc) xi.nyzul.vendingBoxOnEventUpdate(player, csid, option) end -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Oldton_Movalpolos/DefaultActions.lua b/scripts/zones/Oldton_Movalpolos/DefaultActions.lua index 5f5ba8add28..fb0785cc61b 100644 --- a/scripts/zones/Oldton_Movalpolos/DefaultActions.lua +++ b/scripts/zones/Oldton_Movalpolos/DefaultActions.lua @@ -1,5 +1,9 @@ local ID = zones[xi.zone.OLDTON_MOVALPOLOS] return { - ['Rakorok'] = { text = ID.text.RAKOROK_DIALOGUE }, + ['Bartabaq'] = { event = 32756 }, + ['Brakobrik'] = { event = 2 }, + ['GuZho_Thunderblade'] = { event = 60 }, + ['Koblakiq'] = { event = 13 }, + ['Rakorok'] = { text = ID.text.RAKOROK_DIALOGUE }, } diff --git a/scripts/zones/Oldton_Movalpolos/npcs/Bartabaq.lua b/scripts/zones/Oldton_Movalpolos/npcs/Bartabaq.lua deleted file mode 100644 index 5d57296d688..00000000000 --- a/scripts/zones/Oldton_Movalpolos/npcs/Bartabaq.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Oldton Movalpolos --- NPC: Bartabaq --- Type: Outpost Vendor --- !pos -261.930 6.999 -49.145 11 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(32756) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Oldton_Movalpolos/npcs/Brakobrik.lua b/scripts/zones/Oldton_Movalpolos/npcs/Brakobrik.lua deleted file mode 100644 index b2818dbd66b..00000000000 --- a/scripts/zones/Oldton_Movalpolos/npcs/Brakobrik.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Oldton Movalpolos --- NPC: Brakobrik --- !pos 164.605 10.992 -91.253 11 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(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/Oldton_Movalpolos/npcs/GuZho_Thunderblade.lua b/scripts/zones/Oldton_Movalpolos/npcs/GuZho_Thunderblade.lua deleted file mode 100644 index 7851a4238b7..00000000000 --- a/scripts/zones/Oldton_Movalpolos/npcs/GuZho_Thunderblade.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Oldton Movalpolos --- NPC: Gu'Zho Thunderblade --- !pos -316.427 7.124 -260.868 11 ------------------------------------ ----@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/Oldton_Movalpolos/npcs/Koblakiq.lua b/scripts/zones/Oldton_Movalpolos/npcs/Koblakiq.lua deleted file mode 100644 index 5ae2e2c1c05..00000000000 --- a/scripts/zones/Oldton_Movalpolos/npcs/Koblakiq.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Oldton Movalpolos --- NPC: Koblakiq --- !pos -64.851 21.834 -117.521 11 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(13) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Oldton_Movalpolos/npcs/Mining_Point.lua b/scripts/zones/Oldton_Movalpolos/npcs/Mining_Point.lua index 5ea82be6f92..18849cca936 100644 --- a/scripts/zones/Oldton_Movalpolos/npcs/Mining_Point.lua +++ b/scripts/zones/Oldton_Movalpolos/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/Oldton_Movalpolos/npcs/Scrawled_Writing.lua b/scripts/zones/Oldton_Movalpolos/npcs/Scrawled_Writing.lua index 4c120828ffa..91c49029365 100644 --- a/scripts/zones/Oldton_Movalpolos/npcs/Scrawled_Writing.lua +++ b/scripts/zones/Oldton_Movalpolos/npcs/Scrawled_Writing.lua @@ -26,13 +26,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/Oldton_Movalpolos/npcs/Tarnotik.lua b/scripts/zones/Oldton_Movalpolos/npcs/Tarnotik.lua index 16233badb08..ae2fab0a082 100644 --- a/scripts/zones/Oldton_Movalpolos/npcs/Tarnotik.lua +++ b/scripts/zones/Oldton_Movalpolos/npcs/Tarnotik.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 csid == 32 then player:confirmTrade() diff --git a/scripts/zones/Oldton_Movalpolos/npcs/Treasure_Chest.lua b/scripts/zones/Oldton_Movalpolos/npcs/Treasure_Chest.lua index 8bd7965501e..d2fc9c70d62 100644 --- a/scripts/zones/Oldton_Movalpolos/npcs/Treasure_Chest.lua +++ b/scripts/zones/Oldton_Movalpolos/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/Oldton_Movalpolos/npcs/Twinkbrix.lua b/scripts/zones/Oldton_Movalpolos/npcs/Twinkbrix.lua index 289c0a90fb5..708252154dc 100644 --- a/scripts/zones/Oldton_Movalpolos/npcs/Twinkbrix.lua +++ b/scripts/zones/Oldton_Movalpolos/npcs/Twinkbrix.lua @@ -98,9 +98,6 @@ entity.onTrade = function(player, npc, trade) end end -entity.onEventUpdate = function(player, csid, option) -end - entity.onEventFinish = function(player, csid, option) if csid == 51 then -- TODO entering battle sets the cooldown (extra important here as using the teleport consumes this key item, and it should be possible to immediately get another) diff --git a/scripts/zones/Open_sea_route_to_Al_Zahbi/DefaultActions.lua b/scripts/zones/Open_sea_route_to_Al_Zahbi/DefaultActions.lua new file mode 100644 index 00000000000..d8d7a5a873e --- /dev/null +++ b/scripts/zones/Open_sea_route_to_Al_Zahbi/DefaultActions.lua @@ -0,0 +1,5 @@ +-- local ID = zones[xi.zone.OPEN_SEA_ROUTE_TO_AL_ZAHBI] + +return { + ['Map'] = { event = 1024 }, +} diff --git a/scripts/zones/Open_sea_route_to_Al_Zahbi/npcs/Adeben.lua b/scripts/zones/Open_sea_route_to_Al_Zahbi/npcs/Adeben.lua index 12971bacd16..42e97b1513e 100644 --- a/scripts/zones/Open_sea_route_to_Al_Zahbi/npcs/Adeben.lua +++ b/scripts/zones/Open_sea_route_to_Al_Zahbi/npcs/Adeben.lua @@ -9,17 +9,8 @@ local ID = zones[xi.zone.OPEN_SEA_ROUTE_TO_AL_ZAHBI] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.transport.onBoatTimekeeperTrigger(player, xi.transport.routes.OPEN_SEA, ID.text.ON_WAY_TO_AL_ZAHBI, ID.text.ARRIVING_SOON_AL_ZAHBI) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Open_sea_route_to_Al_Zahbi/npcs/Cehn_Teyohngo.lua b/scripts/zones/Open_sea_route_to_Al_Zahbi/npcs/Cehn_Teyohngo.lua index 9639e6bc195..3d519efa029 100644 --- a/scripts/zones/Open_sea_route_to_Al_Zahbi/npcs/Cehn_Teyohngo.lua +++ b/scripts/zones/Open_sea_route_to_Al_Zahbi/npcs/Cehn_Teyohngo.lua @@ -9,19 +9,10 @@ local ID = zones[xi.zone.OPEN_SEA_ROUTE_TO_AL_ZAHBI] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:sendGuild(522, 1, 23, 5) then player:showText(npc, ID.text.CEHN_TEYOHNGO_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/Open_sea_route_to_Al_Zahbi/npcs/Map.lua b/scripts/zones/Open_sea_route_to_Al_Zahbi/npcs/Map.lua deleted file mode 100644 index b59415da6ef..00000000000 --- a/scripts/zones/Open_sea_route_to_Al_Zahbi/npcs/Map.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Open_sea_route_to_Al_Zahbi --- NPC: Map --- !pos 0.340 -12.232 -4.120 46 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(1024) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Open_sea_route_to_Mhaura/DefaultActions.lua b/scripts/zones/Open_sea_route_to_Mhaura/DefaultActions.lua new file mode 100644 index 00000000000..e1ac5044ea6 --- /dev/null +++ b/scripts/zones/Open_sea_route_to_Mhaura/DefaultActions.lua @@ -0,0 +1,5 @@ +-- local ID = zones[xi.zone.OPEN_SEA_ROUTE_TO_MHAURA] + +return { + ['Map'] = { event = 1024 }, +} diff --git a/scripts/zones/Open_sea_route_to_Mhaura/npcs/Map.lua b/scripts/zones/Open_sea_route_to_Mhaura/npcs/Map.lua deleted file mode 100644 index 263a43e154c..00000000000 --- a/scripts/zones/Open_sea_route_to_Mhaura/npcs/Map.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Open_sea_route_to_Mhaura --- NPC: Map --- !pos 0.340 -12.232 -4.120 47 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(1024) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Open_sea_route_to_Mhaura/npcs/Pashi_Maccaleh.lua b/scripts/zones/Open_sea_route_to_Mhaura/npcs/Pashi_Maccaleh.lua index fba9893750b..50e3259e0be 100644 --- a/scripts/zones/Open_sea_route_to_Mhaura/npcs/Pashi_Maccaleh.lua +++ b/scripts/zones/Open_sea_route_to_Mhaura/npcs/Pashi_Maccaleh.lua @@ -9,19 +9,10 @@ local ID = zones[xi.zone.OPEN_SEA_ROUTE_TO_MHAURA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:sendGuild(523, 1, 23, 5) then player:showText(npc, ID.text.PASHI_MACCALEH_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/Open_sea_route_to_Mhaura/npcs/Sheadon.lua b/scripts/zones/Open_sea_route_to_Mhaura/npcs/Sheadon.lua index 9694c65e9c7..e0e014c0b1c 100644 --- a/scripts/zones/Open_sea_route_to_Mhaura/npcs/Sheadon.lua +++ b/scripts/zones/Open_sea_route_to_Mhaura/npcs/Sheadon.lua @@ -9,17 +9,8 @@ local ID = zones[xi.zone.OPEN_SEA_ROUTE_TO_MHAURA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.transport.onBoatTimekeeperTrigger(player, xi.transport.routes.OPEN_SEA, ID.text.ON_WAY_TO_MHAURA, ID.text.ARRIVING_SOON_MHAURA) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Ordelles_Caves/npcs/Geomagnetic_Fount.lua b/scripts/zones/Ordelles_Caves/npcs/Geomagnetic_Fount.lua index 8d3f95afbea..72f0ec031e0 100644 --- a/scripts/zones/Ordelles_Caves/npcs/Geomagnetic_Fount.lua +++ b/scripts/zones/Ordelles_Caves/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/Ordelles_Caves/npcs/Grounds_Tome.lua b/scripts/zones/Ordelles_Caves/npcs/Grounds_Tome.lua index 53263d81db0..2ff81bec6a7 100644 --- a/scripts/zones/Ordelles_Caves/npcs/Grounds_Tome.lua +++ b/scripts/zones/Ordelles_Caves/npcs/Grounds_Tome.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.regime.bookOnTrigger(player, xi.regime.type.GROUNDS) end diff --git a/scripts/zones/Ordelles_Caves/npcs/Rojaireaut.lua b/scripts/zones/Ordelles_Caves/npcs/Rojaireaut.lua index 897ff6b5376..aeda03fc48c 100644 --- a/scripts/zones/Ordelles_Caves/npcs/Rojaireaut.lua +++ b/scripts/zones/Ordelles_Caves/npcs/Rojaireaut.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') == 1 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 == 51 and option == 1 then player:addStatusEffect(xi.effect.LEVEL_RESTRICTION, 25, 0, 0) diff --git a/scripts/zones/Ordelles_Caves/npcs/Ruillont.lua b/scripts/zones/Ordelles_Caves/npcs/Ruillont.lua index d346e098850..20e219499db 100644 --- a/scripts/zones/Ordelles_Caves/npcs/Ruillont.lua +++ b/scripts/zones/Ordelles_Caves/npcs/Ruillont.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.ORDELLES_CAVES] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) -- Ruillont Default Actions vary based on Nation if player:getNation() == xi.nation.SANDORIA 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/Ordelles_Caves/npcs/Stalagmite.lua b/scripts/zones/Ordelles_Caves/npcs/Stalagmite.lua index 387026e3c83..70a66946e72 100644 --- a/scripts/zones/Ordelles_Caves/npcs/Stalagmite.lua +++ b/scripts/zones/Ordelles_Caves/npcs/Stalagmite.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.ORDELLES_CAVES] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local sharpeningTheSwordStat = player:getCharVar('sharpeningTheSwordCS') @@ -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/Ordelles_Caves/npcs/Treasure_Casket.lua b/scripts/zones/Ordelles_Caves/npcs/Treasure_Casket.lua index 30451574ec4..9fcc77b91f4 100644 --- a/scripts/zones/Ordelles_Caves/npcs/Treasure_Casket.lua +++ b/scripts/zones/Ordelles_Caves/npcs/Treasure_Casket.lua @@ -13,9 +13,6 @@ entity.onTrade = function(player, npc, trade) xi.caskets.onTrade(player, npc, trade) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.caskets.onEventFinish(player, csid, option, npc) end diff --git a/scripts/zones/Ordelles_Caves/npcs/Treasure_Chest.lua b/scripts/zones/Ordelles_Caves/npcs/Treasure_Chest.lua index 207e71292cc..3d59fa58dcd 100644 --- a/scripts/zones/Ordelles_Caves/npcs/Treasure_Chest.lua +++ b/scripts/zones/Ordelles_Caves/npcs/Treasure_Chest.lua @@ -1,8 +1,6 @@ ----------------------------------- -- Area: Ordelles Caves -- NPC: Treasure Chest --- Involved In Quest: Signed In Blood and The Goblin Tailor --- !zone 193 ----------------------------------- ---@type TNpcEntity local entity = {} @@ -15,10 +13,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/Ordelles_Caves/npcs/qm1.lua b/scripts/zones/Ordelles_Caves/npcs/qm1.lua index bf67d914245..45980a8854d 100644 --- a/scripts/zones/Ordelles_Caves/npcs/qm1.lua +++ b/scripts/zones/Ordelles_Caves/npcs/qm1.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.ORDELLES_CAVES] ---@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/Ordelles_Caves/npcs/qm7.lua b/scripts/zones/Ordelles_Caves/npcs/qm7.lua index 8fec4a473c8..41fd0f794be 100644 --- a/scripts/zones/Ordelles_Caves/npcs/qm7.lua +++ b/scripts/zones/Ordelles_Caves/npcs/qm7.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.ORDELLES_CAVES] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getCharVar('EcoStatus') == 1 and @@ -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/Outer_Horutoto_Ruins/npcs/Geomagnetic_Fount.lua b/scripts/zones/Outer_Horutoto_Ruins/npcs/Geomagnetic_Fount.lua index c8ba5bab304..7bbd73ff58d 100644 --- a/scripts/zones/Outer_Horutoto_Ruins/npcs/Geomagnetic_Fount.lua +++ b/scripts/zones/Outer_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/Outer_Horutoto_Ruins/npcs/Grounds_Tome.lua b/scripts/zones/Outer_Horutoto_Ruins/npcs/Grounds_Tome.lua index 6fbd9a0b2a5..bb0d58b0579 100644 --- a/scripts/zones/Outer_Horutoto_Ruins/npcs/Grounds_Tome.lua +++ b/scripts/zones/Outer_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/Outer_Horutoto_Ruins/npcs/Treasure_Casket.lua b/scripts/zones/Outer_Horutoto_Ruins/npcs/Treasure_Casket.lua index 36273c2c514..ae6f29b547c 100644 --- a/scripts/zones/Outer_Horutoto_Ruins/npcs/Treasure_Casket.lua +++ b/scripts/zones/Outer_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/Outer_Horutoto_Ruins/npcs/Treasure_Chest.lua b/scripts/zones/Outer_Horutoto_Ruins/npcs/Treasure_Chest.lua index b081c3e849a..bf0ada846fb 100644 --- a/scripts/zones/Outer_Horutoto_Ruins/npcs/Treasure_Chest.lua +++ b/scripts/zones/Outer_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/Outer_RaKaznar/npcs/Entwined_Roots_1.lua b/scripts/zones/Outer_RaKaznar/npcs/Entwined_Roots_1.lua index 2bca673b9b0..acfb2444f21 100644 --- a/scripts/zones/Outer_RaKaznar/npcs/Entwined_Roots_1.lua +++ b/scripts/zones/Outer_RaKaznar/npcs/Entwined_Roots_1.lua @@ -6,16 +6,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(31) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) -- TODO: Verify that CS moves the player end diff --git a/scripts/zones/Outer_RaKaznar/npcs/Entwined_Roots_3.lua b/scripts/zones/Outer_RaKaznar/npcs/Entwined_Roots_3.lua index ffa4a23e43a..03f9aec4ddd 100644 --- a/scripts/zones/Outer_RaKaznar/npcs/Entwined_Roots_3.lua +++ b/scripts/zones/Outer_RaKaznar/npcs/Entwined_Roots_3.lua @@ -6,16 +6,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(33) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) -- TODO: Verify that CS moves the player end diff --git a/scripts/zones/Outer_RaKaznar/npcs/Entwined_Roots_4.lua b/scripts/zones/Outer_RaKaznar/npcs/Entwined_Roots_4.lua index 31f384162bf..0d585b0e3fa 100644 --- a/scripts/zones/Outer_RaKaznar/npcs/Entwined_Roots_4.lua +++ b/scripts/zones/Outer_RaKaznar/npcs/Entwined_Roots_4.lua @@ -6,16 +6,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) -- TODO: Verify that CS moves the player end diff --git a/scripts/zones/Outer_RaKaznar/npcs/Entwined_Roots_5.lua b/scripts/zones/Outer_RaKaznar/npcs/Entwined_Roots_5.lua index 047be18b008..c8adb9d6424 100644 --- a/scripts/zones/Outer_RaKaznar/npcs/Entwined_Roots_5.lua +++ b/scripts/zones/Outer_RaKaznar/npcs/Entwined_Roots_5.lua @@ -6,16 +6,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(35) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) -- TODO: Verify that CS moves the player end diff --git a/scripts/zones/Outer_RaKaznar/npcs/Entwined_Roots_6.lua b/scripts/zones/Outer_RaKaznar/npcs/Entwined_Roots_6.lua index 7f26882b409..66de9c70b3a 100644 --- a/scripts/zones/Outer_RaKaznar/npcs/Entwined_Roots_6.lua +++ b/scripts/zones/Outer_RaKaznar/npcs/Entwined_Roots_6.lua @@ -6,16 +6,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(36) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) -- TODO: Verify that CS moves the player end diff --git a/scripts/zones/Outer_RaKaznar/npcs/Liseran_Door_Exit.lua b/scripts/zones/Outer_RaKaznar/npcs/Liseran_Door_Exit.lua index 63a1f684fc3..0aa175ebf62 100644 --- a/scripts/zones/Outer_RaKaznar/npcs/Liseran_Door_Exit.lua +++ b/scripts/zones/Outer_RaKaznar/npcs/Liseran_Door_Exit.lua @@ -7,16 +7,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(28) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 28 and option == 1 then player:setPos(-279.709, 19.976, 60.353, 0, 267) diff --git a/scripts/zones/Outer_RaKaznar/npcs/Vertical_Transit_Device_1.lua b/scripts/zones/Outer_RaKaznar/npcs/Vertical_Transit_Device_1.lua index aec8508fce4..62e1baeb77c 100644 --- a/scripts/zones/Outer_RaKaznar/npcs/Vertical_Transit_Device_1.lua +++ b/scripts/zones/Outer_RaKaznar/npcs/Vertical_Transit_Device_1.lua @@ -6,16 +6,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(43, 0, 300, 0, 100, 269951, 1, 301643, 0) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) -- TODO: Verify that CS moves the player end diff --git a/scripts/zones/Outer_RaKaznar/npcs/Vertical_Transit_Device_2.lua b/scripts/zones/Outer_RaKaznar/npcs/Vertical_Transit_Device_2.lua index 0af345d4cd2..830ee9fd65b 100644 --- a/scripts/zones/Outer_RaKaznar/npcs/Vertical_Transit_Device_2.lua +++ b/scripts/zones/Outer_RaKaznar/npcs/Vertical_Transit_Device_2.lua @@ -6,16 +6,10 @@ ---@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) -- TODO: Verify that CS moves the player end diff --git a/scripts/zones/Outer_RaKaznar/npcs/Vertical_Transit_Device_3.lua b/scripts/zones/Outer_RaKaznar/npcs/Vertical_Transit_Device_3.lua index ac7ec704dc3..c140d37ce6a 100644 --- a/scripts/zones/Outer_RaKaznar/npcs/Vertical_Transit_Device_3.lua +++ b/scripts/zones/Outer_RaKaznar/npcs/Vertical_Transit_Device_3.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.OUTER_RAKAZNAR] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:hasKeyItem(xi.ki.SILVERY_PLATE) then player:startEvent(45, 300, 0, 100, 0, 3, 582330, 0) @@ -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) -- TODO: Verify that CS moves the player end diff --git a/scripts/zones/Outer_RaKaznar/npcs/Vertical_Transit_Device_4.lua b/scripts/zones/Outer_RaKaznar/npcs/Vertical_Transit_Device_4.lua index d15f6b0e60e..e9ce0bc98eb 100644 --- a/scripts/zones/Outer_RaKaznar/npcs/Vertical_Transit_Device_4.lua +++ b/scripts/zones/Outer_RaKaznar/npcs/Vertical_Transit_Device_4.lua @@ -6,16 +6,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(46, 1, 300, 1, 100, 282664, 4, 578743, 0) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) -- TODO: Verify that CS moves the player end diff --git a/scripts/zones/Outer_RaKaznar/npcs/Vertical_Transit_Device_5.lua b/scripts/zones/Outer_RaKaznar/npcs/Vertical_Transit_Device_5.lua index 33714ce4a4a..33b6fc56534 100644 --- a/scripts/zones/Outer_RaKaznar/npcs/Vertical_Transit_Device_5.lua +++ b/scripts/zones/Outer_RaKaznar/npcs/Vertical_Transit_Device_5.lua @@ -6,16 +6,10 @@ ---@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) -- TODO: Verify that CS moves the player end diff --git a/scripts/zones/Outer_RaKaznar/npcs/Vertical_Transit_Device_6.lua b/scripts/zones/Outer_RaKaznar/npcs/Vertical_Transit_Device_6.lua index 62afec153d5..650a9502f05 100644 --- a/scripts/zones/Outer_RaKaznar/npcs/Vertical_Transit_Device_6.lua +++ b/scripts/zones/Outer_RaKaznar/npcs/Vertical_Transit_Device_6.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.OUTER_RAKAZNAR] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:hasKeyItem(xi.ki.SILVERY_PLATE) then player:startEvent(48, 300, 1, 100, 0, 6, 582330, 0) @@ -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) -- TODO: Verify that CS moves the player end diff --git a/scripts/zones/Outer_RaKaznar/npcs/Vertical_Transit_Device_7.lua b/scripts/zones/Outer_RaKaznar/npcs/Vertical_Transit_Device_7.lua index 2fb5a06d653..c61904221ed 100644 --- a/scripts/zones/Outer_RaKaznar/npcs/Vertical_Transit_Device_7.lua +++ b/scripts/zones/Outer_RaKaznar/npcs/Vertical_Transit_Device_7.lua @@ -6,16 +6,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(49, 0, 300, 0, 100, 277675, 7, 578743, 8) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) -- TODO: Verify that CS moves the player end diff --git a/scripts/zones/Outer_RaKaznar/npcs/_7mk.lua b/scripts/zones/Outer_RaKaznar/npcs/_7mk.lua index 1574704501e..a61db78f836 100644 --- a/scripts/zones/Outer_RaKaznar/npcs/_7mk.lua +++ b/scripts/zones/Outer_RaKaznar/npcs/_7mk.lua @@ -6,17 +6,8 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) npc:openDoor(15) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Palborough_Mines/DefaultActions.lua b/scripts/zones/Palborough_Mines/DefaultActions.lua index c2115676b4d..22ab6bd8f0c 100644 --- a/scripts/zones/Palborough_Mines/DefaultActions.lua +++ b/scripts/zones/Palborough_Mines/DefaultActions.lua @@ -1,6 +1,7 @@ local ID = zones[xi.zone.PALBOROUGH_MINES] return { + ['_3za'] = { event = 18 }, ['Old_Toolbox'] = { event = 22 }, ['qm_talekeeper'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, } diff --git a/scripts/zones/Palborough_Mines/npcs/Geomagnetic_Fount.lua b/scripts/zones/Palborough_Mines/npcs/Geomagnetic_Fount.lua index 483f14ef224..8dba512d0e2 100644 --- a/scripts/zones/Palborough_Mines/npcs/Geomagnetic_Fount.lua +++ b/scripts/zones/Palborough_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/Palborough_Mines/npcs/Mining_Point.lua b/scripts/zones/Palborough_Mines/npcs/Mining_Point.lua index d2ec41a93bf..6842acc95b3 100644 --- a/scripts/zones/Palborough_Mines/npcs/Mining_Point.lua +++ b/scripts/zones/Palborough_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/Palborough_Mines/npcs/Mythril_Seam.lua b/scripts/zones/Palborough_Mines/npcs/Mythril_Seam.lua index a33dc6fb7f4..aa75e31236e 100644 --- a/scripts/zones/Palborough_Mines/npcs/Mythril_Seam.lua +++ b/scripts/zones/Palborough_Mines/npcs/Mythril_Seam.lua @@ -33,9 +33,6 @@ entity.onTrigger = function(player, npc) player:startEvent(30, 12, 0, xi.item.CHUNK_OF_MINE_GRAVEL) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 51 and npcUtil.giveItem(player, xi.item.SHARP_STONE) then player:confirmTrade() diff --git a/scripts/zones/Palborough_Mines/npcs/Treasure_Chest.lua b/scripts/zones/Palborough_Mines/npcs/Treasure_Chest.lua index 20937259ac7..e9809b425b4 100644 --- a/scripts/zones/Palborough_Mines/npcs/Treasure_Chest.lua +++ b/scripts/zones/Palborough_Mines/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/Palborough_Mines/npcs/_3z2.lua b/scripts/zones/Palborough_Mines/npcs/_3z2.lua index 4c76cf058a6..3b59c96546c 100644 --- a/scripts/zones/Palborough_Mines/npcs/_3z2.lua +++ b/scripts/zones/Palborough_Mines/npcs/_3z2.lua @@ -6,16 +6,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(14) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 14 then player:setPos(-73, 0, 60, 1, 172) diff --git a/scripts/zones/Palborough_Mines/npcs/_3z6.lua b/scripts/zones/Palborough_Mines/npcs/_3z6.lua index fd6c07df278..1543229385d 100644 --- a/scripts/zones/Palborough_Mines/npcs/_3z6.lua +++ b/scripts/zones/Palborough_Mines/npcs/_3z6.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local state = GetElevatorState(xi.elevator.PALBOROUGH_MINES_LIFT) local isBusy = npc:getLocalVar('isBusy') @@ -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) local isBusy = npc:getLocalVar('isBusy') diff --git a/scripts/zones/Palborough_Mines/npcs/_3z7.lua b/scripts/zones/Palborough_Mines/npcs/_3z7.lua index da26c518029..6bb34a587f7 100644 --- a/scripts/zones/Palborough_Mines/npcs/_3z7.lua +++ b/scripts/zones/Palborough_Mines/npcs/_3z7.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local state = GetElevatorState(xi.elevator.PALBOROUGH_MINES_LIFT) local isBusy = npc:getLocalVar('isBusy') @@ -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) local isBusy = npc:getLocalVar('isBusy') diff --git a/scripts/zones/Palborough_Mines/npcs/_3z8.lua b/scripts/zones/Palborough_Mines/npcs/_3z8.lua index c4c37d81b64..78000dc9228 100644 --- a/scripts/zones/Palborough_Mines/npcs/_3z8.lua +++ b/scripts/zones/Palborough_Mines/npcs/_3z8.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local refinerInput = player:getCharVar('refiner_input') @@ -22,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/Palborough_Mines/npcs/_3z9.lua b/scripts/zones/Palborough_Mines/npcs/_3z9.lua index a3c39663926..fce4dcad503 100644 --- a/scripts/zones/Palborough_Mines/npcs/_3z9.lua +++ b/scripts/zones/Palborough_Mines/npcs/_3z9.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.PALBOROUGH_MINES] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local refinerOutput = player:getCharVar('refiner_output') @@ -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/Palborough_Mines/npcs/_3za.lua b/scripts/zones/Palborough_Mines/npcs/_3za.lua index 51ccf34eeaf..895703211a7 100644 --- a/scripts/zones/Palborough_Mines/npcs/_3za.lua +++ b/scripts/zones/Palborough_Mines/npcs/_3za.lua @@ -22,14 +22,4 @@ entity.onTrade = function(player, npc, trade) end 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/Pashhow_Marshlands/DefaultActions.lua b/scripts/zones/Pashhow_Marshlands/DefaultActions.lua index 5be95baa3c8..11d1169d757 100644 --- a/scripts/zones/Pashhow_Marshlands/DefaultActions.lua +++ b/scripts/zones/Pashhow_Marshlands/DefaultActions.lua @@ -1,6 +1,10 @@ local ID = zones[xi.zone.PASHHOW_MARSHLANDS] return { + ['Beastmens_Banner'] = { messageSpecial = ID.text.BEASTMEN_BANNER }, + ['Luck_Rune'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, + ['Meh_Nbolo'] = { event = 27 }, ['Odyssean_Passage'] = { messageSpecial = ID.text.NOTHING_HAPPENS }, ['Outpost_Gate'] = { messageSpecial = ID.text.GATE_IS_LOCKED }, + ['Stone_Monument'] = { event = 900 }, } diff --git a/scripts/zones/Pashhow_Marshlands/npcs/Beastmens_Banner.lua b/scripts/zones/Pashhow_Marshlands/npcs/Beastmens_Banner.lua deleted file mode 100644 index 9dbb8dd3549..00000000000 --- a/scripts/zones/Pashhow_Marshlands/npcs/Beastmens_Banner.lua +++ /dev/null @@ -1,24 +0,0 @@ ------------------------------------ --- Area: Pashhow Marshlands --- NPC: Beastmen_s_Banner --- !pos -172.764 25.119 93.640 109 ------------------------------------ -local ID = zones[xi.zone.PASHHOW_MARSHLANDS] ------------------------------------ ----@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/Pashhow_Marshlands/npcs/Cavernous_Maw.lua b/scripts/zones/Pashhow_Marshlands/npcs/Cavernous_Maw.lua index 48d7094f1cb..5e960c4717f 100644 --- a/scripts/zones/Pashhow_Marshlands/npcs/Cavernous_Maw.lua +++ b/scripts/zones/Pashhow_Marshlands/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/Pashhow_Marshlands/npcs/Field_Manual.lua b/scripts/zones/Pashhow_Marshlands/npcs/Field_Manual.lua index 752c2210b8c..1860168c340 100644 --- a/scripts/zones/Pashhow_Marshlands/npcs/Field_Manual.lua +++ b/scripts/zones/Pashhow_Marshlands/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/Pashhow_Marshlands/npcs/Luck_Rune.lua b/scripts/zones/Pashhow_Marshlands/npcs/Luck_Rune.lua deleted file mode 100644 index c0378435642..00000000000 --- a/scripts/zones/Pashhow_Marshlands/npcs/Luck_Rune.lua +++ /dev/null @@ -1,25 +0,0 @@ ------------------------------------ --- Area: Pashhow Marshlands --- NPC: Luck Rune --- Involved in Quest: Mhaura Fortune --- !pos 573.245 24.999 199.560 109 ------------------------------------ -local ID = zones[xi.zone.PASHHOW_MARSHLANDS] ------------------------------------ ----@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/Pashhow_Marshlands/npcs/Meh_Nbolo.lua b/scripts/zones/Pashhow_Marshlands/npcs/Meh_Nbolo.lua deleted file mode 100644 index ff4a6777101..00000000000 --- a/scripts/zones/Pashhow_Marshlands/npcs/Meh_Nbolo.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Pashhow Marshlands --- NPC: Meh Nbolo --- Type: Armor Storer --- !pos 80.899 23.999 176.643 109 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(27) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Pashhow_Marshlands/npcs/Stone_Monument.lua b/scripts/zones/Pashhow_Marshlands/npcs/Stone_Monument.lua index efc6b8dcd0c..144dbcfa344 100644 --- a/scripts/zones/Pashhow_Marshlands/npcs/Stone_Monument.lua +++ b/scripts/zones/Pashhow_Marshlands/npcs/Stone_Monument.lua @@ -17,14 +17,4 @@ entity.onTrade = function(player, npc, trade) end end -entity.onTrigger = function(player, npc) - player:startEvent(900) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Pashhow_Marshlands/npcs/Tahmasp.lua b/scripts/zones/Pashhow_Marshlands/npcs/Tahmasp.lua index db14c8d044d..fd80f82e736 100644 --- a/scripts/zones/Pashhow_Marshlands/npcs/Tahmasp.lua +++ b/scripts/zones/Pashhow_Marshlands/npcs/Tahmasp.lua @@ -10,9 +10,6 @@ local entity = {} local vendorRegion = xi.region.DERFLAND 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/Pashhow_Marshlands/npcs/Treasure_Casket.lua b/scripts/zones/Pashhow_Marshlands/npcs/Treasure_Casket.lua index 252c5ca0e46..044d5b74791 100644 --- a/scripts/zones/Pashhow_Marshlands/npcs/Treasure_Casket.lua +++ b/scripts/zones/Pashhow_Marshlands/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/Pashhow_Marshlands_[S]/npcs/Cavernous_Maw.lua b/scripts/zones/Pashhow_Marshlands_[S]/npcs/Cavernous_Maw.lua index 96dad20d678..ac4c13dfa9f 100644 --- a/scripts/zones/Pashhow_Marshlands_[S]/npcs/Cavernous_Maw.lua +++ b/scripts/zones/Pashhow_Marshlands_[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/Pashhow_Marshlands_[S]/npcs/Corroded_Door.lua b/scripts/zones/Pashhow_Marshlands_[S]/npcs/Corroded_Door.lua index 35c757b1acf..eadcdd7afdc 100644 --- a/scripts/zones/Pashhow_Marshlands_[S]/npcs/Corroded_Door.lua +++ b/scripts/zones/Pashhow_Marshlands_[S]/npcs/Corroded_Door.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.PASHHOW_MARSHLANDS_S] ---@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.RUHOTZ_SILVERMINES) then player:messageSpecial(ID.text.NOTHING_OUT_OF_ORDINARY) -- TODO: confirm this diff --git a/scripts/zones/Pashhow_Marshlands_[S]/npcs/Corroded_Gate.lua b/scripts/zones/Pashhow_Marshlands_[S]/npcs/Corroded_Gate.lua index feec8f836ac..2e2cfd4089e 100644 --- a/scripts/zones/Pashhow_Marshlands_[S]/npcs/Corroded_Gate.lua +++ b/scripts/zones/Pashhow_Marshlands_[S]/npcs/Corroded_Gate.lua @@ -5,16 +5,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(102) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 102 and diff --git a/scripts/zones/Pashhow_Marshlands_[S]/npcs/Indescript_Markings.lua b/scripts/zones/Pashhow_Marshlands_[S]/npcs/Indescript_Markings.lua index 11b082141af..c3d065a263e 100644 --- a/scripts/zones/Pashhow_Marshlands_[S]/npcs/Indescript_Markings.lua +++ b/scripts/zones/Pashhow_Marshlands_[S]/npcs/Indescript_Markings.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.PASHHOW_MARSHLANDS_S] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local offset = npc:getID() - ID.npc.INDESCRIPT_MARKINGS_OFFSET local pantsQuestProgress = player:getCharVar('AF_SCH_PANTS') @@ -74,10 +71,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option) -end - return entity diff --git a/scripts/zones/Pashhow_Marshlands_[S]/npcs/Milloure.lua b/scripts/zones/Pashhow_Marshlands_[S]/npcs/Milloure.lua index cb6f6783738..43b5536403d 100644 --- a/scripts/zones/Pashhow_Marshlands_[S]/npcs/Milloure.lua +++ b/scripts/zones/Pashhow_Marshlands_[S]/npcs/Milloure.lua @@ -10,16 +10,10 @@ local entity = {} local eventSucceed = 103 local eventFail = 104 -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/Pashhow_Marshlands_[S]/npcs/Telepoint.lua b/scripts/zones/Pashhow_Marshlands_[S]/npcs/Telepoint.lua index 88113cf0b7f..27d0bb0c974 100644 --- a/scripts/zones/Pashhow_Marshlands_[S]/npcs/Telepoint.lua +++ b/scripts/zones/Pashhow_Marshlands_[S]/npcs/Telepoint.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.PASHHOW_MARSHLANDS_S] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if not player:hasKeyItem(xi.ki.PASHHOW_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.PASHHOW_GATE_CRYSTAL) diff --git a/scripts/zones/Pashhow_Marshlands_[S]/npcs/qm1.lua b/scripts/zones/Pashhow_Marshlands_[S]/npcs/qm1.lua index e56558bae58..4467b5bf1da 100644 --- a/scripts/zones/Pashhow_Marshlands_[S]/npcs/qm1.lua +++ b/scripts/zones/Pashhow_Marshlands_[S]/npcs/qm1.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/Periqia/npcs/Rune_of_Release.lua b/scripts/zones/Periqia/npcs/Rune_of_Release.lua index eb29512f9ea..5aae31a833d 100644 --- a/scripts/zones/Periqia/npcs/Rune_of_Release.lua +++ b/scripts/zones/Periqia/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.CAEDARVA_MIRE) xi.assault.runeReleaseFinish(player, csid, option, npc) diff --git a/scripts/zones/Phanauet_Channel/DefaultActions.lua b/scripts/zones/Phanauet_Channel/DefaultActions.lua new file mode 100644 index 00000000000..aed76c444ab --- /dev/null +++ b/scripts/zones/Phanauet_Channel/DefaultActions.lua @@ -0,0 +1,7 @@ +local ID = zones[xi.zone.PHANAUET_CHANNEL] + +return { + ['Ineuteniace'] = { event = 101 }, + ['Laiteconce'] = { event = 1 }, + ['Luquillaue'] = { event = 3 }, +} diff --git a/scripts/zones/Phanauet_Channel/npcs/Ineuteniace.lua b/scripts/zones/Phanauet_Channel/npcs/Ineuteniace.lua deleted file mode 100644 index 63456622a8a..00000000000 --- a/scripts/zones/Phanauet_Channel/npcs/Ineuteniace.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Phanauet Channel --- NPC: Ineuteniace --- !pos 11.701 -3 1.360 1 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(101) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Phanauet_Channel/npcs/Laiteconce.lua b/scripts/zones/Phanauet_Channel/npcs/Laiteconce.lua deleted file mode 100644 index 7ecd45ce86c..00000000000 --- a/scripts/zones/Phanauet_Channel/npcs/Laiteconce.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Phanauet Channel --- NPC: Laiteconce --- !pos 4.066 -4.5 -10.450 1 ------------------------------------ ----@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/Phanauet_Channel/npcs/Luquillaue.lua b/scripts/zones/Phanauet_Channel/npcs/Luquillaue.lua deleted file mode 100644 index 172176c21c7..00000000000 --- a/scripts/zones/Phanauet_Channel/npcs/Luquillaue.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Phanauet Channel --- NPC: Luquillaue --- Type: Adventurer's Assistant --- !pos 4.066 -4.5 -10.450 1 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(3) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Phomiuna_Aqueducts/DefaultActions.lua b/scripts/zones/Phomiuna_Aqueducts/DefaultActions.lua index 05e475c5558..8ca14f7cd88 100644 --- a/scripts/zones/Phomiuna_Aqueducts/DefaultActions.lua +++ b/scripts/zones/Phomiuna_Aqueducts/DefaultActions.lua @@ -1,5 +1,6 @@ local ID = zones[xi.zone.PHOMIUNA_AQUEDUCTS] return { - ['_0r5'] = { messageSpecial = ID.text.DOOR_FIRMLY_SHUT }, + ['_0r5'] = { messageSpecial = ID.text.DOOR_FIRMLY_SHUT }, + ['qm_torches_hint'] = { event = 56 }, } diff --git a/scripts/zones/Phomiuna_Aqueducts/npcs/Wooden_Ladder.lua b/scripts/zones/Phomiuna_Aqueducts/npcs/Wooden_Ladder.lua index 96dbe70fe8d..05401e83bc4 100644 --- a/scripts/zones/Phomiuna_Aqueducts/npcs/Wooden_Ladder.lua +++ b/scripts/zones/Phomiuna_Aqueducts/npcs/Wooden_Ladder.lua @@ -56,9 +56,6 @@ local function isNpcInBounds(npcXpos, npcYpos, npcZpos, ladderTable) return false end -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local xPos = player:getXPos() local yPos = player:getYPos() @@ -84,9 +81,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 35 then xi.mission.setVar(player, xi.mission.log_id.COP, xi.mission.id.cop.DISTANT_BELIEFS, 'Status', 2) diff --git a/scripts/zones/Phomiuna_Aqueducts/npcs/_0r0.lua b/scripts/zones/Phomiuna_Aqueducts/npcs/_0r0.lua index 42b6e4fb002..17e4432bb31 100644 --- a/scripts/zones/Phomiuna_Aqueducts/npcs/_0r0.lua +++ b/scripts/zones/Phomiuna_Aqueducts/npcs/_0r0.lua @@ -6,19 +6,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if npc:getAnimation() == 9 then npc:openDoor() 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/Phomiuna_Aqueducts/npcs/_0r1.lua b/scripts/zones/Phomiuna_Aqueducts/npcs/_0r1.lua index 6ee5fa9d5a7..00c53c68cd2 100644 --- a/scripts/zones/Phomiuna_Aqueducts/npcs/_0r1.lua +++ b/scripts/zones/Phomiuna_Aqueducts/npcs/_0r1.lua @@ -6,19 +6,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if npc:getAnimation() == 9 then npc:openDoor() 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/Phomiuna_Aqueducts/npcs/_0r2.lua b/scripts/zones/Phomiuna_Aqueducts/npcs/_0r2.lua index 211d53ac33a..ecc51e3010c 100644 --- a/scripts/zones/Phomiuna_Aqueducts/npcs/_0r2.lua +++ b/scripts/zones/Phomiuna_Aqueducts/npcs/_0r2.lua @@ -6,19 +6,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if npc:getAnimation() == 9 then npc:openDoor() 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/Phomiuna_Aqueducts/npcs/_0r4.lua b/scripts/zones/Phomiuna_Aqueducts/npcs/_0r4.lua index 536f1e770db..1f1d3840306 100644 --- a/scripts/zones/Phomiuna_Aqueducts/npcs/_0r4.lua +++ b/scripts/zones/Phomiuna_Aqueducts/npcs/_0r4.lua @@ -6,19 +6,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if npc:getAnimation() == 9 then npc:openDoor() 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/Phomiuna_Aqueducts/npcs/_0r6.lua b/scripts/zones/Phomiuna_Aqueducts/npcs/_0r6.lua index fb965426dda..b1a0e74bd5a 100644 --- a/scripts/zones/Phomiuna_Aqueducts/npcs/_0r6.lua +++ b/scripts/zones/Phomiuna_Aqueducts/npcs/_0r6.lua @@ -6,19 +6,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if npc:getAnimation() == 9 then npc:openDoor() 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/Phomiuna_Aqueducts/npcs/_0r7.lua b/scripts/zones/Phomiuna_Aqueducts/npcs/_0r7.lua index 5883411bdd4..c50b5e11e5f 100644 --- a/scripts/zones/Phomiuna_Aqueducts/npcs/_0r7.lua +++ b/scripts/zones/Phomiuna_Aqueducts/npcs/_0r7.lua @@ -6,19 +6,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if npc:getAnimation() == 9 then npc:openDoor() 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/Phomiuna_Aqueducts/npcs/_0r8.lua b/scripts/zones/Phomiuna_Aqueducts/npcs/_0r8.lua index cbb343f6bdc..6ae0b4d84a7 100644 --- a/scripts/zones/Phomiuna_Aqueducts/npcs/_0r8.lua +++ b/scripts/zones/Phomiuna_Aqueducts/npcs/_0r8.lua @@ -6,19 +6,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if npc:getAnimation() == 9 then npc:openDoor() 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/Phomiuna_Aqueducts/npcs/_0r9.lua b/scripts/zones/Phomiuna_Aqueducts/npcs/_0r9.lua index 81da712cf46..a0353eb644c 100644 --- a/scripts/zones/Phomiuna_Aqueducts/npcs/_0r9.lua +++ b/scripts/zones/Phomiuna_Aqueducts/npcs/_0r9.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getCharVar('X_MARKS_THE_SPOT') == 4 then player:startEvent(37) @@ -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 == 37 then player:setCharVar('X_MARKS_THE_SPOT', 5) diff --git a/scripts/zones/Phomiuna_Aqueducts/npcs/_0ra.lua b/scripts/zones/Phomiuna_Aqueducts/npcs/_0ra.lua index 82d863f6456..c52d2c8a526 100644 --- a/scripts/zones/Phomiuna_Aqueducts/npcs/_0ra.lua +++ b/scripts/zones/Phomiuna_Aqueducts/npcs/_0ra.lua @@ -6,19 +6,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if npc:getAnimation() == 9 then npc:openDoor() 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/Phomiuna_Aqueducts/npcs/_0rb.lua b/scripts/zones/Phomiuna_Aqueducts/npcs/_0rb.lua index 01f202d9a49..2aeadfa971e 100644 --- a/scripts/zones/Phomiuna_Aqueducts/npcs/_0rb.lua +++ b/scripts/zones/Phomiuna_Aqueducts/npcs/_0rb.lua @@ -6,19 +6,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if npc:getAnimation() == 9 then npc:openDoor() 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/Phomiuna_Aqueducts/npcs/_0rm.lua b/scripts/zones/Phomiuna_Aqueducts/npcs/_0rm.lua index 2c0769cd692..a01d414e592 100644 --- a/scripts/zones/Phomiuna_Aqueducts/npcs/_0rm.lua +++ b/scripts/zones/Phomiuna_Aqueducts/npcs/_0rm.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local DoorOffset = npc:getID() - 1 @@ -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/Phomiuna_Aqueducts/npcs/_0rn.lua b/scripts/zones/Phomiuna_Aqueducts/npcs/_0rn.lua index 937b2348bfb..b686bf2090d 100644 --- a/scripts/zones/Phomiuna_Aqueducts/npcs/_0rn.lua +++ b/scripts/zones/Phomiuna_Aqueducts/npcs/_0rn.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.PHOMIUNA_AQUEDUCTS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local doorOffset = npc:getID() @@ -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/Phomiuna_Aqueducts/npcs/_0ro.lua b/scripts/zones/Phomiuna_Aqueducts/npcs/_0ro.lua index 35f92d4af1c..dbdb6f0792d 100644 --- a/scripts/zones/Phomiuna_Aqueducts/npcs/_0ro.lua +++ b/scripts/zones/Phomiuna_Aqueducts/npcs/_0ro.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.PHOMIUNA_AQUEDUCTS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local doorOffset = npc:getID() @@ -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/Phomiuna_Aqueducts/npcs/_0rp.lua b/scripts/zones/Phomiuna_Aqueducts/npcs/_0rp.lua index 374076fc628..73dc0d9e0f8 100644 --- a/scripts/zones/Phomiuna_Aqueducts/npcs/_0rp.lua +++ b/scripts/zones/Phomiuna_Aqueducts/npcs/_0rp.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.PHOMIUNA_AQUEDUCTS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local doorOffset = npc:getID() @@ -30,10 +27,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Phomiuna_Aqueducts/npcs/_0rq.lua b/scripts/zones/Phomiuna_Aqueducts/npcs/_0rq.lua index b6423fa42e0..d474cc5f770 100644 --- a/scripts/zones/Phomiuna_Aqueducts/npcs/_0rq.lua +++ b/scripts/zones/Phomiuna_Aqueducts/npcs/_0rq.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.PHOMIUNA_AQUEDUCTS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local doorOffset = npc:getID() @@ -30,10 +27,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Phomiuna_Aqueducts/npcs/_0rr.lua b/scripts/zones/Phomiuna_Aqueducts/npcs/_0rr.lua index b4cf0f73103..088cb95865f 100644 --- a/scripts/zones/Phomiuna_Aqueducts/npcs/_0rr.lua +++ b/scripts/zones/Phomiuna_Aqueducts/npcs/_0rr.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.PHOMIUNA_AQUEDUCTS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local doorOffset = npc:getID() @@ -30,10 +27,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Phomiuna_Aqueducts/npcs/_0rs.lua b/scripts/zones/Phomiuna_Aqueducts/npcs/_0rs.lua index 710469e6acb..f9a576425fb 100644 --- a/scripts/zones/Phomiuna_Aqueducts/npcs/_0rs.lua +++ b/scripts/zones/Phomiuna_Aqueducts/npcs/_0rs.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.PHOMIUNA_AQUEDUCTS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local doorOffset = npc:getID() @@ -30,10 +27,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Phomiuna_Aqueducts/npcs/_0rt.lua b/scripts/zones/Phomiuna_Aqueducts/npcs/_0rt.lua index 1938461c3c9..a5d1f08aca8 100644 --- a/scripts/zones/Phomiuna_Aqueducts/npcs/_0rt.lua +++ b/scripts/zones/Phomiuna_Aqueducts/npcs/_0rt.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.PHOMIUNA_AQUEDUCTS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local doorOffset = npc:getID() @@ -30,10 +27,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Phomiuna_Aqueducts/npcs/_0ru.lua b/scripts/zones/Phomiuna_Aqueducts/npcs/_0ru.lua index 4600f976fd6..2e37670d425 100644 --- a/scripts/zones/Phomiuna_Aqueducts/npcs/_0ru.lua +++ b/scripts/zones/Phomiuna_Aqueducts/npcs/_0ru.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.PHOMIUNA_AQUEDUCTS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local doorOffset = npc:getID() @@ -30,10 +27,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Phomiuna_Aqueducts/npcs/_0rv.lua b/scripts/zones/Phomiuna_Aqueducts/npcs/_0rv.lua index ff6b0c30579..9a0748a969f 100644 --- a/scripts/zones/Phomiuna_Aqueducts/npcs/_0rv.lua +++ b/scripts/zones/Phomiuna_Aqueducts/npcs/_0rv.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local DoorOffset = npc:getID() - 1 @@ -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/Phomiuna_Aqueducts/npcs/_0rw.lua b/scripts/zones/Phomiuna_Aqueducts/npcs/_0rw.lua index 64f765b9934..4cbc5e03b4b 100644 --- a/scripts/zones/Phomiuna_Aqueducts/npcs/_0rw.lua +++ b/scripts/zones/Phomiuna_Aqueducts/npcs/_0rw.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local DoorOffset = npc:getID() - 1 @@ -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/Phomiuna_Aqueducts/npcs/_0rx.lua b/scripts/zones/Phomiuna_Aqueducts/npcs/_0rx.lua index 77bafc97d0e..351fa512648 100644 --- a/scripts/zones/Phomiuna_Aqueducts/npcs/_0rx.lua +++ b/scripts/zones/Phomiuna_Aqueducts/npcs/_0rx.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.PHOMIUNA_AQUEDUCTS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local DoorOffset = npc:getID() @@ -30,10 +27,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Phomiuna_Aqueducts/npcs/_0ry.lua b/scripts/zones/Phomiuna_Aqueducts/npcs/_0ry.lua index 7a0689fbd5e..52aa599516b 100644 --- a/scripts/zones/Phomiuna_Aqueducts/npcs/_0ry.lua +++ b/scripts/zones/Phomiuna_Aqueducts/npcs/_0ry.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.PHOMIUNA_AQUEDUCTS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local DoorOffset = npc:getID() @@ -30,10 +27,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Phomiuna_Aqueducts/npcs/_0rz.lua b/scripts/zones/Phomiuna_Aqueducts/npcs/_0rz.lua index e0f739b58df..2e1de49fef0 100644 --- a/scripts/zones/Phomiuna_Aqueducts/npcs/_0rz.lua +++ b/scripts/zones/Phomiuna_Aqueducts/npcs/_0rz.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.PHOMIUNA_AQUEDUCTS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local DoorOffset = npc:getID() @@ -30,10 +27,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Phomiuna_Aqueducts/npcs/_ir0.lua b/scripts/zones/Phomiuna_Aqueducts/npcs/_ir0.lua index 7a9c9ffcaf5..c874b8f9f6b 100644 --- a/scripts/zones/Phomiuna_Aqueducts/npcs/_ir0.lua +++ b/scripts/zones/Phomiuna_Aqueducts/npcs/_ir0.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.PHOMIUNA_AQUEDUCTS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local DoorOffset = npc:getID() @@ -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/Phomiuna_Aqueducts/npcs/_ir1.lua b/scripts/zones/Phomiuna_Aqueducts/npcs/_ir1.lua index e91bf1f13b6..25804bbd60e 100644 --- a/scripts/zones/Phomiuna_Aqueducts/npcs/_ir1.lua +++ b/scripts/zones/Phomiuna_Aqueducts/npcs/_ir1.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.PHOMIUNA_AQUEDUCTS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local DoorOffset = npc:getID() @@ -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/Phomiuna_Aqueducts/npcs/_ir2.lua b/scripts/zones/Phomiuna_Aqueducts/npcs/_ir2.lua index 48afac18da5..9933c58f57a 100644 --- a/scripts/zones/Phomiuna_Aqueducts/npcs/_ir2.lua +++ b/scripts/zones/Phomiuna_Aqueducts/npcs/_ir2.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.PHOMIUNA_AQUEDUCTS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local DoorOffset = npc:getID() @@ -30,10 +27,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Phomiuna_Aqueducts/npcs/_ir3.lua b/scripts/zones/Phomiuna_Aqueducts/npcs/_ir3.lua index 6cc40f54ced..3e73abd5a1e 100644 --- a/scripts/zones/Phomiuna_Aqueducts/npcs/_ir3.lua +++ b/scripts/zones/Phomiuna_Aqueducts/npcs/_ir3.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.PHOMIUNA_AQUEDUCTS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local DoorOffset = npc:getID() @@ -30,10 +27,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Phomiuna_Aqueducts/npcs/_ir4.lua b/scripts/zones/Phomiuna_Aqueducts/npcs/_ir4.lua index 5d630cb3279..51e2fc3aa02 100644 --- a/scripts/zones/Phomiuna_Aqueducts/npcs/_ir4.lua +++ b/scripts/zones/Phomiuna_Aqueducts/npcs/_ir4.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.PHOMIUNA_AQUEDUCTS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local DoorOffset = npc:getID() @@ -30,10 +27,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Phomiuna_Aqueducts/npcs/_ir5.lua b/scripts/zones/Phomiuna_Aqueducts/npcs/_ir5.lua index b044ddd18ac..619f5a2587d 100644 --- a/scripts/zones/Phomiuna_Aqueducts/npcs/_ir5.lua +++ b/scripts/zones/Phomiuna_Aqueducts/npcs/_ir5.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local DoorOffset = npc:getID() - 1 @@ -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/Phomiuna_Aqueducts/npcs/_ir7.lua b/scripts/zones/Phomiuna_Aqueducts/npcs/_ir7.lua index cff02c0439b..4b2376ae383 100644 --- a/scripts/zones/Phomiuna_Aqueducts/npcs/_ir7.lua +++ b/scripts/zones/Phomiuna_Aqueducts/npcs/_ir7.lua @@ -36,10 +36,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/Phomiuna_Aqueducts/npcs/_ir9.lua b/scripts/zones/Phomiuna_Aqueducts/npcs/_ir9.lua index 0a05f04ef6b..f6e16a3b0f0 100644 --- a/scripts/zones/Phomiuna_Aqueducts/npcs/_ir9.lua +++ b/scripts/zones/Phomiuna_Aqueducts/npcs/_ir9.lua @@ -36,10 +36,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/Phomiuna_Aqueducts/npcs/qm_east_door_f7.lua b/scripts/zones/Phomiuna_Aqueducts/npcs/qm_east_door_f7.lua index f0e1e60b9f3..841c6955ce8 100644 --- a/scripts/zones/Phomiuna_Aqueducts/npcs/qm_east_door_f7.lua +++ b/scripts/zones/Phomiuna_Aqueducts/npcs/qm_east_door_f7.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local door = GetNPCByID(npc:getID() - 1) @@ -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 == 50 then local door = GetNPCByID(npc:getID() - 1) diff --git a/scripts/zones/Phomiuna_Aqueducts/npcs/qm_east_door_f8.lua b/scripts/zones/Phomiuna_Aqueducts/npcs/qm_east_door_f8.lua index 1e8d552aa82..a9b7130088e 100644 --- a/scripts/zones/Phomiuna_Aqueducts/npcs/qm_east_door_f8.lua +++ b/scripts/zones/Phomiuna_Aqueducts/npcs/qm_east_door_f8.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local xPos = player:getXPos() local door = GetNPCByID(npc:getID() - 1) @@ -23,10 +20,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Phomiuna_Aqueducts/npcs/qm_map_of_aqueducts.lua b/scripts/zones/Phomiuna_Aqueducts/npcs/qm_map_of_aqueducts.lua index bc23b7e637c..e13017df495 100644 --- a/scripts/zones/Phomiuna_Aqueducts/npcs/qm_map_of_aqueducts.lua +++ b/scripts/zones/Phomiuna_Aqueducts/npcs/qm_map_of_aqueducts.lua @@ -10,9 +10,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if not player:hasKeyItem(xi.ki.MAP_OF_THE_AQUEDUCTS) then npcUtil.giveKeyItem(player, xi.ki.MAP_OF_THE_AQUEDUCTS) @@ -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/Phomiuna_Aqueducts/npcs/qm_north_door_j9.lua b/scripts/zones/Phomiuna_Aqueducts/npcs/qm_north_door_j9.lua index f9bc1f95260..fa0eb792235 100644 --- a/scripts/zones/Phomiuna_Aqueducts/npcs/qm_north_door_j9.lua +++ b/scripts/zones/Phomiuna_Aqueducts/npcs/qm_north_door_j9.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local door = GetNPCByID(npc:getID() - 2) @@ -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/Phomiuna_Aqueducts/npcs/qm_south_door_f7.lua b/scripts/zones/Phomiuna_Aqueducts/npcs/qm_south_door_f7.lua index 81e060e6f97..4ce7ee6803a 100644 --- a/scripts/zones/Phomiuna_Aqueducts/npcs/qm_south_door_f7.lua +++ b/scripts/zones/Phomiuna_Aqueducts/npcs/qm_south_door_f7.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local door = GetNPCByID(npc:getID() - 2) @@ -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 == 51 then local door = GetNPCByID(npc:getID() - 2) diff --git a/scripts/zones/Phomiuna_Aqueducts/npcs/qm_torches_hint.lua b/scripts/zones/Phomiuna_Aqueducts/npcs/qm_torches_hint.lua deleted file mode 100644 index 21c109df566..00000000000 --- a/scripts/zones/Phomiuna_Aqueducts/npcs/qm_torches_hint.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Phomiuna Aqueducts --- NPC: qm_torches_hint (???) --- Notes: gives player hint about elemental correlation between the torches and how to open the path to the ornate gates --- !pos 83.219 -25.047 8.010 27 ------------------------------------ ----@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/Phomiuna_Aqueducts/npcs/qm_west_door_j8.lua b/scripts/zones/Phomiuna_Aqueducts/npcs/qm_west_door_j8.lua index 4f63813d15b..e2de0e5dd3d 100644 --- a/scripts/zones/Phomiuna_Aqueducts/npcs/qm_west_door_j8.lua +++ b/scripts/zones/Phomiuna_Aqueducts/npcs/qm_west_door_j8.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local xPos = player:getXPos() local door = GetNPCByID(npc:getID() - 1) @@ -23,10 +20,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Phomiuna_Aqueducts/npcs/qm_west_door_j9.lua b/scripts/zones/Phomiuna_Aqueducts/npcs/qm_west_door_j9.lua index 75d49f0e1cc..2f8b95b5fc2 100644 --- a/scripts/zones/Phomiuna_Aqueducts/npcs/qm_west_door_j9.lua +++ b/scripts/zones/Phomiuna_Aqueducts/npcs/qm_west_door_j9.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local door = GetNPCByID(npc:getID() - 1) @@ -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 From 8e3eef25494503605dc8af2d17e2ec3b55d7cd76 Mon Sep 17 00:00:00 2001 From: claywar Date: Thu, 23 Jan 2025 10:02:49 -0500 Subject: [PATCH 2/3] Remove empty NPCs, add Default Actions - N. Gusta ~ N. San d'Oria --- .../zones/North_Gustaberg/DefaultActions.lua | 6 ++-- .../North_Gustaberg/npcs/Cavernous_Maw.lua | 6 ---- .../North_Gustaberg/npcs/Cavernous_Maw_2.lua | 6 ---- .../North_Gustaberg/npcs/Field_Manual.lua | 3 -- .../North_Gustaberg/npcs/Field_Parchment.lua | 23 ------------- .../North_Gustaberg/npcs/Goblin_Footprint.lua | 3 -- scripts/zones/North_Gustaberg/npcs/Kuleo.lua | 3 -- .../North_Gustaberg/npcs/Lyco_Sparkles_0.lua | 3 -- .../North_Gustaberg/npcs/Lyco_Sparkles_1.lua | 3 -- .../North_Gustaberg/npcs/Stone_Monument.lua | 10 ------ .../North_Gustaberg/npcs/Treasure_Casket.lua | 3 -- scripts/zones/North_Gustaberg/npcs/qm1.lua | 6 ---- scripts/zones/North_Gustaberg/npcs/relic.lua | 3 -- .../North_Gustaberg_[S]/npcs/Barricade.lua | 6 ---- .../npcs/Cavernous_Maw.lua | 6 ---- .../North_Gustaberg_[S]/npcs/Gebhardt.lua | 6 ---- .../North_Gustaberg_[S]/npcs/Lycopodium.lua | 6 ---- .../North_Gustaberg_[S]/npcs/Mining_Point.lua | 6 ---- .../North_Gustaberg_[S]/npcs/Roderich.lua | 6 ---- .../North_Gustaberg_[S]/npcs/Solitary_Ant.lua | 9 ------ .../npcs/Stonehoused_Adit.lua | 3 -- .../zones/North_Gustaberg_[S]/npcs/qm1.lua | 6 ---- .../Northern_San_dOria/DefaultActions.lua | 32 +++++++++++++++++++ .../Northern_San_dOria/npcs/AMAN_Liaison.lua | 3 -- .../Northern_San_dOria/npcs/Ailbeche.lua | 3 -- .../npcs/Alphollon_C_Meriard.lua | 3 -- .../Northern_San_dOria/npcs/Amarefice.lua | 6 ---- .../Northern_San_dOria/npcs/Anieuvansand.lua | 22 ------------- .../zones/Northern_San_dOria/npcs/Anilla.lua | 6 ---- .../Northern_San_dOria/npcs/Antonian.lua | 6 ---- .../Northern_San_dOria/npcs/Arachagnon.lua | 9 ------ .../zones/Northern_San_dOria/npcs/Arlenne.lua | 9 ------ .../zones/Northern_San_dOria/npcs/Arnau.lua | 24 -------------- .../Northern_San_dOria/npcs/Attarena.lua | 6 ---- .../zones/Northern_San_dOria/npcs/Aurege.lua | 6 ---- .../zones/Northern_San_dOria/npcs/Baraka.lua | 19 +++-------- .../Northern_San_dOria/npcs/Beadurinc.lua | 6 ---- .../Northern_San_dOria/npcs/Belgidiveau.lua | 6 ---- .../Northern_San_dOria/npcs/Beriphaule.lua | 6 ---- .../Northern_San_dOria/npcs/Bertenont.lua | 6 ---- .../zones/Northern_San_dOria/npcs/Boncort.lua | 6 ---- .../Northern_San_dOria/npcs/Calovour.lua | 21 ------------ .../zones/Northern_San_dOria/npcs/Capiria.lua | 11 ------- .../Northern_San_dOria/npcs/Castilchat.lua | 3 -- .../Northern_San_dOria/npcs/Cauzeriste.lua | 9 ------ .../Northern_San_dOria/npcs/Charlaimagnat.lua | 6 ---- .../Northern_San_dOria/npcs/Charmealaut.lua | 23 ------------- .../Northern_San_dOria/npcs/Chaupire.lua | 9 ------ .../Northern_San_dOria/npcs/Cheupirudaux.lua | 3 -- .../Northern_San_dOria/npcs/Commojourt.lua | 9 ------ .../Northern_San_dOria/npcs/Coullene.lua | 11 ------- .../Northern_San_dOria/npcs/Danngogg.lua | 21 ------------ .../Northern_San_dOria/npcs/Dapraugeant.lua | 21 ------------ .../Northern_San_dOria/npcs/Dauperiat.lua | 3 -- .../Northern_San_dOria/npcs/Daveille.lua | 21 ------------ .../Northern_San_dOria/npcs/Doggomehr.lua | 9 ------ .../zones/Northern_San_dOria/npcs/Durogg.lua | 3 -- .../zones/Northern_San_dOria/npcs/Elesca.lua | 6 ---- .../Northern_San_dOria/npcs/Emeige_AMAN.lua | 6 ---- .../zones/Northern_San_dOria/npcs/Eperdur.lua | 6 ---- .../Northern_San_dOria/npcs/Esqualea.lua | 21 ------------ .../Northern_San_dOria/npcs/Eugballion.lua | 9 ------ .../Northern_San_dOria/npcs/Excenmille.lua | 6 ---- .../npcs/Explorer_Moogle.lua | 6 ---- .../Northern_San_dOria/npcs/Fantarviont.lua | 21 ------------ .../zones/Northern_San_dOria/npcs/Galahad.lua | 25 --------------- .../Northern_San_dOria/npcs/Gaudylox.lua | 9 ------ .../zones/Northern_San_dOria/npcs/Giaunne.lua | 6 ---- .../Northern_San_dOria/npcs/Greubaque.lua | 6 ---- .../zones/Northern_San_dOria/npcs/Grilau.lua | 6 ---- .../Northern_San_dOria/npcs/Guilberdrier.lua | 3 -- .../zones/Northern_San_dOria/npcs/Gulmama.lua | 6 ---- .../Northern_San_dOria/npcs/Halaviabeau.lua | 21 ------------ .../zones/Northern_San_dOria/npcs/Helaku.lua | 22 ------------- .../Northern_San_dOria/npcs/Heruze-Moruze.lua | 9 ------ .../Northern_San_dOria/npcs/Hunt_Registry.lua | 3 -- .../zones/Northern_San_dOria/npcs/Icoua.lua | 22 ------------- .../zones/Northern_San_dOria/npcs/Jufaue.lua | 23 ------------- .../zones/Northern_San_dOria/npcs/Justi.lua | 9 ------ .../Northern_San_dOria/npcs/Letterare.lua | 21 ------------ .../zones/Northern_San_dOria/npcs/Lotine.lua | 9 ------ .../Northern_San_dOria/npcs/Lucretia.lua | 9 ------ .../Northern_San_dOria/npcs/Machella.lua | 21 ------------ .../Northern_San_dOria/npcs/Madaline.lua | 9 ------ .../Northern_San_dOria/npcs/Maloquedil.lua | 3 -- .../Northern_San_dOria/npcs/Matildie.lua | 7 ---- .../Northern_San_dOria/npcs/Mevaloud.lua | 21 ------------ .../Northern_San_dOria/npcs/Mevreauche.lua | 3 -- .../zones/Northern_San_dOria/npcs/Miaux.lua | 6 ---- .../Northern_San_dOria/npcs/Millechuca.lua | 9 ------ .../zones/Northern_San_dOria/npcs/Morjean.lua | 6 ---- .../Northern_San_dOria/npcs/Morunaude.lua | 21 ------------ .../Northern_San_dOria/npcs/Mulaujeant.lua | 6 ---- .../Northern_San_dOria/npcs/Narcheral.lua | 3 -- .../Northern_San_dOria/npcs/Narsaude.lua | 21 ------------ .../Northern_San_dOria/npcs/Nonterene.lua | 9 ------ .../Northern_San_dOria/npcs/Olbergieut.lua | 6 ---- .../Northern_San_dOria/npcs/Pagisalis.lua | 3 -- .../Northern_San_dOria/npcs/Pala_Korin.lua | 21 ------------ .../Northern_San_dOria/npcs/Palguevion.lua | 9 ------ .../Northern_San_dOria/npcs/Phairupegiont.lua | 6 ---- .../zones/Northern_San_dOria/npcs/Pikiki.lua | 21 ------------ .../Northern_San_dOria/npcs/Pinok-Morok.lua | 6 ---- .../Northern_San_dOria/npcs/Pirvidiauce.lua | 9 ------ .../Northern_San_dOria/npcs/Pontaudarme.lua | 22 ------------- .../zones/Northern_San_dOria/npcs/Pulloie.lua | 9 ------ .../Northern_San_dOria/npcs/Pursuivant.lua | 22 ------------- .../zones/Northern_San_dOria/npcs/Ramua.lua | 6 ---- .../Northern_San_dOria/npcs/Rondipur.lua | 23 ------------- .../Northern_San_dOria/npcs/Ronpaurege.lua | 22 ------------- .../Northern_San_dOria/npcs/Secodiand.lua | 3 -- .../zones/Northern_San_dOria/npcs/Shakir.lua | 22 ------------- .../npcs/Shomo_Pochachilo.lua | 9 ------ .../npcs/Symphonic_Curator.lua | 3 -- .../npcs/Synergy_Engineer.lua | 22 ------------- .../Northern_San_dOria/npcs/Taurette.lua | 23 ------------- .../Northern_San_dOria/npcs/Tavourine.lua | 9 ------ .../zones/Northern_San_dOria/npcs/Telmoda.lua | 9 ------ .../Northern_San_dOria/npcs/Ulycille.lua | 6 ---- .../Northern_San_dOria/npcs/Vamorcote.lua | 3 -- .../Northern_San_dOria/npcs/Vavegallet.lua | 21 ------------ .../zones/Northern_San_dOria/npcs/Vichuel.lua | 6 ---- .../zones/Northern_San_dOria/npcs/Villion.lua | 10 ------ .../npcs/Wooden_Shutter.lua | 6 ---- .../zones/Northern_San_dOria/npcs/_6fc.lua | 23 ------------- 125 files changed, 41 insertions(+), 1253 deletions(-) delete mode 100644 scripts/zones/North_Gustaberg/npcs/Field_Parchment.lua delete mode 100644 scripts/zones/Northern_San_dOria/npcs/Anieuvansand.lua delete mode 100644 scripts/zones/Northern_San_dOria/npcs/Arnau.lua delete mode 100644 scripts/zones/Northern_San_dOria/npcs/Calovour.lua delete mode 100644 scripts/zones/Northern_San_dOria/npcs/Charmealaut.lua delete mode 100644 scripts/zones/Northern_San_dOria/npcs/Danngogg.lua delete mode 100644 scripts/zones/Northern_San_dOria/npcs/Dapraugeant.lua delete mode 100644 scripts/zones/Northern_San_dOria/npcs/Daveille.lua delete mode 100644 scripts/zones/Northern_San_dOria/npcs/Esqualea.lua delete mode 100644 scripts/zones/Northern_San_dOria/npcs/Fantarviont.lua delete mode 100644 scripts/zones/Northern_San_dOria/npcs/Galahad.lua delete mode 100644 scripts/zones/Northern_San_dOria/npcs/Halaviabeau.lua delete mode 100644 scripts/zones/Northern_San_dOria/npcs/Helaku.lua delete mode 100644 scripts/zones/Northern_San_dOria/npcs/Icoua.lua delete mode 100644 scripts/zones/Northern_San_dOria/npcs/Jufaue.lua delete mode 100644 scripts/zones/Northern_San_dOria/npcs/Letterare.lua delete mode 100644 scripts/zones/Northern_San_dOria/npcs/Machella.lua delete mode 100644 scripts/zones/Northern_San_dOria/npcs/Mevaloud.lua delete mode 100644 scripts/zones/Northern_San_dOria/npcs/Morunaude.lua delete mode 100644 scripts/zones/Northern_San_dOria/npcs/Narsaude.lua delete mode 100644 scripts/zones/Northern_San_dOria/npcs/Pala_Korin.lua delete mode 100644 scripts/zones/Northern_San_dOria/npcs/Pikiki.lua delete mode 100644 scripts/zones/Northern_San_dOria/npcs/Pontaudarme.lua delete mode 100644 scripts/zones/Northern_San_dOria/npcs/Pursuivant.lua delete mode 100644 scripts/zones/Northern_San_dOria/npcs/Rondipur.lua delete mode 100644 scripts/zones/Northern_San_dOria/npcs/Ronpaurege.lua delete mode 100644 scripts/zones/Northern_San_dOria/npcs/Shakir.lua delete mode 100644 scripts/zones/Northern_San_dOria/npcs/Synergy_Engineer.lua delete mode 100644 scripts/zones/Northern_San_dOria/npcs/Taurette.lua delete mode 100644 scripts/zones/Northern_San_dOria/npcs/Vavegallet.lua delete mode 100644 scripts/zones/Northern_San_dOria/npcs/_6fc.lua diff --git a/scripts/zones/North_Gustaberg/DefaultActions.lua b/scripts/zones/North_Gustaberg/DefaultActions.lua index b9e5b108541..57ea775275c 100644 --- a/scripts/zones/North_Gustaberg/DefaultActions.lua +++ b/scripts/zones/North_Gustaberg/DefaultActions.lua @@ -1,6 +1,8 @@ local ID = zones[xi.zone.NORTH_GUSTABERG] return { - ['Hunting_Bear'] = { event = 20 }, - ['Waterfall_Base'] = { messageSpecial = ID.text.REACH_WATER_FROM_HERE }, + ['Field_Parchment'] = { event = 2001 }, + ['Hunting_Bear'] = { event = 20 }, + ['Stone_Monument'] = { event = 900 }, + ['Waterfall_Base'] = { messageSpecial = ID.text.REACH_WATER_FROM_HERE }, } diff --git a/scripts/zones/North_Gustaberg/npcs/Cavernous_Maw.lua b/scripts/zones/North_Gustaberg/npcs/Cavernous_Maw.lua index 628e9de08a6..b8f2a3c1e4f 100644 --- a/scripts/zones/North_Gustaberg/npcs/Cavernous_Maw.lua +++ b/scripts/zones/North_Gustaberg/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/North_Gustaberg/npcs/Cavernous_Maw_2.lua b/scripts/zones/North_Gustaberg/npcs/Cavernous_Maw_2.lua index 03bd86acecf..d5497e97a10 100644 --- a/scripts/zones/North_Gustaberg/npcs/Cavernous_Maw_2.lua +++ b/scripts/zones/North_Gustaberg/npcs/Cavernous_Maw_2.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.NORTH_GUSTABERG] ---@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 == 0 then player:addQuest(xi.questLog.ABYSSEA, xi.quest.id.abyssea.AN_ULCEROUS_URAGNITE) diff --git a/scripts/zones/North_Gustaberg/npcs/Field_Manual.lua b/scripts/zones/North_Gustaberg/npcs/Field_Manual.lua index 80a31a20df8..807d551eb38 100644 --- a/scripts/zones/North_Gustaberg/npcs/Field_Manual.lua +++ b/scripts/zones/North_Gustaberg/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/North_Gustaberg/npcs/Field_Parchment.lua b/scripts/zones/North_Gustaberg/npcs/Field_Parchment.lua deleted file mode 100644 index 18a5f509d79..00000000000 --- a/scripts/zones/North_Gustaberg/npcs/Field_Parchment.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: North Gustaberg --- NPC: Field Parchment --- Type: Fields of Valor NMs --- !pos 400.000 -21.5 560.000 106 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(2001) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/North_Gustaberg/npcs/Goblin_Footprint.lua b/scripts/zones/North_Gustaberg/npcs/Goblin_Footprint.lua index 353d24dc61b..cecd7750b14 100644 --- a/scripts/zones/North_Gustaberg/npcs/Goblin_Footprint.lua +++ b/scripts/zones/North_Gustaberg/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/North_Gustaberg/npcs/Kuleo.lua b/scripts/zones/North_Gustaberg/npcs/Kuleo.lua index 0e0d8679952..808c543f663 100644 --- a/scripts/zones/North_Gustaberg/npcs/Kuleo.lua +++ b/scripts/zones/North_Gustaberg/npcs/Kuleo.lua @@ -10,9 +10,6 @@ local entity = {} local vendorRegion = xi.region.GUSTABERG 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/North_Gustaberg/npcs/Lyco_Sparkles_0.lua b/scripts/zones/North_Gustaberg/npcs/Lyco_Sparkles_0.lua index f1afd687b0e..16b83498f3d 100644 --- a/scripts/zones/North_Gustaberg/npcs/Lyco_Sparkles_0.lua +++ b/scripts/zones/North_Gustaberg/npcs/Lyco_Sparkles_0.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 == 264 then player:confirmTrade() diff --git a/scripts/zones/North_Gustaberg/npcs/Lyco_Sparkles_1.lua b/scripts/zones/North_Gustaberg/npcs/Lyco_Sparkles_1.lua index 9229d536611..9852f78ed92 100644 --- a/scripts/zones/North_Gustaberg/npcs/Lyco_Sparkles_1.lua +++ b/scripts/zones/North_Gustaberg/npcs/Lyco_Sparkles_1.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 == 265 then player:confirmTrade() diff --git a/scripts/zones/North_Gustaberg/npcs/Stone_Monument.lua b/scripts/zones/North_Gustaberg/npcs/Stone_Monument.lua index df69a57519b..5cc1388b4f2 100644 --- a/scripts/zones/North_Gustaberg/npcs/Stone_Monument.lua +++ b/scripts/zones/North_Gustaberg/npcs/Stone_Monument.lua @@ -17,14 +17,4 @@ entity.onTrade = function(player, npc, trade) end end -entity.onTrigger = function(player, npc) - player:startEvent(900) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/North_Gustaberg/npcs/Treasure_Casket.lua b/scripts/zones/North_Gustaberg/npcs/Treasure_Casket.lua index 1eeb9937446..d9ec4d28e79 100644 --- a/scripts/zones/North_Gustaberg/npcs/Treasure_Casket.lua +++ b/scripts/zones/North_Gustaberg/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/North_Gustaberg/npcs/qm1.lua b/scripts/zones/North_Gustaberg/npcs/qm1.lua index f17bd500767..cf905a19333 100644 --- a/scripts/zones/North_Gustaberg/npcs/qm1.lua +++ b/scripts/zones/North_Gustaberg/npcs/qm1.lua @@ -48,16 +48,10 @@ local function moveSirenTear(npc) end end -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(10) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 10 and option == 0 then if diff --git a/scripts/zones/North_Gustaberg/npcs/relic.lua b/scripts/zones/North_Gustaberg/npcs/relic.lua index afb1dbd4a3c..0d7011f5f64 100644 --- a/scripts/zones/North_Gustaberg/npcs/relic.lua +++ b/scripts/zones/North_Gustaberg/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 == 254 and diff --git a/scripts/zones/North_Gustaberg_[S]/npcs/Barricade.lua b/scripts/zones/North_Gustaberg_[S]/npcs/Barricade.lua index 34734780a26..9e67ecfbb8d 100644 --- a/scripts/zones/North_Gustaberg_[S]/npcs/Barricade.lua +++ b/scripts/zones/North_Gustaberg_[S]/npcs/Barricade.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getQuestStatus(xi.questLog.CRYSTAL_WAR, xi.quest.id.crystalWar.THE_FIGHTING_FOURTH) == xi.questStatus.QUEST_ACCEPTED and @@ -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 == 106 then player:setCharVar('THE_FIGHTING_FOURTH', 3) diff --git a/scripts/zones/North_Gustaberg_[S]/npcs/Cavernous_Maw.lua b/scripts/zones/North_Gustaberg_[S]/npcs/Cavernous_Maw.lua index 6683e9bdef1..2000e133f6d 100644 --- a/scripts/zones/North_Gustaberg_[S]/npcs/Cavernous_Maw.lua +++ b/scripts/zones/North_Gustaberg_[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/North_Gustaberg_[S]/npcs/Gebhardt.lua b/scripts/zones/North_Gustaberg_[S]/npcs/Gebhardt.lua index 39420ffd17d..8b3a409d187 100644 --- a/scripts/zones/North_Gustaberg_[S]/npcs/Gebhardt.lua +++ b/scripts/zones/North_Gustaberg_[S]/npcs/Gebhardt.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getQuestStatus(xi.questLog.CRYSTAL_WAR, xi.quest.id.crystalWar.THE_FIGHTING_FOURTH) == xi.questStatus.QUEST_ACCEPTED and @@ -20,9 +17,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 102 then player:delKeyItem(xi.ki.BATTLE_RATIONS) diff --git a/scripts/zones/North_Gustaberg_[S]/npcs/Lycopodium.lua b/scripts/zones/North_Gustaberg_[S]/npcs/Lycopodium.lua index 571fa3f7167..ac66d55f689 100644 --- a/scripts/zones/North_Gustaberg_[S]/npcs/Lycopodium.lua +++ b/scripts/zones/North_Gustaberg_[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 == 113 then player:setCharVar('LycopodiumTeleport_Mask', utils.mask.setBit(player:getCharVar('LycopodiumTeleport_Mask'), 2, true)) diff --git a/scripts/zones/North_Gustaberg_[S]/npcs/Mining_Point.lua b/scripts/zones/North_Gustaberg_[S]/npcs/Mining_Point.lua index 0a1175d16d3..165587d6873 100644 --- a/scripts/zones/North_Gustaberg_[S]/npcs/Mining_Point.lua +++ b/scripts/zones/North_Gustaberg_[S]/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/North_Gustaberg_[S]/npcs/Roderich.lua b/scripts/zones/North_Gustaberg_[S]/npcs/Roderich.lua index 6e97accce17..25328ea8775 100644 --- a/scripts/zones/North_Gustaberg_[S]/npcs/Roderich.lua +++ b/scripts/zones/North_Gustaberg_[S]/npcs/Roderich.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getQuestStatus(xi.questLog.CRYSTAL_WAR, xi.quest.id.crystalWar.THE_FIGHTING_FOURTH) == xi.questStatus.QUEST_ACCEPTED and @@ -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 == 104 then player:setCharVar('THE_FIGHTING_FOURTH', 2) diff --git a/scripts/zones/North_Gustaberg_[S]/npcs/Solitary_Ant.lua b/scripts/zones/North_Gustaberg_[S]/npcs/Solitary_Ant.lua index 8eb0f41d8db..c83017b1743 100644 --- a/scripts/zones/North_Gustaberg_[S]/npcs/Solitary_Ant.lua +++ b/scripts/zones/North_Gustaberg_[S]/npcs/Solitary_Ant.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getQuestStatus(xi.questLog.CRYSTAL_WAR, xi.quest.id.crystalWar.BETTER_PART_OF_VALOR) == xi.questStatus.QUEST_ACCEPTED then player:startEvent(2) @@ -17,10 +14,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/North_Gustaberg_[S]/npcs/Stonehoused_Adit.lua b/scripts/zones/North_Gustaberg_[S]/npcs/Stonehoused_Adit.lua index 09137056539..b97f353fdf0 100644 --- a/scripts/zones/North_Gustaberg_[S]/npcs/Stonehoused_Adit.lua +++ b/scripts/zones/North_Gustaberg_[S]/npcs/Stonehoused_Adit.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.instance.onTrigger(player, npc, xi.zones.RUHOTZ_SILVERMINES) end diff --git a/scripts/zones/North_Gustaberg_[S]/npcs/qm1.lua b/scripts/zones/North_Gustaberg_[S]/npcs/qm1.lua index b71fe047a98..9b986081738 100644 --- a/scripts/zones/North_Gustaberg_[S]/npcs/qm1.lua +++ b/scripts/zones/North_Gustaberg_[S]/npcs/qm1.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.BETTER_PART_OF_VALOR) == 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 == 3 then player:setCharVar('BetterPartOfValProg', 2) diff --git a/scripts/zones/Northern_San_dOria/DefaultActions.lua b/scripts/zones/Northern_San_dOria/DefaultActions.lua index b03b160238d..de23812236f 100644 --- a/scripts/zones/Northern_San_dOria/DefaultActions.lua +++ b/scripts/zones/Northern_San_dOria/DefaultActions.lua @@ -5,30 +5,62 @@ return { ['Abioleget'] = { text = ID.text.ABIOLEGET_DIALOG }, ['Ailbeche'] = { event = 868 }, ['Aivedoir'] = { text = ID.text.AIVEDOIR_DIALOG }, + ['Anieuvansand'] = { event = 665 }, ['Arienh'] = { text = ID.text.ARIENH_DIALOG }, + ['Arnau'] = { event = 20 }, -- TODO: CS 520 default while RoV M1-3 active? + ['Calovour'] = { event = 633 }, + ['Capiria'] = { text = ID.text.CAPIRIA_DIALOG }, ['Charlaimagnat'] = { event = 702 }, + ['Charmealaut'] = { event = 768 }, ['Chasalvige'] = { event = 6 }, + ['Coullene'] = { text = ID.text.COULLENE_DIALOG }, + ['Danngogg'] = { event = 540 }, + ['Dapraugeant'] = { event = 532 }, + ['Daveille'] = { event = 584 }, ['Emilia'] = { text = ID.text.EMILIA_DIALOG }, ['Eperdur'] = { event = 678 }, + ['Esqualea'] = { event = 670 }, + ['Fantarviont'] = { event = 671 }, ['Fittesegat'] = { text = ID.text.FITTESEGAT_DIALOG }, + ['Galahad'] = { text = ID.text.GALAHAD_DIALOG }, ['Gilipese'] = { text = ID.text.GILIPESE_DIALOG }, ['Guilerme'] = { text = ID.text.GUILERME_DIALOG }, + ['Halaviabeau'] = { event = 611 }, ['Helaku'] = { event = 541 }, ['Hinaree'] = { event = 580 }, + ['Icoua'] = { event = 674 }, ['Ishwar'] = { text = ID.text.ISHWAR_DIALOG }, + ['Jufaue'] = { event = 715 }, ['Kasaroro'] = { event = 548 }, + ['Letterare'] = { event = 660 }, + ['Machella'] = { event = 672 }, ['Malfine'] = { text = ID.text.MALFINE_DIALOG }, + ['Matildie'] = { event = 587 }, ['Maurine'] = { text = ID.text.MAURINE_DIALOG }, -- NOTE: These are two different NPCs ['Maurinne'] = { text = ID.text.MAURINNE_DIALOG }, + ['Mevaloud'] = { event = 661 }, ['Miageau'] = { event = 517 }, ['Morjean'] = { event = 601 }, + ['Morunaude'] = { event = 634 }, + ['Narsaude'] = { event = 668 }, ['Nouveil'] = { event = 574 }, ['Odyssean_Passage'] = { messageSpecial = ID.text.NOTHING_HAPPENS }, + ['Pala_Korin'] = { event = 555 }, ['Pellimie'] = { text = ID.text.PELLIMIE_DIALOG }, ['Pepigort'] = { text = ID.text.PEPIGORT_DIALOG }, ['Phaviane'] = { text = ID.text.PHAVIANE_DIALOG }, + ['Pikiki'] = { evert = 553 }, + ['Pontaudarme'] = { event = 717 }, ['Prerivon'] = { text = ID.text.PRERIVON_DIALOG }, + ['Pursuivant'] = { event = 760 }, ['Rodaillece'] = { text = ID.text.RODAILLECE_DIALOG }, + ['Rondipur'] = { event = 721 }, + ['Ronpaurege'] = { event = 669 }, + ['Shakir'] = { event = 538 }, ['Sochiene'] = { text = ID.text.SOCHIENE_DIALOG }, ['Suspicious_Elvaan'] = { event = 881 }, + ['Synergy_Engineer'] = { event = 11002 }, + ['Taurette'] = { event = 664 }, + ['Vavegallet'] = { event = 673 }, + ['Villion'] = { event = 632 }, } diff --git a/scripts/zones/Northern_San_dOria/npcs/AMAN_Liaison.lua b/scripts/zones/Northern_San_dOria/npcs/AMAN_Liaison.lua index 2c45b3bf34e..2ef89d0c9d5 100644 --- a/scripts/zones/Northern_San_dOria/npcs/AMAN_Liaison.lua +++ b/scripts/zones/Northern_San_dOria/npcs/AMAN_Liaison.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local firstStepForwardCompleted = player:getEminenceCompleted(1) local assistChannelCompleted = player:getEminenceCompleted(1448) diff --git a/scripts/zones/Northern_San_dOria/npcs/Ailbeche.lua b/scripts/zones/Northern_San_dOria/npcs/Ailbeche.lua index da0c23f37c9..64807e69f5c 100644 --- a/scripts/zones/Northern_San_dOria/npcs/Ailbeche.lua +++ b/scripts/zones/Northern_San_dOria/npcs/Ailbeche.lua @@ -94,9 +94,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) -- "Sharpening the Sword" if (csid == 45 or csid == 43) and option == 1 then diff --git a/scripts/zones/Northern_San_dOria/npcs/Alphollon_C_Meriard.lua b/scripts/zones/Northern_San_dOria/npcs/Alphollon_C_Meriard.lua index 81d6d6db2fa..269b53fc64a 100644 --- a/scripts/zones/Northern_San_dOria/npcs/Alphollon_C_Meriard.lua +++ b/scripts/zones/Northern_San_dOria/npcs/Alphollon_C_Meriard.lua @@ -40,9 +40,6 @@ entity.onTrigger = function(player, npc) player:startEvent(719) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 720 then local reward = player:getCharVar('reward') diff --git a/scripts/zones/Northern_San_dOria/npcs/Amarefice.lua b/scripts/zones/Northern_San_dOria/npcs/Amarefice.lua index 741d173b1dc..8f8ce39bbfc 100644 --- a/scripts/zones/Northern_San_dOria/npcs/Amarefice.lua +++ b/scripts/zones/Northern_San_dOria/npcs/Amarefice.lua @@ -7,16 +7,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.crafting.oldImageSupportOnTrigger(player, npc) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.crafting.oldImageSupportOnEventFinish(player, csid, option, npc) end diff --git a/scripts/zones/Northern_San_dOria/npcs/Anieuvansand.lua b/scripts/zones/Northern_San_dOria/npcs/Anieuvansand.lua deleted file mode 100644 index f66c2f2690b..00000000000 --- a/scripts/zones/Northern_San_dOria/npcs/Anieuvansand.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Northern San d'Oria --- NPC: Anieuvansand --- !pos -18.608 -0.199 83.911 231 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(665) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Northern_San_dOria/npcs/Anilla.lua b/scripts/zones/Northern_San_dOria/npcs/Anilla.lua index 279322a17ad..0fcf86b3e59 100644 --- a/scripts/zones/Northern_San_dOria/npcs/Anilla.lua +++ b/scripts/zones/Northern_San_dOria/npcs/Anilla.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') @@ -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 == 808 then player:setCharVar('WildcatSandy', utils.mask.setBit(player:getCharVar('WildcatSandy'), 6, true)) diff --git a/scripts/zones/Northern_San_dOria/npcs/Antonian.lua b/scripts/zones/Northern_San_dOria/npcs/Antonian.lua index e5d735e82a9..de1f4a2a227 100644 --- a/scripts/zones/Northern_San_dOria/npcs/Antonian.lua +++ b/scripts/zones/Northern_San_dOria/npcs/Antonian.lua @@ -31,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/Northern_San_dOria/npcs/Arachagnon.lua b/scripts/zones/Northern_San_dOria/npcs/Arachagnon.lua index 0fa53ef60ec..70c46eff4e9 100644 --- a/scripts/zones/Northern_San_dOria/npcs/Arachagnon.lua +++ b/scripts/zones/Northern_San_dOria/npcs/Arachagnon.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.NORTHERN_SAN_DORIA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -27,10 +24,4 @@ entity.onTrigger = function(player, npc) xi.shop.general(player, stock, xi.fameArea.SANDORIA) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Northern_San_dOria/npcs/Arlenne.lua b/scripts/zones/Northern_San_dOria/npcs/Arlenne.lua index 363e1ef90d9..2c99b2db053 100644 --- a/scripts/zones/Northern_San_dOria/npcs/Arlenne.lua +++ b/scripts/zones/Northern_San_dOria/npcs/Arlenne.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.NORTHERN_SAN_DORIA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -35,10 +32,4 @@ entity.onTrigger = function(player, npc) xi.shop.nation(player, stock, xi.nation.SANDORIA) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Northern_San_dOria/npcs/Arnau.lua b/scripts/zones/Northern_San_dOria/npcs/Arnau.lua deleted file mode 100644 index c8207d63d07..00000000000 --- a/scripts/zones/Northern_San_dOria/npcs/Arnau.lua +++ /dev/null @@ -1,24 +0,0 @@ ------------------------------------ --- Area: Northern San d'Oria --- NPC: Arnau --- Involved in Mission: Save the Children --- !pos 148 0 139 231 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(20) - -- CS 520 default while RoV M1-3 active? -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Northern_San_dOria/npcs/Attarena.lua b/scripts/zones/Northern_San_dOria/npcs/Attarena.lua index 4092acc96a9..1614a4e79dd 100644 --- a/scripts/zones/Northern_San_dOria/npcs/Attarena.lua +++ b/scripts/zones/Northern_San_dOria/npcs/Attarena.lua @@ -27,10 +27,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Northern_San_dOria/npcs/Aurege.lua b/scripts/zones/Northern_San_dOria/npcs/Aurege.lua index 6f8ac68bbe2..5019a590129 100644 --- a/scripts/zones/Northern_San_dOria/npcs/Aurege.lua +++ b/scripts/zones/Northern_San_dOria/npcs/Aurege.lua @@ -8,9 +8,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local exitTheGambler = player:getQuestStatus(xi.questLog.SANDORIA, xi.quest.id.sandoria.EXIT_THE_GAMBLER) local exitTheGamblerStat = player:getCharVar('exitTheGamblerStat') @@ -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 == 521 and diff --git a/scripts/zones/Northern_San_dOria/npcs/Baraka.lua b/scripts/zones/Northern_San_dOria/npcs/Baraka.lua index e7745a1eb00..7b874e7468f 100644 --- a/scripts/zones/Northern_San_dOria/npcs/Baraka.lua +++ b/scripts/zones/Northern_San_dOria/npcs/Baraka.lua @@ -7,25 +7,16 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) - local pNation = player:getNation() + local pNation = player:getNation() if pNation == xi.nation.SANDORIA then - player:startEvent(580) + player:startEvent(580) elseif pNation == xi.nation.WINDURST then - player:startEvent(579) - else - player:startEvent(539) - end + player:startEvent(579) + else + player:startEvent(539) end - -entity.onEventUpdate = function(player, csid, option, npc) end -entity.onEventFinish = function(player, csid, option, npc) - end - return entity diff --git a/scripts/zones/Northern_San_dOria/npcs/Beadurinc.lua b/scripts/zones/Northern_San_dOria/npcs/Beadurinc.lua index a63972ab914..bdd0b16bb36 100644 --- a/scripts/zones/Northern_San_dOria/npcs/Beadurinc.lua +++ b/scripts/zones/Northern_San_dOria/npcs/Beadurinc.lua @@ -7,16 +7,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.crafting.oldImageSupportOnTrigger(player, npc) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.crafting.oldImageSupportOnEventFinish(player, csid, option, npc) end diff --git a/scripts/zones/Northern_San_dOria/npcs/Belgidiveau.lua b/scripts/zones/Northern_San_dOria/npcs/Belgidiveau.lua index a9f7293972d..f2047889751 100644 --- a/scripts/zones/Northern_San_dOria/npcs/Belgidiveau.lua +++ b/scripts/zones/Northern_San_dOria/npcs/Belgidiveau.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.NORTHERN_SAN_DORIA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local troubleAtTheSluice = player:getQuestStatus(xi.questLog.SANDORIA, xi.quest.id.sandoria.TROUBLE_AT_THE_SLUICE) local hasNeutralizerKI = player:hasKeyItem(xi.ki.NEUTRALIZER) @@ -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 == 57 and option == 0 then player:addQuest(xi.questLog.SANDORIA, xi.quest.id.sandoria.TROUBLE_AT_THE_SLUICE) diff --git a/scripts/zones/Northern_San_dOria/npcs/Beriphaule.lua b/scripts/zones/Northern_San_dOria/npcs/Beriphaule.lua index 3e8b4e26943..c6c9718f0e5 100644 --- a/scripts/zones/Northern_San_dOria/npcs/Beriphaule.lua +++ b/scripts/zones/Northern_San_dOria/npcs/Beriphaule.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.SANDORIA 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 == 606 and option == 1 then local newNation = xi.nation.SANDORIA diff --git a/scripts/zones/Northern_San_dOria/npcs/Bertenont.lua b/scripts/zones/Northern_San_dOria/npcs/Bertenont.lua index a85138d153d..cd851ffe28a 100644 --- a/scripts/zones/Northern_San_dOria/npcs/Bertenont.lua +++ b/scripts/zones/Northern_San_dOria/npcs/Bertenont.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.NORTHERN_SAN_DORIA] ---@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 == 809 then player:setCharVar('WildcatSandy', utils.mask.setBit(player:getCharVar('WildcatSandy'), 9, true)) diff --git a/scripts/zones/Northern_San_dOria/npcs/Boncort.lua b/scripts/zones/Northern_San_dOria/npcs/Boncort.lua index 7e6e9089e1c..15d3260ff3c 100644 --- a/scripts/zones/Northern_San_dOria/npcs/Boncort.lua +++ b/scripts/zones/Northern_San_dOria/npcs/Boncort.lua @@ -29,10 +29,4 @@ entity.onTrigger = function(player, npc) xi.shop.nation(player, stock, xi.nation.SANDORIA) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Northern_San_dOria/npcs/Calovour.lua b/scripts/zones/Northern_San_dOria/npcs/Calovour.lua deleted file mode 100644 index 955949e3fb6..00000000000 --- a/scripts/zones/Northern_San_dOria/npcs/Calovour.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Northern San d'Oria --- NPC: Calovour ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(633) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Northern_San_dOria/npcs/Capiria.lua b/scripts/zones/Northern_San_dOria/npcs/Capiria.lua index 25f36bf85f2..4c3e99859ab 100644 --- a/scripts/zones/Northern_San_dOria/npcs/Capiria.lua +++ b/scripts/zones/Northern_San_dOria/npcs/Capiria.lua @@ -4,7 +4,6 @@ -- Type: Involved in Quest (Flyers for Regine) -- !pos -127.355 0.000 130.461 231 ----------------------------------- -local ID = zones[xi.zone.NORTHERN_SAN_DORIA] require('scripts/quests/flyers_for_regine') ----------------------------------- ---@type TNpcEntity @@ -14,14 +13,4 @@ entity.onTrade = function(player, npc, trade) quests.ffr.onTrade(player, npc, trade, 8) -- FLYERS FOR REGINE end -entity.onTrigger = function(player, npc) - player:showText(npc, ID.text.CAPIRIA_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/Northern_San_dOria/npcs/Castilchat.lua b/scripts/zones/Northern_San_dOria/npcs/Castilchat.lua index 9c3fd2da1a3..e1734df5d79 100644 --- a/scripts/zones/Northern_San_dOria/npcs/Castilchat.lua +++ b/scripts/zones/Northern_San_dOria/npcs/Castilchat.lua @@ -46,9 +46,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 == 733 and option == 1 then if player:getFreeSlotsCount() == 0 then diff --git a/scripts/zones/Northern_San_dOria/npcs/Cauzeriste.lua b/scripts/zones/Northern_San_dOria/npcs/Cauzeriste.lua index 6e1234b946b..c976aeb5666 100644 --- a/scripts/zones/Northern_San_dOria/npcs/Cauzeriste.lua +++ b/scripts/zones/Northern_San_dOria/npcs/Cauzeriste.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.NORTHERN_SAN_DORIA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local guildSkillId = xi.skill.WOODWORKING local stock = xi.shop.generalGuildStock[guildSkillId] @@ -19,10 +16,4 @@ entity.onTrigger = function(player, npc) player:showText(npc, ID.text.CAUZERISTE_SHOP_DIALOG) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Northern_San_dOria/npcs/Charlaimagnat.lua b/scripts/zones/Northern_San_dOria/npcs/Charlaimagnat.lua index 00f085d5913..b502080cb43 100644 --- a/scripts/zones/Northern_San_dOria/npcs/Charlaimagnat.lua +++ b/scripts/zones/Northern_San_dOria/npcs/Charlaimagnat.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.NORTHERN_SAN_DORIA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local theMissingPiece = player:getQuestStatus(xi.questLog.OUTLANDS, xi.quest.id.outlands.THE_MISSING_PIECE) @@ -32,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 == 703 then player:setCharVar('TheMissingPiece_date', os.time() + 60) diff --git a/scripts/zones/Northern_San_dOria/npcs/Charmealaut.lua b/scripts/zones/Northern_San_dOria/npcs/Charmealaut.lua deleted file mode 100644 index 738d06baacc..00000000000 --- a/scripts/zones/Northern_San_dOria/npcs/Charmealaut.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Northern San d'Oria --- NPC: Charmealaut --- Type: Merchant --- !pos 0.000 -0.501 29.303 231 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(768) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Northern_San_dOria/npcs/Chaupire.lua b/scripts/zones/Northern_San_dOria/npcs/Chaupire.lua index 0317ec5b91e..d7e1b07fa82 100644 --- a/scripts/zones/Northern_San_dOria/npcs/Chaupire.lua +++ b/scripts/zones/Northern_San_dOria/npcs/Chaupire.lua @@ -9,19 +9,10 @@ local ID = zones[xi.zone.NORTHERN_SAN_DORIA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:sendGuild(5132, 6, 21, 0) then player:showText(npc, ID.text.CHAUPIRE_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/Northern_San_dOria/npcs/Cheupirudaux.lua b/scripts/zones/Northern_San_dOria/npcs/Cheupirudaux.lua index fd337cdb6d1..e3924d5f5c3 100644 --- a/scripts/zones/Northern_San_dOria/npcs/Cheupirudaux.lua +++ b/scripts/zones/Northern_San_dOria/npcs/Cheupirudaux.lua @@ -16,9 +16,6 @@ entity.onTrigger = function(player, npc) xi.crafting.guildMasterOnTrigger(player, npc) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.crafting.guildMasterOnEventFinish(player, csid, option, npc) end diff --git a/scripts/zones/Northern_San_dOria/npcs/Commojourt.lua b/scripts/zones/Northern_San_dOria/npcs/Commojourt.lua index 7425b11bae6..af98132f9fa 100644 --- a/scripts/zones/Northern_San_dOria/npcs/Commojourt.lua +++ b/scripts/zones/Northern_San_dOria/npcs/Commojourt.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local rand = math.random(1, 2) @@ -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/Northern_San_dOria/npcs/Coullene.lua b/scripts/zones/Northern_San_dOria/npcs/Coullene.lua index 1b3f2ee35a0..b8cc190b799 100644 --- a/scripts/zones/Northern_San_dOria/npcs/Coullene.lua +++ b/scripts/zones/Northern_San_dOria/npcs/Coullene.lua @@ -4,7 +4,6 @@ -- Type: Involved in Quest (Flyers for Regine) -- !pos 146.420 0.000 127.601 231 ----------------------------------- -local ID = zones[xi.zone.NORTHERN_SAN_DORIA] require('scripts/quests/flyers_for_regine') ----------------------------------- ---@type TNpcEntity @@ -14,14 +13,4 @@ entity.onTrade = function(player, npc, trade) quests.ffr.onTrade(player, npc, trade, 5) -- FLYERS FOR REGINE end -entity.onTrigger = function(player, npc) - player:showText(npc, ID.text.COULLENE_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/Northern_San_dOria/npcs/Danngogg.lua b/scripts/zones/Northern_San_dOria/npcs/Danngogg.lua deleted file mode 100644 index 02aa9d56666..00000000000 --- a/scripts/zones/Northern_San_dOria/npcs/Danngogg.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Northern San d'Oria --- NPC: Danngogg ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(540) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Northern_San_dOria/npcs/Dapraugeant.lua b/scripts/zones/Northern_San_dOria/npcs/Dapraugeant.lua deleted file mode 100644 index 280517a6fb6..00000000000 --- a/scripts/zones/Northern_San_dOria/npcs/Dapraugeant.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Northern San d'Oria --- NPC: Dapraugeant ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(532) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Northern_San_dOria/npcs/Dauperiat.lua b/scripts/zones/Northern_San_dOria/npcs/Dauperiat.lua index 9c4e7e51def..ff9b794246e 100644 --- a/scripts/zones/Northern_San_dOria/npcs/Dauperiat.lua +++ b/scripts/zones/Northern_San_dOria/npcs/Dauperiat.lua @@ -62,9 +62,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 643 then player:addQuest(xi.questLog.SANDORIA, xi.quest.id.sandoria.BLACKMAIL) diff --git a/scripts/zones/Northern_San_dOria/npcs/Daveille.lua b/scripts/zones/Northern_San_dOria/npcs/Daveille.lua deleted file mode 100644 index 5156bbb9bb6..00000000000 --- a/scripts/zones/Northern_San_dOria/npcs/Daveille.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Northern San d'Oria --- NPC: Daveille ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(584) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Northern_San_dOria/npcs/Doggomehr.lua b/scripts/zones/Northern_San_dOria/npcs/Doggomehr.lua index baeba413c32..3c481192c65 100644 --- a/scripts/zones/Northern_San_dOria/npcs/Doggomehr.lua +++ b/scripts/zones/Northern_San_dOria/npcs/Doggomehr.lua @@ -9,19 +9,10 @@ local ID = zones[xi.zone.NORTHERN_SAN_DORIA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:sendGuild(531, 8, 23, 2) then player:showText(npc, ID.text.DOGGOMEHR_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/Northern_San_dOria/npcs/Durogg.lua b/scripts/zones/Northern_San_dOria/npcs/Durogg.lua index 1df4e18432c..fa6719cae4a 100644 --- a/scripts/zones/Northern_San_dOria/npcs/Durogg.lua +++ b/scripts/zones/Northern_San_dOria/npcs/Durogg.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) -- Add-on Scenarios local addonScenarios = 0xFFFFFFFE diff --git a/scripts/zones/Northern_San_dOria/npcs/Elesca.lua b/scripts/zones/Northern_San_dOria/npcs/Elesca.lua index 49f4611d444..f31d4ac52b6 100644 --- a/scripts/zones/Northern_San_dOria/npcs/Elesca.lua +++ b/scripts/zones/Northern_San_dOria/npcs/Elesca.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.maps.onTrigger(player, npc) end @@ -17,7 +14,4 @@ entity.onEventUpdate = function(player, csid, option, npc) xi.maps.onEventUpdate(player, csid, option, npc) end -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Northern_San_dOria/npcs/Emeige_AMAN.lua b/scripts/zones/Northern_San_dOria/npcs/Emeige_AMAN.lua index b19ff85cb34..79088748856 100644 --- a/scripts/zones/Northern_San_dOria/npcs/Emeige_AMAN.lua +++ b/scripts/zones/Northern_San_dOria/npcs/Emeige_AMAN.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local var = 0 if not player:getMentor() then @@ -22,9 +19,6 @@ entity.onTrigger = function(player, npc) player:startEvent(739, var) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 739 and option == 0 then player:setMentor(true) diff --git a/scripts/zones/Northern_San_dOria/npcs/Eperdur.lua b/scripts/zones/Northern_San_dOria/npcs/Eperdur.lua index 2d09c31f1fc..e58d69ea210 100644 --- a/scripts/zones/Northern_San_dOria/npcs/Eperdur.lua +++ b/scripts/zones/Northern_San_dOria/npcs/Eperdur.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.NORTHERN_SAN_DORIA] ---@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) local sorceryOfTheNorth = player:getQuestStatus(xi.questLog.SANDORIA, xi.quest.id.sandoria.SORCERY_OF_THE_NORTH) @@ -57,9 +54,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 == 681 and option == 0 then player:addQuest(xi.questLog.SANDORIA, xi.quest.id.sandoria.HEALING_THE_LAND) diff --git a/scripts/zones/Northern_San_dOria/npcs/Esqualea.lua b/scripts/zones/Northern_San_dOria/npcs/Esqualea.lua deleted file mode 100644 index 4145fd716ec..00000000000 --- a/scripts/zones/Northern_San_dOria/npcs/Esqualea.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Northern San d'Oria --- NPC: Esqualea ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(670) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Northern_San_dOria/npcs/Eugballion.lua b/scripts/zones/Northern_San_dOria/npcs/Eugballion.lua index 39c841d5bcc..78b2b33576f 100644 --- a/scripts/zones/Northern_San_dOria/npcs/Eugballion.lua +++ b/scripts/zones/Northern_San_dOria/npcs/Eugballion.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.NORTHERN_SAN_DORIA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if GetRegionOwner(xi.region.QUFIMISLAND) ~= xi.nation.SANDORIA then player:showText(npc, ID.text.EUGBALLION_CLOSED_DIALOG) @@ -25,10 +22,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Northern_San_dOria/npcs/Excenmille.lua b/scripts/zones/Northern_San_dOria/npcs/Excenmille.lua index bf8aa4c4a0a..bfca739099b 100644 --- a/scripts/zones/Northern_San_dOria/npcs/Excenmille.lua +++ b/scripts/zones/Northern_San_dOria/npcs/Excenmille.lua @@ -28,9 +28,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) @@ -73,9 +70,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) -- TRUST if csid == 893 then diff --git a/scripts/zones/Northern_San_dOria/npcs/Explorer_Moogle.lua b/scripts/zones/Northern_San_dOria/npcs/Explorer_Moogle.lua index 458d3bf0191..9d437d6872b 100644 --- a/scripts/zones/Northern_San_dOria/npcs/Explorer_Moogle.lua +++ b/scripts/zones/Northern_San_dOria/npcs/Explorer_Moogle.lua @@ -7,16 +7,10 @@ local entity = {} local eventId = 862 -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.teleport.explorerMoogleOnTrigger(player, eventId) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.teleport.explorerMoogleOnEventFinish(player, csid, option, eventId) end diff --git a/scripts/zones/Northern_San_dOria/npcs/Fantarviont.lua b/scripts/zones/Northern_San_dOria/npcs/Fantarviont.lua deleted file mode 100644 index 6beb86fd559..00000000000 --- a/scripts/zones/Northern_San_dOria/npcs/Fantarviont.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Northern San d'Oria --- NPC: Fantarviont ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(671) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Northern_San_dOria/npcs/Galahad.lua b/scripts/zones/Northern_San_dOria/npcs/Galahad.lua deleted file mode 100644 index 27a1ab9112b..00000000000 --- a/scripts/zones/Northern_San_dOria/npcs/Galahad.lua +++ /dev/null @@ -1,25 +0,0 @@ ------------------------------------ --- Area: Northern San d'Oria --- NPC: Galahad --- Type: Consulate Representative NPC --- !pos -51.984 -2.000 -15.373 231 ------------------------------------ -local ID = zones[xi.zone.NORTHERN_SAN_DORIA] ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:showText(npc, ID.text.GALAHAD_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/Northern_San_dOria/npcs/Gaudylox.lua b/scripts/zones/Northern_San_dOria/npcs/Gaudylox.lua index 33cf088fc48..20bc04046bd 100644 --- a/scripts/zones/Northern_San_dOria/npcs/Gaudylox.lua +++ b/scripts/zones/Northern_San_dOria/npcs/Gaudylox.lua @@ -9,19 +9,10 @@ local ID = zones[xi.zone.NORTHERN_SAN_DORIA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:sendGuild(60418, 11, 22, 0) then player:showText(npc, ID.text.GAUDYLOX_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/Northern_San_dOria/npcs/Giaunne.lua b/scripts/zones/Northern_San_dOria/npcs/Giaunne.lua index db8c47ed219..317481d92be 100644 --- a/scripts/zones/Northern_San_dOria/npcs/Giaunne.lua +++ b/scripts/zones/Northern_San_dOria/npcs/Giaunne.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') @@ -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 == 805 then player:setCharVar('WildcatSandy', utils.mask.setBit(player:getCharVar('WildcatSandy'), 5, true)) diff --git a/scripts/zones/Northern_San_dOria/npcs/Greubaque.lua b/scripts/zones/Northern_San_dOria/npcs/Greubaque.lua index 83fced68a47..98f3dfeb330 100644 --- a/scripts/zones/Northern_San_dOria/npcs/Greubaque.lua +++ b/scripts/zones/Northern_San_dOria/npcs/Greubaque.lua @@ -7,16 +7,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.crafting.oldImageSupportOnTrigger(player, npc) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.crafting.oldImageSupportOnEventFinish(player, csid, option, npc) end diff --git a/scripts/zones/Northern_San_dOria/npcs/Grilau.lua b/scripts/zones/Northern_San_dOria/npcs/Grilau.lua index 982a15f8fae..28ada2db632 100644 --- a/scripts/zones/Northern_San_dOria/npcs/Grilau.lua +++ b/scripts/zones/Northern_San_dOria/npcs/Grilau.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/Northern_San_dOria/npcs/Guilberdrier.lua b/scripts/zones/Northern_San_dOria/npcs/Guilberdrier.lua index 16b1b396f09..e5a58b9f15b 100644 --- a/scripts/zones/Northern_San_dOria/npcs/Guilberdrier.lua +++ b/scripts/zones/Northern_San_dOria/npcs/Guilberdrier.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 == 522 and diff --git a/scripts/zones/Northern_San_dOria/npcs/Gulmama.lua b/scripts/zones/Northern_San_dOria/npcs/Gulmama.lua index 61ca6c6f792..cbb1871d420 100644 --- a/scripts/zones/Northern_San_dOria/npcs/Gulmama.lua +++ b/scripts/zones/Northern_San_dOria/npcs/Gulmama.lua @@ -10,9 +10,6 @@ local ID = zones[xi.zone.NORTHERN_SAN_DORIA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local trialByIce = player:getQuestStatus(xi.questLog.SANDORIA, xi.quest.id.sandoria.TRIAL_BY_ICE) local classReunion = player:getQuestStatus(xi.questLog.WINDURST, xi.quest.id.windurst.CLASS_REUNION) @@ -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 == 706 and option == 1 then if player:getQuestStatus(xi.questLog.SANDORIA, xi.quest.id.sandoria.TRIAL_BY_ICE) == xi.questStatus.QUEST_COMPLETED then diff --git a/scripts/zones/Northern_San_dOria/npcs/Halaviabeau.lua b/scripts/zones/Northern_San_dOria/npcs/Halaviabeau.lua deleted file mode 100644 index 4822a04b289..00000000000 --- a/scripts/zones/Northern_San_dOria/npcs/Halaviabeau.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Northern San d'Oria --- NPC: Halaviabeau ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(611) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Northern_San_dOria/npcs/Helaku.lua b/scripts/zones/Northern_San_dOria/npcs/Helaku.lua deleted file mode 100644 index ad2d4450d3e..00000000000 --- a/scripts/zones/Northern_San_dOria/npcs/Helaku.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Northern San d'Oria --- NPC: Helaku --- Involved in Missions 2-3 --- !pos 49 -2 -12 231 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) - end - -return entity diff --git a/scripts/zones/Northern_San_dOria/npcs/Heruze-Moruze.lua b/scripts/zones/Northern_San_dOria/npcs/Heruze-Moruze.lua index cb723424109..10d4c1633a9 100644 --- a/scripts/zones/Northern_San_dOria/npcs/Heruze-Moruze.lua +++ b/scripts/zones/Northern_San_dOria/npcs/Heruze-Moruze.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local pNation = player:getNation() @@ -22,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/Northern_San_dOria/npcs/Hunt_Registry.lua b/scripts/zones/Northern_San_dOria/npcs/Hunt_Registry.lua index acdbd5080c5..6681ea9edc2 100644 --- a/scripts/zones/Northern_San_dOria/npcs/Hunt_Registry.lua +++ b/scripts/zones/Northern_San_dOria/npcs/Hunt_Registry.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.hunts.onTrigger(player, npc) end diff --git a/scripts/zones/Northern_San_dOria/npcs/Icoua.lua b/scripts/zones/Northern_San_dOria/npcs/Icoua.lua deleted file mode 100644 index 7c9d48f0ef8..00000000000 --- a/scripts/zones/Northern_San_dOria/npcs/Icoua.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Northern San d'Oria --- NPC: Icoua --- !pos 87.719 -1 9.256 231 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(674) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Northern_San_dOria/npcs/Jufaue.lua b/scripts/zones/Northern_San_dOria/npcs/Jufaue.lua deleted file mode 100644 index f318fbf18fc..00000000000 --- a/scripts/zones/Northern_San_dOria/npcs/Jufaue.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Northern San d'Oria --- NPC: Jufaue --- Type: Past Event Watcher --- !pos 13.221 -1.199 -19.231 231 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(715) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Northern_San_dOria/npcs/Justi.lua b/scripts/zones/Northern_San_dOria/npcs/Justi.lua index 3cb0cfb27f4..80563c31079 100644 --- a/scripts/zones/Northern_San_dOria/npcs/Justi.lua +++ b/scripts/zones/Northern_San_dOria/npcs/Justi.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.NORTHERN_SAN_DORIA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -29,10 +26,4 @@ entity.onTrigger = function(player, npc) xi.shop.nation(player, stock, xi.nation.SANDORIA) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Northern_San_dOria/npcs/Letterare.lua b/scripts/zones/Northern_San_dOria/npcs/Letterare.lua deleted file mode 100644 index 8e66c4e63fd..00000000000 --- a/scripts/zones/Northern_San_dOria/npcs/Letterare.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Northern San d'Oria --- NPC: Letterare ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(660) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Northern_San_dOria/npcs/Lotine.lua b/scripts/zones/Northern_San_dOria/npcs/Lotine.lua index 5a1302aa58d..644b4160de8 100644 --- a/scripts/zones/Northern_San_dOria/npcs/Lotine.lua +++ b/scripts/zones/Northern_San_dOria/npcs/Lotine.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local rand = math.random(1, 2) if rand == 1 then @@ -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/Northern_San_dOria/npcs/Lucretia.lua b/scripts/zones/Northern_San_dOria/npcs/Lucretia.lua index 431c0086bb3..c9340292420 100644 --- a/scripts/zones/Northern_San_dOria/npcs/Lucretia.lua +++ b/scripts/zones/Northern_San_dOria/npcs/Lucretia.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.NORTHERN_SAN_DORIA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local guildSkillId = xi.skill.SMITHING local stock = xi.shop.generalGuildStock[guildSkillId] @@ -19,10 +16,4 @@ entity.onTrigger = function(player, npc) player:showText(npc, ID.text.LUCRETIA_SHOP_DIALOG) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Northern_San_dOria/npcs/Machella.lua b/scripts/zones/Northern_San_dOria/npcs/Machella.lua deleted file mode 100644 index 04c51b67ab8..00000000000 --- a/scripts/zones/Northern_San_dOria/npcs/Machella.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Northern San d'Oria --- NPC: Machella ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(672) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Northern_San_dOria/npcs/Madaline.lua b/scripts/zones/Northern_San_dOria/npcs/Madaline.lua index abee42ddf01..d4e59e45e60 100644 --- a/scripts/zones/Northern_San_dOria/npcs/Madaline.lua +++ b/scripts/zones/Northern_San_dOria/npcs/Madaline.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local telmodaMadaline = player:getCharVar('Telmoda_Madaline_Event') if telmodaMadaline ~= 1 then @@ -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/Northern_San_dOria/npcs/Maloquedil.lua b/scripts/zones/Northern_San_dOria/npcs/Maloquedil.lua index c59af8c4194..52888b7672a 100644 --- a/scripts/zones/Northern_San_dOria/npcs/Maloquedil.lua +++ b/scripts/zones/Northern_San_dOria/npcs/Maloquedil.lua @@ -42,9 +42,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 == 24 and option == 1 then player:addQuest(xi.questLog.SANDORIA, xi.quest.id.sandoria.WARDING_VAMPIRES) diff --git a/scripts/zones/Northern_San_dOria/npcs/Matildie.lua b/scripts/zones/Northern_San_dOria/npcs/Matildie.lua index db2f82ae3d6..0d1296adcf6 100644 --- a/scripts/zones/Northern_San_dOria/npcs/Matildie.lua +++ b/scripts/zones/Northern_San_dOria/npcs/Matildie.lua @@ -15,13 +15,6 @@ entity.onTrade = function(player, npc, trade) end end -entity.onTrigger = function(player, npc) - player:startEvent(587) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 631 then player:tradeComplete() diff --git a/scripts/zones/Northern_San_dOria/npcs/Mevaloud.lua b/scripts/zones/Northern_San_dOria/npcs/Mevaloud.lua deleted file mode 100644 index 015347dc7ed..00000000000 --- a/scripts/zones/Northern_San_dOria/npcs/Mevaloud.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Northern San d'Oria --- NPC: Mevaloud ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(661) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Northern_San_dOria/npcs/Mevreauche.lua b/scripts/zones/Northern_San_dOria/npcs/Mevreauche.lua index 90d7c178750..3906ed1db51 100644 --- a/scripts/zones/Northern_San_dOria/npcs/Mevreauche.lua +++ b/scripts/zones/Northern_San_dOria/npcs/Mevreauche.lua @@ -15,9 +15,6 @@ entity.onTrigger = function(player, npc) xi.crafting.guildMasterOnTrigger(player, npc) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.crafting.guildMasterOnEventFinish(player, csid, option, npc) end diff --git a/scripts/zones/Northern_San_dOria/npcs/Miaux.lua b/scripts/zones/Northern_San_dOria/npcs/Miaux.lua index f4e689d0aae..09c1a1beb94 100644 --- a/scripts/zones/Northern_San_dOria/npcs/Miaux.lua +++ b/scripts/zones/Northern_San_dOria/npcs/Miaux.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.NORTHERN_SAN_DORIA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local aCraftsmansWork = player:getQuestStatus(xi.questLog.SANDORIA, xi.quest.id.sandoria.A_CRAFTSMAN_S_WORK) local quotasStatus = player:getCharVar('ChasingQuotas_Progress') @@ -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 == 73 and option == 0 then -- first part of long CS -- declines questgiver player:setCharVar('has_seen_drgaf1_quest_already', 1) diff --git a/scripts/zones/Northern_San_dOria/npcs/Millechuca.lua b/scripts/zones/Northern_San_dOria/npcs/Millechuca.lua index 8ae732f86d2..9dee8fdd87f 100644 --- a/scripts/zones/Northern_San_dOria/npcs/Millechuca.lua +++ b/scripts/zones/Northern_San_dOria/npcs/Millechuca.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.NORTHERN_SAN_DORIA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if GetRegionOwner(xi.region.VOLLBOW) ~= xi.nation.SANDORIA then player:showText(npc, ID.text.MILLECHUCA_CLOSED_DIALOG) @@ -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/Northern_San_dOria/npcs/Morjean.lua b/scripts/zones/Northern_San_dOria/npcs/Morjean.lua index 0777ba79e1d..7d18ff9488d 100755 --- a/scripts/zones/Northern_San_dOria/npcs/Morjean.lua +++ b/scripts/zones/Northern_San_dOria/npcs/Morjean.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local theHolyCrest = player:getCharVar('TheHolyCrest_Event') @@ -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 == 65 then player:addQuest(xi.questLog.SANDORIA, xi.quest.id.sandoria.THE_HOLY_CREST) diff --git a/scripts/zones/Northern_San_dOria/npcs/Morunaude.lua b/scripts/zones/Northern_San_dOria/npcs/Morunaude.lua deleted file mode 100644 index 41022523572..00000000000 --- a/scripts/zones/Northern_San_dOria/npcs/Morunaude.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Northern San d'Oria --- NPC: Morunaude ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(634) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Northern_San_dOria/npcs/Mulaujeant.lua b/scripts/zones/Northern_San_dOria/npcs/Mulaujeant.lua index 684fae1199f..66fbaa022a5 100644 --- a/scripts/zones/Northern_San_dOria/npcs/Mulaujeant.lua +++ b/scripts/zones/Northern_San_dOria/npcs/Mulaujeant.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.NORTHERN_SAN_DORIA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local finishtime = player:getCharVar('MissionaryMan_date') local missionaryManVar = player:getCharVar('MissionaryManVar') @@ -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 == 698 then player:setCharVar('MissionaryManVar', 3) diff --git a/scripts/zones/Northern_San_dOria/npcs/Narcheral.lua b/scripts/zones/Northern_San_dOria/npcs/Narcheral.lua index 41959034963..fd1be18fc49 100644 --- a/scripts/zones/Northern_San_dOria/npcs/Narcheral.lua +++ b/scripts/zones/Northern_San_dOria/npcs/Narcheral.lua @@ -54,9 +54,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 == 689 then player:addQuest(xi.questLog.SANDORIA, xi.quest.id.sandoria.MESSENGER_FROM_BEYOND) diff --git a/scripts/zones/Northern_San_dOria/npcs/Narsaude.lua b/scripts/zones/Northern_San_dOria/npcs/Narsaude.lua deleted file mode 100644 index 7a547207599..00000000000 --- a/scripts/zones/Northern_San_dOria/npcs/Narsaude.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Northern San d'Oria --- NPC: Narsaude ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(668) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Northern_San_dOria/npcs/Nonterene.lua b/scripts/zones/Northern_San_dOria/npcs/Nonterene.lua index 0c9879c15e9..e4268d5f81d 100644 --- a/scripts/zones/Northern_San_dOria/npcs/Nonterene.lua +++ b/scripts/zones/Northern_San_dOria/npcs/Nonterene.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.SANDORIA, xi.quest.id.sandoria.EXIT_THE_GAMBLER) == xi.questStatus.QUEST_ACCEPTED then player:startEvent(523) @@ -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/Northern_San_dOria/npcs/Olbergieut.lua b/scripts/zones/Northern_San_dOria/npcs/Olbergieut.lua index dcb171ce305..633b067150a 100644 --- a/scripts/zones/Northern_San_dOria/npcs/Olbergieut.lua +++ b/scripts/zones/Northern_San_dOria/npcs/Olbergieut.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.NORTHERN_SAN_DORIA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local gates = player:getQuestStatus(xi.questLog.SANDORIA, xi.quest.id.sandoria.GATES_TO_PARADISE) @@ -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 == 619 and option == 0 then player:addQuest(xi.questLog.SANDORIA, xi.quest.id.sandoria.GATES_TO_PARADISE) diff --git a/scripts/zones/Northern_San_dOria/npcs/Pagisalis.lua b/scripts/zones/Northern_San_dOria/npcs/Pagisalis.lua index fd98947eb37..19644014cd6 100644 --- a/scripts/zones/Northern_San_dOria/npcs/Pagisalis.lua +++ b/scripts/zones/Northern_San_dOria/npcs/Pagisalis.lua @@ -35,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 == 562 and option == 0 then player:addQuest(xi.questLog.SANDORIA, xi.quest.id.sandoria.UNDYING_FLAMES) diff --git a/scripts/zones/Northern_San_dOria/npcs/Pala_Korin.lua b/scripts/zones/Northern_San_dOria/npcs/Pala_Korin.lua deleted file mode 100644 index a2c872b4f3c..00000000000 --- a/scripts/zones/Northern_San_dOria/npcs/Pala_Korin.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Northern San d'Oria --- NPC: Pala_Korin ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(555) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Northern_San_dOria/npcs/Palguevion.lua b/scripts/zones/Northern_San_dOria/npcs/Palguevion.lua index b98298621f9..24e6b517f6b 100644 --- a/scripts/zones/Northern_San_dOria/npcs/Palguevion.lua +++ b/scripts/zones/Northern_San_dOria/npcs/Palguevion.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.NORTHERN_SAN_DORIA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if GetRegionOwner(xi.region.VALDEAUNIA) ~= xi.nation.SANDORIA then player:showText(npc, ID.text.PALGUEVION_CLOSED_DIALOG) @@ -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/Northern_San_dOria/npcs/Phairupegiont.lua b/scripts/zones/Northern_San_dOria/npcs/Phairupegiont.lua index bf37a88bc91..81898a19900 100644 --- a/scripts/zones/Northern_San_dOria/npcs/Phairupegiont.lua +++ b/scripts/zones/Northern_San_dOria/npcs/Phairupegiont.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') @@ -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 == 806 then player:setCharVar('WildcatSandy', utils.mask.setBit(player:getCharVar('WildcatSandy'), 8, true)) diff --git a/scripts/zones/Northern_San_dOria/npcs/Pikiki.lua b/scripts/zones/Northern_San_dOria/npcs/Pikiki.lua deleted file mode 100644 index 4785ecb0deb..00000000000 --- a/scripts/zones/Northern_San_dOria/npcs/Pikiki.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Northern San d'Oria --- NPC: Pikiki ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(553) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Northern_San_dOria/npcs/Pinok-Morok.lua b/scripts/zones/Northern_San_dOria/npcs/Pinok-Morok.lua index 8fc3e433a31..75edc624ee4 100644 --- a/scripts/zones/Northern_San_dOria/npcs/Pinok-Morok.lua +++ b/scripts/zones/Northern_San_dOria/npcs/Pinok-Morok.lua @@ -7,16 +7,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.crafting.oldImageSupportOnTrigger(player, npc) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.crafting.oldImageSupportOnEventFinish(player, csid, option, npc) end diff --git a/scripts/zones/Northern_San_dOria/npcs/Pirvidiauce.lua b/scripts/zones/Northern_San_dOria/npcs/Pirvidiauce.lua index e7075897d66..f1d6f02d8bc 100644 --- a/scripts/zones/Northern_San_dOria/npcs/Pirvidiauce.lua +++ b/scripts/zones/Northern_San_dOria/npcs/Pirvidiauce.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.NORTHERN_SAN_DORIA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -33,10 +30,4 @@ entity.onTrigger = function(player, npc) xi.shop.nation(player, stock, xi.nation.SANDORIA) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Northern_San_dOria/npcs/Pontaudarme.lua b/scripts/zones/Northern_San_dOria/npcs/Pontaudarme.lua deleted file mode 100644 index d3beea687eb..00000000000 --- a/scripts/zones/Northern_San_dOria/npcs/Pontaudarme.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Northern San d'Oria --- NPC: Pontaudarme --- !pos -51.628 -0.199 16.593 231 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(717) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Northern_San_dOria/npcs/Pulloie.lua b/scripts/zones/Northern_San_dOria/npcs/Pulloie.lua index 6cddca14c6e..64b019b27b3 100644 --- a/scripts/zones/Northern_San_dOria/npcs/Pulloie.lua +++ b/scripts/zones/Northern_San_dOria/npcs/Pulloie.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getNation() == 0 then player:startEvent(595) @@ -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/Northern_San_dOria/npcs/Pursuivant.lua b/scripts/zones/Northern_San_dOria/npcs/Pursuivant.lua deleted file mode 100644 index 82fb10b2a34..00000000000 --- a/scripts/zones/Northern_San_dOria/npcs/Pursuivant.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Northern San d'Oria --- NPC: Pursuivant --- !pos 54.000 -1.199 11.937 231 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(760) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Northern_San_dOria/npcs/Ramua.lua b/scripts/zones/Northern_San_dOria/npcs/Ramua.lua index 76b1bf2ecc1..dcac28f8246 100644 --- a/scripts/zones/Northern_San_dOria/npcs/Ramua.lua +++ b/scripts/zones/Northern_San_dOria/npcs/Ramua.lua @@ -7,16 +7,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.crafting.oldImageSupportOnTrigger(player, npc) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.crafting.oldImageSupportOnEventFinish(player, csid, option, npc) end diff --git a/scripts/zones/Northern_San_dOria/npcs/Rondipur.lua b/scripts/zones/Northern_San_dOria/npcs/Rondipur.lua deleted file mode 100644 index d6342d0d8fe..00000000000 --- a/scripts/zones/Northern_San_dOria/npcs/Rondipur.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Northern San d'Oria --- NPC: Rondipur --- Type: Quest Giver --- !pos -154.415 10.999 153.744 231 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(721) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Northern_San_dOria/npcs/Ronpaurege.lua b/scripts/zones/Northern_San_dOria/npcs/Ronpaurege.lua deleted file mode 100644 index 555ab759d2a..00000000000 --- a/scripts/zones/Northern_San_dOria/npcs/Ronpaurege.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Northern San d'Oria --- NPC: Ronpaurege --- !pos 65.739 -0.199 74.275 231 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(669) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Northern_San_dOria/npcs/Secodiand.lua b/scripts/zones/Northern_San_dOria/npcs/Secodiand.lua index b557aa37777..5ef175de8e8 100644 --- a/scripts/zones/Northern_San_dOria/npcs/Secodiand.lua +++ b/scripts/zones/Northern_San_dOria/npcs/Secodiand.lua @@ -25,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 == 19 and option == 1 then player:addQuest(xi.questLog.SANDORIA, xi.quest.id.sandoria.FEAR_OF_THE_DARK) diff --git a/scripts/zones/Northern_San_dOria/npcs/Shakir.lua b/scripts/zones/Northern_San_dOria/npcs/Shakir.lua deleted file mode 100644 index 4bbd308f7f1..00000000000 --- a/scripts/zones/Northern_San_dOria/npcs/Shakir.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Northern San d'Oria --- NPC: Shakir --- !pos 48.952 -2.999 -16.687 231 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(538) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Northern_San_dOria/npcs/Shomo_Pochachilo.lua b/scripts/zones/Northern_San_dOria/npcs/Shomo_Pochachilo.lua index 4e4496b4be9..67eecd5b671 100644 --- a/scripts/zones/Northern_San_dOria/npcs/Shomo_Pochachilo.lua +++ b/scripts/zones/Northern_San_dOria/npcs/Shomo_Pochachilo.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) -- TODO: Verify this, and move to quest script local questFatherAndSon = player:getQuestStatus(xi.questLog.SANDORIA, xi.quest.id.sandoria.FATHER_AND_SON) @@ -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/Northern_San_dOria/npcs/Symphonic_Curator.lua b/scripts/zones/Northern_San_dOria/npcs/Symphonic_Curator.lua index 1f207df2bd3..78532bbf338 100644 --- a/scripts/zones/Northern_San_dOria/npcs/Symphonic_Curator.lua +++ b/scripts/zones/Northern_San_dOria/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/Northern_San_dOria/npcs/Synergy_Engineer.lua b/scripts/zones/Northern_San_dOria/npcs/Synergy_Engineer.lua deleted file mode 100644 index 94f637d7245..00000000000 --- a/scripts/zones/Northern_San_dOria/npcs/Synergy_Engineer.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Northern San d'Oria --- NPC: Synergy Engineer --- !pos -123.000 10.5 244.000 231 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(11002) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Northern_San_dOria/npcs/Taurette.lua b/scripts/zones/Northern_San_dOria/npcs/Taurette.lua deleted file mode 100644 index 5b90e536847..00000000000 --- a/scripts/zones/Northern_San_dOria/npcs/Taurette.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Northern San d'Oria --- NPC: Taurette --- Involved in Quests: Riding on the Clouds --- !pos -159 0 91 231 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(664) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Northern_San_dOria/npcs/Tavourine.lua b/scripts/zones/Northern_San_dOria/npcs/Tavourine.lua index e523f576590..075ad5a7a70 100644 --- a/scripts/zones/Northern_San_dOria/npcs/Tavourine.lua +++ b/scripts/zones/Northern_San_dOria/npcs/Tavourine.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.NORTHERN_SAN_DORIA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -33,10 +30,4 @@ entity.onTrigger = function(player, npc) xi.shop.nation(player, stock, xi.nation.SANDORIA) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Northern_San_dOria/npcs/Telmoda.lua b/scripts/zones/Northern_San_dOria/npcs/Telmoda.lua index b005712bb06..d84bd74c295 100644 --- a/scripts/zones/Northern_San_dOria/npcs/Telmoda.lua +++ b/scripts/zones/Northern_San_dOria/npcs/Telmoda.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local telmodaMadaline = player:getCharVar('Telmoda_Madaline_Event') @@ -19,10 +16,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Northern_San_dOria/npcs/Ulycille.lua b/scripts/zones/Northern_San_dOria/npcs/Ulycille.lua index 376e3a7f81a..5ad0e94e8fc 100644 --- a/scripts/zones/Northern_San_dOria/npcs/Ulycille.lua +++ b/scripts/zones/Northern_San_dOria/npcs/Ulycille.lua @@ -7,16 +7,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.crafting.oldImageSupportOnTrigger(player, npc) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.crafting.oldImageSupportOnEventFinish(player, csid, option, npc) end diff --git a/scripts/zones/Northern_San_dOria/npcs/Vamorcote.lua b/scripts/zones/Northern_San_dOria/npcs/Vamorcote.lua index 98983a410ac..c74951d52b8 100644 --- a/scripts/zones/Northern_San_dOria/npcs/Vamorcote.lua +++ b/scripts/zones/Northern_San_dOria/npcs/Vamorcote.lua @@ -35,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 == 654 and option == 1 then --Player accepts the quest player:addQuest(xi.questLog.SANDORIA, xi.quest.id.sandoria.THE_SETTING_SUN) diff --git a/scripts/zones/Northern_San_dOria/npcs/Vavegallet.lua b/scripts/zones/Northern_San_dOria/npcs/Vavegallet.lua deleted file mode 100644 index 9d512481c7f..00000000000 --- a/scripts/zones/Northern_San_dOria/npcs/Vavegallet.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Northern San d'Oria --- NPC: Vavegallet ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(673) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Northern_San_dOria/npcs/Vichuel.lua b/scripts/zones/Northern_San_dOria/npcs/Vichuel.lua index b3afea97515..298e06b5665 100644 --- a/scripts/zones/Northern_San_dOria/npcs/Vichuel.lua +++ b/scripts/zones/Northern_San_dOria/npcs/Vichuel.lua @@ -28,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/Northern_San_dOria/npcs/Villion.lua b/scripts/zones/Northern_San_dOria/npcs/Villion.lua index 7c60cc20993..1cd889705d3 100644 --- a/scripts/zones/Northern_San_dOria/npcs/Villion.lua +++ b/scripts/zones/Northern_San_dOria/npcs/Villion.lua @@ -14,14 +14,4 @@ entity.onTrade = function(player, npc, trade) quests.ffr.onTrade(player, npc, trade, 9) -- FLYERS FOR REGINE end -entity.onTrigger = function(player, npc) - player:startEvent(632) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Northern_San_dOria/npcs/Wooden_Shutter.lua b/scripts/zones/Northern_San_dOria/npcs/Wooden_Shutter.lua index bdbb98081c1..a7c81a84869 100644 --- a/scripts/zones/Northern_San_dOria/npcs/Wooden_Shutter.lua +++ b/scripts/zones/Northern_San_dOria/npcs/Wooden_Shutter.lua @@ -5,16 +5,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(5) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if option == 1 then player:setPos(-480, -5.65, 669, 70, 2) diff --git a/scripts/zones/Northern_San_dOria/npcs/_6fc.lua b/scripts/zones/Northern_San_dOria/npcs/_6fc.lua deleted file mode 100644 index 2b532fb13c1..00000000000 --- a/scripts/zones/Northern_San_dOria/npcs/_6fc.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Northern San d'Oria --- NPC: Papal Chambers --- Finish Mission: The Davoi Report --- !pos 131 -11 122 231 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - -- This NPC is relevant only to San d'Orians on missions and has no default -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity From 1394aa94fc9511f5be74ff6e8d1ebe7bf68699ee Mon Sep 17 00:00:00 2001 From: claywar Date: Thu, 23 Jan 2025 12:37:51 -0500 Subject: [PATCH 3/3] Remove empty NPCs, add Default Actions - Nashmau ~ Norg --- scripts/zones/Nashmau/DefaultActions.lua | 33 +++++++++++-- scripts/zones/Nashmau/npcs/Abihaal.lua | 6 --- scripts/zones/Nashmau/npcs/Awaheen.lua | 10 ---- .../zones/Nashmau/npcs/Belligerent_Sheep.lua | 21 -------- .../zones/Nashmau/npcs/Bellowing_Scout.lua | 21 -------- scripts/zones/Nashmau/npcs/Buburoon.lua | 21 -------- scripts/zones/Nashmau/npcs/Chichiroon.lua | 9 ---- scripts/zones/Nashmau/npcs/Chuchuroon.lua | 21 -------- scripts/zones/Nashmau/npcs/Dnegan.lua | 6 --- scripts/zones/Nashmau/npcs/Gehuha.lua | 23 --------- scripts/zones/Nashmau/npcs/Guhyun.lua | 21 -------- scripts/zones/Nashmau/npcs/Habadim.lua | 21 -------- scripts/zones/Nashmau/npcs/Halshaob.lua | 22 --------- scripts/zones/Nashmau/npcs/Hunt_Registry.lua | 3 -- scripts/zones/Nashmau/npcs/Jajaroon.lua | 9 ---- scripts/zones/Nashmau/npcs/Jijiroon.lua | 21 -------- scripts/zones/Nashmau/npcs/Jojoroon.lua | 21 -------- scripts/zones/Nashmau/npcs/Leleroon.lua | 3 -- scripts/zones/Nashmau/npcs/Loloroon.lua | 21 -------- scripts/zones/Nashmau/npcs/Mamaroon.lua | 9 ---- scripts/zones/Nashmau/npcs/Memeroon.lua | 3 -- scripts/zones/Nashmau/npcs/Momoroon.lua | 9 ---- scripts/zones/Nashmau/npcs/Mumuroon.lua | 21 -------- scripts/zones/Nashmau/npcs/Nabihwah.lua | 3 -- scripts/zones/Nashmau/npcs/Nanaroon.lua | 9 ---- scripts/zones/Nashmau/npcs/Neneroon.lua | 9 ---- scripts/zones/Nashmau/npcs/Nomad_Moogle.lua | 9 ---- scripts/zones/Nashmau/npcs/Paparoon.lua | 21 -------- scripts/zones/Nashmau/npcs/Pipiroon.lua | 9 ---- scripts/zones/Nashmau/npcs/Poporoon.lua | 9 ---- scripts/zones/Nashmau/npcs/Pupuroon.lua | 9 ---- scripts/zones/Nashmau/npcs/Sajhra.lua | 21 -------- scripts/zones/Nashmau/npcs/Sisiroon.lua | 21 -------- scripts/zones/Nashmau/npcs/Tataroon.lua | 21 -------- scripts/zones/Nashmau/npcs/Teco_Chatpaya.lua | 21 -------- scripts/zones/Nashmau/npcs/Totoroon.lua | 21 -------- scripts/zones/Nashmau/npcs/Tsetseroon.lua | 21 -------- scripts/zones/Nashmau/npcs/Tsotsoroon.lua | 21 -------- scripts/zones/Nashmau/npcs/Tsutsuroon.lua | 11 ----- scripts/zones/Nashmau/npcs/Viviroon.lua | 21 -------- scripts/zones/Nashmau/npcs/Wafeeyah.lua | 21 -------- scripts/zones/Nashmau/npcs/Wata_Khamazom.lua | 9 ---- scripts/zones/Nashmau/npcs/Yohj_Dukonlhy.lua | 9 ---- scripts/zones/Nashmau/npcs/Yoyoroon.lua | 9 ---- scripts/zones/Nashmau/npcs/Yuyuroon.lua | 21 -------- scripts/zones/Nashmau/npcs/Zazaroon.lua | 21 -------- .../Newton_Movalpolos/npcs/Furnace_Hatch.lua | 6 --- .../Newton_Movalpolos/npcs/Mining_Point.lua | 6 --- .../Newton_Movalpolos/npcs/Sleakachiq.lua | 3 -- .../npcs/Treasure_Coffer.lua | 6 --- scripts/zones/Norg/DefaultActions.lua | 49 +++++++++++++------ scripts/zones/Norg/npcs/Achika.lua | 9 ---- scripts/zones/Norg/npcs/Agatsum.lua | 9 ---- scripts/zones/Norg/npcs/Ailee.lua | 21 -------- scripts/zones/Norg/npcs/Atrevaux.lua | 9 ---- scripts/zones/Norg/npcs/Chiyo.lua | 11 ----- scripts/zones/Norg/npcs/Colleraie.lua | 23 --------- scripts/zones/Norg/npcs/Comitiolus.lua | 3 -- scripts/zones/Norg/npcs/Corlotte.lua | 21 -------- scripts/zones/Norg/npcs/Deigoff.lua | 13 ----- scripts/zones/Norg/npcs/Edal-Tahdal.lua | 6 --- scripts/zones/Norg/npcs/Enishi.lua | 21 -------- scripts/zones/Norg/npcs/Eunsoo.lua | 21 -------- scripts/zones/Norg/npcs/Fouvia.lua | 6 --- scripts/zones/Norg/npcs/Gabide.lua | 21 -------- scripts/zones/Norg/npcs/Gimb.lua | 9 ---- scripts/zones/Norg/npcs/Gofufu.lua | 9 ---- scripts/zones/Norg/npcs/Gottna.lua | 21 -------- scripts/zones/Norg/npcs/Hayris.lua | 22 --------- scripts/zones/Norg/npcs/Heiji.lua | 3 -- scripts/zones/Norg/npcs/Heizo.lua | 3 -- scripts/zones/Norg/npcs/Hunt_Registry.lua | 3 -- scripts/zones/Norg/npcs/Jirokichi.lua | 11 ----- scripts/zones/Norg/npcs/Keal.lua | 6 --- scripts/zones/Norg/npcs/Koetsu.lua | 21 -------- scripts/zones/Norg/npcs/Louartain.lua | 13 ----- scripts/zones/Norg/npcs/Ludiault.lua | 21 -------- scripts/zones/Norg/npcs/Magephaud.lua | 3 -- scripts/zones/Norg/npcs/Mamaulabion.lua | 3 -- scripts/zones/Norg/npcs/Marilleune.lua | 3 -- scripts/zones/Norg/npcs/Muzaffar.lua | 3 -- scripts/zones/Norg/npcs/Nomad_Moogle.lua | 9 ---- scripts/zones/Norg/npcs/Odilinia.lua | 21 -------- scripts/zones/Norg/npcs/Ogugu.lua | 21 -------- scripts/zones/Norg/npcs/Oruga.lua | 13 ----- scripts/zones/Norg/npcs/Paito-Maito.lua | 13 ----- scripts/zones/Norg/npcs/Paleille.lua | 9 ---- scripts/zones/Norg/npcs/Parlemaille.lua | 13 ----- scripts/zones/Norg/npcs/Quntsu-Nointsu.lua | 6 --- scripts/zones/Norg/npcs/Rafid.lua | 21 -------- scripts/zones/Norg/npcs/Ramon.lua | 21 -------- scripts/zones/Norg/npcs/Ryoma.lua | 3 -- scripts/zones/Norg/npcs/Shidzue.lua | 9 ---- scripts/zones/Norg/npcs/Shivivi.lua | 12 ----- scripts/zones/Norg/npcs/Sohyon.lua | 22 --------- scripts/zones/Norg/npcs/Solby-Maholby.lua | 9 ---- scripts/zones/Norg/npcs/Spasija.lua | 9 ---- scripts/zones/Norg/npcs/Stray_Cloud.lua | 6 --- scripts/zones/Norg/npcs/Vaultimand.lua | 9 ---- scripts/zones/Norg/npcs/Verctissa.lua | 3 -- scripts/zones/Norg/npcs/Vishwas.lua | 22 --------- scripts/zones/Norg/npcs/Vuliaie.lua | 11 ----- scripts/zones/Norg/npcs/Zoldba.lua | 9 ---- .../zones/Phanauet_Channel/DefaultActions.lua | 2 +- 104 files changed, 66 insertions(+), 1327 deletions(-) delete mode 100644 scripts/zones/Nashmau/npcs/Belligerent_Sheep.lua delete mode 100644 scripts/zones/Nashmau/npcs/Bellowing_Scout.lua delete mode 100644 scripts/zones/Nashmau/npcs/Buburoon.lua delete mode 100644 scripts/zones/Nashmau/npcs/Chuchuroon.lua delete mode 100644 scripts/zones/Nashmau/npcs/Gehuha.lua delete mode 100644 scripts/zones/Nashmau/npcs/Guhyun.lua delete mode 100644 scripts/zones/Nashmau/npcs/Habadim.lua delete mode 100644 scripts/zones/Nashmau/npcs/Halshaob.lua delete mode 100644 scripts/zones/Nashmau/npcs/Jijiroon.lua delete mode 100644 scripts/zones/Nashmau/npcs/Jojoroon.lua delete mode 100644 scripts/zones/Nashmau/npcs/Loloroon.lua delete mode 100644 scripts/zones/Nashmau/npcs/Mumuroon.lua delete mode 100644 scripts/zones/Nashmau/npcs/Paparoon.lua delete mode 100644 scripts/zones/Nashmau/npcs/Sajhra.lua delete mode 100644 scripts/zones/Nashmau/npcs/Sisiroon.lua delete mode 100644 scripts/zones/Nashmau/npcs/Tataroon.lua delete mode 100644 scripts/zones/Nashmau/npcs/Teco_Chatpaya.lua delete mode 100644 scripts/zones/Nashmau/npcs/Totoroon.lua delete mode 100644 scripts/zones/Nashmau/npcs/Tsetseroon.lua delete mode 100644 scripts/zones/Nashmau/npcs/Tsotsoroon.lua delete mode 100644 scripts/zones/Nashmau/npcs/Viviroon.lua delete mode 100644 scripts/zones/Nashmau/npcs/Wafeeyah.lua delete mode 100644 scripts/zones/Nashmau/npcs/Yuyuroon.lua delete mode 100644 scripts/zones/Nashmau/npcs/Zazaroon.lua delete mode 100644 scripts/zones/Norg/npcs/Ailee.lua delete mode 100644 scripts/zones/Norg/npcs/Colleraie.lua delete mode 100644 scripts/zones/Norg/npcs/Corlotte.lua delete mode 100644 scripts/zones/Norg/npcs/Enishi.lua delete mode 100644 scripts/zones/Norg/npcs/Eunsoo.lua delete mode 100644 scripts/zones/Norg/npcs/Gabide.lua delete mode 100644 scripts/zones/Norg/npcs/Gottna.lua delete mode 100644 scripts/zones/Norg/npcs/Hayris.lua delete mode 100644 scripts/zones/Norg/npcs/Koetsu.lua delete mode 100644 scripts/zones/Norg/npcs/Ludiault.lua delete mode 100644 scripts/zones/Norg/npcs/Odilinia.lua delete mode 100644 scripts/zones/Norg/npcs/Ogugu.lua delete mode 100644 scripts/zones/Norg/npcs/Rafid.lua delete mode 100644 scripts/zones/Norg/npcs/Ramon.lua delete mode 100644 scripts/zones/Norg/npcs/Sohyon.lua delete mode 100644 scripts/zones/Norg/npcs/Vishwas.lua diff --git a/scripts/zones/Nashmau/DefaultActions.lua b/scripts/zones/Nashmau/DefaultActions.lua index 94217f40e83..39cebfd008f 100644 --- a/scripts/zones/Nashmau/DefaultActions.lua +++ b/scripts/zones/Nashmau/DefaultActions.lua @@ -1,5 +1,32 @@ +-- local ID = zones[xi.zone.NASHMAU] + return { - ['Kyokyoroon'] = { event = 263 }, - ['Pyopyoroon'] = { event = 275 }, - ['Ququroon'] = { event = 241 }, + ['Awaheen'] = { event = 240 }, + ['Belligerent_Sheep'] = { event = 237 }, + ['Bellowing_Scout'] = { event = 236 }, + ['Buburoon'] = { event = 259 }, + ['Chuchuroon'] = { event = 266 }, + ['Gehuha'] = { event = 13 }, + ['Guhyun'] = { event = 10 }, + ['Habadim'] = { event = 274 }, + ['Halshaob'] = { event = 299 }, + ['Jijiroon'] = { event = 1 }, + ['Jojoroon'] = { event = 271 }, + ['Kyokyoroon'] = { event = 263 }, + ['Loloroon'] = { event = 269 }, + ['Mumuroon'] = { event = 262 }, + ['Paparoon'] = { event = 26 }, + ['Pyopyoroon'] = { event = 275 }, + ['Ququroon'] = { event = 241 }, + ['Sajhra'] = { event = 220 }, + ['Sisiroon'] = { event = 268 }, + ['Tataroon'] = { event = 270 }, + ['Teco_Chatpaya'] = { event = 306 }, + ['Totoroon'] = { event = 246 }, + ['Tsetseroon'] = { event = 4 }, + ['Tsotsoroon'] = { event = 267 }, + ['Viviroon'] = { event = 2 }, + ['Wafeeyah'] = { event = 11 }, + ['Yuyuroon'] = { event = 265 }, + ['Zazaroon'] = { event = 260 }, } diff --git a/scripts/zones/Nashmau/npcs/Abihaal.lua b/scripts/zones/Nashmau/npcs/Abihaal.lua index 53ae788d766..231d40ef236 100644 --- a/scripts/zones/Nashmau/npcs/Abihaal.lua +++ b/scripts/zones/Nashmau/npcs/Abihaal.lua @@ -5,16 +5,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(221, player:getGil(), 100) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 221 and option == 333 then player:delGil(100) diff --git a/scripts/zones/Nashmau/npcs/Awaheen.lua b/scripts/zones/Nashmau/npcs/Awaheen.lua index 5e39d9d243e..c21d0c3d658 100644 --- a/scripts/zones/Nashmau/npcs/Awaheen.lua +++ b/scripts/zones/Nashmau/npcs/Awaheen.lua @@ -40,14 +40,4 @@ entity.onTrade = function(player, npc, trade) end 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/Nashmau/npcs/Belligerent_Sheep.lua b/scripts/zones/Nashmau/npcs/Belligerent_Sheep.lua deleted file mode 100644 index ed936424f3e..00000000000 --- a/scripts/zones/Nashmau/npcs/Belligerent_Sheep.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Nashmau --- NPC: Belligerent Sheep ------------------------------------ ----@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/Nashmau/npcs/Bellowing_Scout.lua b/scripts/zones/Nashmau/npcs/Bellowing_Scout.lua deleted file mode 100644 index feab90e8e6d..00000000000 --- a/scripts/zones/Nashmau/npcs/Bellowing_Scout.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Nashmau --- NPC: Bellowing Scout ------------------------------------ ----@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/Nashmau/npcs/Buburoon.lua b/scripts/zones/Nashmau/npcs/Buburoon.lua deleted file mode 100644 index c1496ea12a7..00000000000 --- a/scripts/zones/Nashmau/npcs/Buburoon.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Nashmau --- NPC: Buburoon ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(259) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Nashmau/npcs/Chichiroon.lua b/scripts/zones/Nashmau/npcs/Chichiroon.lua index 9ce4904a0ef..023f6fe0216 100644 --- a/scripts/zones/Nashmau/npcs/Chichiroon.lua +++ b/scripts/zones/Nashmau/npcs/Chichiroon.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.NASHMAU] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -30,10 +27,4 @@ entity.onTrigger = function(player, npc) xi.shop.general(player, stock) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Nashmau/npcs/Chuchuroon.lua b/scripts/zones/Nashmau/npcs/Chuchuroon.lua deleted file mode 100644 index c37bc04b62e..00000000000 --- a/scripts/zones/Nashmau/npcs/Chuchuroon.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Nashmau --- NPC: Chuchuroon ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(266) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Nashmau/npcs/Dnegan.lua b/scripts/zones/Nashmau/npcs/Dnegan.lua index 18df8adbb07..411806c4884 100644 --- a/scripts/zones/Nashmau/npcs/Dnegan.lua +++ b/scripts/zones/Nashmau/npcs/Dnegan.lua @@ -7,9 +7,6 @@ ---@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') @@ -35,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 == 289 then player:setCharVar('TheWaywardAutomatonProgress', 2) diff --git a/scripts/zones/Nashmau/npcs/Gehuha.lua b/scripts/zones/Nashmau/npcs/Gehuha.lua deleted file mode 100644 index 50761b60326..00000000000 --- a/scripts/zones/Nashmau/npcs/Gehuha.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Nashmau --- NPC: Gehuha --- Type: Event Scene Replayer --- !pos -13.414 -1 -50.825 53 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(13) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Nashmau/npcs/Guhyun.lua b/scripts/zones/Nashmau/npcs/Guhyun.lua deleted file mode 100644 index 4c2368a15b9..00000000000 --- a/scripts/zones/Nashmau/npcs/Guhyun.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Nashmau --- NPC: Guhyun ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(10) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Nashmau/npcs/Habadim.lua b/scripts/zones/Nashmau/npcs/Habadim.lua deleted file mode 100644 index c40ebb4a8e4..00000000000 --- a/scripts/zones/Nashmau/npcs/Habadim.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Nashmau --- NPC: Habadim ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(274) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Nashmau/npcs/Halshaob.lua b/scripts/zones/Nashmau/npcs/Halshaob.lua deleted file mode 100644 index 8c4e932d118..00000000000 --- a/scripts/zones/Nashmau/npcs/Halshaob.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Nashmau --- NPC: Halshaob --- !pos 28.537 -7 -85.250 53 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(299) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Nashmau/npcs/Hunt_Registry.lua b/scripts/zones/Nashmau/npcs/Hunt_Registry.lua index 82bdd6a309f..654bf8c5c59 100644 --- a/scripts/zones/Nashmau/npcs/Hunt_Registry.lua +++ b/scripts/zones/Nashmau/npcs/Hunt_Registry.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.hunts.onTrigger(player, npc) end diff --git a/scripts/zones/Nashmau/npcs/Jajaroon.lua b/scripts/zones/Nashmau/npcs/Jajaroon.lua index f644f1af356..cfbe2976e42 100644 --- a/scripts/zones/Nashmau/npcs/Jajaroon.lua +++ b/scripts/zones/Nashmau/npcs/Jajaroon.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.NASHMAU] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -35,10 +32,4 @@ entity.onTrigger = function(player, npc) xi.shop.general(player, stock) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Nashmau/npcs/Jijiroon.lua b/scripts/zones/Nashmau/npcs/Jijiroon.lua deleted file mode 100644 index 456d835c6e0..00000000000 --- a/scripts/zones/Nashmau/npcs/Jijiroon.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Nashmau --- NPC: Jijiroon ------------------------------------ ----@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/Nashmau/npcs/Jojoroon.lua b/scripts/zones/Nashmau/npcs/Jojoroon.lua deleted file mode 100644 index c3dcec4ea0f..00000000000 --- a/scripts/zones/Nashmau/npcs/Jojoroon.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Nashmau --- NPC: Jojoroon ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(271) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Nashmau/npcs/Leleroon.lua b/scripts/zones/Nashmau/npcs/Leleroon.lua index f96dee76731..c551c05e066 100644 --- a/scripts/zones/Nashmau/npcs/Leleroon.lua +++ b/scripts/zones/Nashmau/npcs/Leleroon.lua @@ -59,9 +59,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 282 then if option == 1 then diff --git a/scripts/zones/Nashmau/npcs/Loloroon.lua b/scripts/zones/Nashmau/npcs/Loloroon.lua deleted file mode 100644 index d07bb937a4d..00000000000 --- a/scripts/zones/Nashmau/npcs/Loloroon.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Nashmau --- NPC: Loloroon ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(269) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Nashmau/npcs/Mamaroon.lua b/scripts/zones/Nashmau/npcs/Mamaroon.lua index 11458c39d39..48143b63d55 100644 --- a/scripts/zones/Nashmau/npcs/Mamaroon.lua +++ b/scripts/zones/Nashmau/npcs/Mamaroon.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.NASHMAU] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -31,10 +28,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/Nashmau/npcs/Memeroon.lua b/scripts/zones/Nashmau/npcs/Memeroon.lua index 2f11e8b24b3..06a2a236883 100644 --- a/scripts/zones/Nashmau/npcs/Memeroon.lua +++ b/scripts/zones/Nashmau/npcs/Memeroon.lua @@ -15,9 +15,6 @@ entity.onTrigger = function(player, npc) player:startEvent(272, 500) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.appraisal.appraisalOnEventFinish(player, csid, option, 500, 273, npc) end diff --git a/scripts/zones/Nashmau/npcs/Momoroon.lua b/scripts/zones/Nashmau/npcs/Momoroon.lua index 6a377228843..ef405602475 100644 --- a/scripts/zones/Nashmau/npcs/Momoroon.lua +++ b/scripts/zones/Nashmau/npcs/Momoroon.lua @@ -5,17 +5,8 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:sendMenu(3) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Nashmau/npcs/Mumuroon.lua b/scripts/zones/Nashmau/npcs/Mumuroon.lua deleted file mode 100644 index 099078ac15a..00000000000 --- a/scripts/zones/Nashmau/npcs/Mumuroon.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Nashmau --- NPC: Mumuroon ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(262) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Nashmau/npcs/Nabihwah.lua b/scripts/zones/Nashmau/npcs/Nabihwah.lua index 0c79d5d2f02..28f5b2ac09b 100644 --- a/scripts/zones/Nashmau/npcs/Nabihwah.lua +++ b/scripts/zones/Nashmau/npcs/Nabihwah.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.besieged.onTrigger(player, npc, 253) end diff --git a/scripts/zones/Nashmau/npcs/Nanaroon.lua b/scripts/zones/Nashmau/npcs/Nanaroon.lua index f5be261aeaa..36ddcf2b731 100644 --- a/scripts/zones/Nashmau/npcs/Nanaroon.lua +++ b/scripts/zones/Nashmau/npcs/Nanaroon.lua @@ -9,18 +9,9 @@ local ID = zones[xi.zone.NASHMAU] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:showText(npc, ID.text.NANA_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/Nashmau/npcs/Neneroon.lua b/scripts/zones/Nashmau/npcs/Neneroon.lua index 65dc1ef46ad..1a1bae4b671 100644 --- a/scripts/zones/Nashmau/npcs/Neneroon.lua +++ b/scripts/zones/Nashmau/npcs/Neneroon.lua @@ -9,18 +9,9 @@ local ID = zones[xi.zone.NASHMAU] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:showText(npc, ID.text.NENE_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/Nashmau/npcs/Nomad_Moogle.lua b/scripts/zones/Nashmau/npcs/Nomad_Moogle.lua index 22fc363fac4..ae63dfa8040 100644 --- a/scripts/zones/Nashmau/npcs/Nomad_Moogle.lua +++ b/scripts/zones/Nashmau/npcs/Nomad_Moogle.lua @@ -7,18 +7,9 @@ local ID = zones[xi.zone.NASHMAU] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:showText(npc, ID.text.NOMAD_MOOGLE_DIALOG) player:sendMenu(1) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Nashmau/npcs/Paparoon.lua b/scripts/zones/Nashmau/npcs/Paparoon.lua deleted file mode 100644 index cdafcb46ddb..00000000000 --- a/scripts/zones/Nashmau/npcs/Paparoon.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Nashmau --- NPC: Paparoon ------------------------------------ ----@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/Nashmau/npcs/Pipiroon.lua b/scripts/zones/Nashmau/npcs/Pipiroon.lua index 628993b56fa..b1676a1f92d 100644 --- a/scripts/zones/Nashmau/npcs/Pipiroon.lua +++ b/scripts/zones/Nashmau/npcs/Pipiroon.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.NASHMAU] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -23,10 +20,4 @@ entity.onTrigger = function(player, npc) xi.shop.general(player, stock) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Nashmau/npcs/Poporoon.lua b/scripts/zones/Nashmau/npcs/Poporoon.lua index dfbfb5b67f3..d86b16da933 100644 --- a/scripts/zones/Nashmau/npcs/Poporoon.lua +++ b/scripts/zones/Nashmau/npcs/Poporoon.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.NASHMAU] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -23,10 +20,4 @@ entity.onTrigger = function(player, npc) xi.shop.general(player, stock) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Nashmau/npcs/Pupuroon.lua b/scripts/zones/Nashmau/npcs/Pupuroon.lua index 53dcef73258..73c3d0e02f6 100644 --- a/scripts/zones/Nashmau/npcs/Pupuroon.lua +++ b/scripts/zones/Nashmau/npcs/Pupuroon.lua @@ -5,17 +5,8 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:sendMenu(3) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Nashmau/npcs/Sajhra.lua b/scripts/zones/Nashmau/npcs/Sajhra.lua deleted file mode 100644 index e36f2d2b65f..00000000000 --- a/scripts/zones/Nashmau/npcs/Sajhra.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Nashmau --- NPC: Sajhra ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(220) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Nashmau/npcs/Sisiroon.lua b/scripts/zones/Nashmau/npcs/Sisiroon.lua deleted file mode 100644 index a9793d6cbc4..00000000000 --- a/scripts/zones/Nashmau/npcs/Sisiroon.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Nashmau --- NPC: Sisiroon ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(268) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Nashmau/npcs/Tataroon.lua b/scripts/zones/Nashmau/npcs/Tataroon.lua deleted file mode 100644 index 7c869a99c52..00000000000 --- a/scripts/zones/Nashmau/npcs/Tataroon.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Nashmau --- NPC: Tataroon ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(270) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Nashmau/npcs/Teco_Chatpaya.lua b/scripts/zones/Nashmau/npcs/Teco_Chatpaya.lua deleted file mode 100644 index 30c85d11bb0..00000000000 --- a/scripts/zones/Nashmau/npcs/Teco_Chatpaya.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Nashmau --- NPC: Teco Chatpaya ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(306) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Nashmau/npcs/Totoroon.lua b/scripts/zones/Nashmau/npcs/Totoroon.lua deleted file mode 100644 index 0bd3bcb7f6a..00000000000 --- a/scripts/zones/Nashmau/npcs/Totoroon.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Nashmau --- NPC: Totoroon ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(246) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Nashmau/npcs/Tsetseroon.lua b/scripts/zones/Nashmau/npcs/Tsetseroon.lua deleted file mode 100644 index 99b0c0a3c72..00000000000 --- a/scripts/zones/Nashmau/npcs/Tsetseroon.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Nashmau --- NPC: Tsetseroon ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(4) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Nashmau/npcs/Tsotsoroon.lua b/scripts/zones/Nashmau/npcs/Tsotsoroon.lua deleted file mode 100644 index a843a6765e4..00000000000 --- a/scripts/zones/Nashmau/npcs/Tsotsoroon.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Nashmau --- NPC: Tsotsoroon ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(267) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Nashmau/npcs/Tsutsuroon.lua b/scripts/zones/Nashmau/npcs/Tsutsuroon.lua index db9ce3c60ad..3652cbe3b9c 100644 --- a/scripts/zones/Nashmau/npcs/Tsutsuroon.lua +++ b/scripts/zones/Nashmau/npcs/Tsutsuroon.lua @@ -9,23 +9,12 @@ local ID = zones[xi.zone.NASHMAU] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:hasKeyItem(xi.ki.TENSHODO_MEMBERS_CARD) then if player:sendGuild(60431, 1, 23, 7) then player:showText(npc, ID.text.TSUTSUROON_SHOP_DIALOG) end - else - -- player:startEvent(150) 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/Nashmau/npcs/Viviroon.lua b/scripts/zones/Nashmau/npcs/Viviroon.lua deleted file mode 100644 index f328a468495..00000000000 --- a/scripts/zones/Nashmau/npcs/Viviroon.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Nashmau --- NPC: Viviroon ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(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/Nashmau/npcs/Wafeeyah.lua b/scripts/zones/Nashmau/npcs/Wafeeyah.lua deleted file mode 100644 index c943ed1ab67..00000000000 --- a/scripts/zones/Nashmau/npcs/Wafeeyah.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Nashmau --- NPC: Wafeeyah ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -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/Nashmau/npcs/Wata_Khamazom.lua b/scripts/zones/Nashmau/npcs/Wata_Khamazom.lua index 8299a9916fe..b8259915f5a 100644 --- a/scripts/zones/Nashmau/npcs/Wata_Khamazom.lua +++ b/scripts/zones/Nashmau/npcs/Wata_Khamazom.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.NASHMAU] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -30,10 +27,4 @@ entity.onTrigger = function(player, npc) xi.shop.general(player, stock) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Nashmau/npcs/Yohj_Dukonlhy.lua b/scripts/zones/Nashmau/npcs/Yohj_Dukonlhy.lua index c980a1d6ba4..15f4a8c40cc 100644 --- a/scripts/zones/Nashmau/npcs/Yohj_Dukonlhy.lua +++ b/scripts/zones/Nashmau/npcs/Yohj_Dukonlhy.lua @@ -6,17 +6,8 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.transport.onDockTimekeeperTrigger(player, xi.transport.routes.SILVER_SEA, 231) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Nashmau/npcs/Yoyoroon.lua b/scripts/zones/Nashmau/npcs/Yoyoroon.lua index 7005690dc45..cfb651d98e6 100644 --- a/scripts/zones/Nashmau/npcs/Yoyoroon.lua +++ b/scripts/zones/Nashmau/npcs/Yoyoroon.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.NASHMAU] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -88,10 +85,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/Nashmau/npcs/Yuyuroon.lua b/scripts/zones/Nashmau/npcs/Yuyuroon.lua deleted file mode 100644 index 26a8cc89fd2..00000000000 --- a/scripts/zones/Nashmau/npcs/Yuyuroon.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Nashmau --- NPC: Yuyuroon ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(265) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Nashmau/npcs/Zazaroon.lua b/scripts/zones/Nashmau/npcs/Zazaroon.lua deleted file mode 100644 index 1fad4e3c436..00000000000 --- a/scripts/zones/Nashmau/npcs/Zazaroon.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Nashmau --- NPC: Zazaroon ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(260) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Newton_Movalpolos/npcs/Furnace_Hatch.lua b/scripts/zones/Newton_Movalpolos/npcs/Furnace_Hatch.lua index 47ea2e9c705..76d6a85b847 100644 --- a/scripts/zones/Newton_Movalpolos/npcs/Furnace_Hatch.lua +++ b/scripts/zones/Newton_Movalpolos/npcs/Furnace_Hatch.lua @@ -31,10 +31,4 @@ entity.onTrigger = function(player, npc) player:startEvent(20) -- no firesand message end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Newton_Movalpolos/npcs/Mining_Point.lua b/scripts/zones/Newton_Movalpolos/npcs/Mining_Point.lua index c367975c51b..251961157ca 100644 --- a/scripts/zones/Newton_Movalpolos/npcs/Mining_Point.lua +++ b/scripts/zones/Newton_Movalpolos/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/Newton_Movalpolos/npcs/Sleakachiq.lua b/scripts/zones/Newton_Movalpolos/npcs/Sleakachiq.lua index 02748d28f67..ec6ab8c921e 100644 --- a/scripts/zones/Newton_Movalpolos/npcs/Sleakachiq.lua +++ b/scripts/zones/Newton_Movalpolos/npcs/Sleakachiq.lua @@ -30,9 +30,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 28 then if option == 1 then diff --git a/scripts/zones/Newton_Movalpolos/npcs/Treasure_Coffer.lua b/scripts/zones/Newton_Movalpolos/npcs/Treasure_Coffer.lua index d543251e9c5..ffaa9c7cbdb 100644 --- a/scripts/zones/Newton_Movalpolos/npcs/Treasure_Coffer.lua +++ b/scripts/zones/Newton_Movalpolos/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/Norg/DefaultActions.lua b/scripts/zones/Norg/DefaultActions.lua index 14f649ff127..154f9293483 100644 --- a/scripts/zones/Norg/DefaultActions.lua +++ b/scripts/zones/Norg/DefaultActions.lua @@ -1,18 +1,39 @@ local ID = zones[xi.zone.NORG] return { - ['_700'] = { messageSpecial = ID.text.DOOR_IS_LOCKED }, - ['Aeka'] = { event = 120 }, - ['Andrause'] = { event = 239 }, - ['Comitiolus'] = { event = 72 }, - ['Heillal'] = { event = 64 }, - ['Jaucribaix'] = { event = 71 }, - ['Kamui'] = { event = 61 }, - ['Keal'] = { event = 89 }, - ['Laisrean'] = { event = 83 }, - ['Ranemaud'] = { event = 68 }, - ['Ryoma'] = { event = 94 }, - ['Shivivi'] = { event = 85 }, - ['Verctissa'] = { event = 114 }, - ['Washu'] = { event = 80 }, + ['_700'] = { messageSpecial = ID.text.DOOR_IS_LOCKED }, + ['Aeka'] = { event = 120 }, + ['Ailee'] = { event = 91 }, + ['Andrause'] = { event = 239 }, + ['Colleraie'] = { event = 175 }, + ['Comitiolus'] = { event = 72 }, + ['Corlotte'] = { event = 73 }, + ['Deigoff'] = { event = 86 }, + ['Enishi'] = { event = 77 }, + ['Eunsoo'] = { event = 63 }, + ['Gabide'] = { event = 78 }, + ['Gottna'] = { event = 66 }, + ['Hayris'] = { event = 215 }, + ['Heillal'] = { event = 64 }, + ['Jaucribaix'] = { event = 71 }, + ['Kamui'] = { event = 61 }, + ['Keal'] = { event = 89 }, + ['Koetsu'] = { event = 70 }, + ['Laisrean'] = { event = 83 }, + ['Louartain'] = { event = 84 }, + ['Ludiault'] = { event = 82 }, + ['Odilinia'] = { event = 92 }, + ['Ogugu'] = { event = 79 }, + ['Oruga'] = { event = 87 }, + ['Paito-Maito'] = { event = 90 }, + ['Parlemaille'] = { event = 88 }, + ['Rafid'] = { event = 65 }, + ['Ramon'] = { event = 62 }, + ['Ranemaud'] = { event = 68 }, + ['Ryoma'] = { event = 94 }, + ['Shivivi'] = { event = 85 }, + ['Sohyon'] = { event = 212 }, + ['Verctissa'] = { event = 114 }, + ['Vishwas'] = { event = 218 }, + ['Washu'] = { event = 80 }, } diff --git a/scripts/zones/Norg/npcs/Achika.lua b/scripts/zones/Norg/npcs/Achika.lua index c758858bf1b..70da319b97b 100644 --- a/scripts/zones/Norg/npcs/Achika.lua +++ b/scripts/zones/Norg/npcs/Achika.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.NORG] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:hasKeyItem(xi.ki.TENSHODO_MEMBERS_CARD) then if player:sendGuild(60421, 9, 23, 7) then @@ -22,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/Norg/npcs/Agatsum.lua b/scripts/zones/Norg/npcs/Agatsum.lua index 0313069e8a3..3e60069f3de 100644 --- a/scripts/zones/Norg/npcs/Agatsum.lua +++ b/scripts/zones/Norg/npcs/Agatsum.lua @@ -5,17 +5,8 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:sendMenu(3) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Norg/npcs/Ailee.lua b/scripts/zones/Norg/npcs/Ailee.lua deleted file mode 100644 index 59eae208429..00000000000 --- a/scripts/zones/Norg/npcs/Ailee.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Norg --- NPC: Ailee ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(91) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Norg/npcs/Atrevaux.lua b/scripts/zones/Norg/npcs/Atrevaux.lua index 4d32d59bb5f..55216fef457 100644 --- a/scripts/zones/Norg/npcs/Atrevaux.lua +++ b/scripts/zones/Norg/npcs/Atrevaux.lua @@ -5,17 +5,8 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:sendMenu(3) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Norg/npcs/Chiyo.lua b/scripts/zones/Norg/npcs/Chiyo.lua index 74779b70e3d..d67249a5e86 100644 --- a/scripts/zones/Norg/npcs/Chiyo.lua +++ b/scripts/zones/Norg/npcs/Chiyo.lua @@ -9,23 +9,12 @@ local ID = zones[xi.zone.NORG] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:hasKeyItem(xi.ki.TENSHODO_MEMBERS_CARD) then if player:sendGuild(60422, 9, 23, 7) then player:showText(npc, ID.text.CHIYO_SHOP_DIALOG) end - else - -- player:startEvent(150) 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/Norg/npcs/Colleraie.lua b/scripts/zones/Norg/npcs/Colleraie.lua deleted file mode 100644 index 6c16bb0cb3f..00000000000 --- a/scripts/zones/Norg/npcs/Colleraie.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Norg --- NPC: Colleraie --- Type: Event Scene Replayer --- !pos -24.684 0.097 -39.409 252 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(175) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Norg/npcs/Comitiolus.lua b/scripts/zones/Norg/npcs/Comitiolus.lua index adfc5192f04..46528bbeb39 100644 --- a/scripts/zones/Norg/npcs/Comitiolus.lua +++ b/scripts/zones/Norg/npcs/Comitiolus.lua @@ -25,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 == 207 then player:tradeComplete() diff --git a/scripts/zones/Norg/npcs/Corlotte.lua b/scripts/zones/Norg/npcs/Corlotte.lua deleted file mode 100644 index 7bf2ccabf94..00000000000 --- a/scripts/zones/Norg/npcs/Corlotte.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Norg --- NPC: Corlotte ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(73) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Norg/npcs/Deigoff.lua b/scripts/zones/Norg/npcs/Deigoff.lua index 15695a2a708..a7e3c61a5fa 100644 --- a/scripts/zones/Norg/npcs/Deigoff.lua +++ b/scripts/zones/Norg/npcs/Deigoff.lua @@ -73,17 +73,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(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/Norg/npcs/Edal-Tahdal.lua b/scripts/zones/Norg/npcs/Edal-Tahdal.lua index e2bc197ddde..5c029ebb0da 100644 --- a/scripts/zones/Norg/npcs/Edal-Tahdal.lua +++ b/scripts/zones/Norg/npcs/Edal-Tahdal.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.NORG] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local trialByWater = player:getQuestStatus(xi.questLog.OUTLANDS, xi.quest.id.outlands.TRIAL_BY_WATER) local hasWhisperOfTides = player:hasKeyItem(xi.ki.WHISPER_OF_TIDES) @@ -58,9 +55,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 == 109 and option == 1 then if player:getQuestStatus(xi.questLog.OUTLANDS, xi.quest.id.outlands.TRIAL_BY_WATER) == xi.questStatus.QUEST_COMPLETED then diff --git a/scripts/zones/Norg/npcs/Enishi.lua b/scripts/zones/Norg/npcs/Enishi.lua deleted file mode 100644 index f333461a63f..00000000000 --- a/scripts/zones/Norg/npcs/Enishi.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Norg --- NPC: Enishi ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(77) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Norg/npcs/Eunsoo.lua b/scripts/zones/Norg/npcs/Eunsoo.lua deleted file mode 100644 index b99a054480a..00000000000 --- a/scripts/zones/Norg/npcs/Eunsoo.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Norg --- NPC: Eunsoo ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(63) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Norg/npcs/Fouvia.lua b/scripts/zones/Norg/npcs/Fouvia.lua index 161e5855af0..9f31f54f160 100644 --- a/scripts/zones/Norg/npcs/Fouvia.lua +++ b/scripts/zones/Norg/npcs/Fouvia.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.NORG] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getMainJob() ~= xi.job.DRG then player:showText(npc, ID.text.FOUIVA_DIALOG) -- Oi 'av naw business wi' de likes av you. @@ -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 == 130 and diff --git a/scripts/zones/Norg/npcs/Gabide.lua b/scripts/zones/Norg/npcs/Gabide.lua deleted file mode 100644 index a1b7637cef4..00000000000 --- a/scripts/zones/Norg/npcs/Gabide.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Norg --- NPC: Gabide ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(78) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Norg/npcs/Gimb.lua b/scripts/zones/Norg/npcs/Gimb.lua index 777c668eb8b..91ff674aef9 100644 --- a/scripts/zones/Norg/npcs/Gimb.lua +++ b/scripts/zones/Norg/npcs/Gimb.lua @@ -7,18 +7,9 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(69) player:setCharVar('SahaginKeyProgress', 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/Norg/npcs/Gofufu.lua b/scripts/zones/Norg/npcs/Gofufu.lua index cf8d840c9fe..a87024ced04 100644 --- a/scripts/zones/Norg/npcs/Gofufu.lua +++ b/scripts/zones/Norg/npcs/Gofufu.lua @@ -5,17 +5,8 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:sendMenu(3) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Norg/npcs/Gottna.lua b/scripts/zones/Norg/npcs/Gottna.lua deleted file mode 100644 index 6a59252f607..00000000000 --- a/scripts/zones/Norg/npcs/Gottna.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Norg --- NPC: Gottna ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(66) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Norg/npcs/Hayris.lua b/scripts/zones/Norg/npcs/Hayris.lua deleted file mode 100644 index 0f1b6cb6947..00000000000 --- a/scripts/zones/Norg/npcs/Hayris.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Norg --- NPC: Hayris --- !pos 45.296 -7.282 12.267 252 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(215) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Norg/npcs/Heiji.lua b/scripts/zones/Norg/npcs/Heiji.lua index d542d5a9f37..733d639a689 100644 --- a/scripts/zones/Norg/npcs/Heiji.lua +++ b/scripts/zones/Norg/npcs/Heiji.lua @@ -50,9 +50,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 123 then player:addQuest(xi.questLog.OUTLANDS, xi.quest.id.outlands.LIKE_A_SHINING_SUBLIGAR) diff --git a/scripts/zones/Norg/npcs/Heizo.lua b/scripts/zones/Norg/npcs/Heizo.lua index 5932be97343..b00c84b4b86 100644 --- a/scripts/zones/Norg/npcs/Heizo.lua +++ b/scripts/zones/Norg/npcs/Heizo.lua @@ -50,9 +50,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 127 then player:addQuest(xi.questLog.OUTLANDS, xi.quest.id.outlands.LIKE_A_SHINING_LEGGINGS) diff --git a/scripts/zones/Norg/npcs/Hunt_Registry.lua b/scripts/zones/Norg/npcs/Hunt_Registry.lua index a4c29128dab..9f09930d022 100644 --- a/scripts/zones/Norg/npcs/Hunt_Registry.lua +++ b/scripts/zones/Norg/npcs/Hunt_Registry.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.hunts.onTrigger(player, npc) end diff --git a/scripts/zones/Norg/npcs/Jirokichi.lua b/scripts/zones/Norg/npcs/Jirokichi.lua index 5ba6bc0afa2..51cae74e2e6 100644 --- a/scripts/zones/Norg/npcs/Jirokichi.lua +++ b/scripts/zones/Norg/npcs/Jirokichi.lua @@ -9,23 +9,12 @@ local ID = zones[xi.zone.NORG] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:hasKeyItem(xi.ki.TENSHODO_MEMBERS_CARD) then if player:sendGuild(60423, 9, 23, 7) then player:showText(npc, ID.text.JIROKICHI_SHOP_DIALOG) end - else - -- player:startEvent(150) 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/Norg/npcs/Keal.lua b/scripts/zones/Norg/npcs/Keal.lua index 766cfc1a28a..d772e216287 100644 --- a/scripts/zones/Norg/npcs/Keal.lua +++ b/scripts/zones/Norg/npcs/Keal.lua @@ -68,9 +68,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) local vault = player:getQuestStatus(xi.questLog.OUTLANDS, xi.quest.id.outlands.ITS_NOT_YOUR_VAULT) local mLvl = player:getMainLvl() @@ -92,9 +89,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 == 36 and option == 1 then player:addQuest(xi.questLog.OUTLANDS, xi.quest.id.outlands.ITS_NOT_YOUR_VAULT) diff --git a/scripts/zones/Norg/npcs/Koetsu.lua b/scripts/zones/Norg/npcs/Koetsu.lua deleted file mode 100644 index b93d45667a8..00000000000 --- a/scripts/zones/Norg/npcs/Koetsu.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Norg --- NPC: Koetsu ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(70) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Norg/npcs/Louartain.lua b/scripts/zones/Norg/npcs/Louartain.lua index 588aec631e5..c971dc50bb1 100644 --- a/scripts/zones/Norg/npcs/Louartain.lua +++ b/scripts/zones/Norg/npcs/Louartain.lua @@ -24,17 +24,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(84) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Norg/npcs/Ludiault.lua b/scripts/zones/Norg/npcs/Ludiault.lua deleted file mode 100644 index b52597257d1..00000000000 --- a/scripts/zones/Norg/npcs/Ludiault.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Norg --- NPC: Ludiault ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(82) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Norg/npcs/Magephaud.lua b/scripts/zones/Norg/npcs/Magephaud.lua index 8dcf91f083a..faad4d63a86 100644 --- a/scripts/zones/Norg/npcs/Magephaud.lua +++ b/scripts/zones/Norg/npcs/Magephaud.lua @@ -37,9 +37,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 116 then player:addQuest(xi.questLog.OUTLANDS, xi.quest.id.outlands.EVERYONES_GRUDGE) diff --git a/scripts/zones/Norg/npcs/Mamaulabion.lua b/scripts/zones/Norg/npcs/Mamaulabion.lua index 19bdb567083..62da9234cb9 100644 --- a/scripts/zones/Norg/npcs/Mamaulabion.lua +++ b/scripts/zones/Norg/npcs/Mamaulabion.lua @@ -101,9 +101,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 == 191 then player:addQuest(xi.questLog.OUTLANDS, xi.quest.id.outlands.MAMA_MIA) diff --git a/scripts/zones/Norg/npcs/Marilleune.lua b/scripts/zones/Norg/npcs/Marilleune.lua index a643898741c..a23ba045936 100644 --- a/scripts/zones/Norg/npcs/Marilleune.lua +++ b/scripts/zones/Norg/npcs/Marilleune.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/Norg/npcs/Muzaffar.lua b/scripts/zones/Norg/npcs/Muzaffar.lua index ad7ebea6322..7f14394e670 100644 --- a/scripts/zones/Norg/npcs/Muzaffar.lua +++ b/scripts/zones/Norg/npcs/Muzaffar.lua @@ -41,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 == 15 and option == 1 then player:addQuest(xi.questLog.OUTLANDS, xi.quest.id.outlands.BLACK_MARKET) diff --git a/scripts/zones/Norg/npcs/Nomad_Moogle.lua b/scripts/zones/Norg/npcs/Nomad_Moogle.lua index 50218b08215..9adf3cb93b3 100644 --- a/scripts/zones/Norg/npcs/Nomad_Moogle.lua +++ b/scripts/zones/Norg/npcs/Nomad_Moogle.lua @@ -7,18 +7,9 @@ local ID = zones[xi.zone.NORG] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:showText(npc, ID.text.NOMAD_MOOGLE_DIALOG) player:sendMenu(1) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Norg/npcs/Odilinia.lua b/scripts/zones/Norg/npcs/Odilinia.lua deleted file mode 100644 index b44040f5d2c..00000000000 --- a/scripts/zones/Norg/npcs/Odilinia.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Norg --- NPC: Odilinia ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(92) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Norg/npcs/Ogugu.lua b/scripts/zones/Norg/npcs/Ogugu.lua deleted file mode 100644 index 63fcc2e3a43..00000000000 --- a/scripts/zones/Norg/npcs/Ogugu.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Norg --- NPC: Ogugu ------------------------------------ ----@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/Norg/npcs/Oruga.lua b/scripts/zones/Norg/npcs/Oruga.lua index 8443530be1a..3ce31f76677 100644 --- a/scripts/zones/Norg/npcs/Oruga.lua +++ b/scripts/zones/Norg/npcs/Oruga.lua @@ -70,17 +70,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(87) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Norg/npcs/Paito-Maito.lua b/scripts/zones/Norg/npcs/Paito-Maito.lua index 480492600f4..54f181255d6 100644 --- a/scripts/zones/Norg/npcs/Paito-Maito.lua +++ b/scripts/zones/Norg/npcs/Paito-Maito.lua @@ -58,17 +58,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(90) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Norg/npcs/Paleille.lua b/scripts/zones/Norg/npcs/Paleille.lua index 6f676c5ac1c..edae7eea45a 100644 --- a/scripts/zones/Norg/npcs/Paleille.lua +++ b/scripts/zones/Norg/npcs/Paleille.lua @@ -9,18 +9,9 @@ local ID = zones[xi.zone.NORG] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:showText(npc, ID.text.PALEILLE_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/Norg/npcs/Parlemaille.lua b/scripts/zones/Norg/npcs/Parlemaille.lua index 3cc4747a36e..293d52b00fa 100644 --- a/scripts/zones/Norg/npcs/Parlemaille.lua +++ b/scripts/zones/Norg/npcs/Parlemaille.lua @@ -38,17 +38,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(88) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Norg/npcs/Quntsu-Nointsu.lua b/scripts/zones/Norg/npcs/Quntsu-Nointsu.lua index 51582a705af..3a088e463c6 100644 --- a/scripts/zones/Norg/npcs/Quntsu-Nointsu.lua +++ b/scripts/zones/Norg/npcs/Quntsu-Nointsu.lua @@ -51,16 +51,10 @@ local titleInfo = }, } -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.titleChanger.onTrigger(player, eventId, titleInfo) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.titleChanger.onEventFinish(player, csid, option, eventId, titleInfo) end diff --git a/scripts/zones/Norg/npcs/Rafid.lua b/scripts/zones/Norg/npcs/Rafid.lua deleted file mode 100644 index c1611f7f932..00000000000 --- a/scripts/zones/Norg/npcs/Rafid.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Norg --- NPC: Rafid ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(65) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Norg/npcs/Ramon.lua b/scripts/zones/Norg/npcs/Ramon.lua deleted file mode 100644 index 02150209d79..00000000000 --- a/scripts/zones/Norg/npcs/Ramon.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Norg --- NPC: Ramon ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(62) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Norg/npcs/Ryoma.lua b/scripts/zones/Norg/npcs/Ryoma.lua index ca8c1c0f0b8..5b55cc19082 100755 --- a/scripts/zones/Norg/npcs/Ryoma.lua +++ b/scripts/zones/Norg/npcs/Ryoma.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.NORG] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local twentyInPirateYears = player:getQuestStatus(xi.questLog.OUTLANDS, xi.quest.id.outlands.TWENTY_IN_PIRATE_YEARS) local illTakeTheBigBox = player:getQuestStatus(xi.questLog.OUTLANDS, xi.quest.id.outlands.I_LL_TAKE_THE_BIG_BOX) diff --git a/scripts/zones/Norg/npcs/Shidzue.lua b/scripts/zones/Norg/npcs/Shidzue.lua index ec31ed4b846..8eee759de6f 100644 --- a/scripts/zones/Norg/npcs/Shidzue.lua +++ b/scripts/zones/Norg/npcs/Shidzue.lua @@ -6,17 +6,8 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(1005, 0, 0, 0, 0, 0, 0, 0, VanadielTime()) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Norg/npcs/Shivivi.lua b/scripts/zones/Norg/npcs/Shivivi.lua index 945d28d659c..2c5f94dc2db 100644 --- a/scripts/zones/Norg/npcs/Shivivi.lua +++ b/scripts/zones/Norg/npcs/Shivivi.lua @@ -55,16 +55,4 @@ entity.onSpawn = function(npc) npc:pathThrough(pathNodes, xi.path.flag.PATROL) end -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Norg/npcs/Sohyon.lua b/scripts/zones/Norg/npcs/Sohyon.lua deleted file mode 100644 index 8946a99e650..00000000000 --- a/scripts/zones/Norg/npcs/Sohyon.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Norg --- NPC: Sohyon --- !pos 47.286 -7.282 13.873 252 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(212) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Norg/npcs/Solby-Maholby.lua b/scripts/zones/Norg/npcs/Solby-Maholby.lua index 29eda189b6f..e6ca06ec622 100644 --- a/scripts/zones/Norg/npcs/Solby-Maholby.lua +++ b/scripts/zones/Norg/npcs/Solby-Maholby.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.NORG] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -34,10 +31,4 @@ entity.onTrigger = function(player, npc) xi.shop.general(player, stock) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Norg/npcs/Spasija.lua b/scripts/zones/Norg/npcs/Spasija.lua index 51f9ccc8858..fdc7fd8c652 100644 --- a/scripts/zones/Norg/npcs/Spasija.lua +++ b/scripts/zones/Norg/npcs/Spasija.lua @@ -9,18 +9,9 @@ local ID = zones[xi.zone.NORG] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:showText(npc, ID.text.SPASIJA_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/Norg/npcs/Stray_Cloud.lua b/scripts/zones/Norg/npcs/Stray_Cloud.lua index 373e44244ea..b73ec84d141 100644 --- a/scripts/zones/Norg/npcs/Stray_Cloud.lua +++ b/scripts/zones/Norg/npcs/Stray_Cloud.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local anUndyingPledge = player:getQuestStatus(xi.questLog.OUTLANDS, xi.quest.id.outlands.AN_UNDYING_PLEDGE) @@ -40,9 +37,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 225 then player:addQuest(xi.questLog.OUTLANDS, xi.quest.id.outlands.AN_UNDYING_PLEDGE) diff --git a/scripts/zones/Norg/npcs/Vaultimand.lua b/scripts/zones/Norg/npcs/Vaultimand.lua index efc0b28635f..a1e6e6483d1 100644 --- a/scripts/zones/Norg/npcs/Vaultimand.lua +++ b/scripts/zones/Norg/npcs/Vaultimand.lua @@ -7,19 +7,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local norgFame = player:getFameLevel(xi.fameArea.NORG) player:startEvent(100 + (norgFame - 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/Norg/npcs/Verctissa.lua b/scripts/zones/Norg/npcs/Verctissa.lua index a7b68536578..2e3f9e33e4d 100644 --- a/scripts/zones/Norg/npcs/Verctissa.lua +++ b/scripts/zones/Norg/npcs/Verctissa.lua @@ -43,9 +43,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 199 and option == 1 then if player:getFreeSlotsCount() == 0 then diff --git a/scripts/zones/Norg/npcs/Vishwas.lua b/scripts/zones/Norg/npcs/Vishwas.lua deleted file mode 100644 index 566c35e674a..00000000000 --- a/scripts/zones/Norg/npcs/Vishwas.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Norg --- NPC: Vishwas --- !pos 44.028 -7.282 13.663 252 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(218) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Norg/npcs/Vuliaie.lua b/scripts/zones/Norg/npcs/Vuliaie.lua index 6e5f807ad52..985ca2baf2f 100644 --- a/scripts/zones/Norg/npcs/Vuliaie.lua +++ b/scripts/zones/Norg/npcs/Vuliaie.lua @@ -9,23 +9,12 @@ local ID = zones[xi.zone.NORG] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:hasKeyItem(xi.ki.TENSHODO_MEMBERS_CARD) then if player:sendGuild(60424, 9, 23, 7) then player:showText(npc, ID.text.VULIAIE_SHOP_DIALOG) end - else - -- player:startEvent(150) 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/Norg/npcs/Zoldba.lua b/scripts/zones/Norg/npcs/Zoldba.lua index 73800b799ad..d4edd231354 100644 --- a/scripts/zones/Norg/npcs/Zoldba.lua +++ b/scripts/zones/Norg/npcs/Zoldba.lua @@ -5,17 +5,8 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:sendMenu(3) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Phanauet_Channel/DefaultActions.lua b/scripts/zones/Phanauet_Channel/DefaultActions.lua index aed76c444ab..a4f953eb072 100644 --- a/scripts/zones/Phanauet_Channel/DefaultActions.lua +++ b/scripts/zones/Phanauet_Channel/DefaultActions.lua @@ -1,4 +1,4 @@ -local ID = zones[xi.zone.PHANAUET_CHANNEL] +-- local ID = zones[xi.zone.PHANAUET_CHANNEL] return { ['Ineuteniace'] = { event = 101 },