From c475ad56e5c7910bf9a9cd4e989d9cfd7b8063f7 Mon Sep 17 00:00:00 2001 From: claywar Date: Mon, 20 Jan 2025 09:09:04 -0500 Subject: [PATCH 1/4] Remove empty NPCs, add Default Actions - Port Windurst --- .../zones/Port_Windurst/DefaultActions.lua | 66 +++++++++++++++++++ .../zones/Port_Windurst/npcs/AMAN_Liaison.lua | 3 - scripts/zones/Port_Windurst/npcs/Aigneis.lua | 21 ------ scripts/zones/Port_Windurst/npcs/Alizabe.lua | 9 --- scripts/zones/Port_Windurst/npcs/Aroro.lua | 9 --- scripts/zones/Port_Windurst/npcs/Babubu.lua | 9 --- .../zones/Port_Windurst/npcs/Baladanzo.lua | 21 ------ scripts/zones/Port_Windurst/npcs/Boronene.lua | 23 ------- .../zones/Port_Windurst/npcs/Breanainn.lua | 22 ------- scripts/zones/Port_Windurst/npcs/Calixte.lua | 21 ------ .../zones/Port_Windurst/npcs/Chakwaina.lua | 21 ------ .../zones/Port_Windurst/npcs/Chapa-Cha.lua | 21 ------ .../Port_Windurst/npcs/Choyi_Totlihpa.lua | 6 -- .../npcs/Curio_Vendor_Moogle.lua | 6 -- .../zones/Port_Windurst/npcs/Deeto-Yaato.lua | 21 ------ scripts/zones/Port_Windurst/npcs/Degong.lua | 6 -- .../Port_Windurst/npcs/Dehn_Harzhapan.lua | 22 ------- scripts/zones/Port_Windurst/npcs/Diegai.lua | 21 ------ scripts/zones/Port_Windurst/npcs/Drozga.lua | 9 --- .../Port_Windurst/npcs/Eight_of_Clubs.lua | 21 ------ scripts/zones/Port_Windurst/npcs/Enjojo.lua | 21 ------ .../Port_Windurst/npcs/Erabu-Fumulubu.lua | 6 -- scripts/zones/Port_Windurst/npcs/Eugie.lua | 21 ------ .../Port_Windurst/npcs/Explorer_Moogle.lua | 6 -- .../zones/Port_Windurst/npcs/Eya_Bhithroh.lua | 9 --- .../zones/Port_Windurst/npcs/Fabricius.lua | 3 - .../Port_Windurst/npcs/Five_of_Clubs.lua | 9 --- .../Port_Windurst/npcs/Four_of_Clubs.lua | 21 ------ scripts/zones/Port_Windurst/npcs/Goltata.lua | 9 --- scripts/zones/Port_Windurst/npcs/Griffyth.lua | 21 ------ .../Port_Windurst/npcs/Guruna-Maguruna.lua | 9 --- .../Port_Windurst/npcs/Hakkuru-Rinkuru.lua | 3 - .../zones/Port_Windurst/npcs/Hepo_Pinulpe.lua | 21 ------ .../Port_Windurst/npcs/Hohbiba-Mubiba.lua | 9 --- scripts/zones/Port_Windurst/npcs/Honorio.lua | 6 -- .../Port_Windurst/npcs/Hunt_Registry.lua | 3 - .../Port_Windurst/npcs/Jack_of_Clubs.lua | 6 -- .../Port_Windurst/npcs/Janshura-Rashura.lua | 6 -- .../zones/Port_Windurst/npcs/Jolwa-Moowa.lua | 21 ------ scripts/zones/Port_Windurst/npcs/Josefina.lua | 21 ------ scripts/zones/Port_Windurst/npcs/Kameel.lua | 9 --- .../Port_Windurst/npcs/Khel_Pahlhama.lua | 9 --- .../Port_Windurst/npcs/Kucha_Malkobhi.lua | 9 --- scripts/zones/Port_Windurst/npcs/Kumama.lua | 9 --- .../zones/Port_Windurst/npcs/Kunchichi.lua | 6 -- .../Port_Windurst/npcs/Kuroido-Moido.lua | 3 - scripts/zones/Port_Windurst/npcs/Kususu.lua | 9 --- .../Port_Windurst/npcs/Laughing_Lizard.lua | 21 ------ scripts/zones/Port_Windurst/npcs/Lebondur.lua | 9 --- .../zones/Port_Windurst/npcs/Maabu-Sonbu.lua | 21 ------ scripts/zones/Port_Windurst/npcs/Machichi.lua | 13 ---- .../zones/Port_Windurst/npcs/Machu-Kuchu.lua | 8 +-- scripts/zones/Port_Windurst/npcs/Martin.lua | 9 --- .../zones/Port_Windurst/npcs/Mefa_Euron.lua | 21 ------ scripts/zones/Port_Windurst/npcs/Melek.lua | 22 ------- .../zones/Port_Windurst/npcs/Mhe_Quryobhi.lua | 21 ------ .../Port_Windurst/npcs/Mhoji_Roccoruh.lua | 6 -- .../zones/Port_Windurst/npcs/Mojo-Pojo.lua | 13 ---- scripts/zones/Port_Windurst/npcs/Mosusu.lua | 13 ---- .../zones/Port_Windurst/npcs/Mov_Lingyoh.lua | 13 ---- .../Port_Windurst/npcs/Nbeh_Dimehbariga.lua | 21 ------ scripts/zones/Port_Windurst/npcs/Newlyn.lua | 22 ------- .../Port_Windurst/npcs/Nine_of_Clubs.lua | 22 ------- .../Port_Windurst/npcs/Noragu-Meragu.lua | 13 ---- scripts/zones/Port_Windurst/npcs/Ochacha.lua | 21 ------ scripts/zones/Port_Windurst/npcs/Odilia.lua | 22 ------- scripts/zones/Port_Windurst/npcs/Ohruru.lua | 6 -- scripts/zones/Port_Windurst/npcs/Opabibi.lua | 21 ------ .../zones/Port_Windurst/npcs/Pakku-Shakku.lua | 21 ------ .../zones/Port_Windurst/npcs/Panja-Nanja.lua | 6 -- .../Port_Windurst/npcs/Pankii-Mankii.lua | 21 ------ scripts/zones/Port_Windurst/npcs/Paruru.lua | 21 ------ scripts/zones/Port_Windurst/npcs/Pateruru.lua | 21 ------ .../Port_Windurst/npcs/Pattel-Bacchel.lua | 21 ------ scripts/zones/Port_Windurst/npcs/Paytah.lua | 22 ------- .../zones/Port_Windurst/npcs/Peepikiki.lua | 21 ------ .../zones/Port_Windurst/npcs/Pherchabalet.lua | 22 ------- .../Port_Windurst/npcs/Posso_Ruhbini.lua | 9 --- scripts/zones/Port_Windurst/npcs/Puo_Rhen.lua | 23 ------- .../zones/Port_Windurst/npcs/Pygmalion.lua | 22 ------- scripts/zones/Port_Windurst/npcs/Rachuchu.lua | 13 ---- .../Port_Windurst/npcs/Reiso-Haroiso.lua | 13 ---- scripts/zones/Port_Windurst/npcs/Remesasa.lua | 21 ------ scripts/zones/Port_Windurst/npcs/Rishi.lua | 21 ------ scripts/zones/Port_Windurst/npcs/Ryan.lua | 9 --- scripts/zones/Port_Windurst/npcs/Satata.lua | 25 ------- .../Port_Windurst/npcs/Sattsuh_Ahkanpari.lua | 9 --- .../Port_Windurst/npcs/Seburoa-Mabilua.lua | 21 ------ .../Port_Windurst/npcs/Seven_of_Clubs.lua | 13 ---- .../Port_Windurst/npcs/Sheia_Pohrichamaha.lua | 9 --- .../zones/Port_Windurst/npcs/Sigismund.lua | 3 - .../zones/Port_Windurst/npcs/Six_of_Clubs.lua | 21 ------ scripts/zones/Port_Windurst/npcs/Skopopo.lua | 21 ------ .../Port_Windurst/npcs/Snha_Migashniohra.lua | 21 ------ scripts/zones/Port_Windurst/npcs/Sugn.lua | 21 ------ .../Port_Windurst/npcs/Symphonic_Curator.lua | 3 - .../Port_Windurst/npcs/Synergy_Enthusiast.lua | 21 ------ .../Port_Windurst/npcs/Taniko-Maniko.lua | 9 --- .../zones/Port_Windurst/npcs/Ten_of_Clubs.lua | 22 ------- .../Port_Windurst/npcs/Teruga-Boruga.lua | 21 ------ .../Port_Windurst/npcs/Three_of_Clubs.lua | 6 -- .../Port_Windurst/npcs/Thubu_Parohren.lua | 3 - scripts/zones/Port_Windurst/npcs/Tohopka.lua | 9 --- scripts/zones/Port_Windurst/npcs/Tokaka.lua | 3 - scripts/zones/Port_Windurst/npcs/Tonule.lua | 23 ------- scripts/zones/Port_Windurst/npcs/Tujaja.lua | 21 ------ .../zones/Port_Windurst/npcs/Tun_Habyryu.lua | 21 ------ .../zones/Port_Windurst/npcs/Uli_Pehkowa.lua | 9 --- .../zones/Port_Windurst/npcs/Wanja-Daruja.lua | 21 ------ .../zones/Port_Windurst/npcs/Wau_Kaatapoh.lua | 21 ------ scripts/zones/Port_Windurst/npcs/Willis.lua | 3 - scripts/zones/Port_Windurst/npcs/Wynne.lua | 21 ------ .../Port_Windurst/npcs/Yaman-Hachuman.lua | 6 -- .../zones/Port_Windurst/npcs/Yapam-Alpam.lua | 21 ------ .../Port_Windurst/npcs/Yuhito-Kubhito.lua | 21 ------ scripts/zones/Port_Windurst/npcs/Yujuju.lua | 6 -- scripts/zones/Port_Windurst/npcs/Zoreen.lua | 9 --- scripts/zones/Port_Windurst/npcs/_6o6.lua | 6 -- scripts/zones/Port_Windurst/npcs/_6o7.lua | 22 ------- 119 files changed, 67 insertions(+), 1713 deletions(-) delete mode 100644 scripts/zones/Port_Windurst/npcs/Aigneis.lua delete mode 100644 scripts/zones/Port_Windurst/npcs/Baladanzo.lua delete mode 100644 scripts/zones/Port_Windurst/npcs/Boronene.lua delete mode 100644 scripts/zones/Port_Windurst/npcs/Breanainn.lua delete mode 100644 scripts/zones/Port_Windurst/npcs/Calixte.lua delete mode 100644 scripts/zones/Port_Windurst/npcs/Chakwaina.lua delete mode 100644 scripts/zones/Port_Windurst/npcs/Chapa-Cha.lua delete mode 100644 scripts/zones/Port_Windurst/npcs/Deeto-Yaato.lua delete mode 100644 scripts/zones/Port_Windurst/npcs/Dehn_Harzhapan.lua delete mode 100644 scripts/zones/Port_Windurst/npcs/Diegai.lua delete mode 100644 scripts/zones/Port_Windurst/npcs/Eight_of_Clubs.lua delete mode 100644 scripts/zones/Port_Windurst/npcs/Enjojo.lua delete mode 100644 scripts/zones/Port_Windurst/npcs/Eugie.lua delete mode 100644 scripts/zones/Port_Windurst/npcs/Four_of_Clubs.lua delete mode 100644 scripts/zones/Port_Windurst/npcs/Griffyth.lua delete mode 100644 scripts/zones/Port_Windurst/npcs/Hepo_Pinulpe.lua delete mode 100644 scripts/zones/Port_Windurst/npcs/Jolwa-Moowa.lua delete mode 100644 scripts/zones/Port_Windurst/npcs/Josefina.lua delete mode 100644 scripts/zones/Port_Windurst/npcs/Laughing_Lizard.lua delete mode 100644 scripts/zones/Port_Windurst/npcs/Maabu-Sonbu.lua delete mode 100644 scripts/zones/Port_Windurst/npcs/Mefa_Euron.lua delete mode 100644 scripts/zones/Port_Windurst/npcs/Melek.lua delete mode 100644 scripts/zones/Port_Windurst/npcs/Mhe_Quryobhi.lua delete mode 100644 scripts/zones/Port_Windurst/npcs/Nbeh_Dimehbariga.lua delete mode 100644 scripts/zones/Port_Windurst/npcs/Newlyn.lua delete mode 100644 scripts/zones/Port_Windurst/npcs/Nine_of_Clubs.lua delete mode 100644 scripts/zones/Port_Windurst/npcs/Ochacha.lua delete mode 100644 scripts/zones/Port_Windurst/npcs/Odilia.lua delete mode 100644 scripts/zones/Port_Windurst/npcs/Opabibi.lua delete mode 100644 scripts/zones/Port_Windurst/npcs/Pakku-Shakku.lua delete mode 100644 scripts/zones/Port_Windurst/npcs/Pankii-Mankii.lua delete mode 100644 scripts/zones/Port_Windurst/npcs/Paruru.lua delete mode 100644 scripts/zones/Port_Windurst/npcs/Pateruru.lua delete mode 100644 scripts/zones/Port_Windurst/npcs/Pattel-Bacchel.lua delete mode 100644 scripts/zones/Port_Windurst/npcs/Paytah.lua delete mode 100644 scripts/zones/Port_Windurst/npcs/Peepikiki.lua delete mode 100644 scripts/zones/Port_Windurst/npcs/Pherchabalet.lua delete mode 100644 scripts/zones/Port_Windurst/npcs/Puo_Rhen.lua delete mode 100644 scripts/zones/Port_Windurst/npcs/Pygmalion.lua delete mode 100644 scripts/zones/Port_Windurst/npcs/Remesasa.lua delete mode 100644 scripts/zones/Port_Windurst/npcs/Rishi.lua delete mode 100644 scripts/zones/Port_Windurst/npcs/Satata.lua delete mode 100644 scripts/zones/Port_Windurst/npcs/Seburoa-Mabilua.lua delete mode 100644 scripts/zones/Port_Windurst/npcs/Six_of_Clubs.lua delete mode 100644 scripts/zones/Port_Windurst/npcs/Skopopo.lua delete mode 100644 scripts/zones/Port_Windurst/npcs/Snha_Migashniohra.lua delete mode 100644 scripts/zones/Port_Windurst/npcs/Sugn.lua delete mode 100644 scripts/zones/Port_Windurst/npcs/Synergy_Enthusiast.lua delete mode 100644 scripts/zones/Port_Windurst/npcs/Ten_of_Clubs.lua delete mode 100644 scripts/zones/Port_Windurst/npcs/Teruga-Boruga.lua delete mode 100644 scripts/zones/Port_Windurst/npcs/Tonule.lua delete mode 100644 scripts/zones/Port_Windurst/npcs/Tujaja.lua delete mode 100644 scripts/zones/Port_Windurst/npcs/Tun_Habyryu.lua delete mode 100644 scripts/zones/Port_Windurst/npcs/Wanja-Daruja.lua delete mode 100644 scripts/zones/Port_Windurst/npcs/Wau_Kaatapoh.lua delete mode 100644 scripts/zones/Port_Windurst/npcs/Wynne.lua delete mode 100644 scripts/zones/Port_Windurst/npcs/Yapam-Alpam.lua delete mode 100644 scripts/zones/Port_Windurst/npcs/Yuhito-Kubhito.lua delete mode 100644 scripts/zones/Port_Windurst/npcs/_6o7.lua diff --git a/scripts/zones/Port_Windurst/DefaultActions.lua b/scripts/zones/Port_Windurst/DefaultActions.lua index d023de966e9..2505a7e0494 100644 --- a/scripts/zones/Port_Windurst/DefaultActions.lua +++ b/scripts/zones/Port_Windurst/DefaultActions.lua @@ -1,21 +1,87 @@ local ID = zones[xi.zone.PORT_WINDURST] return { + ['_6o7'] = { event = 182 }, ['Ada'] = { event = 44 }, + ['Aigneis'] = { event = 192 }, + ['Baladanzo'] = { event = 354 }, + ['Boronene'] = { event = 638 }, + ['Breanainn'] = { event = 182 }, + ['Calixte'] = { event = 46 }, + ['Chakwaina'] = { event = 350 }, + ['Chapa-Cha'] = { event = 216 }, ['Chipmy-Popmy'] = { event = 202 }, + ['Deeto-Yaato'] = { event = 336 }, + ['Dehn_Harzhapan'] = { event = 10018 }, + ['Diegai'] = { event = 355 }, + ['Eight_of_Clubs'] = { event = 219 }, ['Eki_Kamalabi'] = { event = 10005 }, + ['Enjojo'] = { event = 327 }, + ['Eugie'] = { event = 351 }, + ['Four_of_Clubs'] = { event = 218 }, ['Gold_Skull'] = { event = 43 }, ['Gomada-Vulmada'] = { event = 363 }, + ['Griffyth'] = { event = 352 }, ['Hakkuru-Rinkuru'] = { event = 224 }, + ['Hepo_Pinulpe'] = { event = 346 }, + ['Jolwa-Moowa'] = { event = 214 }, ['Josef'] = { event = 45 }, + ['Josefina'] = { event = 189 }, ['Kohlo-Lakolo'] = { event = 361 }, + ['Laughing_Lizard'] = { event = 618 }, + ['Maabu-Sonbu'] = { event = 227 }, + ['Machichi'] = { event = 325 }, + ['Mefa_Euron'] = { event = 347 }, ['Melek'] = { event = 42 }, + ['Mhe_Quryobhi'] = { event = 206 }, + ['Mojo-Pojo'] = { event = 229 }, + ['Mosusu'] = { event = 329 }, + ['Mov_Lingyoh'] = { event = 345 }, + ['Nbeh_Dimehbariga'] = { event = 342 }, + ['Newlyn'] = { event = 190 }, + ['Nine_of_Clubs'] = { event = 74 }, + ['Noragu-Meragu'] = { event = 236 }, + ['Ochacha'] = { event = 337 }, + ['Odilia'] = { event = 289 }, ['Odyssean_Passage'] = { messageSpecial = ID.text.NOTHING_HAPPENS }, + ['Opabibi'] = { event = 339 }, + ['Pakku-Shakku'] = { event = 217 }, + ['Pankii-Mankii'] = { event = 212 }, ['Papo-Hopo'] = { event = 362 }, + ['Paruru'] = { event = 331 }, + ['Pateruru'] = { event = 330 }, + ['Pattel-Bacchel'] = { event = 876 }, + ['Paytah'] = { event = 288 }, + ['Peepikiki'] = { event = 359 }, + ['Pherchabalet'] = { event = 553 }, ['Pichichi'] = { event = 364 }, + ['Puo_Rhen'] = { event = 72 }, + ['Pygmalion'] = { event = 10019 }, ['Pyo_Nzon'] = { event = 366 }, + ['Rachuchu'] = { event = 234 }, + ['Reiso-Haroiso'] = { event = 334 }, + ['Remesasa'] = { event = 333 }, + ['Rishi'] = { event = 188 }, + ['Satata'] = { event = 235 }, + ['Seburoa-Mabilua'] = { event = 194 }, + ['Seven_of_Clubs'] = { event = 220 }, ['Shanruru'] = { event = 367 }, + ['Six_of_Clubs'] = { event = 223 }, + ['Skopopo'] = { event = 332 }, + ['Snha_Migashniohra'] = { event = 343 }, + ['Sugn'] = { event = 353 }, ['Suspicious_Tarutaru'] = { event = 879 }, + ['Synergy_Enthusiast'] = { event = 12001 }, + ['Ten_of_Clubs'] = { event = 75 }, + ['Teruga-Boruga'] = { event = 335 }, ['Tokaka'] = { event = 207 }, + ['Tonule'] = { event = 551 }, + ['Tujaja'] = { event = 213 }, + ['Tun_Habyryu'] = { event = 348 }, + ['Wanja-Daruja'] = { event = 328 }, + ['Wau_Kaatapoh'] = { event = 195 }, + ['Wynne'] = { event = 356 }, ['Yafa_Yaa'] = { event = 365 }, + ['Yapam-Alpam'] = { event = 326 }, + ['Yuhito-Kubhito'] = { event = 447 }, } diff --git a/scripts/zones/Port_Windurst/npcs/AMAN_Liaison.lua b/scripts/zones/Port_Windurst/npcs/AMAN_Liaison.lua index 66e91d92fef..b21829d76c7 100644 --- a/scripts/zones/Port_Windurst/npcs/AMAN_Liaison.lua +++ b/scripts/zones/Port_Windurst/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/Port_Windurst/npcs/Aigneis.lua b/scripts/zones/Port_Windurst/npcs/Aigneis.lua deleted file mode 100644 index 73c4aeb1d5e..00000000000 --- a/scripts/zones/Port_Windurst/npcs/Aigneis.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port Windurst --- NPC: Aigneis ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(192) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_Windurst/npcs/Alizabe.lua b/scripts/zones/Port_Windurst/npcs/Alizabe.lua index 3e95b74103a..18f552439af 100644 --- a/scripts/zones/Port_Windurst/npcs/Alizabe.lua +++ b/scripts/zones/Port_Windurst/npcs/Alizabe.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.PORT_WINDURST] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getCurrentMission(xi.mission.log_id.COP) >= xi.mission.id.cop.THE_SAVAGE then if GetRegionOwner(xi.region.TAVNAZIANARCH) ~= xi.nation.WINDURST then @@ -33,10 +30,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Port_Windurst/npcs/Aroro.lua b/scripts/zones/Port_Windurst/npcs/Aroro.lua index 0a9c4e532b6..a0439363cc7 100644 --- a/scripts/zones/Port_Windurst/npcs/Aroro.lua +++ b/scripts/zones/Port_Windurst/npcs/Aroro.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.PORT_WINDURST] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -35,10 +32,4 @@ entity.onTrigger = function(player, npc) xi.shop.nation(player, stock, xi.nation.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/Port_Windurst/npcs/Babubu.lua b/scripts/zones/Port_Windurst/npcs/Babubu.lua index c17efabaf55..e7b8334e495 100644 --- a/scripts/zones/Port_Windurst/npcs/Babubu.lua +++ b/scripts/zones/Port_Windurst/npcs/Babubu.lua @@ -9,19 +9,10 @@ local ID = zones[xi.zone.PORT_WINDURST] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:sendGuild(517, 3, 18, 5) then player:showText(npc, ID.text.BABUBU_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/Port_Windurst/npcs/Baladanzo.lua b/scripts/zones/Port_Windurst/npcs/Baladanzo.lua deleted file mode 100644 index ac04c4a464f..00000000000 --- a/scripts/zones/Port_Windurst/npcs/Baladanzo.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port Windurst --- NPC: Baladanzo ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(354) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_Windurst/npcs/Boronene.lua b/scripts/zones/Port_Windurst/npcs/Boronene.lua deleted file mode 100644 index f3d8a4c7cfc..00000000000 --- a/scripts/zones/Port_Windurst/npcs/Boronene.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Port Windurst --- NPC: Boronene --- Type: Moghouse Renter --- !pos 201.651 -13 229.584 240 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(638) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_Windurst/npcs/Breanainn.lua b/scripts/zones/Port_Windurst/npcs/Breanainn.lua deleted file mode 100644 index db3589f91d0..00000000000 --- a/scripts/zones/Port_Windurst/npcs/Breanainn.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Port Windurst --- NPC: Breanainn --- !pos 212 -6 96 240 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(182) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_Windurst/npcs/Calixte.lua b/scripts/zones/Port_Windurst/npcs/Calixte.lua deleted file mode 100644 index ddfb0ab9769..00000000000 --- a/scripts/zones/Port_Windurst/npcs/Calixte.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port Windurst --- NPC: Calixte ------------------------------------ ----@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/Port_Windurst/npcs/Chakwaina.lua b/scripts/zones/Port_Windurst/npcs/Chakwaina.lua deleted file mode 100644 index 8c29d134b53..00000000000 --- a/scripts/zones/Port_Windurst/npcs/Chakwaina.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port Windurst --- NPC: Chakwaina ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(350) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_Windurst/npcs/Chapa-Cha.lua b/scripts/zones/Port_Windurst/npcs/Chapa-Cha.lua deleted file mode 100644 index eedfbaef0b4..00000000000 --- a/scripts/zones/Port_Windurst/npcs/Chapa-Cha.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port Windurst --- NPC: Chapa-Cha ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(216) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_Windurst/npcs/Choyi_Totlihpa.lua b/scripts/zones/Port_Windurst/npcs/Choyi_Totlihpa.lua index a5b29912565..024cb39de4b 100644 --- a/scripts/zones/Port_Windurst/npcs/Choyi_Totlihpa.lua +++ b/scripts/zones/Port_Windurst/npcs/Choyi_Totlihpa.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 == 622 then player:setCharVar('WildcatWindurst', utils.mask.setBit(player:getCharVar('WildcatWindurst'), 17, true)) diff --git a/scripts/zones/Port_Windurst/npcs/Curio_Vendor_Moogle.lua b/scripts/zones/Port_Windurst/npcs/Curio_Vendor_Moogle.lua index bf4c3cba960..478feeb6e35 100644 --- a/scripts/zones/Port_Windurst/npcs/Curio_Vendor_Moogle.lua +++ b/scripts/zones/Port_Windurst/npcs/Curio_Vendor_Moogle.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.RHAPSODY_IN_WHITE) then player:startEvent(9600) @@ -17,9 +14,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 9601 then if option >= 1 and option <= 6 then diff --git a/scripts/zones/Port_Windurst/npcs/Deeto-Yaato.lua b/scripts/zones/Port_Windurst/npcs/Deeto-Yaato.lua deleted file mode 100644 index 21440468175..00000000000 --- a/scripts/zones/Port_Windurst/npcs/Deeto-Yaato.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port Windurst --- NPC: Deeto-Yaato ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(336) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_Windurst/npcs/Degong.lua b/scripts/zones/Port_Windurst/npcs/Degong.lua index 14e7bcf4c23..16158e83fd5 100644 --- a/scripts/zones/Port_Windurst/npcs/Degong.lua +++ b/scripts/zones/Port_Windurst/npcs/Degong.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/Port_Windurst/npcs/Dehn_Harzhapan.lua b/scripts/zones/Port_Windurst/npcs/Dehn_Harzhapan.lua deleted file mode 100644 index ba79f7f86b8..00000000000 --- a/scripts/zones/Port_Windurst/npcs/Dehn_Harzhapan.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Port Windurst --- NPC: Dehn Harzhapan --- !pos -7.974 -7 152.633 240 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(10018) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_Windurst/npcs/Diegai.lua b/scripts/zones/Port_Windurst/npcs/Diegai.lua deleted file mode 100644 index 2f5e4b61ef9..00000000000 --- a/scripts/zones/Port_Windurst/npcs/Diegai.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port Windurst --- NPC: Deigai ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(355) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_Windurst/npcs/Drozga.lua b/scripts/zones/Port_Windurst/npcs/Drozga.lua index a239aac7f62..6e3f15ea1a4 100644 --- a/scripts/zones/Port_Windurst/npcs/Drozga.lua +++ b/scripts/zones/Port_Windurst/npcs/Drozga.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.PORT_WINDURST] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -27,10 +24,4 @@ entity.onTrigger = function(player, npc) xi.shop.general(player, stock, xi.fameArea.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/Port_Windurst/npcs/Eight_of_Clubs.lua b/scripts/zones/Port_Windurst/npcs/Eight_of_Clubs.lua deleted file mode 100644 index bff67375597..00000000000 --- a/scripts/zones/Port_Windurst/npcs/Eight_of_Clubs.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port Windurst --- NPC: Eight of Clubs ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(219) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_Windurst/npcs/Enjojo.lua b/scripts/zones/Port_Windurst/npcs/Enjojo.lua deleted file mode 100644 index a0b0198977f..00000000000 --- a/scripts/zones/Port_Windurst/npcs/Enjojo.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port Windurst --- NPC: Enjojo ------------------------------------ ----@type TNpcEntity -local entity = {} - -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/Port_Windurst/npcs/Erabu-Fumulubu.lua b/scripts/zones/Port_Windurst/npcs/Erabu-Fumulubu.lua index 093785671e0..3352817ba8c 100644 --- a/scripts/zones/Port_Windurst/npcs/Erabu-Fumulubu.lua +++ b/scripts/zones/Port_Windurst/npcs/Erabu-Fumulubu.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/Port_Windurst/npcs/Eugie.lua b/scripts/zones/Port_Windurst/npcs/Eugie.lua deleted file mode 100644 index 50fce8abbbd..00000000000 --- a/scripts/zones/Port_Windurst/npcs/Eugie.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port Windurst --- NPC: Eugie ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(351) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_Windurst/npcs/Explorer_Moogle.lua b/scripts/zones/Port_Windurst/npcs/Explorer_Moogle.lua index 1bd7f422b38..b01db82acbd 100644 --- a/scripts/zones/Port_Windurst/npcs/Explorer_Moogle.lua +++ b/scripts/zones/Port_Windurst/npcs/Explorer_Moogle.lua @@ -7,16 +7,10 @@ local entity = {} local eventId = 854 -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.teleport.explorerMoogleOnTrigger(player, eventId) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.teleport.explorerMoogleOnEventFinish(player, csid, option, eventId) end diff --git a/scripts/zones/Port_Windurst/npcs/Eya_Bhithroh.lua b/scripts/zones/Port_Windurst/npcs/Eya_Bhithroh.lua index b4f5a8adab0..062706b92b6 100644 --- a/scripts/zones/Port_Windurst/npcs/Eya_Bhithroh.lua +++ b/scripts/zones/Port_Windurst/npcs/Eya_Bhithroh.lua @@ -6,17 +6,8 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(10006, 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/Port_Windurst/npcs/Fabricius.lua b/scripts/zones/Port_Windurst/npcs/Fabricius.lua index 1fe2d43cee5..ec8f8915417 100644 --- a/scripts/zones/Port_Windurst/npcs/Fabricius.lua +++ b/scripts/zones/Port_Windurst/npcs/Fabricius.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.traverserNPCOnTrigger(player, npc) end diff --git a/scripts/zones/Port_Windurst/npcs/Five_of_Clubs.lua b/scripts/zones/Port_Windurst/npcs/Five_of_Clubs.lua index e44242ef1d4..ef1f88c84d7 100644 --- a/scripts/zones/Port_Windurst/npcs/Five_of_Clubs.lua +++ b/scripts/zones/Port_Windurst/npcs/Five_of_Clubs.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(448) @@ -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/Port_Windurst/npcs/Four_of_Clubs.lua b/scripts/zones/Port_Windurst/npcs/Four_of_Clubs.lua deleted file mode 100644 index d7f1270accb..00000000000 --- a/scripts/zones/Port_Windurst/npcs/Four_of_Clubs.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port Windurst --- NPC: Four of Clubs ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(218) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_Windurst/npcs/Goltata.lua b/scripts/zones/Port_Windurst/npcs/Goltata.lua index cd8dc8029ba..b587c694d60 100644 --- a/scripts/zones/Port_Windurst/npcs/Goltata.lua +++ b/scripts/zones/Port_Windurst/npcs/Goltata.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local wonderWands = player:getQuestStatus(xi.questLog.WINDURST, xi.quest.id.windurst.WONDER_WANDS) @@ -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/Port_Windurst/npcs/Griffyth.lua b/scripts/zones/Port_Windurst/npcs/Griffyth.lua deleted file mode 100644 index 9f297b23e1c..00000000000 --- a/scripts/zones/Port_Windurst/npcs/Griffyth.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port Windurst --- NPC: Griffyth ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(352) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_Windurst/npcs/Guruna-Maguruna.lua b/scripts/zones/Port_Windurst/npcs/Guruna-Maguruna.lua index 2f1111c9d51..3b75a4f6cbc 100644 --- a/scripts/zones/Port_Windurst/npcs/Guruna-Maguruna.lua +++ b/scripts/zones/Port_Windurst/npcs/Guruna-Maguruna.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.PORT_WINDURST] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -32,10 +29,4 @@ entity.onTrigger = function(player, npc) xi.shop.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/Port_Windurst/npcs/Hakkuru-Rinkuru.lua b/scripts/zones/Port_Windurst/npcs/Hakkuru-Rinkuru.lua index 59532aa006b..fa3fa86f0a5 100644 --- a/scripts/zones/Port_Windurst/npcs/Hakkuru-Rinkuru.lua +++ b/scripts/zones/Port_Windurst/npcs/Hakkuru-Rinkuru.lua @@ -69,9 +69,6 @@ entity.onTrigger = function(player, npc) -- End Wonder Wands Section end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 274 and option == 1 then player:addQuest(xi.questLog.WINDURST, xi.quest.id.windurst.MAKING_AMENDS) diff --git a/scripts/zones/Port_Windurst/npcs/Hepo_Pinulpe.lua b/scripts/zones/Port_Windurst/npcs/Hepo_Pinulpe.lua deleted file mode 100644 index f525e1f6ffc..00000000000 --- a/scripts/zones/Port_Windurst/npcs/Hepo_Pinulpe.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port Windurst --- NPC: Hepo Pinulpe ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(346) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_Windurst/npcs/Hohbiba-Mubiba.lua b/scripts/zones/Port_Windurst/npcs/Hohbiba-Mubiba.lua index bb0b348e8c8..8e85b247385 100644 --- a/scripts/zones/Port_Windurst/npcs/Hohbiba-Mubiba.lua +++ b/scripts/zones/Port_Windurst/npcs/Hohbiba-Mubiba.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.PORT_WINDURST] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -32,10 +29,4 @@ entity.onTrigger = function(player, npc) xi.shop.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/Port_Windurst/npcs/Honorio.lua b/scripts/zones/Port_Windurst/npcs/Honorio.lua index 44658ab385e..1752ec96e0b 100644 --- a/scripts/zones/Port_Windurst/npcs/Honorio.lua +++ b/scripts/zones/Port_Windurst/npcs/Honorio.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.AIRSHIP_PASS) and player:getGil() >= 200 then player:startEvent(181, 0, 8, 0, 0, 0, 0, 0, 200) @@ -17,9 +14,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 181 then local xPos = player:getXPos() diff --git a/scripts/zones/Port_Windurst/npcs/Hunt_Registry.lua b/scripts/zones/Port_Windurst/npcs/Hunt_Registry.lua index 7c943fbdf65..4159c80e942 100644 --- a/scripts/zones/Port_Windurst/npcs/Hunt_Registry.lua +++ b/scripts/zones/Port_Windurst/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/Port_Windurst/npcs/Jack_of_Clubs.lua b/scripts/zones/Port_Windurst/npcs/Jack_of_Clubs.lua index ab46736e2e8..60057a518be 100644 --- a/scripts/zones/Port_Windurst/npcs/Jack_of_Clubs.lua +++ b/scripts/zones/Port_Windurst/npcs/Jack_of_Clubs.lua @@ -21,10 +21,4 @@ entity.onTrigger = function(player, npc) player:startEvent(10007, 0, 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/Port_Windurst/npcs/Janshura-Rashura.lua b/scripts/zones/Port_Windurst/npcs/Janshura-Rashura.lua index 9e0e76665b7..501030613e7 100644 --- a/scripts/zones/Port_Windurst/npcs/Janshura-Rashura.lua +++ b/scripts/zones/Port_Windurst/npcs/Janshura-Rashura.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/Port_Windurst/npcs/Jolwa-Moowa.lua b/scripts/zones/Port_Windurst/npcs/Jolwa-Moowa.lua deleted file mode 100644 index 8a8445e8048..00000000000 --- a/scripts/zones/Port_Windurst/npcs/Jolwa-Moowa.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port Windurst --- NPC: Jolwa-Moowa ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(214) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_Windurst/npcs/Josefina.lua b/scripts/zones/Port_Windurst/npcs/Josefina.lua deleted file mode 100644 index 40b993212ed..00000000000 --- a/scripts/zones/Port_Windurst/npcs/Josefina.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port Windurst --- NPC: Josefina ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(189) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_Windurst/npcs/Kameel.lua b/scripts/zones/Port_Windurst/npcs/Kameel.lua index 314f85e7b3e..446f41ef423 100644 --- a/scripts/zones/Port_Windurst/npcs/Kameel.lua +++ b/scripts/zones/Port_Windurst/npcs/Kameel.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local vHour = VanadielHour() local vMin = VanadielMinute() @@ -27,10 +24,4 @@ entity.onTrigger = function(player, npc) player:startEvent(193, seconds, 0, 0, 0, 0, 0, 0, 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/Port_Windurst/npcs/Khel_Pahlhama.lua b/scripts/zones/Port_Windurst/npcs/Khel_Pahlhama.lua index 0d84ba808c8..64630f3ba2d 100644 --- a/scripts/zones/Port_Windurst/npcs/Khel_Pahlhama.lua +++ b/scripts/zones/Port_Windurst/npcs/Khel_Pahlhama.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.PORT_WINDURST] ---@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/Port_Windurst/npcs/Kucha_Malkobhi.lua b/scripts/zones/Port_Windurst/npcs/Kucha_Malkobhi.lua index 439dfd8ce7e..5290d8d9e60 100644 --- a/scripts/zones/Port_Windurst/npcs/Kucha_Malkobhi.lua +++ b/scripts/zones/Port_Windurst/npcs/Kucha_Malkobhi.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.PORT_WINDURST] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -27,10 +24,4 @@ entity.onTrigger = function(player, npc) xi.shop.general(player, stock) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Port_Windurst/npcs/Kumama.lua b/scripts/zones/Port_Windurst/npcs/Kumama.lua index 1258d6ceac7..aa51cf48b10 100644 --- a/scripts/zones/Port_Windurst/npcs/Kumama.lua +++ b/scripts/zones/Port_Windurst/npcs/Kumama.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.PORT_WINDURST] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -33,10 +30,4 @@ entity.onTrigger = function(player, npc) xi.shop.nation(player, stock, xi.nation.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/Port_Windurst/npcs/Kunchichi.lua b/scripts/zones/Port_Windurst/npcs/Kunchichi.lua index 2871ff8a7b6..0d3324c84be 100644 --- a/scripts/zones/Port_Windurst/npcs/Kunchichi.lua +++ b/scripts/zones/Port_Windurst/npcs/Kunchichi.lua @@ -10,9 +10,6 @@ entity.onSpawn = function(npc) npcUtil.castingAnimation(npc, xi.magic.spellGroup.BLACK, 16) end -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local wildcatWindurst = player:getCharVar('WildcatWindurst') @@ -26,9 +23,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 623 then player:setCharVar('WildcatWindurst', utils.mask.setBit(player:getCharVar('WildcatWindurst'), 15, true)) diff --git a/scripts/zones/Port_Windurst/npcs/Kuroido-Moido.lua b/scripts/zones/Port_Windurst/npcs/Kuroido-Moido.lua index 5a76c5dc9fc..91b0caf2c87 100644 --- a/scripts/zones/Port_Windurst/npcs/Kuroido-Moido.lua +++ b/scripts/zones/Port_Windurst/npcs/Kuroido-Moido.lua @@ -8,9 +8,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local makingAmends = player:getQuestStatus(xi.questLog.WINDURST, xi.quest.id.windurst.MAKING_AMENDS) --First quest in series local makingAmens = player:getQuestStatus(xi.questLog.WINDURST, xi.quest.id.windurst.MAKING_AMENS) --Second quest in series diff --git a/scripts/zones/Port_Windurst/npcs/Kususu.lua b/scripts/zones/Port_Windurst/npcs/Kususu.lua index 9ba19ad78ec..6abf640e3be 100644 --- a/scripts/zones/Port_Windurst/npcs/Kususu.lua +++ b/scripts/zones/Port_Windurst/npcs/Kususu.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.PORT_WINDURST] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -35,10 +32,4 @@ entity.onTrigger = function(player, npc) xi.shop.nation(player, stock, xi.nation.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/Port_Windurst/npcs/Laughing_Lizard.lua b/scripts/zones/Port_Windurst/npcs/Laughing_Lizard.lua deleted file mode 100644 index 355899bbb8f..00000000000 --- a/scripts/zones/Port_Windurst/npcs/Laughing_Lizard.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port Windurst --- NPC: Laughing Lizard ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(618) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_Windurst/npcs/Lebondur.lua b/scripts/zones/Port_Windurst/npcs/Lebondur.lua index 8548e976fc6..914ca184c04 100644 --- a/scripts/zones/Port_Windurst/npcs/Lebondur.lua +++ b/scripts/zones/Port_Windurst/npcs/Lebondur.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.PORT_WINDURST] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if GetRegionOwner(xi.region.VOLLBOW) ~= xi.nation.WINDURST then player:showText(npc, ID.text.LEBONDUR_CLOSED_DIALOG) @@ -28,10 +25,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Port_Windurst/npcs/Maabu-Sonbu.lua b/scripts/zones/Port_Windurst/npcs/Maabu-Sonbu.lua deleted file mode 100644 index 12434d80f23..00000000000 --- a/scripts/zones/Port_Windurst/npcs/Maabu-Sonbu.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port Windurst --- NPC: Maabu-Sonbu ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(227) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_Windurst/npcs/Machichi.lua b/scripts/zones/Port_Windurst/npcs/Machichi.lua index b8c5614afb1..9c564a05cf7 100644 --- a/scripts/zones/Port_Windurst/npcs/Machichi.lua +++ b/scripts/zones/Port_Windurst/npcs/Machichi.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(325) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Port_Windurst/npcs/Machu-Kuchu.lua b/scripts/zones/Port_Windurst/npcs/Machu-Kuchu.lua index 7d5c90380f4..10735b31925 100644 --- a/scripts/zones/Port_Windurst/npcs/Machu-Kuchu.lua +++ b/scripts/zones/Port_Windurst/npcs/Machu-Kuchu.lua @@ -6,19 +6,13 @@ ---@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(65.534, -7.5, -49.935, 59, 239) -- Retail packet capped + player:setPos(65.534, -7.5, -49.935, 59, 239) end end diff --git a/scripts/zones/Port_Windurst/npcs/Martin.lua b/scripts/zones/Port_Windurst/npcs/Martin.lua index 8c067f83ce4..723aa94996f 100644 --- a/scripts/zones/Port_Windurst/npcs/Martin.lua +++ b/scripts/zones/Port_Windurst/npcs/Martin.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local vHour = VanadielHour() local vMin = VanadielMinute() @@ -27,10 +24,4 @@ entity.onTrigger = function(player, npc) player:startEvent(628, seconds, 0, 0, 0, 0, 0, 0, 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/Port_Windurst/npcs/Mefa_Euron.lua b/scripts/zones/Port_Windurst/npcs/Mefa_Euron.lua deleted file mode 100644 index 2f4b62095e1..00000000000 --- a/scripts/zones/Port_Windurst/npcs/Mefa_Euron.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port Windurst --- NPC: Mefa Euron ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(347) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_Windurst/npcs/Melek.lua b/scripts/zones/Port_Windurst/npcs/Melek.lua deleted file mode 100644 index 5dd56bb367f..00000000000 --- a/scripts/zones/Port_Windurst/npcs/Melek.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Port Windurst --- NPC: Melek --- Involved in Mission 2-3 --- !pos -80 -5 158 240 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) - end - -return entity diff --git a/scripts/zones/Port_Windurst/npcs/Mhe_Quryobhi.lua b/scripts/zones/Port_Windurst/npcs/Mhe_Quryobhi.lua deleted file mode 100644 index 55b1d8b605a..00000000000 --- a/scripts/zones/Port_Windurst/npcs/Mhe_Quryobhi.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port Windurst --- NPC: Mhe Quryobhi ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(206) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_Windurst/npcs/Mhoji_Roccoruh.lua b/scripts/zones/Port_Windurst/npcs/Mhoji_Roccoruh.lua index 2bc1a19c2c9..8c1932de6d0 100644 --- a/scripts/zones/Port_Windurst/npcs/Mhoji_Roccoruh.lua +++ b/scripts/zones/Port_Windurst/npcs/Mhoji_Roccoruh.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/Port_Windurst/npcs/Mojo-Pojo.lua b/scripts/zones/Port_Windurst/npcs/Mojo-Pojo.lua index 0f8af8d4853..bee92cb57fa 100644 --- a/scripts/zones/Port_Windurst/npcs/Mojo-Pojo.lua +++ b/scripts/zones/Port_Windurst/npcs/Mojo-Pojo.lua @@ -10,17 +10,4 @@ entity.onSpawn = function(npc) npcUtil.castingAnimation(npc, xi.magic.spellGroup.BLACK, 14) end -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(229) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Port_Windurst/npcs/Mosusu.lua b/scripts/zones/Port_Windurst/npcs/Mosusu.lua index d0c8290c00a..763bd979a9f 100644 --- a/scripts/zones/Port_Windurst/npcs/Mosusu.lua +++ b/scripts/zones/Port_Windurst/npcs/Mosusu.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(329) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Port_Windurst/npcs/Mov_Lingyoh.lua b/scripts/zones/Port_Windurst/npcs/Mov_Lingyoh.lua index 55dba1f1203..9f763ec8511 100644 --- a/scripts/zones/Port_Windurst/npcs/Mov_Lingyoh.lua +++ b/scripts/zones/Port_Windurst/npcs/Mov_Lingyoh.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(345) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Port_Windurst/npcs/Nbeh_Dimehbariga.lua b/scripts/zones/Port_Windurst/npcs/Nbeh_Dimehbariga.lua deleted file mode 100644 index c2727ac7ec0..00000000000 --- a/scripts/zones/Port_Windurst/npcs/Nbeh_Dimehbariga.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port Windurst --- NPC: Nbeh Dimehbariga ------------------------------------ ----@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/Port_Windurst/npcs/Newlyn.lua b/scripts/zones/Port_Windurst/npcs/Newlyn.lua deleted file mode 100644 index f20f1a6669f..00000000000 --- a/scripts/zones/Port_Windurst/npcs/Newlyn.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Port Windurst --- NPC: Newlyn --- !pos 200.673 -6.601 108.665 240 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(190) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_Windurst/npcs/Nine_of_Clubs.lua b/scripts/zones/Port_Windurst/npcs/Nine_of_Clubs.lua deleted file mode 100644 index 3b3d19de359..00000000000 --- a/scripts/zones/Port_Windurst/npcs/Nine_of_Clubs.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Port Windurst --- NPC: Nine of Clubs --- !pos -229.699 -9 185.686 240 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(74) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_Windurst/npcs/Noragu-Meragu.lua b/scripts/zones/Port_Windurst/npcs/Noragu-Meragu.lua index 9e2a6baf52c..190f3ec031a 100644 --- a/scripts/zones/Port_Windurst/npcs/Noragu-Meragu.lua +++ b/scripts/zones/Port_Windurst/npcs/Noragu-Meragu.lua @@ -9,17 +9,4 @@ entity.onSpawn = function(npc) npcUtil.castingAnimation(npc, xi.magic.spellGroup.BLACK, 10) end -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(236) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Port_Windurst/npcs/Ochacha.lua b/scripts/zones/Port_Windurst/npcs/Ochacha.lua deleted file mode 100644 index 64ac8a88f5d..00000000000 --- a/scripts/zones/Port_Windurst/npcs/Ochacha.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port Windurst --- NPC: Ochacha ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(337) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_Windurst/npcs/Odilia.lua b/scripts/zones/Port_Windurst/npcs/Odilia.lua deleted file mode 100644 index eb1334b2188..00000000000 --- a/scripts/zones/Port_Windurst/npcs/Odilia.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Port Windurst --- NPC: Odilia --- !pos 78.801 -6 118.653 240 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(289) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_Windurst/npcs/Ohruru.lua b/scripts/zones/Port_Windurst/npcs/Ohruru.lua index a52497534b4..be8a84843ee 100644 --- a/scripts/zones/Port_Windurst/npcs/Ohruru.lua +++ b/scripts/zones/Port_Windurst/npcs/Ohruru.lua @@ -9,9 +9,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local catch = player:getQuestStatus(xi.questLog.WINDURST, xi.quest.id.windurst.CATCH_IT_IF_YOU_CAN) local wonderWands = player:getQuestStatus(xi.questLog.WINDURST, xi.quest.id.windurst.WONDER_WANDS) @@ -60,9 +57,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 231 then player:addQuest(xi.questLog.WINDURST, xi.quest.id.windurst.CATCH_IT_IF_YOU_CAN) diff --git a/scripts/zones/Port_Windurst/npcs/Opabibi.lua b/scripts/zones/Port_Windurst/npcs/Opabibi.lua deleted file mode 100644 index f56a99d25f3..00000000000 --- a/scripts/zones/Port_Windurst/npcs/Opabibi.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port Windurst --- NPC: Opabibi ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(339) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_Windurst/npcs/Pakku-Shakku.lua b/scripts/zones/Port_Windurst/npcs/Pakku-Shakku.lua deleted file mode 100644 index 56026c68fac..00000000000 --- a/scripts/zones/Port_Windurst/npcs/Pakku-Shakku.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port Windurst --- NPC: Pakku-Shakku ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(217) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_Windurst/npcs/Panja-Nanja.lua b/scripts/zones/Port_Windurst/npcs/Panja-Nanja.lua index 7bb0a45d013..791b7c821db 100644 --- a/scripts/zones/Port_Windurst/npcs/Panja-Nanja.lua +++ b/scripts/zones/Port_Windurst/npcs/Panja-Nanja.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/Port_Windurst/npcs/Pankii-Mankii.lua b/scripts/zones/Port_Windurst/npcs/Pankii-Mankii.lua deleted file mode 100644 index 7eef2d13b7a..00000000000 --- a/scripts/zones/Port_Windurst/npcs/Pankii-Mankii.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port Windurst --- NPC: Pankii-Mankii ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(212) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_Windurst/npcs/Paruru.lua b/scripts/zones/Port_Windurst/npcs/Paruru.lua deleted file mode 100644 index 23193154579..00000000000 --- a/scripts/zones/Port_Windurst/npcs/Paruru.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port Windurst --- NPC: Paruru ------------------------------------ ----@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/Port_Windurst/npcs/Pateruru.lua b/scripts/zones/Port_Windurst/npcs/Pateruru.lua deleted file mode 100644 index 54c6d405b10..00000000000 --- a/scripts/zones/Port_Windurst/npcs/Pateruru.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port Windurst --- NPC: Pateruru ------------------------------------ ----@type TNpcEntity -local entity = {} - -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/Port_Windurst/npcs/Pattel-Bacchel.lua b/scripts/zones/Port_Windurst/npcs/Pattel-Bacchel.lua deleted file mode 100644 index 33a619a30bf..00000000000 --- a/scripts/zones/Port_Windurst/npcs/Pattel-Bacchel.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port Windurst --- NPC: Pattel Bacchel ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(876) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_Windurst/npcs/Paytah.lua b/scripts/zones/Port_Windurst/npcs/Paytah.lua deleted file mode 100644 index eec36b7c0f9..00000000000 --- a/scripts/zones/Port_Windurst/npcs/Paytah.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Port Windurst --- NPC: Paytah --- !pos 77.550 -6 117.769 240 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(288) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_Windurst/npcs/Peepikiki.lua b/scripts/zones/Port_Windurst/npcs/Peepikiki.lua deleted file mode 100644 index 275688b58c3..00000000000 --- a/scripts/zones/Port_Windurst/npcs/Peepikiki.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port Windurst --- NPC: Peepikiki ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(359) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_Windurst/npcs/Pherchabalet.lua b/scripts/zones/Port_Windurst/npcs/Pherchabalet.lua deleted file mode 100644 index cbb930fe47c..00000000000 --- a/scripts/zones/Port_Windurst/npcs/Pherchabalet.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Port Windurst --- NPC: Pherchabalet --- !pos 34.683 -5.999 137.447 240 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(553) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_Windurst/npcs/Posso_Ruhbini.lua b/scripts/zones/Port_Windurst/npcs/Posso_Ruhbini.lua index 13aaa7b33b7..c583e0359c7 100644 --- a/scripts/zones/Port_Windurst/npcs/Posso_Ruhbini.lua +++ b/scripts/zones/Port_Windurst/npcs/Posso_Ruhbini.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.PORT_WINDURST] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if GetRegionOwner(xi.region.NORVALLEN) ~= xi.nation.WINDURST then player:showText(npc, ID.text.POSSORUHBINI_CLOSED_DIALOG) @@ -28,10 +25,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Port_Windurst/npcs/Puo_Rhen.lua b/scripts/zones/Port_Windurst/npcs/Puo_Rhen.lua deleted file mode 100644 index ae88cc07138..00000000000 --- a/scripts/zones/Port_Windurst/npcs/Puo_Rhen.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Port Windurst --- NPC: Puo Rhen --- Type: Mission Starter --- !pos -227.964 -9 187.087 240 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(72) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_Windurst/npcs/Pygmalion.lua b/scripts/zones/Port_Windurst/npcs/Pygmalion.lua deleted file mode 100644 index ab8005d5021..00000000000 --- a/scripts/zones/Port_Windurst/npcs/Pygmalion.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Port Windurst --- NPC: Pygmalion --- !pos 228.710 -7 93.314 240 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(10019) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_Windurst/npcs/Rachuchu.lua b/scripts/zones/Port_Windurst/npcs/Rachuchu.lua index db19c75e826..062aaf69475 100644 --- a/scripts/zones/Port_Windurst/npcs/Rachuchu.lua +++ b/scripts/zones/Port_Windurst/npcs/Rachuchu.lua @@ -9,17 +9,4 @@ entity.onSpawn = function(npc) npcUtil.castingAnimation(npc, xi.magic.spellGroup.WHITE, 10.5) end -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(234) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Port_Windurst/npcs/Reiso-Haroiso.lua b/scripts/zones/Port_Windurst/npcs/Reiso-Haroiso.lua index a40e3822ce9..ab14c5de973 100644 --- a/scripts/zones/Port_Windurst/npcs/Reiso-Haroiso.lua +++ b/scripts/zones/Port_Windurst/npcs/Reiso-Haroiso.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(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/Port_Windurst/npcs/Remesasa.lua b/scripts/zones/Port_Windurst/npcs/Remesasa.lua deleted file mode 100644 index 074c4ea9df1..00000000000 --- a/scripts/zones/Port_Windurst/npcs/Remesasa.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port Windurst --- NPC: Remesasa ------------------------------------ ----@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/Port_Windurst/npcs/Rishi.lua b/scripts/zones/Port_Windurst/npcs/Rishi.lua deleted file mode 100644 index 49796803c89..00000000000 --- a/scripts/zones/Port_Windurst/npcs/Rishi.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port Windurst --- NPC: Rishi ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(188) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_Windurst/npcs/Ryan.lua b/scripts/zones/Port_Windurst/npcs/Ryan.lua index 481125860f3..387f519786e 100644 --- a/scripts/zones/Port_Windurst/npcs/Ryan.lua +++ b/scripts/zones/Port_Windurst/npcs/Ryan.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.PORT_WINDURST] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -34,10 +31,4 @@ entity.onTrigger = function(player, npc) xi.shop.general(player, stock, 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/Port_Windurst/npcs/Satata.lua b/scripts/zones/Port_Windurst/npcs/Satata.lua deleted file mode 100644 index 6569a305b5c..00000000000 --- a/scripts/zones/Port_Windurst/npcs/Satata.lua +++ /dev/null @@ -1,25 +0,0 @@ ------------------------------------ --- Area: Port Windurst --- NPC: Satata ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onSpawn = function(npc) - npcUtil.castingAnimation(npc, xi.magic.spellGroup.BLACK, 12) -end - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(235) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_Windurst/npcs/Sattsuh_Ahkanpari.lua b/scripts/zones/Port_Windurst/npcs/Sattsuh_Ahkanpari.lua index 3278117947c..783949bb21a 100644 --- a/scripts/zones/Port_Windurst/npcs/Sattsuh_Ahkanpari.lua +++ b/scripts/zones/Port_Windurst/npcs/Sattsuh_Ahkanpari.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.PORT_WINDURST] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if GetRegionOwner(xi.region.ELSHIMOUPLANDS) ~= xi.nation.WINDURST then player:showText(npc, ID.text.SATTSUHAHKANPARI_CLOSED_DIALOG) @@ -28,10 +25,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Port_Windurst/npcs/Seburoa-Mabilua.lua b/scripts/zones/Port_Windurst/npcs/Seburoa-Mabilua.lua deleted file mode 100644 index cc0dca530cc..00000000000 --- a/scripts/zones/Port_Windurst/npcs/Seburoa-Mabilua.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port Windurst --- NPC: Seburoa-Mabilua ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(194) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_Windurst/npcs/Seven_of_Clubs.lua b/scripts/zones/Port_Windurst/npcs/Seven_of_Clubs.lua index 22427e4bbb3..7cd5f5c4732 100644 --- a/scripts/zones/Port_Windurst/npcs/Seven_of_Clubs.lua +++ b/scripts/zones/Port_Windurst/npcs/Seven_of_Clubs.lua @@ -20,17 +20,4 @@ entity.onSpawn = function(npc) npc:pathThrough(pathNodes, xi.path.flag.PATROL) end -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(220) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Port_Windurst/npcs/Sheia_Pohrichamaha.lua b/scripts/zones/Port_Windurst/npcs/Sheia_Pohrichamaha.lua index 6b0afc0f2a8..fb1a09b441b 100644 --- a/scripts/zones/Port_Windurst/npcs/Sheia_Pohrichamaha.lua +++ b/scripts/zones/Port_Windurst/npcs/Sheia_Pohrichamaha.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.PORT_WINDURST] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if GetRegionOwner(xi.region.FAUREGANDI) ~= xi.nation.WINDURST then player:showText(npc, ID.text.SHEIAPOHRICHAMAHA_CLOSED_DIALOG) @@ -27,10 +24,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Port_Windurst/npcs/Sigismund.lua b/scripts/zones/Port_Windurst/npcs/Sigismund.lua index 694a809e1da..c33d2257d1a 100644 --- a/scripts/zones/Port_Windurst/npcs/Sigismund.lua +++ b/scripts/zones/Port_Windurst/npcs/Sigismund.lua @@ -38,9 +38,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 == 196 then player:addQuest(xi.questLog.WINDURST, xi.quest.id.windurst.TO_CATCH_A_FALLING_STAR) diff --git a/scripts/zones/Port_Windurst/npcs/Six_of_Clubs.lua b/scripts/zones/Port_Windurst/npcs/Six_of_Clubs.lua deleted file mode 100644 index 809df6e51f0..00000000000 --- a/scripts/zones/Port_Windurst/npcs/Six_of_Clubs.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port Windurst --- NPC: Six of Clubs ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(223) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_Windurst/npcs/Skopopo.lua b/scripts/zones/Port_Windurst/npcs/Skopopo.lua deleted file mode 100644 index e8cb7139d35..00000000000 --- a/scripts/zones/Port_Windurst/npcs/Skopopo.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port Windurst --- NPC: Skopopo ------------------------------------ ----@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/Port_Windurst/npcs/Snha_Migashniohra.lua b/scripts/zones/Port_Windurst/npcs/Snha_Migashniohra.lua deleted file mode 100644 index 430f1f1a087..00000000000 --- a/scripts/zones/Port_Windurst/npcs/Snha_Migashniohra.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port Windurst --- NPC: Snha Migashniohra ------------------------------------ ----@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/Port_Windurst/npcs/Sugn.lua b/scripts/zones/Port_Windurst/npcs/Sugn.lua deleted file mode 100644 index 074395e957a..00000000000 --- a/scripts/zones/Port_Windurst/npcs/Sugn.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port Windurst --- NPC: Sugn ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(353) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_Windurst/npcs/Symphonic_Curator.lua b/scripts/zones/Port_Windurst/npcs/Symphonic_Curator.lua index 1f207df2bd3..78532bbf338 100644 --- a/scripts/zones/Port_Windurst/npcs/Symphonic_Curator.lua +++ b/scripts/zones/Port_Windurst/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/Port_Windurst/npcs/Synergy_Enthusiast.lua b/scripts/zones/Port_Windurst/npcs/Synergy_Enthusiast.lua deleted file mode 100644 index 360e9e282b5..00000000000 --- a/scripts/zones/Port_Windurst/npcs/Synergy_Enthusiast.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port Windurst --- NPC: Synergy Enthusiast ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(12001) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_Windurst/npcs/Taniko-Maniko.lua b/scripts/zones/Port_Windurst/npcs/Taniko-Maniko.lua index 7740fd6339b..78e8cf73380 100644 --- a/scripts/zones/Port_Windurst/npcs/Taniko-Maniko.lua +++ b/scripts/zones/Port_Windurst/npcs/Taniko-Maniko.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.PORT_WINDURST] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -34,10 +31,4 @@ entity.onTrigger = function(player, npc) xi.shop.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/Port_Windurst/npcs/Ten_of_Clubs.lua b/scripts/zones/Port_Windurst/npcs/Ten_of_Clubs.lua deleted file mode 100644 index 097a7869407..00000000000 --- a/scripts/zones/Port_Windurst/npcs/Ten_of_Clubs.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Port Windurst --- NPC: Ten of Clubs --- !pos -229.393 -9.2 182.696 240 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(75) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_Windurst/npcs/Teruga-Boruga.lua b/scripts/zones/Port_Windurst/npcs/Teruga-Boruga.lua deleted file mode 100644 index d9c9394fc50..00000000000 --- a/scripts/zones/Port_Windurst/npcs/Teruga-Boruga.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port Windurst --- NPC: Teruga-Boruga ------------------------------------ ----@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/Port_Windurst/npcs/Three_of_Clubs.lua b/scripts/zones/Port_Windurst/npcs/Three_of_Clubs.lua index c4be025d661..225642aa532 100644 --- a/scripts/zones/Port_Windurst/npcs/Three_of_Clubs.lua +++ b/scripts/zones/Port_Windurst/npcs/Three_of_Clubs.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 == 625 then player:setCharVar('WildcatWindurst', utils.mask.setBit(player:getCharVar('WildcatWindurst'), 18, true)) diff --git a/scripts/zones/Port_Windurst/npcs/Thubu_Parohren.lua b/scripts/zones/Port_Windurst/npcs/Thubu_Parohren.lua index c4e4144928a..93c22c382e4 100644 --- a/scripts/zones/Port_Windurst/npcs/Thubu_Parohren.lua +++ b/scripts/zones/Port_Windurst/npcs/Thubu_Parohren.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/Port_Windurst/npcs/Tohopka.lua b/scripts/zones/Port_Windurst/npcs/Tohopka.lua index be354b1b8d9..2204a8f8777 100644 --- a/scripts/zones/Port_Windurst/npcs/Tohopka.lua +++ b/scripts/zones/Port_Windurst/npcs/Tohopka.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.TO_CATCH_A_FALLING_STAR) @@ -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/Port_Windurst/npcs/Tokaka.lua b/scripts/zones/Port_Windurst/npcs/Tokaka.lua index aec237a9ba1..f465f1f9934 100644 --- a/scripts/zones/Port_Windurst/npcs/Tokaka.lua +++ b/scripts/zones/Port_Windurst/npcs/Tokaka.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 == 208 then player:addQuest(xi.questLog.WINDURST, xi.quest.id.windurst.SOMETHING_FISHY) diff --git a/scripts/zones/Port_Windurst/npcs/Tonule.lua b/scripts/zones/Port_Windurst/npcs/Tonule.lua deleted file mode 100644 index 9c7c8ce44d5..00000000000 --- a/scripts/zones/Port_Windurst/npcs/Tonule.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Port Windurst --- NPC: Tonule --- Type: Event Replayer --- !pos -209.385 -9.117 195.217 240 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(551) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_Windurst/npcs/Tujaja.lua b/scripts/zones/Port_Windurst/npcs/Tujaja.lua deleted file mode 100644 index 51033e0d5fe..00000000000 --- a/scripts/zones/Port_Windurst/npcs/Tujaja.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port Windurst --- NPC: Tujaja ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(213) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_Windurst/npcs/Tun_Habyryu.lua b/scripts/zones/Port_Windurst/npcs/Tun_Habyryu.lua deleted file mode 100644 index 74066f3bc0b..00000000000 --- a/scripts/zones/Port_Windurst/npcs/Tun_Habyryu.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port Windurst --- NPC: Tun Habyryu ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(348) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_Windurst/npcs/Uli_Pehkowa.lua b/scripts/zones/Port_Windurst/npcs/Uli_Pehkowa.lua index f2020614af7..650c55b37ca 100644 --- a/scripts/zones/Port_Windurst/npcs/Uli_Pehkowa.lua +++ b/scripts/zones/Port_Windurst/npcs/Uli_Pehkowa.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.PORT_WINDURST] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -29,10 +26,4 @@ entity.onTrigger = function(player, npc) xi.shop.nation(player, stock, xi.nation.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/Port_Windurst/npcs/Wanja-Daruja.lua b/scripts/zones/Port_Windurst/npcs/Wanja-Daruja.lua deleted file mode 100644 index 6f2ecee0691..00000000000 --- a/scripts/zones/Port_Windurst/npcs/Wanja-Daruja.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port Windurst --- NPC: Wanja-Daruja ------------------------------------ ----@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/Port_Windurst/npcs/Wau_Kaatapoh.lua b/scripts/zones/Port_Windurst/npcs/Wau_Kaatapoh.lua deleted file mode 100644 index 084dfd76fa0..00000000000 --- a/scripts/zones/Port_Windurst/npcs/Wau_Kaatapoh.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port Windurst --- NPC: Wau Kaatapoh ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(195) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_Windurst/npcs/Willis.lua b/scripts/zones/Port_Windurst/npcs/Willis.lua index 2efdb7fd937..59819a0e355 100644 --- a/scripts/zones/Port_Windurst/npcs/Willis.lua +++ b/scripts/zones/Port_Windurst/npcs/Willis.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.warpNPCOnTrigger(player, npc) end diff --git a/scripts/zones/Port_Windurst/npcs/Wynne.lua b/scripts/zones/Port_Windurst/npcs/Wynne.lua deleted file mode 100644 index e5071643652..00000000000 --- a/scripts/zones/Port_Windurst/npcs/Wynne.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port Windurst --- NPC: Wynne ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(356) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_Windurst/npcs/Yaman-Hachuman.lua b/scripts/zones/Port_Windurst/npcs/Yaman-Hachuman.lua index e410daaa2ef..e547ca5a25b 100644 --- a/scripts/zones/Port_Windurst/npcs/Yaman-Hachuman.lua +++ b/scripts/zones/Port_Windurst/npcs/Yaman-Hachuman.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local wonderWands = player:getQuestStatus(xi.questLog.WINDURST, xi.quest.id.windurst.WONDER_WANDS) local wildcatWindurst = player:getCharVar('WildcatWindurst') @@ -28,9 +25,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 624 then player:setCharVar('WildcatWindurst', utils.mask.setBit(player:getCharVar('WildcatWindurst'), 16, true)) diff --git a/scripts/zones/Port_Windurst/npcs/Yapam-Alpam.lua b/scripts/zones/Port_Windurst/npcs/Yapam-Alpam.lua deleted file mode 100644 index cb5e88c24b7..00000000000 --- a/scripts/zones/Port_Windurst/npcs/Yapam-Alpam.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port Windurst --- NPC: Yapam-Alpam ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(326) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_Windurst/npcs/Yuhito-Kubhito.lua b/scripts/zones/Port_Windurst/npcs/Yuhito-Kubhito.lua deleted file mode 100644 index 1e643c093ad..00000000000 --- a/scripts/zones/Port_Windurst/npcs/Yuhito-Kubhito.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port Windurst --- NPC: Yuhito-Kubhito ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(447) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_Windurst/npcs/Yujuju.lua b/scripts/zones/Port_Windurst/npcs/Yujuju.lua index 8376b689c11..0a80192f5bc 100644 --- a/scripts/zones/Port_Windurst/npcs/Yujuju.lua +++ b/scripts/zones/Port_Windurst/npcs/Yujuju.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 wildcatWindurst = player:getCharVar('WildcatWindurst') @@ -33,9 +30,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 314 then npcUtil.giveKeyItem(player, xi.ki.PORT_WINDURST_SCOOP) diff --git a/scripts/zones/Port_Windurst/npcs/Zoreen.lua b/scripts/zones/Port_Windurst/npcs/Zoreen.lua index 0436cf2245b..eaf506a9eb6 100644 --- a/scripts/zones/Port_Windurst/npcs/Zoreen.lua +++ b/scripts/zones/Port_Windurst/npcs/Zoreen.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.PORT_WINDURST] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if GetRegionOwner(xi.region.VALDEAUNIA) ~= xi.nation.WINDURST then player:showText(npc, ID.text.ZOREEN_CLOSED_DIALOG) @@ -26,10 +23,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Port_Windurst/npcs/_6o6.lua b/scripts/zones/Port_Windurst/npcs/_6o6.lua index f089f788c50..22c054cdc68 100644 --- a/scripts/zones/Port_Windurst/npcs/_6o6.lua +++ b/scripts/zones/Port_Windurst/npcs/_6o6.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.AIRSHIP_PASS) and player:getGil() >= 200 then player:startEvent(181, 0, 8, 0, 0, 0, 0, 0, 200) @@ -17,9 +14,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 181 then local xPos = player:getXPos() diff --git a/scripts/zones/Port_Windurst/npcs/_6o7.lua b/scripts/zones/Port_Windurst/npcs/_6o7.lua deleted file mode 100644 index 34354feb237..00000000000 --- a/scripts/zones/Port_Windurst/npcs/_6o7.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Port Windurst --- NPC: Door: Arrivals Entrance --- !pos 212 -6 96 240 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(182) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity From d082e2d348cd495ee0187c0a3f0effb3b4359d2a Mon Sep 17 00:00:00 2001 From: claywar Date: Mon, 20 Jan 2025 10:06:57 -0500 Subject: [PATCH 2/4] Remove empty NPCs, add Default Actions - Port San d'Oria --- .../zones/Port_San_dOria/DefaultActions.lua | 18 +++++++++++++- .../Port_San_dOria/npcs/AMAN_Liaison.lua | 3 --- scripts/zones/Port_San_dOria/npcs/Albinie.lua | 9 ------- scripts/zones/Port_San_dOria/npcs/Altiret.lua | 9 ------- scripts/zones/Port_San_dOria/npcs/Ambleon.lua | 9 ------- scripts/zones/Port_San_dOria/npcs/Answald.lua | 9 ------- scripts/zones/Port_San_dOria/npcs/Anton.lua | 6 ----- .../zones/Port_San_dOria/npcs/Antreneau.lua | 3 --- .../zones/Port_San_dOria/npcs/Arminibit.lua | 6 ----- .../zones/Port_San_dOria/npcs/Artinien.lua | 12 ---------- .../Port_San_dOria/npcs/Auction_Counter.lua | 9 ------- scripts/zones/Port_San_dOria/npcs/Auvare.lua | 10 -------- scripts/zones/Port_San_dOria/npcs/Bellue.lua | 21 ---------------- .../zones/Port_San_dOria/npcs/Bonarpant.lua | 21 ---------------- .../zones/Port_San_dOria/npcs/Bonmaurieut.lua | 9 ------- .../zones/Port_San_dOria/npcs/Bricorsant.lua | 21 ---------------- .../zones/Port_San_dOria/npcs/Brifalien.lua | 12 ---------- scripts/zones/Port_San_dOria/npcs/Callort.lua | 21 ---------------- .../zones/Port_San_dOria/npcs/Ceraulian.lua | 3 --- .../zones/Port_San_dOria/npcs/Cherlodeau.lua | 6 ----- .../zones/Port_San_dOria/npcs/Comittie.lua | 9 ------- .../zones/Port_San_dOria/npcs/Coullave.lua | 9 ------- .../zones/Port_San_dOria/npcs/Croumangue.lua | 9 ------- .../npcs/Curio_Vendor_Moogle.lua | 6 ----- scripts/zones/Port_San_dOria/npcs/Dabbio.lua | 22 ----------------- .../Port_San_dOria/npcs/Deguerendars.lua | 9 ------- .../zones/Port_San_dOria/npcs/Diraulate.lua | 21 ---------------- scripts/zones/Port_San_dOria/npcs/Eddy.lua | 22 ----------------- scripts/zones/Port_San_dOria/npcs/Fiva.lua | 9 ------- .../zones/Port_San_dOria/npcs/Gallijaux.lua | 3 --- scripts/zones/Port_San_dOria/npcs/Gilburt.lua | 3 --- .../zones/Port_San_dOria/npcs/Gournaie.lua | 21 ---------------- .../Port_San_dOria/npcs/Greeter_Moogle.lua | 6 ----- scripts/zones/Port_San_dOria/npcs/Ilgusin.lua | 22 ----------------- scripts/zones/Port_San_dOria/npcs/Ivan.lua | 3 --- scripts/zones/Port_San_dOria/npcs/Jaireto.lua | 21 ---------------- scripts/zones/Port_San_dOria/npcs/Joulet.lua | 3 --- scripts/zones/Port_San_dOria/npcs/Leonora.lua | 10 -------- scripts/zones/Port_San_dOria/npcs/Liloune.lua | 21 ---------------- scripts/zones/Port_San_dOria/npcs/Louis.lua | 9 ------- .../zones/Port_San_dOria/npcs/Meinemelle.lua | 9 ------- scripts/zones/Port_San_dOria/npcs/Meta.lua | 21 ---------------- scripts/zones/Port_San_dOria/npcs/Miene.lua | 9 ------- scripts/zones/Port_San_dOria/npcs/Milva.lua | 9 ------- scripts/zones/Port_San_dOria/npcs/Nazar.lua | 9 ------- scripts/zones/Port_San_dOria/npcs/Nimia.lua | 9 ------- scripts/zones/Port_San_dOria/npcs/Nogelle.lua | 3 --- .../zones/Port_San_dOria/npcs/Parcarin.lua | 6 ----- scripts/zones/Port_San_dOria/npcs/Patolle.lua | 9 ------- .../Port_San_dOria/npcs/Perdiouvilet.lua | 6 ----- .../zones/Port_San_dOria/npcs/Phersula.lua | 21 ---------------- scripts/zones/Port_San_dOria/npcs/Pomilla.lua | 6 ----- .../zones/Port_San_dOria/npcs/Portaure.lua | 24 ------------------- scripts/zones/Port_San_dOria/npcs/Prietta.lua | 10 -------- .../zones/Port_San_dOria/npcs/Raqtibahl.lua | 3 --- scripts/zones/Port_San_dOria/npcs/Regine.lua | 3 --- .../zones/Port_San_dOria/npcs/Rugiette.lua | 6 ----- .../Port_San_dOria/npcs/Symphonic_Curator.lua | 3 --- scripts/zones/Port_San_dOria/npcs/Teilsa.lua | 7 ------ .../zones/Port_San_dOria/npcs/Thierride.lua | 9 ------- scripts/zones/Port_San_dOria/npcs/Ufanne.lua | 9 ------- .../zones/Port_San_dOria/npcs/Vendavoq.lua | 9 ------- .../Port_San_dOria/npcs/Vounebariont.lua | 3 --- scripts/zones/Port_San_dOria/npcs/_6g7.lua | 9 ------- scripts/zones/Port_San_dOria/npcs/_6g9.lua | 6 ----- 65 files changed, 17 insertions(+), 656 deletions(-) delete mode 100644 scripts/zones/Port_San_dOria/npcs/Bellue.lua delete mode 100644 scripts/zones/Port_San_dOria/npcs/Bonarpant.lua delete mode 100644 scripts/zones/Port_San_dOria/npcs/Bricorsant.lua delete mode 100644 scripts/zones/Port_San_dOria/npcs/Callort.lua delete mode 100644 scripts/zones/Port_San_dOria/npcs/Dabbio.lua delete mode 100644 scripts/zones/Port_San_dOria/npcs/Diraulate.lua delete mode 100644 scripts/zones/Port_San_dOria/npcs/Eddy.lua delete mode 100644 scripts/zones/Port_San_dOria/npcs/Gournaie.lua delete mode 100644 scripts/zones/Port_San_dOria/npcs/Ilgusin.lua delete mode 100644 scripts/zones/Port_San_dOria/npcs/Jaireto.lua delete mode 100644 scripts/zones/Port_San_dOria/npcs/Liloune.lua delete mode 100644 scripts/zones/Port_San_dOria/npcs/Meta.lua delete mode 100644 scripts/zones/Port_San_dOria/npcs/Phersula.lua delete mode 100644 scripts/zones/Port_San_dOria/npcs/Portaure.lua diff --git a/scripts/zones/Port_San_dOria/DefaultActions.lua b/scripts/zones/Port_San_dOria/DefaultActions.lua index 1f3a5a696c8..bfcd6e73454 100644 --- a/scripts/zones/Port_San_dOria/DefaultActions.lua +++ b/scripts/zones/Port_San_dOria/DefaultActions.lua @@ -7,23 +7,39 @@ return { ['Antreneau'] = { messageSpecial = ID.text.ANTRENEAU_READY_TO_EAT }, ['Apstaule'] = { event = 542 }, ['Artinien'] = { event = 588 }, + ['Auvare'] = { event = 598 }, ['Avandale'] = { event = 555 }, + ['Bellue'] = { event = 597 }, + ['Bonarpant'] = { event = 595 }, + ['Bricorsant'] = { event = 570 }, ['Brifalien'] = { event = 589 }, + ['Callort'] = { event = 557 }, ['Coribalgeant'] = { event = 599 }, ['Crilde'] = { event = 569 }, + ['Dabbio'] = { event = 722 }, + ['Diraulate'] = { event = 581 }, ['Eaugouint'] = { event = 579 }, + ['Eddy'] = { event = 723 }, ['Fontoumant'] = { event = 561 }, + ['Gournaie'] = { event = 715 }, ['Gulemont'] = { event = 593 }, + ['Ilgusin'] = { event = 591 }, + ['Jaireto'] = { event = 711 }, ['Laucimercen'] = { event = 563 }, + ['Liloune'] = { event = 594 }, ['Marquie'] = { event = 565 }, ['Maunadolace'] = { event = 713 }, - ['Meinemelle'] = { event = 713 }, + ['Meta'] = { event = 520 }, ['Meuxtajean'] = { event = 582 }, ['Miene'] = { event = 553 }, ['Noquerelle'] = { event = 583 }, ['Parcarin'] = { event = 566 }, + ['Phersula'] = { event = 775 }, + ['Portaure'] = { event = 651 }, + ['Prietta'] = { event = 596 }, ['Rielle'] = { event = 564 }, ['Sheridan'] = { event = 572 }, ['Solgierte'] = { event = 567 }, + ['Teilsa'] = { event = 573 }, ['Thierride'] = { event = 521 }, } diff --git a/scripts/zones/Port_San_dOria/npcs/AMAN_Liaison.lua b/scripts/zones/Port_San_dOria/npcs/AMAN_Liaison.lua index b1beb722f85..a08ee935a42 100644 --- a/scripts/zones/Port_San_dOria/npcs/AMAN_Liaison.lua +++ b/scripts/zones/Port_San_dOria/npcs/AMAN_Liaison.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local firstStepForwardCompleted = player:getEminenceCompleted(1) local assistChannelCompleted = player:getEminenceCompleted(1448) diff --git a/scripts/zones/Port_San_dOria/npcs/Albinie.lua b/scripts/zones/Port_San_dOria/npcs/Albinie.lua index a40b2ec5b45..19f9c73d6d5 100644 --- a/scripts/zones/Port_San_dOria/npcs/Albinie.lua +++ b/scripts/zones/Port_San_dOria/npcs/Albinie.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.PORT_SAN_DORIA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -29,10 +26,4 @@ entity.onTrigger = function(player, npc) xi.shop.nation(player, stock, xi.nation.SANDORIA) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Port_San_dOria/npcs/Altiret.lua b/scripts/zones/Port_San_dOria/npcs/Altiret.lua index 3709c38716d..b9ae3ddb253 100644 --- a/scripts/zones/Port_San_dOria/npcs/Altiret.lua +++ b/scripts/zones/Port_San_dOria/npcs/Altiret.lua @@ -11,13 +11,4 @@ entity.onTrade = function(player, npc, trade) player:startEvent(551) 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/Port_San_dOria/npcs/Ambleon.lua b/scripts/zones/Port_San_dOria/npcs/Ambleon.lua index 6700a45733e..7c9883f05b3 100644 --- a/scripts/zones/Port_San_dOria/npcs/Ambleon.lua +++ b/scripts/zones/Port_San_dOria/npcs/Ambleon.lua @@ -7,19 +7,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) -- Currently selecting option 1 will result in a hard lock of the player requiring them to force quit the client. -- This likely needs special handling in the core. -- player:startEvent(710) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Port_San_dOria/npcs/Answald.lua b/scripts/zones/Port_San_dOria/npcs/Answald.lua index 5cfaee156b9..8dac8289500 100644 --- a/scripts/zones/Port_San_dOria/npcs/Answald.lua +++ b/scripts/zones/Port_San_dOria/npcs/Answald.lua @@ -11,13 +11,4 @@ entity.onTrade = function(player, npc, trade) quests.ffr.onTrade(player, npc, trade, 0) -- FLYERS FOR REGINE 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/Port_San_dOria/npcs/Anton.lua b/scripts/zones/Port_San_dOria/npcs/Anton.lua index c445a696a45..d762d790bc1 100644 --- a/scripts/zones/Port_San_dOria/npcs/Anton.lua +++ b/scripts/zones/Port_San_dOria/npcs/Anton.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.AIRSHIP_PASS) then player:startEvent(517) @@ -19,9 +16,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 604 then local xPos = player:getXPos() diff --git a/scripts/zones/Port_San_dOria/npcs/Antreneau.lua b/scripts/zones/Port_San_dOria/npcs/Antreneau.lua index 5a2348214df..710436b259e 100644 --- a/scripts/zones/Port_San_dOria/npcs/Antreneau.lua +++ b/scripts/zones/Port_San_dOria/npcs/Antreneau.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 == 725 then player:addQuest(xi.questLog.SANDORIA, xi.quest.id.sandoria.OVER_THE_HILLS_AND_FAR_AWAY) diff --git a/scripts/zones/Port_San_dOria/npcs/Arminibit.lua b/scripts/zones/Port_San_dOria/npcs/Arminibit.lua index df33edfc262..8a018c778f7 100644 --- a/scripts/zones/Port_San_dOria/npcs/Arminibit.lua +++ b/scripts/zones/Port_San_dOria/npcs/Arminibit.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getMainLvl() >= 30 and @@ -19,9 +16,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 24 then player:setCharVar('TheHolyCrest_Event', 1) diff --git a/scripts/zones/Port_San_dOria/npcs/Artinien.lua b/scripts/zones/Port_San_dOria/npcs/Artinien.lua index 762809aef85..a546099f0ab 100644 --- a/scripts/zones/Port_San_dOria/npcs/Artinien.lua +++ b/scripts/zones/Port_San_dOria/npcs/Artinien.lua @@ -24,16 +24,4 @@ entity.onSpawn = function(npc) npc:pathThrough(pathNodes, xi.path.flag.PATROL) end -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Port_San_dOria/npcs/Auction_Counter.lua b/scripts/zones/Port_San_dOria/npcs/Auction_Counter.lua index 6eb9c6ef1e7..8f28a64fb1f 100644 --- a/scripts/zones/Port_San_dOria/npcs/Auction_Counter.lua +++ b/scripts/zones/Port_San_dOria/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/Port_San_dOria/npcs/Auvare.lua b/scripts/zones/Port_San_dOria/npcs/Auvare.lua index 541cef869fd..e3873882e1d 100644 --- a/scripts/zones/Port_San_dOria/npcs/Auvare.lua +++ b/scripts/zones/Port_San_dOria/npcs/Auvare.lua @@ -11,14 +11,4 @@ entity.onTrade = function(player, npc, trade) quests.ffr.onTrade(player, npc, trade, 4) -- FLYERS FOR REGINE end -entity.onTrigger = function(player, npc) - player:startEvent(598) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Port_San_dOria/npcs/Bellue.lua b/scripts/zones/Port_San_dOria/npcs/Bellue.lua deleted file mode 100644 index 2322750dbc6..00000000000 --- a/scripts/zones/Port_San_dOria/npcs/Bellue.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port San d'Oria --- NPC: Bellue ------------------------------------ ----@type TNpcEntity -local entity = {} - -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/Port_San_dOria/npcs/Bonarpant.lua b/scripts/zones/Port_San_dOria/npcs/Bonarpant.lua deleted file mode 100644 index bf83ad449ef..00000000000 --- a/scripts/zones/Port_San_dOria/npcs/Bonarpant.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port San d'Oria --- NPC: Bonarpant ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(595) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_San_dOria/npcs/Bonmaurieut.lua b/scripts/zones/Port_San_dOria/npcs/Bonmaurieut.lua index aa09745e5a4..ba570716f90 100644 --- a/scripts/zones/Port_San_dOria/npcs/Bonmaurieut.lua +++ b/scripts/zones/Port_San_dOria/npcs/Bonmaurieut.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.PORT_SAN_DORIA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if GetRegionOwner(xi.region.ELSHIMOUPLANDS) ~= xi.nation.SANDORIA then player:showText(npc, ID.text.BONMAURIEUT_CLOSED_DIALOG) @@ -28,10 +25,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Port_San_dOria/npcs/Bricorsant.lua b/scripts/zones/Port_San_dOria/npcs/Bricorsant.lua deleted file mode 100644 index ec43fb7ed03..00000000000 --- a/scripts/zones/Port_San_dOria/npcs/Bricorsant.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port San d'Oria --- NPC: Bricorsant ------------------------------------ ----@type TNpcEntity -local entity = {} - -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/Port_San_dOria/npcs/Brifalien.lua b/scripts/zones/Port_San_dOria/npcs/Brifalien.lua index 208b8b26e4c..842484093d7 100644 --- a/scripts/zones/Port_San_dOria/npcs/Brifalien.lua +++ b/scripts/zones/Port_San_dOria/npcs/Brifalien.lua @@ -25,16 +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) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Port_San_dOria/npcs/Callort.lua b/scripts/zones/Port_San_dOria/npcs/Callort.lua deleted file mode 100644 index b0b7f9bbeac..00000000000 --- a/scripts/zones/Port_San_dOria/npcs/Callort.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port San d'Oria --- NPC: Callort ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(557) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_San_dOria/npcs/Ceraulian.lua b/scripts/zones/Port_San_dOria/npcs/Ceraulian.lua index 7fdd135f143..db371f0c444 100644 --- a/scripts/zones/Port_San_dOria/npcs/Ceraulian.lua +++ b/scripts/zones/Port_San_dOria/npcs/Ceraulian.lua @@ -89,9 +89,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 24 then player:setCharVar('TheHolyCrest_Event', 1) diff --git a/scripts/zones/Port_San_dOria/npcs/Cherlodeau.lua b/scripts/zones/Port_San_dOria/npcs/Cherlodeau.lua index 6932054012e..155e3046ae7 100644 --- a/scripts/zones/Port_San_dOria/npcs/Cherlodeau.lua +++ b/scripts/zones/Port_San_dOria/npcs/Cherlodeau.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local wildcatSandy = player:getCharVar('WildcatSandy') @@ -23,9 +20,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 748 then player:setCharVar('WildcatSandy', utils.mask.setBit(player:getCharVar('WildcatSandy'), 12, true)) diff --git a/scripts/zones/Port_San_dOria/npcs/Comittie.lua b/scripts/zones/Port_San_dOria/npcs/Comittie.lua index 9b2a54dc672..5a485f7f4fd 100644 --- a/scripts/zones/Port_San_dOria/npcs/Comittie.lua +++ b/scripts/zones/Port_San_dOria/npcs/Comittie.lua @@ -8,18 +8,9 @@ local ID = zones[xi.zone.PORT_SAN_DORIA] ---@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/Port_San_dOria/npcs/Coullave.lua b/scripts/zones/Port_San_dOria/npcs/Coullave.lua index 73b931d7dc1..e2baa952ef2 100644 --- a/scripts/zones/Port_San_dOria/npcs/Coullave.lua +++ b/scripts/zones/Port_San_dOria/npcs/Coullave.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.PORT_SAN_DORIA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -33,10 +30,4 @@ entity.onTrigger = function(player, npc) xi.shop.nation(player, stock, xi.nation.SANDORIA) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Port_San_dOria/npcs/Croumangue.lua b/scripts/zones/Port_San_dOria/npcs/Croumangue.lua index 0049835651a..73586b9dde0 100644 --- a/scripts/zones/Port_San_dOria/npcs/Croumangue.lua +++ b/scripts/zones/Port_San_dOria/npcs/Croumangue.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.PORT_SAN_DORIA] ---@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.SANDORIA) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Port_San_dOria/npcs/Curio_Vendor_Moogle.lua b/scripts/zones/Port_San_dOria/npcs/Curio_Vendor_Moogle.lua index f31ed04fdf8..3fd8e49a457 100644 --- a/scripts/zones/Port_San_dOria/npcs/Curio_Vendor_Moogle.lua +++ b/scripts/zones/Port_San_dOria/npcs/Curio_Vendor_Moogle.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.RHAPSODY_IN_WHITE) then player:startEvent(9600) @@ -17,9 +14,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 9601 then if option >= 1 and option <= 6 then diff --git a/scripts/zones/Port_San_dOria/npcs/Dabbio.lua b/scripts/zones/Port_San_dOria/npcs/Dabbio.lua deleted file mode 100644 index 5ba26842e53..00000000000 --- a/scripts/zones/Port_San_dOria/npcs/Dabbio.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Port San d'Oria --- NPC: Dabbio --- !pos -7.819 -15 -106.990 232 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(722) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_San_dOria/npcs/Deguerendars.lua b/scripts/zones/Port_San_dOria/npcs/Deguerendars.lua index 66ef6354940..947f4530b33 100644 --- a/scripts/zones/Port_San_dOria/npcs/Deguerendars.lua +++ b/scripts/zones/Port_San_dOria/npcs/Deguerendars.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.PORT_SAN_DORIA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getCurrentMission(xi.mission.log_id.COP) >= xi.mission.id.cop.THE_SAVAGE then if GetRegionOwner(xi.region.TAVNAZIANARCH) ~= xi.nation.SANDORIA then @@ -33,10 +30,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Port_San_dOria/npcs/Diraulate.lua b/scripts/zones/Port_San_dOria/npcs/Diraulate.lua deleted file mode 100644 index d39b665d2d4..00000000000 --- a/scripts/zones/Port_San_dOria/npcs/Diraulate.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port San d'Oria --- NPC: Diraulate ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(581) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_San_dOria/npcs/Eddy.lua b/scripts/zones/Port_San_dOria/npcs/Eddy.lua deleted file mode 100644 index ec24a566f67..00000000000 --- a/scripts/zones/Port_San_dOria/npcs/Eddy.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Port San d'Oria --- NPC: Eddy --- !pos -5.209 -8.999 39.833 232 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(723) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_San_dOria/npcs/Fiva.lua b/scripts/zones/Port_San_dOria/npcs/Fiva.lua index 3cfc2bd4edf..ffb98cc8b46 100644 --- a/scripts/zones/Port_San_dOria/npcs/Fiva.lua +++ b/scripts/zones/Port_San_dOria/npcs/Fiva.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.PORT_SAN_DORIA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if GetRegionOwner(xi.region.KOLSHUSHU) ~= xi.nation.SANDORIA then player:showText(npc, ID.text.FIVA_CLOSED_DIALOG) @@ -29,10 +26,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Port_San_dOria/npcs/Gallijaux.lua b/scripts/zones/Port_San_dOria/npcs/Gallijaux.lua index 6811c64947f..6cc55618462 100644 --- a/scripts/zones/Port_San_dOria/npcs/Gallijaux.lua +++ b/scripts/zones/Port_San_dOria/npcs/Gallijaux.lua @@ -56,9 +56,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 == 303 then if player:getFreeSlotsCount() == 0 then diff --git a/scripts/zones/Port_San_dOria/npcs/Gilburt.lua b/scripts/zones/Port_San_dOria/npcs/Gilburt.lua index f81ae4d21e5..f9e58c0fd34 100644 --- a/scripts/zones/Port_San_dOria/npcs/Gilburt.lua +++ b/scripts/zones/Port_San_dOria/npcs/Gilburt.lua @@ -8,9 +8,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.traverserNPCOnTrigger(player, npc) end diff --git a/scripts/zones/Port_San_dOria/npcs/Gournaie.lua b/scripts/zones/Port_San_dOria/npcs/Gournaie.lua deleted file mode 100644 index 639c6f582ff..00000000000 --- a/scripts/zones/Port_San_dOria/npcs/Gournaie.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port San d'Oria --- NPC: Gournaie ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(715) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_San_dOria/npcs/Greeter_Moogle.lua b/scripts/zones/Port_San_dOria/npcs/Greeter_Moogle.lua index 46a79005bb2..a714764ad5b 100644 --- a/scripts/zones/Port_San_dOria/npcs/Greeter_Moogle.lua +++ b/scripts/zones/Port_San_dOria/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 = 806 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/Port_San_dOria/npcs/Ilgusin.lua b/scripts/zones/Port_San_dOria/npcs/Ilgusin.lua deleted file mode 100644 index ba3ae34a5cb..00000000000 --- a/scripts/zones/Port_San_dOria/npcs/Ilgusin.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Port San d'Oria --- NPC: Ilgusin --- !pos -68.313 -6.5 -36.985 232 ------------------------------------ ----@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/Port_San_dOria/npcs/Ivan.lua b/scripts/zones/Port_San_dOria/npcs/Ivan.lua index 7246f10330a..ada8286f456 100644 --- a/scripts/zones/Port_San_dOria/npcs/Ivan.lua +++ b/scripts/zones/Port_San_dOria/npcs/Ivan.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.warpNPCOnTrigger(player, npc) end diff --git a/scripts/zones/Port_San_dOria/npcs/Jaireto.lua b/scripts/zones/Port_San_dOria/npcs/Jaireto.lua deleted file mode 100644 index b92632df307..00000000000 --- a/scripts/zones/Port_San_dOria/npcs/Jaireto.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port San d'Oria --- NPC: Jaireto ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(711) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_San_dOria/npcs/Joulet.lua b/scripts/zones/Port_San_dOria/npcs/Joulet.lua index 131e07856ce..65e4ebe9030 100644 --- a/scripts/zones/Port_San_dOria/npcs/Joulet.lua +++ b/scripts/zones/Port_San_dOria/npcs/Joulet.lua @@ -58,9 +58,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 == 307 then if player:getFreeSlotsCount() == 0 then diff --git a/scripts/zones/Port_San_dOria/npcs/Leonora.lua b/scripts/zones/Port_San_dOria/npcs/Leonora.lua index 8ded315b17e..af55ae4170e 100644 --- a/scripts/zones/Port_San_dOria/npcs/Leonora.lua +++ b/scripts/zones/Port_San_dOria/npcs/Leonora.lua @@ -1,25 +1,15 @@ ----------------------------------- -- Area: Port San d'Oria -- NPC: Leonora --- Involved in Quest: -- !pos -24 -8 15 232 ----------------------------------- ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getZPos() >= 12 then player:startEvent(518) 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/Port_San_dOria/npcs/Liloune.lua b/scripts/zones/Port_San_dOria/npcs/Liloune.lua deleted file mode 100644 index 19643772ed6..00000000000 --- a/scripts/zones/Port_San_dOria/npcs/Liloune.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port San d'Oria --- NPC: Liloune ------------------------------------ ----@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/Port_San_dOria/npcs/Louis.lua b/scripts/zones/Port_San_dOria/npcs/Louis.lua index 407db2ebd1d..1e8084077cc 100644 --- a/scripts/zones/Port_San_dOria/npcs/Louis.lua +++ b/scripts/zones/Port_San_dOria/npcs/Louis.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local vHour = VanadielHour() local vMin = VanadielMinute() @@ -29,10 +26,4 @@ entity.onTrigger = function(player, npc) player:startEvent(763, seconds, 0, 0, 0, 0, 0, 0, 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/Port_San_dOria/npcs/Meinemelle.lua b/scripts/zones/Port_San_dOria/npcs/Meinemelle.lua index 6b57e1a7104..ed8b1d4f950 100644 --- a/scripts/zones/Port_San_dOria/npcs/Meinemelle.lua +++ b/scripts/zones/Port_San_dOria/npcs/Meinemelle.lua @@ -8,18 +8,9 @@ local ID = zones[xi.zone.PORT_SAN_DORIA] ---@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/Port_San_dOria/npcs/Meta.lua b/scripts/zones/Port_San_dOria/npcs/Meta.lua deleted file mode 100644 index 9d2a1b5c541..00000000000 --- a/scripts/zones/Port_San_dOria/npcs/Meta.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port San d'Oria --- NPC: Meta ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(520) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_San_dOria/npcs/Miene.lua b/scripts/zones/Port_San_dOria/npcs/Miene.lua index 76496196428..87005171fd4 100644 --- a/scripts/zones/Port_San_dOria/npcs/Miene.lua +++ b/scripts/zones/Port_San_dOria/npcs/Miene.lua @@ -13,13 +13,4 @@ entity.onTrade = function(player, npc, trade) quests.ffr.onTrade(player, npc, trade, 2) -- FLYERS FOR REGINE 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/Port_San_dOria/npcs/Milva.lua b/scripts/zones/Port_San_dOria/npcs/Milva.lua index 4f14d9f549a..2fbad3f2c56 100644 --- a/scripts/zones/Port_San_dOria/npcs/Milva.lua +++ b/scripts/zones/Port_San_dOria/npcs/Milva.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.PORT_SAN_DORIA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if GetRegionOwner(xi.region.SARUTABARUTA) ~= xi.nation.SANDORIA then player:showText(npc, ID.text.MILVA_CLOSED_DIALOG) @@ -29,10 +26,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Port_San_dOria/npcs/Nazar.lua b/scripts/zones/Port_San_dOria/npcs/Nazar.lua index 4df93df3f5a..0d982d08acc 100644 --- a/scripts/zones/Port_San_dOria/npcs/Nazar.lua +++ b/scripts/zones/Port_San_dOria/npcs/Nazar.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local vHour = VanadielHour() local vMin = VanadielMinute() @@ -29,10 +26,4 @@ entity.onTrigger = function(player, npc) player:startEvent(703, seconds, 0, 0, 0, 0, 0, 0, 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/Port_San_dOria/npcs/Nimia.lua b/scripts/zones/Port_San_dOria/npcs/Nimia.lua index 2b8ca3fad41..ee2c7f7619b 100644 --- a/scripts/zones/Port_San_dOria/npcs/Nimia.lua +++ b/scripts/zones/Port_San_dOria/npcs/Nimia.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.PORT_SAN_DORIA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if GetRegionOwner(xi.region.ELSHIMOLOWLANDS) ~= xi.nation.SANDORIA then player:showText(npc, ID.text.NIMIA_CLOSED_DIALOG) @@ -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/Port_San_dOria/npcs/Nogelle.lua b/scripts/zones/Port_San_dOria/npcs/Nogelle.lua index 9205d16e963..a66f0171ada 100644 --- a/scripts/zones/Port_San_dOria/npcs/Nogelle.lua +++ b/scripts/zones/Port_San_dOria/npcs/Nogelle.lua @@ -29,9 +29,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 12 and option == 1 then player:addQuest(xi.questLog.SANDORIA, xi.quest.id.sandoria.LUFET_S_LAKE_SALT) diff --git a/scripts/zones/Port_San_dOria/npcs/Parcarin.lua b/scripts/zones/Port_San_dOria/npcs/Parcarin.lua index 3d121e52097..0d0b0c3f22f 100644 --- a/scripts/zones/Port_San_dOria/npcs/Parcarin.lua +++ b/scripts/zones/Port_San_dOria/npcs/Parcarin.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getQuestStatus(xi.questLog.SANDORIA, xi.quest.id.sandoria.LURE_OF_THE_WILDCAT) == xi.questStatus.QUEST_ACCEPTED and @@ -19,9 +16,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 747 then player:setCharVar('WildcatSandy', utils.mask.setBit(player:getCharVar('WildcatSandy'), 13, true)) diff --git a/scripts/zones/Port_San_dOria/npcs/Patolle.lua b/scripts/zones/Port_San_dOria/npcs/Patolle.lua index 7133226381a..56a5125cf01 100644 --- a/scripts/zones/Port_San_dOria/npcs/Patolle.lua +++ b/scripts/zones/Port_San_dOria/npcs/Patolle.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.PORT_SAN_DORIA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if GetRegionOwner(xi.region.KUZOTZ) ~= xi.nation.SANDORIA then player:showText(npc, ID.text.PATOLLE_CLOSED_DIALOG) @@ -27,10 +24,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Port_San_dOria/npcs/Perdiouvilet.lua b/scripts/zones/Port_San_dOria/npcs/Perdiouvilet.lua index 9a582f2ec57..590521a5c65 100644 --- a/scripts/zones/Port_San_dOria/npcs/Perdiouvilet.lua +++ b/scripts/zones/Port_San_dOria/npcs/Perdiouvilet.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local wildcatSandy = player:getCharVar('WildcatSandy') @@ -23,9 +20,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 750 then player:setCharVar('WildcatSandy', utils.mask.setBit(player:getCharVar('WildcatSandy'), 10, true)) diff --git a/scripts/zones/Port_San_dOria/npcs/Phersula.lua b/scripts/zones/Port_San_dOria/npcs/Phersula.lua deleted file mode 100644 index 68760d5ad29..00000000000 --- a/scripts/zones/Port_San_dOria/npcs/Phersula.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port San d'Oria --- NPC: Phersula ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(525063) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_San_dOria/npcs/Pomilla.lua b/scripts/zones/Port_San_dOria/npcs/Pomilla.lua index a2e25440695..da6814e75dc 100644 --- a/scripts/zones/Port_San_dOria/npcs/Pomilla.lua +++ b/scripts/zones/Port_San_dOria/npcs/Pomilla.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local wildcatSandy = player:getCharVar('WildcatSandy') @@ -23,9 +20,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 749 then player:setCharVar('WildcatSandy', utils.mask.setBit(player:getCharVar('WildcatSandy'), 11, true)) diff --git a/scripts/zones/Port_San_dOria/npcs/Portaure.lua b/scripts/zones/Port_San_dOria/npcs/Portaure.lua deleted file mode 100644 index ff53488ae1a..00000000000 --- a/scripts/zones/Port_San_dOria/npcs/Portaure.lua +++ /dev/null @@ -1,24 +0,0 @@ ------------------------------------ --- Area: Port San d'Oria --- NPC: Portaure ------------------------------------ -require('scripts/quests/flyers_for_regine') ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) - quests.ffr.onTrade(player, npc, trade, 3) -- FLYERS FOR REGINE -end - -entity.onTrigger = function(player, npc) - player:startEvent(651) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_San_dOria/npcs/Prietta.lua b/scripts/zones/Port_San_dOria/npcs/Prietta.lua index 2c8fef908bc..5564309b489 100644 --- a/scripts/zones/Port_San_dOria/npcs/Prietta.lua +++ b/scripts/zones/Port_San_dOria/npcs/Prietta.lua @@ -11,14 +11,4 @@ entity.onTrade = function(player, npc, trade) quests.ffr.onTrade(player, npc, trade, 1) -- FLYERS FOR REGINE end -entity.onTrigger = function(player, npc) - player:startEvent(596) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Port_San_dOria/npcs/Raqtibahl.lua b/scripts/zones/Port_San_dOria/npcs/Raqtibahl.lua index 40089f61020..02fb0f03cb7 100644 --- a/scripts/zones/Port_San_dOria/npcs/Raqtibahl.lua +++ b/scripts/zones/Port_San_dOria/npcs/Raqtibahl.lua @@ -53,9 +53,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 753 then player:setCharVar('LeleroonsLetterRed', 2) diff --git a/scripts/zones/Port_San_dOria/npcs/Regine.lua b/scripts/zones/Port_San_dOria/npcs/Regine.lua index 2b02b1b3aef..457a68beba9 100644 --- a/scripts/zones/Port_San_dOria/npcs/Regine.lua +++ b/scripts/zones/Port_San_dOria/npcs/Regine.lua @@ -44,9 +44,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) -- FLYERS FOR REGINE if csid == 510 and option == 2 then diff --git a/scripts/zones/Port_San_dOria/npcs/Rugiette.lua b/scripts/zones/Port_San_dOria/npcs/Rugiette.lua index 22dfa42f221..406aa31a0ac 100644 --- a/scripts/zones/Port_San_dOria/npcs/Rugiette.lua +++ b/scripts/zones/Port_San_dOria/npcs/Rugiette.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local wildcatSandy = player:getCharVar('WildcatSandy') @@ -23,9 +20,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 746 then player:setCharVar('WildcatSandy', utils.mask.setBit(player:getCharVar('WildcatSandy'), 14, true)) diff --git a/scripts/zones/Port_San_dOria/npcs/Symphonic_Curator.lua b/scripts/zones/Port_San_dOria/npcs/Symphonic_Curator.lua index 1f207df2bd3..78532bbf338 100644 --- a/scripts/zones/Port_San_dOria/npcs/Symphonic_Curator.lua +++ b/scripts/zones/Port_San_dOria/npcs/Symphonic_Curator.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.symphonic_curator.onTrigger(player, npc) end diff --git a/scripts/zones/Port_San_dOria/npcs/Teilsa.lua b/scripts/zones/Port_San_dOria/npcs/Teilsa.lua index 89d49eca162..c5150823ec2 100644 --- a/scripts/zones/Port_San_dOria/npcs/Teilsa.lua +++ b/scripts/zones/Port_San_dOria/npcs/Teilsa.lua @@ -17,13 +17,6 @@ entity.onTrade = function(player, npc, trade) end 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) if csid == 612 then player:tradeComplete() diff --git a/scripts/zones/Port_San_dOria/npcs/Thierride.lua b/scripts/zones/Port_San_dOria/npcs/Thierride.lua index 61fc210ba9c..eb40dfe5522 100644 --- a/scripts/zones/Port_San_dOria/npcs/Thierride.lua +++ b/scripts/zones/Port_San_dOria/npcs/Thierride.lua @@ -11,13 +11,4 @@ entity.onTrade = function(player, npc, trade) player:startEvent(529) 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/Port_San_dOria/npcs/Ufanne.lua b/scripts/zones/Port_San_dOria/npcs/Ufanne.lua index 691798b796d..f4e08fccbd5 100644 --- a/scripts/zones/Port_San_dOria/npcs/Ufanne.lua +++ b/scripts/zones/Port_San_dOria/npcs/Ufanne.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local fishCountVar = player:getCharVar('theCompetitionFishCountVar') if player:getQuestStatus(xi.questLog.SANDORIA, xi.quest.id.sandoria.THE_RIVALRY) == xi.questStatus.QUEST_ACCEPTED then @@ -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/Port_San_dOria/npcs/Vendavoq.lua b/scripts/zones/Port_San_dOria/npcs/Vendavoq.lua index 44e8b91b278..343849a3009 100644 --- a/scripts/zones/Port_San_dOria/npcs/Vendavoq.lua +++ b/scripts/zones/Port_San_dOria/npcs/Vendavoq.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.PORT_SAN_DORIA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if GetRegionOwner(xi.region.MOVALPOLOS) ~= xi.nation.SANDORIA then player:showText(npc, ID.text.VENDAVOQ_CLOSED_DIALOG) @@ -29,10 +26,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Port_San_dOria/npcs/Vounebariont.lua b/scripts/zones/Port_San_dOria/npcs/Vounebariont.lua index 42090af0c3e..d727626b323 100644 --- a/scripts/zones/Port_San_dOria/npcs/Vounebariont.lua +++ b/scripts/zones/Port_San_dOria/npcs/Vounebariont.lua @@ -25,9 +25,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 516 then if player:getQuestStatus(xi.questLog.SANDORIA, xi.quest.id.sandoria.THICK_SHELLS) == xi.questStatus.QUEST_AVAILABLE then diff --git a/scripts/zones/Port_San_dOria/npcs/_6g7.lua b/scripts/zones/Port_San_dOria/npcs/_6g7.lua index 1db83e3fac2..e94bb77b7ab 100644 --- a/scripts/zones/Port_San_dOria/npcs/_6g7.lua +++ b/scripts/zones/Port_San_dOria/npcs/_6g7.lua @@ -6,19 +6,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getZPos() >= 12 then player:startEvent(518) 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/Port_San_dOria/npcs/_6g9.lua b/scripts/zones/Port_San_dOria/npcs/_6g9.lua index 96a2f597e8c..7e5f5590e31 100644 --- a/scripts/zones/Port_San_dOria/npcs/_6g9.lua +++ b/scripts/zones/Port_San_dOria/npcs/_6g9.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local xPos = player:getXPos() @@ -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 == 604 then local xPos = player:getXPos() From 7dded1c7f35f7ffb49bf90431ef6e97df9422988 Mon Sep 17 00:00:00 2001 From: claywar Date: Mon, 20 Jan 2025 10:46:35 -0500 Subject: [PATCH 3/4] Remove empty NPCs, add Default Actions - Port Jeuno --- scripts/zones/Port_Jeuno/DefaultActions.lua | 11 +++++++++ scripts/zones/Port_Jeuno/npcs/Asolmieu.lua | 24 ------------------- scripts/zones/Port_Jeuno/npcs/Avijit.lua | 9 ------- scripts/zones/Port_Jeuno/npcs/Basmus.lua | 9 ------- scripts/zones/Port_Jeuno/npcs/Buntz.lua | 21 ---------------- scripts/zones/Port_Jeuno/npcs/Caffie.lua | 3 --- .../zones/Port_Jeuno/npcs/Chaka_Skitimah.lua | 9 ------- scripts/zones/Port_Jeuno/npcs/Challoux.lua | 9 ------- scripts/zones/Port_Jeuno/npcs/Cheli.lua | 24 ------------------- .../zones/Port_Jeuno/npcs/Chudigrimane.lua | 9 ------- .../zones/Port_Jeuno/npcs/Dhaso_Toehprin.lua | 24 ------------------- scripts/zones/Port_Jeuno/npcs/Digaga.lua | 9 ------- scripts/zones/Port_Jeuno/npcs/Gaura.lua | 9 ------- scripts/zones/Port_Jeuno/npcs/Gavin.lua | 9 ------- scripts/zones/Port_Jeuno/npcs/Gekko.lua | 9 ------- scripts/zones/Port_Jeuno/npcs/Horst.lua | 3 --- .../zones/Port_Jeuno/npcs/Illauvolahaut.lua | 6 ----- scripts/zones/Port_Jeuno/npcs/Imasuke.lua | 6 ----- scripts/zones/Port_Jeuno/npcs/Jaipal.lua | 9 ------- .../zones/Port_Jeuno/npcs/Jhuo_Halmanzoh.lua | 21 ---------------- scripts/zones/Port_Jeuno/npcs/Joachim.lua | 3 --- scripts/zones/Port_Jeuno/npcs/Kindlix.lua | 6 ----- scripts/zones/Port_Jeuno/npcs/Kouang.lua | 9 ------- scripts/zones/Port_Jeuno/npcs/Leffquen.lua | 9 ------- scripts/zones/Port_Jeuno/npcs/Leyla.lua | 9 ------- scripts/zones/Port_Jeuno/npcs/Najib.lua | 9 ------- scripts/zones/Port_Jeuno/npcs/Narsha.lua | 3 --- .../zones/Port_Jeuno/npcs/Omiro-Zamiro.lua | 6 ----- scripts/zones/Port_Jeuno/npcs/Phouminnet.lua | 24 ------------------- scripts/zones/Port_Jeuno/npcs/Pranab.lua | 24 ------------------- scripts/zones/Port_Jeuno/npcs/Purequane.lua | 6 ----- scripts/zones/Port_Jeuno/npcs/Pyropox.lua | 6 ----- scripts/zones/Port_Jeuno/npcs/Raging_Lion.lua | 9 ------- scripts/zones/Port_Jeuno/npcs/Red_Ghost.lua | 12 ---------- .../zones/Port_Jeuno/npcs/Rilve-Hitolve.lua | 9 ------- .../zones/Port_Jeuno/npcs/Sapladrepoin.lua | 9 ------- scripts/zones/Port_Jeuno/npcs/Shami.lua | 3 --- scripts/zones/Port_Jeuno/npcs/Shemo.lua | 3 --- scripts/zones/Port_Jeuno/npcs/Supiroro.lua | 9 ------- scripts/zones/Port_Jeuno/npcs/Tsolag.lua | 24 ------------------- scripts/zones/Port_Jeuno/npcs/Veujaie.lua | 9 ------- .../zones/Port_Jeuno/npcs/White_Beetle.lua | 21 ---------------- scripts/zones/Port_Jeuno/npcs/Yon_Boskoti.lua | 24 ------------------- scripts/zones/Port_Jeuno/npcs/Zedduva.lua | 6 ----- .../zones/Port_Jeuno/npcs/Zona_Shodhun.lua | 9 ------- .../zones/Port_Jeuno/npcs/Zuah_Lepahnyu.lua | 6 ----- scripts/zones/Port_Jeuno/npcs/_6u2.lua | 21 ---------------- scripts/zones/Port_Jeuno/npcs/_6u4.lua | 6 ----- scripts/zones/Port_Jeuno/npcs/_6u6.lua | 21 ---------------- scripts/zones/Port_Jeuno/npcs/_6u8.lua | 6 ----- scripts/zones/Port_Jeuno/npcs/_6ua.lua | 6 ----- scripts/zones/Port_Jeuno/npcs/_6uc.lua | 21 ---------------- scripts/zones/Port_Jeuno/npcs/_6ue.lua | 6 ----- scripts/zones/Port_Jeuno/npcs/_6ug.lua | 21 ---------------- scripts/zones/Port_Jeuno/npcs/qm1.lua | 6 ----- 55 files changed, 11 insertions(+), 603 deletions(-) delete mode 100644 scripts/zones/Port_Jeuno/npcs/Asolmieu.lua delete mode 100644 scripts/zones/Port_Jeuno/npcs/Buntz.lua delete mode 100644 scripts/zones/Port_Jeuno/npcs/Cheli.lua delete mode 100644 scripts/zones/Port_Jeuno/npcs/Dhaso_Toehprin.lua delete mode 100644 scripts/zones/Port_Jeuno/npcs/Jhuo_Halmanzoh.lua delete mode 100644 scripts/zones/Port_Jeuno/npcs/Phouminnet.lua delete mode 100644 scripts/zones/Port_Jeuno/npcs/Pranab.lua delete mode 100644 scripts/zones/Port_Jeuno/npcs/Tsolag.lua delete mode 100644 scripts/zones/Port_Jeuno/npcs/White_Beetle.lua delete mode 100644 scripts/zones/Port_Jeuno/npcs/Yon_Boskoti.lua delete mode 100644 scripts/zones/Port_Jeuno/npcs/_6u2.lua delete mode 100644 scripts/zones/Port_Jeuno/npcs/_6u6.lua delete mode 100644 scripts/zones/Port_Jeuno/npcs/_6uc.lua delete mode 100644 scripts/zones/Port_Jeuno/npcs/_6ug.lua diff --git a/scripts/zones/Port_Jeuno/DefaultActions.lua b/scripts/zones/Port_Jeuno/DefaultActions.lua index 2d1d4872c1f..75936eb7b68 100644 --- a/scripts/zones/Port_Jeuno/DefaultActions.lua +++ b/scripts/zones/Port_Jeuno/DefaultActions.lua @@ -1,9 +1,16 @@ local ID = zones[xi.zone.PORT_JEUNO] return { + ['_6u2'] = { event = 54 }, + ['_6u6'] = { event = 53 }, + ['_6uc'] = { event = 52 }, + ['_6ug'] = { event = 55 }, + ['Asolmieu'] = { text = ID.text.DEPARTURE_NPC }, ['Buntz'] = { event = 59 }, + ['Cheli'] = { text = ID.text.DEPARTURE_NPC }, ['Cumetouflaix'] = { text = ID.text.CUMETOUFLAIX_DIALOG }, ['Daju'] = { event = 53 }, + ['Dhaso_Toehprin'] = { text = ID.text.DEPARTURE_NPC }, ['Dohhel'] = { event = 10028 }, ['Falak'] = { event = 28 }, ['Funono'] = { event = 55 }, @@ -20,7 +27,9 @@ return { ['Moulloie'] = { event = 46 }, ['Naurmaire'] = { event = 7 }, ['Nikki'] = { event = 52 }, + ['Phouminnet'] = { text = ID.text.DEPARTURE_NPC }, ['Pitantimand'] = { event = 63 }, + ['Pranab'] = { text = ID.text.DEPARTURE_NPC }, ['Rachocho'] = { event = 47 }, ['Ramicharaux'] = { event = 60 }, ['Red_Ghost'] = { event = 34 }, @@ -28,6 +37,8 @@ return { ['Roupatour'] = { event = 54 }, ['Sanosuke'] = { event = 303 }, ['Silent_Lynx'] = { event = 18 }, + ['Tsolag'] = { text = ID.text.DEPARTURE_NPC }, ['White_Beetle'] = { event = 52 }, + ['Yon_Boskoti'] = { text = ID.text.DEPARTURE_NPC }, ['Yurugu-Homurugu'] = { event = 21 }, } diff --git a/scripts/zones/Port_Jeuno/npcs/Asolmieu.lua b/scripts/zones/Port_Jeuno/npcs/Asolmieu.lua deleted file mode 100644 index 533f080e7c8..00000000000 --- a/scripts/zones/Port_Jeuno/npcs/Asolmieu.lua +++ /dev/null @@ -1,24 +0,0 @@ ------------------------------------ --- Area: Port Jeuno --- NPC: Asolmieu --- !pos -81 8 53 246 ------------------------------------ -local ID = zones[xi.zone.PORT_JEUNO] ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:showText(npc, ID.text.DEPARTURE_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/Port_Jeuno/npcs/Avijit.lua b/scripts/zones/Port_Jeuno/npcs/Avijit.lua index e9cdc2710ad..1eb4636e81f 100644 --- a/scripts/zones/Port_Jeuno/npcs/Avijit.lua +++ b/scripts/zones/Port_Jeuno/npcs/Avijit.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local vHour = VanadielHour() local vMin = VanadielMinute() @@ -21,10 +18,4 @@ entity.onTrigger = function(player, npc) player:startEvent(10024, seconds, 0, 0, 0, 0, 0, 0, 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/Port_Jeuno/npcs/Basmus.lua b/scripts/zones/Port_Jeuno/npcs/Basmus.lua index 52fb9a4e95f..61766fb89df 100644 --- a/scripts/zones/Port_Jeuno/npcs/Basmus.lua +++ b/scripts/zones/Port_Jeuno/npcs/Basmus.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/Port_Jeuno/npcs/Buntz.lua b/scripts/zones/Port_Jeuno/npcs/Buntz.lua deleted file mode 100644 index b6d80482f4e..00000000000 --- a/scripts/zones/Port_Jeuno/npcs/Buntz.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port Jeuno --- NPC: Buntz ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(59) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_Jeuno/npcs/Caffie.lua b/scripts/zones/Port_Jeuno/npcs/Caffie.lua index e51eaf273f8..cad4716b25e 100644 --- a/scripts/zones/Port_Jeuno/npcs/Caffie.lua +++ b/scripts/zones/Port_Jeuno/npcs/Caffie.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/Port_Jeuno/npcs/Chaka_Skitimah.lua b/scripts/zones/Port_Jeuno/npcs/Chaka_Skitimah.lua index 0ac235fe519..93aced448bd 100644 --- a/scripts/zones/Port_Jeuno/npcs/Chaka_Skitimah.lua +++ b/scripts/zones/Port_Jeuno/npcs/Chaka_Skitimah.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local vHour = VanadielHour() local vMin = VanadielMinute() @@ -27,10 +24,4 @@ entity.onTrigger = function(player, npc) player:startEvent(3, seconds, 0, 0, 0, 0, 0, 0, 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/Port_Jeuno/npcs/Challoux.lua b/scripts/zones/Port_Jeuno/npcs/Challoux.lua index acc701db36a..903a98af840 100644 --- a/scripts/zones/Port_Jeuno/npcs/Challoux.lua +++ b/scripts/zones/Port_Jeuno/npcs/Challoux.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.PORT_JEUNO] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -22,10 +19,4 @@ entity.onTrigger = function(player, npc) xi.shop.general(player, stock) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Port_Jeuno/npcs/Cheli.lua b/scripts/zones/Port_Jeuno/npcs/Cheli.lua deleted file mode 100644 index e0805a8b5da..00000000000 --- a/scripts/zones/Port_Jeuno/npcs/Cheli.lua +++ /dev/null @@ -1,24 +0,0 @@ ------------------------------------ --- Area: Port Jeuno --- NPC: Cheli --- !pos -60 8 51 246 ------------------------------------ -local ID = zones[xi.zone.PORT_JEUNO] ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:showText(npc, ID.text.DEPARTURE_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/Port_Jeuno/npcs/Chudigrimane.lua b/scripts/zones/Port_Jeuno/npcs/Chudigrimane.lua index 27c2ccb266d..1e96d82112b 100644 --- a/scripts/zones/Port_Jeuno/npcs/Chudigrimane.lua +++ b/scripts/zones/Port_Jeuno/npcs/Chudigrimane.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local vHour = VanadielHour() local vMin = VanadielMinute() @@ -21,10 +18,4 @@ entity.onTrigger = function(player, npc) player:startEvent(6, seconds, 0, 0, 0, 0, 0, 0, 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/Port_Jeuno/npcs/Dhaso_Toehprin.lua b/scripts/zones/Port_Jeuno/npcs/Dhaso_Toehprin.lua deleted file mode 100644 index 6da01d8533a..00000000000 --- a/scripts/zones/Port_Jeuno/npcs/Dhaso_Toehprin.lua +++ /dev/null @@ -1,24 +0,0 @@ ------------------------------------ --- Area: Port Jeuno --- NPC: Dhaso Toehprin --- !pos 4 8 -50 246 ------------------------------------ -local ID = zones[xi.zone.PORT_JEUNO] ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:showText(npc, ID.text.DEPARTURE_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/Port_Jeuno/npcs/Digaga.lua b/scripts/zones/Port_Jeuno/npcs/Digaga.lua index 7f5283abd26..7ab42e71097 100644 --- a/scripts/zones/Port_Jeuno/npcs/Digaga.lua +++ b/scripts/zones/Port_Jeuno/npcs/Digaga.lua @@ -9,18 +9,9 @@ local ID = zones[xi.zone.PORT_JEUNO] ---@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/Port_Jeuno/npcs/Gaura.lua b/scripts/zones/Port_Jeuno/npcs/Gaura.lua index ecc6f47cb7c..d582bff6501 100644 --- a/scripts/zones/Port_Jeuno/npcs/Gaura.lua +++ b/scripts/zones/Port_Jeuno/npcs/Gaura.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local vHour = VanadielHour() local vMin = VanadielMinute() @@ -29,10 +26,4 @@ entity.onTrigger = function(player, npc) player:startEvent(10025, seconds, 0, 0, 0, 0, 0, 0, 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/Port_Jeuno/npcs/Gavin.lua b/scripts/zones/Port_Jeuno/npcs/Gavin.lua index 0e05a1bc09b..45760ed62ea 100644 --- a/scripts/zones/Port_Jeuno/npcs/Gavin.lua +++ b/scripts/zones/Port_Jeuno/npcs/Gavin.lua @@ -8,17 +8,8 @@ local ID = zones[xi.zone.PORT_JEUNO] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:showText(npc, ID.text.GAVIN_DIALOG, xi.ki.AIRSHIP_PASS_FOR_KAZHAM) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Port_Jeuno/npcs/Gekko.lua b/scripts/zones/Port_Jeuno/npcs/Gekko.lua index 36536a6da23..0b7deb05119 100644 --- a/scripts/zones/Port_Jeuno/npcs/Gekko.lua +++ b/scripts/zones/Port_Jeuno/npcs/Gekko.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.PORT_JEUNO] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -28,10 +25,4 @@ entity.onTrigger = function(player, npc) xi.shop.general(player, stock) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Port_Jeuno/npcs/Horst.lua b/scripts/zones/Port_Jeuno/npcs/Horst.lua index f63e596bad8..fa8ae9f1db4 100644 --- a/scripts/zones/Port_Jeuno/npcs/Horst.lua +++ b/scripts/zones/Port_Jeuno/npcs/Horst.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.warpNPCOnTrigger(player, npc) end diff --git a/scripts/zones/Port_Jeuno/npcs/Illauvolahaut.lua b/scripts/zones/Port_Jeuno/npcs/Illauvolahaut.lua index 6e4449e0356..08326c64b7b 100644 --- a/scripts/zones/Port_Jeuno/npcs/Illauvolahaut.lua +++ b/scripts/zones/Port_Jeuno/npcs/Illauvolahaut.lua @@ -8,9 +8,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local kazhamPass = player:hasKeyItem(xi.ki.AIRSHIP_PASS_FOR_KAZHAM) @@ -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 == 37 then local zPos = player:getZPos() diff --git a/scripts/zones/Port_Jeuno/npcs/Imasuke.lua b/scripts/zones/Port_Jeuno/npcs/Imasuke.lua index 214e31ec02a..443d567c88b 100644 --- a/scripts/zones/Port_Jeuno/npcs/Imasuke.lua +++ b/scripts/zones/Port_Jeuno/npcs/Imasuke.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local circleOfTime = player:getQuestStatus(xi.questLog.JEUNO, xi.quest.id.jeuno.THE_CIRCLE_OF_TIME) local circleProgress = player:getCharVar('circleTime') @@ -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) -- CIRCLE OF TIME if csid == 29 and option == 1 then diff --git a/scripts/zones/Port_Jeuno/npcs/Jaipal.lua b/scripts/zones/Port_Jeuno/npcs/Jaipal.lua index 3d114305d3b..2c069825e81 100644 --- a/scripts/zones/Port_Jeuno/npcs/Jaipal.lua +++ b/scripts/zones/Port_Jeuno/npcs/Jaipal.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local vHour = VanadielHour() local vMin = VanadielMinute() @@ -27,10 +24,4 @@ entity.onTrigger = function(player, npc) player:startEvent(10027, seconds, 0, 0, 0, 0, 0, 0, 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/Port_Jeuno/npcs/Jhuo_Halmanzoh.lua b/scripts/zones/Port_Jeuno/npcs/Jhuo_Halmanzoh.lua deleted file mode 100644 index bad885e1457..00000000000 --- a/scripts/zones/Port_Jeuno/npcs/Jhuo_Halmanzoh.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port Jeuno --- NPC: Jhuo Halmanzoh ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(53) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_Jeuno/npcs/Joachim.lua b/scripts/zones/Port_Jeuno/npcs/Joachim.lua index 05d81cdf9dc..a61b1cebcbe 100644 --- a/scripts/zones/Port_Jeuno/npcs/Joachim.lua +++ b/scripts/zones/Port_Jeuno/npcs/Joachim.lua @@ -15,9 +15,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.traverserNPCOnTrigger(player, npc) end diff --git a/scripts/zones/Port_Jeuno/npcs/Kindlix.lua b/scripts/zones/Port_Jeuno/npcs/Kindlix.lua index 120ce31d8ed..b229e17e704 100644 --- a/scripts/zones/Port_Jeuno/npcs/Kindlix.lua +++ b/scripts/zones/Port_Jeuno/npcs/Kindlix.lua @@ -28,9 +28,6 @@ local stock = 5936, 300, -- Mog Missile } -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getCharVar('spokeKindlix') == 1 then player:startEvent(348) @@ -40,9 +37,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 348 and option == 0 then xi.shop.general(player, stock) diff --git a/scripts/zones/Port_Jeuno/npcs/Kouang.lua b/scripts/zones/Port_Jeuno/npcs/Kouang.lua index 193dd76e5e4..25f8c82a60c 100644 --- a/scripts/zones/Port_Jeuno/npcs/Kouang.lua +++ b/scripts/zones/Port_Jeuno/npcs/Kouang.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/Port_Jeuno/npcs/Leffquen.lua b/scripts/zones/Port_Jeuno/npcs/Leffquen.lua index 56beb891560..b1701c816b3 100644 --- a/scripts/zones/Port_Jeuno/npcs/Leffquen.lua +++ b/scripts/zones/Port_Jeuno/npcs/Leffquen.lua @@ -6,17 +6,8 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(10022, 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/Port_Jeuno/npcs/Leyla.lua b/scripts/zones/Port_Jeuno/npcs/Leyla.lua index 39f1ac0b4bf..943112a206b 100644 --- a/scripts/zones/Port_Jeuno/npcs/Leyla.lua +++ b/scripts/zones/Port_Jeuno/npcs/Leyla.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.PORT_JEUNO] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -30,10 +27,4 @@ entity.onTrigger = function(player, npc) xi.shop.general(player, stock) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Port_Jeuno/npcs/Najib.lua b/scripts/zones/Port_Jeuno/npcs/Najib.lua index cecf48bc0d8..53e6f6045be 100644 --- a/scripts/zones/Port_Jeuno/npcs/Najib.lua +++ b/scripts/zones/Port_Jeuno/npcs/Najib.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local vHour = VanadielHour() local vMin = VanadielMinute() @@ -33,10 +30,4 @@ entity.onTrigger = function(player, npc) player:startEvent(10026, seconds, 0, 0, 0, 0, 0, 0, 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/Port_Jeuno/npcs/Narsha.lua b/scripts/zones/Port_Jeuno/npcs/Narsha.lua index 2ca495cc378..980c41a3377 100644 --- a/scripts/zones/Port_Jeuno/npcs/Narsha.lua +++ b/scripts/zones/Port_Jeuno/npcs/Narsha.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/Port_Jeuno/npcs/Omiro-Zamiro.lua b/scripts/zones/Port_Jeuno/npcs/Omiro-Zamiro.lua index 30d43ef0b20..5f6e35995b9 100644 --- a/scripts/zones/Port_Jeuno/npcs/Omiro-Zamiro.lua +++ b/scripts/zones/Port_Jeuno/npcs/Omiro-Zamiro.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.AIRSHIP_PASS) 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 == 39 then local zPos = player:getZPos() diff --git a/scripts/zones/Port_Jeuno/npcs/Phouminnet.lua b/scripts/zones/Port_Jeuno/npcs/Phouminnet.lua deleted file mode 100644 index 558775a2231..00000000000 --- a/scripts/zones/Port_Jeuno/npcs/Phouminnet.lua +++ /dev/null @@ -1,24 +0,0 @@ ------------------------------------ --- Area: Port Jeuno --- NPC: Prouminnet --- !pos -81 8 53 246 ------------------------------------ -local ID = zones[xi.zone.PORT_JEUNO] ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:showText(npc, ID.text.DEPARTURE_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/Port_Jeuno/npcs/Pranab.lua b/scripts/zones/Port_Jeuno/npcs/Pranab.lua deleted file mode 100644 index 8abd04c172d..00000000000 --- a/scripts/zones/Port_Jeuno/npcs/Pranab.lua +++ /dev/null @@ -1,24 +0,0 @@ ------------------------------------ --- Area: Port Jeuno --- NPC: Pranab --- !pos -60 8 51 246 ------------------------------------ -local ID = zones[xi.zone.PORT_JEUNO] ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:showText(npc, ID.text.DEPARTURE_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/Port_Jeuno/npcs/Purequane.lua b/scripts/zones/Port_Jeuno/npcs/Purequane.lua index a4817fd0838..725dd399a37 100644 --- a/scripts/zones/Port_Jeuno/npcs/Purequane.lua +++ b/scripts/zones/Port_Jeuno/npcs/Purequane.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.AIRSHIP_PASS) 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 == 38 then local zPos = player:getZPos() diff --git a/scripts/zones/Port_Jeuno/npcs/Pyropox.lua b/scripts/zones/Port_Jeuno/npcs/Pyropox.lua index dead08f090b..090c30fa925 100644 --- a/scripts/zones/Port_Jeuno/npcs/Pyropox.lua +++ b/scripts/zones/Port_Jeuno/npcs/Pyropox.lua @@ -26,9 +26,6 @@ local stock = 5725, 300, -- Goshikitenge } -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getCharVar('spokePyropox') == 1 then player:startEvent(349) @@ -38,9 +35,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 349 and option == 0 then xi.shop.general(player, stock) diff --git a/scripts/zones/Port_Jeuno/npcs/Raging_Lion.lua b/scripts/zones/Port_Jeuno/npcs/Raging_Lion.lua index 198bb0063ec..a8fb072a02b 100644 --- a/scripts/zones/Port_Jeuno/npcs/Raging_Lion.lua +++ b/scripts/zones/Port_Jeuno/npcs/Raging_Lion.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local vHour = VanadielHour() local vMin = VanadielMinute() @@ -29,10 +26,4 @@ entity.onTrigger = function(player, npc) player:startEvent(17, seconds, 0, 0, 0, 0, 0, 0, 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/Port_Jeuno/npcs/Red_Ghost.lua b/scripts/zones/Port_Jeuno/npcs/Red_Ghost.lua index 6f3ae67c480..2554c576e12 100644 --- a/scripts/zones/Port_Jeuno/npcs/Red_Ghost.lua +++ b/scripts/zones/Port_Jeuno/npcs/Red_Ghost.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/Port_Jeuno/npcs/Rilve-Hitolve.lua b/scripts/zones/Port_Jeuno/npcs/Rilve-Hitolve.lua index 922b5ecebf5..419916fddce 100644 --- a/scripts/zones/Port_Jeuno/npcs/Rilve-Hitolve.lua +++ b/scripts/zones/Port_Jeuno/npcs/Rilve-Hitolve.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/Port_Jeuno/npcs/Sapladrepoin.lua b/scripts/zones/Port_Jeuno/npcs/Sapladrepoin.lua index 19a863f47d0..a59f8fd6ca1 100644 --- a/scripts/zones/Port_Jeuno/npcs/Sapladrepoin.lua +++ b/scripts/zones/Port_Jeuno/npcs/Sapladrepoin.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/Port_Jeuno/npcs/Shami.lua b/scripts/zones/Port_Jeuno/npcs/Shami.lua index 2ddbd85e32f..246fa314cdf 100644 --- a/scripts/zones/Port_Jeuno/npcs/Shami.lua +++ b/scripts/zones/Port_Jeuno/npcs/Shami.lua @@ -141,9 +141,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) -- Cracked orb was traded if csid == 22 then diff --git a/scripts/zones/Port_Jeuno/npcs/Shemo.lua b/scripts/zones/Port_Jeuno/npcs/Shemo.lua index d1672dd90ce..f745c88d8f3 100644 --- a/scripts/zones/Port_Jeuno/npcs/Shemo.lua +++ b/scripts/zones/Port_Jeuno/npcs/Shemo.lua @@ -39,9 +39,6 @@ entity.onTrigger = function(player, npc) player:startEvent(csid, sealBit1, sealBit2, sealBit3, isTradeNum2) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 352 then local addnum = bit.rshift(option, 8) diff --git a/scripts/zones/Port_Jeuno/npcs/Supiroro.lua b/scripts/zones/Port_Jeuno/npcs/Supiroro.lua index 48f09d57e27..77c7dbe8e55 100644 --- a/scripts/zones/Port_Jeuno/npcs/Supiroro.lua +++ b/scripts/zones/Port_Jeuno/npcs/Supiroro.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local vHour = VanadielHour() local vMin = VanadielMinute() @@ -33,10 +30,4 @@ entity.onTrigger = function(player, npc) player:startEvent(2, seconds, 0, 0, 0, 0, 0, 0, 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/Port_Jeuno/npcs/Tsolag.lua b/scripts/zones/Port_Jeuno/npcs/Tsolag.lua deleted file mode 100644 index 1ea7bd71a37..00000000000 --- a/scripts/zones/Port_Jeuno/npcs/Tsolag.lua +++ /dev/null @@ -1,24 +0,0 @@ ------------------------------------ --- Area: Port Jeuno --- NPC: Tsolag --- !pos -13 8 53 246 ------------------------------------ -local ID = zones[xi.zone.PORT_JEUNO] ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:showText(npc, ID.text.DEPARTURE_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/Port_Jeuno/npcs/Veujaie.lua b/scripts/zones/Port_Jeuno/npcs/Veujaie.lua index 13ca8e2daf6..ba21efe97c6 100644 --- a/scripts/zones/Port_Jeuno/npcs/Veujaie.lua +++ b/scripts/zones/Port_Jeuno/npcs/Veujaie.lua @@ -9,18 +9,9 @@ local ID = zones[xi.zone.PORT_JEUNO] ---@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/Port_Jeuno/npcs/White_Beetle.lua b/scripts/zones/Port_Jeuno/npcs/White_Beetle.lua deleted file mode 100644 index 85e3bd5f8dd..00000000000 --- a/scripts/zones/Port_Jeuno/npcs/White_Beetle.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port Jeuno --- NPC: White Beetle ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(52) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_Jeuno/npcs/Yon_Boskoti.lua b/scripts/zones/Port_Jeuno/npcs/Yon_Boskoti.lua deleted file mode 100644 index 22d36588c4d..00000000000 --- a/scripts/zones/Port_Jeuno/npcs/Yon_Boskoti.lua +++ /dev/null @@ -1,24 +0,0 @@ ------------------------------------ --- Area: Port Jeuno --- NPC: Yon Boskoti --- !pos 0 8 -44 246 ------------------------------------ -local ID = zones[xi.zone.PORT_JEUNO] ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:showText(npc, ID.text.DEPARTURE_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/Port_Jeuno/npcs/Zedduva.lua b/scripts/zones/Port_Jeuno/npcs/Zedduva.lua index 13be617f2b6..66177fc0ea7 100644 --- a/scripts/zones/Port_Jeuno/npcs/Zedduva.lua +++ b/scripts/zones/Port_Jeuno/npcs/Zedduva.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.AIRSHIP_PASS) 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 == 36 then local zPos = player:getZPos() diff --git a/scripts/zones/Port_Jeuno/npcs/Zona_Shodhun.lua b/scripts/zones/Port_Jeuno/npcs/Zona_Shodhun.lua index 828cdd0d09b..8c3cc7c2b19 100644 --- a/scripts/zones/Port_Jeuno/npcs/Zona_Shodhun.lua +++ b/scripts/zones/Port_Jeuno/npcs/Zona_Shodhun.lua @@ -7,17 +7,8 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(10023, 0, 246, 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/Port_Jeuno/npcs/Zuah_Lepahnyu.lua b/scripts/zones/Port_Jeuno/npcs/Zuah_Lepahnyu.lua index 8b3262e1baa..5ff578701b5 100644 --- a/scripts/zones/Port_Jeuno/npcs/Zuah_Lepahnyu.lua +++ b/scripts/zones/Port_Jeuno/npcs/Zuah_Lepahnyu.lua @@ -126,16 +126,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/Port_Jeuno/npcs/_6u2.lua b/scripts/zones/Port_Jeuno/npcs/_6u2.lua deleted file mode 100644 index ebb2558c8e9..00000000000 --- a/scripts/zones/Port_Jeuno/npcs/_6u2.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port Jeuno --- NPC: Door: Arrivals (from San d'Oria) ------------------------------------ ----@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/Port_Jeuno/npcs/_6u4.lua b/scripts/zones/Port_Jeuno/npcs/_6u4.lua index 55dbd6c3cdd..99410894164 100644 --- a/scripts/zones/Port_Jeuno/npcs/_6u4.lua +++ b/scripts/zones/Port_Jeuno/npcs/_6u4.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.AIRSHIP_PASS) 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 == 38 then local zPos = player:getZPos() diff --git a/scripts/zones/Port_Jeuno/npcs/_6u6.lua b/scripts/zones/Port_Jeuno/npcs/_6u6.lua deleted file mode 100644 index f940eb642ba..00000000000 --- a/scripts/zones/Port_Jeuno/npcs/_6u6.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port Jeuno --- NPC: Door: Arrivals (from Kazham) ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(53) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_Jeuno/npcs/_6u8.lua b/scripts/zones/Port_Jeuno/npcs/_6u8.lua index a86ce9b3360..76f6588f841 100644 --- a/scripts/zones/Port_Jeuno/npcs/_6u8.lua +++ b/scripts/zones/Port_Jeuno/npcs/_6u8.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local kazhamPass = player:hasKeyItem(xi.ki.AIRSHIP_PASS_FOR_KAZHAM) @@ -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 == 37 then local zPos = player:getZPos() diff --git a/scripts/zones/Port_Jeuno/npcs/_6ua.lua b/scripts/zones/Port_Jeuno/npcs/_6ua.lua index a1d1420e6d2..f99f2e496af 100644 --- a/scripts/zones/Port_Jeuno/npcs/_6ua.lua +++ b/scripts/zones/Port_Jeuno/npcs/_6ua.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.AIRSHIP_PASS) 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 == 36 then local zPos = player:getZPos() diff --git a/scripts/zones/Port_Jeuno/npcs/_6uc.lua b/scripts/zones/Port_Jeuno/npcs/_6uc.lua deleted file mode 100644 index 0953bc24c0e..00000000000 --- a/scripts/zones/Port_Jeuno/npcs/_6uc.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port Jeuno --- NPC: Door: Arrivals (from Bastok) ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(52) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_Jeuno/npcs/_6ue.lua b/scripts/zones/Port_Jeuno/npcs/_6ue.lua index d70022585bc..3209f121ed1 100644 --- a/scripts/zones/Port_Jeuno/npcs/_6ue.lua +++ b/scripts/zones/Port_Jeuno/npcs/_6ue.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.AIRSHIP_PASS) 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 == 39 then local zPos = player:getZPos() diff --git a/scripts/zones/Port_Jeuno/npcs/_6ug.lua b/scripts/zones/Port_Jeuno/npcs/_6ug.lua deleted file mode 100644 index 60a5b0fcb0d..00000000000 --- a/scripts/zones/Port_Jeuno/npcs/_6ug.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port Jeuno --- NPC: Door: Arivals (from Windurst) ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(55) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_Jeuno/npcs/qm1.lua b/scripts/zones/Port_Jeuno/npcs/qm1.lua index d34eff0a9f4..9b1f03647d5 100644 --- a/scripts/zones/Port_Jeuno/npcs/qm1.lua +++ b/scripts/zones/Port_Jeuno/npcs/qm1.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local borghertzCS = player:getCharVar('BorghertzCS') @@ -26,9 +23,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 20 and option == 1 then player:setCharVar('BorghertzCS', 2) From b734f64623155da08d07de7129057be008bb72d9 Mon Sep 17 00:00:00 2001 From: claywar Date: Mon, 20 Jan 2025 12:46:51 -0500 Subject: [PATCH 4/4] Remove empty NPCs, add Default Actions - Port Bastok --- scripts/zones/Port_Bastok/DefaultActions.lua | 28 +++++++++++++++++++ .../zones/Port_Bastok/npcs/AMAN_Liaison.lua | 3 -- scripts/zones/Port_Bastok/npcs/Aishah.lua | 21 -------------- .../zones/Port_Bastok/npcs/Alib-Mufalib.lua | 3 -- scripts/zones/Port_Bastok/npcs/Argus.lua | 9 ------ scripts/zones/Port_Bastok/npcs/Bagnobrok.lua | 9 ------ scripts/zones/Port_Bastok/npcs/Belka.lua | 9 ------ scripts/zones/Port_Bastok/npcs/Benita.lua | 10 +------ scripts/zones/Port_Bastok/npcs/Blabbivix.lua | 9 ------ scripts/zones/Port_Bastok/npcs/Blayne.lua | 21 -------------- scripts/zones/Port_Bastok/npcs/Bodaway.lua | 9 ------ scripts/zones/Port_Bastok/npcs/Brita.lua | 9 ------ scripts/zones/Port_Bastok/npcs/Bruno.lua | 9 ------ scripts/zones/Port_Bastok/npcs/Carey.lua | 23 --------------- .../zones/Port_Bastok/npcs/Clarion_Star.lua | 6 ---- .../Port_Bastok/npcs/Curio_Vendor_Moogle.lua | 6 ---- scripts/zones/Port_Bastok/npcs/Dalba.lua | 3 -- scripts/zones/Port_Bastok/npcs/Denvihr.lua | 9 ------ .../zones/Port_Bastok/npcs/Dhen_Tevryukoh.lua | 9 ------ scripts/zones/Port_Bastok/npcs/Dulsie.lua | 3 -- scripts/zones/Port_Bastok/npcs/Eburacon.lua | 21 -------------- scripts/zones/Port_Bastok/npcs/Ensetsu.lua | 6 ---- scripts/zones/Port_Bastok/npcs/Erich.lua | 3 -- scripts/zones/Port_Bastok/npcs/Ernst.lua | 3 -- scripts/zones/Port_Bastok/npcs/Evelyn.lua | 9 ------ scripts/zones/Port_Bastok/npcs/Flaco.lua | 9 ------ scripts/zones/Port_Bastok/npcs/Fo_Mocorho.lua | 9 ------ scripts/zones/Port_Bastok/npcs/Gallagher.lua | 21 -------------- scripts/zones/Port_Bastok/npcs/Galvin.lua | 9 ------ .../zones/Port_Bastok/npcs/Greeter_Moogle.lua | 6 ---- scripts/zones/Port_Bastok/npcs/Grin.lua | 23 --------------- scripts/zones/Port_Bastok/npcs/Gwinar.lua | 21 -------------- scripts/zones/Port_Bastok/npcs/Hilda.lua | 12 -------- scripts/zones/Port_Bastok/npcs/Ihsan.lua | 21 -------------- scripts/zones/Port_Bastok/npcs/Ilita.lua | 9 ------ scripts/zones/Port_Bastok/npcs/Jabbar.lua | 9 ------ scripts/zones/Port_Bastok/npcs/Johanna.lua | 21 -------------- scripts/zones/Port_Bastok/npcs/Kachada.lua | 9 ------ scripts/zones/Port_Bastok/npcs/Kagetora.lua | 6 ---- scripts/zones/Port_Bastok/npcs/Klaas.lua | 21 -------------- scripts/zones/Port_Bastok/npcs/Klaus.lua | 24 ---------------- scripts/zones/Port_Bastok/npcs/Lone_Horn.lua | 21 -------------- scripts/zones/Port_Bastok/npcs/Mathurin.lua | 21 -------------- scripts/zones/Port_Bastok/npcs/Melloa.lua | 9 ------ scripts/zones/Port_Bastok/npcs/Mustafa.lua | 23 --------------- scripts/zones/Port_Bastok/npcs/Nicadio.lua | 21 -------------- .../zones/Port_Bastok/npcs/Nokkhi_Jinjahl.lua | 6 ---- scripts/zones/Port_Bastok/npcs/Numa.lua | 9 ------ .../zones/Port_Bastok/npcs/Ominous_Cloud.lua | 6 ---- .../zones/Port_Bastok/npcs/Patient_Wheel.lua | 22 --------------- scripts/zones/Port_Bastok/npcs/Pelinvarde.lua | 21 -------------- scripts/zones/Port_Bastok/npcs/Pursuivant.lua | 21 -------------- scripts/zones/Port_Bastok/npcs/Raifa.lua | 6 ---- scripts/zones/Port_Bastok/npcs/Rajesh.lua | 6 ---- scripts/zones/Port_Bastok/npcs/Ravorara.lua | 23 --------------- scripts/zones/Port_Bastok/npcs/Rex.lua | 6 ---- scripts/zones/Port_Bastok/npcs/Rin.lua | 21 -------------- scripts/zones/Port_Bastok/npcs/Rosswald.lua | 9 ------ scripts/zones/Port_Bastok/npcs/Sawyer.lua | 9 ------ scripts/zones/Port_Bastok/npcs/Silver_Owl.lua | 9 ------ .../zones/Port_Bastok/npcs/Styi_Palneh.lua | 6 ---- scripts/zones/Port_Bastok/npcs/Sugandhi.lua | 9 ------ .../Port_Bastok/npcs/Symphonic_Curator.lua | 3 -- .../Port_Bastok/npcs/Synergy_Engineer.lua | 22 --------------- .../zones/Port_Bastok/npcs/Tiger_Tooth.lua | 21 -------------- scripts/zones/Port_Bastok/npcs/Tilian.lua | 22 --------------- scripts/zones/Port_Bastok/npcs/Trilok.lua | 21 -------------- scripts/zones/Port_Bastok/npcs/Valeriano.lua | 9 ------ scripts/zones/Port_Bastok/npcs/Varden.lua | 21 -------------- scripts/zones/Port_Bastok/npcs/Vattian.lua | 9 ------ scripts/zones/Port_Bastok/npcs/Wurteh.lua | 21 -------------- scripts/zones/Port_Bastok/npcs/Zeldaff.lua | 21 -------------- scripts/zones/Port_Bastok/npcs/Zoby_Quhyo.lua | 9 ------ scripts/zones/Port_Bastok/npcs/_6k8.lua | 6 ---- scripts/zones/Port_Bastok/npcs/_6k9.lua | 22 --------------- 75 files changed, 29 insertions(+), 942 deletions(-) delete mode 100644 scripts/zones/Port_Bastok/npcs/Aishah.lua delete mode 100644 scripts/zones/Port_Bastok/npcs/Blayne.lua delete mode 100644 scripts/zones/Port_Bastok/npcs/Carey.lua delete mode 100644 scripts/zones/Port_Bastok/npcs/Eburacon.lua delete mode 100644 scripts/zones/Port_Bastok/npcs/Gallagher.lua delete mode 100644 scripts/zones/Port_Bastok/npcs/Grin.lua delete mode 100644 scripts/zones/Port_Bastok/npcs/Gwinar.lua delete mode 100644 scripts/zones/Port_Bastok/npcs/Ihsan.lua delete mode 100644 scripts/zones/Port_Bastok/npcs/Johanna.lua delete mode 100644 scripts/zones/Port_Bastok/npcs/Klaas.lua delete mode 100644 scripts/zones/Port_Bastok/npcs/Klaus.lua delete mode 100644 scripts/zones/Port_Bastok/npcs/Lone_Horn.lua delete mode 100644 scripts/zones/Port_Bastok/npcs/Mathurin.lua delete mode 100644 scripts/zones/Port_Bastok/npcs/Mustafa.lua delete mode 100644 scripts/zones/Port_Bastok/npcs/Nicadio.lua delete mode 100644 scripts/zones/Port_Bastok/npcs/Patient_Wheel.lua delete mode 100644 scripts/zones/Port_Bastok/npcs/Pelinvarde.lua delete mode 100644 scripts/zones/Port_Bastok/npcs/Pursuivant.lua delete mode 100644 scripts/zones/Port_Bastok/npcs/Ravorara.lua delete mode 100644 scripts/zones/Port_Bastok/npcs/Rin.lua delete mode 100644 scripts/zones/Port_Bastok/npcs/Synergy_Engineer.lua delete mode 100644 scripts/zones/Port_Bastok/npcs/Tiger_Tooth.lua delete mode 100644 scripts/zones/Port_Bastok/npcs/Tilian.lua delete mode 100644 scripts/zones/Port_Bastok/npcs/Trilok.lua delete mode 100644 scripts/zones/Port_Bastok/npcs/Varden.lua delete mode 100644 scripts/zones/Port_Bastok/npcs/Wurteh.lua delete mode 100644 scripts/zones/Port_Bastok/npcs/Zeldaff.lua delete mode 100644 scripts/zones/Port_Bastok/npcs/_6k9.lua diff --git a/scripts/zones/Port_Bastok/DefaultActions.lua b/scripts/zones/Port_Bastok/DefaultActions.lua index db010d40761..dcf6ad03ac9 100644 --- a/scripts/zones/Port_Bastok/DefaultActions.lua +++ b/scripts/zones/Port_Bastok/DefaultActions.lua @@ -1,38 +1,66 @@ local ID = zones[xi.zone.PORT_BASTOK] return { + ['_6k9'] = { event = 140 }, ['Agapito'] = { event = 17 }, + ['Aishah'] = { event = 140 }, ['Bartolomeo'] = { text = ID.text.ARRIVING_PASSENGER_DIALOG }, + ['Blayne'] = { event = 41 }, + ['Carey'] = { text = ID.text.DEPARTING_PASSENGER_DIALOG }, ['Carmelo'] = { event = 182 }, ['Clarion_Star'] = { event = 442 }, ['Corann'] = { event = 38 }, ['Dehlner'] = { event = 46 }, + ['Eburacon'] = { event = 40 }, ['Ehrhard'] = { event = 47 }, ['Ensetsu'] = { event = 27 }, ['Evi'] = { event = 21 }, ['Ferrol'] = { event = 254 }, + ['Gallagher'] = { event = 349 }, + ['Grin'] = { event = 295 }, ['Gudav'] = { event = 31 }, + ['Gwinar'] = { event = 365 }, ['Hilda'] = { event = 48 }, + ['Ihsan'] = { event = 16 }, ['Jabbar'] = { event = 150 }, + ['Johanna'] = { event = 18 }, ['Juroro'] = { event = 253 }, ['Kaede'] = { event = 26 }, ['Kagetora'] = { event = 23 }, + ['Klaas'] = { event = 387 }, + ['Klaus'] = { messageSpecial = ID.text.DEPARTING_PASSENGER_DIALOG }, ['Kurando'] = { event = 28 }, ['Latifah'] = { event = 13 }, + ['Lone_Horn'] = { event = 39 }, + ['Mathurin'] = { event = 101 }, ['Mine_Konte'] = { event = 42 }, + ['Mustafa'] = { messageSpecial = ID.text.ARRIVING_PASSENGER_DIALOG }, + ['Nicadio'] = { event = 32 }, ['Odyssean_Passage'] = { messageSpecial = ID.text.NOTHING_HAPPENS }, ['Oggbi'] = { event = 230 }, ['Otto'] = { event = 20 }, ['Panana'] = { event = 43 }, + ['Patient_Wheel'] = { event = 325 }, ['Paujean'] = { event = 25 }, + ['Pelinvarde'] = { event = 266 }, ['Powhatan'] = { text = ID.text.POWHATAN_DIALOG_1 }, + ['Pursuivant'] = { event = 304 }, ['Qiji'] = { event = 33 }, ['Rafaela'] = { event = 22 }, + ['Ravorara'] = { event = 310 }, + ['Rin'] = { event = 36 }, ['Romilda'] = { event = 34 }, ['Ronan'] = { event = 37 }, ['Steel_Bones'] = { event = 29 }, ['Silver_Owl'] = { event = 150, 1 }, ['Suspicious_Galka'] = { event = 417 }, + ['Synergy_Engineer'] = { event = 11002 }, ['Tete'] = { event = 35 }, + ['Tiger_Tooth'] = { event = 12 }, + ['Tilian'] = { event = 100 }, + ['Trilok'] = { event = 44 }, + ['Varden'] = { event = 141 }, + ['Wurteh'] = { event = 95 }, ['Yazan'] = { event = 190 }, + ['Zeldaff'] = { event = 30 }, } diff --git a/scripts/zones/Port_Bastok/npcs/AMAN_Liaison.lua b/scripts/zones/Port_Bastok/npcs/AMAN_Liaison.lua index b7b09604ba0..7b4e21d90c5 100644 --- a/scripts/zones/Port_Bastok/npcs/AMAN_Liaison.lua +++ b/scripts/zones/Port_Bastok/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/Port_Bastok/npcs/Aishah.lua b/scripts/zones/Port_Bastok/npcs/Aishah.lua deleted file mode 100644 index b7fc3c234ef..00000000000 --- a/scripts/zones/Port_Bastok/npcs/Aishah.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port Bastok --- NPC: Aishah ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(140) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_Bastok/npcs/Alib-Mufalib.lua b/scripts/zones/Port_Bastok/npcs/Alib-Mufalib.lua index f54830a627d..a0ca33a674c 100644 --- a/scripts/zones/Port_Bastok/npcs/Alib-Mufalib.lua +++ b/scripts/zones/Port_Bastok/npcs/Alib-Mufalib.lua @@ -27,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 == 379 then player:tradeComplete() diff --git a/scripts/zones/Port_Bastok/npcs/Argus.lua b/scripts/zones/Port_Bastok/npcs/Argus.lua index 99d9606e4d5..40bfdb3c886 100644 --- a/scripts/zones/Port_Bastok/npcs/Argus.lua +++ b/scripts/zones/Port_Bastok/npcs/Argus.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.BASTOK then player:startEvent(1003) -- For non-Bastokian @@ -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/Port_Bastok/npcs/Bagnobrok.lua b/scripts/zones/Port_Bastok/npcs/Bagnobrok.lua index 1d4a5d4d9d2..6dc0fba08f7 100644 --- a/scripts/zones/Port_Bastok/npcs/Bagnobrok.lua +++ b/scripts/zones/Port_Bastok/npcs/Bagnobrok.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.PORT_BASTOK] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if GetRegionOwner(xi.region.MOVALPOLOS) ~= xi.nation.BASTOK then player:showText(npc, ID.text.BAGNOBROK_CLOSED_DIALOG) @@ -29,10 +26,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Port_Bastok/npcs/Belka.lua b/scripts/zones/Port_Bastok/npcs/Belka.lua index eb7ca466895..5a95af444d2 100644 --- a/scripts/zones/Port_Bastok/npcs/Belka.lua +++ b/scripts/zones/Port_Bastok/npcs/Belka.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.PORT_BASTOK] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if GetRegionOwner(xi.region.DERFLAND) ~= xi.nation.BASTOK then player:showText(npc, ID.text.BELKA_CLOSED_DIALOG) @@ -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/Port_Bastok/npcs/Benita.lua b/scripts/zones/Port_Bastok/npcs/Benita.lua index 118c392eb7e..efe9f863392 100644 --- a/scripts/zones/Port_Bastok/npcs/Benita.lua +++ b/scripts/zones/Port_Bastok/npcs/Benita.lua @@ -5,12 +5,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local rand = math.random(1, 2) + -- TODO: Needs verification if rand == 1 then player:startEvent(102) else @@ -18,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/Port_Bastok/npcs/Blabbivix.lua b/scripts/zones/Port_Bastok/npcs/Blabbivix.lua index 702e2524424..c9c6debf293 100644 --- a/scripts/zones/Port_Bastok/npcs/Blabbivix.lua +++ b/scripts/zones/Port_Bastok/npcs/Blabbivix.lua @@ -9,19 +9,10 @@ local ID = zones[xi.zone.PORT_BASTOK] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:sendGuild(60418, 11, 22, 3) then player:showText(npc, ID.text.BLABBIVIX_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/Port_Bastok/npcs/Blayne.lua b/scripts/zones/Port_Bastok/npcs/Blayne.lua deleted file mode 100644 index 67376d910db..00000000000 --- a/scripts/zones/Port_Bastok/npcs/Blayne.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port Bastok --- NPC: Blayne ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(41) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_Bastok/npcs/Bodaway.lua b/scripts/zones/Port_Bastok/npcs/Bodaway.lua index 5165f86dc5f..567c6495b0a 100644 --- a/scripts/zones/Port_Bastok/npcs/Bodaway.lua +++ b/scripts/zones/Port_Bastok/npcs/Bodaway.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local vHour = VanadielHour() local vMin = VanadielMinute() @@ -35,10 +32,4 @@ entity.onTrigger = function(player, npc) player:startEvent(45, seconds, 0, 0, 0, 0, 0, 0, 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/Port_Bastok/npcs/Brita.lua b/scripts/zones/Port_Bastok/npcs/Brita.lua index 0861399d3fe..558877d09ea 100644 --- a/scripts/zones/Port_Bastok/npcs/Brita.lua +++ b/scripts/zones/Port_Bastok/npcs/Brita.lua @@ -6,17 +6,8 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(346, 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/Port_Bastok/npcs/Bruno.lua b/scripts/zones/Port_Bastok/npcs/Bruno.lua index 01da618ac95..ce01b523c52 100644 --- a/scripts/zones/Port_Bastok/npcs/Bruno.lua +++ b/scripts/zones/Port_Bastok/npcs/Bruno.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local vHour = VanadielHour() local vMin = VanadielMinute() @@ -35,10 +32,4 @@ entity.onTrigger = function(player, npc) player:startEvent(364, seconds, 0, 0, 0, 0, 0, 0, 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/Port_Bastok/npcs/Carey.lua b/scripts/zones/Port_Bastok/npcs/Carey.lua deleted file mode 100644 index 77ba8fbedc5..00000000000 --- a/scripts/zones/Port_Bastok/npcs/Carey.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Port Bastok --- NPC: Carey ------------------------------------ -local ID = zones[xi.zone.PORT_BASTOK] ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:messageSpecial(ID.text.DEPARTING_PASSENGER_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/Port_Bastok/npcs/Clarion_Star.lua b/scripts/zones/Port_Bastok/npcs/Clarion_Star.lua index cd52a12f87a..6ea6a1d1c76 100644 --- a/scripts/zones/Port_Bastok/npcs/Clarion_Star.lua +++ b/scripts/zones/Port_Bastok/npcs/Clarion_Star.lua @@ -13,12 +13,6 @@ entity.onTrade = function(player, npc, trade) xi.trust.onTradeCipher(player, trade, 437, 457, 458) end -entity.onTrigger = function(player, npc) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 437 or csid == 458 then local spellID = player:getLocalVar('TradingTrustCipher') diff --git a/scripts/zones/Port_Bastok/npcs/Curio_Vendor_Moogle.lua b/scripts/zones/Port_Bastok/npcs/Curio_Vendor_Moogle.lua index b4826184069..40889eee745 100644 --- a/scripts/zones/Port_Bastok/npcs/Curio_Vendor_Moogle.lua +++ b/scripts/zones/Port_Bastok/npcs/Curio_Vendor_Moogle.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.RHAPSODY_IN_WHITE) then player:startEvent(9600) @@ -17,9 +14,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 9601 then if option >= 1 and option <= 6 then diff --git a/scripts/zones/Port_Bastok/npcs/Dalba.lua b/scripts/zones/Port_Bastok/npcs/Dalba.lua index 2f4903a0013..f28d9a0bebf 100644 --- a/scripts/zones/Port_Bastok/npcs/Dalba.lua +++ b/scripts/zones/Port_Bastok/npcs/Dalba.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) -- Bastok Missions. local bastokMissions = 0xFFFFFFFE diff --git a/scripts/zones/Port_Bastok/npcs/Denvihr.lua b/scripts/zones/Port_Bastok/npcs/Denvihr.lua index 9e29962afbd..e514f02d71b 100644 --- a/scripts/zones/Port_Bastok/npcs/Denvihr.lua +++ b/scripts/zones/Port_Bastok/npcs/Denvihr.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.PORT_BASTOK] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -29,10 +26,4 @@ entity.onTrigger = function(player, npc) xi.shop.nation(player, stock, xi.nation.BASTOK) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Port_Bastok/npcs/Dhen_Tevryukoh.lua b/scripts/zones/Port_Bastok/npcs/Dhen_Tevryukoh.lua index fbdfcebcb38..f9d2e8f0071 100644 --- a/scripts/zones/Port_Bastok/npcs/Dhen_Tevryukoh.lua +++ b/scripts/zones/Port_Bastok/npcs/Dhen_Tevryukoh.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.PORT_BASTOK] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if GetRegionOwner(xi.region.ELSHIMOUPLANDS) ~= xi.nation.BASTOK then player:showText(npc, ID.text.DHENTEVRYUKOH_CLOSED_DIALOG) @@ -29,10 +26,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Port_Bastok/npcs/Dulsie.lua b/scripts/zones/Port_Bastok/npcs/Dulsie.lua index fe477ad4655..120d13e013b 100644 --- a/scripts/zones/Port_Bastok/npcs/Dulsie.lua +++ b/scripts/zones/Port_Bastok/npcs/Dulsie.lua @@ -19,9 +19,6 @@ entity.onTrigger = function(player, npc) player:startEvent(7) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 8 then player:tradeComplete() diff --git a/scripts/zones/Port_Bastok/npcs/Eburacon.lua b/scripts/zones/Port_Bastok/npcs/Eburacon.lua deleted file mode 100644 index bb84aa9b580..00000000000 --- a/scripts/zones/Port_Bastok/npcs/Eburacon.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port Bastok --- NPC: Eburacon ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(40) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_Bastok/npcs/Ensetsu.lua b/scripts/zones/Port_Bastok/npcs/Ensetsu.lua index 8fa26f03ccf..f3db23075de 100755 --- a/scripts/zones/Port_Bastok/npcs/Ensetsu.lua +++ b/scripts/zones/Port_Bastok/npcs/Ensetsu.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local ayameAndKaede = player:getQuestStatus(xi.questLog.BASTOK, xi.quest.id.bastok.AYAME_AND_KAEDE) @@ -32,9 +29,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 262 then player:setCharVar('twentyInPirateYearsCS', 3) diff --git a/scripts/zones/Port_Bastok/npcs/Erich.lua b/scripts/zones/Port_Bastok/npcs/Erich.lua index f2bf735ad0e..21c6b7453c9 100644 --- a/scripts/zones/Port_Bastok/npcs/Erich.lua +++ b/scripts/zones/Port_Bastok/npcs/Erich.lua @@ -8,9 +8,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.traverserNPCOnTrigger(player, npc) end diff --git a/scripts/zones/Port_Bastok/npcs/Ernst.lua b/scripts/zones/Port_Bastok/npcs/Ernst.lua index 4b385434e4c..7b7baaa29b1 100644 --- a/scripts/zones/Port_Bastok/npcs/Ernst.lua +++ b/scripts/zones/Port_Bastok/npcs/Ernst.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.warpNPCOnTrigger(player, npc) end diff --git a/scripts/zones/Port_Bastok/npcs/Evelyn.lua b/scripts/zones/Port_Bastok/npcs/Evelyn.lua index 366213f83fa..5325c0bd167 100644 --- a/scripts/zones/Port_Bastok/npcs/Evelyn.lua +++ b/scripts/zones/Port_Bastok/npcs/Evelyn.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.PORT_BASTOK] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if GetRegionOwner(xi.region.GUSTABERG) ~= xi.nation.BASTOK then player:showText(npc, ID.text.EVELYN_CLOSED_DIALOG) @@ -28,10 +25,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Port_Bastok/npcs/Flaco.lua b/scripts/zones/Port_Bastok/npcs/Flaco.lua index cd7b6f3b003..d0ae5096587 100644 --- a/scripts/zones/Port_Bastok/npcs/Flaco.lua +++ b/scripts/zones/Port_Bastok/npcs/Flaco.lua @@ -7,17 +7,8 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(210 + player:getFameLevel(xi.fameArea.BASTOK)) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Port_Bastok/npcs/Fo_Mocorho.lua b/scripts/zones/Port_Bastok/npcs/Fo_Mocorho.lua index e1aae4bcf44..0aa59596907 100644 --- a/scripts/zones/Port_Bastok/npcs/Fo_Mocorho.lua +++ b/scripts/zones/Port_Bastok/npcs/Fo_Mocorho.lua @@ -6,17 +6,8 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(116, 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/Port_Bastok/npcs/Gallagher.lua b/scripts/zones/Port_Bastok/npcs/Gallagher.lua deleted file mode 100644 index 472be85bcf2..00000000000 --- a/scripts/zones/Port_Bastok/npcs/Gallagher.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port Bastok --- NPC: Gallagher ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(349) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_Bastok/npcs/Galvin.lua b/scripts/zones/Port_Bastok/npcs/Galvin.lua index 100a5e3e4dc..fa8f686602a 100644 --- a/scripts/zones/Port_Bastok/npcs/Galvin.lua +++ b/scripts/zones/Port_Bastok/npcs/Galvin.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.PORT_BASTOK] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -27,10 +24,4 @@ entity.onTrigger = function(player, npc) xi.shop.nation(player, stock, xi.nation.BASTOK) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Port_Bastok/npcs/Greeter_Moogle.lua b/scripts/zones/Port_Bastok/npcs/Greeter_Moogle.lua index a22b4b90de8..cb155a42c94 100644 --- a/scripts/zones/Port_Bastok/npcs/Greeter_Moogle.lua +++ b/scripts/zones/Port_Bastok/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 = 425 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/Port_Bastok/npcs/Grin.lua b/scripts/zones/Port_Bastok/npcs/Grin.lua deleted file mode 100644 index 7acb0d3f14c..00000000000 --- a/scripts/zones/Port_Bastok/npcs/Grin.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Port Bastok --- NPC: Grin --- Type: Quest Giver --- !pos -56.533 1.392 -29.432 236 ------------------------------------ ----@type TNpcEntity -local entity = {} - -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/Port_Bastok/npcs/Gwinar.lua b/scripts/zones/Port_Bastok/npcs/Gwinar.lua deleted file mode 100644 index 1d908af7f4b..00000000000 --- a/scripts/zones/Port_Bastok/npcs/Gwinar.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port Bastok --- NPC: Gwinar ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(365) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_Bastok/npcs/Hilda.lua b/scripts/zones/Port_Bastok/npcs/Hilda.lua index a90a68e1ccc..81467fbf49e 100644 --- a/scripts/zones/Port_Bastok/npcs/Hilda.lua +++ b/scripts/zones/Port_Bastok/npcs/Hilda.lua @@ -35,16 +35,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/Port_Bastok/npcs/Ihsan.lua b/scripts/zones/Port_Bastok/npcs/Ihsan.lua deleted file mode 100644 index 2387c8e20e5..00000000000 --- a/scripts/zones/Port_Bastok/npcs/Ihsan.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port Bastok --- NPC: Ihsan ------------------------------------ ----@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/Port_Bastok/npcs/Ilita.lua b/scripts/zones/Port_Bastok/npcs/Ilita.lua index b2b9cf2daff..b4037039160 100644 --- a/scripts/zones/Port_Bastok/npcs/Ilita.lua +++ b/scripts/zones/Port_Bastok/npcs/Ilita.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.PORT_BASTOK] ---@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/Port_Bastok/npcs/Jabbar.lua b/scripts/zones/Port_Bastok/npcs/Jabbar.lua index 9229457a925..466b979858c 100644 --- a/scripts/zones/Port_Bastok/npcs/Jabbar.lua +++ b/scripts/zones/Port_Bastok/npcs/Jabbar.lua @@ -10,9 +10,6 @@ local ID = zones[xi.zone.PORT_BASTOK] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:hasKeyItem(xi.ki.TENSHODO_MEMBERS_CARD) then if player:sendGuild(60419, 1, 23, 4) then @@ -21,10 +18,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Port_Bastok/npcs/Johanna.lua b/scripts/zones/Port_Bastok/npcs/Johanna.lua deleted file mode 100644 index 9cf03f300ee..00000000000 --- a/scripts/zones/Port_Bastok/npcs/Johanna.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port Bastok --- NPC: Johanna ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(18) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_Bastok/npcs/Kachada.lua b/scripts/zones/Port_Bastok/npcs/Kachada.lua index 346917d62e0..031d7cfebff 100644 --- a/scripts/zones/Port_Bastok/npcs/Kachada.lua +++ b/scripts/zones/Port_Bastok/npcs/Kachada.lua @@ -5,19 +5,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) -- Currently selecting option 1 will result in a hard lock of the player requiring them to force quit the client. -- This likely needs special handling in the core. -- player:startEvent(96)--, 0, 0, 0, 0, 0, -1, 2) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Port_Bastok/npcs/Kagetora.lua b/scripts/zones/Port_Bastok/npcs/Kagetora.lua index 11c990e19f0..6fd93c2e80c 100755 --- a/scripts/zones/Port_Bastok/npcs/Kagetora.lua +++ b/scripts/zones/Port_Bastok/npcs/Kagetora.lua @@ -7,18 +7,12 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getCharVar('twentyInPirateYearsCS') == 1 then player:startEvent(261) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 261 then player:setCharVar('twentyInPirateYearsCS', 2) diff --git a/scripts/zones/Port_Bastok/npcs/Klaas.lua b/scripts/zones/Port_Bastok/npcs/Klaas.lua deleted file mode 100644 index c1082aa8206..00000000000 --- a/scripts/zones/Port_Bastok/npcs/Klaas.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port Bastok --- NPC: Klaas ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(387) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_Bastok/npcs/Klaus.lua b/scripts/zones/Port_Bastok/npcs/Klaus.lua deleted file mode 100644 index 85a6923706f..00000000000 --- a/scripts/zones/Port_Bastok/npcs/Klaus.lua +++ /dev/null @@ -1,24 +0,0 @@ ------------------------------------ --- Area: Port Bastok --- NPC: Klaus --- !pos -89.355 -3.611 -15.256 236 ------------------------------------ -local ID = zones[xi.zone.PORT_BASTOK] ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:messageSpecial(ID.text.DEPARTING_PASSENGER_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/Port_Bastok/npcs/Lone_Horn.lua b/scripts/zones/Port_Bastok/npcs/Lone_Horn.lua deleted file mode 100644 index 2795127c35c..00000000000 --- a/scripts/zones/Port_Bastok/npcs/Lone_Horn.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port Bastok --- NPC: LoneHorn ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(39) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_Bastok/npcs/Mathurin.lua b/scripts/zones/Port_Bastok/npcs/Mathurin.lua deleted file mode 100644 index 88eb4efcb8c..00000000000 --- a/scripts/zones/Port_Bastok/npcs/Mathurin.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port Bastok --- NPC: Mathurin ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(101) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_Bastok/npcs/Melloa.lua b/scripts/zones/Port_Bastok/npcs/Melloa.lua index 2d0f24e67a6..723c880bab9 100644 --- a/scripts/zones/Port_Bastok/npcs/Melloa.lua +++ b/scripts/zones/Port_Bastok/npcs/Melloa.lua @@ -29,9 +29,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 stock = { @@ -52,10 +49,4 @@ entity.onTrigger = function(player, npc) xi.shop.nation(player, stock, xi.nation.BASTOK) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Port_Bastok/npcs/Mustafa.lua b/scripts/zones/Port_Bastok/npcs/Mustafa.lua deleted file mode 100644 index 7464b7cd9cf..00000000000 --- a/scripts/zones/Port_Bastok/npcs/Mustafa.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Port Bastok --- NPC: Mustafa ------------------------------------ -local ID = zones[xi.zone.PORT_BASTOK] ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:messageSpecial(ID.text.ARRIVING_PASSENGER_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/Port_Bastok/npcs/Nicadio.lua b/scripts/zones/Port_Bastok/npcs/Nicadio.lua deleted file mode 100644 index 11c004e8b5d..00000000000 --- a/scripts/zones/Port_Bastok/npcs/Nicadio.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port Bastok --- NPC: Nicadio ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(32) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_Bastok/npcs/Nokkhi_Jinjahl.lua b/scripts/zones/Port_Bastok/npcs/Nokkhi_Jinjahl.lua index 18b2fb62769..37707a98a5c 100644 --- a/scripts/zones/Port_Bastok/npcs/Nokkhi_Jinjahl.lua +++ b/scripts/zones/Port_Bastok/npcs/Nokkhi_Jinjahl.lua @@ -149,10 +149,4 @@ entity.onTrigger = function(player, npc) player:startEvent(285, 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/Port_Bastok/npcs/Numa.lua b/scripts/zones/Port_Bastok/npcs/Numa.lua index 25c5375c712..d432df74ef1 100644 --- a/scripts/zones/Port_Bastok/npcs/Numa.lua +++ b/scripts/zones/Port_Bastok/npcs/Numa.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.PORT_BASTOK] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -35,10 +32,4 @@ entity.onTrigger = function(player, npc) xi.shop.nation(player, stock, xi.nation.BASTOK) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Port_Bastok/npcs/Ominous_Cloud.lua b/scripts/zones/Port_Bastok/npcs/Ominous_Cloud.lua index fcda644b201..970a37f6aa0 100644 --- a/scripts/zones/Port_Bastok/npcs/Ominous_Cloud.lua +++ b/scripts/zones/Port_Bastok/npcs/Ominous_Cloud.lua @@ -107,10 +107,4 @@ entity.onTrigger = function(player, npc) player:startEvent(345, 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/Port_Bastok/npcs/Patient_Wheel.lua b/scripts/zones/Port_Bastok/npcs/Patient_Wheel.lua deleted file mode 100644 index 42b5b944f9a..00000000000 --- a/scripts/zones/Port_Bastok/npcs/Patient_Wheel.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Port Bastok --- NPC: Patient Wheel --- !pos -107.988 3.898 52.557 236 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(325) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_Bastok/npcs/Pelinvarde.lua b/scripts/zones/Port_Bastok/npcs/Pelinvarde.lua deleted file mode 100644 index 5f76d3b1013..00000000000 --- a/scripts/zones/Port_Bastok/npcs/Pelinvarde.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port Bastok --- NPC: Pelinvarde ------------------------------------ ----@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/Port_Bastok/npcs/Pursuivant.lua b/scripts/zones/Port_Bastok/npcs/Pursuivant.lua deleted file mode 100644 index b0cf6fa8751..00000000000 --- a/scripts/zones/Port_Bastok/npcs/Pursuivant.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port Bastok --- NPC: Pursuivant ------------------------------------ ----@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/Port_Bastok/npcs/Raifa.lua b/scripts/zones/Port_Bastok/npcs/Raifa.lua index 0e4d33ee4cc..8f2d73836d2 100644 --- a/scripts/zones/Port_Bastok/npcs/Raifa.lua +++ b/scripts/zones/Port_Bastok/npcs/Raifa.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 == 278 and option == 1 then if player:getQuestStatus(xi.questLog.BASTOK, xi.quest.id.bastok.ECO_WARRIOR) == xi.questStatus.QUEST_AVAILABLE then diff --git a/scripts/zones/Port_Bastok/npcs/Rajesh.lua b/scripts/zones/Port_Bastok/npcs/Rajesh.lua index 6a7dde46df8..0a06bff328b 100644 --- a/scripts/zones/Port_Bastok/npcs/Rajesh.lua +++ b/scripts/zones/Port_Bastok/npcs/Rajesh.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.AIRSHIP_PASS) and player:getGil() >= 200 then player:startEvent(141) @@ -17,9 +14,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 141 and option == 0 then local xPos = player:getXPos() diff --git a/scripts/zones/Port_Bastok/npcs/Ravorara.lua b/scripts/zones/Port_Bastok/npcs/Ravorara.lua deleted file mode 100644 index 3653128b275..00000000000 --- a/scripts/zones/Port_Bastok/npcs/Ravorara.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Port Bastok --- NPC: Ravorara --- Type: Quest Giver --- !pos -151.062 -7 -7.243 236 ------------------------------------ ----@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/Port_Bastok/npcs/Rex.lua b/scripts/zones/Port_Bastok/npcs/Rex.lua index 20ea6c275dd..05959d58d6f 100644 --- a/scripts/zones/Port_Bastok/npcs/Rex.lua +++ b/scripts/zones/Port_Bastok/npcs/Rex.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/Port_Bastok/npcs/Rin.lua b/scripts/zones/Port_Bastok/npcs/Rin.lua deleted file mode 100644 index 9036d87b609..00000000000 --- a/scripts/zones/Port_Bastok/npcs/Rin.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port Bastok --- NPC: Rin ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(36) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_Bastok/npcs/Rosswald.lua b/scripts/zones/Port_Bastok/npcs/Rosswald.lua index 2733a97f5d2..31b521c93f0 100644 --- a/scripts/zones/Port_Bastok/npcs/Rosswald.lua +++ b/scripts/zones/Port_Bastok/npcs/Rosswald.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.PORT_BASTOK] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if GetRegionOwner(xi.region.ZULKHEIM) ~= xi.nation.BASTOK then player:showText(npc, ID.text.ROSSWALD_CLOSED_DIALOG) @@ -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/Port_Bastok/npcs/Sawyer.lua b/scripts/zones/Port_Bastok/npcs/Sawyer.lua index 3942e6e98aa..cdbbb69cc0f 100644 --- a/scripts/zones/Port_Bastok/npcs/Sawyer.lua +++ b/scripts/zones/Port_Bastok/npcs/Sawyer.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.PORT_BASTOK] ---@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.BASTOK) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Port_Bastok/npcs/Silver_Owl.lua b/scripts/zones/Port_Bastok/npcs/Silver_Owl.lua index 000c18a97fe..13a355f43ff 100644 --- a/scripts/zones/Port_Bastok/npcs/Silver_Owl.lua +++ b/scripts/zones/Port_Bastok/npcs/Silver_Owl.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.PORT_BASTOK] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:hasKeyItem(xi.ki.TENSHODO_MEMBERS_CARD) then if player:sendGuild(60420, 1, 23, 4) then @@ -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/Port_Bastok/npcs/Styi_Palneh.lua b/scripts/zones/Port_Bastok/npcs/Styi_Palneh.lua index b9a604be582..9193441caf7 100644 --- a/scripts/zones/Port_Bastok/npcs/Styi_Palneh.lua +++ b/scripts/zones/Port_Bastok/npcs/Styi_Palneh.lua @@ -127,16 +127,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/Port_Bastok/npcs/Sugandhi.lua b/scripts/zones/Port_Bastok/npcs/Sugandhi.lua index 6b849f6bb36..018dfe61303 100644 --- a/scripts/zones/Port_Bastok/npcs/Sugandhi.lua +++ b/scripts/zones/Port_Bastok/npcs/Sugandhi.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.PORT_BASTOK] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -32,10 +29,4 @@ entity.onTrigger = function(player, npc) xi.shop.nation(player, stock, xi.nation.BASTOK) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Port_Bastok/npcs/Symphonic_Curator.lua b/scripts/zones/Port_Bastok/npcs/Symphonic_Curator.lua index 1f207df2bd3..78532bbf338 100644 --- a/scripts/zones/Port_Bastok/npcs/Symphonic_Curator.lua +++ b/scripts/zones/Port_Bastok/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/Port_Bastok/npcs/Synergy_Engineer.lua b/scripts/zones/Port_Bastok/npcs/Synergy_Engineer.lua deleted file mode 100644 index 21be2cf0f3e..00000000000 --- a/scripts/zones/Port_Bastok/npcs/Synergy_Engineer.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Port Bastok --- NPC: Synergy Engineer --- !pos 37.700 -0.3 -50.500 236 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(11002) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_Bastok/npcs/Tiger_Tooth.lua b/scripts/zones/Port_Bastok/npcs/Tiger_Tooth.lua deleted file mode 100644 index 1fbdfa2811b..00000000000 --- a/scripts/zones/Port_Bastok/npcs/Tiger_Tooth.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port Bastok --- NPC: Tiger Tooth ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(12) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_Bastok/npcs/Tilian.lua b/scripts/zones/Port_Bastok/npcs/Tilian.lua deleted file mode 100644 index ebe2d8e624c..00000000000 --- a/scripts/zones/Port_Bastok/npcs/Tilian.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Port Bastok --- NPC: Tilian --- !pos -118.460 4.999 -68.090 236 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(100) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_Bastok/npcs/Trilok.lua b/scripts/zones/Port_Bastok/npcs/Trilok.lua deleted file mode 100644 index 94e86e0d8d0..00000000000 --- a/scripts/zones/Port_Bastok/npcs/Trilok.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port Bastok --- NPC: Trilok ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(44) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_Bastok/npcs/Valeriano.lua b/scripts/zones/Port_Bastok/npcs/Valeriano.lua index 7eb690fe2d0..53742e1e1d4 100644 --- a/scripts/zones/Port_Bastok/npcs/Valeriano.lua +++ b/scripts/zones/Port_Bastok/npcs/Valeriano.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.PORT_BASTOK] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -32,10 +29,4 @@ entity.onTrigger = function(player, npc) xi.shop.general(player, stock) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Port_Bastok/npcs/Varden.lua b/scripts/zones/Port_Bastok/npcs/Varden.lua deleted file mode 100644 index 05e15b2aa8b..00000000000 --- a/scripts/zones/Port_Bastok/npcs/Varden.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port Bastok --- NPC: Varden ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(141) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_Bastok/npcs/Vattian.lua b/scripts/zones/Port_Bastok/npcs/Vattian.lua index 12b84004d82..b3ac0b03a15 100644 --- a/scripts/zones/Port_Bastok/npcs/Vattian.lua +++ b/scripts/zones/Port_Bastok/npcs/Vattian.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.PORT_BASTOK] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if GetRegionOwner(xi.region.KUZOTZ) ~= xi.nation.BASTOK then player:showText(npc, ID.text.VATTIAN_CLOSED_DIALOG) @@ -27,10 +24,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Port_Bastok/npcs/Wurteh.lua b/scripts/zones/Port_Bastok/npcs/Wurteh.lua deleted file mode 100644 index 13223691f26..00000000000 --- a/scripts/zones/Port_Bastok/npcs/Wurteh.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port Bastok --- NPC: Wurteh ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(95) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_Bastok/npcs/Zeldaff.lua b/scripts/zones/Port_Bastok/npcs/Zeldaff.lua deleted file mode 100644 index 0a88f15e396..00000000000 --- a/scripts/zones/Port_Bastok/npcs/Zeldaff.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Port Bastok --- NPC: Zeldaff ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(30) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Port_Bastok/npcs/Zoby_Quhyo.lua b/scripts/zones/Port_Bastok/npcs/Zoby_Quhyo.lua index 7a59114a037..89350a05f52 100644 --- a/scripts/zones/Port_Bastok/npcs/Zoby_Quhyo.lua +++ b/scripts/zones/Port_Bastok/npcs/Zoby_Quhyo.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.PORT_BASTOK] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if GetRegionOwner(xi.region.ELSHIMOLOWLANDS) ~= xi.nation.BASTOK then player:showText(npc, ID.text.ZOBYQUHYO_CLOSED_DIALOG) @@ -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/Port_Bastok/npcs/_6k8.lua b/scripts/zones/Port_Bastok/npcs/_6k8.lua index 93bc7916fc9..8a608f22d3e 100644 --- a/scripts/zones/Port_Bastok/npcs/_6k8.lua +++ b/scripts/zones/Port_Bastok/npcs/_6k8.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.AIRSHIP_PASS) and player:getGil() >= 200 then player:startEvent(141) @@ -17,9 +14,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 141 then local xPos = player:getXPos() diff --git a/scripts/zones/Port_Bastok/npcs/_6k9.lua b/scripts/zones/Port_Bastok/npcs/_6k9.lua deleted file mode 100644 index 6387403b8c4..00000000000 --- a/scripts/zones/Port_Bastok/npcs/_6k9.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Port Bastok --- NPC: Door: Arrivals Entrance --- !pos -80 1 -26 236 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(140) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity