From 1d7aa60a5fb750a8658f5e23428ea83c274e910e Mon Sep 17 00:00:00 2001 From: claywar Date: Sat, 18 Jan 2025 09:18:02 -0500 Subject: [PATCH 1/4] Remove empty NPCs, add Default Actions - Windurst Woods --- .../zones/Windurst_Woods/DefaultActions.lua | 75 ++++++++++++++++--- .../Windurst_Woods/npcs/AMAN_Liaison.lua | 3 - .../Windurst_Woods/npcs/AMAN_Validator.lua | 3 - .../Windurst_Woods/npcs/Abby_Jalunshi.lua | 23 ------ .../zones/Windurst_Woods/npcs/Aja-Panja.lua | 22 ------ scripts/zones/Windurst_Woods/npcs/Amimi.lua | 3 - scripts/zones/Windurst_Woods/npcs/Anillah.lua | 6 -- scripts/zones/Windurst_Woods/npcs/Apururu.lua | 3 - .../Windurst_Woods/npcs/Auction_Counter.lua | 9 --- .../Windurst_Woods/npcs/Baha_Mannohl.lua | 21 ------ .../Windurst_Woods/npcs/Bin_Stejihna.lua | 9 --- .../zones/Windurst_Woods/npcs/Boizo-Naizo.lua | 9 --- .../zones/Windurst_Woods/npcs/Bopa_Greso.lua | 9 --- scripts/zones/Windurst_Woods/npcs/Bozack.lua | 23 ------ scripts/zones/Windurst_Woods/npcs/Catalia.lua | 22 ------ .../Windurst_Woods/npcs/Cayu_Pensharhumi.lua | 6 -- .../zones/Windurst_Woods/npcs/Cha_Lebagta.lua | 9 --- .../zones/Windurst_Woods/npcs/Cheh_Raihah.lua | 21 ------ .../npcs/Chihpi_Kapirapehro.lua | 21 ------ .../Windurst_Woods/npcs/Cocchi_Ryojhbon.lua | 21 ------ scripts/zones/Windurst_Woods/npcs/Dahjal.lua | 23 ------ .../zones/Windurst_Woods/npcs/Dazi_Nosuk.lua | 13 ---- scripts/zones/Windurst_Woods/npcs/Dhahah.lua | 12 --- scripts/zones/Windurst_Woods/npcs/Dhahih.lua | 12 --- scripts/zones/Windurst_Woods/npcs/Dhakih.lua | 12 --- scripts/zones/Windurst_Woods/npcs/Dhakoh.lua | 12 --- .../Windurst_Woods/npcs/Dhiz_Tomehrih.lua | 21 ------ scripts/zones/Windurst_Woods/npcs/Edmondo.lua | 21 ------ .../Windurst_Woods/npcs/Eight_of_Spades.lua | 13 ---- .../zones/Windurst_Woods/npcs/Erpolant.lua | 9 --- .../Windurst_Woods/npcs/Etsa_Rhuyuli.lua | 6 -- scripts/zones/Windurst_Woods/npcs/Etsatsa.lua | 21 ------ .../zones/Windurst_Woods/npcs/Femardaque.lua | 21 ------ scripts/zones/Windurst_Woods/npcs/Forine.lua | 9 --- .../Windurst_Woods/npcs/Four_of_Spades.lua | 21 ------ .../zones/Windurst_Woods/npcs/Gioh_Ajihri.lua | 3 - .../npcs/Gottah_Maporushanoh.lua | 9 --- .../Windurst_Woods/npcs/Hakaru-Marikaru.lua | 21 ------ .../npcs/Hayah_Dahbalesahma.lua | 22 ------ scripts/zones/Windurst_Woods/npcs/Hlif.lua | 21 ------ .../Windurst_Woods/npcs/Hohl_Nhaesin.lua | 21 ------ scripts/zones/Windurst_Woods/npcs/Ibwam.lua | 3 - .../zones/Windurst_Woods/npcs/Illu_Bohjaa.lua | 3 - scripts/zones/Windurst_Woods/npcs/Istvan.lua | 23 ------ .../zones/Windurst_Woods/npcs/Iya_Rihyo.lua | 21 ------ .../Windurst_Woods/npcs/Jack_of_Spades.lua | 3 - .../zones/Windurst_Woods/npcs/Ju_Kamja.lua | 9 --- .../Windurst_Woods/npcs/Khomi_Tibariah.lua | 21 ------ .../zones/Windurst_Woods/npcs/Ki_Volep.lua | 21 ------ .../Windurst_Woods/npcs/Kohpe_Takhabio.lua | 21 ------ .../Windurst_Woods/npcs/Kopua-Mobua_AMAN.lua | 6 -- .../Windurst_Woods/npcs/Kopuro-Popuro.lua | 3 - scripts/zones/Windurst_Woods/npcs/Kororo.lua | 6 -- .../zones/Windurst_Woods/npcs/Kuoh_Rhel.lua | 6 -- .../zones/Windurst_Woods/npcs/Kuu_Lohro.lua | 21 ------ .../Windurst_Woods/npcs/Kuzah_Hpirohpon.lua | 9 --- .../zones/Windurst_Woods/npcs/Kyaa_Taali.lua | 6 -- .../zones/Windurst_Woods/npcs/Lih_Pituu.lua | 6 -- .../Windurst_Woods/npcs/Mahoh_Mahborogho.lua | 21 ------ scripts/zones/Windurst_Woods/npcs/Manyny.lua | 9 --- scripts/zones/Windurst_Woods/npcs/Matata.lua | 6 -- .../Windurst_Woods/npcs/Meh_Kotomaihro.lua | 21 ------ scripts/zones/Windurst_Woods/npcs/Meriri.lua | 9 --- .../Windurst_Woods/npcs/Mheca_Khetashipah.lua | 9 --- .../zones/Windurst_Woods/npcs/Miiri-Wohri.lua | 22 ------ .../Windurst_Woods/npcs/Millerovieunet.lua | 6 -- .../Windurst_Woods/npcs/Mocchi_Katsartbih.lua | 22 ------ .../Windurst_Woods/npcs/Mokop-Sankop.lua | 23 ------ .../zones/Windurst_Woods/npcs/Mono_Nchaa.lua | 9 --- .../zones/Windurst_Woods/npcs/Mul_Betreh.lua | 21 ------ .../Windurst_Woods/npcs/Mushuhi-Metahi.lua | 9 --- scripts/zones/Windurst_Woods/npcs/Nalta.lua | 23 ------ .../zones/Windurst_Woods/npcs/Nanaa_Mihgo.lua | 3 - .../Windurst_Woods/npcs/Nhobi_Zalkia.lua | 6 -- scripts/zones/Windurst_Woods/npcs/Nikkoko.lua | 6 -- .../Windurst_Woods/npcs/Nine_of_Spades.lua | 21 ------ .../Windurst_Woods/npcs/Nokkhi_Jinjahl.lua | 6 -- .../Windurst_Woods/npcs/Nya_Labiccio.lua | 9 --- .../Windurst_Woods/npcs/Ominous_Cloud.lua | 6 -- .../Windurst_Woods/npcs/Orahi-Karapahi.lua | 13 ---- scripts/zones/Windurst_Woods/npcs/Orlaine.lua | 3 - .../Windurst_Woods/npcs/Otte_Burhiyu.lua | 21 ------ .../zones/Windurst_Woods/npcs/Palyalya.lua | 23 ------ .../Windurst_Woods/npcs/Patsaa_Maehoc.lua | 13 ---- .../Windurst_Woods/npcs/Pattsu-Yabittsu.lua | 6 -- .../Windurst_Woods/npcs/Pehki_Machumaht.lua | 6 -- .../Windurst_Woods/npcs/Peshi_Yohnts.lua | 3 - .../Windurst_Woods/npcs/Pew_Sahbaraef.lua | 9 --- .../Windurst_Woods/npcs/Phub_Bayzarahn.lua | 21 ------ .../Windurst_Woods/npcs/Phuz_Mannohl.lua | 21 ------ scripts/zones/Windurst_Woods/npcs/Ponono.lua | 3 - scripts/zones/Windurst_Woods/npcs/Quesse.lua | 9 --- .../zones/Windurst_Woods/npcs/Rakoh_Buuma.lua | 6 -- .../Windurst_Woods/npcs/Retto-Marutto.lua | 9 --- scripts/zones/Windurst_Woods/npcs/Ronana.lua | 6 -- scripts/zones/Windurst_Woods/npcs/Sariale.lua | 3 - scripts/zones/Windurst_Woods/npcs/Selele.lua | 6 -- .../zones/Windurst_Woods/npcs/Seno_Zarhin.lua | 13 ---- .../Windurst_Woods/npcs/Seven_of_Spades.lua | 21 ------ .../zones/Windurst_Woods/npcs/Shih_Tayuun.lua | 9 --- .../Windurst_Woods/npcs/Six_of_Spades.lua | 21 ------ .../zones/Windurst_Woods/npcs/Soni-Muni.lua | 3 - .../zones/Windurst_Woods/npcs/Sorutoto.lua | 21 ------ .../zones/Windurst_Woods/npcs/Spare_Five.lua | 6 -- .../zones/Windurst_Woods/npcs/Spare_Four.lua | 6 -- .../zones/Windurst_Woods/npcs/Spare_One.lua | 6 -- .../zones/Windurst_Woods/npcs/Spare_Three.lua | 6 -- .../zones/Windurst_Woods/npcs/Spare_Two.lua | 6 -- .../Windurst_Woods/npcs/Sunakku-Matakku.lua | 21 ------ scripts/zones/Windurst_Woods/npcs/Sunana.lua | 9 --- .../Windurst_Woods/npcs/Symphonic_Curator.lua | 3 - .../Windurst_Woods/npcs/Tapoh_Lihzeh.lua | 3 - .../Windurst_Woods/npcs/Taraihi-Perunhi.lua | 6 -- .../Windurst_Woods/npcs/Teldro-Kesdrodo.lua | 3 - .../Windurst_Woods/npcs/Ten_of_Spades.lua | 21 ------ .../Windurst_Woods/npcs/Terude-Harude.lua | 6 -- .../Windurst_Woods/npcs/Three_of_Spades.lua | 21 ------ .../Windurst_Woods/npcs/Tico_Karimakiba.lua | 21 ------ .../zones/Windurst_Woods/npcs/Tosh_Hohnay.lua | 21 ------ .../Windurst_Woods/npcs/Two_of_Spades.lua | 21 ------ scripts/zones/Windurst_Woods/npcs/Umumu.lua | 6 -- scripts/zones/Windurst_Woods/npcs/Uuroro.lua | 21 ------ .../zones/Windurst_Woods/npcs/Valeriano.lua | 9 --- scripts/zones/Windurst_Woods/npcs/Varun.lua | 3 - .../Windurst_Woods/npcs/Wani_Casdohry.lua | 9 --- scripts/zones/Windurst_Woods/npcs/Wetata.lua | 3 - .../zones/Windurst_Woods/npcs/Wije_Tiren.lua | 9 --- .../zones/Windurst_Woods/npcs/Yonolala.lua | 3 - .../Windurst_Woods/npcs/Zahsa_Syalmhaia.lua | 23 ------ 129 files changed, 63 insertions(+), 1574 deletions(-) delete mode 100644 scripts/zones/Windurst_Woods/npcs/Abby_Jalunshi.lua delete mode 100644 scripts/zones/Windurst_Woods/npcs/Aja-Panja.lua delete mode 100644 scripts/zones/Windurst_Woods/npcs/Baha_Mannohl.lua delete mode 100644 scripts/zones/Windurst_Woods/npcs/Bozack.lua delete mode 100644 scripts/zones/Windurst_Woods/npcs/Catalia.lua delete mode 100644 scripts/zones/Windurst_Woods/npcs/Cheh_Raihah.lua delete mode 100644 scripts/zones/Windurst_Woods/npcs/Chihpi_Kapirapehro.lua delete mode 100644 scripts/zones/Windurst_Woods/npcs/Cocchi_Ryojhbon.lua delete mode 100644 scripts/zones/Windurst_Woods/npcs/Dahjal.lua delete mode 100644 scripts/zones/Windurst_Woods/npcs/Dhiz_Tomehrih.lua delete mode 100644 scripts/zones/Windurst_Woods/npcs/Edmondo.lua delete mode 100644 scripts/zones/Windurst_Woods/npcs/Etsatsa.lua delete mode 100644 scripts/zones/Windurst_Woods/npcs/Femardaque.lua delete mode 100644 scripts/zones/Windurst_Woods/npcs/Four_of_Spades.lua delete mode 100644 scripts/zones/Windurst_Woods/npcs/Hakaru-Marikaru.lua delete mode 100644 scripts/zones/Windurst_Woods/npcs/Hayah_Dahbalesahma.lua delete mode 100644 scripts/zones/Windurst_Woods/npcs/Hlif.lua delete mode 100644 scripts/zones/Windurst_Woods/npcs/Hohl_Nhaesin.lua delete mode 100644 scripts/zones/Windurst_Woods/npcs/Istvan.lua delete mode 100644 scripts/zones/Windurst_Woods/npcs/Iya_Rihyo.lua delete mode 100644 scripts/zones/Windurst_Woods/npcs/Khomi_Tibariah.lua delete mode 100644 scripts/zones/Windurst_Woods/npcs/Ki_Volep.lua delete mode 100644 scripts/zones/Windurst_Woods/npcs/Kohpe_Takhabio.lua delete mode 100644 scripts/zones/Windurst_Woods/npcs/Kuu_Lohro.lua delete mode 100644 scripts/zones/Windurst_Woods/npcs/Mahoh_Mahborogho.lua delete mode 100644 scripts/zones/Windurst_Woods/npcs/Meh_Kotomaihro.lua delete mode 100644 scripts/zones/Windurst_Woods/npcs/Miiri-Wohri.lua delete mode 100644 scripts/zones/Windurst_Woods/npcs/Mocchi_Katsartbih.lua delete mode 100644 scripts/zones/Windurst_Woods/npcs/Mokop-Sankop.lua delete mode 100644 scripts/zones/Windurst_Woods/npcs/Mul_Betreh.lua delete mode 100644 scripts/zones/Windurst_Woods/npcs/Nalta.lua delete mode 100644 scripts/zones/Windurst_Woods/npcs/Nine_of_Spades.lua delete mode 100644 scripts/zones/Windurst_Woods/npcs/Otte_Burhiyu.lua delete mode 100644 scripts/zones/Windurst_Woods/npcs/Palyalya.lua delete mode 100644 scripts/zones/Windurst_Woods/npcs/Phub_Bayzarahn.lua delete mode 100644 scripts/zones/Windurst_Woods/npcs/Phuz_Mannohl.lua delete mode 100644 scripts/zones/Windurst_Woods/npcs/Seven_of_Spades.lua delete mode 100644 scripts/zones/Windurst_Woods/npcs/Six_of_Spades.lua delete mode 100644 scripts/zones/Windurst_Woods/npcs/Sorutoto.lua delete mode 100644 scripts/zones/Windurst_Woods/npcs/Sunakku-Matakku.lua delete mode 100644 scripts/zones/Windurst_Woods/npcs/Ten_of_Spades.lua delete mode 100644 scripts/zones/Windurst_Woods/npcs/Three_of_Spades.lua delete mode 100644 scripts/zones/Windurst_Woods/npcs/Tico_Karimakiba.lua delete mode 100644 scripts/zones/Windurst_Woods/npcs/Tosh_Hohnay.lua delete mode 100644 scripts/zones/Windurst_Woods/npcs/Two_of_Spades.lua delete mode 100644 scripts/zones/Windurst_Woods/npcs/Uuroro.lua delete mode 100644 scripts/zones/Windurst_Woods/npcs/Zahsa_Syalmhaia.lua diff --git a/scripts/zones/Windurst_Woods/DefaultActions.lua b/scripts/zones/Windurst_Woods/DefaultActions.lua index c548c277911..c6ebdaa8966 100644 --- a/scripts/zones/Windurst_Woods/DefaultActions.lua +++ b/scripts/zones/Windurst_Woods/DefaultActions.lua @@ -1,16 +1,67 @@ -- local ID = zones[xi.zone.WINDURST_WOODS] return { - ['An_Polaali'] = { event = 44 }, - ['An_Shanaa'] = { event = 45 }, - ['Apururu'] = { event = 274 }, - ['Bopa_Greso'] = { event = 77 }, - ['Cha_Lebagta'] = { event = 78 }, - ['Hae_Jakkya'] = { event = 41 }, - ['Kapeh_Myohrye'] = { event = 340 },-- There is at current an unknown mission/quest/status that alters their dialog. Windurst citizens get something different than other nations. - ['Kototo'] = { event = 410 }, - ['Mourices'] = { event = 441 }, - ['Muhk_Johldy'] = { event = 339 },-- There is at current an unknown mission/quest/status that alters their dialog. Windurst citizens get something different than other nations. - ['Perih_Vashai'] = { event = 338 }, - ['Roberta'] = { event = 436 }, + ['Abby_Jalunshi'] = { event = 798 }, + ['Aja-Panja'] = { event = 247 }, + ['An_Polaali'] = { event = 44 }, + ['An_Shanaa'] = { event = 45 }, + ['Apururu'] = { event = 274 }, + ['Baha_Mannohl'] = { event = 343 }, + ['Bopa_Greso'] = { event = 77 }, + ['Bozack'] = { event = 612 }, + ['Catalia'] = { event = 442 }, + ['Cha_Lebagta'] = { event = 78 }, + ['Chihpi_Kapirapehro'] = { event = 429 }, + ['Cocchi_Ryojhbon'] = { event = 418 }, + ['Dahjal'] = { event = 48 }, + ['Dazi_Nosuk'] = { event = 428 }, + ['Dhiz_Tomehrih'] = { event = 261 }, + ['Edmondo'] = { event = 435 }, + ['Eight_of_Spades'] = { event = 268 }, + ['Etsatsa'] = { event = 252 }, + ['Femardaque'] = { event = 433 }, + ['Four_of_Spades'] = { event = 269 }, + ['Hae_Jakkya'] = { event = 41 }, + ['Hakaru-Marikaru'] = { event = 412 }, + ['Hayah_Dahbalesahma'] = { event = 263 }, + ['Hlif'] = { event = 434 }, + ['Hohl_Nhaesin'] = { event = 342 }, + ['Istvan'] = { event = 692 }, + ['Iya_Rihyo'] = { event = 419 }, + ['Kapeh_Myohrye'] = { event = 340 }, -- There is at current an unknown mission/quest/status that alters their dialog. Windurst citizens get something different than other nations. + ['Khomi_Tibariah'] = { event = 262 }, + ['Ki_Volep'] = { event = 260 }, + ['Kohpe_Takhabio'] = { event = 423 }, + ['Kototo'] = { event = 410 }, + ['Kuu_Lohro'] = { event = 430 }, + ['Mahoh_Mahborogho'] = { event = 257 }, + ['Meh_Kotomaihro'] = { event = 258 }, + ['Miiri-Wohri'] = { event = 111 }, + ['Mocchi_Katsartbih'] = { event = 264 }, + ['Mokop-Sankop'] = { event = 50 }, + ['Mourices'] = { event = 441 }, + ['Muhk_Johldy'] = { event = 339 }, -- There is at current an unknown mission/quest/status that alters their dialog. Windurst citizens get something different than other nations. + ['Mul_Betreh'] = { event = 431 }, + ['Nalta'] = { event = 54 }, + ['Nine_of_Spades'] = { event = 266 }, + ['Orahi-Karapahi'] = { event = 413 }, + ['Otte_Burhiyu'] = { event = 341 }, + ['Palyalya'] = { event = 10021 }, + ['Patsaa_Maehoc'] = { event = 427 }, + ['Perih_Vashai'] = { event = 338 }, + ['Phub_Bayzarahn'] = { event = 416 }, + ['Phuz_Mannohl'] = { event = 344 }, + ['Roberta'] = { event = 436 }, + ['Seno_Zarhin'] = { event = 417 }, + ['Seven_of_Spades'] = { event = 267 }, + ['Six_of_Spades'] = { event = 273 }, + ['Sorutoto'] = { event = 256 }, + ['Sunakku-Matakku'] = { event = 248 }, + ['Tico_Karimakiba'] = { event = 361 }, + ['Tosh_Hohnay'] = { event = 415 }, + ['Ten_of_Spades'] = { event = 265 }, + ['Three_of_Spades'] = { event = 270 }, + ['Two_of_Spades'] = { event = 271 }, + ['Uuroro'] = { event = 272 }, + ['Zahsa_Syalmhaia'] = { event = 797 }, } diff --git a/scripts/zones/Windurst_Woods/npcs/AMAN_Liaison.lua b/scripts/zones/Windurst_Woods/npcs/AMAN_Liaison.lua index c90accc3f39..5203d79c199 100644 --- a/scripts/zones/Windurst_Woods/npcs/AMAN_Liaison.lua +++ b/scripts/zones/Windurst_Woods/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/Windurst_Woods/npcs/AMAN_Validator.lua b/scripts/zones/Windurst_Woods/npcs/AMAN_Validator.lua index 513ae5bf84b..c8eb8d96a8d 100644 --- a/scripts/zones/Windurst_Woods/npcs/AMAN_Validator.lua +++ b/scripts/zones/Windurst_Woods/npcs/AMAN_Validator.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.deeds.validatorOnTrigger(player, npc) end diff --git a/scripts/zones/Windurst_Woods/npcs/Abby_Jalunshi.lua b/scripts/zones/Windurst_Woods/npcs/Abby_Jalunshi.lua deleted file mode 100644 index e4fbfab10c6..00000000000 --- a/scripts/zones/Windurst_Woods/npcs/Abby_Jalunshi.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Windurst Woods --- NPC: Abby Jalunshi --- Type: Moghouse Renter --- !pos -101.895 -5 36.172 241 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(798) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Woods/npcs/Aja-Panja.lua b/scripts/zones/Windurst_Woods/npcs/Aja-Panja.lua deleted file mode 100644 index b3249a59587..00000000000 --- a/scripts/zones/Windurst_Woods/npcs/Aja-Panja.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Windurst Woods --- NPC: Aja-Panja --- !pos -7.251 -6.55 -134.127 241 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(247) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Woods/npcs/Amimi.lua b/scripts/zones/Windurst_Woods/npcs/Amimi.lua index bc30e6771a2..79f630f42dc 100644 --- a/scripts/zones/Windurst_Woods/npcs/Amimi.lua +++ b/scripts/zones/Windurst_Woods/npcs/Amimi.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/Windurst_Woods/npcs/Anillah.lua b/scripts/zones/Windurst_Woods/npcs/Anillah.lua index 7393031bf4a..059c1338169 100644 --- a/scripts/zones/Windurst_Woods/npcs/Anillah.lua +++ b/scripts/zones/Windurst_Woods/npcs/Anillah.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/Windurst_Woods/npcs/Apururu.lua b/scripts/zones/Windurst_Woods/npcs/Apururu.lua index b9081bc7784..f1d5b4feced 100644 --- a/scripts/zones/Windurst_Woods/npcs/Apururu.lua +++ b/scripts/zones/Windurst_Woods/npcs/Apururu.lua @@ -99,9 +99,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) -- THE KIND CARDIAN if csid == 392 and option == 1 then diff --git a/scripts/zones/Windurst_Woods/npcs/Auction_Counter.lua b/scripts/zones/Windurst_Woods/npcs/Auction_Counter.lua index c3b9c744127..1b564ff97f7 100644 --- a/scripts/zones/Windurst_Woods/npcs/Auction_Counter.lua +++ b/scripts/zones/Windurst_Woods/npcs/Auction_Counter.lua @@ -7,18 +7,9 @@ require('scripts/quests/tutorial') ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.tutorial.onAuctionTrigger(player) 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/Windurst_Woods/npcs/Baha_Mannohl.lua b/scripts/zones/Windurst_Woods/npcs/Baha_Mannohl.lua deleted file mode 100644 index bdaf9b411f8..00000000000 --- a/scripts/zones/Windurst_Woods/npcs/Baha_Mannohl.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Woods --- NPC: Baha Mannohl ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(343) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Woods/npcs/Bin_Stejihna.lua b/scripts/zones/Windurst_Woods/npcs/Bin_Stejihna.lua index c6bf7ed989c..4bd82b95afd 100644 --- a/scripts/zones/Windurst_Woods/npcs/Bin_Stejihna.lua +++ b/scripts/zones/Windurst_Woods/npcs/Bin_Stejihna.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.WINDURST_WOODS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local regionOwner = GetRegionOwner(xi.region.ZULKHEIM) @@ -41,10 +38,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/Windurst_Woods/npcs/Boizo-Naizo.lua b/scripts/zones/Windurst_Woods/npcs/Boizo-Naizo.lua index af86cc1f706..b67fd62f295 100644 --- a/scripts/zones/Windurst_Woods/npcs/Boizo-Naizo.lua +++ b/scripts/zones/Windurst_Woods/npcs/Boizo-Naizo.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local allNewC2000 = player:getQuestStatus(xi.questLog.WINDURST, xi.quest.id.windurst.THE_ALL_NEW_C_2000) local greetingCardian = player:getQuestStatus(xi.questLog.WINDURST, xi.quest.id.windurst.A_GREETING_CARDIAN) @@ -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/Windurst_Woods/npcs/Bopa_Greso.lua b/scripts/zones/Windurst_Woods/npcs/Bopa_Greso.lua index afc7be51684..7dad6c30192 100644 --- a/scripts/zones/Windurst_Woods/npcs/Bopa_Greso.lua +++ b/scripts/zones/Windurst_Woods/npcs/Bopa_Greso.lua @@ -6,19 +6,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getQuestStatus(xi.questLog.WINDURST, xi.quest.id.windurst.MIHGO_S_AMIGO) == xi.questStatus.QUEST_ACCEPTED then player:startEvent(84) 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/Windurst_Woods/npcs/Bozack.lua b/scripts/zones/Windurst_Woods/npcs/Bozack.lua deleted file mode 100644 index de6d63cefd8..00000000000 --- a/scripts/zones/Windurst_Woods/npcs/Bozack.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Windurst Woods --- NPC: Bozack --- Type: Event Replayer --- !pos 92.591 -5.58 -31.529 241 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(612) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Woods/npcs/Catalia.lua b/scripts/zones/Windurst_Woods/npcs/Catalia.lua deleted file mode 100644 index 057a72dcc80..00000000000 --- a/scripts/zones/Windurst_Woods/npcs/Catalia.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Windurst Woods --- NPC: Catalia --- !pos -46.160 -0.501 -32.698 241 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(442) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Woods/npcs/Cayu_Pensharhumi.lua b/scripts/zones/Windurst_Woods/npcs/Cayu_Pensharhumi.lua index 3888ff3ba16..b763f0a68b5 100644 --- a/scripts/zones/Windurst_Woods/npcs/Cayu_Pensharhumi.lua +++ b/scripts/zones/Windurst_Woods/npcs/Cayu_Pensharhumi.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local wildcatWindurst = player:getCharVar('WildcatWindurst') @@ -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 == 733 then player:setCharVar('WildcatWindurst', utils.mask.setBit(player:getCharVar('WildcatWindurst'), 2, true)) diff --git a/scripts/zones/Windurst_Woods/npcs/Cha_Lebagta.lua b/scripts/zones/Windurst_Woods/npcs/Cha_Lebagta.lua index 804ff465d10..27a05cb8c2c 100644 --- a/scripts/zones/Windurst_Woods/npcs/Cha_Lebagta.lua +++ b/scripts/zones/Windurst_Woods/npcs/Cha_Lebagta.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local mihgosAmigo = player:getQuestStatus(xi.questLog.WINDURST, xi.quest.id.windurst.MIHGO_S_AMIGO) @@ -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/Windurst_Woods/npcs/Cheh_Raihah.lua b/scripts/zones/Windurst_Woods/npcs/Cheh_Raihah.lua deleted file mode 100644 index d23435f6147..00000000000 --- a/scripts/zones/Windurst_Woods/npcs/Cheh_Raihah.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Woods --- NPC: Cheh Raihah ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - -- player:startEvent(247) or player:showText(npc, 801) ??? -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Woods/npcs/Chihpi_Kapirapehro.lua b/scripts/zones/Windurst_Woods/npcs/Chihpi_Kapirapehro.lua deleted file mode 100644 index b96768f025e..00000000000 --- a/scripts/zones/Windurst_Woods/npcs/Chihpi_Kapirapehro.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Woods --- NPC: Chihpi Kapirapehro ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(429) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Woods/npcs/Cocchi_Ryojhbon.lua b/scripts/zones/Windurst_Woods/npcs/Cocchi_Ryojhbon.lua deleted file mode 100644 index 730abb71bfe..00000000000 --- a/scripts/zones/Windurst_Woods/npcs/Cocchi_Ryojhbon.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Woods --- NPC: Cocchi Ryojhbon ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(418) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Woods/npcs/Dahjal.lua b/scripts/zones/Windurst_Woods/npcs/Dahjal.lua deleted file mode 100644 index 061a8761e8f..00000000000 --- a/scripts/zones/Windurst_Woods/npcs/Dahjal.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Windurst Woods --- NPC: Dahjal --- Type: Conquest Troupe --- !pos 11.639 1.267 -57.706 241 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(48) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Woods/npcs/Dazi_Nosuk.lua b/scripts/zones/Windurst_Woods/npcs/Dazi_Nosuk.lua index 3ab32e538a6..875aeb283d3 100644 --- a/scripts/zones/Windurst_Woods/npcs/Dazi_Nosuk.lua +++ b/scripts/zones/Windurst_Woods/npcs/Dazi_Nosuk.lua @@ -21,17 +21,4 @@ entity.onSpawn = function(npc) npc:pathThrough(pathNodes, xi.path.flag.PATROL) end -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(428) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Windurst_Woods/npcs/Dhahah.lua b/scripts/zones/Windurst_Woods/npcs/Dhahah.lua index d4a450c9ef6..cf2ff71bb65 100644 --- a/scripts/zones/Windurst_Woods/npcs/Dhahah.lua +++ b/scripts/zones/Windurst_Woods/npcs/Dhahah.lua @@ -19,16 +19,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/Windurst_Woods/npcs/Dhahih.lua b/scripts/zones/Windurst_Woods/npcs/Dhahih.lua index a1cdba86dc5..72966980e40 100644 --- a/scripts/zones/Windurst_Woods/npcs/Dhahih.lua +++ b/scripts/zones/Windurst_Woods/npcs/Dhahih.lua @@ -19,16 +19,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/Windurst_Woods/npcs/Dhakih.lua b/scripts/zones/Windurst_Woods/npcs/Dhakih.lua index 3c164e14cb3..8ad6dcd6226 100644 --- a/scripts/zones/Windurst_Woods/npcs/Dhakih.lua +++ b/scripts/zones/Windurst_Woods/npcs/Dhakih.lua @@ -17,16 +17,4 @@ entity.onSpawn = function(npc) npc:pathThrough(pathNodes, bit.bor(xi.path.flag.PATROL, xi.path.flag.RUN)) 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/Windurst_Woods/npcs/Dhakoh.lua b/scripts/zones/Windurst_Woods/npcs/Dhakoh.lua index 440e8e0af72..477e267f094 100644 --- a/scripts/zones/Windurst_Woods/npcs/Dhakoh.lua +++ b/scripts/zones/Windurst_Woods/npcs/Dhakoh.lua @@ -17,16 +17,4 @@ entity.onSpawn = function(npc) npc:pathThrough(pathNodes, xi.path.flag.PATROL) end -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Windurst_Woods/npcs/Dhiz_Tomehrih.lua b/scripts/zones/Windurst_Woods/npcs/Dhiz_Tomehrih.lua deleted file mode 100644 index b00acaddc5b..00000000000 --- a/scripts/zones/Windurst_Woods/npcs/Dhiz_Tomehrih.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Woods --- NPC: Dhiz Tomehrih ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(261) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Woods/npcs/Edmondo.lua b/scripts/zones/Windurst_Woods/npcs/Edmondo.lua deleted file mode 100644 index 7f58f797928..00000000000 --- a/scripts/zones/Windurst_Woods/npcs/Edmondo.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Woods --- NPC: Edmondo ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(435) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Woods/npcs/Eight_of_Spades.lua b/scripts/zones/Windurst_Woods/npcs/Eight_of_Spades.lua index 34264301647..17b809a8c66 100644 --- a/scripts/zones/Windurst_Woods/npcs/Eight_of_Spades.lua +++ b/scripts/zones/Windurst_Woods/npcs/Eight_of_Spades.lua @@ -26,17 +26,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(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/Windurst_Woods/npcs/Erpolant.lua b/scripts/zones/Windurst_Woods/npcs/Erpolant.lua index 7d148b2e1e9..19b20d71ba9 100644 --- a/scripts/zones/Windurst_Woods/npcs/Erpolant.lua +++ b/scripts/zones/Windurst_Woods/npcs/Erpolant.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getNation() == xi.nation.SANDORIA then player:startEvent(447) @@ -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/Windurst_Woods/npcs/Etsa_Rhuyuli.lua b/scripts/zones/Windurst_Woods/npcs/Etsa_Rhuyuli.lua index 3fb21fc46b7..e118fd7abdf 100644 --- a/scripts/zones/Windurst_Woods/npcs/Etsa_Rhuyuli.lua +++ b/scripts/zones/Windurst_Woods/npcs/Etsa_Rhuyuli.lua @@ -20,9 +20,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 wildcatWindurst = player:getCharVar('WildcatWindurst') @@ -36,9 +33,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 == 734 then player:setCharVar('WildcatWindurst', utils.mask.setBit(player:getCharVar('WildcatWindurst'), 1, true)) diff --git a/scripts/zones/Windurst_Woods/npcs/Etsatsa.lua b/scripts/zones/Windurst_Woods/npcs/Etsatsa.lua deleted file mode 100644 index 6875a804271..00000000000 --- a/scripts/zones/Windurst_Woods/npcs/Etsatsa.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Woods --- NPC: Etsatsa ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(252) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Woods/npcs/Femardaque.lua b/scripts/zones/Windurst_Woods/npcs/Femardaque.lua deleted file mode 100644 index a2cefb960ab..00000000000 --- a/scripts/zones/Windurst_Woods/npcs/Femardaque.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Woods --- NPC: Femardaque ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(433) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Woods/npcs/Forine.lua b/scripts/zones/Windurst_Woods/npcs/Forine.lua index cea16b0e480..d5a008da615 100644 --- a/scripts/zones/Windurst_Woods/npcs/Forine.lua +++ b/scripts/zones/Windurst_Woods/npcs/Forine.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getNation() == xi.nation.SANDORIA then player:startEvent(446) @@ -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/Windurst_Woods/npcs/Four_of_Spades.lua b/scripts/zones/Windurst_Woods/npcs/Four_of_Spades.lua deleted file mode 100644 index 0fc30763ea5..00000000000 --- a/scripts/zones/Windurst_Woods/npcs/Four_of_Spades.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Woods --- NPC: Four of Spades ------------------------------------ ----@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/Windurst_Woods/npcs/Gioh_Ajihri.lua b/scripts/zones/Windurst_Woods/npcs/Gioh_Ajihri.lua index bf82827a7ae..096fb003d96 100644 --- a/scripts/zones/Windurst_Woods/npcs/Gioh_Ajihri.lua +++ b/scripts/zones/Windurst_Woods/npcs/Gioh_Ajihri.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 == 487 then player:addQuest(xi.questLog.WINDURST, xi.quest.id.windurst.TWINSTONE_BONDING) diff --git a/scripts/zones/Windurst_Woods/npcs/Gottah_Maporushanoh.lua b/scripts/zones/Windurst_Woods/npcs/Gottah_Maporushanoh.lua index e5090fbb25b..0b5a2f0f0c3 100644 --- a/scripts/zones/Windurst_Woods/npcs/Gottah_Maporushanoh.lua +++ b/scripts/zones/Windurst_Woods/npcs/Gottah_Maporushanoh.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local amazinScorpio = player:getQuestStatus(xi.questLog.WINDURST, xi.quest.id.windurst.THE_AMAZIN_SCORPIO) @@ -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/Windurst_Woods/npcs/Hakaru-Marikaru.lua b/scripts/zones/Windurst_Woods/npcs/Hakaru-Marikaru.lua deleted file mode 100644 index 466d4d9952d..00000000000 --- a/scripts/zones/Windurst_Woods/npcs/Hakaru-Marikaru.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Woods --- NPC: Hakaru-Marikaru ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(412) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Woods/npcs/Hayah_Dahbalesahma.lua b/scripts/zones/Windurst_Woods/npcs/Hayah_Dahbalesahma.lua deleted file mode 100644 index b15dcc60577..00000000000 --- a/scripts/zones/Windurst_Woods/npcs/Hayah_Dahbalesahma.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Windurst Woods --- NPC: Hayah Dahbalesahma --- !pos -50.363 -1.292 -147.883 241 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(263) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Woods/npcs/Hlif.lua b/scripts/zones/Windurst_Woods/npcs/Hlif.lua deleted file mode 100644 index a92a931abfe..00000000000 --- a/scripts/zones/Windurst_Woods/npcs/Hlif.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Woods --- NPC: Hlif ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(434) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Woods/npcs/Hohl_Nhaesin.lua b/scripts/zones/Windurst_Woods/npcs/Hohl_Nhaesin.lua deleted file mode 100644 index 40c5104c5e2..00000000000 --- a/scripts/zones/Windurst_Woods/npcs/Hohl_Nhaesin.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Woods --- NPC: Hohl Nhaesin ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(342) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Woods/npcs/Ibwam.lua b/scripts/zones/Windurst_Woods/npcs/Ibwam.lua index 5818ff15f66..cfeb1a3df98 100644 --- a/scripts/zones/Windurst_Woods/npcs/Ibwam.lua +++ b/scripts/zones/Windurst_Woods/npcs/Ibwam.lua @@ -77,9 +77,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 == 736 then player:addQuest(xi.questLog.WINDURST, xi.quest.id.windurst.LURE_OF_THE_WILDCAT) diff --git a/scripts/zones/Windurst_Woods/npcs/Illu_Bohjaa.lua b/scripts/zones/Windurst_Woods/npcs/Illu_Bohjaa.lua index 9818d173125..a041ed5744d 100644 --- a/scripts/zones/Windurst_Woods/npcs/Illu_Bohjaa.lua +++ b/scripts/zones/Windurst_Woods/npcs/Illu_Bohjaa.lua @@ -26,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 == 333 and option == 1 then player:addQuest(xi.questLog.WINDURST, xi.quest.id.windurst.CREEPY_CRAWLIES) diff --git a/scripts/zones/Windurst_Woods/npcs/Istvan.lua b/scripts/zones/Windurst_Woods/npcs/Istvan.lua deleted file mode 100644 index 1f6fd3240d2..00000000000 --- a/scripts/zones/Windurst_Woods/npcs/Istvan.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Windurst Woods --- NPC: Istvan --- Type: ENM Quest Timer --- !pos 116.294 -6 -98.164 241 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(692) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Woods/npcs/Iya_Rihyo.lua b/scripts/zones/Windurst_Woods/npcs/Iya_Rihyo.lua deleted file mode 100644 index e394033c322..00000000000 --- a/scripts/zones/Windurst_Woods/npcs/Iya_Rihyo.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Woods --- NPC: Iya Rihyo ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(419) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Woods/npcs/Jack_of_Spades.lua b/scripts/zones/Windurst_Woods/npcs/Jack_of_Spades.lua index 128a108fcf8..4b03f24bbc1 100644 --- a/scripts/zones/Windurst_Woods/npcs/Jack_of_Spades.lua +++ b/scripts/zones/Windurst_Woods/npcs/Jack_of_Spades.lua @@ -16,9 +16,6 @@ entity.onTrigger = function(player, npc) player:startEvent(10009, 0, 4) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 10010 then player:confirmTrade() diff --git a/scripts/zones/Windurst_Woods/npcs/Ju_Kamja.lua b/scripts/zones/Windurst_Woods/npcs/Ju_Kamja.lua index cf5ea205da3..84b400a3aea 100644 --- a/scripts/zones/Windurst_Woods/npcs/Ju_Kamja.lua +++ b/scripts/zones/Windurst_Woods/npcs/Ju_Kamja.lua @@ -9,18 +9,9 @@ local ID = zones[xi.zone.WINDURST_WOODS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:showText(npc, ID.text.ITEM_DELIVERY_DIALOG) player:openSendBox() end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Windurst_Woods/npcs/Khomi_Tibariah.lua b/scripts/zones/Windurst_Woods/npcs/Khomi_Tibariah.lua deleted file mode 100644 index fcb3cc37823..00000000000 --- a/scripts/zones/Windurst_Woods/npcs/Khomi_Tibariah.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Woods --- NPC: Khomi Tibariah ------------------------------------ ----@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/Windurst_Woods/npcs/Ki_Volep.lua b/scripts/zones/Windurst_Woods/npcs/Ki_Volep.lua deleted file mode 100644 index f32dfb12e5f..00000000000 --- a/scripts/zones/Windurst_Woods/npcs/Ki_Volep.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Woods --- NPC: Ki Volep ------------------------------------ ----@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/Windurst_Woods/npcs/Kohpe_Takhabio.lua b/scripts/zones/Windurst_Woods/npcs/Kohpe_Takhabio.lua deleted file mode 100644 index 1e2d8069166..00000000000 --- a/scripts/zones/Windurst_Woods/npcs/Kohpe_Takhabio.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Woods --- NPC: Kohpe Takhabio ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(423) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Woods/npcs/Kopua-Mobua_AMAN.lua b/scripts/zones/Windurst_Woods/npcs/Kopua-Mobua_AMAN.lua index c7aff2dbd0e..e8699245918 100644 --- a/scripts/zones/Windurst_Woods/npcs/Kopua-Mobua_AMAN.lua +++ b/scripts/zones/Windurst_Woods/npcs/Kopua-Mobua_AMAN.lua @@ -7,9 +7,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 @@ -23,9 +20,6 @@ entity.onTrigger = function(player, npc) player:startEvent(10026, var) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 10026 and option == 0 then player:setMentor(true) diff --git a/scripts/zones/Windurst_Woods/npcs/Kopuro-Popuro.lua b/scripts/zones/Windurst_Woods/npcs/Kopuro-Popuro.lua index 7606f0a17e2..d5297af286b 100644 --- a/scripts/zones/Windurst_Woods/npcs/Kopuro-Popuro.lua +++ b/scripts/zones/Windurst_Woods/npcs/Kopuro-Popuro.lua @@ -100,9 +100,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) -- THE ALL NEW C-2000 if csid == 285 and option ~= 2 then -- option 2 is declining the quest for the second question diff --git a/scripts/zones/Windurst_Woods/npcs/Kororo.lua b/scripts/zones/Windurst_Woods/npcs/Kororo.lua index a2f6a4cfac1..85ec9385a04 100644 --- a/scripts/zones/Windurst_Woods/npcs/Kororo.lua +++ b/scripts/zones/Windurst_Woods/npcs/Kororo.lua @@ -10,9 +10,6 @@ local ID = zones[xi.zone.WINDURST_WOODS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local c2000 = player:getQuestStatus(xi.questLog.WINDURST, xi.quest.id.windurst.THE_ALL_NEW_C_2000) -- previous quest in line local aGreetingCardian = player:getQuestStatus(xi.questLog.WINDURST, xi.quest.id.windurst.A_GREETING_CARDIAN) @@ -49,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) -- A Greeting Cardian if csid == 296 then diff --git a/scripts/zones/Windurst_Woods/npcs/Kuoh_Rhel.lua b/scripts/zones/Windurst_Woods/npcs/Kuoh_Rhel.lua index 4852a81a34e..e0810bb06a4 100644 --- a/scripts/zones/Windurst_Woods/npcs/Kuoh_Rhel.lua +++ b/scripts/zones/Windurst_Woods/npcs/Kuoh_Rhel.lua @@ -9,9 +9,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local inAStew = player:getQuestStatus(xi.questLog.WINDURST, xi.quest.id.windurst.IN_A_STEW) local inAStewCS = player:getCharVar('IASvar') @@ -60,9 +57,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) -- CHOCOBILIOUS if csid == 224 and option == 1 then diff --git a/scripts/zones/Windurst_Woods/npcs/Kuu_Lohro.lua b/scripts/zones/Windurst_Woods/npcs/Kuu_Lohro.lua deleted file mode 100644 index d2276c7226e..00000000000 --- a/scripts/zones/Windurst_Woods/npcs/Kuu_Lohro.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Woods --- NPC: Kuu Lohro ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(430) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Woods/npcs/Kuzah_Hpirohpon.lua b/scripts/zones/Windurst_Woods/npcs/Kuzah_Hpirohpon.lua index e35c5754e84..1ce657b13e1 100644 --- a/scripts/zones/Windurst_Woods/npcs/Kuzah_Hpirohpon.lua +++ b/scripts/zones/Windurst_Woods/npcs/Kuzah_Hpirohpon.lua @@ -9,19 +9,10 @@ local ID = zones[xi.zone.WINDURST_WOODS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:sendGuild(5152, 6, 21, 0) then player:showText(npc, ID.text.KUZAH_HPIROHPON_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/Windurst_Woods/npcs/Kyaa_Taali.lua b/scripts/zones/Windurst_Woods/npcs/Kyaa_Taali.lua index 10ddd9662a1..ecf21f47382 100644 --- a/scripts/zones/Windurst_Woods/npcs/Kyaa_Taali.lua +++ b/scripts/zones/Windurst_Woods/npcs/Kyaa_Taali.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/Windurst_Woods/npcs/Lih_Pituu.lua b/scripts/zones/Windurst_Woods/npcs/Lih_Pituu.lua index 81cc01f1406..922afe7272c 100644 --- a/scripts/zones/Windurst_Woods/npcs/Lih_Pituu.lua +++ b/scripts/zones/Windurst_Woods/npcs/Lih_Pituu.lua @@ -20,16 +20,10 @@ entity.onSpawn = function(npc) npc:pathThrough(pathNodes, xi.path.flag.PATROL) end -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/Windurst_Woods/npcs/Mahoh_Mahborogho.lua b/scripts/zones/Windurst_Woods/npcs/Mahoh_Mahborogho.lua deleted file mode 100644 index d50609029cf..00000000000 --- a/scripts/zones/Windurst_Woods/npcs/Mahoh_Mahborogho.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Woods --- NPC: Mahoh Mahborogho ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(257) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Woods/npcs/Manyny.lua b/scripts/zones/Windurst_Woods/npcs/Manyny.lua index 0587400421a..76f59552c38 100644 --- a/scripts/zones/Windurst_Woods/npcs/Manyny.lua +++ b/scripts/zones/Windurst_Woods/npcs/Manyny.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.WINDURST_WOODS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -25,10 +22,4 @@ entity.onTrigger = function(player, npc) xi.shop.general(player, stock) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Windurst_Woods/npcs/Matata.lua b/scripts/zones/Windurst_Woods/npcs/Matata.lua index 01a2cf4f6bd..37b9f830a11 100644 --- a/scripts/zones/Windurst_Woods/npcs/Matata.lua +++ b/scripts/zones/Windurst_Woods/npcs/Matata.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local inAStew = player:getQuestStatus(xi.questLog.WINDURST, xi.quest.id.windurst.IN_A_STEW) local iasVar = player:getCharVar('IASvar') @@ -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) -- IN A STEW if csid == 233 then diff --git a/scripts/zones/Windurst_Woods/npcs/Meh_Kotomaihro.lua b/scripts/zones/Windurst_Woods/npcs/Meh_Kotomaihro.lua deleted file mode 100644 index dab306eb491..00000000000 --- a/scripts/zones/Windurst_Woods/npcs/Meh_Kotomaihro.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Woods --- NPC: Meh Kotomaihro ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(258) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Woods/npcs/Meriri.lua b/scripts/zones/Windurst_Woods/npcs/Meriri.lua index 63ac156a312..938fb9b0e2a 100644 --- a/scripts/zones/Windurst_Woods/npcs/Meriri.lua +++ b/scripts/zones/Windurst_Woods/npcs/Meriri.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.WINDURST_WOODS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local guildSkillId = xi.skill.CLOTHCRAFT local stock = xi.shop.generalGuildStock[guildSkillId] @@ -19,10 +16,4 @@ entity.onTrigger = function(player, npc) player:showText(npc, ID.text.MERIRI_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/Windurst_Woods/npcs/Mheca_Khetashipah.lua b/scripts/zones/Windurst_Woods/npcs/Mheca_Khetashipah.lua index 96afa217cc5..fcf7b67c53b 100644 --- a/scripts/zones/Windurst_Woods/npcs/Mheca_Khetashipah.lua +++ b/scripts/zones/Windurst_Woods/npcs/Mheca_Khetashipah.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local starStatus = player:getQuestStatus(xi.questLog.WINDURST, xi.quest.id.windurst.MIHGO_S_AMIGO) @@ -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/Windurst_Woods/npcs/Miiri-Wohri.lua b/scripts/zones/Windurst_Woods/npcs/Miiri-Wohri.lua deleted file mode 100644 index 19d6f023a50..00000000000 --- a/scripts/zones/Windurst_Woods/npcs/Miiri-Wohri.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Windurst Woods --- NPC: Miiri-Wohri --- !pos 106.766 -6 -30.492 241 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(111) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Woods/npcs/Millerovieunet.lua b/scripts/zones/Windurst_Woods/npcs/Millerovieunet.lua index dc90b7faad9..d618b2f71ee 100644 --- a/scripts/zones/Windurst_Woods/npcs/Millerovieunet.lua +++ b/scripts/zones/Windurst_Woods/npcs/Millerovieunet.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/Windurst_Woods/npcs/Mocchi_Katsartbih.lua b/scripts/zones/Windurst_Woods/npcs/Mocchi_Katsartbih.lua deleted file mode 100644 index c2eeb11c083..00000000000 --- a/scripts/zones/Windurst_Woods/npcs/Mocchi_Katsartbih.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Windurst Woods --- NPC: Mocchi Katsartbih --- !pos -13.225 -4.888 -164.108 241 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(264) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Woods/npcs/Mokop-Sankop.lua b/scripts/zones/Windurst_Woods/npcs/Mokop-Sankop.lua deleted file mode 100644 index f0bc0e1cfda..00000000000 --- a/scripts/zones/Windurst_Woods/npcs/Mokop-Sankop.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Windurst Woods --- NPC: Mokop-Sankop --- Type: Conquest Troupe --- !pos 11.542 1.05 -53.217 241 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(50) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Woods/npcs/Mono_Nchaa.lua b/scripts/zones/Windurst_Woods/npcs/Mono_Nchaa.lua index 1f3d766ade2..84bcb7ad4b4 100644 --- a/scripts/zones/Windurst_Woods/npcs/Mono_Nchaa.lua +++ b/scripts/zones/Windurst_Woods/npcs/Mono_Nchaa.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.WINDURST_WOODS] ---@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.nation(player, stock, xi.nation.WINDURST) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Windurst_Woods/npcs/Mul_Betreh.lua b/scripts/zones/Windurst_Woods/npcs/Mul_Betreh.lua deleted file mode 100644 index ded808ab42c..00000000000 --- a/scripts/zones/Windurst_Woods/npcs/Mul_Betreh.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Woods --- NPC: Mul Betreh ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(431) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Woods/npcs/Mushuhi-Metahi.lua b/scripts/zones/Windurst_Woods/npcs/Mushuhi-Metahi.lua index 2fd29131588..f5d38e1b83a 100644 --- a/scripts/zones/Windurst_Woods/npcs/Mushuhi-Metahi.lua +++ b/scripts/zones/Windurst_Woods/npcs/Mushuhi-Metahi.lua @@ -6,17 +6,8 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(10008, 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/Windurst_Woods/npcs/Nalta.lua b/scripts/zones/Windurst_Woods/npcs/Nalta.lua deleted file mode 100644 index 37b4e541eb0..00000000000 --- a/scripts/zones/Windurst_Woods/npcs/Nalta.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Windurst Woods --- NPC: Nalta --- Type: Conquest Troupe --- !pos 19.140 1 -51.297 241 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(54) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Woods/npcs/Nanaa_Mihgo.lua b/scripts/zones/Windurst_Woods/npcs/Nanaa_Mihgo.lua index de3b42627a4..48deb325fd8 100644 --- a/scripts/zones/Windurst_Woods/npcs/Nanaa_Mihgo.lua +++ b/scripts/zones/Windurst_Woods/npcs/Nanaa_Mihgo.lua @@ -122,9 +122,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) -- LURE OF THE WILDCAT (WINDURST) if csid == 732 then diff --git a/scripts/zones/Windurst_Woods/npcs/Nhobi_Zalkia.lua b/scripts/zones/Windurst_Woods/npcs/Nhobi_Zalkia.lua index 8bb78fbf231..3ad953ecfa2 100644 --- a/scripts/zones/Windurst_Woods/npcs/Nhobi_Zalkia.lua +++ b/scripts/zones/Windurst_Woods/npcs/Nhobi_Zalkia.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/Windurst_Woods/npcs/Nikkoko.lua b/scripts/zones/Windurst_Woods/npcs/Nikkoko.lua index d5ae4d1a1b5..8d39a8d5097 100644 --- a/scripts/zones/Windurst_Woods/npcs/Nikkoko.lua +++ b/scripts/zones/Windurst_Woods/npcs/Nikkoko.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/Windurst_Woods/npcs/Nine_of_Spades.lua b/scripts/zones/Windurst_Woods/npcs/Nine_of_Spades.lua deleted file mode 100644 index 3d7b5758bb2..00000000000 --- a/scripts/zones/Windurst_Woods/npcs/Nine_of_Spades.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Woods --- NPC: Nine of Spades ------------------------------------ ----@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/Windurst_Woods/npcs/Nokkhi_Jinjahl.lua b/scripts/zones/Windurst_Woods/npcs/Nokkhi_Jinjahl.lua index d797c06d9ce..77ce75171f5 100644 --- a/scripts/zones/Windurst_Woods/npcs/Nokkhi_Jinjahl.lua +++ b/scripts/zones/Windurst_Woods/npcs/Nokkhi_Jinjahl.lua @@ -149,10 +149,4 @@ entity.onTrigger = function(player, npc) player:startEvent(667, npc:getID()) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Windurst_Woods/npcs/Nya_Labiccio.lua b/scripts/zones/Windurst_Woods/npcs/Nya_Labiccio.lua index a4140ae8bac..4cf6cc845d5 100644 --- a/scripts/zones/Windurst_Woods/npcs/Nya_Labiccio.lua +++ b/scripts/zones/Windurst_Woods/npcs/Nya_Labiccio.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.WINDURST_WOODS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local regionOwner = GetRegionOwner(xi.region.GUSTABERG) @@ -31,10 +28,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Windurst_Woods/npcs/Ominous_Cloud.lua b/scripts/zones/Windurst_Woods/npcs/Ominous_Cloud.lua index 73b4c5525ff..99f7f78fae2 100644 --- a/scripts/zones/Windurst_Woods/npcs/Ominous_Cloud.lua +++ b/scripts/zones/Windurst_Woods/npcs/Ominous_Cloud.lua @@ -107,10 +107,4 @@ entity.onTrigger = function(player, npc) player:startEvent(698, npc:getID()) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Windurst_Woods/npcs/Orahi-Karapahi.lua b/scripts/zones/Windurst_Woods/npcs/Orahi-Karapahi.lua index cb104cce7bc..33b3a20927a 100644 --- a/scripts/zones/Windurst_Woods/npcs/Orahi-Karapahi.lua +++ b/scripts/zones/Windurst_Woods/npcs/Orahi-Karapahi.lua @@ -19,17 +19,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(413) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Windurst_Woods/npcs/Orlaine.lua b/scripts/zones/Windurst_Woods/npcs/Orlaine.lua index 7b7ea3bef91..e85d561cee3 100644 --- a/scripts/zones/Windurst_Woods/npcs/Orlaine.lua +++ b/scripts/zones/Windurst_Woods/npcs/Orlaine.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/Windurst_Woods/npcs/Otte_Burhiyu.lua b/scripts/zones/Windurst_Woods/npcs/Otte_Burhiyu.lua deleted file mode 100644 index c3bcb8d6b2e..00000000000 --- a/scripts/zones/Windurst_Woods/npcs/Otte_Burhiyu.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Woods --- NPC: Otte Burhiyu ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(341) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Woods/npcs/Palyalya.lua b/scripts/zones/Windurst_Woods/npcs/Palyalya.lua deleted file mode 100644 index 84a9767e368..00000000000 --- a/scripts/zones/Windurst_Woods/npcs/Palyalya.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Windurst Woods --- NPC: Palyalya --- Type: Adv. Assistant --- !pos 62.298 -3.499 -128.093 241 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(10021) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Woods/npcs/Patsaa_Maehoc.lua b/scripts/zones/Windurst_Woods/npcs/Patsaa_Maehoc.lua index 3dc0512b48f..2b6abfb0226 100644 --- a/scripts/zones/Windurst_Woods/npcs/Patsaa_Maehoc.lua +++ b/scripts/zones/Windurst_Woods/npcs/Patsaa_Maehoc.lua @@ -21,17 +21,4 @@ entity.onSpawn = function(npc) npc:pathThrough(pathNodes, xi.path.flag.PATROL) end -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(427) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Windurst_Woods/npcs/Pattsu-Yabittsu.lua b/scripts/zones/Windurst_Woods/npcs/Pattsu-Yabittsu.lua index 484c762e4c4..9bcdeda4386 100644 --- a/scripts/zones/Windurst_Woods/npcs/Pattsu-Yabittsu.lua +++ b/scripts/zones/Windurst_Woods/npcs/Pattsu-Yabittsu.lua @@ -6,16 +6,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(411) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if option == 1 then player:setPos(-2.203, -1.5, 103.226, 196, 238) -- Retail packet capped diff --git a/scripts/zones/Windurst_Woods/npcs/Pehki_Machumaht.lua b/scripts/zones/Windurst_Woods/npcs/Pehki_Machumaht.lua index c80320660df..94318c093f3 100644 --- a/scripts/zones/Windurst_Woods/npcs/Pehki_Machumaht.lua +++ b/scripts/zones/Windurst_Woods/npcs/Pehki_Machumaht.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/Windurst_Woods/npcs/Peshi_Yohnts.lua b/scripts/zones/Windurst_Woods/npcs/Peshi_Yohnts.lua index c5fb16dce5a..c084bee1917 100644 --- a/scripts/zones/Windurst_Woods/npcs/Peshi_Yohnts.lua +++ b/scripts/zones/Windurst_Woods/npcs/Peshi_Yohnts.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/Windurst_Woods/npcs/Pew_Sahbaraef.lua b/scripts/zones/Windurst_Woods/npcs/Pew_Sahbaraef.lua index 522f507b4fa..78cd311c354 100644 --- a/scripts/zones/Windurst_Woods/npcs/Pew_Sahbaraef.lua +++ b/scripts/zones/Windurst_Woods/npcs/Pew_Sahbaraef.lua @@ -9,18 +9,9 @@ local ID = zones[xi.zone.WINDURST_WOODS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:showText(npc, ID.text.ITEM_DELIVERY_DIALOG) player:openSendBox() end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Windurst_Woods/npcs/Phub_Bayzarahn.lua b/scripts/zones/Windurst_Woods/npcs/Phub_Bayzarahn.lua deleted file mode 100644 index 818e09a6453..00000000000 --- a/scripts/zones/Windurst_Woods/npcs/Phub_Bayzarahn.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Woods --- NPC: Phub Bayzarahn ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(416) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Woods/npcs/Phuz_Mannohl.lua b/scripts/zones/Windurst_Woods/npcs/Phuz_Mannohl.lua deleted file mode 100644 index 74c983c66ed..00000000000 --- a/scripts/zones/Windurst_Woods/npcs/Phuz_Mannohl.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Woods --- NPC: Phuz Mannohl ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(344) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Woods/npcs/Ponono.lua b/scripts/zones/Windurst_Woods/npcs/Ponono.lua index 4258954f47f..f879bc86d47 100644 --- a/scripts/zones/Windurst_Woods/npcs/Ponono.lua +++ b/scripts/zones/Windurst_Woods/npcs/Ponono.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 == 700 then player:setCharVar('moral', 2) diff --git a/scripts/zones/Windurst_Woods/npcs/Quesse.lua b/scripts/zones/Windurst_Woods/npcs/Quesse.lua index 031ce9c0993..eb22f7674e5 100644 --- a/scripts/zones/Windurst_Woods/npcs/Quesse.lua +++ b/scripts/zones/Windurst_Woods/npcs/Quesse.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.WINDURST_WOODS] ---@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.nation(player, stock, xi.nation.WINDURST) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Windurst_Woods/npcs/Rakoh_Buuma.lua b/scripts/zones/Windurst_Woods/npcs/Rakoh_Buuma.lua index d38af707c24..8ec67de7166 100644 --- a/scripts/zones/Windurst_Woods/npcs/Rakoh_Buuma.lua +++ b/scripts/zones/Windurst_Woods/npcs/Rakoh_Buuma.lua @@ -25,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/Windurst_Woods/npcs/Retto-Marutto.lua b/scripts/zones/Windurst_Woods/npcs/Retto-Marutto.lua index 677877efa8f..b48a1fe3187 100644 --- a/scripts/zones/Windurst_Woods/npcs/Retto-Marutto.lua +++ b/scripts/zones/Windurst_Woods/npcs/Retto-Marutto.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.WINDURST_WOODS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local guildSkillId = xi.skill.BONECRAFT local stock = xi.shop.generalGuildStock[guildSkillId] @@ -19,10 +16,4 @@ entity.onTrigger = function(player, npc) player:showText(npc, ID.text.RETTO_MARUTTO_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/Windurst_Woods/npcs/Ronana.lua b/scripts/zones/Windurst_Woods/npcs/Ronana.lua index b5ebca3f294..9f9285c6504 100644 --- a/scripts/zones/Windurst_Woods/npcs/Ronana.lua +++ b/scripts/zones/Windurst_Woods/npcs/Ronana.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/Windurst_Woods/npcs/Sariale.lua b/scripts/zones/Windurst_Woods/npcs/Sariale.lua index d3201ba3615..f3a2783f9c0 100644 --- a/scripts/zones/Windurst_Woods/npcs/Sariale.lua +++ b/scripts/zones/Windurst_Woods/npcs/Sariale.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/Windurst_Woods/npcs/Selele.lua b/scripts/zones/Windurst_Woods/npcs/Selele.lua index 465d2a9a224..893501c95c5 100644 --- a/scripts/zones/Windurst_Woods/npcs/Selele.lua +++ b/scripts/zones/Windurst_Woods/npcs/Selele.lua @@ -9,16 +9,10 @@ require('scripts/quests/tutorial') ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.tutorial.onTrigger(player, npc, 813, 2) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.tutorial.onEventFinish(player, csid, option, 813, 2) end diff --git a/scripts/zones/Windurst_Woods/npcs/Seno_Zarhin.lua b/scripts/zones/Windurst_Woods/npcs/Seno_Zarhin.lua index f3d2e25e9eb..236b2471766 100644 --- a/scripts/zones/Windurst_Woods/npcs/Seno_Zarhin.lua +++ b/scripts/zones/Windurst_Woods/npcs/Seno_Zarhin.lua @@ -23,17 +23,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(417) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Windurst_Woods/npcs/Seven_of_Spades.lua b/scripts/zones/Windurst_Woods/npcs/Seven_of_Spades.lua deleted file mode 100644 index 753d2d41ab1..00000000000 --- a/scripts/zones/Windurst_Woods/npcs/Seven_of_Spades.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Woods --- NPC: Seven of Spades ------------------------------------ ----@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/Windurst_Woods/npcs/Shih_Tayuun.lua b/scripts/zones/Windurst_Woods/npcs/Shih_Tayuun.lua index 1abd38ab383..da6a6f27c3a 100644 --- a/scripts/zones/Windurst_Woods/npcs/Shih_Tayuun.lua +++ b/scripts/zones/Windurst_Woods/npcs/Shih_Tayuun.lua @@ -9,19 +9,10 @@ local ID = zones[xi.zone.WINDURST_WOODS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:sendGuild(514, 8, 23, 3) then player:showText(npc, ID.text.SHIH_TAYUUN_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/Windurst_Woods/npcs/Six_of_Spades.lua b/scripts/zones/Windurst_Woods/npcs/Six_of_Spades.lua deleted file mode 100644 index dc82a0d065a..00000000000 --- a/scripts/zones/Windurst_Woods/npcs/Six_of_Spades.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Woods --- NPC: Six of Spades ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(273) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Woods/npcs/Soni-Muni.lua b/scripts/zones/Windurst_Woods/npcs/Soni-Muni.lua index a101fbb0b31..256f7a2ce47 100644 --- a/scripts/zones/Windurst_Woods/npcs/Soni-Muni.lua +++ b/scripts/zones/Windurst_Woods/npcs/Soni-Muni.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 == 481 then player:addQuest(xi.questLog.WINDURST, xi.quest.id.windurst.THE_AMAZIN_SCORPIO) diff --git a/scripts/zones/Windurst_Woods/npcs/Sorutoto.lua b/scripts/zones/Windurst_Woods/npcs/Sorutoto.lua deleted file mode 100644 index 6a5a6a6a73f..00000000000 --- a/scripts/zones/Windurst_Woods/npcs/Sorutoto.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Woods --- NPC: Sorutoto ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(256) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Woods/npcs/Spare_Five.lua b/scripts/zones/Windurst_Woods/npcs/Spare_Five.lua index 07821641c02..6a7842ea6e3 100644 --- a/scripts/zones/Windurst_Woods/npcs/Spare_Five.lua +++ b/scripts/zones/Windurst_Woods/npcs/Spare_Five.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local aGreetingCardian = player:getQuestStatus(xi.questLog.WINDURST, xi.quest.id.windurst.A_GREETING_CARDIAN) local agcCs = player:getCharVar('AGreetingCardian_Event') @@ -20,9 +17,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 295 then player:setCharVar('AGreetingCardian_Event', 3) diff --git a/scripts/zones/Windurst_Woods/npcs/Spare_Four.lua b/scripts/zones/Windurst_Woods/npcs/Spare_Four.lua index 6934d74f508..70594058533 100644 --- a/scripts/zones/Windurst_Woods/npcs/Spare_Four.lua +++ b/scripts/zones/Windurst_Woods/npcs/Spare_Four.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local aGreetingCardian = player:getQuestStatus(xi.questLog.WINDURST, xi.quest.id.windurst.A_GREETING_CARDIAN) local agcCs = player:getCharVar('AGreetingCardian_Event') @@ -20,9 +17,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 295 then player:setCharVar('AGreetingCardian_Event', 3) diff --git a/scripts/zones/Windurst_Woods/npcs/Spare_One.lua b/scripts/zones/Windurst_Woods/npcs/Spare_One.lua index dc9b9da42cd..b939d29d8c0 100644 --- a/scripts/zones/Windurst_Woods/npcs/Spare_One.lua +++ b/scripts/zones/Windurst_Woods/npcs/Spare_One.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local aGreetingCardian = player:getQuestStatus(xi.questLog.WINDURST, xi.quest.id.windurst.A_GREETING_CARDIAN) local agcCs = player:getCharVar('AGreetingCardian_Event') @@ -20,9 +17,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 295 then player:setCharVar('AGreetingCardian_Event', 3) diff --git a/scripts/zones/Windurst_Woods/npcs/Spare_Three.lua b/scripts/zones/Windurst_Woods/npcs/Spare_Three.lua index 7343d683684..406c6b27a16 100644 --- a/scripts/zones/Windurst_Woods/npcs/Spare_Three.lua +++ b/scripts/zones/Windurst_Woods/npcs/Spare_Three.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local aGreetingCardian = player:getQuestStatus(xi.questLog.WINDURST, xi.quest.id.windurst.A_GREETING_CARDIAN) local agcCs = player:getCharVar('AGreetingCardian_Event') @@ -20,9 +17,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 295 then player:setCharVar('AGreetingCardian_Event', 3) diff --git a/scripts/zones/Windurst_Woods/npcs/Spare_Two.lua b/scripts/zones/Windurst_Woods/npcs/Spare_Two.lua index 52e32e55c67..e73b513d62a 100644 --- a/scripts/zones/Windurst_Woods/npcs/Spare_Two.lua +++ b/scripts/zones/Windurst_Woods/npcs/Spare_Two.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local aGreetingCardian = player:getQuestStatus(xi.questLog.WINDURST, xi.quest.id.windurst.A_GREETING_CARDIAN) local agcCs = player:getCharVar('AGreetingCardian_Event') @@ -20,9 +17,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 295 then player:setCharVar('AGreetingCardian_Event', 3) diff --git a/scripts/zones/Windurst_Woods/npcs/Sunakku-Matakku.lua b/scripts/zones/Windurst_Woods/npcs/Sunakku-Matakku.lua deleted file mode 100644 index 1b2c5701e05..00000000000 --- a/scripts/zones/Windurst_Woods/npcs/Sunakku-Matakku.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Woods --- NPC: Sunakku-Matakku ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(248) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Woods/npcs/Sunana.lua b/scripts/zones/Windurst_Woods/npcs/Sunana.lua index 5685af78983..528019943fd 100644 --- a/scripts/zones/Windurst_Woods/npcs/Sunana.lua +++ b/scripts/zones/Windurst_Woods/npcs/Sunana.lua @@ -5,17 +5,8 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(409, 0, 17088) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Windurst_Woods/npcs/Symphonic_Curator.lua b/scripts/zones/Windurst_Woods/npcs/Symphonic_Curator.lua index 1f207df2bd3..78532bbf338 100644 --- a/scripts/zones/Windurst_Woods/npcs/Symphonic_Curator.lua +++ b/scripts/zones/Windurst_Woods/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/Windurst_Woods/npcs/Tapoh_Lihzeh.lua b/scripts/zones/Windurst_Woods/npcs/Tapoh_Lihzeh.lua index eb0800fe1be..211771bbf08 100644 --- a/scripts/zones/Windurst_Woods/npcs/Tapoh_Lihzeh.lua +++ b/scripts/zones/Windurst_Woods/npcs/Tapoh_Lihzeh.lua @@ -51,9 +51,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) -- CHOCOBILIOUS if csid == 227 then diff --git a/scripts/zones/Windurst_Woods/npcs/Taraihi-Perunhi.lua b/scripts/zones/Windurst_Woods/npcs/Taraihi-Perunhi.lua index d17af7e7a1e..22c3d31c196 100644 --- a/scripts/zones/Windurst_Woods/npcs/Taraihi-Perunhi.lua +++ b/scripts/zones/Windurst_Woods/npcs/Taraihi-Perunhi.lua @@ -34,10 +34,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Windurst_Woods/npcs/Teldro-Kesdrodo.lua b/scripts/zones/Windurst_Woods/npcs/Teldro-Kesdrodo.lua index c1b092dbd98..a54522fe47a 100644 --- a/scripts/zones/Windurst_Woods/npcs/Teldro-Kesdrodo.lua +++ b/scripts/zones/Windurst_Woods/npcs/Teldro-Kesdrodo.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.unity.onTrigger(player, npc) end diff --git a/scripts/zones/Windurst_Woods/npcs/Ten_of_Spades.lua b/scripts/zones/Windurst_Woods/npcs/Ten_of_Spades.lua deleted file mode 100644 index e40bba274ae..00000000000 --- a/scripts/zones/Windurst_Woods/npcs/Ten_of_Spades.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Woods --- NPC: Ten of Spades ------------------------------------ ----@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/Windurst_Woods/npcs/Terude-Harude.lua b/scripts/zones/Windurst_Woods/npcs/Terude-Harude.lua index 5b1c9fb9e7f..749ea209d30 100644 --- a/scripts/zones/Windurst_Woods/npcs/Terude-Harude.lua +++ b/scripts/zones/Windurst_Woods/npcs/Terude-Harude.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/Windurst_Woods/npcs/Three_of_Spades.lua b/scripts/zones/Windurst_Woods/npcs/Three_of_Spades.lua deleted file mode 100644 index 99f6c7d28db..00000000000 --- a/scripts/zones/Windurst_Woods/npcs/Three_of_Spades.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Woods --- NPC: Three of Spades ------------------------------------ ----@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/Windurst_Woods/npcs/Tico_Karimakiba.lua b/scripts/zones/Windurst_Woods/npcs/Tico_Karimakiba.lua deleted file mode 100644 index 44441f83539..00000000000 --- a/scripts/zones/Windurst_Woods/npcs/Tico_Karimakiba.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Woods --- NPC: Tico Karimakiba ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(361) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Woods/npcs/Tosh_Hohnay.lua b/scripts/zones/Windurst_Woods/npcs/Tosh_Hohnay.lua deleted file mode 100644 index 21351bdc8ea..00000000000 --- a/scripts/zones/Windurst_Woods/npcs/Tosh_Hohnay.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Woods --- NPC: Tosh Hohnay ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(415) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Woods/npcs/Two_of_Spades.lua b/scripts/zones/Windurst_Woods/npcs/Two_of_Spades.lua deleted file mode 100644 index e21e73f81a0..00000000000 --- a/scripts/zones/Windurst_Woods/npcs/Two_of_Spades.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Woods --- NPC: Two of Spades ------------------------------------ ----@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/Windurst_Woods/npcs/Umumu.lua b/scripts/zones/Windurst_Woods/npcs/Umumu.lua index 94127a26319..c518ed0edcc 100644 --- a/scripts/zones/Windurst_Woods/npcs/Umumu.lua +++ b/scripts/zones/Windurst_Woods/npcs/Umumu.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local makingHeadlines = player:getQuestStatus(xi.questLog.WINDURST, xi.quest.id.windurst.MAKING_HEADLINES) local lureOfTheWildcat = player:getQuestStatus(xi.questLog.WINDURST, xi.quest.id.windurst.LURE_OF_THE_WILDCAT) @@ -46,9 +43,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 381 then npcUtil.giveKeyItem(player, xi.ki.WINDURST_WOODS_SCOOP) diff --git a/scripts/zones/Windurst_Woods/npcs/Uuroro.lua b/scripts/zones/Windurst_Woods/npcs/Uuroro.lua deleted file mode 100644 index 3c0b93dfa93..00000000000 --- a/scripts/zones/Windurst_Woods/npcs/Uuroro.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Woods --- NPC: Uuroro ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(272) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Woods/npcs/Valeriano.lua b/scripts/zones/Windurst_Woods/npcs/Valeriano.lua index 35c784f8fc3..4ab205adb46 100644 --- a/scripts/zones/Windurst_Woods/npcs/Valeriano.lua +++ b/scripts/zones/Windurst_Woods/npcs/Valeriano.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.WINDURST_WOODS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:showText(npc, ID.text.VALERIANO_SHOP_DIALOG) @@ -33,10 +30,4 @@ entity.onTrigger = function(player, npc) xi.shop.general(player, stock, xi.fameArea.WINDURST) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Windurst_Woods/npcs/Varun.lua b/scripts/zones/Windurst_Woods/npcs/Varun.lua index c0682ee3fb8..1c0bf1dd688 100644 --- a/scripts/zones/Windurst_Woods/npcs/Varun.lua +++ b/scripts/zones/Windurst_Woods/npcs/Varun.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 == 100 then player:setCharVar('rockracketeer_sold', 4) diff --git a/scripts/zones/Windurst_Woods/npcs/Wani_Casdohry.lua b/scripts/zones/Windurst_Woods/npcs/Wani_Casdohry.lua index 8437136f717..5ffd4c7989a 100644 --- a/scripts/zones/Windurst_Woods/npcs/Wani_Casdohry.lua +++ b/scripts/zones/Windurst_Woods/npcs/Wani_Casdohry.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local twinstoneBonding = player:getQuestStatus(xi.questLog.WINDURST, xi.quest.id.windurst.TWINSTONE_BONDING) local mihgosAmigo = player:getQuestStatus(xi.questLog.WINDURST, xi.quest.id.windurst.MIHGO_S_AMIGO) @@ -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/Windurst_Woods/npcs/Wetata.lua b/scripts/zones/Windurst_Woods/npcs/Wetata.lua index 72967699166..1787d75fdc0 100644 --- a/scripts/zones/Windurst_Woods/npcs/Wetata.lua +++ b/scripts/zones/Windurst_Woods/npcs/Wetata.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 == 863 or csid == 867) and option == 2 then player:addQuest(xi.questLog.WINDURST, xi.quest.id.windurst.TRUST_WINDURST) diff --git a/scripts/zones/Windurst_Woods/npcs/Wije_Tiren.lua b/scripts/zones/Windurst_Woods/npcs/Wije_Tiren.lua index 93489d7885f..856622d0c66 100644 --- a/scripts/zones/Windurst_Woods/npcs/Wije_Tiren.lua +++ b/scripts/zones/Windurst_Woods/npcs/Wije_Tiren.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.WINDURST_WOODS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:showText(npc, ID.text.WIJETIREN_SHOP_DIALOG) @@ -27,10 +24,4 @@ entity.onTrigger = function(player, npc) xi.shop.general(player, stock, xi.fameArea.WINDURST) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Windurst_Woods/npcs/Yonolala.lua b/scripts/zones/Windurst_Woods/npcs/Yonolala.lua index fdb06e8c6bf..5bedcbcce8d 100644 --- a/scripts/zones/Windurst_Woods/npcs/Yonolala.lua +++ b/scripts/zones/Windurst_Woods/npcs/Yonolala.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.unity.onTrigger(player, npc) end diff --git a/scripts/zones/Windurst_Woods/npcs/Zahsa_Syalmhaia.lua b/scripts/zones/Windurst_Woods/npcs/Zahsa_Syalmhaia.lua deleted file mode 100644 index 12b34ea85ab..00000000000 --- a/scripts/zones/Windurst_Woods/npcs/Zahsa_Syalmhaia.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Windurst Woods --- NPC: Zahsa Syalmhaia --- Type: Great War Veteran NPC --- !pos 13.710 1.422 -83.198 241 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(797) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity From 4088d006e56f4c18e286e4822e24db1fdbf9b536 Mon Sep 17 00:00:00 2001 From: claywar Date: Sat, 18 Jan 2025 10:04:41 -0500 Subject: [PATCH 2/4] Remove empty NPCs, add Default Actions - Windurst Waters [S] --- .../Windurst_Waters_[S]/DefaultActions.lua | 59 +++++++++++++++++++ .../Windurst_Waters_[S]/npcs/Adjutant.lua | 22 ------- .../npcs/Aihn_Sowlmirih.lua | 22 ------- .../Windurst_Waters_[S]/npcs/Ajen-Myoojen.lua | 6 -- .../zones/Windurst_Waters_[S]/npcs/Amfafa.lua | 22 ------- .../npcs/Ampiro-Mapiro.lua | 22 ------- .../Windurst_Waters_[S]/npcs/Aystise.lua | 22 ------- .../npcs/Cattah_Pamjah.lua | 23 -------- .../Windurst_Waters_[S]/npcs/Chays-Ratays.lua | 22 ------- .../Windurst_Waters_[S]/npcs/Churacoco.lua | 22 ------- .../Windurst_Waters_[S]/npcs/Corbrere.lua | 22 ------- .../npcs/Dallus-Mallus.lua | 23 -------- .../npcs/Dhea_Prandoleh.lua | 6 -- .../npcs/Door_Acolyte_Hostel_down.lua | 6 -- .../npcs/Door_Acolyte_Hostel_up.lua | 6 -- .../Windurst_Waters_[S]/npcs/Eih_Lhogotan.lua | 22 ------- .../Windurst_Waters_[S]/npcs/Ekki-Mokki.lua | 22 ------- .../npcs/Emhi_Tchaoryo.lua | 23 -------- .../npcs/Ezura-Romazura.lua | 9 --- .../zones/Windurst_Waters_[S]/npcs/Gevarg.lua | 23 -------- .../Windurst_Waters_[S]/npcs/Hampu-Kampu.lua | 6 -- .../npcs/Hunt_Registry.lua | 3 - .../Windurst_Waters_[S]/npcs/Khea_Mhyyih.lua | 22 ------- .../npcs/Kleh_Engyumoh.lua | 22 ------- .../Windurst_Waters_[S]/npcs/Kocco_Ehllek.lua | 6 -- .../Windurst_Waters_[S]/npcs/Kolin-Olin.lua | 22 ------- .../Windurst_Waters_[S]/npcs/Kopol-Rapol.lua | 22 ------- .../Windurst_Waters_[S]/npcs/Koton-Llaton.lua | 22 ------- .../Windurst_Waters_[S]/npcs/Kristen.lua | 22 ------- .../npcs/Kuron-Makaron.lua | 23 -------- .../Windurst_Waters_[S]/npcs/Llewellyn.lua | 23 -------- .../zones/Windurst_Waters_[S]/npcs/Lutete.lua | 24 -------- .../Windurst_Waters_[S]/npcs/Mearuru.lua | 22 ------- .../npcs/Mhoti_Pyiahrs.lua | 23 -------- .../Windurst_Waters_[S]/npcs/Miah_Riyuh.lua | 6 -- .../npcs/Mikhe_Aryohcha.lua | 24 -------- .../npcs/Mindala-Andola_CC.lua | 5 +- .../npcs/Narito-Pettito.lua | 22 ------- .../Windurst_Waters_[S]/npcs/Nhel_Urhahn.lua | 22 ------- .../Windurst_Waters_[S]/npcs/Ozzmo-Mazmo.lua | 22 ------- .../npcs/Pahpe_Rauulih.lua | 22 ------- .../Windurst_Waters_[S]/npcs/Parukoko.lua | 22 ------- .../Windurst_Waters_[S]/npcs/Pebul-Tabul.lua | 22 ------- .../Windurst_Waters_[S]/npcs/Pelftrix.lua | 9 --- .../npcs/Pelsey-Holsey.lua | 22 ------- .../Windurst_Waters_[S]/npcs/Pettette.lua | 22 ------- .../zones/Windurst_Waters_[S]/npcs/Pogigi.lua | 10 ---- .../zones/Windurst_Waters_[S]/npcs/Ponono.lua | 22 ------- .../npcs/Prucco-Lurucco.lua | 22 ------- .../npcs/Quartermaster.lua | 22 ------- .../Windurst_Waters_[S]/npcs/Ragyaya.lua | 22 ------- .../npcs/Rakh_Mhappyoh.lua | 22 ------- .../Windurst_Waters_[S]/npcs/Rakih_Lyhall.lua | 22 ------- .../Windurst_Waters_[S]/npcs/Ranna-Brunna.lua | 22 ------- .../Windurst_Waters_[S]/npcs/Ransnana.lua | 22 ------- .../npcs/Renten-Tonten.lua | 22 ------- .../npcs/Rohn_Ehlbalna.lua | 6 -- .../Windurst_Waters_[S]/npcs/Romaa_Mihgo.lua | 22 ------- .../Windurst_Waters_[S]/npcs/Ruirara.lua | 22 ------- .../npcs/Sahnn_Dhansett.lua | 22 ------- .../Windurst_Waters_[S]/npcs/Scotwick.lua | 23 -------- .../npcs/Soimin-Oimin_CC.lua | 23 -------- .../npcs/Symphonic_Curator.lua | 3 - .../npcs/Tahl_Mhioguch.lua | 22 ------- .../Windurst_Waters_[S]/npcs/Tohs_Jhannih.lua | 22 ------- .../npcs/Upital-Lupital.lua | 22 ------- .../npcs/Uricca-Koricca.lua | 22 ------- .../Windurst_Waters_[S]/npcs/Velda-Galda.lua | 23 -------- .../Windurst_Waters_[S]/npcs/Wenonah_CA.lua | 23 -------- .../Windurst_Waters_[S]/npcs/Yasmina.lua | 6 -- .../Windurst_Waters_[S]/npcs/Yassi-Possi.lua | 9 --- 71 files changed, 60 insertions(+), 1304 deletions(-) create mode 100644 scripts/zones/Windurst_Waters_[S]/DefaultActions.lua delete mode 100644 scripts/zones/Windurst_Waters_[S]/npcs/Adjutant.lua delete mode 100644 scripts/zones/Windurst_Waters_[S]/npcs/Aihn_Sowlmirih.lua delete mode 100644 scripts/zones/Windurst_Waters_[S]/npcs/Amfafa.lua delete mode 100644 scripts/zones/Windurst_Waters_[S]/npcs/Ampiro-Mapiro.lua delete mode 100644 scripts/zones/Windurst_Waters_[S]/npcs/Aystise.lua delete mode 100644 scripts/zones/Windurst_Waters_[S]/npcs/Cattah_Pamjah.lua delete mode 100644 scripts/zones/Windurst_Waters_[S]/npcs/Chays-Ratays.lua delete mode 100644 scripts/zones/Windurst_Waters_[S]/npcs/Churacoco.lua delete mode 100644 scripts/zones/Windurst_Waters_[S]/npcs/Corbrere.lua delete mode 100644 scripts/zones/Windurst_Waters_[S]/npcs/Dallus-Mallus.lua delete mode 100644 scripts/zones/Windurst_Waters_[S]/npcs/Eih_Lhogotan.lua delete mode 100644 scripts/zones/Windurst_Waters_[S]/npcs/Ekki-Mokki.lua delete mode 100644 scripts/zones/Windurst_Waters_[S]/npcs/Emhi_Tchaoryo.lua delete mode 100644 scripts/zones/Windurst_Waters_[S]/npcs/Gevarg.lua delete mode 100644 scripts/zones/Windurst_Waters_[S]/npcs/Khea_Mhyyih.lua delete mode 100644 scripts/zones/Windurst_Waters_[S]/npcs/Kleh_Engyumoh.lua delete mode 100644 scripts/zones/Windurst_Waters_[S]/npcs/Kolin-Olin.lua delete mode 100644 scripts/zones/Windurst_Waters_[S]/npcs/Kopol-Rapol.lua delete mode 100644 scripts/zones/Windurst_Waters_[S]/npcs/Koton-Llaton.lua delete mode 100644 scripts/zones/Windurst_Waters_[S]/npcs/Kristen.lua delete mode 100644 scripts/zones/Windurst_Waters_[S]/npcs/Kuron-Makaron.lua delete mode 100644 scripts/zones/Windurst_Waters_[S]/npcs/Llewellyn.lua delete mode 100644 scripts/zones/Windurst_Waters_[S]/npcs/Lutete.lua delete mode 100644 scripts/zones/Windurst_Waters_[S]/npcs/Mearuru.lua delete mode 100644 scripts/zones/Windurst_Waters_[S]/npcs/Mhoti_Pyiahrs.lua delete mode 100644 scripts/zones/Windurst_Waters_[S]/npcs/Mikhe_Aryohcha.lua delete mode 100644 scripts/zones/Windurst_Waters_[S]/npcs/Narito-Pettito.lua delete mode 100644 scripts/zones/Windurst_Waters_[S]/npcs/Nhel_Urhahn.lua delete mode 100644 scripts/zones/Windurst_Waters_[S]/npcs/Ozzmo-Mazmo.lua delete mode 100644 scripts/zones/Windurst_Waters_[S]/npcs/Pahpe_Rauulih.lua delete mode 100644 scripts/zones/Windurst_Waters_[S]/npcs/Parukoko.lua delete mode 100644 scripts/zones/Windurst_Waters_[S]/npcs/Pebul-Tabul.lua delete mode 100644 scripts/zones/Windurst_Waters_[S]/npcs/Pelsey-Holsey.lua delete mode 100644 scripts/zones/Windurst_Waters_[S]/npcs/Pettette.lua delete mode 100644 scripts/zones/Windurst_Waters_[S]/npcs/Ponono.lua delete mode 100644 scripts/zones/Windurst_Waters_[S]/npcs/Prucco-Lurucco.lua delete mode 100644 scripts/zones/Windurst_Waters_[S]/npcs/Quartermaster.lua delete mode 100644 scripts/zones/Windurst_Waters_[S]/npcs/Ragyaya.lua delete mode 100644 scripts/zones/Windurst_Waters_[S]/npcs/Rakh_Mhappyoh.lua delete mode 100644 scripts/zones/Windurst_Waters_[S]/npcs/Rakih_Lyhall.lua delete mode 100644 scripts/zones/Windurst_Waters_[S]/npcs/Ranna-Brunna.lua delete mode 100644 scripts/zones/Windurst_Waters_[S]/npcs/Ransnana.lua delete mode 100644 scripts/zones/Windurst_Waters_[S]/npcs/Renten-Tonten.lua delete mode 100644 scripts/zones/Windurst_Waters_[S]/npcs/Romaa_Mihgo.lua delete mode 100644 scripts/zones/Windurst_Waters_[S]/npcs/Ruirara.lua delete mode 100644 scripts/zones/Windurst_Waters_[S]/npcs/Sahnn_Dhansett.lua delete mode 100644 scripts/zones/Windurst_Waters_[S]/npcs/Scotwick.lua delete mode 100644 scripts/zones/Windurst_Waters_[S]/npcs/Soimin-Oimin_CC.lua delete mode 100644 scripts/zones/Windurst_Waters_[S]/npcs/Tahl_Mhioguch.lua delete mode 100644 scripts/zones/Windurst_Waters_[S]/npcs/Tohs_Jhannih.lua delete mode 100644 scripts/zones/Windurst_Waters_[S]/npcs/Upital-Lupital.lua delete mode 100644 scripts/zones/Windurst_Waters_[S]/npcs/Uricca-Koricca.lua delete mode 100644 scripts/zones/Windurst_Waters_[S]/npcs/Velda-Galda.lua delete mode 100644 scripts/zones/Windurst_Waters_[S]/npcs/Wenonah_CA.lua diff --git a/scripts/zones/Windurst_Waters_[S]/DefaultActions.lua b/scripts/zones/Windurst_Waters_[S]/DefaultActions.lua new file mode 100644 index 00000000000..a84c2cc1a5d --- /dev/null +++ b/scripts/zones/Windurst_Waters_[S]/DefaultActions.lua @@ -0,0 +1,59 @@ +local ID = zones[xi.zone.WINDURST_WATERS_S] + +return { + ['Adjutant'] = { event = 305 }, + ['Aihn_Sowlmirih'] = { event = 412 }, + ['Amfafa'] = { event = 433 }, + ['Ampiro-Mapiro'] = { event = 423 }, + ['Aystise'] = { event = 410 }, + ['Cattah Pamjah'] = { event = 137 }, + ['Chays-Ratays'] = { event = 401 }, + ['Churacoco'] = { event = 434 }, + ['Corbrere'] = { event = 414 }, + ['Dallus-Mallus'] = { event = 323 }, + ['Eih_Lhogotan'] = { event = 407 }, + ['Ekki-Mokki'] = { event = 409 }, + ['Emhi_Tchaoryo'] = { event = 307 }, + ['Gevarg'] = { event = 0 }, + ['Khea_Mhyyih'] = { event = 428 }, + ['Kleh_Engyumoh'] = { event = 431 }, + ['Kolin-Olin'] = { event = 306 }, + ['Kopol-Rapol'] = { event = 422 }, + ['Koton-Llaton'] = { event = 402 }, + ['Kristen'] = { event = 404 }, + ['Kuron-Makaron'] = { event = 300 }, + ['Llewellyn'] = { event = 10 }, + ['Lutete'] = { text = ID.text.LUTETE_DIALOG }, + ['Mearuru'] = { event = 418 }, + ['Mhoti_Pyiahrs'] = { event = 2 }, + ['Mikhe Aryohcha'] = { text = ID.text.MIKHE_ARYOHCHA_DIALOG }, + ['Narito-Pettito'] = { event = 425 }, + ['Nhel_Urhahn'] = { event = 416 }, + ['Ozzmo-Mazmo'] = { event = 432 }, + ['Pahpe_Rauulih'] = { event = 427 }, + ['Parukoko'] = { event = 436 }, + ['Pebul-Tabul'] = { event = 405 }, + ['Pelsey-Holsey'] = { event = 419 }, + ['Pettette'] = { event = 9 }, + ['Pogigi'] = { event = 330 }, + ['Ponono'] = { event = 193 }, + ['Prucco-Lurucco'] = { event = 420 }, + ['Quartermaster'] = { event = 201 }, + ['Ragyaya'] = { event = 406 }, + ['Rakh_Mhappyoh'] = { event = 411 }, + ['Rakih_Lyhall'] = { event = 429 }, + ['Ranna-Brunna'] = { event = 424 }, + ['Ransnana'] = { event = 408 }, + ['Renten-Tonten'] = { event = 421 }, + ['Romaa_Mihgo'] = { event = 11 }, + ['Ruirara'] = { event = 435 }, + ['Sahnn_Dhansett'] = { event = 417 }, + ['Scotwick'] = { event = 16 }, + ['Soimin-Oimin_CC'] = { event = 452 }, + ['Tahl_Mhioguch'] = { event = 438 }, + ['Tohs_Jhannih'] = { event = 430 }, + ['Upital-Lupital'] = { event = 439 }, + ['Uricca-Koricca'] = { event = 437 }, + ['Velda-Galda'] = { event = 177 }, + ['Wenonah_CA'] = { event = 459 }, +} diff --git a/scripts/zones/Windurst_Waters_[S]/npcs/Adjutant.lua b/scripts/zones/Windurst_Waters_[S]/npcs/Adjutant.lua deleted file mode 100644 index 72e18baa66a..00000000000 --- a/scripts/zones/Windurst_Waters_[S]/npcs/Adjutant.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Windurst Waters (S) --- NPC: Adjutant --- !pos -67.819 -4.499 58.997 94 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(305) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters_[S]/npcs/Aihn_Sowlmirih.lua b/scripts/zones/Windurst_Waters_[S]/npcs/Aihn_Sowlmirih.lua deleted file mode 100644 index 5dbc0cd1c9d..00000000000 --- a/scripts/zones/Windurst_Waters_[S]/npcs/Aihn_Sowlmirih.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Windurst Waters (S) --- NPC: Aihn Sowlmirih --- !pos -61.102 -4.5 71.743 94 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(412) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters_[S]/npcs/Ajen-Myoojen.lua b/scripts/zones/Windurst_Waters_[S]/npcs/Ajen-Myoojen.lua index 997ca2d3adf..5dc26396a4e 100644 --- a/scripts/zones/Windurst_Waters_[S]/npcs/Ajen-Myoojen.lua +++ b/scripts/zones/Windurst_Waters_[S]/npcs/Ajen-Myoojen.lua @@ -6,16 +6,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(200) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 200 and option == 1 then player:setPos(320, -4, -46, 192, 95) diff --git a/scripts/zones/Windurst_Waters_[S]/npcs/Amfafa.lua b/scripts/zones/Windurst_Waters_[S]/npcs/Amfafa.lua deleted file mode 100644 index 4eb169f73d6..00000000000 --- a/scripts/zones/Windurst_Waters_[S]/npcs/Amfafa.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Windurst Waters (S) --- NPC: Amfafa --- !pos -24.938 -2 -185.729 94 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(433) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters_[S]/npcs/Ampiro-Mapiro.lua b/scripts/zones/Windurst_Waters_[S]/npcs/Ampiro-Mapiro.lua deleted file mode 100644 index 93fc28e321c..00000000000 --- a/scripts/zones/Windurst_Waters_[S]/npcs/Ampiro-Mapiro.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Windurst Waters (S) --- NPC: Ampiro-Mapiro --- !pos 131.380 -6.75 174.169 94 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(423) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters_[S]/npcs/Aystise.lua b/scripts/zones/Windurst_Waters_[S]/npcs/Aystise.lua deleted file mode 100644 index ebf0116f209..00000000000 --- a/scripts/zones/Windurst_Waters_[S]/npcs/Aystise.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Windurst Waters (S) --- NPC: Aystise --- !pos -69.805 -4.5 68.078 94 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(410) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters_[S]/npcs/Cattah_Pamjah.lua b/scripts/zones/Windurst_Waters_[S]/npcs/Cattah_Pamjah.lua deleted file mode 100644 index 35ef9f1458c..00000000000 --- a/scripts/zones/Windurst_Waters_[S]/npcs/Cattah_Pamjah.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Windurst Waters (S) --- NPC: Cattah Pamjah --- Type: Title Changer --- !pos -13.564 -2 10.673 94 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(137) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters_[S]/npcs/Chays-Ratays.lua b/scripts/zones/Windurst_Waters_[S]/npcs/Chays-Ratays.lua deleted file mode 100644 index 97c2b880bf0..00000000000 --- a/scripts/zones/Windurst_Waters_[S]/npcs/Chays-Ratays.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Windurst Waters (S) --- NPC: Chays-Ratays --- !pos -6.013 -4.999 -185.219 94 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(401) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters_[S]/npcs/Churacoco.lua b/scripts/zones/Windurst_Waters_[S]/npcs/Churacoco.lua deleted file mode 100644 index a09fffd3b2e..00000000000 --- a/scripts/zones/Windurst_Waters_[S]/npcs/Churacoco.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Windurst Waters (S) --- NPC: Churacoco --- !pos -76.139 -4.499 20.986 94 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(434) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters_[S]/npcs/Corbrere.lua b/scripts/zones/Windurst_Waters_[S]/npcs/Corbrere.lua deleted file mode 100644 index c29c01bfdc0..00000000000 --- a/scripts/zones/Windurst_Waters_[S]/npcs/Corbrere.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Windurst Waters (S) --- NPC: Corbrere --- !pos -46.925 -4.5 49.006 94 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(414) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters_[S]/npcs/Dallus-Mallus.lua b/scripts/zones/Windurst_Waters_[S]/npcs/Dallus-Mallus.lua deleted file mode 100644 index ea35b1448f2..00000000000 --- a/scripts/zones/Windurst_Waters_[S]/npcs/Dallus-Mallus.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Windurst Waters (S) --- NPC: Dallus-Mallus --- Type: Campaign Intel Advisor --- !pos -13.666 -2 26.180 94 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(323) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters_[S]/npcs/Dhea_Prandoleh.lua b/scripts/zones/Windurst_Waters_[S]/npcs/Dhea_Prandoleh.lua index 331cf5d6664..66b64207192 100644 --- a/scripts/zones/Windurst_Waters_[S]/npcs/Dhea_Prandoleh.lua +++ b/scripts/zones/Windurst_Waters_[S]/npcs/Dhea_Prandoleh.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.WINDURST_WATERS_S] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getCampaignAllegiance() > 0 and @@ -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 == 128 then player:addQuest(xi.questLog.CRYSTAL_WAR, xi.quest.id.crystalWar.THE_TIGRESS_STIRS) diff --git a/scripts/zones/Windurst_Waters_[S]/npcs/Door_Acolyte_Hostel_down.lua b/scripts/zones/Windurst_Waters_[S]/npcs/Door_Acolyte_Hostel_down.lua index f22200d90a6..198f15450a1 100644 --- a/scripts/zones/Windurst_Waters_[S]/npcs/Door_Acolyte_Hostel_down.lua +++ b/scripts/zones/Windurst_Waters_[S]/npcs/Door_Acolyte_Hostel_down.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.WINDURST_WATERS_S] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getQuestStatus(xi.questLog.CRYSTAL_WAR, xi.quest.id.crystalWar.THE_TIGRESS_STIRS) == xi.questStatus.QUEST_ACCEPTED and @@ -34,9 +31,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 129 then player:addItem(xi.item.HI_ELIXIR) diff --git a/scripts/zones/Windurst_Waters_[S]/npcs/Door_Acolyte_Hostel_up.lua b/scripts/zones/Windurst_Waters_[S]/npcs/Door_Acolyte_Hostel_up.lua index d66dcc77f7f..4a8464404c7 100644 --- a/scripts/zones/Windurst_Waters_[S]/npcs/Door_Acolyte_Hostel_up.lua +++ b/scripts/zones/Windurst_Waters_[S]/npcs/Door_Acolyte_Hostel_up.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.SAY_IT_WITH_A_HANDBAG) == 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 == 171 then if option == 1 then diff --git a/scripts/zones/Windurst_Waters_[S]/npcs/Eih_Lhogotan.lua b/scripts/zones/Windurst_Waters_[S]/npcs/Eih_Lhogotan.lua deleted file mode 100644 index d88649349a6..00000000000 --- a/scripts/zones/Windurst_Waters_[S]/npcs/Eih_Lhogotan.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Windurst Waters (S) --- NPC: Eih Lhogotan --- !pos -29.887 -5.999 91.042 94 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(407) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters_[S]/npcs/Ekki-Mokki.lua b/scripts/zones/Windurst_Waters_[S]/npcs/Ekki-Mokki.lua deleted file mode 100644 index 3f15bd446e1..00000000000 --- a/scripts/zones/Windurst_Waters_[S]/npcs/Ekki-Mokki.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Windurst Waters (S) --- NPC: Ekki-Mokki --- !pos -26.558 -4.5 62.930 94 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(409) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters_[S]/npcs/Emhi_Tchaoryo.lua b/scripts/zones/Windurst_Waters_[S]/npcs/Emhi_Tchaoryo.lua deleted file mode 100644 index f1ad46959d5..00000000000 --- a/scripts/zones/Windurst_Waters_[S]/npcs/Emhi_Tchaoryo.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Windurst Waters (S) --- NPC: Emhi Tchaoryo --- Type: Campaign Ops Overseer --- !pos 10.577 -2.478 32.680 94 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(307) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters_[S]/npcs/Ezura-Romazura.lua b/scripts/zones/Windurst_Waters_[S]/npcs/Ezura-Romazura.lua index 4fe053c57d5..53d3d6489f8 100644 --- a/scripts/zones/Windurst_Waters_[S]/npcs/Ezura-Romazura.lua +++ b/scripts/zones/Windurst_Waters_[S]/npcs/Ezura-Romazura.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.WINDURST_WATERS_S] ---@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.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/Windurst_Waters_[S]/npcs/Gevarg.lua b/scripts/zones/Windurst_Waters_[S]/npcs/Gevarg.lua deleted file mode 100644 index e8cbd4df53a..00000000000 --- a/scripts/zones/Windurst_Waters_[S]/npcs/Gevarg.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Windurst Waters (S) --- NPC: Gevarg --- Type: Past Event Watcher --- !pos -46.448 -6.312 212.384 94 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(0) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters_[S]/npcs/Hampu-Kampu.lua b/scripts/zones/Windurst_Waters_[S]/npcs/Hampu-Kampu.lua index b1e221945b0..a3724eb4354 100644 --- a/scripts/zones/Windurst_Waters_[S]/npcs/Hampu-Kampu.lua +++ b/scripts/zones/Windurst_Waters_[S]/npcs/Hampu-Kampu.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local sayItWithAHandbag = player:getQuestStatus(xi.questLog.CRYSTAL_WAR, xi.quest.id.crystalWar.SAY_IT_WITH_A_HANDBAG) local sayItWithAHandbagCS = player:getCharVar('sayItWithAHandbagCS') @@ -34,9 +31,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 174 then -- Option doesn't matter as NPC will take key item if yes or no if diff --git a/scripts/zones/Windurst_Waters_[S]/npcs/Hunt_Registry.lua b/scripts/zones/Windurst_Waters_[S]/npcs/Hunt_Registry.lua index 6fd9b27c9cf..776d810d031 100644 --- a/scripts/zones/Windurst_Waters_[S]/npcs/Hunt_Registry.lua +++ b/scripts/zones/Windurst_Waters_[S]/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/Windurst_Waters_[S]/npcs/Khea_Mhyyih.lua b/scripts/zones/Windurst_Waters_[S]/npcs/Khea_Mhyyih.lua deleted file mode 100644 index 2ec0f3a0d3f..00000000000 --- a/scripts/zones/Windurst_Waters_[S]/npcs/Khea_Mhyyih.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Windurst Waters (S) --- NPC: Khea Mhyyih --- !pos -53.927 -4.499 56.215 94 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(428) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters_[S]/npcs/Kleh_Engyumoh.lua b/scripts/zones/Windurst_Waters_[S]/npcs/Kleh_Engyumoh.lua deleted file mode 100644 index 68c0b8e4737..00000000000 --- a/scripts/zones/Windurst_Waters_[S]/npcs/Kleh_Engyumoh.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Windurst Waters (S) --- NPC: Kleh Engyumoh --- !pos -54.962 -4.5 57.701 94 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(431) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters_[S]/npcs/Kocco_Ehllek.lua b/scripts/zones/Windurst_Waters_[S]/npcs/Kocco_Ehllek.lua index e5d1db382d2..be5e7f4154a 100644 --- a/scripts/zones/Windurst_Waters_[S]/npcs/Kocco_Ehllek.lua +++ b/scripts/zones/Windurst_Waters_[S]/npcs/Kocco_Ehllek.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local redeemingRocks = player:getQuestStatus(xi.questLog.CRYSTAL_WAR, xi.quest.id.crystalWar.REDEEMING_ROCKS) local rocksProg = player:getCharVar('RedeemingRocksProg') @@ -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 == 108 then -- Finish 'Redeeming Rocks' opening CS player:addQuest(xi.questLog.CRYSTAL_WAR, xi.quest.id.crystalWar.REDEEMING_ROCKS) diff --git a/scripts/zones/Windurst_Waters_[S]/npcs/Kolin-Olin.lua b/scripts/zones/Windurst_Waters_[S]/npcs/Kolin-Olin.lua deleted file mode 100644 index 9bbe671a640..00000000000 --- a/scripts/zones/Windurst_Waters_[S]/npcs/Kolin-Olin.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Windurst Waters (S) --- NPC: Kolin-Olin --- !pos 9.981 -2.478 33.786 94 ------------------------------------ ----@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/Windurst_Waters_[S]/npcs/Kopol-Rapol.lua b/scripts/zones/Windurst_Waters_[S]/npcs/Kopol-Rapol.lua deleted file mode 100644 index eb285183fc3..00000000000 --- a/scripts/zones/Windurst_Waters_[S]/npcs/Kopol-Rapol.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Windurst Waters (S) --- NPC: Kopol-Rapol --- !pos 131.179 -6.75 172.758 94 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(422) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters_[S]/npcs/Koton-Llaton.lua b/scripts/zones/Windurst_Waters_[S]/npcs/Koton-Llaton.lua deleted file mode 100644 index 0bd420864eb..00000000000 --- a/scripts/zones/Windurst_Waters_[S]/npcs/Koton-Llaton.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Windurst Waters (S) --- NPC: Koton-Llaton --- !pos 78.220 -3.75 -173.631 94 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(402) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters_[S]/npcs/Kristen.lua b/scripts/zones/Windurst_Waters_[S]/npcs/Kristen.lua deleted file mode 100644 index d7574ae5559..00000000000 --- a/scripts/zones/Windurst_Waters_[S]/npcs/Kristen.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Windurst Waters (S) --- NPC: Kristen --- !pos 2.195 -2 60.296 94 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(404) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters_[S]/npcs/Kuron-Makaron.lua b/scripts/zones/Windurst_Waters_[S]/npcs/Kuron-Makaron.lua deleted file mode 100644 index 83d819abc5a..00000000000 --- a/scripts/zones/Windurst_Waters_[S]/npcs/Kuron-Makaron.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Windurst Waters (S) --- NPC: Kuron-Makaron --- Type: Morale Manager --- !pos 10.422 -2.478 24.616 94 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(300) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters_[S]/npcs/Llewellyn.lua b/scripts/zones/Windurst_Waters_[S]/npcs/Llewellyn.lua deleted file mode 100644 index 28dada8bc42..00000000000 --- a/scripts/zones/Windurst_Waters_[S]/npcs/Llewellyn.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Windurst Waters (S) --- NPC: Llewellyn --- Type: Campaign Evaluator --- !pos -6.907 -2 42.871 94 ------------------------------------ ----@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/Windurst_Waters_[S]/npcs/Lutete.lua b/scripts/zones/Windurst_Waters_[S]/npcs/Lutete.lua deleted file mode 100644 index afc33078c71..00000000000 --- a/scripts/zones/Windurst_Waters_[S]/npcs/Lutete.lua +++ /dev/null @@ -1,24 +0,0 @@ ------------------------------------ --- Area: Windurst Waters (S) --- NPC: Lutete --- !pos 169.205 -0.879 -9.107 94 ------------------------------------ -local ID = zones[xi.zone.WINDURST_WATERS_S] ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:showText(npc, ID.text.LUTETE_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/Windurst_Waters_[S]/npcs/Mearuru.lua b/scripts/zones/Windurst_Waters_[S]/npcs/Mearuru.lua deleted file mode 100644 index d303dd9bafd..00000000000 --- a/scripts/zones/Windurst_Waters_[S]/npcs/Mearuru.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Windurst Waters (S) --- NPC: Mearuru --- !pos 153.798 -1 153.712 94 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(418) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters_[S]/npcs/Mhoti_Pyiahrs.lua b/scripts/zones/Windurst_Waters_[S]/npcs/Mhoti_Pyiahrs.lua deleted file mode 100644 index 0cb171c63e3..00000000000 --- a/scripts/zones/Windurst_Waters_[S]/npcs/Mhoti_Pyiahrs.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Windurst Waters (S) --- NPC: Mhoti Pyiahrs --- Type: Allegiance --- !pos 6.356 -2 26.677 94 ------------------------------------ ----@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/Windurst_Waters_[S]/npcs/Miah_Riyuh.lua b/scripts/zones/Windurst_Waters_[S]/npcs/Miah_Riyuh.lua index c13acc3b9f3..c1dd53f2980 100644 --- a/scripts/zones/Windurst_Waters_[S]/npcs/Miah_Riyuh.lua +++ b/scripts/zones/Windurst_Waters_[S]/npcs/Miah_Riyuh.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.WINDURST_WATERS_S] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local allegiance = player:getCampaignAllegiance() -- 0 = none, 1 = San d'Oria Iron Rams, 2 = Bastok Fighting Fourth, 3 = Windurst Cobras @@ -63,9 +60,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 103 and option == 0 then player:addQuest(xi.questLog.CRYSTAL_WAR, xi.quest.id.crystalWar.SNAKE_ON_THE_PLAINS) diff --git a/scripts/zones/Windurst_Waters_[S]/npcs/Mikhe_Aryohcha.lua b/scripts/zones/Windurst_Waters_[S]/npcs/Mikhe_Aryohcha.lua deleted file mode 100644 index 13e46ad6548..00000000000 --- a/scripts/zones/Windurst_Waters_[S]/npcs/Mikhe_Aryohcha.lua +++ /dev/null @@ -1,24 +0,0 @@ ------------------------------------ --- Area: Windurst Waters (S) --- NPC: Mikhe Aryohcha --- !pos -56.645 -4.5 13.014 94 ------------------------------------ -local ID = zones[xi.zone.WINDURST_WATERS_S] ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:showText(npc, ID.text.MIKHE_ARYOHCHA_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/Windurst_Waters_[S]/npcs/Mindala-Andola_CC.lua b/scripts/zones/Windurst_Waters_[S]/npcs/Mindala-Andola_CC.lua index 1b9b5e32820..71a9d983f95 100644 --- a/scripts/zones/Windurst_Waters_[S]/npcs/Mindala-Andola_CC.lua +++ b/scripts/zones/Windurst_Waters_[S]/npcs/Mindala-Andola_CC.lua @@ -1,15 +1,12 @@ ----------------------------------- -- Area: Windurst Waters [S] --- NPC: Mindala Andola C.C. +-- NPC: Mindala-Andola C.C. -- Type: Sigil NPC -- !pos -31.869 -6.009 226.793 94 ----------------------------------- ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.campaign.sigilOnTrigger(player, npc) end diff --git a/scripts/zones/Windurst_Waters_[S]/npcs/Narito-Pettito.lua b/scripts/zones/Windurst_Waters_[S]/npcs/Narito-Pettito.lua deleted file mode 100644 index b99e8d4e98b..00000000000 --- a/scripts/zones/Windurst_Waters_[S]/npcs/Narito-Pettito.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Windurst Waters (S) --- NPC: Narito-Pettito --- !pos -52.674 -5.999 90.403 94 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(425) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters_[S]/npcs/Nhel_Urhahn.lua b/scripts/zones/Windurst_Waters_[S]/npcs/Nhel_Urhahn.lua deleted file mode 100644 index c3d5c84c579..00000000000 --- a/scripts/zones/Windurst_Waters_[S]/npcs/Nhel_Urhahn.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Windurst Waters (S) --- NPC: Nhel Urhahn --- !pos -47.348 -4.499 47.117 94 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(416) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters_[S]/npcs/Ozzmo-Mazmo.lua b/scripts/zones/Windurst_Waters_[S]/npcs/Ozzmo-Mazmo.lua deleted file mode 100644 index c3233f605fc..00000000000 --- a/scripts/zones/Windurst_Waters_[S]/npcs/Ozzmo-Mazmo.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Windurst Waters (S) --- NPC: Ozzmo-Mazmo --- !pos -61.677 -13.311 106.400 94 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(432) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters_[S]/npcs/Pahpe_Rauulih.lua b/scripts/zones/Windurst_Waters_[S]/npcs/Pahpe_Rauulih.lua deleted file mode 100644 index 37a4e6fc39e..00000000000 --- a/scripts/zones/Windurst_Waters_[S]/npcs/Pahpe_Rauulih.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Windurst Waters (S) --- NPC: Pahpe Rauulih --- !pos -39.740 -4.499 53.223 94 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(427) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters_[S]/npcs/Parukoko.lua b/scripts/zones/Windurst_Waters_[S]/npcs/Parukoko.lua deleted file mode 100644 index 009898d06fe..00000000000 --- a/scripts/zones/Windurst_Waters_[S]/npcs/Parukoko.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Windurst Waters (S) --- NPC: Parukoko --- !pos -32.400 -3.5 -103.666 94 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(436) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters_[S]/npcs/Pebul-Tabul.lua b/scripts/zones/Windurst_Waters_[S]/npcs/Pebul-Tabul.lua deleted file mode 100644 index 036c7b8312a..00000000000 --- a/scripts/zones/Windurst_Waters_[S]/npcs/Pebul-Tabul.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Windurst Waters (S) --- NPC: Pebul-Tabul --- !pos -68.500 -4.5 3.694 94 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(405) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters_[S]/npcs/Pelftrix.lua b/scripts/zones/Windurst_Waters_[S]/npcs/Pelftrix.lua index 5865b7f8f30..a69e3e29c9c 100644 --- a/scripts/zones/Windurst_Waters_[S]/npcs/Pelftrix.lua +++ b/scripts/zones/Windurst_Waters_[S]/npcs/Pelftrix.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.WINDURST_WATERS_S] ---@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/Windurst_Waters_[S]/npcs/Pelsey-Holsey.lua b/scripts/zones/Windurst_Waters_[S]/npcs/Pelsey-Holsey.lua deleted file mode 100644 index 4b4d3fdda26..00000000000 --- a/scripts/zones/Windurst_Waters_[S]/npcs/Pelsey-Holsey.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Windurst Waters (S) --- NPC: Pelsey-Holsey --- !pos 119.755 -4.5 209.754 94 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(419) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters_[S]/npcs/Pettette.lua b/scripts/zones/Windurst_Waters_[S]/npcs/Pettette.lua deleted file mode 100644 index c2e52d6550f..00000000000 --- a/scripts/zones/Windurst_Waters_[S]/npcs/Pettette.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Windurst Waters (S) --- NPC: Pettette --- !pos 164.026 -0.001 -26.690 94 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(9) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters_[S]/npcs/Pogigi.lua b/scripts/zones/Windurst_Waters_[S]/npcs/Pogigi.lua index c6fb639fc87..e102ef70676 100644 --- a/scripts/zones/Windurst_Waters_[S]/npcs/Pogigi.lua +++ b/scripts/zones/Windurst_Waters_[S]/npcs/Pogigi.lua @@ -34,14 +34,4 @@ entity.onTrade = function(player, npc, trade) end end -entity.onTrigger = function(player, npc) - player:startEvent(330) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Windurst_Waters_[S]/npcs/Ponono.lua b/scripts/zones/Windurst_Waters_[S]/npcs/Ponono.lua deleted file mode 100644 index a46f9e82a99..00000000000 --- a/scripts/zones/Windurst_Waters_[S]/npcs/Ponono.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Windurst Waters (S) --- NPC: Ponono --- !pos 156.069 -0.001 -15.667 94 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(193) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters_[S]/npcs/Prucco-Lurucco.lua b/scripts/zones/Windurst_Waters_[S]/npcs/Prucco-Lurucco.lua deleted file mode 100644 index ccd531a5723..00000000000 --- a/scripts/zones/Windurst_Waters_[S]/npcs/Prucco-Lurucco.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Windurst Waters (S) --- NPC: Prucco-Lurucco --- !pos 140.772 -3.499 132.942 94 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(420) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters_[S]/npcs/Quartermaster.lua b/scripts/zones/Windurst_Waters_[S]/npcs/Quartermaster.lua deleted file mode 100644 index bd165430036..00000000000 --- a/scripts/zones/Windurst_Waters_[S]/npcs/Quartermaster.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Windurst Waters (S) --- NPC: Quartermaster --- !pos -60.200 -4.7 32.500 94 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(201) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters_[S]/npcs/Ragyaya.lua b/scripts/zones/Windurst_Waters_[S]/npcs/Ragyaya.lua deleted file mode 100644 index e2ff8f6421c..00000000000 --- a/scripts/zones/Windurst_Waters_[S]/npcs/Ragyaya.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Windurst Waters (S) --- NPC: Ragyaya --- !pos -95.376 -3 60.795 94 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(406) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters_[S]/npcs/Rakh_Mhappyoh.lua b/scripts/zones/Windurst_Waters_[S]/npcs/Rakh_Mhappyoh.lua deleted file mode 100644 index e01143d9fe6..00000000000 --- a/scripts/zones/Windurst_Waters_[S]/npcs/Rakh_Mhappyoh.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Windurst Waters (S) --- NPC: Rakh Mhappyoh --- !pos -55.989 -4.5 48.365 94 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(411) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters_[S]/npcs/Rakih_Lyhall.lua b/scripts/zones/Windurst_Waters_[S]/npcs/Rakih_Lyhall.lua deleted file mode 100644 index db8302d229b..00000000000 --- a/scripts/zones/Windurst_Waters_[S]/npcs/Rakih_Lyhall.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Windurst Waters (S) --- NPC: Rakih Lyhall --- !pos -48.111 -4.5 69.712 94 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(429) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters_[S]/npcs/Ranna-Brunna.lua b/scripts/zones/Windurst_Waters_[S]/npcs/Ranna-Brunna.lua deleted file mode 100644 index 2e70f96c871..00000000000 --- a/scripts/zones/Windurst_Waters_[S]/npcs/Ranna-Brunna.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Windurst Waters (S) --- NPC: Ranna-Brunna --- !pos 123.085 -8.874 223.734 94 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(424) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters_[S]/npcs/Ransnana.lua b/scripts/zones/Windurst_Waters_[S]/npcs/Ransnana.lua deleted file mode 100644 index 1f1266aaa80..00000000000 --- a/scripts/zones/Windurst_Waters_[S]/npcs/Ransnana.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Windurst Waters (S) --- NPC: Ransnana --- !pos -22.008 -13.339 122.819 94 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(408) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters_[S]/npcs/Renten-Tonten.lua b/scripts/zones/Windurst_Waters_[S]/npcs/Renten-Tonten.lua deleted file mode 100644 index b7540bbc667..00000000000 --- a/scripts/zones/Windurst_Waters_[S]/npcs/Renten-Tonten.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Windurst Waters (S) --- NPC: Renten-Tonten --- !pos 133.840 -6.75 173.305 94 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(421) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters_[S]/npcs/Rohn_Ehlbalna.lua b/scripts/zones/Windurst_Waters_[S]/npcs/Rohn_Ehlbalna.lua index 297ddfe700d..d635cc25d58 100644 --- a/scripts/zones/Windurst_Waters_[S]/npcs/Rohn_Ehlbalna.lua +++ b/scripts/zones/Windurst_Waters_[S]/npcs/Rohn_Ehlbalna.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.REDEEMING_ROCKS) == 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 == 114 then -- Finish "Redeeming Rocks" second CS player:setCharVar('RedeemingRocksProg', 2) diff --git a/scripts/zones/Windurst_Waters_[S]/npcs/Romaa_Mihgo.lua b/scripts/zones/Windurst_Waters_[S]/npcs/Romaa_Mihgo.lua deleted file mode 100644 index 878073b06d3..00000000000 --- a/scripts/zones/Windurst_Waters_[S]/npcs/Romaa_Mihgo.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Windurst Waters (S) --- NPC: Romaa Mihgo --- !pos -1.967 -3 -26.337 94 ------------------------------------ ----@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/Windurst_Waters_[S]/npcs/Ruirara.lua b/scripts/zones/Windurst_Waters_[S]/npcs/Ruirara.lua deleted file mode 100644 index ba538f31861..00000000000 --- a/scripts/zones/Windurst_Waters_[S]/npcs/Ruirara.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Windurst Waters (S) --- NPC: Ruirara --- !pos -87.378 -2 -158.019 94 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(435) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters_[S]/npcs/Sahnn_Dhansett.lua b/scripts/zones/Windurst_Waters_[S]/npcs/Sahnn_Dhansett.lua deleted file mode 100644 index 8591284bc22..00000000000 --- a/scripts/zones/Windurst_Waters_[S]/npcs/Sahnn_Dhansett.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Windurst Waters (S) --- NPC: Sahnn Dhansett --- !pos 112.820 -3.122 47.857 94 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(417) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters_[S]/npcs/Scotwick.lua b/scripts/zones/Windurst_Waters_[S]/npcs/Scotwick.lua deleted file mode 100644 index 410f1083758..00000000000 --- a/scripts/zones/Windurst_Waters_[S]/npcs/Scotwick.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Windurst Waters (S) --- NPC: Scotwick --- Type: Allied Notes Notorious Monsters --- !pos 153.785 -3.134 9.895 94 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(16) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters_[S]/npcs/Soimin-Oimin_CC.lua b/scripts/zones/Windurst_Waters_[S]/npcs/Soimin-Oimin_CC.lua deleted file mode 100644 index b5c5d0bb23e..00000000000 --- a/scripts/zones/Windurst_Waters_[S]/npcs/Soimin-Oimin_CC.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Windurst Waters (S) --- NPC: Soimin-Oimin, C.C. --- Type: Retrace --- !pos -51.010 -6.276 213.678 94 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(452) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters_[S]/npcs/Symphonic_Curator.lua b/scripts/zones/Windurst_Waters_[S]/npcs/Symphonic_Curator.lua index 1f207df2bd3..78532bbf338 100644 --- a/scripts/zones/Windurst_Waters_[S]/npcs/Symphonic_Curator.lua +++ b/scripts/zones/Windurst_Waters_[S]/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/Windurst_Waters_[S]/npcs/Tahl_Mhioguch.lua b/scripts/zones/Windurst_Waters_[S]/npcs/Tahl_Mhioguch.lua deleted file mode 100644 index 5ca863adda3..00000000000 --- a/scripts/zones/Windurst_Waters_[S]/npcs/Tahl_Mhioguch.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Windurst Waters (S) --- NPC: Tahl Mhioguch --- !pos -64.907 -5.947 81.391 94 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(438) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters_[S]/npcs/Tohs_Jhannih.lua b/scripts/zones/Windurst_Waters_[S]/npcs/Tohs_Jhannih.lua deleted file mode 100644 index ff13032c427..00000000000 --- a/scripts/zones/Windurst_Waters_[S]/npcs/Tohs_Jhannih.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Windurst Waters (S) --- NPC: Tohs Jhannih --- !pos -46.492 -4.5 70.828 94 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(430) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters_[S]/npcs/Upital-Lupital.lua b/scripts/zones/Windurst_Waters_[S]/npcs/Upital-Lupital.lua deleted file mode 100644 index aa150afc88d..00000000000 --- a/scripts/zones/Windurst_Waters_[S]/npcs/Upital-Lupital.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Windurst Waters (S) --- NPC: Upital-Lupital --- !pos -57.809 -13.339 122.753 94 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(439) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters_[S]/npcs/Uricca-Koricca.lua b/scripts/zones/Windurst_Waters_[S]/npcs/Uricca-Koricca.lua deleted file mode 100644 index 05ddb6b4fbe..00000000000 --- a/scripts/zones/Windurst_Waters_[S]/npcs/Uricca-Koricca.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Windurst Waters (S) --- NPC: Uricca-Koricca --- !pos -102.221 -3 48.791 94 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(437) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters_[S]/npcs/Velda-Galda.lua b/scripts/zones/Windurst_Waters_[S]/npcs/Velda-Galda.lua deleted file mode 100644 index f3f3fedf036..00000000000 --- a/scripts/zones/Windurst_Waters_[S]/npcs/Velda-Galda.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Windurst Waters (S) --- NPC: Velda-Galda --- Type: Mission NPC --- !pos 138.631 -3.112 61.658 94 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(177) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters_[S]/npcs/Wenonah_CA.lua b/scripts/zones/Windurst_Waters_[S]/npcs/Wenonah_CA.lua deleted file mode 100644 index 0fae3372f3a..00000000000 --- a/scripts/zones/Windurst_Waters_[S]/npcs/Wenonah_CA.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Windurst Waters (S) --- NPC: Wenonah, C.A. --- Type: Campaign Arbiter --- !pos -2.175 -2 10.184 94 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(459) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters_[S]/npcs/Yasmina.lua b/scripts/zones/Windurst_Waters_[S]/npcs/Yasmina.lua index 7952ec23b7b..b185e4d1fd7 100644 --- a/scripts/zones/Windurst_Waters_[S]/npcs/Yasmina.lua +++ b/scripts/zones/Windurst_Waters_[S]/npcs/Yasmina.lua @@ -10,16 +10,10 @@ local entity = {} local eventSucceed = 6 local eventFail = 7 -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/Windurst_Waters_[S]/npcs/Yassi-Possi.lua b/scripts/zones/Windurst_Waters_[S]/npcs/Yassi-Possi.lua index b4a9013000c..0bfa5b31421 100644 --- a/scripts/zones/Windurst_Waters_[S]/npcs/Yassi-Possi.lua +++ b/scripts/zones/Windurst_Waters_[S]/npcs/Yassi-Possi.lua @@ -9,18 +9,9 @@ local ID = zones[xi.zone.WINDURST_WATERS_S] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:showText(npc, ID.text.YASSI_POSSI_DIALOG) player:openSendBox() end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity From 218c8c22c1cfc5b8d66a760b2c9ef56b512c304e Mon Sep 17 00:00:00 2001 From: claywar Date: Sat, 18 Jan 2025 11:18:02 -0500 Subject: [PATCH 3/4] Remove empty NPCs, add Default Actions - Windurst Waters --- .../zones/Windurst_Waters/DefaultActions.lua | 117 ++++++++++++++---- .../Windurst_Waters/npcs/AMAN_Liaison.lua | 3 - .../zones/Windurst_Waters/npcs/Ahyeekih.lua | 6 - .../Windurst_Waters/npcs/Ajen-Myoojen.lua | 22 ---- .../zones/Windurst_Waters/npcs/Akee_Yonji.lua | 21 ---- .../npcs/Amagusa-Chigurusa.lua | 6 - .../zones/Windurst_Waters/npcs/Anja-Enja.lua | 22 ---- .../zones/Windurst_Waters/npcs/Aora-Uora.lua | 21 ---- .../Windurst_Waters/npcs/Aramu-Paramu.lua | 9 -- .../zones/Windurst_Waters/npcs/Arukoko.lua | 21 ---- .../Windurst_Waters/npcs/Baehu-Faehu.lua | 9 -- .../Windurst_Waters/npcs/Baren-Moren.lua | 3 - .../zones/Windurst_Waters/npcs/Bondada.lua | 6 - .../Windurst_Waters/npcs/Buchi_Kohmrijah.lua | 21 ---- scripts/zones/Windurst_Waters/npcs/Bulolo.lua | 21 ---- .../zones/Windurst_Waters/npcs/Caliburn.lua | 13 -- .../zones/Windurst_Waters/npcs/Chamama.lua | 3 - .../Windurst_Waters/npcs/Chomo_Jinjahl.lua | 9 -- .../Windurst_Waters/npcs/Churano-Shurano.lua | 3 - .../Windurst_Waters/npcs/Chyuk-Kochak.lua | 22 ---- scripts/zones/Windurst_Waters/npcs/Clais.lua | 6 - .../Windurst_Waters/npcs/Dabido-Sorobido.lua | 22 ---- .../Windurst_Waters/npcs/Dagoza-Beruza.lua | 23 ---- .../Windurst_Waters/npcs/Damami-Karumi.lua | 22 ---- .../zones/Windurst_Waters/npcs/Dienger.lua | 23 ---- .../Windurst_Waters/npcs/Diroku-Oroku.lua | 21 ---- .../zones/Windurst_Waters/npcs/Door_House.lua | 3 - .../Windurst_Waters/npcs/Eight_of_Hearts.lua | 21 ---- .../zones/Windurst_Waters/npcs/Enrefort.lua | 21 ---- scripts/zones/Windurst_Waters/npcs/Ensasa.lua | 6 - .../Windurst_Waters/npcs/Five_of_Hearts.lua | 9 -- scripts/zones/Windurst_Waters/npcs/Fomina.lua | 9 -- .../Windurst_Waters/npcs/Four_of_Hearts.lua | 21 ---- .../zones/Windurst_Waters/npcs/Fuepepe.lua | 6 - .../Windurst_Waters/npcs/Funpo-Shipo.lua | 6 - .../Windurst_Waters/npcs/Furakku-Norakku.lua | 6 - .../Windurst_Waters/npcs/Furan-Furin.lua | 9 -- .../Windurst_Waters/npcs/Gevirun-Gabirun.lua | 21 ---- .../zones/Windurst_Waters/npcs/Gordias.lua | 21 ---- scripts/zones/Windurst_Waters/npcs/Hakeem.lua | 6 - .../Windurst_Waters/npcs/Hilkomu-Makimu.lua | 9 -- scripts/zones/Windurst_Waters/npcs/Hobibi.lua | 21 ---- .../Windurst_Waters/npcs/Honoi-Gomoi.lua | 6 - scripts/zones/Windurst_Waters/npcs/Hororo.lua | 13 -- .../Windurst_Waters/npcs/Jack_of_Hearts.lua | 6 - .../zones/Windurst_Waters/npcs/Jacodaut.lua | 6 - .../Windurst_Waters/npcs/Janta-Jonta.lua | 13 -- .../Windurst_Waters/npcs/Jatan-Paratan.lua | 3 - .../zones/Windurst_Waters/npcs/Jourille.lua | 9 -- scripts/zones/Windurst_Waters/npcs/Karuru.lua | 21 ---- .../Windurst_Waters/npcs/Kayeel-Payeel.lua | 21 ---- .../Windurst_Waters/npcs/Kenapa-Keppa.lua | 6 - .../zones/Windurst_Waters/npcs/Kerutoto.lua | 6 - .../Windurst_Waters/npcs/Khoto_Rokkorah.lua | 21 ---- .../Windurst_Waters/npcs/Khuta_Colaara.lua | 21 ---- .../zones/Windurst_Waters/npcs/Kipo-Opo.lua | 6 - .../Windurst_Waters/npcs/Kobite-Mojite.lua | 21 ---- .../Windurst_Waters/npcs/Kogri-Nargri.lua | 21 ---- .../zones/Windurst_Waters/npcs/Koowawa.lua | 21 ---- scripts/zones/Windurst_Waters/npcs/Kopopo.lua | 9 -- .../Windurst_Waters/npcs/Kotan-Moritan.lua | 21 ---- .../zones/Windurst_Waters/npcs/Kuesoso.lua | 21 ---- .../Windurst_Waters/npcs/Kyume-Romeh.lua | 6 - .../Windurst_Waters/npcs/Lago-Charago.lua | 6 - .../Windurst_Waters/npcs/Leepe-Hoppe.lua | 3 - scripts/zones/Windurst_Waters/npcs/Lumomo.lua | 6 - .../zones/Windurst_Waters/npcs/Machitata.lua | 6 - scripts/zones/Windurst_Waters/npcs/Majiji.lua | 21 ---- .../Windurst_Waters/npcs/Maqu_Molpih.lua | 6 - .../zones/Windurst_Waters/npcs/Mashishi.lua | 21 ---- .../Windurst_Waters/npcs/Mashuu-Ajuu.lua | 3 - .../zones/Windurst_Waters/npcs/Maysoon.lua | 3 - .../Windurst_Waters/npcs/Mejina-Monjina.lua | 21 ---- scripts/zones/Windurst_Waters/npcs/Miriri.lua | 21 ---- .../Windurst_Waters/npcs/Moari-Kaaori.lua | 3 - .../zones/Windurst_Waters/npcs/Moitoto.lua | 21 ---- .../zones/Windurst_Waters/npcs/Mokyokyo.lua | 6 - .../Windurst_Waters/npcs/Moreno-Toeno.lua | 9 -- .../zones/Windurst_Waters/npcs/Myumimi.lua | 21 ---- .../Windurst_Waters/npcs/Naiko-Paneiko.lua | 6 - .../zones/Windurst_Waters/npcs/Nasoh_Joli.lua | 21 ---- .../Windurst_Waters/npcs/Ness_Rugetomal.lua | 6 - .../Windurst_Waters/npcs/Nine_of_Hearts.lua | 21 ---- scripts/zones/Windurst_Waters/npcs/Npopo.lua | 6 - .../Windurst_Waters/npcs/Ohbiru-Dohbiru.lua | 6 - scripts/zones/Windurst_Waters/npcs/Okaka.lua | 21 ---- .../Windurst_Waters/npcs/Olaky-Yayulaky.lua | 23 ---- .../zones/Windurst_Waters/npcs/Orez-Ebrez.lua | 9 -- scripts/zones/Windurst_Waters/npcs/Otete.lua | 9 -- .../Windurst_Waters/npcs/Pakesse-Myukesse.lua | 21 ---- .../zones/Windurst_Waters/npcs/Panaa_Fom.lua | 21 ---- .../Windurst_Waters/npcs/Panna-Donna.lua | 23 ---- .../Windurst_Waters/npcs/Pechiru-Mashiru.lua | 6 - scripts/zones/Windurst_Waters/npcs/Pia.lua | 13 -- .../Windurst_Waters/npcs/Piketo-Puketo.lua | 3 - .../Windurst_Waters/npcs/Pojimo-Rojimo.lua | 21 ---- .../Windurst_Waters/npcs/Porupen-Kyurupen.lua | 21 ---- .../zones/Windurst_Waters/npcs/Prestapiq.lua | 9 -- .../zones/Windurst_Waters/npcs/Pulykiki.lua | 21 ---- .../zones/Windurst_Waters/npcs/Pursuivant.lua | 23 ---- .../zones/Windurst_Waters/npcs/Queo-Paeo.lua | 21 ---- .../Windurst_Waters/npcs/Rabiri-Tabiri.lua | 13 -- .../zones/Windurst_Waters/npcs/Ramasese.lua | 13 -- .../Windurst_Waters/npcs/Ranpi-Monpi.lua | 3 - .../zones/Windurst_Waters/npcs/Reh_Hapli.lua | 21 ---- .../zones/Windurst_Waters/npcs/Ropunono.lua | 21 ---- .../Windurst_Waters/npcs/Seven_of_Hearts.lua | 21 ---- .../zones/Windurst_Waters/npcs/Shanana.lua | 21 ---- .../Windurst_Waters/npcs/Shante-Fante.lua | 21 ---- .../Windurst_Waters/npcs/Shataru-Potaru.lua | 13 -- .../zones/Windurst_Waters/npcs/Shatoto.lua | 21 ---- .../Windurst_Waters/npcs/Shohrun-Tuhrun.lua | 9 -- .../Windurst_Waters/npcs/Six_of_Hearts.lua | 21 ---- .../npcs/Symphonic_Curator.lua | 3 - .../zones/Windurst_Waters/npcs/Taajiji.lua | 9 -- .../zones/Windurst_Waters/npcs/Temoe-Amoe.lua | 21 ---- .../Windurst_Waters/npcs/Ten_of_Hearts.lua | 22 ---- scripts/zones/Windurst_Waters/npcs/Tonana.lua | 6 - .../zones/Windurst_Waters/npcs/Torikoko.lua | 21 ---- .../Windurst_Waters/npcs/Tosuka-Porika.lua | 6 - .../Windurst_Waters/npcs/Tsuran-Botaran.lua | 21 ---- .../Windurst_Waters/npcs/Upih_Khachla.lua | 6 - .../zones/Windurst_Waters/npcs/Yohra-Ora.lua | 13 -- .../zones/Windurst_Waters/npcs/Yomotsutsu.lua | 21 ---- .../zones/Windurst_Waters/npcs/Yuli_Yaam.lua | 9 -- .../zones/Windurst_Waters/npcs/Yung_Yaam.lua | 9 -- .../Windurst_Waters/npcs/Zabirego-Hajigo.lua | 9 -- scripts/zones/Windurst_Waters/npcs/Zelala.lua | 23 ---- 128 files changed, 92 insertions(+), 1761 deletions(-) delete mode 100644 scripts/zones/Windurst_Waters/npcs/Ajen-Myoojen.lua delete mode 100644 scripts/zones/Windurst_Waters/npcs/Akee_Yonji.lua delete mode 100644 scripts/zones/Windurst_Waters/npcs/Anja-Enja.lua delete mode 100644 scripts/zones/Windurst_Waters/npcs/Aora-Uora.lua delete mode 100644 scripts/zones/Windurst_Waters/npcs/Arukoko.lua delete mode 100644 scripts/zones/Windurst_Waters/npcs/Buchi_Kohmrijah.lua delete mode 100644 scripts/zones/Windurst_Waters/npcs/Bulolo.lua delete mode 100644 scripts/zones/Windurst_Waters/npcs/Chyuk-Kochak.lua delete mode 100644 scripts/zones/Windurst_Waters/npcs/Dabido-Sorobido.lua delete mode 100644 scripts/zones/Windurst_Waters/npcs/Dagoza-Beruza.lua delete mode 100644 scripts/zones/Windurst_Waters/npcs/Damami-Karumi.lua delete mode 100644 scripts/zones/Windurst_Waters/npcs/Dienger.lua delete mode 100644 scripts/zones/Windurst_Waters/npcs/Diroku-Oroku.lua delete mode 100644 scripts/zones/Windurst_Waters/npcs/Eight_of_Hearts.lua delete mode 100644 scripts/zones/Windurst_Waters/npcs/Enrefort.lua delete mode 100644 scripts/zones/Windurst_Waters/npcs/Four_of_Hearts.lua delete mode 100644 scripts/zones/Windurst_Waters/npcs/Gevirun-Gabirun.lua delete mode 100644 scripts/zones/Windurst_Waters/npcs/Gordias.lua delete mode 100644 scripts/zones/Windurst_Waters/npcs/Hobibi.lua delete mode 100644 scripts/zones/Windurst_Waters/npcs/Karuru.lua delete mode 100644 scripts/zones/Windurst_Waters/npcs/Kayeel-Payeel.lua delete mode 100644 scripts/zones/Windurst_Waters/npcs/Khoto_Rokkorah.lua delete mode 100644 scripts/zones/Windurst_Waters/npcs/Khuta_Colaara.lua delete mode 100644 scripts/zones/Windurst_Waters/npcs/Kobite-Mojite.lua delete mode 100644 scripts/zones/Windurst_Waters/npcs/Kogri-Nargri.lua delete mode 100644 scripts/zones/Windurst_Waters/npcs/Koowawa.lua delete mode 100644 scripts/zones/Windurst_Waters/npcs/Kotan-Moritan.lua delete mode 100644 scripts/zones/Windurst_Waters/npcs/Kuesoso.lua delete mode 100644 scripts/zones/Windurst_Waters/npcs/Majiji.lua delete mode 100644 scripts/zones/Windurst_Waters/npcs/Mashishi.lua delete mode 100644 scripts/zones/Windurst_Waters/npcs/Mejina-Monjina.lua delete mode 100644 scripts/zones/Windurst_Waters/npcs/Miriri.lua delete mode 100644 scripts/zones/Windurst_Waters/npcs/Moitoto.lua delete mode 100644 scripts/zones/Windurst_Waters/npcs/Myumimi.lua delete mode 100644 scripts/zones/Windurst_Waters/npcs/Nasoh_Joli.lua delete mode 100644 scripts/zones/Windurst_Waters/npcs/Nine_of_Hearts.lua delete mode 100644 scripts/zones/Windurst_Waters/npcs/Okaka.lua delete mode 100644 scripts/zones/Windurst_Waters/npcs/Olaky-Yayulaky.lua delete mode 100644 scripts/zones/Windurst_Waters/npcs/Pakesse-Myukesse.lua delete mode 100644 scripts/zones/Windurst_Waters/npcs/Panaa_Fom.lua delete mode 100644 scripts/zones/Windurst_Waters/npcs/Panna-Donna.lua delete mode 100644 scripts/zones/Windurst_Waters/npcs/Pojimo-Rojimo.lua delete mode 100644 scripts/zones/Windurst_Waters/npcs/Porupen-Kyurupen.lua delete mode 100644 scripts/zones/Windurst_Waters/npcs/Pulykiki.lua delete mode 100644 scripts/zones/Windurst_Waters/npcs/Pursuivant.lua delete mode 100644 scripts/zones/Windurst_Waters/npcs/Queo-Paeo.lua delete mode 100644 scripts/zones/Windurst_Waters/npcs/Reh_Hapli.lua delete mode 100644 scripts/zones/Windurst_Waters/npcs/Ropunono.lua delete mode 100644 scripts/zones/Windurst_Waters/npcs/Seven_of_Hearts.lua delete mode 100644 scripts/zones/Windurst_Waters/npcs/Shanana.lua delete mode 100644 scripts/zones/Windurst_Waters/npcs/Shante-Fante.lua delete mode 100644 scripts/zones/Windurst_Waters/npcs/Shatoto.lua delete mode 100644 scripts/zones/Windurst_Waters/npcs/Six_of_Hearts.lua delete mode 100644 scripts/zones/Windurst_Waters/npcs/Temoe-Amoe.lua delete mode 100644 scripts/zones/Windurst_Waters/npcs/Ten_of_Hearts.lua delete mode 100644 scripts/zones/Windurst_Waters/npcs/Torikoko.lua delete mode 100644 scripts/zones/Windurst_Waters/npcs/Tsuran-Botaran.lua delete mode 100644 scripts/zones/Windurst_Waters/npcs/Yomotsutsu.lua delete mode 100644 scripts/zones/Windurst_Waters/npcs/Zelala.lua diff --git a/scripts/zones/Windurst_Waters/DefaultActions.lua b/scripts/zones/Windurst_Waters/DefaultActions.lua index 5698f9d81f9..d37ea875fef 100644 --- a/scripts/zones/Windurst_Waters/DefaultActions.lua +++ b/scripts/zones/Windurst_Waters/DefaultActions.lua @@ -1,29 +1,96 @@ -- local ID = zones[xi.zone.WINDURST_WATERS] return { - ['Akkeke'] = { event = 427 }, - ['Chomoro-Kyotoro'] = { event = 432 }, - ['Cochal-Monchal'] = { event = 696 }, - ['Foi-Mui'] = { event = 430 }, - ['Fuepepe'] = { event = 423 }, - ['Furakku-Norakku'] = { event = 371 }, - ['Gantineux'] = { event = 10018 }, - ['Hariga-Origa'] = { event = 372 }, - ['Kerutoto'] = { event = 306 }, - ['Kirarara'] = { event = 425 }, - ['Koko_Lihzeh'] = { event = 428 }, - ['Leepe-Hoppe'] = { event = 345 }, - ['Library_book1'] = { event = 367 }, - ['Library_book2'] = { event = 368 }, - ['Mashuu-Ajuu'] = { event = 429 }, - ['Mimomo'] = { event = 436 }, - ['Ohbiru-Dohbiru'] = { event = 344 }, - ['Orn'] = { event = 652 }, - ['Paku-Nakku'] = { event = 431 }, - ['Pechiru-Mashiru'] = { event = 421 }, - ['Rukuku'] = { event = 426 }, - ['Sahgi_Konchumih'] = { event = 596 }, - ['Serukoko'] = { event = 373 }, - ['Sohdede'] = { event = 374 }, - ['Tauwawa'] = { event = 424 }, + ['Ajen-Myoojen'] = { event = 270 }, + ['Akee_Yonji'] = { event = 594 }, + ['Akkeke'] = { event = 427 }, + ['Anja-Enja'] = { event = 278 }, + ['Aora-Uora'] = { event = 378 }, + ['Arukoko'] = { event = 509 }, + ['Buchi_Kohmrijah'] = { event = 591 }, + ['Bulolo'] = { event = 566 }, + ['Caliburn'] = { event = 599 }, + ['Chomoro-Kyotoro'] = { event = 432 }, + ['Chyuk-Kochak'] = { event = 664 }, + ['Cochal-Monchal'] = { event = 696 }, + ['Dabido-Sorobido'] = { event = 904 }, + ['Dagoza-Beruza'] = { event = 104 }, + ['Damami-Karumi'] = { event = 575 }, + ['Dienger'] = { event = 815 }, + ['Diroku-Oroku'] = { event = 420 }, + ['Eight_of_Hearts'] = { event = 276 }, + ['Enrefort'] = { event = 601 }, + ['Foi-Mui'] = { event = 430 }, + ['Four_of_Hearts'] = { event = 272 }, + ['Fuepepe'] = { event = 423 }, + ['Furakku-Norakku'] = { event = 371 }, + ['Gantineux'] = { event = 10018 }, + ['Gevirun-Gabirun'] = { event = 510 }, + ['Gordias'] = { event = 600 }, + ['Hariga-Origa'] = { event = 372 }, + ['Hobibi'] = { event = 646 }, + ['Hororo'] = { event = 570 }, + ['Janta-Jonta'] = { event = 567 }, + ['Karuru'] = { event = 559 }, + ['Kayeel-Payeel'] = { event = 975 }, + ['Kerutoto'] = { event = 306 }, + ['Khoto_Rokkorah'] = { event = 988 }, + ['Khuta_Colaara'] = { event = 587 }, + ['Kirarara'] = { event = 425 }, + ['Kobite-Mojite'] = { event = 563 }, + ['Kogri-Nargri'] = { event = 905 }, + ['Koko_Lihzeh'] = { event = 428 }, + ['Koowawa'] = { event = 569 }, + ['Kotan-Moritan'] = { event = 377 }, + ['Kuesoso'] = { event = 586 }, + ['Leepe-Hoppe'] = { event = 345 }, + ['Library_book1'] = { event = 367 }, + ['Library_book2'] = { event = 368 }, + ['Majiji'] = { event = 435 }, + ['Mashishi'] = { event = 513 }, + ['Mashuu-Ajuu'] = { event = 429 }, + ['Mejina-Monjina'] = { event = 282 }, + ['Mimomo'] = { event = 436 }, + ['Miriri'] = { event = 573 }, + ['Moitoto'] = { event = 564 }, + ['Myumimi'] = { event = 580 }, + ['Nasoh_Joli'] = { event = 593 }, + ['Nine_of_Hearts'] = { event = 277 }, + ['Ohbiru-Dohbiru'] = { event = 344 }, + ['Okaka'] = { event = 574 }, + ['Olaky-Yayulaky'] = { event = 910 }, + ['Orn'] = { event = 652 }, + ['Pakesse-Myukesse'] = { event = 434 }, + ['Paku-Nakku'] = { event = 431 }, + ['Panaa_Fom'] = { event = 588 }, + ['Panna-Donna'] = { event = 105 }, + ['Pechiru-Mashiru'] = { event = 421 }, + ['Pia'] = { event = 597 }, + ['Pojimo-Rojimo'] = { event = 560 }, + ['Porupen-Kyurupen'] = { event = 572 }, + ['Pulykiki'] = { event = 511 }, + ['Pursuivant'] = { event = 870 }, + ['Queo-Paeo'] = { event = 583 }, + ['Rabiri-Tabiri'] = { event = 568 }, + ['Ramasese'] = { event = 584 }, + ['Reh_Hapli'] = { event = 590 }, + ['Ropunono'] = { event = 283 }, + ['Rukuku'] = { event = 426 }, + ['Sahgi_Konchumih'] = { event = 596 }, + ['Serukoko'] = { event = 373 }, + ['Seven_of_Hearts'] = { event = 275 }, + ['Shanana'] = { event = 577 }, + ['Shante-Fante'] = { event = 561 }, + ['Shataru-Potaru'] = { event = 585 }, + ['Shatoto'] = { event = 271 }, + ['Six_of_Hearts'] = { event = 274 }, + ['Sohdede'] = { event = 374 }, + ['Tauwawa'] = { event = 424 }, + ['Temoe-Amoe'] = { event = 508 }, + ['Ten_of_Hearts'] = { event = 107 }, + ['Torikoko'] = { event = 582 }, + ['Tsuran-Botaran'] = { event = 578 }, + ['Yohra-Ora'] = { event = 565 }, + ['Yomotsutsu'] = { event = 579 }, + ['Zelala'] = { event = 960 }, } diff --git a/scripts/zones/Windurst_Waters/npcs/AMAN_Liaison.lua b/scripts/zones/Windurst_Waters/npcs/AMAN_Liaison.lua index d727b03ed92..b0d29e47ef0 100644 --- a/scripts/zones/Windurst_Waters/npcs/AMAN_Liaison.lua +++ b/scripts/zones/Windurst_Waters/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/Windurst_Waters/npcs/Ahyeekih.lua b/scripts/zones/Windurst_Waters/npcs/Ahyeekih.lua index 380464a26b8..3ef59d3cf29 100644 --- a/scripts/zones/Windurst_Waters/npcs/Ahyeekih.lua +++ b/scripts/zones/Windurst_Waters/npcs/Ahyeekih.lua @@ -33,10 +33,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/Windurst_Waters/npcs/Ajen-Myoojen.lua b/scripts/zones/Windurst_Waters/npcs/Ajen-Myoojen.lua deleted file mode 100644 index aec757fbdcc..00000000000 --- a/scripts/zones/Windurst_Waters/npcs/Ajen-Myoojen.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Windurst Waters --- NPC: Ajen-Myoojen --- !pos -44.542 -5.999 238.996 238 ------------------------------------ ----@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/Windurst_Waters/npcs/Akee_Yonji.lua b/scripts/zones/Windurst_Waters/npcs/Akee_Yonji.lua deleted file mode 100644 index 8c5bf2a3663..00000000000 --- a/scripts/zones/Windurst_Waters/npcs/Akee_Yonji.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Waters --- NPC: Akee Yonji ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(594) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters/npcs/Amagusa-Chigurusa.lua b/scripts/zones/Windurst_Waters/npcs/Amagusa-Chigurusa.lua index 811fd4a3b20..b53b6456820 100644 --- a/scripts/zones/Windurst_Waters/npcs/Amagusa-Chigurusa.lua +++ b/scripts/zones/Windurst_Waters/npcs/Amagusa-Chigurusa.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local wildcatWindurst = player:getCharVar('WildcatWindurst') @@ -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 == 937 then player:setCharVar('WildcatWindurst', utils.mask.setBit(player:getCharVar('WildcatWindurst'), 12, true)) diff --git a/scripts/zones/Windurst_Waters/npcs/Anja-Enja.lua b/scripts/zones/Windurst_Waters/npcs/Anja-Enja.lua deleted file mode 100644 index df0b1b4df4f..00000000000 --- a/scripts/zones/Windurst_Waters/npcs/Anja-Enja.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Windurst Waters --- NPC: Anja-Enja --- Adventurer's Assistant ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(278) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters/npcs/Aora-Uora.lua b/scripts/zones/Windurst_Waters/npcs/Aora-Uora.lua deleted file mode 100644 index d38543a0fa6..00000000000 --- a/scripts/zones/Windurst_Waters/npcs/Aora-Uora.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Waters --- NPC: Aora-Uora ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(378) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters/npcs/Aramu-Paramu.lua b/scripts/zones/Windurst_Waters/npcs/Aramu-Paramu.lua index 2cd501f1fd0..8f32c74965c 100644 --- a/scripts/zones/Windurst_Waters/npcs/Aramu-Paramu.lua +++ b/scripts/zones/Windurst_Waters/npcs/Aramu-Paramu.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local wonderingstatus = player:getQuestStatus(xi.questLog.WINDURST, xi.quest.id.windurst.WONDERING_MINSTREL) @@ -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/Windurst_Waters/npcs/Arukoko.lua b/scripts/zones/Windurst_Waters/npcs/Arukoko.lua deleted file mode 100644 index 955f69a74af..00000000000 --- a/scripts/zones/Windurst_Waters/npcs/Arukoko.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Waters --- NPC: Arukoko ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(509) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters/npcs/Baehu-Faehu.lua b/scripts/zones/Windurst_Waters/npcs/Baehu-Faehu.lua index f53ce97b33c..50f717418a7 100644 --- a/scripts/zones/Windurst_Waters/npcs/Baehu-Faehu.lua +++ b/scripts/zones/Windurst_Waters/npcs/Baehu-Faehu.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.WINDURST_WATERS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local regionOwner = GetRegionOwner(xi.region.SARUTABARUTA) if regionOwner ~= xi.nation.WINDURST then @@ -32,10 +29,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Windurst_Waters/npcs/Baren-Moren.lua b/scripts/zones/Windurst_Waters/npcs/Baren-Moren.lua index dff101b5e64..0318d8edd26 100644 --- a/scripts/zones/Windurst_Waters/npcs/Baren-Moren.lua +++ b/scripts/zones/Windurst_Waters/npcs/Baren-Moren.lua @@ -83,9 +83,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) local aFeatherInOnesCap = player:getQuestStatus(xi.questLog.WINDURST, xi.quest.id.windurst.A_FEATHER_IN_ONE_S_CAP) diff --git a/scripts/zones/Windurst_Waters/npcs/Bondada.lua b/scripts/zones/Windurst_Waters/npcs/Bondada.lua index 2889c2af47e..9df14e3b377 100644 --- a/scripts/zones/Windurst_Waters/npcs/Bondada.lua +++ b/scripts/zones/Windurst_Waters/npcs/Bondada.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.WINDURST_WATERS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local hatMask = player:getCharVar('QuestHatInHand_var') @@ -31,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 == 61 then player:setCharVar('QuestHatInHand_var', utils.mask.setBit(player:getCharVar('QuestHatInHand_var'), 7, true)) diff --git a/scripts/zones/Windurst_Waters/npcs/Buchi_Kohmrijah.lua b/scripts/zones/Windurst_Waters/npcs/Buchi_Kohmrijah.lua deleted file mode 100644 index 21b0db3a48c..00000000000 --- a/scripts/zones/Windurst_Waters/npcs/Buchi_Kohmrijah.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Waters --- NPC: Buchi Kohmrijah ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(591) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters/npcs/Bulolo.lua b/scripts/zones/Windurst_Waters/npcs/Bulolo.lua deleted file mode 100644 index 76b183c7eb7..00000000000 --- a/scripts/zones/Windurst_Waters/npcs/Bulolo.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Waters --- NPC: Bulolo ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(566) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters/npcs/Caliburn.lua b/scripts/zones/Windurst_Waters/npcs/Caliburn.lua index 52fc4c1249b..72d43e1db55 100644 --- a/scripts/zones/Windurst_Waters/npcs/Caliburn.lua +++ b/scripts/zones/Windurst_Waters/npcs/Caliburn.lua @@ -17,17 +17,4 @@ entity.onSpawn = function(npc) npc:pathThrough(pathNodes, xi.path.flag.PATROL) end -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(599) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Windurst_Waters/npcs/Chamama.lua b/scripts/zones/Windurst_Waters/npcs/Chamama.lua index cf588d245cf..42bdb8f3066 100644 --- a/scripts/zones/Windurst_Waters/npcs/Chamama.lua +++ b/scripts/zones/Windurst_Waters/npcs/Chamama.lua @@ -69,9 +69,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 -- IN A PICKLE + RARAB TAIL: Quest Begin player:addQuest(xi.questLog.WINDURST, xi.quest.id.windurst.IN_A_PICKLE) diff --git a/scripts/zones/Windurst_Waters/npcs/Chomo_Jinjahl.lua b/scripts/zones/Windurst_Waters/npcs/Chomo_Jinjahl.lua index 3421b1fd631..6b9f4386ccd 100644 --- a/scripts/zones/Windurst_Waters/npcs/Chomo_Jinjahl.lua +++ b/scripts/zones/Windurst_Waters/npcs/Chomo_Jinjahl.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.WINDURST_WATERS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local guildSkillId = xi.skill.COOKING local stock = xi.shop.generalGuildStock[guildSkillId] @@ -19,10 +16,4 @@ entity.onTrigger = function(player, npc) player:showText(npc, ID.text.CHOMOJINJAHL_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/Windurst_Waters/npcs/Churano-Shurano.lua b/scripts/zones/Windurst_Waters/npcs/Churano-Shurano.lua index 4210fe788d1..73e16373942 100644 --- a/scripts/zones/Windurst_Waters/npcs/Churano-Shurano.lua +++ b/scripts/zones/Windurst_Waters/npcs/Churano-Shurano.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if not player:hasKeyItem(xi.ki.MAGICKED_ASTROLABE) then local cost = 10000 diff --git a/scripts/zones/Windurst_Waters/npcs/Chyuk-Kochak.lua b/scripts/zones/Windurst_Waters/npcs/Chyuk-Kochak.lua deleted file mode 100644 index 67513ab17ed..00000000000 --- a/scripts/zones/Windurst_Waters/npcs/Chyuk-Kochak.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Windurst Waters --- NPC: Chyuk-Kochak --- !pos -252.162 -6.319 -307.011 238 ------------------------------------ ----@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/Windurst_Waters/npcs/Clais.lua b/scripts/zones/Windurst_Waters/npcs/Clais.lua index 0ac004ed763..bebbe37aac2 100644 --- a/scripts/zones/Windurst_Waters/npcs/Clais.lua +++ b/scripts/zones/Windurst_Waters/npcs/Clais.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.WINDURST_WATERS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:hasKeyItem(xi.ki.NEW_MODEL_HAT) and @@ -24,9 +21,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 57 then player:setCharVar('QuestHatInHand_var', utils.mask.setBit(player:getCharVar('QuestHatInHand_var'), 3, true)) diff --git a/scripts/zones/Windurst_Waters/npcs/Dabido-Sorobido.lua b/scripts/zones/Windurst_Waters/npcs/Dabido-Sorobido.lua deleted file mode 100644 index 6185d68b494..00000000000 --- a/scripts/zones/Windurst_Waters/npcs/Dabido-Sorobido.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Windurst Waters --- NPC: Dabido-Sorobido --- !pos -93.586 -4.499 19.321 238 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(904) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters/npcs/Dagoza-Beruza.lua b/scripts/zones/Windurst_Waters/npcs/Dagoza-Beruza.lua deleted file mode 100644 index 7b53d0ec99d..00000000000 --- a/scripts/zones/Windurst_Waters/npcs/Dagoza-Beruza.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Windurst Waters --- NPC: Dagoza-Beruza --- Type: Mission NPC --- !pos -54.523 -6 229.271 238 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(104) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters/npcs/Damami-Karumi.lua b/scripts/zones/Windurst_Waters/npcs/Damami-Karumi.lua deleted file mode 100644 index 2f3b3d9c400..00000000000 --- a/scripts/zones/Windurst_Waters/npcs/Damami-Karumi.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Windurst Waters --- NPC: Damami-Karumi --- !pos -5.362 -2 18.059 238 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(575) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters/npcs/Dienger.lua b/scripts/zones/Windurst_Waters/npcs/Dienger.lua deleted file mode 100644 index 5af65559c10..00000000000 --- a/scripts/zones/Windurst_Waters/npcs/Dienger.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Windurst Waters --- NPC: Dienger --- Type: Melody Minstrel --- !pos -46.448 -6.312 212.384 238 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(815) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters/npcs/Diroku-Oroku.lua b/scripts/zones/Windurst_Waters/npcs/Diroku-Oroku.lua deleted file mode 100644 index 84dc92d0b16..00000000000 --- a/scripts/zones/Windurst_Waters/npcs/Diroku-Oroku.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Waters --- NPC: Diroku-Oroku ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(420) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters/npcs/Door_House.lua b/scripts/zones/Windurst_Waters/npcs/Door_House.lua index 3b83053ee81..20eb50d742b 100644 --- a/scripts/zones/Windurst_Waters/npcs/Door_House.lua +++ b/scripts/zones/Windurst_Waters/npcs/Door_House.lua @@ -55,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 == 941 then player:setCharVar('LeleroonsLetterGreen', 2) diff --git a/scripts/zones/Windurst_Waters/npcs/Eight_of_Hearts.lua b/scripts/zones/Windurst_Waters/npcs/Eight_of_Hearts.lua deleted file mode 100644 index 42766481ca4..00000000000 --- a/scripts/zones/Windurst_Waters/npcs/Eight_of_Hearts.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Waters --- NPC: Eight of Hearts ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(276) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters/npcs/Enrefort.lua b/scripts/zones/Windurst_Waters/npcs/Enrefort.lua deleted file mode 100644 index ab7ac4a96db..00000000000 --- a/scripts/zones/Windurst_Waters/npcs/Enrefort.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Waters --- NPC: Enrefort ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(601) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters/npcs/Ensasa.lua b/scripts/zones/Windurst_Waters/npcs/Ensasa.lua index 685498822d5..a2c43ed1619 100644 --- a/scripts/zones/Windurst_Waters/npcs/Ensasa.lua +++ b/scripts/zones/Windurst_Waters/npcs/Ensasa.lua @@ -35,10 +35,4 @@ entity.onTrigger = function(player, npc) xi.shop.nation(player, stock, xi.nation.WINDURST) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Windurst_Waters/npcs/Five_of_Hearts.lua b/scripts/zones/Windurst_Waters/npcs/Five_of_Hearts.lua index c04ac8220d9..6247c0603e6 100644 --- a/scripts/zones/Windurst_Waters/npcs/Five_of_Hearts.lua +++ b/scripts/zones/Windurst_Waters/npcs/Five_of_Hearts.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getQuestStatus(xi.questLog.WINDURST, xi.quest.id.windurst.A_GREETING_CARDIAN) == xi.questStatus.QUEST_ACCEPTED then player:startEvent(686) @@ -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/Windurst_Waters/npcs/Fomina.lua b/scripts/zones/Windurst_Waters/npcs/Fomina.lua index 19e087b9cfe..32489ff2150 100644 --- a/scripts/zones/Windurst_Waters/npcs/Fomina.lua +++ b/scripts/zones/Windurst_Waters/npcs/Fomina.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.WINDURST_WATERS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local regionOwner = GetRegionOwner(xi.region.ELSHIMOLOWLANDS) @@ -34,10 +31,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Windurst_Waters/npcs/Four_of_Hearts.lua b/scripts/zones/Windurst_Waters/npcs/Four_of_Hearts.lua deleted file mode 100644 index 632d27d3b6a..00000000000 --- a/scripts/zones/Windurst_Waters/npcs/Four_of_Hearts.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Waters --- NPC: Four of Hearts ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(272) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters/npcs/Fuepepe.lua b/scripts/zones/Windurst_Waters/npcs/Fuepepe.lua index 430026c3b03..0075092e5c6 100644 --- a/scripts/zones/Windurst_Waters/npcs/Fuepepe.lua +++ b/scripts/zones/Windurst_Waters/npcs/Fuepepe.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local classReunion = player:getQuestStatus(xi.questLog.WINDURST, xi.quest.id.windurst.CLASS_REUNION) @@ -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 == 817 then player:setCharVar('ClassReunion_TalkedToFupepe', 1) diff --git a/scripts/zones/Windurst_Waters/npcs/Funpo-Shipo.lua b/scripts/zones/Windurst_Waters/npcs/Funpo-Shipo.lua index 28d4fb0c334..644bf25212f 100644 --- a/scripts/zones/Windurst_Waters/npcs/Funpo-Shipo.lua +++ b/scripts/zones/Windurst_Waters/npcs/Funpo-Shipo.lua @@ -18,9 +18,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 wildcatWindurst = player:getCharVar('WildcatWindurst') @@ -34,9 +31,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 938 then player:setCharVar('WildcatWindurst', utils.mask.setBit(player:getCharVar('WildcatWindurst'), 13, true)) diff --git a/scripts/zones/Windurst_Waters/npcs/Furakku-Norakku.lua b/scripts/zones/Windurst_Waters/npcs/Furakku-Norakku.lua index 5d1ccaebf4f..e8d6d542821 100644 --- a/scripts/zones/Windurst_Waters/npcs/Furakku-Norakku.lua +++ b/scripts/zones/Windurst_Waters/npcs/Furakku-Norakku.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local classReunion = player:getQuestStatus(xi.questLog.WINDURST, xi.quest.id.windurst.CLASS_REUNION) local classReunionProgress = player:getCharVar('ClassReunionProgress') @@ -21,9 +18,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 816 then player:setCharVar('ClassReunion_TalkedToFurakku', 1) diff --git a/scripts/zones/Windurst_Waters/npcs/Furan-Furin.lua b/scripts/zones/Windurst_Waters/npcs/Furan-Furin.lua index f91b76fd8fc..a9d685ee11e 100644 --- a/scripts/zones/Windurst_Waters/npcs/Furan-Furin.lua +++ b/scripts/zones/Windurst_Waters/npcs/Furan-Furin.lua @@ -6,17 +6,8 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(10002, 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/Windurst_Waters/npcs/Gevirun-Gabirun.lua b/scripts/zones/Windurst_Waters/npcs/Gevirun-Gabirun.lua deleted file mode 100644 index a8340081eef..00000000000 --- a/scripts/zones/Windurst_Waters/npcs/Gevirun-Gabirun.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Waters --- NPC: Gevirun-Gabirun ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(510) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters/npcs/Gordias.lua b/scripts/zones/Windurst_Waters/npcs/Gordias.lua deleted file mode 100644 index 3459f1affbd..00000000000 --- a/scripts/zones/Windurst_Waters/npcs/Gordias.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Waters --- NPC: Gordias ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(600) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters/npcs/Hakeem.lua b/scripts/zones/Windurst_Waters/npcs/Hakeem.lua index 9ab82beb8f3..99c79fec36b 100644 --- a/scripts/zones/Windurst_Waters/npcs/Hakeem.lua +++ b/scripts/zones/Windurst_Waters/npcs/Hakeem.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/Windurst_Waters/npcs/Hilkomu-Makimu.lua b/scripts/zones/Windurst_Waters/npcs/Hilkomu-Makimu.lua index e9ab207fb20..154f610a7ee 100644 --- a/scripts/zones/Windurst_Waters/npcs/Hilkomu-Makimu.lua +++ b/scripts/zones/Windurst_Waters/npcs/Hilkomu-Makimu.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.WINDURST_WATERS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:showText(npc, ID.text.HIKOMUMAKIMU_SHOP_DIALOG) @@ -37,10 +34,4 @@ entity.onTrigger = function(player, npc) xi.shop.nation(player, stock, xi.nation.WINDURST) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Windurst_Waters/npcs/Hobibi.lua b/scripts/zones/Windurst_Waters/npcs/Hobibi.lua deleted file mode 100644 index ad97fd7b295..00000000000 --- a/scripts/zones/Windurst_Waters/npcs/Hobibi.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Waters --- NPC: Hobibi ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(646) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters/npcs/Honoi-Gomoi.lua b/scripts/zones/Windurst_Waters/npcs/Honoi-Gomoi.lua index fbdf70a1fcf..09be783d373 100644 --- a/scripts/zones/Windurst_Waters/npcs/Honoi-Gomoi.lua +++ b/scripts/zones/Windurst_Waters/npcs/Honoi-Gomoi.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.WINDURST_WATERS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:hasKeyItem(xi.ki.NEW_MODEL_HAT) 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) -- 'Hat in Hand' if csid == 59 then diff --git a/scripts/zones/Windurst_Waters/npcs/Hororo.lua b/scripts/zones/Windurst_Waters/npcs/Hororo.lua index 4341054e2ab..b8b0c68bf0b 100644 --- a/scripts/zones/Windurst_Waters/npcs/Hororo.lua +++ b/scripts/zones/Windurst_Waters/npcs/Hororo.lua @@ -52,17 +52,4 @@ entity.onSpawn = function(npc) npc:pathThrough(pathNodes, bit.bor(xi.path.flag.PATROL, xi.path.flag.RUN)) end -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(570) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Windurst_Waters/npcs/Jack_of_Hearts.lua b/scripts/zones/Windurst_Waters/npcs/Jack_of_Hearts.lua index b5bf811f2c0..a2e334400b6 100644 --- a/scripts/zones/Windurst_Waters/npcs/Jack_of_Hearts.lua +++ b/scripts/zones/Windurst_Waters/npcs/Jack_of_Hearts.lua @@ -21,10 +21,4 @@ entity.onTrigger = function(player, npc) player:startEvent(10011, 0, 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/Windurst_Waters/npcs/Jacodaut.lua b/scripts/zones/Windurst_Waters/npcs/Jacodaut.lua index dc5d6803041..9be2fdcee3a 100644 --- a/scripts/zones/Windurst_Waters/npcs/Jacodaut.lua +++ b/scripts/zones/Windurst_Waters/npcs/Jacodaut.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/Windurst_Waters/npcs/Janta-Jonta.lua b/scripts/zones/Windurst_Waters/npcs/Janta-Jonta.lua index 5fe318e91ee..1b78d6b705b 100644 --- a/scripts/zones/Windurst_Waters/npcs/Janta-Jonta.lua +++ b/scripts/zones/Windurst_Waters/npcs/Janta-Jonta.lua @@ -38,17 +38,4 @@ entity.onSpawn = function(npc) npc:pathThrough(pathNodes, bit.bor(xi.path.flag.PATROL, xi.path.flag.RUN)) end -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(567) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Windurst_Waters/npcs/Jatan-Paratan.lua b/scripts/zones/Windurst_Waters/npcs/Jatan-Paratan.lua index 0f3db9c3585..b0fe7e2368e 100644 --- a/scripts/zones/Windurst_Waters/npcs/Jatan-Paratan.lua +++ b/scripts/zones/Windurst_Waters/npcs/Jatan-Paratan.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 == 634 then -- WONDERING_MINSTREL: Quest Start player:addQuest(xi.questLog.WINDURST, xi.quest.id.windurst.WONDERING_MINSTREL) diff --git a/scripts/zones/Windurst_Waters/npcs/Jourille.lua b/scripts/zones/Windurst_Waters/npcs/Jourille.lua index c85f6dce20c..6e86108bf9e 100644 --- a/scripts/zones/Windurst_Waters/npcs/Jourille.lua +++ b/scripts/zones/Windurst_Waters/npcs/Jourille.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.WINDURST_WATERS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local regionOwner = GetRegionOwner(xi.region.RONFAURE) if regionOwner ~= xi.nation.WINDURST then @@ -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/Windurst_Waters/npcs/Karuru.lua b/scripts/zones/Windurst_Waters/npcs/Karuru.lua deleted file mode 100644 index f04d8170f33..00000000000 --- a/scripts/zones/Windurst_Waters/npcs/Karuru.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Waters --- NPC: Karuru ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(559) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters/npcs/Kayeel-Payeel.lua b/scripts/zones/Windurst_Waters/npcs/Kayeel-Payeel.lua deleted file mode 100644 index f1fd038d6dd..00000000000 --- a/scripts/zones/Windurst_Waters/npcs/Kayeel-Payeel.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Waters --- NPC: Kayeel-Payeel ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(975) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters/npcs/Kenapa-Keppa.lua b/scripts/zones/Windurst_Waters/npcs/Kenapa-Keppa.lua index 0ccc5b3c697..a6f935555ad 100644 --- a/scripts/zones/Windurst_Waters/npcs/Kenapa-Keppa.lua +++ b/scripts/zones/Windurst_Waters/npcs/Kenapa-Keppa.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.WINDURST_WATERS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local sayItWithFlowers = player:getQuestStatus(xi.questLog.WINDURST, xi.quest.id.windurst.SAY_IT_WITH_FLOWERS) local flowerProgress = player:getCharVar('FLOWER_PROGRESS') -- progress of Say It with Flowers @@ -36,9 +33,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 == 56 then player:setCharVar('QuestHatInHand_var', utils.mask.setBit(player:getCharVar('QuestHatInHand_var'), 2, true)) diff --git a/scripts/zones/Windurst_Waters/npcs/Kerutoto.lua b/scripts/zones/Windurst_Waters/npcs/Kerutoto.lua index 06e88d6e22b..d5d6dcea14d 100644 --- a/scripts/zones/Windurst_Waters/npcs/Kerutoto.lua +++ b/scripts/zones/Windurst_Waters/npcs/Kerutoto.lua @@ -10,9 +10,6 @@ local ID = zones[xi.zone.WINDURST_WATERS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local wakingDreams = player:getQuestStatus(xi.questLog.WINDURST, xi.quest.id.windurst.WAKING_DREAMS) @@ -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) -- WAKING DREAMS if csid == 918 then diff --git a/scripts/zones/Windurst_Waters/npcs/Khoto_Rokkorah.lua b/scripts/zones/Windurst_Waters/npcs/Khoto_Rokkorah.lua deleted file mode 100644 index bb8d43f3439..00000000000 --- a/scripts/zones/Windurst_Waters/npcs/Khoto_Rokkorah.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Waters --- NPC: Khoto Rokkorah ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(988) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters/npcs/Khuta_Colaara.lua b/scripts/zones/Windurst_Waters/npcs/Khuta_Colaara.lua deleted file mode 100644 index 7e9e13e8695..00000000000 --- a/scripts/zones/Windurst_Waters/npcs/Khuta_Colaara.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Waters --- NPC: Khuta Colaara ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -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) -end - -return entity diff --git a/scripts/zones/Windurst_Waters/npcs/Kipo-Opo.lua b/scripts/zones/Windurst_Waters/npcs/Kipo-Opo.lua index e7b0bdb83fb..e810d71bc16 100644 --- a/scripts/zones/Windurst_Waters/npcs/Kipo-Opo.lua +++ b/scripts/zones/Windurst_Waters/npcs/Kipo-Opo.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/Windurst_Waters/npcs/Kobite-Mojite.lua b/scripts/zones/Windurst_Waters/npcs/Kobite-Mojite.lua deleted file mode 100644 index 86ebd255881..00000000000 --- a/scripts/zones/Windurst_Waters/npcs/Kobite-Mojite.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Waters --- NPC: Kobite-Mojite ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(563) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters/npcs/Kogri-Nargri.lua b/scripts/zones/Windurst_Waters/npcs/Kogri-Nargri.lua deleted file mode 100644 index afc576ddd79..00000000000 --- a/scripts/zones/Windurst_Waters/npcs/Kogri-Nargri.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Waters --- NPC: Kogri-Nargri ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(905) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters/npcs/Koowawa.lua b/scripts/zones/Windurst_Waters/npcs/Koowawa.lua deleted file mode 100644 index fd4de13e929..00000000000 --- a/scripts/zones/Windurst_Waters/npcs/Koowawa.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Waters --- NPC: Koowawa ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(569) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters/npcs/Kopopo.lua b/scripts/zones/Windurst_Waters/npcs/Kopopo.lua index 7fe6b1a7edd..d566fccc80e 100644 --- a/scripts/zones/Windurst_Waters/npcs/Kopopo.lua +++ b/scripts/zones/Windurst_Waters/npcs/Kopopo.lua @@ -9,19 +9,10 @@ local ID = zones[xi.zone.WINDURST_WATERS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:sendGuild(530, 5, 20, 7) then player:showText(npc, ID.text.KOPOPO_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/Windurst_Waters/npcs/Kotan-Moritan.lua b/scripts/zones/Windurst_Waters/npcs/Kotan-Moritan.lua deleted file mode 100644 index ac7743d9e84..00000000000 --- a/scripts/zones/Windurst_Waters/npcs/Kotan-Moritan.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Waters --- NPC: Kotan-Moritan ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(377) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters/npcs/Kuesoso.lua b/scripts/zones/Windurst_Waters/npcs/Kuesoso.lua deleted file mode 100644 index e8407e6a8b7..00000000000 --- a/scripts/zones/Windurst_Waters/npcs/Kuesoso.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Waters --- NPC: Kuesoso ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(586) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters/npcs/Kyume-Romeh.lua b/scripts/zones/Windurst_Waters/npcs/Kyume-Romeh.lua index 6ff47d04062..2c62d107983 100644 --- a/scripts/zones/Windurst_Waters/npcs/Kyume-Romeh.lua +++ b/scripts/zones/Windurst_Waters/npcs/Kyume-Romeh.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.WINDURST_WATERS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local makingHeadlines = player:getQuestStatus(xi.questLog.WINDURST, xi.quest.id.windurst.MAKING_HEADLINES) local lureOfTheWildcat = player:getQuestStatus(xi.questLog.WINDURST, xi.quest.id.windurst.LURE_OF_THE_WILDCAT) @@ -46,9 +43,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 668 then npcUtil.giveKeyItem(player, xi.ki.WINDURST_WATERS_SCOOP) diff --git a/scripts/zones/Windurst_Waters/npcs/Lago-Charago.lua b/scripts/zones/Windurst_Waters/npcs/Lago-Charago.lua index 0a81ed7782d..c13d2a30289 100644 --- a/scripts/zones/Windurst_Waters/npcs/Lago-Charago.lua +++ b/scripts/zones/Windurst_Waters/npcs/Lago-Charago.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local wildcatWindurst = player:getCharVar('WildcatWindurst') @@ -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 == 940 then player:setCharVar('WildcatWindurst', utils.mask.setBit(player:getCharVar('WildcatWindurst'), 11, true)) diff --git a/scripts/zones/Windurst_Waters/npcs/Leepe-Hoppe.lua b/scripts/zones/Windurst_Waters/npcs/Leepe-Hoppe.lua index 096ea1234a5..3a07bc3f321 100644 --- a/scripts/zones/Windurst_Waters/npcs/Leepe-Hoppe.lua +++ b/scripts/zones/Windurst_Waters/npcs/Leepe-Hoppe.lua @@ -149,9 +149,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) -- Moonlit Path and Other Fenrir Stuff if csid == 842 and option == 2 then diff --git a/scripts/zones/Windurst_Waters/npcs/Lumomo.lua b/scripts/zones/Windurst_Waters/npcs/Lumomo.lua index 61884c80842..0c2fdcad4a3 100644 --- a/scripts/zones/Windurst_Waters/npcs/Lumomo.lua +++ b/scripts/zones/Windurst_Waters/npcs/Lumomo.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local ecoStatus = player:getCharVar('EcoStatus') @@ -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 == 818 and option == 1 then if player:getQuestStatus(xi.questLog.WINDURST, xi.quest.id.windurst.ECO_WARRIOR) == xi.questStatus.QUEST_AVAILABLE then diff --git a/scripts/zones/Windurst_Waters/npcs/Machitata.lua b/scripts/zones/Windurst_Waters/npcs/Machitata.lua index 6ccd05f8eb1..109515539d7 100644 --- a/scripts/zones/Windurst_Waters/npcs/Machitata.lua +++ b/scripts/zones/Windurst_Waters/npcs/Machitata.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.WINDURST_WATERS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:hasKeyItem(xi.ki.NEW_MODEL_HAT) and @@ -24,9 +21,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 58 then player:setCharVar('QuestHatInHand_var', utils.mask.setBit(player:getCharVar('QuestHatInHand_var'), 0, true)) diff --git a/scripts/zones/Windurst_Waters/npcs/Majiji.lua b/scripts/zones/Windurst_Waters/npcs/Majiji.lua deleted file mode 100644 index 7c001c532e8..00000000000 --- a/scripts/zones/Windurst_Waters/npcs/Majiji.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Waters --- NPC: Majiji ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(435) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters/npcs/Maqu_Molpih.lua b/scripts/zones/Windurst_Waters/npcs/Maqu_Molpih.lua index be377d304fa..1c18fb30a44 100644 --- a/scripts/zones/Windurst_Waters/npcs/Maqu_Molpih.lua +++ b/scripts/zones/Windurst_Waters/npcs/Maqu_Molpih.lua @@ -33,10 +33,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/Windurst_Waters/npcs/Mashishi.lua b/scripts/zones/Windurst_Waters/npcs/Mashishi.lua deleted file mode 100644 index 200d9566da6..00000000000 --- a/scripts/zones/Windurst_Waters/npcs/Mashishi.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Waters --- NPC: Mashishi ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(513) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters/npcs/Mashuu-Ajuu.lua b/scripts/zones/Windurst_Waters/npcs/Mashuu-Ajuu.lua index 814a09e51d3..d0d69ff9a5b 100644 --- a/scripts/zones/Windurst_Waters/npcs/Mashuu-Ajuu.lua +++ b/scripts/zones/Windurst_Waters/npcs/Mashuu-Ajuu.lua @@ -60,9 +60,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if ((csid == 463 and option == 3) or (csid == 479 and option == 3)) and diff --git a/scripts/zones/Windurst_Waters/npcs/Maysoon.lua b/scripts/zones/Windurst_Waters/npcs/Maysoon.lua index 90f4437307c..afeeb591712 100644 --- a/scripts/zones/Windurst_Waters/npcs/Maysoon.lua +++ b/scripts/zones/Windurst_Waters/npcs/Maysoon.lua @@ -36,9 +36,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 10000 then player:addQuest(xi.questLog.WINDURST, xi.quest.id.windurst.HOIST_THE_JELLY_ROGER) diff --git a/scripts/zones/Windurst_Waters/npcs/Mejina-Monjina.lua b/scripts/zones/Windurst_Waters/npcs/Mejina-Monjina.lua deleted file mode 100644 index e0324ee24e3..00000000000 --- a/scripts/zones/Windurst_Waters/npcs/Mejina-Monjina.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Waters --- NPC: Mejina-Monjina ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(282) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters/npcs/Miriri.lua b/scripts/zones/Windurst_Waters/npcs/Miriri.lua deleted file mode 100644 index 26264389fc9..00000000000 --- a/scripts/zones/Windurst_Waters/npcs/Miriri.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Waters --- NPC: Miriri ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(573) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters/npcs/Moari-Kaaori.lua b/scripts/zones/Windurst_Waters/npcs/Moari-Kaaori.lua index adde6d3cdf9..9795dc97236 100644 --- a/scripts/zones/Windurst_Waters/npcs/Moari-Kaaori.lua +++ b/scripts/zones/Windurst_Waters/npcs/Moari-Kaaori.lua @@ -60,9 +60,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 514 and option == 1 then player:setCharVar('FLOWER_PROGRESS', 1) diff --git a/scripts/zones/Windurst_Waters/npcs/Moitoto.lua b/scripts/zones/Windurst_Waters/npcs/Moitoto.lua deleted file mode 100644 index 87d6b9fed84..00000000000 --- a/scripts/zones/Windurst_Waters/npcs/Moitoto.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Waters --- NPC: Moitoto ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(564) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters/npcs/Mokyokyo.lua b/scripts/zones/Windurst_Waters/npcs/Mokyokyo.lua index c7951c7a417..d30450fe2fb 100644 --- a/scripts/zones/Windurst_Waters/npcs/Mokyokyo.lua +++ b/scripts/zones/Windurst_Waters/npcs/Mokyokyo.lua @@ -25,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/Windurst_Waters/npcs/Moreno-Toeno.lua b/scripts/zones/Windurst_Waters/npcs/Moreno-Toeno.lua index f9bab890888..509fbee38ce 100644 --- a/scripts/zones/Windurst_Waters/npcs/Moreno-Toeno.lua +++ b/scripts/zones/Windurst_Waters/npcs/Moreno-Toeno.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) @@ -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/Windurst_Waters/npcs/Myumimi.lua b/scripts/zones/Windurst_Waters/npcs/Myumimi.lua deleted file mode 100644 index 08b45d924ec..00000000000 --- a/scripts/zones/Windurst_Waters/npcs/Myumimi.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Waters --- NPC: Myumimi ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(580) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters/npcs/Naiko-Paneiko.lua b/scripts/zones/Windurst_Waters/npcs/Naiko-Paneiko.lua index 52de1e311d8..be519b821a6 100644 --- a/scripts/zones/Windurst_Waters/npcs/Naiko-Paneiko.lua +++ b/scripts/zones/Windurst_Waters/npcs/Naiko-Paneiko.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local makingHeadlines = player:getQuestStatus(xi.questLog.WINDURST, xi.quest.id.windurst.MAKING_HEADLINES) @@ -39,9 +36,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 665 then player:addQuest(xi.questLog.WINDURST, xi.quest.id.windurst.MAKING_HEADLINES) diff --git a/scripts/zones/Windurst_Waters/npcs/Nasoh_Joli.lua b/scripts/zones/Windurst_Waters/npcs/Nasoh_Joli.lua deleted file mode 100644 index 3d8d3e3c76e..00000000000 --- a/scripts/zones/Windurst_Waters/npcs/Nasoh_Joli.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Waters --- NPC: Nasoh Joli ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(593) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters/npcs/Ness_Rugetomal.lua b/scripts/zones/Windurst_Waters/npcs/Ness_Rugetomal.lua index aadb4513f3e..5fca8222326 100644 --- a/scripts/zones/Windurst_Waters/npcs/Ness_Rugetomal.lua +++ b/scripts/zones/Windurst_Waters/npcs/Ness_Rugetomal.lua @@ -32,10 +32,4 @@ entity.onTrigger = function(player, npc) xi.shop.nation(player, stock, xi.nation.WINDURST) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Windurst_Waters/npcs/Nine_of_Hearts.lua b/scripts/zones/Windurst_Waters/npcs/Nine_of_Hearts.lua deleted file mode 100644 index a165f32e887..00000000000 --- a/scripts/zones/Windurst_Waters/npcs/Nine_of_Hearts.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Waters --- NPC: Nine of Hearts ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(277) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters/npcs/Npopo.lua b/scripts/zones/Windurst_Waters/npcs/Npopo.lua index 6c2a7bb75de..c8e2b8f8687 100644 --- a/scripts/zones/Windurst_Waters/npcs/Npopo.lua +++ b/scripts/zones/Windurst_Waters/npcs/Npopo.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local wildcatWindurst = player:getCharVar('WildcatWindurst') @@ -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 == 936 then player:setCharVar('WildcatWindurst', utils.mask.setBit(player:getCharVar('WildcatWindurst'), 10, true)) diff --git a/scripts/zones/Windurst_Waters/npcs/Ohbiru-Dohbiru.lua b/scripts/zones/Windurst_Waters/npcs/Ohbiru-Dohbiru.lua index 515ce3f566c..ed9d12d42ba 100644 --- a/scripts/zones/Windurst_Waters/npcs/Ohbiru-Dohbiru.lua +++ b/scripts/zones/Windurst_Waters/npcs/Ohbiru-Dohbiru.lua @@ -10,9 +10,6 @@ local ID = zones[xi.zone.WINDURST_WATERS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local needToZone = player:needToZone() local sayFlowers = player:getQuestStatus(xi.questLog.WINDURST, xi.quest.id.windurst.SAY_IT_WITH_FLOWERS) @@ -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) local flowerList = { diff --git a/scripts/zones/Windurst_Waters/npcs/Okaka.lua b/scripts/zones/Windurst_Waters/npcs/Okaka.lua deleted file mode 100644 index bc3bb043cf2..00000000000 --- a/scripts/zones/Windurst_Waters/npcs/Okaka.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Waters --- NPC: Okaka ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(574) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters/npcs/Olaky-Yayulaky.lua b/scripts/zones/Windurst_Waters/npcs/Olaky-Yayulaky.lua deleted file mode 100644 index e0c7bf7fc54..00000000000 --- a/scripts/zones/Windurst_Waters/npcs/Olaky-Yayulaky.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Windurst Waters --- NPC: Olaky-Yayulaky --- Type: Item Depository --- !pos -61.247 -4.5 72.551 238 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(910) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters/npcs/Orez-Ebrez.lua b/scripts/zones/Windurst_Waters/npcs/Orez-Ebrez.lua index 036cc4a11d4..7a4fead1091 100644 --- a/scripts/zones/Windurst_Waters/npcs/Orez-Ebrez.lua +++ b/scripts/zones/Windurst_Waters/npcs/Orez-Ebrez.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.WINDURST_WATERS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:showText(npc, ID.text.OREZEBREZ_SHOP_DIALOG) @@ -36,10 +33,4 @@ entity.onTrigger = function(player, npc) xi.shop.nation(player, stock, xi.nation.WINDURST) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Windurst_Waters/npcs/Otete.lua b/scripts/zones/Windurst_Waters/npcs/Otete.lua index 735edde479d..7b9d1261d0d 100644 --- a/scripts/zones/Windurst_Waters/npcs/Otete.lua +++ b/scripts/zones/Windurst_Waters/npcs/Otete.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.WINDURST_WATERS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local regionOwner = GetRegionOwner(xi.region.LITELOR) @@ -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/Windurst_Waters/npcs/Pakesse-Myukesse.lua b/scripts/zones/Windurst_Waters/npcs/Pakesse-Myukesse.lua deleted file mode 100644 index 88953c691fb..00000000000 --- a/scripts/zones/Windurst_Waters/npcs/Pakesse-Myukesse.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Waters --- NPC: Pakesse-Myukesse ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(434) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters/npcs/Panaa_Fom.lua b/scripts/zones/Windurst_Waters/npcs/Panaa_Fom.lua deleted file mode 100644 index 7e1a12acfcb..00000000000 --- a/scripts/zones/Windurst_Waters/npcs/Panaa_Fom.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Waters --- NPC: Panaa Fom ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(588) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters/npcs/Panna-Donna.lua b/scripts/zones/Windurst_Waters/npcs/Panna-Donna.lua deleted file mode 100644 index 21bf3e26f22..00000000000 --- a/scripts/zones/Windurst_Waters/npcs/Panna-Donna.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Windurst Waters --- NPC: Panna-Donna --- Type: Mission NPC --- !pos -57.502 -6 229.571 238 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(105) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters/npcs/Pechiru-Mashiru.lua b/scripts/zones/Windurst_Waters/npcs/Pechiru-Mashiru.lua index 60e9c6fcb48..c45b8c263e5 100644 --- a/scripts/zones/Windurst_Waters/npcs/Pechiru-Mashiru.lua +++ b/scripts/zones/Windurst_Waters/npcs/Pechiru-Mashiru.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.WINDURST_WATERS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:hasKeyItem(xi.ki.NEW_MODEL_HAT) and @@ -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 == 54 then player:setCharVar('QuestHatInHand_var', utils.mask.setBit(player:getCharVar('QuestHatInHand_var'), 6, true)) diff --git a/scripts/zones/Windurst_Waters/npcs/Pia.lua b/scripts/zones/Windurst_Waters/npcs/Pia.lua index 9771f37a8cf..77aaaafbfb4 100644 --- a/scripts/zones/Windurst_Waters/npcs/Pia.lua +++ b/scripts/zones/Windurst_Waters/npcs/Pia.lua @@ -17,17 +17,4 @@ entity.onSpawn = function(npc) npc:pathThrough(pathNodes, xi.path.flag.PATROL) end -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(597) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Windurst_Waters/npcs/Piketo-Puketo.lua b/scripts/zones/Windurst_Waters/npcs/Piketo-Puketo.lua index 2a3144f5770..34d434e1e6e 100644 --- a/scripts/zones/Windurst_Waters/npcs/Piketo-Puketo.lua +++ b/scripts/zones/Windurst_Waters/npcs/Piketo-Puketo.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/Windurst_Waters/npcs/Pojimo-Rojimo.lua b/scripts/zones/Windurst_Waters/npcs/Pojimo-Rojimo.lua deleted file mode 100644 index 7a9b55939cd..00000000000 --- a/scripts/zones/Windurst_Waters/npcs/Pojimo-Rojimo.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Waters --- NPC: Pojimo-Rojimo ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(560) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters/npcs/Porupen-Kyurupen.lua b/scripts/zones/Windurst_Waters/npcs/Porupen-Kyurupen.lua deleted file mode 100644 index b34aad5e904..00000000000 --- a/scripts/zones/Windurst_Waters/npcs/Porupen-Kyurupen.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Waters --- NPC: Porupen-Kyurupen ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(572) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters/npcs/Prestapiq.lua b/scripts/zones/Windurst_Waters/npcs/Prestapiq.lua index f49616811f3..576a8f7b8d0 100644 --- a/scripts/zones/Windurst_Waters/npcs/Prestapiq.lua +++ b/scripts/zones/Windurst_Waters/npcs/Prestapiq.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.WINDURST_WATERS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local regionOwner = GetRegionOwner(xi.region.MOVALPOLOS) @@ -32,10 +29,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Windurst_Waters/npcs/Pulykiki.lua b/scripts/zones/Windurst_Waters/npcs/Pulykiki.lua deleted file mode 100644 index 9db47c8983d..00000000000 --- a/scripts/zones/Windurst_Waters/npcs/Pulykiki.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Waters --- NPC: Pulykiki ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(511) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters/npcs/Pursuivant.lua b/scripts/zones/Windurst_Waters/npcs/Pursuivant.lua deleted file mode 100644 index 0e12fb19e8f..00000000000 --- a/scripts/zones/Windurst_Waters/npcs/Pursuivant.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Windurst Waters --- NPC: Pursuivant --- Type: Pursuivant --- !pos 113.971 -3.077 51.524 238 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(870) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters/npcs/Queo-Paeo.lua b/scripts/zones/Windurst_Waters/npcs/Queo-Paeo.lua deleted file mode 100644 index 2a56a35a8d8..00000000000 --- a/scripts/zones/Windurst_Waters/npcs/Queo-Paeo.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Waters --- NPC: Queo-Paeo ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(583) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters/npcs/Rabiri-Tabiri.lua b/scripts/zones/Windurst_Waters/npcs/Rabiri-Tabiri.lua index 5899f86641d..da180bc8976 100644 --- a/scripts/zones/Windurst_Waters/npcs/Rabiri-Tabiri.lua +++ b/scripts/zones/Windurst_Waters/npcs/Rabiri-Tabiri.lua @@ -18,17 +18,4 @@ entity.onSpawn = function(npc) npc:pathThrough(pathNodes, bit.bor(xi.path.flag.PATROL, xi.path.flag.RUN)) end -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(568) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Windurst_Waters/npcs/Ramasese.lua b/scripts/zones/Windurst_Waters/npcs/Ramasese.lua index 628f8423be5..195b9c31e19 100644 --- a/scripts/zones/Windurst_Waters/npcs/Ramasese.lua +++ b/scripts/zones/Windurst_Waters/npcs/Ramasese.lua @@ -25,17 +25,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(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/Windurst_Waters/npcs/Ranpi-Monpi.lua b/scripts/zones/Windurst_Waters/npcs/Ranpi-Monpi.lua index 1b6ed8fefcb..d6774f1bc1d 100644 --- a/scripts/zones/Windurst_Waters/npcs/Ranpi-Monpi.lua +++ b/scripts/zones/Windurst_Waters/npcs/Ranpi-Monpi.lua @@ -85,9 +85,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) -- A Crisis in the Making if csid == 258 and option == 1 then -- A Crisis in the Making + ITEM: Quest Offer - ACCEPTED diff --git a/scripts/zones/Windurst_Waters/npcs/Reh_Hapli.lua b/scripts/zones/Windurst_Waters/npcs/Reh_Hapli.lua deleted file mode 100644 index e9d2b871762..00000000000 --- a/scripts/zones/Windurst_Waters/npcs/Reh_Hapli.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Waters --- NPC: Reh Hapli ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(590) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters/npcs/Ropunono.lua b/scripts/zones/Windurst_Waters/npcs/Ropunono.lua deleted file mode 100644 index 8a094e35e0f..00000000000 --- a/scripts/zones/Windurst_Waters/npcs/Ropunono.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Waters --- NPC: Ropunono ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(283) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters/npcs/Seven_of_Hearts.lua b/scripts/zones/Windurst_Waters/npcs/Seven_of_Hearts.lua deleted file mode 100644 index 4e0e1483a7f..00000000000 --- a/scripts/zones/Windurst_Waters/npcs/Seven_of_Hearts.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Waters --- NPC: Seven of Hearts ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(275) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters/npcs/Shanana.lua b/scripts/zones/Windurst_Waters/npcs/Shanana.lua deleted file mode 100644 index 0a7cab2a21b..00000000000 --- a/scripts/zones/Windurst_Waters/npcs/Shanana.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Waters --- NPC: Shanana ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(577) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters/npcs/Shante-Fante.lua b/scripts/zones/Windurst_Waters/npcs/Shante-Fante.lua deleted file mode 100644 index c4b3144a459..00000000000 --- a/scripts/zones/Windurst_Waters/npcs/Shante-Fante.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Waters --- NPC: Shante-Fante ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(561) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters/npcs/Shataru-Potaru.lua b/scripts/zones/Windurst_Waters/npcs/Shataru-Potaru.lua index f12519cde4d..2bd68d0d726 100644 --- a/scripts/zones/Windurst_Waters/npcs/Shataru-Potaru.lua +++ b/scripts/zones/Windurst_Waters/npcs/Shataru-Potaru.lua @@ -17,17 +17,4 @@ entity.onSpawn = function(npc) npc:pathThrough(pathNodes, xi.path.flag.PATROL) end -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(585) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Windurst_Waters/npcs/Shatoto.lua b/scripts/zones/Windurst_Waters/npcs/Shatoto.lua deleted file mode 100644 index f2b4e82ca7e..00000000000 --- a/scripts/zones/Windurst_Waters/npcs/Shatoto.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Waters --- NPC: Shatoto ------------------------------------ ----@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/Windurst_Waters/npcs/Shohrun-Tuhrun.lua b/scripts/zones/Windurst_Waters/npcs/Shohrun-Tuhrun.lua index 0da5342d37b..84eb19261bb 100644 --- a/scripts/zones/Windurst_Waters/npcs/Shohrun-Tuhrun.lua +++ b/scripts/zones/Windurst_Waters/npcs/Shohrun-Tuhrun.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.WINDURST_WATERS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:showText(npc, ID.text.SHOHRUNTUHRUN_SHOP_DIALOG) @@ -36,10 +33,4 @@ entity.onTrigger = function(player, npc) xi.shop.nation(player, stock, xi.nation.WINDURST) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Windurst_Waters/npcs/Six_of_Hearts.lua b/scripts/zones/Windurst_Waters/npcs/Six_of_Hearts.lua deleted file mode 100644 index 86eac5adf9f..00000000000 --- a/scripts/zones/Windurst_Waters/npcs/Six_of_Hearts.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Waters --- NPC: Six of Hearts ------------------------------------ ----@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/Windurst_Waters/npcs/Symphonic_Curator.lua b/scripts/zones/Windurst_Waters/npcs/Symphonic_Curator.lua index 1f207df2bd3..78532bbf338 100644 --- a/scripts/zones/Windurst_Waters/npcs/Symphonic_Curator.lua +++ b/scripts/zones/Windurst_Waters/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/Windurst_Waters/npcs/Taajiji.lua b/scripts/zones/Windurst_Waters/npcs/Taajiji.lua index 550eb7e623a..5eb9598208e 100644 --- a/scripts/zones/Windurst_Waters/npcs/Taajiji.lua +++ b/scripts/zones/Windurst_Waters/npcs/Taajiji.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.WINDURST_WATERS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:showText(npc, ID.text.TAAJIJI_SHOP_DIALOG) @@ -35,10 +32,4 @@ entity.onTrigger = function(player, npc) xi.shop.nation(player, stock, xi.nation.WINDURST) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Windurst_Waters/npcs/Temoe-Amoe.lua b/scripts/zones/Windurst_Waters/npcs/Temoe-Amoe.lua deleted file mode 100644 index d545aefac05..00000000000 --- a/scripts/zones/Windurst_Waters/npcs/Temoe-Amoe.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Waters --- NPC: Temoe-Amoe ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(508) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters/npcs/Ten_of_Hearts.lua b/scripts/zones/Windurst_Waters/npcs/Ten_of_Hearts.lua deleted file mode 100644 index e65cca68414..00000000000 --- a/scripts/zones/Windurst_Waters/npcs/Ten_of_Hearts.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Windurst Waters --- NPC: Ten of Hearts --- !pos -49.441 -5.909 226.524 238 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(107) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters/npcs/Tonana.lua b/scripts/zones/Windurst_Waters/npcs/Tonana.lua index 8bfebacb12d..46ecd346060 100644 --- a/scripts/zones/Windurst_Waters/npcs/Tonana.lua +++ b/scripts/zones/Windurst_Waters/npcs/Tonana.lua @@ -6,16 +6,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(571) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if option == 1 then player:setPos(108.744, -4.999, -134.094, 222, 241) -- (Retail packet captured) diff --git a/scripts/zones/Windurst_Waters/npcs/Torikoko.lua b/scripts/zones/Windurst_Waters/npcs/Torikoko.lua deleted file mode 100644 index 94f217f68af..00000000000 --- a/scripts/zones/Windurst_Waters/npcs/Torikoko.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Waters --- NPC: Torikoko ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(582) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters/npcs/Tosuka-Porika.lua b/scripts/zones/Windurst_Waters/npcs/Tosuka-Porika.lua index 287f12893e1..b043a1067f3 100644 --- a/scripts/zones/Windurst_Waters/npcs/Tosuka-Porika.lua +++ b/scripts/zones/Windurst_Waters/npcs/Tosuka-Porika.lua @@ -11,9 +11,6 @@ local ID = zones[xi.zone.WINDURST_WATERS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) -- Hat in Hand if @@ -37,9 +34,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) -- Hat in Hand if csid == 55 then -- Show Off Hat diff --git a/scripts/zones/Windurst_Waters/npcs/Tsuran-Botaran.lua b/scripts/zones/Windurst_Waters/npcs/Tsuran-Botaran.lua deleted file mode 100644 index a887fa3fc9d..00000000000 --- a/scripts/zones/Windurst_Waters/npcs/Tsuran-Botaran.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Waters --- NPC: Tsuran-Botaran ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(578) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters/npcs/Upih_Khachla.lua b/scripts/zones/Windurst_Waters/npcs/Upih_Khachla.lua index 0dd232a82b2..cb10160e07e 100644 --- a/scripts/zones/Windurst_Waters/npcs/Upih_Khachla.lua +++ b/scripts/zones/Windurst_Waters/npcs/Upih_Khachla.lua @@ -48,10 +48,4 @@ entity.onTrigger = function(player, npc) xi.shop.nation(player, stock, xi.nation.WINDURST) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Windurst_Waters/npcs/Yohra-Ora.lua b/scripts/zones/Windurst_Waters/npcs/Yohra-Ora.lua index 5322c4594be..240c174d6b8 100644 --- a/scripts/zones/Windurst_Waters/npcs/Yohra-Ora.lua +++ b/scripts/zones/Windurst_Waters/npcs/Yohra-Ora.lua @@ -23,17 +23,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(565) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Windurst_Waters/npcs/Yomotsutsu.lua b/scripts/zones/Windurst_Waters/npcs/Yomotsutsu.lua deleted file mode 100644 index c6aa429be78..00000000000 --- a/scripts/zones/Windurst_Waters/npcs/Yomotsutsu.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Waters --- NPC: Yomotsutsu ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(579) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Waters/npcs/Yuli_Yaam.lua b/scripts/zones/Windurst_Waters/npcs/Yuli_Yaam.lua index 60982edc54d..fadc3ef343e 100644 --- a/scripts/zones/Windurst_Waters/npcs/Yuli_Yaam.lua +++ b/scripts/zones/Windurst_Waters/npcs/Yuli_Yaam.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local wonderingstatus = player:getQuestStatus(xi.questLog.WINDURST, xi.quest.id.windurst.WONDERING_MINSTREL) local fame = player:getFameLevel(xi.fameArea.WINDURST) @@ -31,10 +28,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Windurst_Waters/npcs/Yung_Yaam.lua b/scripts/zones/Windurst_Waters/npcs/Yung_Yaam.lua index a13ac9edaee..5926deb1703 100644 --- a/scripts/zones/Windurst_Waters/npcs/Yung_Yaam.lua +++ b/scripts/zones/Windurst_Waters/npcs/Yung_Yaam.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local wonderingstatus = player:getQuestStatus(xi.questLog.WINDURST, xi.quest.id.windurst.WONDERING_MINSTREL) local fame = player:getFameLevel(xi.fameArea.WINDURST) @@ -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/Windurst_Waters/npcs/Zabirego-Hajigo.lua b/scripts/zones/Windurst_Waters/npcs/Zabirego-Hajigo.lua index 483cb31e28e..15405d77fb9 100644 --- a/scripts/zones/Windurst_Waters/npcs/Zabirego-Hajigo.lua +++ b/scripts/zones/Windurst_Waters/npcs/Zabirego-Hajigo.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local fame = player:getFameLevel(2) if fame == 9 then @@ -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/Windurst_Waters/npcs/Zelala.lua b/scripts/zones/Windurst_Waters/npcs/Zelala.lua deleted file mode 100644 index 549ea45e147..00000000000 --- a/scripts/zones/Windurst_Waters/npcs/Zelala.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Windurst Waters --- NPC: Zelala --- Type: Map Marker --- !pos 169.855 -1.295 -3.238 238 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(960) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity From 692da52fa40e04f36c9ae8fe8dc001851e0fcd21 Mon Sep 17 00:00:00 2001 From: claywar Date: Sat, 18 Jan 2025 12:25:46 -0500 Subject: [PATCH 4/4] Remove empty NPCs, add Default Actions - Windurst Walls Add windurst-jeuno Airship removals --- .../Windurst-Jeuno_Airship/npcs/Gabriele.lua | 9 --- .../Windurst-Jeuno_Airship/npcs/Mauricio.lua | 9 --- .../zones/Windurst_Walls/DefaultActions.lua | 65 ++++++++++++++++--- .../Windurst_Walls/npcs/AMAN_Liaison.lua | 3 - .../zones/Windurst_Walls/npcs/Ambrosius.lua | 3 - scripts/zones/Windurst_Walls/npcs/Anini.lua | 21 ------ .../zones/Windurst_Walls/npcs/Aromu-Oromu.lua | 21 ------ .../Windurst_Walls/npcs/Auction_Counter.lua | 9 --- .../zones/Windurst_Walls/npcs/Augu-Maugu.lua | 21 ------ .../zones/Windurst_Walls/npcs/Bonchacha.lua | 13 ---- .../Windurst_Walls/npcs/Burute-Sorute.lua | 6 -- scripts/zones/Windurst_Walls/npcs/Chomomo.lua | 6 -- .../Windurst_Walls/npcs/Dabaide-Obaide.lua | 21 ------ scripts/zones/Windurst_Walls/npcs/Ekamama.lua | 21 ------ .../npcs/Enigmatic_Footprints.lua | 24 ------- .../zones/Windurst_Walls/npcs/Esmeralda.lua | 23 ------- scripts/zones/Windurst_Walls/npcs/Finene.lua | 21 ------ .../Windurst_Walls/npcs/Five_of_Diamonds.lua | 9 --- .../zones/Windurst_Walls/npcs/Florencia.lua | 21 ------ .../Windurst_Walls/npcs/Four_of_Diamonds.lua | 22 ------- .../zones/Windurst_Walls/npcs/Gerun-Garun.lua | 21 ------ .../Windurst_Walls/npcs/Greeter_Moogle.lua | 6 -- .../Windurst_Walls/npcs/Haah_Chakaila.lua | 13 ---- .../zones/Windurst_Walls/npcs/Hiwon-Biwon.lua | 6 -- .../Windurst_Walls/npcs/Horuni-Mawoni.lua | 21 ------ scripts/zones/Windurst_Walls/npcs/Ignaz.lua | 21 ------ .../Windurst_Walls/npcs/Jack_of_Diamonds.lua | 6 -- .../zones/Windurst_Walls/npcs/Juna_Moshal.lua | 13 ---- .../zones/Windurst_Walls/npcs/Juvillie.lua | 23 ------- .../Windurst_Walls/npcs/Kaaya_Majiad.lua | 21 ------ .../Windurst_Walls/npcs/Kalupa-Tawalupa.lua | 8 --- .../Windurst_Walls/npcs/Karija-Marija.lua | 13 ---- scripts/zones/Windurst_Walls/npcs/Karola.lua | 21 ------ scripts/zones/Windurst_Walls/npcs/Keir.lua | 21 ------ scripts/zones/Windurst_Walls/npcs/Kimumu.lua | 21 ------ .../zones/Windurst_Walls/npcs/Kobunono.lua | 23 ------- .../Windurst_Walls/npcs/Kohpo-Akuupo.lua | 21 ------ scripts/zones/Windurst_Walls/npcs/Komomo.lua | 13 ---- .../zones/Windurst_Walls/npcs/Komulili.lua | 6 -- .../zones/Windurst_Walls/npcs/Koru-Moru.lua | 3 - .../zones/Windurst_Walls/npcs/Lala_Gohma.lua | 21 ------ .../zones/Windurst_Walls/npcs/Maan-Pokuun.lua | 21 ------ .../zones/Windurst_Walls/npcs/Malmi-Monmi.lua | 13 ---- scripts/zones/Windurst_Walls/npcs/Mehruru.lua | 21 ------ .../zones/Windurst_Walls/npcs/Migi_Centa.lua | 13 ---- .../zones/Windurst_Walls/npcs/Moan-Maon.lua | 6 -- scripts/zones/Windurst_Walls/npcs/Moogle.lua | 3 - scripts/zones/Windurst_Walls/npcs/Mukuku.lua | 21 ------ .../Windurst_Walls/npcs/Naih_Arihmepp.lua | 6 -- .../Windurst_Walls/npcs/Nine_of_Diamonds.lua | 22 ------- scripts/zones/Windurst_Walls/npcs/Nozaza.lua | 21 ------ .../Windurst_Walls/npcs/Orudoba-Sondeba.lua | 9 --- scripts/zones/Windurst_Walls/npcs/Pakeke.lua | 13 ---- .../zones/Windurst_Walls/npcs/Pakke-Pokke.lua | 22 ------- .../Windurst_Walls/npcs/Pakora-Makora.lua | 21 ------ .../Windurst_Walls/npcs/Pantsa-Karutsa.lua | 21 ------ .../Windurst_Walls/npcs/Polikal-Ramikal.lua | 21 ------ .../Windurst_Walls/npcs/Polink-Moink.lua | 13 ---- .../zones/Windurst_Walls/npcs/Purakoko.lua | 13 ---- scripts/zones/Windurst_Walls/npcs/Purere.lua | 21 ------ scripts/zones/Windurst_Walls/npcs/Quentin.lua | 21 ------ scripts/zones/Windurst_Walls/npcs/Raamimi.lua | 6 -- scripts/zones/Windurst_Walls/npcs/Ran.lua | 9 --- .../Windurst_Walls/npcs/Rutango-Botango.lua | 8 --- scripts/zones/Windurst_Walls/npcs/Scavnix.lua | 9 --- scripts/zones/Windurst_Walls/npcs/Selulu.lua | 9 --- .../Windurst_Walls/npcs/Seven_of_Diamonds.lua | 9 --- .../zones/Windurst_Walls/npcs/Shantotto.lua | 3 - .../Windurst_Walls/npcs/Shinchai-Tocchai.lua | 23 ------- .../Windurst_Walls/npcs/Six_of_Diamonds.lua | 21 ------ .../Windurst_Walls/npcs/Suhie-Kaihie.lua | 13 ---- .../Windurst_Walls/npcs/Symphonic_Curator.lua | 3 - scripts/zones/Windurst_Walls/npcs/Takoda.lua | 21 ------ .../Windurst_Walls/npcs/Ten_of_Diamonds.lua | 21 ------ scripts/zones/Windurst_Walls/npcs/Toi-Poi.lua | 21 ------ .../Windurst_Walls/npcs/Trail_Markings.lua | 6 -- .../Windurst_Walls/npcs/Tsuaora-Tsuora.lua | 9 --- scripts/zones/Windurst_Walls/npcs/Uwaine.lua | 21 ------ .../zones/Windurst_Walls/npcs/Yanakiki.lua | 21 ------ .../zones/Windurst_Walls/npcs/Yoran-Oran.lua | 3 - scripts/zones/Windurst_Walls/npcs/Yoriri.lua | 6 -- .../zones/Windurst_Walls/npcs/Zayhi-Bauhi.lua | 2 - .../Windurst_Walls/npcs/Zokima-Rokima.lua | 6 -- scripts/zones/Windurst_Walls/npcs/_6n2.lua | 6 -- scripts/zones/Windurst_Walls/npcs/_6n8.lua | 9 --- 85 files changed, 57 insertions(+), 1200 deletions(-) delete mode 100644 scripts/zones/Windurst_Walls/npcs/Anini.lua delete mode 100644 scripts/zones/Windurst_Walls/npcs/Aromu-Oromu.lua delete mode 100644 scripts/zones/Windurst_Walls/npcs/Augu-Maugu.lua delete mode 100644 scripts/zones/Windurst_Walls/npcs/Dabaide-Obaide.lua delete mode 100644 scripts/zones/Windurst_Walls/npcs/Ekamama.lua delete mode 100644 scripts/zones/Windurst_Walls/npcs/Enigmatic_Footprints.lua delete mode 100644 scripts/zones/Windurst_Walls/npcs/Esmeralda.lua delete mode 100644 scripts/zones/Windurst_Walls/npcs/Finene.lua delete mode 100644 scripts/zones/Windurst_Walls/npcs/Florencia.lua delete mode 100644 scripts/zones/Windurst_Walls/npcs/Four_of_Diamonds.lua delete mode 100644 scripts/zones/Windurst_Walls/npcs/Gerun-Garun.lua delete mode 100644 scripts/zones/Windurst_Walls/npcs/Horuni-Mawoni.lua delete mode 100644 scripts/zones/Windurst_Walls/npcs/Ignaz.lua delete mode 100644 scripts/zones/Windurst_Walls/npcs/Juvillie.lua delete mode 100644 scripts/zones/Windurst_Walls/npcs/Kaaya_Majiad.lua delete mode 100644 scripts/zones/Windurst_Walls/npcs/Karola.lua delete mode 100644 scripts/zones/Windurst_Walls/npcs/Keir.lua delete mode 100644 scripts/zones/Windurst_Walls/npcs/Kimumu.lua delete mode 100644 scripts/zones/Windurst_Walls/npcs/Kobunono.lua delete mode 100644 scripts/zones/Windurst_Walls/npcs/Kohpo-Akuupo.lua delete mode 100644 scripts/zones/Windurst_Walls/npcs/Lala_Gohma.lua delete mode 100644 scripts/zones/Windurst_Walls/npcs/Maan-Pokuun.lua delete mode 100644 scripts/zones/Windurst_Walls/npcs/Mehruru.lua delete mode 100644 scripts/zones/Windurst_Walls/npcs/Mukuku.lua delete mode 100644 scripts/zones/Windurst_Walls/npcs/Nine_of_Diamonds.lua delete mode 100644 scripts/zones/Windurst_Walls/npcs/Nozaza.lua delete mode 100644 scripts/zones/Windurst_Walls/npcs/Pakke-Pokke.lua delete mode 100644 scripts/zones/Windurst_Walls/npcs/Pakora-Makora.lua delete mode 100644 scripts/zones/Windurst_Walls/npcs/Pantsa-Karutsa.lua delete mode 100644 scripts/zones/Windurst_Walls/npcs/Polikal-Ramikal.lua delete mode 100644 scripts/zones/Windurst_Walls/npcs/Purere.lua delete mode 100644 scripts/zones/Windurst_Walls/npcs/Quentin.lua delete mode 100644 scripts/zones/Windurst_Walls/npcs/Shinchai-Tocchai.lua delete mode 100644 scripts/zones/Windurst_Walls/npcs/Six_of_Diamonds.lua delete mode 100644 scripts/zones/Windurst_Walls/npcs/Takoda.lua delete mode 100644 scripts/zones/Windurst_Walls/npcs/Ten_of_Diamonds.lua delete mode 100644 scripts/zones/Windurst_Walls/npcs/Toi-Poi.lua delete mode 100644 scripts/zones/Windurst_Walls/npcs/Uwaine.lua delete mode 100644 scripts/zones/Windurst_Walls/npcs/Yanakiki.lua diff --git a/scripts/zones/Windurst-Jeuno_Airship/npcs/Gabriele.lua b/scripts/zones/Windurst-Jeuno_Airship/npcs/Gabriele.lua index 92a291594cc..6d0df9676e0 100644 --- a/scripts/zones/Windurst-Jeuno_Airship/npcs/Gabriele.lua +++ b/scripts/zones/Windurst-Jeuno_Airship/npcs/Gabriele.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.WINDURST_JEUNO_AIRSHIP] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local vHour = VanadielHour() local vMin = VanadielMinute() @@ -63,10 +60,4 @@ entity.onTrigger = function(player, npc) player:messageSpecial(message, math.floor((2.4 * vMinutes) / 60), math.floor(vMinutes / 60 + 0.5)) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Windurst-Jeuno_Airship/npcs/Mauricio.lua b/scripts/zones/Windurst-Jeuno_Airship/npcs/Mauricio.lua index 4019bf2c3cd..aba66ef15b2 100644 --- a/scripts/zones/Windurst-Jeuno_Airship/npcs/Mauricio.lua +++ b/scripts/zones/Windurst-Jeuno_Airship/npcs/Mauricio.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.WINDURST_JEUNO_AIRSHIP] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local vHour = VanadielHour() local vMin = VanadielMinute() @@ -62,10 +59,4 @@ entity.onTrigger = function(player, npc) player:messageSpecial(message, math.floor((2.4 * vMinutes) / 60), math.floor(vMinutes / 60 + 0.5)) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Windurst_Walls/DefaultActions.lua b/scripts/zones/Windurst_Walls/DefaultActions.lua index 2444c500be4..ac0c123d08d 100644 --- a/scripts/zones/Windurst_Walls/DefaultActions.lua +++ b/scripts/zones/Windurst_Walls/DefaultActions.lua @@ -1,12 +1,61 @@ local ID = zones[xi.zone.WINDURST_WALLS] return { - ['_6n2'] = { messageSpecial = ID.text.DOORS_SEALED_SHUT }, - ['Chawo_Shipeynyo'] = { event = 329 }, - ['Keo-Koruo'] = { event = 88 }, - ['Koru-Moru'] = { event = 193 }, - ['Luuh_Koplehn'] = { event = 322 }, - ['Pakke-Pokke'] = { event = 89 }, - ['Shantotto'] = { event = 164 }, - ['Yoran-Oran'] = { event = 245 }, + ['_6n2'] = { messageSpecial = ID.text.DOORS_SEALED_SHUT }, + ['Anini'] = { event = 319 }, + ['Aromu-Oromu'] = { event = 300 }, + ['Augu-Maugu'] = { event = 260 }, + ['Bonchacha'] = { event = 294 }, + ['Chawo_Shipeynyo'] = { event = 329 }, + ['Dabaide-Obaide'] = { event = 47 }, + ['Ekamama'] = { event = 309 }, + ['Enigmatic_Footprints'] = { messageSpecial = ID.text.TEAR_IN_FABRIC_OF_SPACE }, + ['Esmeralda'] = { event = 268 }, + ['Finene'] = { event = 310 }, + ['Florencia'] = { event = 333 }, + ['Four_of_Diamonds'] = { event = 267 }, + ['Gerun-Garun'] = { event = 312 }, + ['Haah_Chakaila'] = { event = 330 }, + ['Horuni-Mawoni'] = { event = 303 }, + ['Ignaz'] = { event = 274 }, + ['Juna_Moshal'] = { event = 327 }, + ['Juvillie'] = { event = 406 }, + ['Kaaya_Majiad'] = { event = 323 }, + ['Karija-Marija'] = { event = 317 }, + ['Karola'] = { event = 335 }, + ['Keir'] = { event = 270 }, + ['Keo-Koruo'] = { event = 88 }, + ['Kimumu'] = { event = 314 }, + ['Kobunono'] = { event = 10005 }, + ['Kohpo-Akuupo'] = { event = 261 }, + ['Komomo'] = { event = 290 }, + ['Koru-Moru'] = { event = 193 }, + ['Lala_Gohma'] = { event = 328 }, + ['Luuh_Koplehn'] = { event = 322 }, + ['Maan-Pokuun'] = { event = 293 }, + ['Malmi-Monmi'] = { event = 295 }, + ['Mehruru'] = { event = 46 }, + ['Migi_Centa'] = { event = 324 }, + ['Mukuku'] = { event = 321 }, + ['Nine_of_Diamonds'] = { event = 263 }, + ['Nozaza'] = { event = 258 }, + ['Pakeke'] = { event = 292 }, + ['Pakke-Pokke'] = { event = 89 }, + ['Pakora-Makora'] = { event = 304 }, + ['Pantsa-Karutsa'] = { event = 301 }, + ['Polikal-Ramikal'] = { event = 320 }, + ['Polink-Moink'] = { event = 302 }, + ['Purakoko'] = { event = 318 }, + ['Purere'] = { event = 311 }, + ['Quentin'] = { event = 334 }, + ['Shantotto'] = { event = 164 }, + ['Shinchai-Tocchai'] = { event = 505 }, + ['Six_of_Diamonds'] = { event = 265 }, + ['Suhie-Kaihie'] = { event = 291 }, + ['Takoda'] = { event = 332 }, + ['Ten_of_Diamonds'] = { event = 262 }, + ['Toi-Poi'] = { event = 308 }, + ['Uwaine'] = { event = 331 }, + ['Yanakiki'] = { event = 259 }, + ['Yoran-Oran'] = { event = 245 }, } diff --git a/scripts/zones/Windurst_Walls/npcs/AMAN_Liaison.lua b/scripts/zones/Windurst_Walls/npcs/AMAN_Liaison.lua index 5c5ebcc7d56..b7ac4ca7828 100644 --- a/scripts/zones/Windurst_Walls/npcs/AMAN_Liaison.lua +++ b/scripts/zones/Windurst_Walls/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/Windurst_Walls/npcs/Ambrosius.lua b/scripts/zones/Windurst_Walls/npcs/Ambrosius.lua index d7028123dda..fea9f9b31d1 100644 --- a/scripts/zones/Windurst_Walls/npcs/Ambrosius.lua +++ b/scripts/zones/Windurst_Walls/npcs/Ambrosius.lua @@ -70,9 +70,6 @@ entity.onTrade = function(player, npc, trade) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 48 and option == 0 then player:addQuest(xi.questLog.WINDURST, xi.quest.id.windurst.THE_POSTMAN_ALWAYS_KO_S_TWICE) diff --git a/scripts/zones/Windurst_Walls/npcs/Anini.lua b/scripts/zones/Windurst_Walls/npcs/Anini.lua deleted file mode 100644 index e4bd7f8df4d..00000000000 --- a/scripts/zones/Windurst_Walls/npcs/Anini.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Walls --- NPC: Anini ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(319) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Walls/npcs/Aromu-Oromu.lua b/scripts/zones/Windurst_Walls/npcs/Aromu-Oromu.lua deleted file mode 100644 index cb4a45baee4..00000000000 --- a/scripts/zones/Windurst_Walls/npcs/Aromu-Oromu.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Walls --- NPC: Aromu-Oromu ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(300) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Walls/npcs/Auction_Counter.lua b/scripts/zones/Windurst_Walls/npcs/Auction_Counter.lua index 806fa1f03a9..05d60152de9 100644 --- a/scripts/zones/Windurst_Walls/npcs/Auction_Counter.lua +++ b/scripts/zones/Windurst_Walls/npcs/Auction_Counter.lua @@ -5,17 +5,8 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:sendMenu(3) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Windurst_Walls/npcs/Augu-Maugu.lua b/scripts/zones/Windurst_Walls/npcs/Augu-Maugu.lua deleted file mode 100644 index e93994ab931..00000000000 --- a/scripts/zones/Windurst_Walls/npcs/Augu-Maugu.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Walls --- NPC: Augu-Maugu ------------------------------------ ----@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/Windurst_Walls/npcs/Bonchacha.lua b/scripts/zones/Windurst_Walls/npcs/Bonchacha.lua index 59a2ad63468..149723c2e0c 100644 --- a/scripts/zones/Windurst_Walls/npcs/Bonchacha.lua +++ b/scripts/zones/Windurst_Walls/npcs/Bonchacha.lua @@ -21,17 +21,4 @@ entity.onSpawn = function(npc) npc:pathThrough(pathNodes, xi.path.flag.PATROL) end -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(294) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Windurst_Walls/npcs/Burute-Sorute.lua b/scripts/zones/Windurst_Walls/npcs/Burute-Sorute.lua index 4b833f92445..3439715e82e 100644 --- a/scripts/zones/Windurst_Walls/npcs/Burute-Sorute.lua +++ b/scripts/zones/Windurst_Walls/npcs/Burute-Sorute.lua @@ -146,16 +146,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/Windurst_Walls/npcs/Chomomo.lua b/scripts/zones/Windurst_Walls/npcs/Chomomo.lua index be7005d6179..d2c3c38582e 100644 --- a/scripts/zones/Windurst_Walls/npcs/Chomomo.lua +++ b/scripts/zones/Windurst_Walls/npcs/Chomomo.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local wildcatWindurst = player:getCharVar('WildcatWindurst') @@ -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 == 499 then player:setCharVar('WildcatWindurst', utils.mask.setBit(player:getCharVar('WildcatWindurst'), 8, true)) diff --git a/scripts/zones/Windurst_Walls/npcs/Dabaide-Obaide.lua b/scripts/zones/Windurst_Walls/npcs/Dabaide-Obaide.lua deleted file mode 100644 index 8f39eacbb72..00000000000 --- a/scripts/zones/Windurst_Walls/npcs/Dabaide-Obaide.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Walls --- NPC: Dabaide-Obaide ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(47) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Walls/npcs/Ekamama.lua b/scripts/zones/Windurst_Walls/npcs/Ekamama.lua deleted file mode 100644 index 5ba75717464..00000000000 --- a/scripts/zones/Windurst_Walls/npcs/Ekamama.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Walls --- NPC: Ekamama ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(309) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Walls/npcs/Enigmatic_Footprints.lua b/scripts/zones/Windurst_Walls/npcs/Enigmatic_Footprints.lua deleted file mode 100644 index 59285911ca6..00000000000 --- a/scripts/zones/Windurst_Walls/npcs/Enigmatic_Footprints.lua +++ /dev/null @@ -1,24 +0,0 @@ ------------------------------------ --- Area: Windurst Walls --- NPC: Enigmatic Footprints --- Entry NPC for Dynamis Divergence ------------------------------------ -local ID = zones[xi.zone.WINDURST_WALLS] ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:messageSpecial(ID.text.TEAR_IN_FABRIC_OF_SPACE) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Walls/npcs/Esmeralda.lua b/scripts/zones/Windurst_Walls/npcs/Esmeralda.lua deleted file mode 100644 index 1183e96ffcb..00000000000 --- a/scripts/zones/Windurst_Walls/npcs/Esmeralda.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Windurst Walls --- NPC: Esmeralda --- Type: Consul. Rep. --- !pos 128.629 -12.5 139.387 239 ------------------------------------ ----@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/Windurst_Walls/npcs/Finene.lua b/scripts/zones/Windurst_Walls/npcs/Finene.lua deleted file mode 100644 index 340985ee17c..00000000000 --- a/scripts/zones/Windurst_Walls/npcs/Finene.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Walls --- NPC: Finene ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(310) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Walls/npcs/Five_of_Diamonds.lua b/scripts/zones/Windurst_Walls/npcs/Five_of_Diamonds.lua index 3d361c350ae..4697e831dd0 100644 --- a/scripts/zones/Windurst_Walls/npcs/Five_of_Diamonds.lua +++ b/scripts/zones/Windurst_Walls/npcs/Five_of_Diamonds.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getQuestStatus(xi.questLog.WINDURST, xi.quest.id.windurst.A_GREETING_CARDIAN) == xi.questStatus.QUEST_ACCEPTED then player:startEvent(339) @@ -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/Windurst_Walls/npcs/Florencia.lua b/scripts/zones/Windurst_Walls/npcs/Florencia.lua deleted file mode 100644 index 6f523bc6349..00000000000 --- a/scripts/zones/Windurst_Walls/npcs/Florencia.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Walls --- NPC: Florencia ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(333) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Walls/npcs/Four_of_Diamonds.lua b/scripts/zones/Windurst_Walls/npcs/Four_of_Diamonds.lua deleted file mode 100644 index e198cdb49b0..00000000000 --- a/scripts/zones/Windurst_Walls/npcs/Four_of_Diamonds.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Windurst Walls --- NPC: Four of Diamonds --- !pos -187.184 -3.545 151.092 239 ------------------------------------ ----@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/Windurst_Walls/npcs/Gerun-Garun.lua b/scripts/zones/Windurst_Walls/npcs/Gerun-Garun.lua deleted file mode 100644 index 6c89428d43f..00000000000 --- a/scripts/zones/Windurst_Walls/npcs/Gerun-Garun.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Walls --- NPC: Gerun-Garun ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(312) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Walls/npcs/Greeter_Moogle.lua b/scripts/zones/Windurst_Walls/npcs/Greeter_Moogle.lua index 6db948f29d1..5597d747cf4 100644 --- a/scripts/zones/Windurst_Walls/npcs/Greeter_Moogle.lua +++ b/scripts/zones/Windurst_Walls/npcs/Greeter_Moogle.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local csid = 528 xi.events.loginCampaign.onTrigger(player, csid) @@ -18,7 +15,4 @@ entity.onEventUpdate = function(player, csid, option, npc) xi.events.loginCampaign.onEventUpdate(player, csid, option, npc) end -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Windurst_Walls/npcs/Haah_Chakaila.lua b/scripts/zones/Windurst_Walls/npcs/Haah_Chakaila.lua index 4bf6b40549f..ee6d42893b6 100644 --- a/scripts/zones/Windurst_Walls/npcs/Haah_Chakaila.lua +++ b/scripts/zones/Windurst_Walls/npcs/Haah_Chakaila.lua @@ -63,17 +63,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(330) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Windurst_Walls/npcs/Hiwon-Biwon.lua b/scripts/zones/Windurst_Walls/npcs/Hiwon-Biwon.lua index 096e2c29484..6d72a3ebdf7 100644 --- a/scripts/zones/Windurst_Walls/npcs/Hiwon-Biwon.lua +++ b/scripts/zones/Windurst_Walls/npcs/Hiwon-Biwon.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local makingHeadlines = player:getQuestStatus(xi.questLog.WINDURST, xi.quest.id.windurst.MAKING_HEADLINES) local cursesFoiledAgain1 = player:getQuestStatus(xi.questLog.WINDURST, xi.quest.id.windurst.CURSES_FOILED_AGAIN_1) @@ -50,9 +47,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) -- Making Headlines if csid == 281 or csid == 283 or csid == 284 then diff --git a/scripts/zones/Windurst_Walls/npcs/Horuni-Mawoni.lua b/scripts/zones/Windurst_Walls/npcs/Horuni-Mawoni.lua deleted file mode 100644 index 06aa266c905..00000000000 --- a/scripts/zones/Windurst_Walls/npcs/Horuni-Mawoni.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Walls --- NPC: Horuni-Mawoni ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(303) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Walls/npcs/Ignaz.lua b/scripts/zones/Windurst_Walls/npcs/Ignaz.lua deleted file mode 100644 index 69682828f0e..00000000000 --- a/scripts/zones/Windurst_Walls/npcs/Ignaz.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Walls --- NPC: Ignaz ------------------------------------ ----@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/Windurst_Walls/npcs/Jack_of_Diamonds.lua b/scripts/zones/Windurst_Walls/npcs/Jack_of_Diamonds.lua index d60aa7a2a6f..160e2137e51 100644 --- a/scripts/zones/Windurst_Walls/npcs/Jack_of_Diamonds.lua +++ b/scripts/zones/Windurst_Walls/npcs/Jack_of_Diamonds.lua @@ -21,10 +21,4 @@ entity.onTrigger = function(player, npc) player:startEvent(10001, 0, 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/Windurst_Walls/npcs/Juna_Moshal.lua b/scripts/zones/Windurst_Walls/npcs/Juna_Moshal.lua index 7624389a9c0..aeb0c0db79e 100644 --- a/scripts/zones/Windurst_Walls/npcs/Juna_Moshal.lua +++ b/scripts/zones/Windurst_Walls/npcs/Juna_Moshal.lua @@ -19,17 +19,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(327) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Windurst_Walls/npcs/Juvillie.lua b/scripts/zones/Windurst_Walls/npcs/Juvillie.lua deleted file mode 100644 index 9b7d624199a..00000000000 --- a/scripts/zones/Windurst_Walls/npcs/Juvillie.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Windurst Walls --- NPC: Juvillie --- Type: Event Replayer --- !pos -180.731 -3.451 143.138 239 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(406) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Walls/npcs/Kaaya_Majiad.lua b/scripts/zones/Windurst_Walls/npcs/Kaaya_Majiad.lua deleted file mode 100644 index 8a8e7ae9cc9..00000000000 --- a/scripts/zones/Windurst_Walls/npcs/Kaaya_Majiad.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Walls --- NPC: Kaaya Majiad ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(323) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Walls/npcs/Kalupa-Tawalupa.lua b/scripts/zones/Windurst_Walls/npcs/Kalupa-Tawalupa.lua index 7155f6e8d71..93a614ab8c0 100644 --- a/scripts/zones/Windurst_Walls/npcs/Kalupa-Tawalupa.lua +++ b/scripts/zones/Windurst_Walls/npcs/Kalupa-Tawalupa.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local toBee = player:getQuestStatus(xi.questLog.WINDURST, xi.quest.id.windurst.TO_BEE_OR_NOT_TO_BEE) local toBeeOrNotStatus = player:getCharVar('ToBeeOrNot_var') @@ -33,10 +30,5 @@ end -- CS 72 - player:startEvent(72) -- During Too Bee quest after some honey was given to Zayhi: "hey did that honey help you just now?" -- *CS 75 - player:startEvent(75) -- Combo CS: During Too Bee quest, kicked off from Zayhi -- CS 77 - player:startEvent(77) -- After Too Bee quest but before zone: "well I guess a tooth ache is to be expected" -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end return entity diff --git a/scripts/zones/Windurst_Walls/npcs/Karija-Marija.lua b/scripts/zones/Windurst_Walls/npcs/Karija-Marija.lua index 94a08d192e9..83985aea771 100644 --- a/scripts/zones/Windurst_Walls/npcs/Karija-Marija.lua +++ b/scripts/zones/Windurst_Walls/npcs/Karija-Marija.lua @@ -41,17 +41,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(317) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Windurst_Walls/npcs/Karola.lua b/scripts/zones/Windurst_Walls/npcs/Karola.lua deleted file mode 100644 index a66d7ea173c..00000000000 --- a/scripts/zones/Windurst_Walls/npcs/Karola.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Walls --- NPC: Karola ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(335) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Walls/npcs/Keir.lua b/scripts/zones/Windurst_Walls/npcs/Keir.lua deleted file mode 100644 index 2078e9934ad..00000000000 --- a/scripts/zones/Windurst_Walls/npcs/Keir.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Walls --- NPC: Keir ------------------------------------ ----@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/Windurst_Walls/npcs/Kimumu.lua b/scripts/zones/Windurst_Walls/npcs/Kimumu.lua deleted file mode 100644 index e754af80c1a..00000000000 --- a/scripts/zones/Windurst_Walls/npcs/Kimumu.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Walls --- NPC: Kimumu ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(314) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Walls/npcs/Kobunono.lua b/scripts/zones/Windurst_Walls/npcs/Kobunono.lua deleted file mode 100644 index 5ed3d6b299a..00000000000 --- a/scripts/zones/Windurst_Walls/npcs/Kobunono.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Windurst Walls --- NPC: Kobunono --- Type: Adv. Assistant --- !pos 52.042 -3.499 -57.588 239 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(10005) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Walls/npcs/Kohpo-Akuupo.lua b/scripts/zones/Windurst_Walls/npcs/Kohpo-Akuupo.lua deleted file mode 100644 index e9dc442cf72..00000000000 --- a/scripts/zones/Windurst_Walls/npcs/Kohpo-Akuupo.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Walls --- NPC: Kohpo-Akuupo ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(261) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Walls/npcs/Komomo.lua b/scripts/zones/Windurst_Walls/npcs/Komomo.lua index 37ed4bb718e..e2436a25827 100644 --- a/scripts/zones/Windurst_Walls/npcs/Komomo.lua +++ b/scripts/zones/Windurst_Walls/npcs/Komomo.lua @@ -22,17 +22,4 @@ entity.onSpawn = function(npc) npc:pathThrough(pathNodes, xi.path.flag.PATROL) end -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(290) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Windurst_Walls/npcs/Komulili.lua b/scripts/zones/Windurst_Walls/npcs/Komulili.lua index 17a7e1345f4..29bbe2259b5 100644 --- a/scripts/zones/Windurst_Walls/npcs/Komulili.lua +++ b/scripts/zones/Windurst_Walls/npcs/Komulili.lua @@ -6,16 +6,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(338) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if option == 1 then player:setPos(-111.919, -8.75, 92.093, 62, 240) -- (R) diff --git a/scripts/zones/Windurst_Walls/npcs/Koru-Moru.lua b/scripts/zones/Windurst_Walls/npcs/Koru-Moru.lua index 6ae15a0f4f8..4bbea8e34e4 100644 --- a/scripts/zones/Windurst_Walls/npcs/Koru-Moru.lua +++ b/scripts/zones/Windurst_Walls/npcs/Koru-Moru.lua @@ -115,9 +115,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 == 412 then player:delKeyItem(xi.ki.CARBUNCLES_TEAR) diff --git a/scripts/zones/Windurst_Walls/npcs/Lala_Gohma.lua b/scripts/zones/Windurst_Walls/npcs/Lala_Gohma.lua deleted file mode 100644 index 5e63a9b20bf..00000000000 --- a/scripts/zones/Windurst_Walls/npcs/Lala_Gohma.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Walls --- NPC: Lala Gohma ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(328) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Walls/npcs/Maan-Pokuun.lua b/scripts/zones/Windurst_Walls/npcs/Maan-Pokuun.lua deleted file mode 100644 index 28735b9dbd8..00000000000 --- a/scripts/zones/Windurst_Walls/npcs/Maan-Pokuun.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Walls --- NPC: Maan-Pokuun ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(293) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Walls/npcs/Malmi-Monmi.lua b/scripts/zones/Windurst_Walls/npcs/Malmi-Monmi.lua index 9e7bd7dd55a..479a832c0ee 100644 --- a/scripts/zones/Windurst_Walls/npcs/Malmi-Monmi.lua +++ b/scripts/zones/Windurst_Walls/npcs/Malmi-Monmi.lua @@ -17,17 +17,4 @@ entity.onSpawn = function(npc) npc:pathThrough(pathNodes, xi.path.flag.PATROL) end -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(295) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Windurst_Walls/npcs/Mehruru.lua b/scripts/zones/Windurst_Walls/npcs/Mehruru.lua deleted file mode 100644 index e9cffe16fa1..00000000000 --- a/scripts/zones/Windurst_Walls/npcs/Mehruru.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Walls --- NPC: Mehruru ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(46) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Walls/npcs/Migi_Centa.lua b/scripts/zones/Windurst_Walls/npcs/Migi_Centa.lua index 775c1b6ccc5..c62a76c1dcd 100644 --- a/scripts/zones/Windurst_Walls/npcs/Migi_Centa.lua +++ b/scripts/zones/Windurst_Walls/npcs/Migi_Centa.lua @@ -17,17 +17,4 @@ entity.onSpawn = function(npc) npc:pathThrough(pathNodes, xi.path.flag.PATROL) end -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(324) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Windurst_Walls/npcs/Moan-Maon.lua b/scripts/zones/Windurst_Walls/npcs/Moan-Maon.lua index a5dae499081..887b2dadf1b 100644 --- a/scripts/zones/Windurst_Walls/npcs/Moan-Maon.lua +++ b/scripts/zones/Windurst_Walls/npcs/Moan-Maon.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local wildcatWindurst = player:getCharVar('WildcatWindurst') @@ -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 == 497 then player:setCharVar('WildcatWindurst', utils.mask.setBit(player:getCharVar('WildcatWindurst'), 7, true)) diff --git a/scripts/zones/Windurst_Walls/npcs/Moogle.lua b/scripts/zones/Windurst_Walls/npcs/Moogle.lua index 4e1f7a4abc4..45fe3e9745a 100644 --- a/scripts/zones/Windurst_Walls/npcs/Moogle.lua +++ b/scripts/zones/Windurst_Walls/npcs/Moogle.lua @@ -13,9 +13,6 @@ entity.onTrigger = function(player, npc) xi.moghouse.moogleTrigger(player, npc) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.moghouse.moogleEventFinish(player, csid, option, npc) end diff --git a/scripts/zones/Windurst_Walls/npcs/Mukuku.lua b/scripts/zones/Windurst_Walls/npcs/Mukuku.lua deleted file mode 100644 index 3586726de68..00000000000 --- a/scripts/zones/Windurst_Walls/npcs/Mukuku.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Walls --- NPC: Mukuku ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(321) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Walls/npcs/Naih_Arihmepp.lua b/scripts/zones/Windurst_Walls/npcs/Naih_Arihmepp.lua index 9fe292b348c..ee8a061a9d3 100644 --- a/scripts/zones/Windurst_Walls/npcs/Naih_Arihmepp.lua +++ b/scripts/zones/Windurst_Walls/npcs/Naih_Arihmepp.lua @@ -20,9 +20,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 wildcatWindurst = player:getCharVar('WildcatWindurst') @@ -36,9 +33,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 == 500 then player:setCharVar('WildcatWindurst', utils.mask.setBit(player:getCharVar('WildcatWindurst'), 9, true)) diff --git a/scripts/zones/Windurst_Walls/npcs/Nine_of_Diamonds.lua b/scripts/zones/Windurst_Walls/npcs/Nine_of_Diamonds.lua deleted file mode 100644 index 9903cf30da1..00000000000 --- a/scripts/zones/Windurst_Walls/npcs/Nine_of_Diamonds.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Windurst Walls --- NPC: Nine of Diamonds --- !pos -76.446 -10.822 107.692 239 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(263) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Walls/npcs/Nozaza.lua b/scripts/zones/Windurst_Walls/npcs/Nozaza.lua deleted file mode 100644 index 4766774577c..00000000000 --- a/scripts/zones/Windurst_Walls/npcs/Nozaza.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Walls --- NPC: Nozaza ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(258) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Walls/npcs/Orudoba-Sondeba.lua b/scripts/zones/Windurst_Walls/npcs/Orudoba-Sondeba.lua index d20c140e7ed..0a72ae85998 100644 --- a/scripts/zones/Windurst_Walls/npcs/Orudoba-Sondeba.lua +++ b/scripts/zones/Windurst_Walls/npcs/Orudoba-Sondeba.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getQuestStatus(xi.questLog.WINDURST, xi.quest.id.windurst.THE_POSTMAN_ALWAYS_KO_S_TWICE) == xi.questStatus.QUEST_ACCEPTED then player:startEvent(51) @@ -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/Windurst_Walls/npcs/Pakeke.lua b/scripts/zones/Windurst_Walls/npcs/Pakeke.lua index 3341b85041b..8fea61955d9 100644 --- a/scripts/zones/Windurst_Walls/npcs/Pakeke.lua +++ b/scripts/zones/Windurst_Walls/npcs/Pakeke.lua @@ -17,17 +17,4 @@ entity.onSpawn = function(npc) npc:pathThrough(pathNodes, xi.path.flag.PATROL) end -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(292) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Windurst_Walls/npcs/Pakke-Pokke.lua b/scripts/zones/Windurst_Walls/npcs/Pakke-Pokke.lua deleted file mode 100644 index 494e4ab4650..00000000000 --- a/scripts/zones/Windurst_Walls/npcs/Pakke-Pokke.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Windurst Walls --- NPC: Pakke-Pokke --- !pos -3.464 -17.25 125.635 239 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(89) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Walls/npcs/Pakora-Makora.lua b/scripts/zones/Windurst_Walls/npcs/Pakora-Makora.lua deleted file mode 100644 index 70ea0d43336..00000000000 --- a/scripts/zones/Windurst_Walls/npcs/Pakora-Makora.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Walls --- NPC: Pakora-Makora ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(304) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Walls/npcs/Pantsa-Karutsa.lua b/scripts/zones/Windurst_Walls/npcs/Pantsa-Karutsa.lua deleted file mode 100644 index 66fc0ca01a5..00000000000 --- a/scripts/zones/Windurst_Walls/npcs/Pantsa-Karutsa.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Walls --- NPC: Pantsa-Karutsa ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(301) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Walls/npcs/Polikal-Ramikal.lua b/scripts/zones/Windurst_Walls/npcs/Polikal-Ramikal.lua deleted file mode 100644 index bc79840bc47..00000000000 --- a/scripts/zones/Windurst_Walls/npcs/Polikal-Ramikal.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Walls --- NPC: Polikal-Ramikal ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(320) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Walls/npcs/Polink-Moink.lua b/scripts/zones/Windurst_Walls/npcs/Polink-Moink.lua index a469254dd11..cf028f36123 100644 --- a/scripts/zones/Windurst_Walls/npcs/Polink-Moink.lua +++ b/scripts/zones/Windurst_Walls/npcs/Polink-Moink.lua @@ -29,17 +29,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(302) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Windurst_Walls/npcs/Purakoko.lua b/scripts/zones/Windurst_Walls/npcs/Purakoko.lua index a0d9a45c267..c3fb26a0081 100644 --- a/scripts/zones/Windurst_Walls/npcs/Purakoko.lua +++ b/scripts/zones/Windurst_Walls/npcs/Purakoko.lua @@ -24,17 +24,4 @@ entity.onPathComplete = function(npc) npc:pathThrough(paths[index], xi.path.flag.PATROL) end -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(318) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Windurst_Walls/npcs/Purere.lua b/scripts/zones/Windurst_Walls/npcs/Purere.lua deleted file mode 100644 index 316bd6692b2..00000000000 --- a/scripts/zones/Windurst_Walls/npcs/Purere.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Walls --- NPC: Purere ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(311) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Walls/npcs/Quentin.lua b/scripts/zones/Windurst_Walls/npcs/Quentin.lua deleted file mode 100644 index 3d1618fec18..00000000000 --- a/scripts/zones/Windurst_Walls/npcs/Quentin.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Walls --- NPC: Quentin ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(334) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Walls/npcs/Raamimi.lua b/scripts/zones/Windurst_Walls/npcs/Raamimi.lua index 1b81e553041..86b12c1399a 100644 --- a/scripts/zones/Windurst_Walls/npcs/Raamimi.lua +++ b/scripts/zones/Windurst_Walls/npcs/Raamimi.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.WINDURST_WALLS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local toBee = player:getQuestStatus(xi.questLog.WINDURST, xi.quest.id.windurst.TO_BEE_OR_NOT_TO_BEE) local toBeeOrNotStatus = player:getCharVar('ToBeeOrNot_var') @@ -40,9 +37,6 @@ end -- player:startEvent(80) -- Quest Finish - Gives Mulsum -- player:startEvent(79) -- After Quest but before zoning: "it's certainly gotten quiet around here..." -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 67 then if player:getFreeSlotsCount() == 0 then diff --git a/scripts/zones/Windurst_Walls/npcs/Ran.lua b/scripts/zones/Windurst_Walls/npcs/Ran.lua index 8d4d39e3bf7..1c691b9d8be 100644 --- a/scripts/zones/Windurst_Walls/npcs/Ran.lua +++ b/scripts/zones/Windurst_Walls/npcs/Ran.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if math.random(1, 100) <= 50 then player:startEvent(272) @@ -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/Windurst_Walls/npcs/Rutango-Botango.lua b/scripts/zones/Windurst_Walls/npcs/Rutango-Botango.lua index 75c5425d9bd..429b5639439 100644 --- a/scripts/zones/Windurst_Walls/npcs/Rutango-Botango.lua +++ b/scripts/zones/Windurst_Walls/npcs/Rutango-Botango.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local toBee = player:getQuestStatus(xi.questLog.WINDURST, xi.quest.id.windurst.TO_BEE_OR_NOT_TO_BEE) local toBeeOrNotStatus = player:getCharVar('ToBeeOrNot_var') @@ -33,10 +30,5 @@ end -- Rutango-Botango CS 71 - player:startEvent(71) -- During Too Bee quest after some honey was given to Zayhi: "lap up more honey" -- *Rutango-Botango CS 75 - player:startEvent(75) -- Combo CS: During Too Bee quest, kicked off from Zayhi -- Rutango-Botango CS 76 - player:startEvent(76) -- After Too Bee quest but before zone: "master let me speak for you" -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end return entity diff --git a/scripts/zones/Windurst_Walls/npcs/Scavnix.lua b/scripts/zones/Windurst_Walls/npcs/Scavnix.lua index 8627b9d83fb..fe722447450 100644 --- a/scripts/zones/Windurst_Walls/npcs/Scavnix.lua +++ b/scripts/zones/Windurst_Walls/npcs/Scavnix.lua @@ -9,19 +9,10 @@ local ID = zones[xi.zone.WINDURST_WALLS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:sendGuild(60418, 11, 22, 6) then player:showText(npc, ID.text.SCAVNIX_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/Windurst_Walls/npcs/Selulu.lua b/scripts/zones/Windurst_Walls/npcs/Selulu.lua index e3deaf68dba..f92e278fe44 100644 --- a/scripts/zones/Windurst_Walls/npcs/Selulu.lua +++ b/scripts/zones/Windurst_Walls/npcs/Selulu.lua @@ -9,18 +9,9 @@ local ID = zones[xi.zone.WINDURST_WALLS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:showText(npc, ID.text.ITEM_DELIVERY_DIALOG) player:openSendBox() end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Windurst_Walls/npcs/Seven_of_Diamonds.lua b/scripts/zones/Windurst_Walls/npcs/Seven_of_Diamonds.lua index 134f3f6edd2..9e5b1a7bae4 100644 --- a/scripts/zones/Windurst_Walls/npcs/Seven_of_Diamonds.lua +++ b/scripts/zones/Windurst_Walls/npcs/Seven_of_Diamonds.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:hasKeyItem(xi.ki.RHINOSTERY_CERTIFICATE) then player:startEvent(390) @@ -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/Windurst_Walls/npcs/Shantotto.lua b/scripts/zones/Windurst_Walls/npcs/Shantotto.lua index 2219f3f69f2..6f7e854f1cd 100644 --- a/scripts/zones/Windurst_Walls/npcs/Shantotto.lua +++ b/scripts/zones/Windurst_Walls/npcs/Shantotto.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local wildcatWindurst = player:getCharVar('WildcatWindurst') diff --git a/scripts/zones/Windurst_Walls/npcs/Shinchai-Tocchai.lua b/scripts/zones/Windurst_Walls/npcs/Shinchai-Tocchai.lua deleted file mode 100644 index d22578f6128..00000000000 --- a/scripts/zones/Windurst_Walls/npcs/Shinchai-Tocchai.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Windurst Walls --- NPC: Shinchai-Tocchai --- Type: Moghouse Renter --- !pos -220.551 -0.001 -116.916 239 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(505) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Walls/npcs/Six_of_Diamonds.lua b/scripts/zones/Windurst_Walls/npcs/Six_of_Diamonds.lua deleted file mode 100644 index 0ff5716939a..00000000000 --- a/scripts/zones/Windurst_Walls/npcs/Six_of_Diamonds.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Walls --- NPC: Six of Diamonds ------------------------------------ ----@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/Windurst_Walls/npcs/Suhie-Kaihie.lua b/scripts/zones/Windurst_Walls/npcs/Suhie-Kaihie.lua index 028639984f2..fe11eaed5a6 100644 --- a/scripts/zones/Windurst_Walls/npcs/Suhie-Kaihie.lua +++ b/scripts/zones/Windurst_Walls/npcs/Suhie-Kaihie.lua @@ -17,17 +17,4 @@ entity.onSpawn = function(npc) npc:pathThrough(pathNodes, xi.path.flag.PATROL) end -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(291) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Windurst_Walls/npcs/Symphonic_Curator.lua b/scripts/zones/Windurst_Walls/npcs/Symphonic_Curator.lua index 1f207df2bd3..78532bbf338 100644 --- a/scripts/zones/Windurst_Walls/npcs/Symphonic_Curator.lua +++ b/scripts/zones/Windurst_Walls/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/Windurst_Walls/npcs/Takoda.lua b/scripts/zones/Windurst_Walls/npcs/Takoda.lua deleted file mode 100644 index 30a1e0cc4c0..00000000000 --- a/scripts/zones/Windurst_Walls/npcs/Takoda.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Walls --- NPC: Takoda ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(332) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Walls/npcs/Ten_of_Diamonds.lua b/scripts/zones/Windurst_Walls/npcs/Ten_of_Diamonds.lua deleted file mode 100644 index 38a536ee4af..00000000000 --- a/scripts/zones/Windurst_Walls/npcs/Ten_of_Diamonds.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Walls --- NPC: Ten of Diamonds ------------------------------------ ----@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/Windurst_Walls/npcs/Toi-Poi.lua b/scripts/zones/Windurst_Walls/npcs/Toi-Poi.lua deleted file mode 100644 index a17e75cf2f9..00000000000 --- a/scripts/zones/Windurst_Walls/npcs/Toi-Poi.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Walls --- NPC: Toi-Poi ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(308) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Walls/npcs/Trail_Markings.lua b/scripts/zones/Windurst_Walls/npcs/Trail_Markings.lua index 3ad71112786..f5c224ebdcb 100644 --- a/scripts/zones/Windurst_Walls/npcs/Trail_Markings.lua +++ b/scripts/zones/Windurst_Walls/npcs/Trail_Markings.lua @@ -7,16 +7,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.dynamis.entryNpcOnTrigger(player, npc) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.dynamis.entryNpcOnEventFinish(player, csid, option, npc) end diff --git a/scripts/zones/Windurst_Walls/npcs/Tsuaora-Tsuora.lua b/scripts/zones/Windurst_Walls/npcs/Tsuaora-Tsuora.lua index 5bf70fa26fa..1f069cfb23b 100644 --- a/scripts/zones/Windurst_Walls/npcs/Tsuaora-Tsuora.lua +++ b/scripts/zones/Windurst_Walls/npcs/Tsuaora-Tsuora.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getQuestStatus(xi.questLog.WINDURST, xi.quest.id.windurst.THE_POSTMAN_ALWAYS_KO_S_TWICE) == xi.questStatus.QUEST_ACCEPTED then player:startEvent(50) @@ -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/Windurst_Walls/npcs/Uwaine.lua b/scripts/zones/Windurst_Walls/npcs/Uwaine.lua deleted file mode 100644 index a640b56b6a8..00000000000 --- a/scripts/zones/Windurst_Walls/npcs/Uwaine.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Walls --- NPC: Uwaine ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(331) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Windurst_Walls/npcs/Yanakiki.lua b/scripts/zones/Windurst_Walls/npcs/Yanakiki.lua deleted file mode 100644 index 143c5849a53..00000000000 --- a/scripts/zones/Windurst_Walls/npcs/Yanakiki.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Windurst Walls --- NPC: Yanakiki ------------------------------------ ----@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/Windurst_Walls/npcs/Yoran-Oran.lua b/scripts/zones/Windurst_Walls/npcs/Yoran-Oran.lua index 6f9511e974e..1aca8810d58 100644 --- a/scripts/zones/Windurst_Walls/npcs/Yoran-Oran.lua +++ b/scripts/zones/Windurst_Walls/npcs/Yoran-Oran.lua @@ -34,9 +34,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 249 then player:addQuest(xi.questLog.WINDURST, xi.quest.id.windurst.MANDRAGORA_MAD) diff --git a/scripts/zones/Windurst_Walls/npcs/Yoriri.lua b/scripts/zones/Windurst_Walls/npcs/Yoriri.lua index 52f1fb519d7..38b516c4aa3 100644 --- a/scripts/zones/Windurst_Walls/npcs/Yoriri.lua +++ b/scripts/zones/Windurst_Walls/npcs/Yoriri.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local wildcatWindurst = player:getCharVar('WildcatWindurst') @@ -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 == 496 then player:setCharVar('WildcatWindurst', utils.mask.setBit(player:getCharVar('WildcatWindurst'), 5, true)) diff --git a/scripts/zones/Windurst_Walls/npcs/Zayhi-Bauhi.lua b/scripts/zones/Windurst_Walls/npcs/Zayhi-Bauhi.lua index 59fc8a645ab..fb4d416bb31 100644 --- a/scripts/zones/Windurst_Walls/npcs/Zayhi-Bauhi.lua +++ b/scripts/zones/Windurst_Walls/npcs/Zayhi-Bauhi.lua @@ -63,8 +63,6 @@ end -- player:startEvent(74) -- After Honey#4: Feels like its getting a lot better but there is still iritaion -- player:startEvent(75) -- After Honey#5: ToBee quest Finish (tooth hurts from all the Honey) -- player:startEvent(78) -- ToBee After Quest Finish but before zone (tooth still hurts) -entity.onEventUpdate = function(player, csid, option, npc) -end entity.onEventFinish = function(player, csid, option, npc) if csid == 64 then diff --git a/scripts/zones/Windurst_Walls/npcs/Zokima-Rokima.lua b/scripts/zones/Windurst_Walls/npcs/Zokima-Rokima.lua index aa90353d083..67c73278ac6 100644 --- a/scripts/zones/Windurst_Walls/npcs/Zokima-Rokima.lua +++ b/scripts/zones/Windurst_Walls/npcs/Zokima-Rokima.lua @@ -25,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/Windurst_Walls/npcs/_6n2.lua b/scripts/zones/Windurst_Walls/npcs/_6n2.lua index c4872b79a00..07223f1ecd0 100644 --- a/scripts/zones/Windurst_Walls/npcs/_6n2.lua +++ b/scripts/zones/Windurst_Walls/npcs/_6n2.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local thePuppetMaster = player:getQuestStatus(xi.questLog.WINDURST, xi.quest.id.windurst.THE_PUPPET_MASTER) local classReunion = player:getQuestStatus(xi.questLog.WINDURST, xi.quest.id.windurst.CLASS_REUNION) @@ -49,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) -- I CAN HEAR A RAINBOW if csid == 384 then diff --git a/scripts/zones/Windurst_Walls/npcs/_6n8.lua b/scripts/zones/Windurst_Walls/npcs/_6n8.lua index 0e75ec55170..6e3c96c3144 100644 --- a/scripts/zones/Windurst_Walls/npcs/_6n8.lua +++ b/scripts/zones/Windurst_Walls/npcs/_6n8.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local x = player:getXPos() local z = player:getZPos() @@ -24,10 +21,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity