From 73bcaf11f24ca4f789885d0b44fe98910666ec50 Mon Sep 17 00:00:00 2001 From: claywar Date: Sun, 26 Jan 2025 14:37:22 -0500 Subject: [PATCH 1/4] Remove empty NPCs, add Default Actions - Bastok Mines ~ Buburimu --- scripts/zones/Bastok_Mines/DefaultActions.lua | 60 ++++++++++++------- .../zones/Bastok_Mines/npcs/AMAN_Liaison.lua | 3 - .../zones/Bastok_Mines/npcs/Abd-al-Raziq.lua | 3 - scripts/zones/Bastok_Mines/npcs/Amar.lua | 21 ------- scripts/zones/Bastok_Mines/npcs/Arva.lua | 3 - .../Bastok_Mines/npcs/Auction_Counter.lua | 9 --- scripts/zones/Bastok_Mines/npcs/Aulavia.lua | 6 -- scripts/zones/Bastok_Mines/npcs/Azette.lua | 3 - scripts/zones/Bastok_Mines/npcs/Azima.lua | 6 -- scripts/zones/Bastok_Mines/npcs/Black_Mud.lua | 12 ---- scripts/zones/Bastok_Mines/npcs/Boytz.lua | 9 --- scripts/zones/Bastok_Mines/npcs/Christina.lua | 23 ------- scripts/zones/Bastok_Mines/npcs/Deegis.lua | 9 --- .../zones/Bastok_Mines/npcs/Door_House.lua | 3 - scripts/zones/Bastok_Mines/npcs/Dry_Bone.lua | 21 ------- .../zones/Bastok_Mines/npcs/Emaliveulaux.lua | 6 -- .../npcs/Enigmatic_Footprints.lua | 24 -------- scripts/zones/Bastok_Mines/npcs/Eulaphe.lua | 3 - .../Bastok_Mines/npcs/Explorer_Moogle.lua | 6 -- scripts/zones/Bastok_Mines/npcs/Faustin.lua | 6 -- scripts/zones/Bastok_Mines/npcs/Galdeo.lua | 9 --- scripts/zones/Bastok_Mines/npcs/Gawful.lua | 9 --- scripts/zones/Bastok_Mines/npcs/Gelzerio.lua | 9 --- scripts/zones/Bastok_Mines/npcs/Gerbaum.lua | 9 --- scripts/zones/Bastok_Mines/npcs/Gonija.lua | 23 ------- scripts/zones/Bastok_Mines/npcs/Gorvik.lua | 23 ------- scripts/zones/Bastok_Mines/npcs/Gray_Wolf.lua | 21 ------- scripts/zones/Bastok_Mines/npcs/Gregory.lua | 23 ------- scripts/zones/Bastok_Mines/npcs/Griselda.lua | 9 --- .../zones/Bastok_Mines/npcs/Hound_Nose.lua | 21 ------- .../zones/Bastok_Mines/npcs/Hunt_Registry.lua | 3 - scripts/zones/Bastok_Mines/npcs/Leonie.lua | 23 ------- scripts/zones/Bastok_Mines/npcs/Mariadok.lua | 9 --- scripts/zones/Bastok_Mines/npcs/Maymunah.lua | 9 --- scripts/zones/Bastok_Mines/npcs/Mille.lua | 6 -- scripts/zones/Bastok_Mines/npcs/Mydon.lua | 21 ------- scripts/zones/Bastok_Mines/npcs/Nangst.lua | 21 ------- .../zones/Bastok_Mines/npcs/Neigepance.lua | 9 --- scripts/zones/Bastok_Mines/npcs/Odoba.lua | 9 --- .../zones/Bastok_Mines/npcs/Proud_Beard.lua | 6 -- scripts/zones/Bastok_Mines/npcs/Quelle.lua | 3 - .../zones/Bastok_Mines/npcs/Ranpi-Pappi.lua | 22 ------- scripts/zones/Bastok_Mines/npcs/Rashid.lua | 9 --- .../zones/Bastok_Mines/npcs/Rodellieux.lua | 9 --- scripts/zones/Bastok_Mines/npcs/Sieglinde.lua | 6 -- scripts/zones/Bastok_Mines/npcs/Sodragamm.lua | 9 --- .../Bastok_Mines/npcs/Symphonic_Curator.lua | 3 - scripts/zones/Bastok_Mines/npcs/Tibelda.lua | 9 --- scripts/zones/Bastok_Mines/npcs/Titus.lua | 6 -- .../Bastok_Mines/npcs/Trail_Markings.lua | 6 -- scripts/zones/Bastok_Mines/npcs/Vaghron.lua | 23 ------- scripts/zones/Bastok_Mines/npcs/Valeri.lua | 21 ------- .../zones/Bastok_Mines/npcs/Wyvern_Tail.lua | 21 ------- scripts/zones/Bastok_Mines/npcs/Zemedars.lua | 9 --- .../zones/Batallia_Downs/DefaultActions.lua | 2 + .../Batallia_Downs/npcs/Cavernous_Maw.lua | 6 -- .../Batallia_Downs/npcs/Field_Manual.lua | 3 - .../npcs/Geomantic_Reservoir.lua | 6 -- .../zones/Batallia_Downs/npcs/Luck_Rune.lua | 25 -------- .../Batallia_Downs/npcs/Lyco_Sparkles.lua | 3 - .../Batallia_Downs/npcs/Stone_Monument.lua | 10 ---- .../Batallia_Downs/npcs/Treasure_Casket.lua | 3 - scripts/zones/Batallia_Downs/npcs/qm1.lua | 3 - scripts/zones/Batallia_Downs/npcs/qm2.lua | 9 --- .../Batallia_Downs_[S]/npcs/Cavernous_Maw.lua | 6 -- .../Batallia_Downs_[S]/npcs/Lycopodium.lua | 6 -- .../zones/Batallia_Downs_[S]/npcs/Shanene.lua | 6 -- scripts/zones/Beadeaux/DefaultActions.lua | 5 +- .../zones/Beadeaux/npcs/GeFhu_Yagudoeye.lua | 22 ------- .../Beadeaux/npcs/Geomantic_Reservoir.lua | 6 -- scripts/zones/Beadeaux/npcs/The_Mute.lua | 11 +--- .../zones/Beadeaux/npcs/Treasure_Chest.lua | 6 -- .../zones/Beadeaux/npcs/Treasure_Coffer.lua | 6 -- .../Beaucedine_Glacier/DefaultActions.lua | 1 + .../npcs/Beastmens_Banner.lua | 24 -------- .../Beaucedine_Glacier/npcs/Field_Manual.lua | 3 - .../npcs/Geomantic_Reservoir.lua | 6 -- .../npcs/Geomantic_Reservoir_2.lua | 6 -- .../Beaucedine_Glacier/npcs/Gueriette.lua | 3 - .../Beaucedine_Glacier/npcs/Iron_Grate.lua | 6 -- .../zones/Beaucedine_Glacier/npcs/Potete.lua | 25 -------- .../npcs/Torino-Samarino.lua | 6 -- .../npcs/Trail_Markings.lua | 6 -- .../npcs/Treasure_Casket.lua | 3 - .../zones/Beaucedine_Glacier/npcs/relic.lua | 3 - .../npcs/Disserond_RK.lua | 9 --- .../npcs/Gray_Colossus_LC.lua | 9 --- .../npcs/Luhk_Leotih_MC.lua | 9 --- .../Beaucedine_Glacier_[S]/npcs/Moana_CA.lua | 9 --- .../npcs/Watchful_Pixie.lua | 10 +--- .../Behemoths_Dominion/npcs/Field_Manual.lua | 3 - .../npcs/Geomantic_Reservoir.lua | 6 -- .../npcs/Treasure_Casket.lua | 3 - scripts/zones/Behemoths_Dominion/npcs/qm2.lua | 9 --- .../zones/Bhaflau_Thickets/npcs/Daswil.lua | 6 -- .../npcs/Harvesting_Point.lua | 6 -- .../npcs/Kamih_Mapokhalam.lua | 3 - .../Bhaflau_Thickets/npcs/Runic_Portal.lua | 6 -- scripts/zones/Bhaflau_Thickets/npcs/_1g0.lua | 6 -- scripts/zones/Bhaflau_Thickets/npcs/_1g1.lua | 9 --- scripts/zones/Bhaflau_Thickets/npcs/_1g2.lua | 3 - scripts/zones/Bhaflau_Thickets/npcs/qm1.lua | 6 -- scripts/zones/Bhaflau_Thickets/npcs/qm2.lua | 6 -- scripts/zones/Bibiki_Bay/DefaultActions.lua | 5 +- .../zones/Bibiki_Bay/npcs/Clamming_Point.lua | 3 - .../zones/Bibiki_Bay/npcs/Fheli_Lapatzuo.lua | 9 --- .../zones/Bibiki_Bay/npcs/Mep_Nhapopoluko.lua | 9 --- .../zones/Bibiki_Bay/npcs/Noih_Tahparawh.lua | 9 --- .../Bibiki_Bay/npcs/Pohka_Chichiyowahl.lua | 9 --- .../zones/Bibiki_Bay/npcs/Rhalo_Davigoh.lua | 22 ------- scripts/zones/Bibiki_Bay/npcs/Toh_Zonikki.lua | 3 - .../zones/Bibiki_Bay/npcs/Tswe_Panipahr.lua | 6 -- scripts/zones/Bibiki_Bay/npcs/qm_shen.lua | 6 -- .../Bostaunieux_Oubliette/DefaultActions.lua | 6 +- .../Bostaunieux_Oubliette/npcs/Chumia.lua | 24 -------- .../npcs/Couchatorage.lua | 22 ------- .../npcs/Geomantic_Reservoir.lua | 6 -- .../npcs/Goblin_Footprint.lua | 3 - .../npcs/Grounds_Tome.lua | 3 - .../npcs/Jurgenclaus.lua | 22 ------- .../npcs/Treasure_Casket.lua | 3 - .../zones/Bostaunieux_Oubliette/npcs/_4n2.lua | 24 -------- .../Buburimu_Peninsula/DefaultActions.lua | 4 +- .../npcs/Beastmens_Banner.lua | 24 -------- .../Buburimu_Peninsula/npcs/Cavernous_Maw.lua | 6 -- .../Buburimu_Peninsula/npcs/Field_Manual.lua | 3 - .../npcs/Five_of_Spades.lua | 6 -- .../Buburimu_Peninsula/npcs/Hieroglyphics.lua | 6 -- .../npcs/Lobho_Ukipturi.lua | 3 - .../Buburimu_Peninsula/npcs/Logging_Point.lua | 6 -- .../Buburimu_Peninsula/npcs/Signpost.lua | 9 --- .../npcs/Stone_Monument.lua | 10 ---- .../npcs/Treasure_Casket.lua | 3 - 133 files changed, 57 insertions(+), 1235 deletions(-) delete mode 100644 scripts/zones/Bastok_Mines/npcs/Amar.lua delete mode 100644 scripts/zones/Bastok_Mines/npcs/Christina.lua delete mode 100644 scripts/zones/Bastok_Mines/npcs/Dry_Bone.lua delete mode 100644 scripts/zones/Bastok_Mines/npcs/Enigmatic_Footprints.lua delete mode 100644 scripts/zones/Bastok_Mines/npcs/Gonija.lua delete mode 100644 scripts/zones/Bastok_Mines/npcs/Gorvik.lua delete mode 100644 scripts/zones/Bastok_Mines/npcs/Gray_Wolf.lua delete mode 100644 scripts/zones/Bastok_Mines/npcs/Gregory.lua delete mode 100644 scripts/zones/Bastok_Mines/npcs/Hound_Nose.lua delete mode 100644 scripts/zones/Bastok_Mines/npcs/Leonie.lua delete mode 100644 scripts/zones/Bastok_Mines/npcs/Mydon.lua delete mode 100644 scripts/zones/Bastok_Mines/npcs/Nangst.lua delete mode 100644 scripts/zones/Bastok_Mines/npcs/Ranpi-Pappi.lua delete mode 100644 scripts/zones/Bastok_Mines/npcs/Vaghron.lua delete mode 100644 scripts/zones/Bastok_Mines/npcs/Valeri.lua delete mode 100644 scripts/zones/Bastok_Mines/npcs/Wyvern_Tail.lua delete mode 100644 scripts/zones/Batallia_Downs/npcs/Luck_Rune.lua delete mode 100644 scripts/zones/Beadeaux/npcs/GeFhu_Yagudoeye.lua delete mode 100644 scripts/zones/Beaucedine_Glacier/npcs/Beastmens_Banner.lua delete mode 100644 scripts/zones/Beaucedine_Glacier/npcs/Potete.lua delete mode 100644 scripts/zones/Bibiki_Bay/npcs/Rhalo_Davigoh.lua delete mode 100644 scripts/zones/Bostaunieux_Oubliette/npcs/Chumia.lua delete mode 100644 scripts/zones/Bostaunieux_Oubliette/npcs/Couchatorage.lua delete mode 100644 scripts/zones/Bostaunieux_Oubliette/npcs/Jurgenclaus.lua delete mode 100644 scripts/zones/Bostaunieux_Oubliette/npcs/_4n2.lua delete mode 100644 scripts/zones/Buburimu_Peninsula/npcs/Beastmens_Banner.lua diff --git a/scripts/zones/Bastok_Mines/DefaultActions.lua b/scripts/zones/Bastok_Mines/DefaultActions.lua index c3dc47b345a..30cb7affa4c 100644 --- a/scripts/zones/Bastok_Mines/DefaultActions.lua +++ b/scripts/zones/Bastok_Mines/DefaultActions.lua @@ -1,25 +1,41 @@ --- local ID = zones[xi.zone.BASTOK_MINES] +local ID = zones[xi.zone.BASTOK_MINES] return { - ['Babenn'] = { event = 40 }, - ['Black_Mud'] = { event = 100 }, - ['Davyad'] = { event = 53 }, - ['Deadly_Spider'] = { event = 17 }, - ['Deidogg'] = { event = 32 }, - ['Detzo'] = { event = 30 }, - ['Drangord'] = { event = 21 }, - ['Echo_Hawk'] = { event = 13 }, - ['Elki'] = { event = 31 }, - ['Goraow'] = { event = 105 }, - ['Gumbah'] = { event = 52 }, - ['Medicine_Eagle'] = { event = 25 }, - ['Parraggoh'] = { event = 11 }, - ['Pavvke'] = { event = 75 }, - ['Phara'] = { event = 150 }, - ['Roh_Latteh'] = { event = 29 }, - ['Tall_Mountain'] = { event = 55 }, - ['Tami'] = { event = 115 }, - ['Virnage'] = { event = 140 }, - ['Wahid'] = { event = 28 }, - ['Wobke'] = { event = 244 }, + ['Amar'] = { event = 27 }, + ['Babenn'] = { event = 40 }, + ['Black_Mud'] = { event = 100 }, + ['Christina'] = { event = 32690 }, + ['Davyad'] = { event = 53 }, + ['Deadly_Spider'] = { event = 17 }, + ['Deidogg'] = { event = 32 }, + ['Detzo'] = { event = 30 }, + ['Drangord'] = { event = 21 }, + ['Dry_Bone'] = { event = 26 }, + ['Echo_Hawk'] = { event = 13 }, + ['Elki'] = { event = 31 }, + ['Enigmatic_Footprints'] = { messageSpecial = ID.text.TEAR_IN_FABRIC_OF_SPACE }, + ['Gonija'] = { event = 534 }, + ['Goraow'] = { event = 105 }, + ['Gorvik'] = { event = 185 }, + ['Gray_Wolf'] = { event = 19 }, + ['Gregory'] = { event = 256 }, + ['Gumbah'] = { event = 52 }, + ['Hound_Nose'] = { event = 132 }, + ['Leonie'] = { event = 568 }, + ['Medicine_Eagle'] = { event = 25 }, + ['Mydon'] = { event = 20 }, + ['Nangst'] = { event = 24 }, + ['Parraggoh'] = { event = 11 }, + ['Pavvke'] = { event = 75 }, + ['Phara'] = { event = 150 }, + ['Ranpi-Pappi'] = { event = 77 }, + ['Roh_Latteh'] = { event = 29 }, + ['Tall_Mountain'] = { event = 55 }, + ['Tami'] = { event = 115 }, + ['Vaghron'] = { event = 118 }, + ['Valeri'] = { event = 33 }, + ['Virnage'] = { event = 140 }, + ['Wahid'] = { event = 28 }, + ['Wobke'] = { event = 244 }, + ['Wyvern_Tail'] = { event = 18 }, } diff --git a/scripts/zones/Bastok_Mines/npcs/AMAN_Liaison.lua b/scripts/zones/Bastok_Mines/npcs/AMAN_Liaison.lua index aa3638c0705..c2c35c3af8e 100644 --- a/scripts/zones/Bastok_Mines/npcs/AMAN_Liaison.lua +++ b/scripts/zones/Bastok_Mines/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/Bastok_Mines/npcs/Abd-al-Raziq.lua b/scripts/zones/Bastok_Mines/npcs/Abd-al-Raziq.lua index 387ae836670..bf3259fcb57 100644 --- a/scripts/zones/Bastok_Mines/npcs/Abd-al-Raziq.lua +++ b/scripts/zones/Bastok_Mines/npcs/Abd-al-Raziq.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/Bastok_Mines/npcs/Amar.lua b/scripts/zones/Bastok_Mines/npcs/Amar.lua deleted file mode 100644 index 6c06ad3063a..00000000000 --- a/scripts/zones/Bastok_Mines/npcs/Amar.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Bastok Mines --- NPC: Amar ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(27) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Bastok_Mines/npcs/Arva.lua b/scripts/zones/Bastok_Mines/npcs/Arva.lua index a8ed9f64837..bee3e684e2a 100644 --- a/scripts/zones/Bastok_Mines/npcs/Arva.lua +++ b/scripts/zones/Bastok_Mines/npcs/Arva.lua @@ -19,9 +19,6 @@ entity.onTrigger = function(player, npc) player:startEvent(3) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 4 then player:tradeComplete() diff --git a/scripts/zones/Bastok_Mines/npcs/Auction_Counter.lua b/scripts/zones/Bastok_Mines/npcs/Auction_Counter.lua index 7a7bad34bf9..5ca626e0aa6 100644 --- a/scripts/zones/Bastok_Mines/npcs/Auction_Counter.lua +++ b/scripts/zones/Bastok_Mines/npcs/Auction_Counter.lua @@ -5,17 +5,8 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:sendMenu(xi.menuType.AUCTION) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Bastok_Mines/npcs/Aulavia.lua b/scripts/zones/Bastok_Mines/npcs/Aulavia.lua index 7f6d3032263..40c754fb7f5 100644 --- a/scripts/zones/Bastok_Mines/npcs/Aulavia.lua +++ b/scripts/zones/Bastok_Mines/npcs/Aulavia.lua @@ -29,10 +29,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Bastok_Mines/npcs/Azette.lua b/scripts/zones/Bastok_Mines/npcs/Azette.lua index c1571df68c9..61c805d1076 100644 --- a/scripts/zones/Bastok_Mines/npcs/Azette.lua +++ b/scripts/zones/Bastok_Mines/npcs/Azette.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/Bastok_Mines/npcs/Azima.lua b/scripts/zones/Bastok_Mines/npcs/Azima.lua index 222360f161c..99b04492fb2 100644 --- a/scripts/zones/Bastok_Mines/npcs/Azima.lua +++ b/scripts/zones/Bastok_Mines/npcs/Azima.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/Bastok_Mines/npcs/Black_Mud.lua b/scripts/zones/Bastok_Mines/npcs/Black_Mud.lua index 38f3372905f..ccdea865dca 100644 --- a/scripts/zones/Bastok_Mines/npcs/Black_Mud.lua +++ b/scripts/zones/Bastok_Mines/npcs/Black_Mud.lua @@ -18,16 +18,4 @@ entity.onSpawn = function(npc) npc:pathThrough(pathNodes, xi.path.flag.PATROL) end -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Bastok_Mines/npcs/Boytz.lua b/scripts/zones/Bastok_Mines/npcs/Boytz.lua index 7d2822b36ef..72c028366c9 100644 --- a/scripts/zones/Bastok_Mines/npcs/Boytz.lua +++ b/scripts/zones/Bastok_Mines/npcs/Boytz.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.BASTOK_MINES] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -44,10 +41,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/Bastok_Mines/npcs/Christina.lua b/scripts/zones/Bastok_Mines/npcs/Christina.lua deleted file mode 100644 index 3fe8014b617..00000000000 --- a/scripts/zones/Bastok_Mines/npcs/Christina.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Bastok Mines --- NPC: Christina --- Type: Special Event Coordinator --- !pos 23.703 -1 -86.034 234 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(32690) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Bastok_Mines/npcs/Deegis.lua b/scripts/zones/Bastok_Mines/npcs/Deegis.lua index 7494f8a010b..4087cb06e17 100644 --- a/scripts/zones/Bastok_Mines/npcs/Deegis.lua +++ b/scripts/zones/Bastok_Mines/npcs/Deegis.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.BASTOK_MINES] ---@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.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/Bastok_Mines/npcs/Door_House.lua b/scripts/zones/Bastok_Mines/npcs/Door_House.lua index b25cb9ecc7f..92f134ef97c 100644 --- a/scripts/zones/Bastok_Mines/npcs/Door_House.lua +++ b/scripts/zones/Bastok_Mines/npcs/Door_House.lua @@ -50,9 +50,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 519 then player:setCharVar('LeleroonsLetterBlue', 2) diff --git a/scripts/zones/Bastok_Mines/npcs/Dry_Bone.lua b/scripts/zones/Bastok_Mines/npcs/Dry_Bone.lua deleted file mode 100644 index 862116170be..00000000000 --- a/scripts/zones/Bastok_Mines/npcs/Dry_Bone.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Bastok Mines --- NPC: Dry Bone ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(26) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Bastok_Mines/npcs/Emaliveulaux.lua b/scripts/zones/Bastok_Mines/npcs/Emaliveulaux.lua index 688a4f6470e..8988b378492 100644 --- a/scripts/zones/Bastok_Mines/npcs/Emaliveulaux.lua +++ b/scripts/zones/Bastok_Mines/npcs/Emaliveulaux.lua @@ -34,10 +34,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Bastok_Mines/npcs/Enigmatic_Footprints.lua b/scripts/zones/Bastok_Mines/npcs/Enigmatic_Footprints.lua deleted file mode 100644 index 0d0f3431f40..00000000000 --- a/scripts/zones/Bastok_Mines/npcs/Enigmatic_Footprints.lua +++ /dev/null @@ -1,24 +0,0 @@ ------------------------------------ --- Area: Bastok Mines --- NPC: Enigmatic Footprints --- Entry NPC for Dynamis Divergence ------------------------------------ -local ID = zones[xi.zone.BASTOK_MINES] ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:messageSpecial(ID.text.TEAR_IN_FABRIC_OF_SPACE) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Bastok_Mines/npcs/Eulaphe.lua b/scripts/zones/Bastok_Mines/npcs/Eulaphe.lua index 0f971d93daf..f231edbd939 100644 --- a/scripts/zones/Bastok_Mines/npcs/Eulaphe.lua +++ b/scripts/zones/Bastok_Mines/npcs/Eulaphe.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/Bastok_Mines/npcs/Explorer_Moogle.lua b/scripts/zones/Bastok_Mines/npcs/Explorer_Moogle.lua index e2d3a907f31..3b5679c67ea 100644 --- a/scripts/zones/Bastok_Mines/npcs/Explorer_Moogle.lua +++ b/scripts/zones/Bastok_Mines/npcs/Explorer_Moogle.lua @@ -7,16 +7,10 @@ local entity = {} local eventId = 585 -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/Bastok_Mines/npcs/Faustin.lua b/scripts/zones/Bastok_Mines/npcs/Faustin.lua index 6a852c60f62..9850200520e 100644 --- a/scripts/zones/Bastok_Mines/npcs/Faustin.lua +++ b/scripts/zones/Bastok_Mines/npcs/Faustin.lua @@ -29,10 +29,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Bastok_Mines/npcs/Galdeo.lua b/scripts/zones/Bastok_Mines/npcs/Galdeo.lua index 1cccbbd2800..bb6a6f1fdee 100644 --- a/scripts/zones/Bastok_Mines/npcs/Galdeo.lua +++ b/scripts/zones/Bastok_Mines/npcs/Galdeo.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.BASTOK_MINES] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if GetRegionOwner(xi.region.LITELOR) ~= xi.nation.BASTOK then player:showText(npc, ID.text.GALDEO_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/Bastok_Mines/npcs/Gawful.lua b/scripts/zones/Bastok_Mines/npcs/Gawful.lua index 6e1c2799624..671e89113ca 100644 --- a/scripts/zones/Bastok_Mines/npcs/Gawful.lua +++ b/scripts/zones/Bastok_Mines/npcs/Gawful.lua @@ -9,18 +9,9 @@ local ID = zones[xi.zone.BASTOK_MINES] ---@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/Bastok_Mines/npcs/Gelzerio.lua b/scripts/zones/Bastok_Mines/npcs/Gelzerio.lua index a83806b79c5..b7928fc3608 100644 --- a/scripts/zones/Bastok_Mines/npcs/Gelzerio.lua +++ b/scripts/zones/Bastok_Mines/npcs/Gelzerio.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.BASTOK_MINES] ---@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.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/Bastok_Mines/npcs/Gerbaum.lua b/scripts/zones/Bastok_Mines/npcs/Gerbaum.lua index fe46e1de00c..81df6943ca3 100644 --- a/scripts/zones/Bastok_Mines/npcs/Gerbaum.lua +++ b/scripts/zones/Bastok_Mines/npcs/Gerbaum.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local rand = math.random(1, 2) @@ -18,10 +15,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Bastok_Mines/npcs/Gonija.lua b/scripts/zones/Bastok_Mines/npcs/Gonija.lua deleted file mode 100644 index 894dcd7282f..00000000000 --- a/scripts/zones/Bastok_Mines/npcs/Gonija.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Bastok Mines --- NPC: Gonija --- Type: Chocobo Breeder --- !pos 28 0 -105 234 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(534) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Bastok_Mines/npcs/Gorvik.lua b/scripts/zones/Bastok_Mines/npcs/Gorvik.lua deleted file mode 100644 index e03293c6235..00000000000 --- a/scripts/zones/Bastok_Mines/npcs/Gorvik.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Bastok Mines --- NPC: Gorvik --- Type: Past Event Watcher --- !pos 21.033 -1 -98.486 234 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(185) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Bastok_Mines/npcs/Gray_Wolf.lua b/scripts/zones/Bastok_Mines/npcs/Gray_Wolf.lua deleted file mode 100644 index ac311b334e9..00000000000 --- a/scripts/zones/Bastok_Mines/npcs/Gray_Wolf.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Bastok Mines --- NPC: Gray Wolf ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(19) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Bastok_Mines/npcs/Gregory.lua b/scripts/zones/Bastok_Mines/npcs/Gregory.lua deleted file mode 100644 index 476790d14dd..00000000000 --- a/scripts/zones/Bastok_Mines/npcs/Gregory.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Bastok Mines --- NPC: Gregory --- Type: ENM --- !pos 51.530 -1 -83.940 234 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(256) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Bastok_Mines/npcs/Griselda.lua b/scripts/zones/Bastok_Mines/npcs/Griselda.lua index bd1787d83c5..e13c57a4622 100644 --- a/scripts/zones/Bastok_Mines/npcs/Griselda.lua +++ b/scripts/zones/Bastok_Mines/npcs/Griselda.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.BASTOK_MINES] ---@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/Bastok_Mines/npcs/Hound_Nose.lua b/scripts/zones/Bastok_Mines/npcs/Hound_Nose.lua deleted file mode 100644 index 45577814aab..00000000000 --- a/scripts/zones/Bastok_Mines/npcs/Hound_Nose.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Bastok Mines --- NPC: Hound Nose ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(132) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Bastok_Mines/npcs/Hunt_Registry.lua b/scripts/zones/Bastok_Mines/npcs/Hunt_Registry.lua index 253c9d42691..48d7bd3c34c 100644 --- a/scripts/zones/Bastok_Mines/npcs/Hunt_Registry.lua +++ b/scripts/zones/Bastok_Mines/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/Bastok_Mines/npcs/Leonie.lua b/scripts/zones/Bastok_Mines/npcs/Leonie.lua deleted file mode 100644 index a72b2ba950d..00000000000 --- a/scripts/zones/Bastok_Mines/npcs/Leonie.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Bastok Mines --- NPC: Leonie --- Type: Room Renters --- !pos 118.871 -0.004 -83.916 234 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(568) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Bastok_Mines/npcs/Mariadok.lua b/scripts/zones/Bastok_Mines/npcs/Mariadok.lua index ce62e130eb4..d3e5c4346e3 100644 --- a/scripts/zones/Bastok_Mines/npcs/Mariadok.lua +++ b/scripts/zones/Bastok_Mines/npcs/Mariadok.lua @@ -6,17 +6,8 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(2, 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/Bastok_Mines/npcs/Maymunah.lua b/scripts/zones/Bastok_Mines/npcs/Maymunah.lua index 5f488eaa5bd..38b411e4938 100644 --- a/scripts/zones/Bastok_Mines/npcs/Maymunah.lua +++ b/scripts/zones/Bastok_Mines/npcs/Maymunah.lua @@ -9,19 +9,10 @@ local ID = zones[xi.zone.BASTOK_MINES] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:sendGuild(5262, 8, 23, 6) then player:showText(npc, ID.text.MAYMUNAH_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/Bastok_Mines/npcs/Mille.lua b/scripts/zones/Bastok_Mines/npcs/Mille.lua index 0c118160e66..2bd754aa8a7 100644 --- a/scripts/zones/Bastok_Mines/npcs/Mille.lua +++ b/scripts/zones/Bastok_Mines/npcs/Mille.lua @@ -29,10 +29,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Bastok_Mines/npcs/Mydon.lua b/scripts/zones/Bastok_Mines/npcs/Mydon.lua deleted file mode 100644 index 5fc8e06bffd..00000000000 --- a/scripts/zones/Bastok_Mines/npcs/Mydon.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Bastok Mines --- NPC: Mydon ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(20) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Bastok_Mines/npcs/Nangst.lua b/scripts/zones/Bastok_Mines/npcs/Nangst.lua deleted file mode 100644 index 801d4eee7cb..00000000000 --- a/scripts/zones/Bastok_Mines/npcs/Nangst.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Bastok Mines --- NPC: Nangst ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(24) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Bastok_Mines/npcs/Neigepance.lua b/scripts/zones/Bastok_Mines/npcs/Neigepance.lua index dd16356f7d3..8021aa5a414 100644 --- a/scripts/zones/Bastok_Mines/npcs/Neigepance.lua +++ b/scripts/zones/Bastok_Mines/npcs/Neigepance.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.BASTOK_MINES] ---@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/Bastok_Mines/npcs/Odoba.lua b/scripts/zones/Bastok_Mines/npcs/Odoba.lua index 988ddd4152d..790477cc1b2 100644 --- a/scripts/zones/Bastok_Mines/npcs/Odoba.lua +++ b/scripts/zones/Bastok_Mines/npcs/Odoba.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.BASTOK_MINES] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local guildSkillId = xi.skill.ALCHEMY local stock = xi.shop.generalGuildStock[guildSkillId] @@ -19,10 +16,4 @@ entity.onTrigger = function(player, npc) player:showText(npc, ID.text.ODOBA_SHOP_DIALOG) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Bastok_Mines/npcs/Proud_Beard.lua b/scripts/zones/Bastok_Mines/npcs/Proud_Beard.lua index 1a0bda67644..4240f6f06e3 100644 --- a/scripts/zones/Bastok_Mines/npcs/Proud_Beard.lua +++ b/scripts/zones/Bastok_Mines/npcs/Proud_Beard.lua @@ -32,10 +32,4 @@ entity.onTrigger = function(player, npc) xi.shop.general(player, stock) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Bastok_Mines/npcs/Quelle.lua b/scripts/zones/Bastok_Mines/npcs/Quelle.lua index a6e0ddb4a6b..564835a9c12 100644 --- a/scripts/zones/Bastok_Mines/npcs/Quelle.lua +++ b/scripts/zones/Bastok_Mines/npcs/Quelle.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/Bastok_Mines/npcs/Ranpi-Pappi.lua b/scripts/zones/Bastok_Mines/npcs/Ranpi-Pappi.lua deleted file mode 100644 index b39d7db820e..00000000000 --- a/scripts/zones/Bastok_Mines/npcs/Ranpi-Pappi.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Bastok Mines --- NPC: Ranpi-Pappi --- !pos -4.535 -1.044 49.881 234 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(77) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Bastok_Mines/npcs/Rashid.lua b/scripts/zones/Bastok_Mines/npcs/Rashid.lua index f35c44b645f..367f34adc0e 100644 --- a/scripts/zones/Bastok_Mines/npcs/Rashid.lua +++ b/scripts/zones/Bastok_Mines/npcs/Rashid.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/Bastok_Mines/npcs/Rodellieux.lua b/scripts/zones/Bastok_Mines/npcs/Rodellieux.lua index 5689dca1900..e08cdec1c09 100644 --- a/scripts/zones/Bastok_Mines/npcs/Rodellieux.lua +++ b/scripts/zones/Bastok_Mines/npcs/Rodellieux.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.BASTOK_MINES] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if GetRegionOwner(xi.region.FAUREGANDI) ~= xi.nation.BASTOK then player:showText(npc, ID.text.RODELLIEUX_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/Bastok_Mines/npcs/Sieglinde.lua b/scripts/zones/Bastok_Mines/npcs/Sieglinde.lua index 055922fa5a7..e855899cc48 100644 --- a/scripts/zones/Bastok_Mines/npcs/Sieglinde.lua +++ b/scripts/zones/Bastok_Mines/npcs/Sieglinde.lua @@ -6,16 +6,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/Bastok_Mines/npcs/Sodragamm.lua b/scripts/zones/Bastok_Mines/npcs/Sodragamm.lua index 7c3895ed4e6..97476231c46 100644 --- a/scripts/zones/Bastok_Mines/npcs/Sodragamm.lua +++ b/scripts/zones/Bastok_Mines/npcs/Sodragamm.lua @@ -9,18 +9,9 @@ local ID = zones[xi.zone.BASTOK_MINES] ---@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/Bastok_Mines/npcs/Symphonic_Curator.lua b/scripts/zones/Bastok_Mines/npcs/Symphonic_Curator.lua index 1f207df2bd3..78532bbf338 100644 --- a/scripts/zones/Bastok_Mines/npcs/Symphonic_Curator.lua +++ b/scripts/zones/Bastok_Mines/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/Bastok_Mines/npcs/Tibelda.lua b/scripts/zones/Bastok_Mines/npcs/Tibelda.lua index c9caa4e6fff..084b7c17723 100644 --- a/scripts/zones/Bastok_Mines/npcs/Tibelda.lua +++ b/scripts/zones/Bastok_Mines/npcs/Tibelda.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.BASTOK_MINES] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if GetRegionOwner(xi.region.VALDEAUNIA) ~= xi.nation.BASTOK then player:showText(npc, ID.text.TIBELDA_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/Bastok_Mines/npcs/Titus.lua b/scripts/zones/Bastok_Mines/npcs/Titus.lua index adec406a67a..aca0a57cf06 100644 --- a/scripts/zones/Bastok_Mines/npcs/Titus.lua +++ b/scripts/zones/Bastok_Mines/npcs/Titus.lua @@ -6,16 +6,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/Bastok_Mines/npcs/Trail_Markings.lua b/scripts/zones/Bastok_Mines/npcs/Trail_Markings.lua index ad39042070a..745f596ed86 100644 --- a/scripts/zones/Bastok_Mines/npcs/Trail_Markings.lua +++ b/scripts/zones/Bastok_Mines/npcs/Trail_Markings.lua @@ -7,16 +7,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.dynamis.entryNpcOnTrigger(player, npc) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.dynamis.entryNpcOnEventFinish(player, csid, option, npc) end diff --git a/scripts/zones/Bastok_Mines/npcs/Vaghron.lua b/scripts/zones/Bastok_Mines/npcs/Vaghron.lua deleted file mode 100644 index fa30d0d13f0..00000000000 --- a/scripts/zones/Bastok_Mines/npcs/Vaghron.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Bastok Mines --- NPC: Vaghron --- Type: Adventurer's Assistant --- !pos -39.162 -1 -92.147 234 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(118) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Bastok_Mines/npcs/Valeri.lua b/scripts/zones/Bastok_Mines/npcs/Valeri.lua deleted file mode 100644 index c4d36dc9d72..00000000000 --- a/scripts/zones/Bastok_Mines/npcs/Valeri.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Bastok Mines --- NPC: Valeri ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(33) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Bastok_Mines/npcs/Wyvern_Tail.lua b/scripts/zones/Bastok_Mines/npcs/Wyvern_Tail.lua deleted file mode 100644 index b3c1e5aff13..00000000000 --- a/scripts/zones/Bastok_Mines/npcs/Wyvern_Tail.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Bastok Mines --- NPC: Wyvern Tail ------------------------------------ ----@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/Bastok_Mines/npcs/Zemedars.lua b/scripts/zones/Bastok_Mines/npcs/Zemedars.lua index 11361290b9b..48a2b040a34 100644 --- a/scripts/zones/Bastok_Mines/npcs/Zemedars.lua +++ b/scripts/zones/Bastok_Mines/npcs/Zemedars.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.BASTOK_MINES] ---@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/Batallia_Downs/DefaultActions.lua b/scripts/zones/Batallia_Downs/DefaultActions.lua index 45cf9eb097c..1942a93fca1 100644 --- a/scripts/zones/Batallia_Downs/DefaultActions.lua +++ b/scripts/zones/Batallia_Downs/DefaultActions.lua @@ -1,9 +1,11 @@ local ID = zones[xi.zone.BATALLIA_DOWNS] return { + ['Luck_Rune'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, ['qm3'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, ['qm4'] = { messageSpecial = ID.text.NO_GRASS_GROWING_HERE }, ['qm_chocobotale'] = { messageSpecial = ID.text.YOU_FIND_NOTHING }, ['qm_maw'] = { messageSpecial = ID.text.NOTHING_HAPPENS }, + ['Stone_Monument'] = { event = 900 }, ['Weathered_Gravestone'] = { messageSpecial = ID.text.SEE_WEATHERED_GRAVESTONE }, } diff --git a/scripts/zones/Batallia_Downs/npcs/Cavernous_Maw.lua b/scripts/zones/Batallia_Downs/npcs/Cavernous_Maw.lua index 9fe87ad9031..3cb8d44dcc0 100644 --- a/scripts/zones/Batallia_Downs/npcs/Cavernous_Maw.lua +++ b/scripts/zones/Batallia_Downs/npcs/Cavernous_Maw.lua @@ -7,16 +7,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.maws.onTrigger(player, npc) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.maws.onEventFinish(player, csid, option, npc) end diff --git a/scripts/zones/Batallia_Downs/npcs/Field_Manual.lua b/scripts/zones/Batallia_Downs/npcs/Field_Manual.lua index 895512e4b1d..792a1a248c8 100644 --- a/scripts/zones/Batallia_Downs/npcs/Field_Manual.lua +++ b/scripts/zones/Batallia_Downs/npcs/Field_Manual.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.regime.bookOnTrigger(player, xi.regime.type.FIELDS) end diff --git a/scripts/zones/Batallia_Downs/npcs/Geomantic_Reservoir.lua b/scripts/zones/Batallia_Downs/npcs/Geomantic_Reservoir.lua index d4dcdb1596d..1d8c093b248 100644 --- a/scripts/zones/Batallia_Downs/npcs/Geomantic_Reservoir.lua +++ b/scripts/zones/Batallia_Downs/npcs/Geomantic_Reservoir.lua @@ -7,16 +7,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.geomanticReservoir.onTrigger(player, npc, xi.magic.spell.GEO_BARRIER) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.geomanticReservoir.onEventFinish(player, csid, xi.magic.spell.GEO_BARRIER) end diff --git a/scripts/zones/Batallia_Downs/npcs/Luck_Rune.lua b/scripts/zones/Batallia_Downs/npcs/Luck_Rune.lua deleted file mode 100644 index 30d3354e6db..00000000000 --- a/scripts/zones/Batallia_Downs/npcs/Luck_Rune.lua +++ /dev/null @@ -1,25 +0,0 @@ ------------------------------------ --- Area: Batallia Downs --- NPC: Luck Rune --- Involved in Quest: Mhaura Fortune --- !pos -362.167 -12.199 157.158 105 ------------------------------------ -local ID = zones[xi.zone.BATALLIA_DOWNS] ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:messageSpecial(ID.text.NOTHING_OUT_OF_ORDINARY) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Batallia_Downs/npcs/Lyco_Sparkles.lua b/scripts/zones/Batallia_Downs/npcs/Lyco_Sparkles.lua index f5938794cb7..8df0119e3df 100644 --- a/scripts/zones/Batallia_Downs/npcs/Lyco_Sparkles.lua +++ b/scripts/zones/Batallia_Downs/npcs/Lyco_Sparkles.lua @@ -28,9 +28,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 101 then player:confirmTrade() diff --git a/scripts/zones/Batallia_Downs/npcs/Stone_Monument.lua b/scripts/zones/Batallia_Downs/npcs/Stone_Monument.lua index 487a694b1b7..3615a33120c 100644 --- a/scripts/zones/Batallia_Downs/npcs/Stone_Monument.lua +++ b/scripts/zones/Batallia_Downs/npcs/Stone_Monument.lua @@ -9,10 +9,6 @@ local ID = zones[xi.zone.BATALLIA_DOWNS] ---@type TNpcEntity local entity = {} -entity.onTrigger = function(player, npc) - player:startEvent(900) -end - entity.onTrade = function(player, npc, trade) if trade:getItemCount() == 1 and @@ -25,10 +21,4 @@ entity.onTrade = function(player, npc, trade) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Batallia_Downs/npcs/Treasure_Casket.lua b/scripts/zones/Batallia_Downs/npcs/Treasure_Casket.lua index 4a3efe0c05d..47415e58867 100644 --- a/scripts/zones/Batallia_Downs/npcs/Treasure_Casket.lua +++ b/scripts/zones/Batallia_Downs/npcs/Treasure_Casket.lua @@ -13,9 +13,6 @@ entity.onTrade = function(player, npc, trade) xi.caskets.onTrade(player, npc, trade) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.caskets.onEventFinish(player, csid, option, npc) end diff --git a/scripts/zones/Batallia_Downs/npcs/qm1.lua b/scripts/zones/Batallia_Downs/npcs/qm1.lua index 28f006fade9..2cd3d71666d 100644 --- a/scripts/zones/Batallia_Downs/npcs/qm1.lua +++ b/scripts/zones/Batallia_Downs/npcs/qm1.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.BATALLIA_DOWNS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if not GetMobByID(ID.mob.VEGNIX_GREENTHUMB):isSpawned() and diff --git a/scripts/zones/Batallia_Downs/npcs/qm2.lua b/scripts/zones/Batallia_Downs/npcs/qm2.lua index 66a02d9b890..4cb2d71b1e1 100644 --- a/scripts/zones/Batallia_Downs/npcs/qm2.lua +++ b/scripts/zones/Batallia_Downs/npcs/qm2.lua @@ -26,13 +26,4 @@ entity.onTrigger = function(player, npc) end end -entity.onTrade = function(player, npc, trade) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Batallia_Downs_[S]/npcs/Cavernous_Maw.lua b/scripts/zones/Batallia_Downs_[S]/npcs/Cavernous_Maw.lua index 83c5d3c180e..dd2a841c2ee 100644 --- a/scripts/zones/Batallia_Downs_[S]/npcs/Cavernous_Maw.lua +++ b/scripts/zones/Batallia_Downs_[S]/npcs/Cavernous_Maw.lua @@ -7,16 +7,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.maws.onTrigger(player, npc) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.maws.onEventFinish(player, csid, option, npc) end diff --git a/scripts/zones/Batallia_Downs_[S]/npcs/Lycopodium.lua b/scripts/zones/Batallia_Downs_[S]/npcs/Lycopodium.lua index 02efa66168c..503b3bc2e10 100644 --- a/scripts/zones/Batallia_Downs_[S]/npcs/Lycopodium.lua +++ b/scripts/zones/Batallia_Downs_[S]/npcs/Lycopodium.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.BATALLIA_DOWNS_S] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:messageSpecial(ID.text.LYCOPODIUM_ENTRANCED) @@ -19,9 +16,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 202 then player:setCharVar('LycopodiumTeleport_Mask', utils.mask.setBit(player:getCharVar('LycopodiumTeleport_Mask'), 1, true)) diff --git a/scripts/zones/Batallia_Downs_[S]/npcs/Shanene.lua b/scripts/zones/Batallia_Downs_[S]/npcs/Shanene.lua index 33d3edfb638..46c435d7bc2 100644 --- a/scripts/zones/Batallia_Downs_[S]/npcs/Shanene.lua +++ b/scripts/zones/Batallia_Downs_[S]/npcs/Shanene.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local hasScrollsBundle = player:hasKeyItem(xi.ki.BUNDLE_OF_HALF_INSCRIBED_SCROLLS) local hasRainemard = player:hasItem(xi.item.CIPHER_OF_RAINEMARDS_ALTER_EGO) or player:hasSpell(xi.magic.spell.RAINEMARD) @@ -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 and option == 2 then npcUtil.giveItem(player, xi.item.CIPHER_OF_RAINEMARDS_ALTER_EGO) diff --git a/scripts/zones/Beadeaux/DefaultActions.lua b/scripts/zones/Beadeaux/DefaultActions.lua index 006ce299ea7..7c707665515 100644 --- a/scripts/zones/Beadeaux/DefaultActions.lua +++ b/scripts/zones/Beadeaux/DefaultActions.lua @@ -1,6 +1,7 @@ local ID = zones[xi.zone.BEADEAUX] return { - ['_43b'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, - ['qm1'] = { messageSpecial = ID.text.FOUL_SMELLING_SOIL_IS_SPILLING_OUT }, + ['_43b'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, + ['GeFhu_Yagudoeye'] = { event = 124 }, + ['qm1'] = { messageSpecial = ID.text.FOUL_SMELLING_SOIL_IS_SPILLING_OUT }, } diff --git a/scripts/zones/Beadeaux/npcs/GeFhu_Yagudoeye.lua b/scripts/zones/Beadeaux/npcs/GeFhu_Yagudoeye.lua deleted file mode 100644 index 6aeeaf19207..00000000000 --- a/scripts/zones/Beadeaux/npcs/GeFhu_Yagudoeye.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Beadeaux --- NPC: Ge'Fhu Yagudoeye --- !pos -91.354 -4.251 -127.831 147 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(124) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Beadeaux/npcs/Geomantic_Reservoir.lua b/scripts/zones/Beadeaux/npcs/Geomantic_Reservoir.lua index fcb080678fe..1b424f3582b 100644 --- a/scripts/zones/Beadeaux/npcs/Geomantic_Reservoir.lua +++ b/scripts/zones/Beadeaux/npcs/Geomantic_Reservoir.lua @@ -7,16 +7,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.geomanticReservoir.onTrigger(player, npc, xi.magic.spell.GEO_SLOW) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.geomanticReservoir.onEventFinish(player, csid, xi.magic.spell.GEO_SLOW) end diff --git a/scripts/zones/Beadeaux/npcs/The_Mute.lua b/scripts/zones/Beadeaux/npcs/The_Mute.lua index 3fe493e4022..1500ec3a20a 100644 --- a/scripts/zones/Beadeaux/npcs/The_Mute.lua +++ b/scripts/zones/Beadeaux/npcs/The_Mute.lua @@ -6,20 +6,11 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local duration = math.random(600, 900) - npc:entityAnimationPacket('sils', player) + npc:entityAnimationPacket(xi.animationString.EFFECT_SILENCE, player) player:addStatusEffect(xi.effect.SILENCE, 0, 0, duration) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Beadeaux/npcs/Treasure_Chest.lua b/scripts/zones/Beadeaux/npcs/Treasure_Chest.lua index 2e82026f61e..1ddb5e0a193 100644 --- a/scripts/zones/Beadeaux/npcs/Treasure_Chest.lua +++ b/scripts/zones/Beadeaux/npcs/Treasure_Chest.lua @@ -14,10 +14,4 @@ entity.onTrigger = function(player, npc) xi.treasure.onTrigger(player, xi.treasure.type.CHEST) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Beadeaux/npcs/Treasure_Coffer.lua b/scripts/zones/Beadeaux/npcs/Treasure_Coffer.lua index 22eb0152fa6..b46bb937f22 100644 --- a/scripts/zones/Beadeaux/npcs/Treasure_Coffer.lua +++ b/scripts/zones/Beadeaux/npcs/Treasure_Coffer.lua @@ -14,10 +14,4 @@ entity.onTrigger = function(player, npc) xi.treasure.onTrigger(player, xi.treasure.type.COFFER) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Beaucedine_Glacier/DefaultActions.lua b/scripts/zones/Beaucedine_Glacier/DefaultActions.lua index 22887d18a82..c463fda8714 100644 --- a/scripts/zones/Beaucedine_Glacier/DefaultActions.lua +++ b/scripts/zones/Beaucedine_Glacier/DefaultActions.lua @@ -1,6 +1,7 @@ local ID = zones[xi.zone.BEAUCEDINE_GLACIER] return { + ['Beastmens_Banner'] = { messageSpecial = ID.text.BEASTMEN_BANNER }, ['Goblin_Grenadier'] = { event = 509 }, ['Leigon-Moigon'] = { event = 103 }, ['Lonely_Evergreen'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, diff --git a/scripts/zones/Beaucedine_Glacier/npcs/Beastmens_Banner.lua b/scripts/zones/Beaucedine_Glacier/npcs/Beastmens_Banner.lua deleted file mode 100644 index 8352046f5cf..00000000000 --- a/scripts/zones/Beaucedine_Glacier/npcs/Beastmens_Banner.lua +++ /dev/null @@ -1,24 +0,0 @@ ------------------------------------ --- Area: Beaucedine_Glacier --- NPC: Beastmen_s_Banner --- !pos 20.169 -80.078 180.063 111 ------------------------------------ -local ID = zones[xi.zone.BEAUCEDINE_GLACIER] ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:messageSpecial(ID.text.BEASTMEN_BANNER) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Beaucedine_Glacier/npcs/Field_Manual.lua b/scripts/zones/Beaucedine_Glacier/npcs/Field_Manual.lua index db6f985e41c..d212ee059bb 100644 --- a/scripts/zones/Beaucedine_Glacier/npcs/Field_Manual.lua +++ b/scripts/zones/Beaucedine_Glacier/npcs/Field_Manual.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.regime.bookOnTrigger(player, xi.regime.type.FIELDS) end diff --git a/scripts/zones/Beaucedine_Glacier/npcs/Geomantic_Reservoir.lua b/scripts/zones/Beaucedine_Glacier/npcs/Geomantic_Reservoir.lua index 8dea0f440e1..5a4d70fdaf9 100644 --- a/scripts/zones/Beaucedine_Glacier/npcs/Geomantic_Reservoir.lua +++ b/scripts/zones/Beaucedine_Glacier/npcs/Geomantic_Reservoir.lua @@ -7,16 +7,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.geomanticReservoir.onTrigger(player, npc, xi.magic.spell.GEO_INT) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.geomanticReservoir.onEventFinish(player, csid, xi.magic.spell.GEO_INT) end diff --git a/scripts/zones/Beaucedine_Glacier/npcs/Geomantic_Reservoir_2.lua b/scripts/zones/Beaucedine_Glacier/npcs/Geomantic_Reservoir_2.lua index b4ff38a5e5d..bf2f8226ae5 100644 --- a/scripts/zones/Beaucedine_Glacier/npcs/Geomantic_Reservoir_2.lua +++ b/scripts/zones/Beaucedine_Glacier/npcs/Geomantic_Reservoir_2.lua @@ -7,16 +7,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.geomanticReservoir.onTrigger(player, npc, xi.magic.spell.GEO_ACUMEN) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.geomanticReservoir.onEventFinish(player, csid, xi.magic.spell.GEO_ACUMEN) end diff --git a/scripts/zones/Beaucedine_Glacier/npcs/Gueriette.lua b/scripts/zones/Beaucedine_Glacier/npcs/Gueriette.lua index 268774e9025..5c13dddbab8 100644 --- a/scripts/zones/Beaucedine_Glacier/npcs/Gueriette.lua +++ b/scripts/zones/Beaucedine_Glacier/npcs/Gueriette.lua @@ -10,9 +10,6 @@ local entity = {} local vendorRegion = xi.region.FAUREGANDI local vendorEvent = 32756 -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conquest.vendorOnTrigger(player, vendorRegion, vendorEvent) end diff --git a/scripts/zones/Beaucedine_Glacier/npcs/Iron_Grate.lua b/scripts/zones/Beaucedine_Glacier/npcs/Iron_Grate.lua index 1fdb44024b8..8065214456a 100644 --- a/scripts/zones/Beaucedine_Glacier/npcs/Iron_Grate.lua +++ b/scripts/zones/Beaucedine_Glacier/npcs/Iron_Grate.lua @@ -12,9 +12,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local xPos = player:getXPos() local zPos = player:getZPos() @@ -34,9 +31,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) local lvlCap = 0 diff --git a/scripts/zones/Beaucedine_Glacier/npcs/Potete.lua b/scripts/zones/Beaucedine_Glacier/npcs/Potete.lua deleted file mode 100644 index 7d79b1a7bb8..00000000000 --- a/scripts/zones/Beaucedine_Glacier/npcs/Potete.lua +++ /dev/null @@ -1,25 +0,0 @@ ------------------------------------ --- Area: Beaucedine Glacier --- NPC: Potete --- !pos 104.907 -21.249 141.391 111 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - -- CoP ?-?: MISSING DIALOG (NEEDS RESEARCH!) - -- player:startEvent(217) - -- Tells location of Prishe (https://youtu.be/gVWzFDHf5v8) - -- I think its linked to Ulima's Quest on Three Paths (Where Messengers Gather) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Beaucedine_Glacier/npcs/Torino-Samarino.lua b/scripts/zones/Beaucedine_Glacier/npcs/Torino-Samarino.lua index 48e16df3fd3..4a3cb189898 100644 --- a/scripts/zones/Beaucedine_Glacier/npcs/Torino-Samarino.lua +++ b/scripts/zones/Beaucedine_Glacier/npcs/Torino-Samarino.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local tuningOutProgress = player:getCharVar('TuningOut_Progress') @@ -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 == 207 then npcUtil.giveCurrency(player, 'gil', 6000) diff --git a/scripts/zones/Beaucedine_Glacier/npcs/Trail_Markings.lua b/scripts/zones/Beaucedine_Glacier/npcs/Trail_Markings.lua index f089f55e8d8..e64fe4679c1 100644 --- a/scripts/zones/Beaucedine_Glacier/npcs/Trail_Markings.lua +++ b/scripts/zones/Beaucedine_Glacier/npcs/Trail_Markings.lua @@ -7,16 +7,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.dynamis.entryNpcOnTrigger(player, npc) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.dynamis.entryNpcOnEventFinish(player, csid, option, npc) end diff --git a/scripts/zones/Beaucedine_Glacier/npcs/Treasure_Casket.lua b/scripts/zones/Beaucedine_Glacier/npcs/Treasure_Casket.lua index 5be04264128..243c665ad96 100644 --- a/scripts/zones/Beaucedine_Glacier/npcs/Treasure_Casket.lua +++ b/scripts/zones/Beaucedine_Glacier/npcs/Treasure_Casket.lua @@ -13,9 +13,6 @@ entity.onTrade = function(player, npc, trade) xi.caskets.onTrade(player, npc, trade) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.caskets.onEventFinish(player, csid, option, npc) end diff --git a/scripts/zones/Beaucedine_Glacier/npcs/relic.lua b/scripts/zones/Beaucedine_Glacier/npcs/relic.lua index ce06775a7ad..0b2958f3e94 100644 --- a/scripts/zones/Beaucedine_Glacier/npcs/relic.lua +++ b/scripts/zones/Beaucedine_Glacier/npcs/relic.lua @@ -22,9 +22,6 @@ entity.onTrigger = function(player, npc) player:messageSpecial(ID.text.NOTHING_OUT_OF_ORDINARY) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 139 and diff --git a/scripts/zones/Beaucedine_Glacier_[S]/npcs/Disserond_RK.lua b/scripts/zones/Beaucedine_Glacier_[S]/npcs/Disserond_RK.lua index 4bb03868080..06db12d9917 100644 --- a/scripts/zones/Beaucedine_Glacier_[S]/npcs/Disserond_RK.lua +++ b/scripts/zones/Beaucedine_Glacier_[S]/npcs/Disserond_RK.lua @@ -7,17 +7,8 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(450) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Beaucedine_Glacier_[S]/npcs/Gray_Colossus_LC.lua b/scripts/zones/Beaucedine_Glacier_[S]/npcs/Gray_Colossus_LC.lua index 6ba64486eae..a1f62ff9270 100644 --- a/scripts/zones/Beaucedine_Glacier_[S]/npcs/Gray_Colossus_LC.lua +++ b/scripts/zones/Beaucedine_Glacier_[S]/npcs/Gray_Colossus_LC.lua @@ -7,17 +7,8 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(451) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Beaucedine_Glacier_[S]/npcs/Luhk_Leotih_MC.lua b/scripts/zones/Beaucedine_Glacier_[S]/npcs/Luhk_Leotih_MC.lua index 0fb81c54547..e0c0438130b 100644 --- a/scripts/zones/Beaucedine_Glacier_[S]/npcs/Luhk_Leotih_MC.lua +++ b/scripts/zones/Beaucedine_Glacier_[S]/npcs/Luhk_Leotih_MC.lua @@ -7,17 +7,8 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(452) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Beaucedine_Glacier_[S]/npcs/Moana_CA.lua b/scripts/zones/Beaucedine_Glacier_[S]/npcs/Moana_CA.lua index ad13a1ac75d..2f09d88337a 100644 --- a/scripts/zones/Beaucedine_Glacier_[S]/npcs/Moana_CA.lua +++ b/scripts/zones/Beaucedine_Glacier_[S]/npcs/Moana_CA.lua @@ -7,17 +7,8 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(453) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Beaucedine_Glacier_[S]/npcs/Watchful_Pixie.lua b/scripts/zones/Beaucedine_Glacier_[S]/npcs/Watchful_Pixie.lua index 063dd4dfb46..88edd6b4db0 100644 --- a/scripts/zones/Beaucedine_Glacier_[S]/npcs/Watchful_Pixie.lua +++ b/scripts/zones/Beaucedine_Glacier_[S]/npcs/Watchful_Pixie.lua @@ -6,17 +6,9 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) + -- TODO: Conflict with default action player:startEvent(4002) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Behemoths_Dominion/npcs/Field_Manual.lua b/scripts/zones/Behemoths_Dominion/npcs/Field_Manual.lua index f9c0177234d..fb5f6133511 100644 --- a/scripts/zones/Behemoths_Dominion/npcs/Field_Manual.lua +++ b/scripts/zones/Behemoths_Dominion/npcs/Field_Manual.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.regime.bookOnTrigger(player, xi.regime.type.FIELDS) end diff --git a/scripts/zones/Behemoths_Dominion/npcs/Geomantic_Reservoir.lua b/scripts/zones/Behemoths_Dominion/npcs/Geomantic_Reservoir.lua index 3239765fde6..1c3e8ec6af3 100644 --- a/scripts/zones/Behemoths_Dominion/npcs/Geomantic_Reservoir.lua +++ b/scripts/zones/Behemoths_Dominion/npcs/Geomantic_Reservoir.lua @@ -7,16 +7,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.geomanticReservoir.onTrigger(player, npc, xi.magic.spell.GEO_DEX) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.geomanticReservoir.onEventFinish(player, csid, xi.magic.spell.GEO_DEX) end diff --git a/scripts/zones/Behemoths_Dominion/npcs/Treasure_Casket.lua b/scripts/zones/Behemoths_Dominion/npcs/Treasure_Casket.lua index 12ee6ea9717..ec971809ccc 100644 --- a/scripts/zones/Behemoths_Dominion/npcs/Treasure_Casket.lua +++ b/scripts/zones/Behemoths_Dominion/npcs/Treasure_Casket.lua @@ -13,9 +13,6 @@ entity.onTrade = function(player, npc, trade) xi.caskets.onTrade(player, npc, trade) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.caskets.onEventFinish(player, csid, option, npc) end diff --git a/scripts/zones/Behemoths_Dominion/npcs/qm2.lua b/scripts/zones/Behemoths_Dominion/npcs/qm2.lua index 5ec8e59114e..2fa07b064b9 100644 --- a/scripts/zones/Behemoths_Dominion/npcs/qm2.lua +++ b/scripts/zones/Behemoths_Dominion/npcs/qm2.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.BEHEMOTHS_DOMINION] ---@type TNpcEntity local entity = {} -entity.onSpawn = function(npc) -end - entity.onTrade = function(player, npc, trade) if not GetMobByID(ID.mob.BEHEMOTH):isSpawned() and @@ -35,10 +32,4 @@ entity.onTrigger = function(player, npc) player:messageSpecial(ID.text.IRREPRESSIBLE_MIGHT) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Bhaflau_Thickets/npcs/Daswil.lua b/scripts/zones/Bhaflau_Thickets/npcs/Daswil.lua index 7c871cf7b2f..50d12128479 100644 --- a/scripts/zones/Bhaflau_Thickets/npcs/Daswil.lua +++ b/scripts/zones/Bhaflau_Thickets/npcs/Daswil.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.BHAFLAU_THICKETS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local toauMission = player:getCurrentMission(xi.mission.log_id.TOAU) @@ -34,9 +31,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) -- ASSAULT if csid == 512 and option == 1 then diff --git a/scripts/zones/Bhaflau_Thickets/npcs/Harvesting_Point.lua b/scripts/zones/Bhaflau_Thickets/npcs/Harvesting_Point.lua index 8d7516c0b31..a4fcc08b2fe 100644 --- a/scripts/zones/Bhaflau_Thickets/npcs/Harvesting_Point.lua +++ b/scripts/zones/Bhaflau_Thickets/npcs/Harvesting_Point.lua @@ -13,10 +13,4 @@ entity.onTrigger = function(player, npc) xi.helm.onTrigger(player, xi.helmType.HARVESTING) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Bhaflau_Thickets/npcs/Kamih_Mapokhalam.lua b/scripts/zones/Bhaflau_Thickets/npcs/Kamih_Mapokhalam.lua index 272773b0ad1..f5c031ccfd1 100644 --- a/scripts/zones/Bhaflau_Thickets/npcs/Kamih_Mapokhalam.lua +++ b/scripts/zones/Bhaflau_Thickets/npcs/Kamih_Mapokhalam.lua @@ -42,9 +42,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 121 then player:setPos(325.137, -3.999, -619.968, 0, 72) -- To Alzadaal Undersea Ruins G-8 (R) diff --git a/scripts/zones/Bhaflau_Thickets/npcs/Runic_Portal.lua b/scripts/zones/Bhaflau_Thickets/npcs/Runic_Portal.lua index 60a0755fe73..95d04ad3bf4 100644 --- a/scripts/zones/Bhaflau_Thickets/npcs/Runic_Portal.lua +++ b/scripts/zones/Bhaflau_Thickets/npcs/Runic_Portal.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.BHAFLAU_THICKETS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getCurrentMission(xi.mission.log_id.TOAU) >= xi.mission.id.toau.IMMORTAL_SENTRIES and @@ -27,9 +24,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if option == 1 then if csid == 111 then diff --git a/scripts/zones/Bhaflau_Thickets/npcs/_1g0.lua b/scripts/zones/Bhaflau_Thickets/npcs/_1g0.lua index 853888fd12f..e81558935f4 100644 --- a/scripts/zones/Bhaflau_Thickets/npcs/_1g0.lua +++ b/scripts/zones/Bhaflau_Thickets/npcs/_1g0.lua @@ -6,16 +6,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(502) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 502 and option == 1 then player:setPos(-37, 1, 56, 0, 50) diff --git a/scripts/zones/Bhaflau_Thickets/npcs/_1g1.lua b/scripts/zones/Bhaflau_Thickets/npcs/_1g1.lua index f438132d8e8..9605f842841 100644 --- a/scripts/zones/Bhaflau_Thickets/npcs/_1g1.lua +++ b/scripts/zones/Bhaflau_Thickets/npcs/_1g1.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.BHAFLAU_THICKETS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:checkDistance(npc) < 3 then if player:getZPos() > -761 then @@ -29,10 +26,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Bhaflau_Thickets/npcs/_1g2.lua b/scripts/zones/Bhaflau_Thickets/npcs/_1g2.lua index 91892e7a5fd..3c7447c37be 100644 --- a/scripts/zones/Bhaflau_Thickets/npcs/_1g2.lua +++ b/scripts/zones/Bhaflau_Thickets/npcs/_1g2.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.BHAFLAU_THICKETS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if not xi.instance.onTrigger(player, npc, xi.zone.MAMOOL_JA_TRAINING_GROUNDS) then player:messageSpecial(ID.text.NOTHING_HAPPENS) diff --git a/scripts/zones/Bhaflau_Thickets/npcs/qm1.lua b/scripts/zones/Bhaflau_Thickets/npcs/qm1.lua index 9361de51962..213fab79c49 100644 --- a/scripts/zones/Bhaflau_Thickets/npcs/qm1.lua +++ b/scripts/zones/Bhaflau_Thickets/npcs/qm1.lua @@ -21,10 +21,4 @@ entity.onTrigger = function(player, npc) player:messageSpecial(ID.text.BLOOD_STAINS) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Bhaflau_Thickets/npcs/qm2.lua b/scripts/zones/Bhaflau_Thickets/npcs/qm2.lua index 817befa6a49..bc4ba8c69b2 100644 --- a/scripts/zones/Bhaflau_Thickets/npcs/qm2.lua +++ b/scripts/zones/Bhaflau_Thickets/npcs/qm2.lua @@ -22,10 +22,4 @@ entity.onTrigger = function(player, npc) player:messageSpecial(ID.text.SHED_LEAVES) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Bibiki_Bay/DefaultActions.lua b/scripts/zones/Bibiki_Bay/DefaultActions.lua index 91e8568c67d..e84d98a40a3 100644 --- a/scripts/zones/Bibiki_Bay/DefaultActions.lua +++ b/scripts/zones/Bibiki_Bay/DefaultActions.lua @@ -1,6 +1,7 @@ local ID = zones[xi.zone.BIBIKI_BAY] return { - ['qm_dalham'] = { messageSpecial = ID.text.NOTHING_LEFT_INTEREST }, - ['Warmachine'] = { text = ID.text.CLUNK_CLUNK_WHIRL_WHIZZ }, + ['qm_dalham'] = { messageSpecial = ID.text.NOTHING_LEFT_INTEREST }, + ['Rhalo_Davigoh'] = { event = 38 }, + ['Warmachine'] = { text = ID.text.CLUNK_CLUNK_WHIRL_WHIZZ }, } diff --git a/scripts/zones/Bibiki_Bay/npcs/Clamming_Point.lua b/scripts/zones/Bibiki_Bay/npcs/Clamming_Point.lua index 089d0ab808e..7679b86dd39 100644 --- a/scripts/zones/Bibiki_Bay/npcs/Clamming_Point.lua +++ b/scripts/zones/Bibiki_Bay/npcs/Clamming_Point.lua @@ -69,9 +69,6 @@ local function giveReducedIncidents(player) return 10 end -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) -- be noisy to try to get server admins to notice if npc:getLocalVar('firstClammingPoint') == 0 then diff --git a/scripts/zones/Bibiki_Bay/npcs/Fheli_Lapatzuo.lua b/scripts/zones/Bibiki_Bay/npcs/Fheli_Lapatzuo.lua index beb6905bf2c..027f64557ff 100644 --- a/scripts/zones/Bibiki_Bay/npcs/Fheli_Lapatzuo.lua +++ b/scripts/zones/Bibiki_Bay/npcs/Fheli_Lapatzuo.lua @@ -10,17 +10,8 @@ local entity = {} local timekeeperLocation = xi.manaclipper.location.SUNSET_DOCKS local timekeeperEventId = 18 -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.manaclipper.timekeeperOnTrigger(player, timekeeperLocation, timekeeperEventId) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Bibiki_Bay/npcs/Mep_Nhapopoluko.lua b/scripts/zones/Bibiki_Bay/npcs/Mep_Nhapopoluko.lua index ef5aa1d06bb..b409df71a60 100644 --- a/scripts/zones/Bibiki_Bay/npcs/Mep_Nhapopoluko.lua +++ b/scripts/zones/Bibiki_Bay/npcs/Mep_Nhapopoluko.lua @@ -9,19 +9,10 @@ local ID = zones[xi.zone.BIBIKI_BAY] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:sendGuild(519, 1, 18, 5) then player:showText(npc, ID.text.MEP_NHAPOPOLUKO_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/Bibiki_Bay/npcs/Noih_Tahparawh.lua b/scripts/zones/Bibiki_Bay/npcs/Noih_Tahparawh.lua index 530d955a0ac..f3b6c7ae495 100644 --- a/scripts/zones/Bibiki_Bay/npcs/Noih_Tahparawh.lua +++ b/scripts/zones/Bibiki_Bay/npcs/Noih_Tahparawh.lua @@ -10,17 +10,8 @@ local entity = {} local timekeeperLocation = xi.manaclipper.location.PURGONORGO_ISLE local timekeeperEventId = 19 -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.manaclipper.timekeeperOnTrigger(player, timekeeperLocation, timekeeperEventId) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Bibiki_Bay/npcs/Pohka_Chichiyowahl.lua b/scripts/zones/Bibiki_Bay/npcs/Pohka_Chichiyowahl.lua index 2fa0124938e..7b0699d1fd6 100644 --- a/scripts/zones/Bibiki_Bay/npcs/Pohka_Chichiyowahl.lua +++ b/scripts/zones/Bibiki_Bay/npcs/Pohka_Chichiyowahl.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.BIBIKI_BAY] ---@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.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/Bibiki_Bay/npcs/Rhalo_Davigoh.lua b/scripts/zones/Bibiki_Bay/npcs/Rhalo_Davigoh.lua deleted file mode 100644 index f770d98e145..00000000000 --- a/scripts/zones/Bibiki_Bay/npcs/Rhalo_Davigoh.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Bibiki Bay --- NPC: Rhalo Davigoh --- !pos -407 -3 -419 4 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(38) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Bibiki_Bay/npcs/Toh_Zonikki.lua b/scripts/zones/Bibiki_Bay/npcs/Toh_Zonikki.lua index 6558db18e9e..dd998380d0a 100644 --- a/scripts/zones/Bibiki_Bay/npcs/Toh_Zonikki.lua +++ b/scripts/zones/Bibiki_Bay/npcs/Toh_Zonikki.lua @@ -69,9 +69,6 @@ local function owePlayerClammedItems(player) return false end -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:hasKeyItem(xi.ki.CLAMMING_KIT) then -- Player has clamming kit if player:getCharVar('ClammingKitBroken') == 1 then -- Broken bucket diff --git a/scripts/zones/Bibiki_Bay/npcs/Tswe_Panipahr.lua b/scripts/zones/Bibiki_Bay/npcs/Tswe_Panipahr.lua index 74d29013a38..ceee0eeeedf 100644 --- a/scripts/zones/Bibiki_Bay/npcs/Tswe_Panipahr.lua +++ b/scripts/zones/Bibiki_Bay/npcs/Tswe_Panipahr.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.BIBIKI_BAY] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local curentticket = 0 if player:hasKeyItem(xi.ki.MANACLIPPER_TICKET) then @@ -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 == 35 then if option == 1 then diff --git a/scripts/zones/Bibiki_Bay/npcs/qm_shen.lua b/scripts/zones/Bibiki_Bay/npcs/qm_shen.lua index 2b982f05ae4..c1e19bd1bc9 100644 --- a/scripts/zones/Bibiki_Bay/npcs/qm_shen.lua +++ b/scripts/zones/Bibiki_Bay/npcs/qm_shen.lua @@ -24,10 +24,4 @@ entity.onTrigger = function(player, npc) player:messageSpecial(ID.text.SHEN_QM) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Bostaunieux_Oubliette/DefaultActions.lua b/scripts/zones/Bostaunieux_Oubliette/DefaultActions.lua index 8dc186c857f..a0a84869599 100644 --- a/scripts/zones/Bostaunieux_Oubliette/DefaultActions.lua +++ b/scripts/zones/Bostaunieux_Oubliette/DefaultActions.lua @@ -1,5 +1,9 @@ local ID = zones[xi.zone.BOSTAUNIEUX_OUBLIETTE] return { - ['qm1'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, + ['_4n2'] = { messageSpecial = ID.text.SEEMS_LOCKED }, + ['Chumia'] = { text = ID.text.CHUMIA_DIALOG }, + ['Couchatorage'] = { event = 9 }, + ['Jurgenclaus'] = { event = 18 }, + ['qm1'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, } diff --git a/scripts/zones/Bostaunieux_Oubliette/npcs/Chumia.lua b/scripts/zones/Bostaunieux_Oubliette/npcs/Chumia.lua deleted file mode 100644 index c2ad692a2d1..00000000000 --- a/scripts/zones/Bostaunieux_Oubliette/npcs/Chumia.lua +++ /dev/null @@ -1,24 +0,0 @@ ------------------------------------ --- Area: Bostaunieux Oubliette --- NPC: Chumia --- !pos 102.420 -25.001 70.457 167 ------------------------------------ -local ID = zones[xi.zone.BOSTAUNIEUX_OUBLIETTE] ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:showText(npc, ID.text.CHUMIA_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/Bostaunieux_Oubliette/npcs/Couchatorage.lua b/scripts/zones/Bostaunieux_Oubliette/npcs/Couchatorage.lua deleted file mode 100644 index 39be5b6c34f..00000000000 --- a/scripts/zones/Bostaunieux_Oubliette/npcs/Couchatorage.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Bostaunieux Oubliette --- NPC: Couchatorage --- !pos -20.502 -19 17.765 167 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(9) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Bostaunieux_Oubliette/npcs/Geomantic_Reservoir.lua b/scripts/zones/Bostaunieux_Oubliette/npcs/Geomantic_Reservoir.lua index 92ea3d78a00..983b91f8a76 100644 --- a/scripts/zones/Bostaunieux_Oubliette/npcs/Geomantic_Reservoir.lua +++ b/scripts/zones/Bostaunieux_Oubliette/npcs/Geomantic_Reservoir.lua @@ -7,16 +7,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.geomanticReservoir.onTrigger(player, npc, xi.magic.spell.GEO_LANGUOR) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.geomanticReservoir.onEventFinish(player, csid, xi.magic.spell.GEO_LANGUOR) end diff --git a/scripts/zones/Bostaunieux_Oubliette/npcs/Goblin_Footprint.lua b/scripts/zones/Bostaunieux_Oubliette/npcs/Goblin_Footprint.lua index 43fe4aa986f..f6d48893463 100644 --- a/scripts/zones/Bostaunieux_Oubliette/npcs/Goblin_Footprint.lua +++ b/scripts/zones/Bostaunieux_Oubliette/npcs/Goblin_Footprint.lua @@ -14,9 +14,6 @@ entity.onTrigger = function(player, npc) xi.goblinfootprint.rewatch(player, true) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.goblinfootprint.startEvent(player, csid, option, npc) end diff --git a/scripts/zones/Bostaunieux_Oubliette/npcs/Grounds_Tome.lua b/scripts/zones/Bostaunieux_Oubliette/npcs/Grounds_Tome.lua index 4139d8b7bac..4e6dc4d0188 100644 --- a/scripts/zones/Bostaunieux_Oubliette/npcs/Grounds_Tome.lua +++ b/scripts/zones/Bostaunieux_Oubliette/npcs/Grounds_Tome.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.regime.bookOnTrigger(player, xi.regime.type.GROUNDS) end diff --git a/scripts/zones/Bostaunieux_Oubliette/npcs/Jurgenclaus.lua b/scripts/zones/Bostaunieux_Oubliette/npcs/Jurgenclaus.lua deleted file mode 100644 index 5f551b1a48a..00000000000 --- a/scripts/zones/Bostaunieux_Oubliette/npcs/Jurgenclaus.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Bostaunieux Oubliette --- NPC: Jurgenclaus --- !pos 69.735 -24.989 7.741 167 ------------------------------------ ----@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/Bostaunieux_Oubliette/npcs/Treasure_Casket.lua b/scripts/zones/Bostaunieux_Oubliette/npcs/Treasure_Casket.lua index d7fc8c45809..8559f59c8a6 100644 --- a/scripts/zones/Bostaunieux_Oubliette/npcs/Treasure_Casket.lua +++ b/scripts/zones/Bostaunieux_Oubliette/npcs/Treasure_Casket.lua @@ -13,9 +13,6 @@ entity.onTrade = function(player, npc, trade) xi.caskets.onTrade(player, npc, trade) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.caskets.onEventFinish(player, csid, option, npc) end diff --git a/scripts/zones/Bostaunieux_Oubliette/npcs/_4n2.lua b/scripts/zones/Bostaunieux_Oubliette/npcs/_4n2.lua deleted file mode 100644 index 4ff4fb3454e..00000000000 --- a/scripts/zones/Bostaunieux_Oubliette/npcs/_4n2.lua +++ /dev/null @@ -1,24 +0,0 @@ ------------------------------------ --- Area: Bostaunieux Obliette --- NPC: _4n2 (Sewer Lid) --- !pos -19.000 -17.899 20.000 167 ------------------------------------ -local ID = zones[xi.zone.BOSTAUNIEUX_OUBLIETTE] ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:messageSpecial(ID.text.SEEMS_LOCKED) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Buburimu_Peninsula/DefaultActions.lua b/scripts/zones/Buburimu_Peninsula/DefaultActions.lua index 434e608593f..3c6f6486602 100644 --- a/scripts/zones/Buburimu_Peninsula/DefaultActions.lua +++ b/scripts/zones/Buburimu_Peninsula/DefaultActions.lua @@ -1,5 +1,7 @@ local ID = zones[xi.zone.BUBURIMU_PENINSULA] return { - ['Song_Runes'] = { messageSpecial = ID.text.SONG_RUNES_DEFAULT }, + ['Beastmens_Banner'] = { messageSpecial = ID.text.BEASTMEN_BANNER }, + ['Song_Runes'] = { messageSpecial = ID.text.SONG_RUNES_DEFAULT }, + ['Stone_Monument'] = { event = 900 }, } diff --git a/scripts/zones/Buburimu_Peninsula/npcs/Beastmens_Banner.lua b/scripts/zones/Buburimu_Peninsula/npcs/Beastmens_Banner.lua deleted file mode 100644 index d6199d95bfa..00000000000 --- a/scripts/zones/Buburimu_Peninsula/npcs/Beastmens_Banner.lua +++ /dev/null @@ -1,24 +0,0 @@ ------------------------------------ --- Area: Buburimu_Peninsula --- NPC: Beastmen_s_Banner --- !pos -132.589 19.999 -314.261 118 ------------------------------------ -local ID = zones[xi.zone.BUBURIMU_PENINSULA] ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:messageSpecial(ID.text.BEASTMEN_BANNER) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Buburimu_Peninsula/npcs/Cavernous_Maw.lua b/scripts/zones/Buburimu_Peninsula/npcs/Cavernous_Maw.lua index 736dca00b37..3268dcd889c 100644 --- a/scripts/zones/Buburimu_Peninsula/npcs/Cavernous_Maw.lua +++ b/scripts/zones/Buburimu_Peninsula/npcs/Cavernous_Maw.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.BUBURIMU_PENINSULA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if xi.settings.main.ENABLE_ABYSSEA == 1 and player:getMainLvl() >= 30 then local hasStone = xi.abyssea.getHeldTraverserStones(player) @@ -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 == 62 then player:addQuest(xi.questLog.ABYSSEA, xi.quest.id.abyssea.A_FLUTTERY_FIEND) diff --git a/scripts/zones/Buburimu_Peninsula/npcs/Field_Manual.lua b/scripts/zones/Buburimu_Peninsula/npcs/Field_Manual.lua index 7e478d824d5..1a517950a39 100644 --- a/scripts/zones/Buburimu_Peninsula/npcs/Field_Manual.lua +++ b/scripts/zones/Buburimu_Peninsula/npcs/Field_Manual.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.regime.bookOnTrigger(player, xi.regime.type.FIELDS) end diff --git a/scripts/zones/Buburimu_Peninsula/npcs/Five_of_Spades.lua b/scripts/zones/Buburimu_Peninsula/npcs/Five_of_Spades.lua index 06d12907ffd..3d9c60de374 100644 --- a/scripts/zones/Buburimu_Peninsula/npcs/Five_of_Spades.lua +++ b/scripts/zones/Buburimu_Peninsula/npcs/Five_of_Spades.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.BUBURIMU_PENINSULA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local aGreetingCardian = player:getQuestStatus(xi.questLog.WINDURST, xi.quest.id.windurst.A_GREETING_CARDIAN) local aGCcs = player:getCharVar('AGreetingCardian_Event') @@ -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 == 1 then player:setCharVar('AGreetingCardian_Event', 5) diff --git a/scripts/zones/Buburimu_Peninsula/npcs/Hieroglyphics.lua b/scripts/zones/Buburimu_Peninsula/npcs/Hieroglyphics.lua index 3c6a9b6dbbd..27fcd58434f 100644 --- a/scripts/zones/Buburimu_Peninsula/npcs/Hieroglyphics.lua +++ b/scripts/zones/Buburimu_Peninsula/npcs/Hieroglyphics.lua @@ -7,16 +7,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.dynamis.entryNpcOnTrigger(player, npc) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.dynamis.entryNpcOnEventFinish(player, csid, option, npc) end diff --git a/scripts/zones/Buburimu_Peninsula/npcs/Lobho_Ukipturi.lua b/scripts/zones/Buburimu_Peninsula/npcs/Lobho_Ukipturi.lua index c984dcabf31..241c7ba1971 100644 --- a/scripts/zones/Buburimu_Peninsula/npcs/Lobho_Ukipturi.lua +++ b/scripts/zones/Buburimu_Peninsula/npcs/Lobho_Ukipturi.lua @@ -10,9 +10,6 @@ local entity = {} local vendorRegion = xi.region.KOLSHUSHU local vendorEvent = 32756 -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conquest.vendorOnTrigger(player, vendorRegion, vendorEvent) end diff --git a/scripts/zones/Buburimu_Peninsula/npcs/Logging_Point.lua b/scripts/zones/Buburimu_Peninsula/npcs/Logging_Point.lua index 5c6f4c44793..a20895e3914 100644 --- a/scripts/zones/Buburimu_Peninsula/npcs/Logging_Point.lua +++ b/scripts/zones/Buburimu_Peninsula/npcs/Logging_Point.lua @@ -13,10 +13,4 @@ entity.onTrigger = function(player, npc) xi.helm.onTrigger(player, xi.helmType.LOGGING) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Buburimu_Peninsula/npcs/Signpost.lua b/scripts/zones/Buburimu_Peninsula/npcs/Signpost.lua index 053945c2fbe..9c41aabb74b 100644 --- a/scripts/zones/Buburimu_Peninsula/npcs/Signpost.lua +++ b/scripts/zones/Buburimu_Peninsula/npcs/Signpost.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.BUBURIMU_PENINSULA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local offset = npc:getID() - ID.npc.SIGNPOST_OFFSET if offset >= 4 or offset <= 6 then @@ -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/Buburimu_Peninsula/npcs/Stone_Monument.lua b/scripts/zones/Buburimu_Peninsula/npcs/Stone_Monument.lua index 1c45fbf5e17..a43038d52ca 100644 --- a/scripts/zones/Buburimu_Peninsula/npcs/Stone_Monument.lua +++ b/scripts/zones/Buburimu_Peninsula/npcs/Stone_Monument.lua @@ -9,10 +9,6 @@ local ID = zones[xi.zone.BUBURIMU_PENINSULA] ---@type TNpcEntity local entity = {} -entity.onTrigger = function(player, npc) - player:startEvent(900) -end - entity.onTrade = function(player, npc, trade) if trade:getItemCount() == 1 and @@ -25,10 +21,4 @@ entity.onTrade = function(player, npc, trade) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Buburimu_Peninsula/npcs/Treasure_Casket.lua b/scripts/zones/Buburimu_Peninsula/npcs/Treasure_Casket.lua index 5c5e54a0e38..9e9e64f8b49 100644 --- a/scripts/zones/Buburimu_Peninsula/npcs/Treasure_Casket.lua +++ b/scripts/zones/Buburimu_Peninsula/npcs/Treasure_Casket.lua @@ -13,9 +13,6 @@ entity.onTrade = function(player, npc, trade) xi.caskets.onTrade(player, npc, trade) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.caskets.onEventFinish(player, csid, option, npc) end From a15ebdb0950146dff84902ed7e985870e29e39a1 Mon Sep 17 00:00:00 2001 From: claywar Date: Sun, 26 Jan 2025 15:35:18 -0500 Subject: [PATCH 2/4] Remove empty NPCs, add Default Actions - Al Zahbi ~ Bastok Markets --- scripts/zones/Al_Zahbi/DefaultActions.lua | 14 +++++++++++ scripts/zones/Al_Zahbi/npcs/Allard.lua | 9 ------- scripts/zones/Al_Zahbi/npcs/Biyaada.lua | 23 ------------------ scripts/zones/Al_Zahbi/npcs/Bornahn.lua | 9 ------- scripts/zones/Al_Zahbi/npcs/Chayaya.lua | 9 ------- scripts/zones/Al_Zahbi/npcs/Chochoroon.lua | 3 --- scripts/zones/Al_Zahbi/npcs/Chocobo.lua | 23 ------------------ scripts/zones/Al_Zahbi/npcs/Dabigo.lua | 23 ------------------ scripts/zones/Al_Zahbi/npcs/Dahaaba.lua | 3 --- scripts/zones/Al_Zahbi/npcs/Dehbi_Moshal.lua | 9 ------- scripts/zones/Al_Zahbi/npcs/Djinabaha.lua | 23 ------------------ scripts/zones/Al_Zahbi/npcs/Falzuuk.lua | 3 --- scripts/zones/Al_Zahbi/npcs/Famatar.lua | 3 --- scripts/zones/Al_Zahbi/npcs/Gadalar.lua | 23 ------------------ scripts/zones/Al_Zahbi/npcs/Gajaad.lua | 6 ----- scripts/zones/Al_Zahbi/npcs/Gaweesh.lua | 23 ------------------ scripts/zones/Al_Zahbi/npcs/Gidappa.lua | 3 --- scripts/zones/Al_Zahbi/npcs/Goyuyu.lua | 9 ------- scripts/zones/Al_Zahbi/npcs/Iphaaf.lua | 23 ------------------ .../zones/Al_Zahbi/npcs/Kahah_Hobichai.lua | 9 ------- scripts/zones/Al_Zahbi/npcs/Krujaal.lua | 23 ------------------ scripts/zones/Al_Zahbi/npcs/Mabebe.lua | 9 ------- scripts/zones/Al_Zahbi/npcs/Macici.lua | 3 --- scripts/zones/Al_Zahbi/npcs/Mihli_Aliapoh.lua | 23 ------------------ scripts/zones/Al_Zahbi/npcs/Najaaj.lua | 12 ---------- scripts/zones/Al_Zahbi/npcs/Najelith.lua | 23 ------------------ scripts/zones/Al_Zahbi/npcs/Ndego.lua | 9 ------- scripts/zones/Al_Zahbi/npcs/Nudahaal.lua | 3 --- scripts/zones/Al_Zahbi/npcs/Numaaf.lua | 3 --- scripts/zones/Al_Zahbi/npcs/Opococo.lua | 9 ------- scripts/zones/Al_Zahbi/npcs/Rajaaha.lua | 3 --- scripts/zones/Al_Zahbi/npcs/Rughadjeen.lua | 23 ------------------ scripts/zones/Al_Zahbi/npcs/Shayadar.lua | 23 ------------------ scripts/zones/Al_Zahbi/npcs/Shihu-Danhu.lua | 6 ----- scripts/zones/Al_Zahbi/npcs/Sojan-Tamjan.lua | 9 ------- scripts/zones/Al_Zahbi/npcs/Sujyahn.lua | 12 ---------- .../zones/Al_Zahbi/npcs/Symphonic_Curator.lua | 3 --- scripts/zones/Al_Zahbi/npcs/Talhaal.lua | 23 ------------------ scripts/zones/Al_Zahbi/npcs/Taten-Bilten.lua | 9 ------- scripts/zones/Al_Zahbi/npcs/Yando-Memondo.lua | 9 ------- scripts/zones/Al_Zahbi/npcs/Yudi_Yolhbi.lua | 3 --- scripts/zones/Al_Zahbi/npcs/Zafif.lua | 9 ------- scripts/zones/Al_Zahbi/npcs/Zazarg.lua | 23 ------------------ scripts/zones/Al_Zahbi/npcs/Zwaluh.lua | 3 --- .../zones/Apollyon/npcs/Sentinel_Column.lua | 3 --- scripts/zones/Arrapago_Reef/npcs/Cutter.lua | 3 --- scripts/zones/Arrapago_Reef/npcs/Meyaada.lua | 6 ----- .../zones/Arrapago_Reef/npcs/Runic_Portal.lua | 6 ----- scripts/zones/Arrapago_Reef/npcs/_1ie.lua | 6 ----- scripts/zones/Arrapago_Reef/npcs/_jib.lua | 9 ------- scripts/zones/Arrapago_Reef/npcs/_jic.lua | 3 --- scripts/zones/Arrapago_Reef/npcs/qm6.lua | 6 ----- .../Arrapago_Remnants/npcs/Armoury_Crate.lua | 6 ----- scripts/zones/Arrapago_Remnants/npcs/Slot.lua | 9 ------- .../zones/Arrapago_Remnants/npcs/Socket.lua | 9 ------- scripts/zones/Arrapago_Remnants/npcs/_220.lua | 3 --- scripts/zones/Arrapago_Remnants/npcs/_221.lua | 3 --- scripts/zones/Arrapago_Remnants/npcs/_222.lua | 3 --- scripts/zones/Arrapago_Remnants/npcs/_223.lua | 3 --- scripts/zones/Arrapago_Remnants/npcs/_224.lua | 3 --- scripts/zones/Arrapago_Remnants/npcs/_225.lua | 3 --- scripts/zones/Arrapago_Remnants/npcs/_226.lua | 3 --- scripts/zones/Arrapago_Remnants/npcs/_227.lua | 3 --- scripts/zones/Arrapago_Remnants/npcs/_228.lua | 3 --- scripts/zones/Arrapago_Remnants/npcs/_229.lua | 3 --- scripts/zones/Arrapago_Remnants/npcs/_22a.lua | 3 --- scripts/zones/Arrapago_Remnants/npcs/_22b.lua | 3 --- scripts/zones/Arrapago_Remnants/npcs/_22c.lua | 3 --- scripts/zones/Arrapago_Remnants/npcs/_22d.lua | 3 --- scripts/zones/Arrapago_Remnants/npcs/_22e.lua | 3 --- scripts/zones/Arrapago_Remnants/npcs/_22f.lua | 3 --- scripts/zones/Arrapago_Remnants/npcs/_22g.lua | 3 --- .../Attohwa_Chasm/npcs/Cradle_of_Rebirth.lua | 9 ------- .../Attohwa_Chasm/npcs/Excavation_Point.lua | 6 ----- scripts/zones/Attohwa_Chasm/npcs/Jakaka.lua | 3 --- .../Bastok-Jeuno_Airship/npcs/Dereck.lua | 9 ------- .../Bastok-Jeuno_Airship/npcs/Michele.lua | 9 ------- .../Bastok_Markets/npcs/AMAN_Liaison.lua | 3 --- .../Bastok_Markets/npcs/AMAN_Validator.lua | 3 --- scripts/zones/Bastok_Markets/npcs/Ardea.lua | 6 ----- .../Bastok_Markets/npcs/Auction_Counter.lua | 9 ------- .../zones/Bastok_Markets/npcs/Belizieg.lua | 9 ------- scripts/zones/Bastok_Markets/npcs/Cleades.lua | 9 ------- .../zones/Bastok_Markets/npcs/Degenhard.lua | 3 --- scripts/zones/Bastok_Markets/npcs/Fatimah.lua | 6 ----- .../zones/Bastok_Markets/npcs/Gulldago.lua | 6 ----- .../zones/Bastok_Markets/npcs/Harmodios.lua | 6 ----- scripts/zones/Bastok_Markets/npcs/Igsli.lua | 3 --- scripts/zones/Bastok_Markets/npcs/Karine.lua | 6 ----- scripts/zones/Bastok_Markets/npcs/Khonzon.lua | 9 ------- .../zones/Bastok_Markets/npcs/Lamepaue.lua | 3 --- scripts/zones/Bastok_Markets/npcs/Michea.lua | 23 ------------------ .../zones/Bastok_Markets/npcs/Oggodett.lua | 9 ------- scripts/zones/Bastok_Markets/npcs/Reet.lua | 3 --- .../zones/Bastok_Markets/npcs/Reinberta.lua | 3 --- scripts/zones/Bastok_Markets/npcs/Rothais.lua | 9 ------- .../zones/Bastok_Markets/npcs/Somn-Paemn.lua | 9 ------- scripts/zones/Bastok_Markets/npcs/Svana.lua | 9 ------- .../Bastok_Markets/npcs/Symphonic_Curator.lua | 3 --- scripts/zones/Bastok_Markets/npcs/Teerth.lua | 9 ------- scripts/zones/Bastok_Markets/npcs/Ulrike.lua | 6 ----- scripts/zones/Bastok_Markets/npcs/Umberto.lua | 6 ----- scripts/zones/Bastok_Markets/npcs/Visala.lua | 9 ------- .../zones/Bastok_Markets/npcs/Wulfnoth.lua | 6 ----- scripts/zones/Bastok_Markets/npcs/Yafafa.lua | 9 ------- .../zones/Bastok_Markets/npcs/Zon-Fobun.lua | 12 ---------- .../Bastok_Markets_[S]/DefaultActions.lua | 11 +++++++++ .../Bastok_Markets_[S]/npcs/Adelbrecht.lua | 6 ----- .../Bastok_Markets_[S]/npcs/Adelinde.lua | 21 ---------------- .../Bastok_Markets_[S]/npcs/Angry_Bull.lua | 21 ---------------- .../Bastok_Markets_[S]/npcs/Benjamin.lua | 21 ---------------- .../Bastok_Markets_[S]/npcs/Blingbrix.lua | 9 ------- .../npcs/Bottomless_Gorge.lua | 21 ---------------- .../Bastok_Markets_[S]/npcs/Christoph.lua | 21 ---------------- .../zones/Bastok_Markets_[S]/npcs/Clemens.lua | 21 ---------------- .../Bastok_Markets_[S]/npcs/Engelhart.lua | 6 ----- .../Bastok_Markets_[S]/npcs/Gentle_Tiger.lua | 6 ----- .../zones/Bastok_Markets_[S]/npcs/Heumila.lua | 24 ------------------- .../Bastok_Markets_[S]/npcs/Hunt_Registry.lua | 3 --- .../Bastok_Markets_[S]/npcs/Karlotte.lua | 9 ------- .../zones/Bastok_Markets_[S]/npcs/Kevan.lua | 6 ----- .../Bastok_Markets_[S]/npcs/Loussaire.lua | 3 --- .../zones/Bastok_Markets_[S]/npcs/Melina.lua | 6 ----- .../Bastok_Markets_[S]/npcs/Millard_IM.lua | 3 --- .../zones/Bastok_Markets_[S]/npcs/Pagdako.lua | 6 ----- .../Bastok_Markets_[S]/npcs/Raginmund.lua | 6 ----- .../Bastok_Markets_[S]/npcs/Red_Canyon.lua | 3 --- .../zones/Bastok_Markets_[S]/npcs/Silke.lua | 9 ------- .../npcs/Symphonic_Curator.lua | 3 --- .../zones/Bastok_Markets_[S]/npcs/Weldon.lua | 9 ------- 130 files changed, 25 insertions(+), 1113 deletions(-) delete mode 100644 scripts/zones/Al_Zahbi/npcs/Biyaada.lua delete mode 100644 scripts/zones/Al_Zahbi/npcs/Chocobo.lua delete mode 100644 scripts/zones/Al_Zahbi/npcs/Dabigo.lua delete mode 100644 scripts/zones/Al_Zahbi/npcs/Djinabaha.lua delete mode 100644 scripts/zones/Al_Zahbi/npcs/Gadalar.lua delete mode 100644 scripts/zones/Al_Zahbi/npcs/Gaweesh.lua delete mode 100644 scripts/zones/Al_Zahbi/npcs/Iphaaf.lua delete mode 100644 scripts/zones/Al_Zahbi/npcs/Krujaal.lua delete mode 100644 scripts/zones/Al_Zahbi/npcs/Mihli_Aliapoh.lua delete mode 100644 scripts/zones/Al_Zahbi/npcs/Najelith.lua delete mode 100644 scripts/zones/Al_Zahbi/npcs/Rughadjeen.lua delete mode 100644 scripts/zones/Al_Zahbi/npcs/Shayadar.lua delete mode 100644 scripts/zones/Al_Zahbi/npcs/Talhaal.lua delete mode 100644 scripts/zones/Al_Zahbi/npcs/Zazarg.lua delete mode 100644 scripts/zones/Bastok_Markets/npcs/Michea.lua create mode 100644 scripts/zones/Bastok_Markets_[S]/DefaultActions.lua delete mode 100644 scripts/zones/Bastok_Markets_[S]/npcs/Adelinde.lua delete mode 100644 scripts/zones/Bastok_Markets_[S]/npcs/Angry_Bull.lua delete mode 100644 scripts/zones/Bastok_Markets_[S]/npcs/Benjamin.lua delete mode 100644 scripts/zones/Bastok_Markets_[S]/npcs/Bottomless_Gorge.lua delete mode 100644 scripts/zones/Bastok_Markets_[S]/npcs/Christoph.lua delete mode 100644 scripts/zones/Bastok_Markets_[S]/npcs/Clemens.lua delete mode 100644 scripts/zones/Bastok_Markets_[S]/npcs/Heumila.lua diff --git a/scripts/zones/Al_Zahbi/DefaultActions.lua b/scripts/zones/Al_Zahbi/DefaultActions.lua index 04715151b97..5110301d718 100644 --- a/scripts/zones/Al_Zahbi/DefaultActions.lua +++ b/scripts/zones/Al_Zahbi/DefaultActions.lua @@ -3,19 +3,33 @@ local ID = zones[xi.zone.AL_ZAHBI] return { ['550'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, ['Banjanu'] = { event = 262 }, + ['Biyaada'] = { event = 250 }, ['Bjibar'] = { event = 263 }, + ['Chocobo'] = { text = ID.text.CHOCOBO_HAPPY }, + ['Dabigo'] = { event = 210 }, ['Dahaeel'] = { event = 264 }, ['Danaaba'] = { event = 248 }, ['Devonte'] = { event = 249 }, + ['Djinabaha'] = { event = 209 }, ['Eumoa-Tajimoa'] = { event = 239 }, ['Gadaana'] = { event = 244 }, + ['Gadalar'] = { event = 266 }, ['Gameem'] = { event = 236 }, + ['Gaweesh'] = { event = 258 }, ['Hadibal'] = { event = 245 }, + ['Iphaaf'] = { event = 254 }, + ['Krujaal'] = { event = 0 }, + ['Mihli_Aliapoh'] = { event = 267 }, ['Najaaj'] = { event = 241 }, + ['Najelith'] = { event = 269 }, + ['Rughadjeen'] = { event = 265 }, ['Salaifa'] = { event = 237 }, + ['Shayadar'] = { event = 252 }, ['Sujyahn'] = { event = 242 }, + ['Talhaal'] = { event = 256 }, ['Talruf'] = { event = 243 }, ['Truffle'] = { event = 240 }, ['Ugahar'] = { event = 238 }, + ['Zazarg'] = { event = 268 }, ['Zwiyaam'] = { event = 247 }, } diff --git a/scripts/zones/Al_Zahbi/npcs/Allard.lua b/scripts/zones/Al_Zahbi/npcs/Allard.lua index 3ec558e9ba9..f62250874a6 100644 --- a/scripts/zones/Al_Zahbi/npcs/Allard.lua +++ b/scripts/zones/Al_Zahbi/npcs/Allard.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.AL_ZAHBI] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -24,10 +21,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/Al_Zahbi/npcs/Biyaada.lua b/scripts/zones/Al_Zahbi/npcs/Biyaada.lua deleted file mode 100644 index 4f1d5909624..00000000000 --- a/scripts/zones/Al_Zahbi/npcs/Biyaada.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Al Zahbi --- NPC: Biyaada --- Type: Rughadjeen's Attendant --- !pos -65.802 -6.999 69.273 48 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(250) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Al_Zahbi/npcs/Bornahn.lua b/scripts/zones/Al_Zahbi/npcs/Bornahn.lua index 63c7c3a761e..cc870e8a26c 100644 --- a/scripts/zones/Al_Zahbi/npcs/Bornahn.lua +++ b/scripts/zones/Al_Zahbi/npcs/Bornahn.lua @@ -9,19 +9,10 @@ local ID = zones[xi.zone.AL_ZAHBI] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:sendGuild(60429, 8, 23, 4) then player:showText(npc, ID.text.BORNAHN_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/Al_Zahbi/npcs/Chayaya.lua b/scripts/zones/Al_Zahbi/npcs/Chayaya.lua index 831636fd544..d84f8c8e13b 100644 --- a/scripts/zones/Al_Zahbi/npcs/Chayaya.lua +++ b/scripts/zones/Al_Zahbi/npcs/Chayaya.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.AL_ZAHBI] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -36,10 +33,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/Al_Zahbi/npcs/Chochoroon.lua b/scripts/zones/Al_Zahbi/npcs/Chochoroon.lua index 6b14f82aefb..e507cb3b227 100644 --- a/scripts/zones/Al_Zahbi/npcs/Chochoroon.lua +++ b/scripts/zones/Al_Zahbi/npcs/Chochoroon.lua @@ -15,9 +15,6 @@ entity.onTrigger = function(player, npc) player:startEvent(260, 50) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.appraisal.appraisalOnEventFinish(player, csid, option, 50, 261, npc) end diff --git a/scripts/zones/Al_Zahbi/npcs/Chocobo.lua b/scripts/zones/Al_Zahbi/npcs/Chocobo.lua deleted file mode 100644 index 3770981abcb..00000000000 --- a/scripts/zones/Al_Zahbi/npcs/Chocobo.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Al Zahbi --- NPC: Chocobo ------------------------------------ -local ID = zones[xi.zone.AL_ZAHBI] ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - npc:showText(npc, ID.text.CHOCOBO_HAPPY) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Al_Zahbi/npcs/Dabigo.lua b/scripts/zones/Al_Zahbi/npcs/Dabigo.lua deleted file mode 100644 index 914a7d26cf2..00000000000 --- a/scripts/zones/Al_Zahbi/npcs/Dabigo.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Al Zahbi --- NPC: Dabigo --- Type: Delivery Box Manager --- !pos -34.289 -1 -129.141 48 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(210) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Al_Zahbi/npcs/Dahaaba.lua b/scripts/zones/Al_Zahbi/npcs/Dahaaba.lua index c3f7a118a29..50d6fcab2b9 100644 --- a/scripts/zones/Al_Zahbi/npcs/Dahaaba.lua +++ b/scripts/zones/Al_Zahbi/npcs/Dahaaba.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/Al_Zahbi/npcs/Dehbi_Moshal.lua b/scripts/zones/Al_Zahbi/npcs/Dehbi_Moshal.lua index 53de8fad934..b81c09e66e2 100644 --- a/scripts/zones/Al_Zahbi/npcs/Dehbi_Moshal.lua +++ b/scripts/zones/Al_Zahbi/npcs/Dehbi_Moshal.lua @@ -9,19 +9,10 @@ local ID = zones[xi.zone.AL_ZAHBI] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:sendGuild(60428, 6, 21, 0) then player:showText(npc, ID.text.DEHBI_MOSHAL_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/Al_Zahbi/npcs/Djinabaha.lua b/scripts/zones/Al_Zahbi/npcs/Djinabaha.lua deleted file mode 100644 index 0e9b8a7ab43..00000000000 --- a/scripts/zones/Al_Zahbi/npcs/Djinabaha.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Al Zahbi --- NPC: Djinabaha --- Type: AH Manager --- !pos -17.661 -1 -117.352 48 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(209) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Al_Zahbi/npcs/Falzuuk.lua b/scripts/zones/Al_Zahbi/npcs/Falzuuk.lua index 32a692b991f..0b7dfc12c81 100644 --- a/scripts/zones/Al_Zahbi/npcs/Falzuuk.lua +++ b/scripts/zones/Al_Zahbi/npcs/Falzuuk.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.besieged.onTrigger(player, npc, 216) end diff --git a/scripts/zones/Al_Zahbi/npcs/Famatar.lua b/scripts/zones/Al_Zahbi/npcs/Famatar.lua index 413c7d59b9f..c13aeff8cd8 100644 --- a/scripts/zones/Al_Zahbi/npcs/Famatar.lua +++ b/scripts/zones/Al_Zahbi/npcs/Famatar.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.besieged.onTrigger(player, npc, 218) end diff --git a/scripts/zones/Al_Zahbi/npcs/Gadalar.lua b/scripts/zones/Al_Zahbi/npcs/Gadalar.lua deleted file mode 100644 index 019cac265c7..00000000000 --- a/scripts/zones/Al_Zahbi/npcs/Gadalar.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Al Zahbi --- NPC: Gadalar --- Type: Fireserpent General --- !pos -105.979 -7 39.692 48 ------------------------------------ ----@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/Al_Zahbi/npcs/Gajaad.lua b/scripts/zones/Al_Zahbi/npcs/Gajaad.lua index 1c88b0740d0..a926f1d628e 100644 --- a/scripts/zones/Al_Zahbi/npcs/Gajaad.lua +++ b/scripts/zones/Al_Zahbi/npcs/Gajaad.lua @@ -44,10 +44,4 @@ entity.onTrigger = function(player, npc) player:startEvent(102, xi.item.IMPERIAL_BRONZE_PIECE) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Al_Zahbi/npcs/Gaweesh.lua b/scripts/zones/Al_Zahbi/npcs/Gaweesh.lua deleted file mode 100644 index 41d5d0f783d..00000000000 --- a/scripts/zones/Al_Zahbi/npcs/Gaweesh.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Al Zahbi --- NPC: Gaweesh --- Type: Najelith's Attendant --- !pos -64.537 -8 37.928 48 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(258) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Al_Zahbi/npcs/Gidappa.lua b/scripts/zones/Al_Zahbi/npcs/Gidappa.lua index e09169f8a8d..c81af2d24eb 100644 --- a/scripts/zones/Al_Zahbi/npcs/Gidappa.lua +++ b/scripts/zones/Al_Zahbi/npcs/Gidappa.lua @@ -15,9 +15,6 @@ entity.onTrigger = function(player, npc) xi.crafting.ahtUhrganImageSupportOnTrigger(player, npc) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.crafting.ahtUhrganImageSupportOnEventFinish(player, csid, option, npc) end diff --git a/scripts/zones/Al_Zahbi/npcs/Goyuyu.lua b/scripts/zones/Al_Zahbi/npcs/Goyuyu.lua index 147eead36a5..b94884ac1a4 100644 --- a/scripts/zones/Al_Zahbi/npcs/Goyuyu.lua +++ b/scripts/zones/Al_Zahbi/npcs/Goyuyu.lua @@ -5,17 +5,8 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:sendMenu(xi.menuType.AUCTION) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Al_Zahbi/npcs/Iphaaf.lua b/scripts/zones/Al_Zahbi/npcs/Iphaaf.lua deleted file mode 100644 index a65659ea832..00000000000 --- a/scripts/zones/Al_Zahbi/npcs/Iphaaf.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Al Zahbi --- NPC: Iphaaf --- Type: Mihli's Attendant --- !pos -28.014 -7 64.371 48 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(254) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Al_Zahbi/npcs/Kahah_Hobichai.lua b/scripts/zones/Al_Zahbi/npcs/Kahah_Hobichai.lua index 5cda09baecd..f69f74ea2bf 100644 --- a/scripts/zones/Al_Zahbi/npcs/Kahah_Hobichai.lua +++ b/scripts/zones/Al_Zahbi/npcs/Kahah_Hobichai.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.AL_ZAHBI] ---@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/Al_Zahbi/npcs/Krujaal.lua b/scripts/zones/Al_Zahbi/npcs/Krujaal.lua deleted file mode 100644 index 7b9c981587a..00000000000 --- a/scripts/zones/Al_Zahbi/npcs/Krujaal.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Al Zahbi --- NPC: Krujaal --- Type: Residence Renter --- !pos 36.522 -1 -63.198 48 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(0) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Al_Zahbi/npcs/Mabebe.lua b/scripts/zones/Al_Zahbi/npcs/Mabebe.lua index 39a06098f9f..d437f488bd0 100644 --- a/scripts/zones/Al_Zahbi/npcs/Mabebe.lua +++ b/scripts/zones/Al_Zahbi/npcs/Mabebe.lua @@ -9,18 +9,9 @@ local ID = zones[xi.zone.AL_ZAHBI] ---@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/Al_Zahbi/npcs/Macici.lua b/scripts/zones/Al_Zahbi/npcs/Macici.lua index 95306c07f6e..659c7761ada 100644 --- a/scripts/zones/Al_Zahbi/npcs/Macici.lua +++ b/scripts/zones/Al_Zahbi/npcs/Macici.lua @@ -15,9 +15,6 @@ entity.onTrigger = function(player, npc) xi.crafting.ahtUhrganImageSupportOnTrigger(player, npc) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.crafting.ahtUhrganImageSupportOnEventFinish(player, csid, option, npc) end diff --git a/scripts/zones/Al_Zahbi/npcs/Mihli_Aliapoh.lua b/scripts/zones/Al_Zahbi/npcs/Mihli_Aliapoh.lua deleted file mode 100644 index 0ec586858b3..00000000000 --- a/scripts/zones/Al_Zahbi/npcs/Mihli_Aliapoh.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Al Zahbi --- NPC: Mihli Aliapoh --- Type: Waterserpent General --- !pos -22.615 -7 78.907 48 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(267) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Al_Zahbi/npcs/Najaaj.lua b/scripts/zones/Al_Zahbi/npcs/Najaaj.lua index 10c722a569d..6c02b480220 100644 --- a/scripts/zones/Al_Zahbi/npcs/Najaaj.lua +++ b/scripts/zones/Al_Zahbi/npcs/Najaaj.lua @@ -20,16 +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) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Al_Zahbi/npcs/Najelith.lua b/scripts/zones/Al_Zahbi/npcs/Najelith.lua deleted file mode 100644 index 454f7f69350..00000000000 --- a/scripts/zones/Al_Zahbi/npcs/Najelith.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Al Zahbi --- NPC: Najelith --- Type: Galeserpent General --- !pos -64.526 -8 39.372 48 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(269) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Al_Zahbi/npcs/Ndego.lua b/scripts/zones/Al_Zahbi/npcs/Ndego.lua index 20e678b8146..e305f08dc0f 100644 --- a/scripts/zones/Al_Zahbi/npcs/Ndego.lua +++ b/scripts/zones/Al_Zahbi/npcs/Ndego.lua @@ -9,19 +9,10 @@ local ID = zones[xi.zone.AL_ZAHBI] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:sendGuild(60427, 8, 23, 2) then player:showText(npc, ID.text.NDEGO_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/Al_Zahbi/npcs/Nudahaal.lua b/scripts/zones/Al_Zahbi/npcs/Nudahaal.lua index 30756546278..6aa53ead4d3 100644 --- a/scripts/zones/Al_Zahbi/npcs/Nudahaal.lua +++ b/scripts/zones/Al_Zahbi/npcs/Nudahaal.lua @@ -15,9 +15,6 @@ entity.onTrigger = function(player, npc) xi.crafting.ahtUhrganImageSupportOnTrigger(player, npc) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.crafting.ahtUhrganImageSupportOnEventFinish(player, csid, option, npc) end diff --git a/scripts/zones/Al_Zahbi/npcs/Numaaf.lua b/scripts/zones/Al_Zahbi/npcs/Numaaf.lua index 67bbcf2482e..97cb096da89 100644 --- a/scripts/zones/Al_Zahbi/npcs/Numaaf.lua +++ b/scripts/zones/Al_Zahbi/npcs/Numaaf.lua @@ -15,9 +15,6 @@ entity.onTrigger = function(player, npc) xi.crafting.ahtUhrganImageSupportOnTrigger(player, npc) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.crafting.ahtUhrganImageSupportOnEventFinish(player, csid, option, npc) end diff --git a/scripts/zones/Al_Zahbi/npcs/Opococo.lua b/scripts/zones/Al_Zahbi/npcs/Opococo.lua index e04d422feaf..b51e8a8d81e 100644 --- a/scripts/zones/Al_Zahbi/npcs/Opococo.lua +++ b/scripts/zones/Al_Zahbi/npcs/Opococo.lua @@ -9,18 +9,9 @@ local ID = zones[xi.zone.AL_ZAHBI] ---@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/Al_Zahbi/npcs/Rajaaha.lua b/scripts/zones/Al_Zahbi/npcs/Rajaaha.lua index 1ae43bc7be6..07d82eaea09 100644 --- a/scripts/zones/Al_Zahbi/npcs/Rajaaha.lua +++ b/scripts/zones/Al_Zahbi/npcs/Rajaaha.lua @@ -15,9 +15,6 @@ entity.onTrigger = function(player, npc) xi.crafting.ahtUhrganImageSupportOnTrigger(player, npc) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.crafting.ahtUhrganImageSupportOnEventFinish(player, csid, option, npc) end diff --git a/scripts/zones/Al_Zahbi/npcs/Rughadjeen.lua b/scripts/zones/Al_Zahbi/npcs/Rughadjeen.lua deleted file mode 100644 index d3ec981a8f3..00000000000 --- a/scripts/zones/Al_Zahbi/npcs/Rughadjeen.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Al Zahbi --- NPC: Rughadjeen --- Type: Skyserpent General --- !pos -74.150 -7 70.656 48 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(265) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Al_Zahbi/npcs/Shayadar.lua b/scripts/zones/Al_Zahbi/npcs/Shayadar.lua deleted file mode 100644 index d12e29ac17e..00000000000 --- a/scripts/zones/Al_Zahbi/npcs/Shayadar.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Al Zahbi --- NPC: Shayadar --- Type: Gadalar's Attendant --- !pos -107.177 -6.999 33.463 48 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(252) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Al_Zahbi/npcs/Shihu-Danhu.lua b/scripts/zones/Al_Zahbi/npcs/Shihu-Danhu.lua index a863a448fb9..e1f874c6b91 100644 --- a/scripts/zones/Al_Zahbi/npcs/Shihu-Danhu.lua +++ b/scripts/zones/Al_Zahbi/npcs/Shihu-Danhu.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.AHT_URHGAN_WHITEGATE] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if xi.besieged.getAstralCandescence() == 1 then player:startEvent(103) @@ -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 == 103 and option == 1 then local shihuDanhuEncounters = player:getCharVar('ShihuDanhu_Encounters') diff --git a/scripts/zones/Al_Zahbi/npcs/Sojan-Tamjan.lua b/scripts/zones/Al_Zahbi/npcs/Sojan-Tamjan.lua index 67a6255e6bf..0e60bd97158 100644 --- a/scripts/zones/Al_Zahbi/npcs/Sojan-Tamjan.lua +++ b/scripts/zones/Al_Zahbi/npcs/Sojan-Tamjan.lua @@ -5,17 +5,8 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:sendMenu(xi.menuType.AUCTION) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Al_Zahbi/npcs/Sujyahn.lua b/scripts/zones/Al_Zahbi/npcs/Sujyahn.lua index 0ff12c350f3..45b3020f831 100644 --- a/scripts/zones/Al_Zahbi/npcs/Sujyahn.lua +++ b/scripts/zones/Al_Zahbi/npcs/Sujyahn.lua @@ -20,16 +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) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Al_Zahbi/npcs/Symphonic_Curator.lua b/scripts/zones/Al_Zahbi/npcs/Symphonic_Curator.lua index 1f207df2bd3..78532bbf338 100644 --- a/scripts/zones/Al_Zahbi/npcs/Symphonic_Curator.lua +++ b/scripts/zones/Al_Zahbi/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/Al_Zahbi/npcs/Talhaal.lua b/scripts/zones/Al_Zahbi/npcs/Talhaal.lua deleted file mode 100644 index 3e4138663e2..00000000000 --- a/scripts/zones/Al_Zahbi/npcs/Talhaal.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Al Zahbi --- NPC: Talhaal --- Type: Zazarg's Attendant --- !pos -35.897 -7 107.160 48 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(256) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Al_Zahbi/npcs/Taten-Bilten.lua b/scripts/zones/Al_Zahbi/npcs/Taten-Bilten.lua index 74a14791620..0146356b7d2 100644 --- a/scripts/zones/Al_Zahbi/npcs/Taten-Bilten.lua +++ b/scripts/zones/Al_Zahbi/npcs/Taten-Bilten.lua @@ -9,19 +9,10 @@ local ID = zones[xi.zone.AL_ZAHBI] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:sendGuild(60430, 6, 21, 0) then player:showText(npc, ID.text.TATEN_BILTEN_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/Al_Zahbi/npcs/Yando-Memondo.lua b/scripts/zones/Al_Zahbi/npcs/Yando-Memondo.lua index dcafca1664c..fed38ec3b1b 100644 --- a/scripts/zones/Al_Zahbi/npcs/Yando-Memondo.lua +++ b/scripts/zones/Al_Zahbi/npcs/Yando-Memondo.lua @@ -5,17 +5,8 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:sendMenu(xi.menuType.AUCTION) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Al_Zahbi/npcs/Yudi_Yolhbi.lua b/scripts/zones/Al_Zahbi/npcs/Yudi_Yolhbi.lua index 0fe4106274e..e0185b314ca 100644 --- a/scripts/zones/Al_Zahbi/npcs/Yudi_Yolhbi.lua +++ b/scripts/zones/Al_Zahbi/npcs/Yudi_Yolhbi.lua @@ -15,9 +15,6 @@ entity.onTrigger = function(player, npc) xi.crafting.ahtUhrganImageSupportOnTrigger(player, npc) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.crafting.ahtUhrganImageSupportOnEventFinish(player, csid, option, npc) end diff --git a/scripts/zones/Al_Zahbi/npcs/Zafif.lua b/scripts/zones/Al_Zahbi/npcs/Zafif.lua index 9da34568a73..8f716fb0c13 100644 --- a/scripts/zones/Al_Zahbi/npcs/Zafif.lua +++ b/scripts/zones/Al_Zahbi/npcs/Zafif.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.AL_ZAHBI] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -35,10 +32,4 @@ entity.onTrigger = function(player, npc) xi.shop.general(player, stock) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Al_Zahbi/npcs/Zazarg.lua b/scripts/zones/Al_Zahbi/npcs/Zazarg.lua deleted file mode 100644 index 5767f0abce7..00000000000 --- a/scripts/zones/Al_Zahbi/npcs/Zazarg.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Al Zahbi --- NPC: Zazarg --- Type: Stoneserpent General --- !pos -41.675 -8 104.452 48 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(268) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Al_Zahbi/npcs/Zwaluh.lua b/scripts/zones/Al_Zahbi/npcs/Zwaluh.lua index d63a37ce2c6..8bcc950840d 100644 --- a/scripts/zones/Al_Zahbi/npcs/Zwaluh.lua +++ b/scripts/zones/Al_Zahbi/npcs/Zwaluh.lua @@ -15,9 +15,6 @@ entity.onTrigger = function(player, npc) xi.crafting.ahtUhrganImageSupportOnTrigger(player, npc) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.crafting.ahtUhrganImageSupportOnEventFinish(player, csid, option, npc) end diff --git a/scripts/zones/Apollyon/npcs/Sentinel_Column.lua b/scripts/zones/Apollyon/npcs/Sentinel_Column.lua index 3643f0896eb..898e43b609a 100644 --- a/scripts/zones/Apollyon/npcs/Sentinel_Column.lua +++ b/scripts/zones/Apollyon/npcs/Sentinel_Column.lua @@ -30,7 +30,4 @@ entity.onEventUpdate = function(player, csid, option, npc) ) end -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Arrapago_Reef/npcs/Cutter.lua b/scripts/zones/Arrapago_Reef/npcs/Cutter.lua index e8cf3de6689..6c8e0fd61be 100644 --- a/scripts/zones/Arrapago_Reef/npcs/Cutter.lua +++ b/scripts/zones/Arrapago_Reef/npcs/Cutter.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.ARRAPAGO_REEF] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if not xi.instance.onTrigger(player, npc, xi.zone.THE_ASHU_TALIF) then player:messageSpecial(ID.text.YOU_NO_REQS) diff --git a/scripts/zones/Arrapago_Reef/npcs/Meyaada.lua b/scripts/zones/Arrapago_Reef/npcs/Meyaada.lua index 7caec469d0c..df8e6095d59 100644 --- a/scripts/zones/Arrapago_Reef/npcs/Meyaada.lua +++ b/scripts/zones/Arrapago_Reef/npcs/Meyaada.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.ARRAPAGO_REEF] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local toauMission = player:getCurrentMission(xi.mission.log_id.TOAU) @@ -34,9 +31,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) -- ASSAULT if csid == 223 and option == 1 then diff --git a/scripts/zones/Arrapago_Reef/npcs/Runic_Portal.lua b/scripts/zones/Arrapago_Reef/npcs/Runic_Portal.lua index a088bae06ea..c68b1ba44ad 100644 --- a/scripts/zones/Arrapago_Reef/npcs/Runic_Portal.lua +++ b/scripts/zones/Arrapago_Reef/npcs/Runic_Portal.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.ARRAPAGO_REEF] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getCurrentMission(xi.mission.log_id.TOAU) >= xi.mission.id.toau.IMMORTAL_SENTRIES and @@ -27,9 +24,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if option == 1 then if csid == 111 then diff --git a/scripts/zones/Arrapago_Reef/npcs/_1ie.lua b/scripts/zones/Arrapago_Reef/npcs/_1ie.lua index 50d3f3c8606..0815c6b2c1a 100644 --- a/scripts/zones/Arrapago_Reef/npcs/_1ie.lua +++ b/scripts/zones/Arrapago_Reef/npcs/_1ie.lua @@ -67,10 +67,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/Arrapago_Reef/npcs/_jib.lua b/scripts/zones/Arrapago_Reef/npcs/_jib.lua index 5d5862daa6c..7b3fae17adf 100644 --- a/scripts/zones/Arrapago_Reef/npcs/_jib.lua +++ b/scripts/zones/Arrapago_Reef/npcs/_jib.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.ARRAPAGO_REEF] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:checkDistance(npc) < 3 then if player:getXPos() < 8 then @@ -29,10 +26,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Arrapago_Reef/npcs/_jic.lua b/scripts/zones/Arrapago_Reef/npcs/_jic.lua index 9adff0b483b..f2f9952f0d0 100644 --- a/scripts/zones/Arrapago_Reef/npcs/_jic.lua +++ b/scripts/zones/Arrapago_Reef/npcs/_jic.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.ARRAPAGO_REEF] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if not xi.instance.onTrigger(player, npc, xi.zone.ILRUSI_ATOLL) then player:messageSpecial(ID.text.NOTHING_HAPPENS) diff --git a/scripts/zones/Arrapago_Reef/npcs/qm6.lua b/scripts/zones/Arrapago_Reef/npcs/qm6.lua index c7800e44ef1..d5d80b4cd16 100644 --- a/scripts/zones/Arrapago_Reef/npcs/qm6.lua +++ b/scripts/zones/Arrapago_Reef/npcs/qm6.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.ARRAPAGO_REEF] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local mJob = player:getMainJob() local mLvl = player:getMainLvl() @@ -35,9 +32,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) -- NAVIGATING THE UNFRIENDLY SEAS if csid == 232 then diff --git a/scripts/zones/Arrapago_Remnants/npcs/Armoury_Crate.lua b/scripts/zones/Arrapago_Remnants/npcs/Armoury_Crate.lua index 0e4a8f7a531..fd02a2004f5 100644 --- a/scripts/zones/Arrapago_Remnants/npcs/Armoury_Crate.lua +++ b/scripts/zones/Arrapago_Remnants/npcs/Armoury_Crate.lua @@ -28,10 +28,4 @@ entity.onTrigger = function(player, npc) GetNPCByID(npcID, instance):setStatus(xi.status.DISAPPEAR) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Arrapago_Remnants/npcs/Slot.lua b/scripts/zones/Arrapago_Remnants/npcs/Slot.lua index ffc075b2a1b..4a67375cf27 100644 --- a/scripts/zones/Arrapago_Remnants/npcs/Slot.lua +++ b/scripts/zones/Arrapago_Remnants/npcs/Slot.lua @@ -19,13 +19,4 @@ entity.onTrade = function(player, npc, trade) end end -entity.onTrigger = function(player, npc) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Arrapago_Remnants/npcs/Socket.lua b/scripts/zones/Arrapago_Remnants/npcs/Socket.lua index d8607b5e773..5ba1ce176de 100644 --- a/scripts/zones/Arrapago_Remnants/npcs/Socket.lua +++ b/scripts/zones/Arrapago_Remnants/npcs/Socket.lua @@ -34,13 +34,4 @@ entity.onTrade = function(player, npc, trade) end end -entity.onTrigger = function(player, npc) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Arrapago_Remnants/npcs/_220.lua b/scripts/zones/Arrapago_Remnants/npcs/_220.lua index 9da6b179613..6df282cb753 100644 --- a/scripts/zones/Arrapago_Remnants/npcs/_220.lua +++ b/scripts/zones/Arrapago_Remnants/npcs/_220.lua @@ -7,9 +7,6 @@ entity.onTrigger = function(player, npc) player:startEvent(300) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, door) if csid == 300 and option == 1 then door:setAnimation(8) diff --git a/scripts/zones/Arrapago_Remnants/npcs/_221.lua b/scripts/zones/Arrapago_Remnants/npcs/_221.lua index abcfbb07766..74fbc6f8ad6 100644 --- a/scripts/zones/Arrapago_Remnants/npcs/_221.lua +++ b/scripts/zones/Arrapago_Remnants/npcs/_221.lua @@ -12,9 +12,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, door) if csid == 300 and option == 1 then local instance = door:getInstance() diff --git a/scripts/zones/Arrapago_Remnants/npcs/_222.lua b/scripts/zones/Arrapago_Remnants/npcs/_222.lua index abcfbb07766..74fbc6f8ad6 100644 --- a/scripts/zones/Arrapago_Remnants/npcs/_222.lua +++ b/scripts/zones/Arrapago_Remnants/npcs/_222.lua @@ -12,9 +12,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, door) if csid == 300 and option == 1 then local instance = door:getInstance() diff --git a/scripts/zones/Arrapago_Remnants/npcs/_223.lua b/scripts/zones/Arrapago_Remnants/npcs/_223.lua index abcfbb07766..74fbc6f8ad6 100644 --- a/scripts/zones/Arrapago_Remnants/npcs/_223.lua +++ b/scripts/zones/Arrapago_Remnants/npcs/_223.lua @@ -12,9 +12,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, door) if csid == 300 and option == 1 then local instance = door:getInstance() diff --git a/scripts/zones/Arrapago_Remnants/npcs/_224.lua b/scripts/zones/Arrapago_Remnants/npcs/_224.lua index abcfbb07766..74fbc6f8ad6 100644 --- a/scripts/zones/Arrapago_Remnants/npcs/_224.lua +++ b/scripts/zones/Arrapago_Remnants/npcs/_224.lua @@ -12,9 +12,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, door) if csid == 300 and option == 1 then local instance = door:getInstance() diff --git a/scripts/zones/Arrapago_Remnants/npcs/_225.lua b/scripts/zones/Arrapago_Remnants/npcs/_225.lua index 0f438fa60b1..ce15d0d730c 100644 --- a/scripts/zones/Arrapago_Remnants/npcs/_225.lua +++ b/scripts/zones/Arrapago_Remnants/npcs/_225.lua @@ -12,9 +12,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, door) if csid == 300 and option == 1 then local instance = door:getInstance() diff --git a/scripts/zones/Arrapago_Remnants/npcs/_226.lua b/scripts/zones/Arrapago_Remnants/npcs/_226.lua index 0f438fa60b1..ce15d0d730c 100644 --- a/scripts/zones/Arrapago_Remnants/npcs/_226.lua +++ b/scripts/zones/Arrapago_Remnants/npcs/_226.lua @@ -12,9 +12,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, door) if csid == 300 and option == 1 then local instance = door:getInstance() diff --git a/scripts/zones/Arrapago_Remnants/npcs/_227.lua b/scripts/zones/Arrapago_Remnants/npcs/_227.lua index 0f438fa60b1..ce15d0d730c 100644 --- a/scripts/zones/Arrapago_Remnants/npcs/_227.lua +++ b/scripts/zones/Arrapago_Remnants/npcs/_227.lua @@ -12,9 +12,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, door) if csid == 300 and option == 1 then local instance = door:getInstance() diff --git a/scripts/zones/Arrapago_Remnants/npcs/_228.lua b/scripts/zones/Arrapago_Remnants/npcs/_228.lua index 0f438fa60b1..ce15d0d730c 100644 --- a/scripts/zones/Arrapago_Remnants/npcs/_228.lua +++ b/scripts/zones/Arrapago_Remnants/npcs/_228.lua @@ -12,9 +12,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, door) if csid == 300 and option == 1 then local instance = door:getInstance() diff --git a/scripts/zones/Arrapago_Remnants/npcs/_229.lua b/scripts/zones/Arrapago_Remnants/npcs/_229.lua index 1a1f633215f..d8f5a159677 100644 --- a/scripts/zones/Arrapago_Remnants/npcs/_229.lua +++ b/scripts/zones/Arrapago_Remnants/npcs/_229.lua @@ -12,9 +12,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, door) if csid == 300 and option == 1 then local instance = door:getInstance() diff --git a/scripts/zones/Arrapago_Remnants/npcs/_22a.lua b/scripts/zones/Arrapago_Remnants/npcs/_22a.lua index d67bb11e04e..baab86936f5 100644 --- a/scripts/zones/Arrapago_Remnants/npcs/_22a.lua +++ b/scripts/zones/Arrapago_Remnants/npcs/_22a.lua @@ -12,9 +12,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, door) if csid == 300 and option == 1 then local instance = door:getInstance() diff --git a/scripts/zones/Arrapago_Remnants/npcs/_22b.lua b/scripts/zones/Arrapago_Remnants/npcs/_22b.lua index 7a32ea9dc9c..e125f2a9539 100644 --- a/scripts/zones/Arrapago_Remnants/npcs/_22b.lua +++ b/scripts/zones/Arrapago_Remnants/npcs/_22b.lua @@ -12,9 +12,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, door) if csid == 300 and option == 1 then local instance = door:getInstance() diff --git a/scripts/zones/Arrapago_Remnants/npcs/_22c.lua b/scripts/zones/Arrapago_Remnants/npcs/_22c.lua index a16de69bf79..85d72d625e5 100644 --- a/scripts/zones/Arrapago_Remnants/npcs/_22c.lua +++ b/scripts/zones/Arrapago_Remnants/npcs/_22c.lua @@ -12,9 +12,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, door) if csid == 300 and option == 1 then local instance = door:getInstance() diff --git a/scripts/zones/Arrapago_Remnants/npcs/_22d.lua b/scripts/zones/Arrapago_Remnants/npcs/_22d.lua index c8d62d5d162..23ce8c2fdc9 100644 --- a/scripts/zones/Arrapago_Remnants/npcs/_22d.lua +++ b/scripts/zones/Arrapago_Remnants/npcs/_22d.lua @@ -12,9 +12,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, door) if csid == 300 and option == 1 then local instance = door:getInstance() diff --git a/scripts/zones/Arrapago_Remnants/npcs/_22e.lua b/scripts/zones/Arrapago_Remnants/npcs/_22e.lua index 6b054b4f110..18d9b4d714b 100644 --- a/scripts/zones/Arrapago_Remnants/npcs/_22e.lua +++ b/scripts/zones/Arrapago_Remnants/npcs/_22e.lua @@ -12,9 +12,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, door) if csid == 300 and option == 1 then local instance = door:getInstance() diff --git a/scripts/zones/Arrapago_Remnants/npcs/_22f.lua b/scripts/zones/Arrapago_Remnants/npcs/_22f.lua index 249f9fa8875..a4dd034f555 100644 --- a/scripts/zones/Arrapago_Remnants/npcs/_22f.lua +++ b/scripts/zones/Arrapago_Remnants/npcs/_22f.lua @@ -15,9 +15,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, door) if csid == 300 and option == 1 then local instance = door:getInstance() diff --git a/scripts/zones/Arrapago_Remnants/npcs/_22g.lua b/scripts/zones/Arrapago_Remnants/npcs/_22g.lua index 910b8bbafed..481486a03ed 100644 --- a/scripts/zones/Arrapago_Remnants/npcs/_22g.lua +++ b/scripts/zones/Arrapago_Remnants/npcs/_22g.lua @@ -12,9 +12,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, door) if csid == 300 and option == 1 then local instance = door:getInstance() diff --git a/scripts/zones/Attohwa_Chasm/npcs/Cradle_of_Rebirth.lua b/scripts/zones/Attohwa_Chasm/npcs/Cradle_of_Rebirth.lua index 67e509b46d3..f904e76581a 100644 --- a/scripts/zones/Attohwa_Chasm/npcs/Cradle_of_Rebirth.lua +++ b/scripts/zones/Attohwa_Chasm/npcs/Cradle_of_Rebirth.lua @@ -20,13 +20,4 @@ entity.onTrade = function(player, npc, trade) end end -entity.onTrigger = function(player, npc) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Attohwa_Chasm/npcs/Excavation_Point.lua b/scripts/zones/Attohwa_Chasm/npcs/Excavation_Point.lua index 9eabbeb2f81..b7db8d15277 100644 --- a/scripts/zones/Attohwa_Chasm/npcs/Excavation_Point.lua +++ b/scripts/zones/Attohwa_Chasm/npcs/Excavation_Point.lua @@ -13,10 +13,4 @@ entity.onTrigger = function(player, npc) xi.helm.onTrigger(player, xi.helmType.EXCAVATION) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Attohwa_Chasm/npcs/Jakaka.lua b/scripts/zones/Attohwa_Chasm/npcs/Jakaka.lua index 3cb742efbce..05d030908d6 100644 --- a/scripts/zones/Attohwa_Chasm/npcs/Jakaka.lua +++ b/scripts/zones/Attohwa_Chasm/npcs/Jakaka.lua @@ -42,9 +42,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 12 then player:addKeyItem(xi.ki.MIASMA_FILTER) diff --git a/scripts/zones/Bastok-Jeuno_Airship/npcs/Dereck.lua b/scripts/zones/Bastok-Jeuno_Airship/npcs/Dereck.lua index 8dfd5f45ff7..abe7d51ccc9 100644 --- a/scripts/zones/Bastok-Jeuno_Airship/npcs/Dereck.lua +++ b/scripts/zones/Bastok-Jeuno_Airship/npcs/Dereck.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.BASTOK_JEUNO_AIRSHIP] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local vHour = VanadielHour() local vMin = VanadielMinute() @@ -59,10 +56,4 @@ entity.onTrigger = function(player, npc) player:messageSpecial(message, math.floor((2.4 * vMinutes) / 60), math.floor(vMinutes / 60 + 0.5)) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Bastok-Jeuno_Airship/npcs/Michele.lua b/scripts/zones/Bastok-Jeuno_Airship/npcs/Michele.lua index eec355292e4..b7878548bf2 100644 --- a/scripts/zones/Bastok-Jeuno_Airship/npcs/Michele.lua +++ b/scripts/zones/Bastok-Jeuno_Airship/npcs/Michele.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.BASTOK_JEUNO_AIRSHIP] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local vHour = VanadielHour() local vMin = VanadielMinute() @@ -58,10 +55,4 @@ entity.onTrigger = function(player, npc) player:messageSpecial(message, math.floor((2.4 * vMinutes) / 60), math.floor(vMinutes / 60 + 0.5)) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Bastok_Markets/npcs/AMAN_Liaison.lua b/scripts/zones/Bastok_Markets/npcs/AMAN_Liaison.lua index 48728e039aa..e606fd7b1c1 100644 --- a/scripts/zones/Bastok_Markets/npcs/AMAN_Liaison.lua +++ b/scripts/zones/Bastok_Markets/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/Bastok_Markets/npcs/AMAN_Validator.lua b/scripts/zones/Bastok_Markets/npcs/AMAN_Validator.lua index a206457b2c8..cd4252f1335 100644 --- a/scripts/zones/Bastok_Markets/npcs/AMAN_Validator.lua +++ b/scripts/zones/Bastok_Markets/npcs/AMAN_Validator.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.deeds.validatorOnTrigger(player, npc) end diff --git a/scripts/zones/Bastok_Markets/npcs/Ardea.lua b/scripts/zones/Bastok_Markets/npcs/Ardea.lua index 0aa76cba996..d0d97354d15 100644 --- a/scripts/zones/Bastok_Markets/npcs/Ardea.lua +++ b/scripts/zones/Bastok_Markets/npcs/Ardea.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local rockRacketeer = player:getQuestStatus(xi.questLog.WINDURST, xi.quest.id.windurst.ROCK_RACKETEER) local chasingQuotasStatus = player:getCharVar('ChasingQuotas_Progress') @@ -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) -- Rock Racketeer if csid == 261 and option ~= 1 then diff --git a/scripts/zones/Bastok_Markets/npcs/Auction_Counter.lua b/scripts/zones/Bastok_Markets/npcs/Auction_Counter.lua index a3394c92b01..474f8034d90 100644 --- a/scripts/zones/Bastok_Markets/npcs/Auction_Counter.lua +++ b/scripts/zones/Bastok_Markets/npcs/Auction_Counter.lua @@ -7,18 +7,9 @@ require('scripts/quests/tutorial') ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.tutorial.onAuctionTrigger(player) player:sendMenu(xi.menuType.AUCTION) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Bastok_Markets/npcs/Belizieg.lua b/scripts/zones/Bastok_Markets/npcs/Belizieg.lua index 9c50f4c18a0..5c95d73344c 100644 --- a/scripts/zones/Bastok_Markets/npcs/Belizieg.lua +++ b/scripts/zones/Bastok_Markets/npcs/Belizieg.lua @@ -9,18 +9,9 @@ local ID = zones[xi.zone.BASTOK_MARKETS] ---@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/Bastok_Markets/npcs/Cleades.lua b/scripts/zones/Bastok_Markets/npcs/Cleades.lua index ca81b4d47b9..b2258dfddf9 100644 --- a/scripts/zones/Bastok_Markets/npcs/Cleades.lua +++ b/scripts/zones/Bastok_Markets/npcs/Cleades.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/Bastok_Markets/npcs/Degenhard.lua b/scripts/zones/Bastok_Markets/npcs/Degenhard.lua index 226c1e49fa8..51a09c62c9d 100644 --- a/scripts/zones/Bastok_Markets/npcs/Degenhard.lua +++ b/scripts/zones/Bastok_Markets/npcs/Degenhard.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 == 15 then npcUtil.giveItem(player, xi.item.OLDE_RARAB_TAIL) diff --git a/scripts/zones/Bastok_Markets/npcs/Fatimah.lua b/scripts/zones/Bastok_Markets/npcs/Fatimah.lua index 89064def47b..2d82967e9f6 100644 --- a/scripts/zones/Bastok_Markets/npcs/Fatimah.lua +++ b/scripts/zones/Bastok_Markets/npcs/Fatimah.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/Bastok_Markets/npcs/Gulldago.lua b/scripts/zones/Bastok_Markets/npcs/Gulldago.lua index 554192a8b01..40725e3d230 100644 --- a/scripts/zones/Bastok_Markets/npcs/Gulldago.lua +++ b/scripts/zones/Bastok_Markets/npcs/Gulldago.lua @@ -9,16 +9,10 @@ require('scripts/quests/tutorial') ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.tutorial.onTrigger(player, npc, 518, 1) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.tutorial.onEventFinish(player, csid, option, 518, 1) end diff --git a/scripts/zones/Bastok_Markets/npcs/Harmodios.lua b/scripts/zones/Bastok_Markets/npcs/Harmodios.lua index 0553faf1afd..fb429e6c1e5 100644 --- a/scripts/zones/Bastok_Markets/npcs/Harmodios.lua +++ b/scripts/zones/Bastok_Markets/npcs/Harmodios.lua @@ -31,10 +31,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/Bastok_Markets/npcs/Igsli.lua b/scripts/zones/Bastok_Markets/npcs/Igsli.lua index b9f5e6dbee6..09049b9b53e 100644 --- a/scripts/zones/Bastok_Markets/npcs/Igsli.lua +++ b/scripts/zones/Bastok_Markets/npcs/Igsli.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.unity.onTrigger(player, npc) end diff --git a/scripts/zones/Bastok_Markets/npcs/Karine.lua b/scripts/zones/Bastok_Markets/npcs/Karine.lua index 2334e9bf2c0..fafd5598006 100644 --- a/scripts/zones/Bastok_Markets/npcs/Karine.lua +++ b/scripts/zones/Bastok_Markets/npcs/Karine.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/Bastok_Markets/npcs/Khonzon.lua b/scripts/zones/Bastok_Markets/npcs/Khonzon.lua index 2742ea1552e..e3bb2bd43cc 100644 --- a/scripts/zones/Bastok_Markets/npcs/Khonzon.lua +++ b/scripts/zones/Bastok_Markets/npcs/Khonzon.lua @@ -9,18 +9,9 @@ local ID = zones[xi.zone.BASTOK_MARKETS] ---@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/Bastok_Markets/npcs/Lamepaue.lua b/scripts/zones/Bastok_Markets/npcs/Lamepaue.lua index 3a9f6da0473..9e344ce04f0 100644 --- a/scripts/zones/Bastok_Markets/npcs/Lamepaue.lua +++ b/scripts/zones/Bastok_Markets/npcs/Lamepaue.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/Bastok_Markets/npcs/Michea.lua b/scripts/zones/Bastok_Markets/npcs/Michea.lua deleted file mode 100644 index d41bf2a41e2..00000000000 --- a/scripts/zones/Bastok_Markets/npcs/Michea.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Bastok Markets --- NPC: Michea --- Starts: Father Figure (100%) | The Elvaan Goldsmith (100%) --- Involed in: Distant Loyalties --- !pos -298 -16 -157 235 ------------------------------------ ----@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/Bastok_Markets/npcs/Oggodett.lua b/scripts/zones/Bastok_Markets/npcs/Oggodett.lua index 8004651af7a..6969a867294 100644 --- a/scripts/zones/Bastok_Markets/npcs/Oggodett.lua +++ b/scripts/zones/Bastok_Markets/npcs/Oggodett.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.BASTOK_MARKETS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if GetRegionOwner(xi.region.ARAGONEU) ~= xi.nation.BASTOK then player:showText(npc, ID.text.OGGODETT_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/Bastok_Markets/npcs/Reet.lua b/scripts/zones/Bastok_Markets/npcs/Reet.lua index 989e24e4637..c69ffe1f9a3 100644 --- a/scripts/zones/Bastok_Markets/npcs/Reet.lua +++ b/scripts/zones/Bastok_Markets/npcs/Reet.lua @@ -20,9 +20,6 @@ entity.onTrigger = function(player, npc) player:startEvent(5) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 6 then player:tradeComplete() diff --git a/scripts/zones/Bastok_Markets/npcs/Reinberta.lua b/scripts/zones/Bastok_Markets/npcs/Reinberta.lua index 916bbd892a6..8894bab9a9a 100644 --- a/scripts/zones/Bastok_Markets/npcs/Reinberta.lua +++ b/scripts/zones/Bastok_Markets/npcs/Reinberta.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/Bastok_Markets/npcs/Rothais.lua b/scripts/zones/Bastok_Markets/npcs/Rothais.lua index ea2419fd326..dad4df31e9d 100644 --- a/scripts/zones/Bastok_Markets/npcs/Rothais.lua +++ b/scripts/zones/Bastok_Markets/npcs/Rothais.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local vanatime = VanadielHour() @@ -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/Bastok_Markets/npcs/Somn-Paemn.lua b/scripts/zones/Bastok_Markets/npcs/Somn-Paemn.lua index 9b0e4c11736..6d8e2ce2d97 100644 --- a/scripts/zones/Bastok_Markets/npcs/Somn-Paemn.lua +++ b/scripts/zones/Bastok_Markets/npcs/Somn-Paemn.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.BASTOK_MARKETS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if GetRegionOwner(xi.region.SARUTABARUTA) ~= xi.nation.BASTOK then player:showText(npc, ID.text.SOMNPAEMN_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/Bastok_Markets/npcs/Svana.lua b/scripts/zones/Bastok_Markets/npcs/Svana.lua index 497a94f49ac..7f578baad66 100644 --- a/scripts/zones/Bastok_Markets/npcs/Svana.lua +++ b/scripts/zones/Bastok_Markets/npcs/Svana.lua @@ -6,17 +6,8 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(4, 0, 0, 0, 0, 0, 0, 0, VanadielTime()) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Bastok_Markets/npcs/Symphonic_Curator.lua b/scripts/zones/Bastok_Markets/npcs/Symphonic_Curator.lua index 1f207df2bd3..78532bbf338 100644 --- a/scripts/zones/Bastok_Markets/npcs/Symphonic_Curator.lua +++ b/scripts/zones/Bastok_Markets/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/Bastok_Markets/npcs/Teerth.lua b/scripts/zones/Bastok_Markets/npcs/Teerth.lua index 1dda104caf7..630cde09e47 100644 --- a/scripts/zones/Bastok_Markets/npcs/Teerth.lua +++ b/scripts/zones/Bastok_Markets/npcs/Teerth.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.BASTOK_MARKETS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local guildSkillId = xi.skill.GOLDSMITHING local stock = xi.shop.generalGuildStock[guildSkillId] @@ -19,10 +16,4 @@ entity.onTrigger = function(player, npc) player:showText(npc, ID.text.TEERTH_SHOP_DIALOG) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Bastok_Markets/npcs/Ulrike.lua b/scripts/zones/Bastok_Markets/npcs/Ulrike.lua index d977f0049fb..70442b01564 100644 --- a/scripts/zones/Bastok_Markets/npcs/Ulrike.lua +++ b/scripts/zones/Bastok_Markets/npcs/Ulrike.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/Bastok_Markets/npcs/Umberto.lua b/scripts/zones/Bastok_Markets/npcs/Umberto.lua index 5905798e4b2..74d5e6ff5c2 100644 --- a/scripts/zones/Bastok_Markets/npcs/Umberto.lua +++ b/scripts/zones/Bastok_Markets/npcs/Umberto.lua @@ -9,18 +9,12 @@ local ID = zones[xi.zone.BASTOK_MARKETS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getCharVar('TOO_MANY_CHEFS') == 5 then -- end Quest Too Many Chefs player:startEvent(473) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 473 then if player:getFreeSlotsCount() == 0 then diff --git a/scripts/zones/Bastok_Markets/npcs/Visala.lua b/scripts/zones/Bastok_Markets/npcs/Visala.lua index 05728067b19..689cf9db966 100644 --- a/scripts/zones/Bastok_Markets/npcs/Visala.lua +++ b/scripts/zones/Bastok_Markets/npcs/Visala.lua @@ -9,19 +9,10 @@ local ID = zones[xi.zone.BASTOK_MARKETS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:sendGuild(5272, 8, 23, 4) then player:showText(npc, ID.text.VISALA_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/Bastok_Markets/npcs/Wulfnoth.lua b/scripts/zones/Bastok_Markets/npcs/Wulfnoth.lua index 0c8a2f9a983..88ef1e276ef 100644 --- a/scripts/zones/Bastok_Markets/npcs/Wulfnoth.lua +++ b/scripts/zones/Bastok_Markets/npcs/Wulfnoth.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/Bastok_Markets/npcs/Yafafa.lua b/scripts/zones/Bastok_Markets/npcs/Yafafa.lua index d1bfddc8772..eb3df528706 100644 --- a/scripts/zones/Bastok_Markets/npcs/Yafafa.lua +++ b/scripts/zones/Bastok_Markets/npcs/Yafafa.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.BASTOK_MARKETS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if GetRegionOwner(xi.region.KOLSHUSHU) ~= xi.nation.BASTOK then player:showText(npc, ID.text.YAFAFA_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/Bastok_Markets/npcs/Zon-Fobun.lua b/scripts/zones/Bastok_Markets/npcs/Zon-Fobun.lua index 2fb0e0dae02..6ecc0bddd00 100644 --- a/scripts/zones/Bastok_Markets/npcs/Zon-Fobun.lua +++ b/scripts/zones/Bastok_Markets/npcs/Zon-Fobun.lua @@ -18,16 +18,4 @@ entity.onSpawn = function(npc) npc:pathThrough(pathNodes, xi.path.flag.PATROL) end -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Bastok_Markets_[S]/DefaultActions.lua b/scripts/zones/Bastok_Markets_[S]/DefaultActions.lua new file mode 100644 index 00000000000..28bee969385 --- /dev/null +++ b/scripts/zones/Bastok_Markets_[S]/DefaultActions.lua @@ -0,0 +1,11 @@ +-- local ID = zones[xi.zone.BASTOK_MARKETS_S] + +return { + ['Adelinde'] = { event = 103 }, + ['Angry_Bull'] = { event = 102 }, + ['Benjamin'] = { event = 146 }, + ['Bottomless_Gorge'] = { event = 150 }, + ['Christoph'] = { event = 157 }, + ['Clemens'] = { event = 149 }, + ['Heumila'] = { event = 0 }, +} diff --git a/scripts/zones/Bastok_Markets_[S]/npcs/Adelbrecht.lua b/scripts/zones/Bastok_Markets_[S]/npcs/Adelbrecht.lua index 4480ac09206..ed4615808fb 100644 --- a/scripts/zones/Bastok_Markets_[S]/npcs/Adelbrecht.lua +++ b/scripts/zones/Bastok_Markets_[S]/npcs/Adelbrecht.lua @@ -19,9 +19,6 @@ local ID = zones[xi.zone.BASTOK_MARKETS_S] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local allegiance = player:getCampaignAllegiance() -- 0 = none, 1 = San d'Oria Iron Rams, 2 = Bastok Fighting Fourth, 3 = Windurst Cobras @@ -66,9 +63,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 == 139 and option == 1 then player:addKeyItem(xi.ki.BATTLE_RATIONS) diff --git a/scripts/zones/Bastok_Markets_[S]/npcs/Adelinde.lua b/scripts/zones/Bastok_Markets_[S]/npcs/Adelinde.lua deleted file mode 100644 index b0aecfe422a..00000000000 --- a/scripts/zones/Bastok_Markets_[S]/npcs/Adelinde.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Bastok Markets (S) (H-6) --- NPC: Adelinde ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(103) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Bastok_Markets_[S]/npcs/Angry_Bull.lua b/scripts/zones/Bastok_Markets_[S]/npcs/Angry_Bull.lua deleted file mode 100644 index 371e5ce39bb..00000000000 --- a/scripts/zones/Bastok_Markets_[S]/npcs/Angry_Bull.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Bastok Markets (S) (H-10) --- NPC: Angry Bull (S) ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(102) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Bastok_Markets_[S]/npcs/Benjamin.lua b/scripts/zones/Bastok_Markets_[S]/npcs/Benjamin.lua deleted file mode 100644 index 2153abf7366..00000000000 --- a/scripts/zones/Bastok_Markets_[S]/npcs/Benjamin.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Bastok Markets (S) (F-9) --- NPC: Benjamin ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(146) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Bastok_Markets_[S]/npcs/Blingbrix.lua b/scripts/zones/Bastok_Markets_[S]/npcs/Blingbrix.lua index b4401591701..8d4d179b55e 100644 --- a/scripts/zones/Bastok_Markets_[S]/npcs/Blingbrix.lua +++ b/scripts/zones/Bastok_Markets_[S]/npcs/Blingbrix.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.BASTOK_MARKETS_S] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -23,10 +20,4 @@ entity.onTrigger = function(player, npc) xi.shop.general(player, stock) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Bastok_Markets_[S]/npcs/Bottomless_Gorge.lua b/scripts/zones/Bastok_Markets_[S]/npcs/Bottomless_Gorge.lua deleted file mode 100644 index 0312cc1b08a..00000000000 --- a/scripts/zones/Bastok_Markets_[S]/npcs/Bottomless_Gorge.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Bastok Markets (S) (F-8) --- NPC: Bottomless Gorge ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(150) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Bastok_Markets_[S]/npcs/Christoph.lua b/scripts/zones/Bastok_Markets_[S]/npcs/Christoph.lua deleted file mode 100644 index 12d421b9b11..00000000000 --- a/scripts/zones/Bastok_Markets_[S]/npcs/Christoph.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Bastok Markets (S) (H-7) --- NPC: Christoph ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(157) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Bastok_Markets_[S]/npcs/Clemens.lua b/scripts/zones/Bastok_Markets_[S]/npcs/Clemens.lua deleted file mode 100644 index d3c7f40361c..00000000000 --- a/scripts/zones/Bastok_Markets_[S]/npcs/Clemens.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Bastok Markets (S) (I-10) --- NPC: Clemens ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(149) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Bastok_Markets_[S]/npcs/Engelhart.lua b/scripts/zones/Bastok_Markets_[S]/npcs/Engelhart.lua index 48347e6f5ab..066b70e93c0 100644 --- a/scripts/zones/Bastok_Markets_[S]/npcs/Engelhart.lua +++ b/scripts/zones/Bastok_Markets_[S]/npcs/Engelhart.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.BASTOK_MARKETS_S] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getQuestStatus(xi.questLog.CRYSTAL_WAR, xi.quest.id.crystalWar.BETTER_PART_OF_VALOR) == xi.questStatus.QUEST_ACCEPTED then if player:getCharVar('BetterPartOfValProg') == 0 then @@ -46,9 +43,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 116 then player:setCharVar('BetterPartOfValProg', 1) diff --git a/scripts/zones/Bastok_Markets_[S]/npcs/Gentle_Tiger.lua b/scripts/zones/Bastok_Markets_[S]/npcs/Gentle_Tiger.lua index 4b69bff50b0..7b22984de1b 100644 --- a/scripts/zones/Bastok_Markets_[S]/npcs/Gentle_Tiger.lua +++ b/scripts/zones/Bastok_Markets_[S]/npcs/Gentle_Tiger.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getQuestStatus(xi.questLog.CRYSTAL_WAR, xi.quest.id.crystalWar.FIRES_OF_DISCONTENT) == xi.questStatus.QUEST_ACCEPTED then if player:getCharVar('FiresOfDiscProg') == 5 then @@ -21,9 +18,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option) if csid == 160 then player:setCharVar('FiresOfDiscProg', 6) diff --git a/scripts/zones/Bastok_Markets_[S]/npcs/Heumila.lua b/scripts/zones/Bastok_Markets_[S]/npcs/Heumila.lua deleted file mode 100644 index c0db118a191..00000000000 --- a/scripts/zones/Bastok_Markets_[S]/npcs/Heumila.lua +++ /dev/null @@ -1,24 +0,0 @@ ------------------------------------ --- Area: Bastok Markets (S) --- NPC: Heumila --- Type: Past Event Watcher --- !zone 87 --- !pos ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(0) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Bastok_Markets_[S]/npcs/Hunt_Registry.lua b/scripts/zones/Bastok_Markets_[S]/npcs/Hunt_Registry.lua index 62ff8af9e3c..1e3aa1628f4 100644 --- a/scripts/zones/Bastok_Markets_[S]/npcs/Hunt_Registry.lua +++ b/scripts/zones/Bastok_Markets_[S]/npcs/Hunt_Registry.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.hunts.onTrigger(player, npc) end diff --git a/scripts/zones/Bastok_Markets_[S]/npcs/Karlotte.lua b/scripts/zones/Bastok_Markets_[S]/npcs/Karlotte.lua index 7700f25db9a..22cb0881396 100644 --- a/scripts/zones/Bastok_Markets_[S]/npcs/Karlotte.lua +++ b/scripts/zones/Bastok_Markets_[S]/npcs/Karlotte.lua @@ -9,18 +9,9 @@ local ID = zones[xi.zone.BASTOK_MARKETS_S] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:showText(npc, ID.text.KARLOTTE_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/Bastok_Markets_[S]/npcs/Kevan.lua b/scripts/zones/Bastok_Markets_[S]/npcs/Kevan.lua index 8f9ed8c0d69..7f05049e3ca 100644 --- a/scripts/zones/Bastok_Markets_[S]/npcs/Kevan.lua +++ b/scripts/zones/Bastok_Markets_[S]/npcs/Kevan.lua @@ -38,10 +38,4 @@ 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/Bastok_Markets_[S]/npcs/Loussaire.lua b/scripts/zones/Bastok_Markets_[S]/npcs/Loussaire.lua index bbed29c7488..bc3942433de 100644 --- a/scripts/zones/Bastok_Markets_[S]/npcs/Loussaire.lua +++ b/scripts/zones/Bastok_Markets_[S]/npcs/Loussaire.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.BASTOK_MARKETS_S] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - -- TODO: Reduce complexity -- Disable cyclomatic complexity check for this function: -- luacheck: ignore 561 diff --git a/scripts/zones/Bastok_Markets_[S]/npcs/Melina.lua b/scripts/zones/Bastok_Markets_[S]/npcs/Melina.lua index cd885507b4d..c6a4aa6347a 100644 --- a/scripts/zones/Bastok_Markets_[S]/npcs/Melina.lua +++ b/scripts/zones/Bastok_Markets_[S]/npcs/Melina.lua @@ -10,16 +10,10 @@ local entity = {} local eventSucceed = 6 local eventFail = 7 -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.chocobo.renterOnTrigger(player, npc, eventSucceed, eventFail) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.chocobo.renterOnEventFinish(player, csid, option, eventSucceed) end diff --git a/scripts/zones/Bastok_Markets_[S]/npcs/Millard_IM.lua b/scripts/zones/Bastok_Markets_[S]/npcs/Millard_IM.lua index 086251b3fd1..8775f339714 100644 --- a/scripts/zones/Bastok_Markets_[S]/npcs/Millard_IM.lua +++ b/scripts/zones/Bastok_Markets_[S]/npcs/Millard_IM.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.campaign.sigilOnTrigger(player, npc) end diff --git a/scripts/zones/Bastok_Markets_[S]/npcs/Pagdako.lua b/scripts/zones/Bastok_Markets_[S]/npcs/Pagdako.lua index 34f8823a8a0..ba630b650ed 100644 --- a/scripts/zones/Bastok_Markets_[S]/npcs/Pagdako.lua +++ b/scripts/zones/Bastok_Markets_[S]/npcs/Pagdako.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getQuestStatus(xi.questLog.CRYSTAL_WAR, xi.quest.id.crystalWar.FIRES_OF_DISCONTENT) == xi.questStatus.QUEST_ACCEPTED then if player:getCharVar('FiresOfDiscProg') == 0 then @@ -21,9 +18,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 122 then player:setCharVar('FiresOfDiscProg', 1) diff --git a/scripts/zones/Bastok_Markets_[S]/npcs/Raginmund.lua b/scripts/zones/Bastok_Markets_[S]/npcs/Raginmund.lua index 09515539f81..386057e554a 100644 --- a/scripts/zones/Bastok_Markets_[S]/npcs/Raginmund.lua +++ b/scripts/zones/Bastok_Markets_[S]/npcs/Raginmund.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getCharVar('TOO_MANY_CHEFS') == 2 then player:startEvent(112) -- part 3 Too Many Chefs @@ -18,9 +15,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 112 then player:setCharVar('TOO_MANY_CHEFS', 3) diff --git a/scripts/zones/Bastok_Markets_[S]/npcs/Red_Canyon.lua b/scripts/zones/Bastok_Markets_[S]/npcs/Red_Canyon.lua index 008d6b90fc0..479b51b2e1f 100644 --- a/scripts/zones/Bastok_Markets_[S]/npcs/Red_Canyon.lua +++ b/scripts/zones/Bastok_Markets_[S]/npcs/Red_Canyon.lua @@ -9,9 +9,6 @@ entity.onTrigger = function(player, npc) player:startEvent(200) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 200 and option == 1 then player:setPos(380, 0, 147, 192, 88) diff --git a/scripts/zones/Bastok_Markets_[S]/npcs/Silke.lua b/scripts/zones/Bastok_Markets_[S]/npcs/Silke.lua index 17af1715e96..916cd8ddf33 100644 --- a/scripts/zones/Bastok_Markets_[S]/npcs/Silke.lua +++ b/scripts/zones/Bastok_Markets_[S]/npcs/Silke.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.BASTOK_MARKETS_S] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -22,10 +19,4 @@ entity.onTrigger = function(player, npc) xi.shop.general(player, stock) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Bastok_Markets_[S]/npcs/Symphonic_Curator.lua b/scripts/zones/Bastok_Markets_[S]/npcs/Symphonic_Curator.lua index 1f207df2bd3..78532bbf338 100644 --- a/scripts/zones/Bastok_Markets_[S]/npcs/Symphonic_Curator.lua +++ b/scripts/zones/Bastok_Markets_[S]/npcs/Symphonic_Curator.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.symphonic_curator.onTrigger(player, npc) end diff --git a/scripts/zones/Bastok_Markets_[S]/npcs/Weldon.lua b/scripts/zones/Bastok_Markets_[S]/npcs/Weldon.lua index 4840fa34850..a52e73dd056 100644 --- a/scripts/zones/Bastok_Markets_[S]/npcs/Weldon.lua +++ b/scripts/zones/Bastok_Markets_[S]/npcs/Weldon.lua @@ -9,18 +9,9 @@ local ID = zones[xi.zone.BASTOK_MARKETS_S] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:showText(npc, ID.text.WELDON_DELIVERY_DIALOG) player:openSendBox() end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity From bc357a7bf2a3140bdb9438543465cd552ba64f68 Mon Sep 17 00:00:00 2001 From: claywar Date: Sun, 26 Jan 2025 16:47:10 -0500 Subject: [PATCH 3/4] Remove empty NPCs, add Default Actions - Aht Urhgan ~ Alzadaal --- .../Aht_Urhgan_Whitegate/DefaultActions.lua | 56 +++++++++++++++++++ .../npcs/Abda-Lurabda.lua | 6 -- .../Aht_Urhgan_Whitegate/npcs/Abquhbah.lua | 9 --- .../Aht_Urhgan_Whitegate/npcs/Ahaadah.lua | 22 -------- .../Aht_Urhgan_Whitegate/npcs/Amajal.lua | 21 ------- .../Aht_Urhgan_Whitegate/npcs/Arzizah.lua | 21 ------- .../Aht_Urhgan_Whitegate/npcs/Asrahd.lua | 3 - .../zones/Aht_Urhgan_Whitegate/npcs/Atiza.lua | 6 -- .../npcs/Auction_Counter.lua | 9 --- .../Aht_Urhgan_Whitegate/npcs/Bajahb.lua | 9 --- .../npcs/Baya_Hiramayuh.lua | 9 --- .../npcs/Bhoy_Yhupplo.lua | 3 - .../Aht_Urhgan_Whitegate/npcs/Bujahwa.lua | 21 ------- .../npcs/Burnished_Bones.lua | 21 ------- .../npcs/Dhima_Polevhia.lua | 21 ------- .../Aht_Urhgan_Whitegate/npcs/Drahbah.lua | 3 - .../zones/Aht_Urhgan_Whitegate/npcs/Dwago.lua | 9 --- .../npcs/Esoteric_Hound.lua | 21 ------- .../zones/Aht_Urhgan_Whitegate/npcs/Famad.lua | 3 - .../Aht_Urhgan_Whitegate/npcs/Fari-Wari.lua | 21 ------- .../Aht_Urhgan_Whitegate/npcs/Fayeewah.lua | 9 --- .../Aht_Urhgan_Whitegate/npcs/Fubruhn.lua | 7 --- .../npcs/Furious_Boulder.lua | 21 ------- .../Aht_Urhgan_Whitegate/npcs/Galzweesh.lua | 21 ------- .../Aht_Urhgan_Whitegate/npcs/Gathweeda.lua | 9 --- .../Aht_Urhgan_Whitegate/npcs/Gavrie.lua | 9 --- .../Aht_Urhgan_Whitegate/npcs/Ghanraam.lua | 9 --- .../Aht_Urhgan_Whitegate/npcs/Giehnz.lua | 21 ------- .../Aht_Urhgan_Whitegate/npcs/Gigirk.lua | 21 ------- .../Aht_Urhgan_Whitegate/npcs/Hadayah.lua | 6 -- .../Aht_Urhgan_Whitegate/npcs/Hagakoff.lua | 9 --- .../Aht_Urhgan_Whitegate/npcs/Hajaom.lua | 21 ------- .../Aht_Urhgan_Whitegate/npcs/Halbeeya.lua | 21 ------- .../Aht_Urhgan_Whitegate/npcs/Hamnahb.lua | 21 ------- .../Aht_Urhgan_Whitegate/npcs/Hashayra.lua | 13 ----- .../Aht_Urhgan_Whitegate/npcs/Hishahma.lua | 21 ------- .../npcs/Hunt_Registry.lua | 3 - .../npcs/Imperial_Whitegate.lua | 3 - .../npcs/Ironbound_Gate.lua | 6 -- .../npcs/Iruki-Waraki.lua | 3 - .../Aht_Urhgan_Whitegate/npcs/Isdebaaq.lua | 3 - .../Aht_Urhgan_Whitegate/npcs/Jarafah.lua | 21 ------- .../Aht_Urhgan_Whitegate/npcs/Jumaaf.lua | 21 ------- .../Aht_Urhgan_Whitegate/npcs/Kabihyam.lua | 21 ------- .../npcs/Kaduru-Haiduru.lua | 3 - .../Aht_Urhgan_Whitegate/npcs/Kalimahf.lua | 21 ------- .../Aht_Urhgan_Whitegate/npcs/Kamnahb.lua | 21 ------- .../Aht_Urhgan_Whitegate/npcs/Kantila.lua | 21 ------- .../Aht_Urhgan_Whitegate/npcs/Kazween.lua | 9 --- .../npcs/Kelsha-Melansha.lua | 21 ------- .../npcs/Kemha_Flasehp.lua | 3 - .../npcs/Khaf_Jhifanm.lua | 9 --- .../npcs/Khoi_Gamduhla.lua | 21 ------- .../npcs/Koyol-Futenol.lua | 6 -- .../Aht_Urhgan_Whitegate/npcs/Kuhmden.lua | 21 ------- .../npcs/Kuhn_Tsahnpri.lua | 9 --- .../npcs/Kulh_Amariyo.lua | 9 --- .../Aht_Urhgan_Whitegate/npcs/Lageegee.lua | 3 - .../Aht_Urhgan_Whitegate/npcs/Mafwahb.lua | 21 ------- .../Aht_Urhgan_Whitegate/npcs/Malfud.lua | 9 --- .../Aht_Urhgan_Whitegate/npcs/Mariyaam.lua | 9 --- .../Aht_Urhgan_Whitegate/npcs/Mazween.lua | 9 --- .../Aht_Urhgan_Whitegate/npcs/Milazahn.lua | 21 ------- .../Aht_Urhgan_Whitegate/npcs/Mishhar.lua | 21 ------- .../Aht_Urhgan_Whitegate/npcs/Mulnith.lua | 9 --- .../Aht_Urhgan_Whitegate/npcs/Musdahl.lua | 21 ------- .../Aht_Urhgan_Whitegate/npcs/Muyadah.lua | 21 ------- .../Aht_Urhgan_Whitegate/npcs/Nadeey.lua | 21 ------- .../Aht_Urhgan_Whitegate/npcs/Nafiwaa.lua | 21 ------- .../npcs/Naja_Salaheem.lua | 6 -- .../Aht_Urhgan_Whitegate/npcs/Nijaom.lua | 21 ------- .../Aht_Urhgan_Whitegate/npcs/Nonoroon.lua | 21 ------- .../Aht_Urhgan_Whitegate/npcs/Prillaure.lua | 23 -------- .../Aht_Urhgan_Whitegate/npcs/Pursuivant.lua | 21 ------- .../Aht_Urhgan_Whitegate/npcs/Qahzwin.lua | 21 ------- .../Aht_Urhgan_Whitegate/npcs/Qulsun.lua | 21 ------- .../Aht_Urhgan_Whitegate/npcs/Ratihb.lua | 6 -- .../Aht_Urhgan_Whitegate/npcs/Riyadahf.lua | 6 -- .../Aht_Urhgan_Whitegate/npcs/Rubahah.lua | 9 --- .../npcs/Rujen-Gorgen.lua | 21 ------- .../npcs/Runic_Portal.lua | 6 -- .../Aht_Urhgan_Whitegate/npcs/Rytaal.lua | 6 -- .../Aht_Urhgan_Whitegate/npcs/Sajaaya.lua | 9 --- .../Aht_Urhgan_Whitegate/npcs/Sajahb.lua | 21 ------- .../Aht_Urhgan_Whitegate/npcs/Saluhwa.lua | 9 --- .../Aht_Urhgan_Whitegate/npcs/Sashosho.lua | 21 ------- .../Aht_Urhgan_Whitegate/npcs/Shahau.lua | 6 -- .../Aht_Urhgan_Whitegate/npcs/Shahbizu.lua | 21 ------- .../Aht_Urhgan_Whitegate/npcs/Shajaf.lua | 6 -- .../npcs/Sharin-Garin.lua | 6 -- .../npcs/Somnolent_Rooster.lua | 21 ------- .../npcs/Sorrowful_Sage.lua | 3 - .../Aht_Urhgan_Whitegate/npcs/Sulbahn.lua | 3 - .../npcs/Symphonic_Curator.lua | 3 - .../Aht_Urhgan_Whitegate/npcs/Tafeesa.lua | 21 ------- .../Aht_Urhgan_Whitegate/npcs/Talwahn.lua | 21 ------- .../Aht_Urhgan_Whitegate/npcs/Tateeya.lua | 3 - .../Aht_Urhgan_Whitegate/npcs/Tazhaal.lua | 6 -- .../Aht_Urhgan_Whitegate/npcs/Teteroon.lua | 21 ------- .../npcs/Tsih_Kolgimih.lua | 23 -------- .../Aht_Urhgan_Whitegate/npcs/Ubahrid.lua | 21 ------- .../Aht_Urhgan_Whitegate/npcs/Ugahar.lua | 21 ------- .../Aht_Urhgan_Whitegate/npcs/Ugrihd.lua | 6 -- .../Aht_Urhgan_Whitegate/npcs/Wahnid.lua | 9 --- .../Aht_Urhgan_Whitegate/npcs/Wahraga.lua | 9 --- .../Aht_Urhgan_Whitegate/npcs/Yafaaf.lua | 9 --- .../Aht_Urhgan_Whitegate/npcs/Yahsra.lua | 3 - .../Aht_Urhgan_Whitegate/npcs/Zaranf.lua | 21 ------- .../Aht_Urhgan_Whitegate/npcs/Zarfhid.lua | 21 ------- .../Aht_Urhgan_Whitegate/npcs/Zasshal.lua | 3 - .../Aht_Urhgan_Whitegate/npcs/Zhamwaa.lua | 21 ------- .../Aht_Urhgan_Whitegate/npcs/Zubyahn.lua | 21 ------- .../Aht_Urhgan_Whitegate/npcs/Zwinam.lua | 21 ------- .../Aht_Urhgan_Whitegate/npcs/Zyfhil.lua | 21 ------- .../zones/Aht_Urhgan_Whitegate/npcs/_1e1.lua | 9 --- .../zones/Aht_Urhgan_Whitegate/npcs/_1e6.lua | 9 --- .../zones/Aht_Urhgan_Whitegate/npcs/_1e8.lua | 9 --- .../zones/Aht_Urhgan_Whitegate/npcs/_1e9.lua | 6 -- .../zones/Aht_Urhgan_Whitegate/npcs/_1ee.lua | 9 --- .../zones/AlTaieu/npcs/Auroral_Updraft.lua | 6 -- .../zones/AlTaieu/npcs/Dimensional_Portal.lua | 6 -- .../zones/AlTaieu/npcs/Swirling_Vortex.lua | 6 -- .../zones/AlTaieu/npcs/qm_jailer_of_hope.lua | 9 --- .../AlTaieu/npcs/qm_jailer_of_justice.lua | 9 --- .../zones/AlTaieu/npcs/qm_jailer_of_love.lua | 9 --- .../AlTaieu/npcs/qm_jailer_of_prudence.lua | 9 --- scripts/zones/Altar_Room/DefaultActions.lua | 1 + scripts/zones/Altar_Room/npcs/Hooknox.lua | 22 -------- scripts/zones/Altar_Room/npcs/Stone_Lid.lua | 3 - .../npcs/Runic_Portal.lua | 6 -- .../Alzadaal_Undersea_Ruins/npcs/_20c.lua | 6 -- .../Alzadaal_Undersea_Ruins/npcs/_20d.lua | 6 -- .../Alzadaal_Undersea_Ruins/npcs/_20m.lua | 3 - .../Alzadaal_Undersea_Ruins/npcs/_20t.lua | 3 - .../Alzadaal_Undersea_Ruins/npcs/_20u.lua | 3 - 135 files changed, 57 insertions(+), 1685 deletions(-) delete mode 100644 scripts/zones/Aht_Urhgan_Whitegate/npcs/Ahaadah.lua delete mode 100644 scripts/zones/Aht_Urhgan_Whitegate/npcs/Amajal.lua delete mode 100644 scripts/zones/Aht_Urhgan_Whitegate/npcs/Arzizah.lua delete mode 100644 scripts/zones/Aht_Urhgan_Whitegate/npcs/Bujahwa.lua delete mode 100644 scripts/zones/Aht_Urhgan_Whitegate/npcs/Burnished_Bones.lua delete mode 100644 scripts/zones/Aht_Urhgan_Whitegate/npcs/Dhima_Polevhia.lua delete mode 100644 scripts/zones/Aht_Urhgan_Whitegate/npcs/Esoteric_Hound.lua delete mode 100644 scripts/zones/Aht_Urhgan_Whitegate/npcs/Fari-Wari.lua delete mode 100644 scripts/zones/Aht_Urhgan_Whitegate/npcs/Furious_Boulder.lua delete mode 100644 scripts/zones/Aht_Urhgan_Whitegate/npcs/Galzweesh.lua delete mode 100644 scripts/zones/Aht_Urhgan_Whitegate/npcs/Giehnz.lua delete mode 100644 scripts/zones/Aht_Urhgan_Whitegate/npcs/Gigirk.lua delete mode 100644 scripts/zones/Aht_Urhgan_Whitegate/npcs/Hajaom.lua delete mode 100644 scripts/zones/Aht_Urhgan_Whitegate/npcs/Halbeeya.lua delete mode 100644 scripts/zones/Aht_Urhgan_Whitegate/npcs/Hamnahb.lua delete mode 100644 scripts/zones/Aht_Urhgan_Whitegate/npcs/Hishahma.lua delete mode 100644 scripts/zones/Aht_Urhgan_Whitegate/npcs/Jarafah.lua delete mode 100644 scripts/zones/Aht_Urhgan_Whitegate/npcs/Jumaaf.lua delete mode 100644 scripts/zones/Aht_Urhgan_Whitegate/npcs/Kabihyam.lua delete mode 100644 scripts/zones/Aht_Urhgan_Whitegate/npcs/Kalimahf.lua delete mode 100644 scripts/zones/Aht_Urhgan_Whitegate/npcs/Kamnahb.lua delete mode 100644 scripts/zones/Aht_Urhgan_Whitegate/npcs/Kantila.lua delete mode 100644 scripts/zones/Aht_Urhgan_Whitegate/npcs/Kelsha-Melansha.lua delete mode 100644 scripts/zones/Aht_Urhgan_Whitegate/npcs/Khoi_Gamduhla.lua delete mode 100644 scripts/zones/Aht_Urhgan_Whitegate/npcs/Kuhmden.lua delete mode 100644 scripts/zones/Aht_Urhgan_Whitegate/npcs/Mafwahb.lua delete mode 100644 scripts/zones/Aht_Urhgan_Whitegate/npcs/Milazahn.lua delete mode 100644 scripts/zones/Aht_Urhgan_Whitegate/npcs/Mishhar.lua delete mode 100644 scripts/zones/Aht_Urhgan_Whitegate/npcs/Musdahl.lua delete mode 100644 scripts/zones/Aht_Urhgan_Whitegate/npcs/Muyadah.lua delete mode 100644 scripts/zones/Aht_Urhgan_Whitegate/npcs/Nadeey.lua delete mode 100644 scripts/zones/Aht_Urhgan_Whitegate/npcs/Nafiwaa.lua delete mode 100644 scripts/zones/Aht_Urhgan_Whitegate/npcs/Nijaom.lua delete mode 100644 scripts/zones/Aht_Urhgan_Whitegate/npcs/Nonoroon.lua delete mode 100644 scripts/zones/Aht_Urhgan_Whitegate/npcs/Prillaure.lua delete mode 100644 scripts/zones/Aht_Urhgan_Whitegate/npcs/Pursuivant.lua delete mode 100644 scripts/zones/Aht_Urhgan_Whitegate/npcs/Qahzwin.lua delete mode 100644 scripts/zones/Aht_Urhgan_Whitegate/npcs/Qulsun.lua delete mode 100644 scripts/zones/Aht_Urhgan_Whitegate/npcs/Rujen-Gorgen.lua delete mode 100644 scripts/zones/Aht_Urhgan_Whitegate/npcs/Sajahb.lua delete mode 100644 scripts/zones/Aht_Urhgan_Whitegate/npcs/Sashosho.lua delete mode 100644 scripts/zones/Aht_Urhgan_Whitegate/npcs/Shahbizu.lua delete mode 100644 scripts/zones/Aht_Urhgan_Whitegate/npcs/Somnolent_Rooster.lua delete mode 100644 scripts/zones/Aht_Urhgan_Whitegate/npcs/Tafeesa.lua delete mode 100644 scripts/zones/Aht_Urhgan_Whitegate/npcs/Talwahn.lua delete mode 100644 scripts/zones/Aht_Urhgan_Whitegate/npcs/Teteroon.lua delete mode 100644 scripts/zones/Aht_Urhgan_Whitegate/npcs/Tsih_Kolgimih.lua delete mode 100644 scripts/zones/Aht_Urhgan_Whitegate/npcs/Ubahrid.lua delete mode 100644 scripts/zones/Aht_Urhgan_Whitegate/npcs/Ugahar.lua delete mode 100644 scripts/zones/Aht_Urhgan_Whitegate/npcs/Zaranf.lua delete mode 100644 scripts/zones/Aht_Urhgan_Whitegate/npcs/Zarfhid.lua delete mode 100644 scripts/zones/Aht_Urhgan_Whitegate/npcs/Zhamwaa.lua delete mode 100644 scripts/zones/Aht_Urhgan_Whitegate/npcs/Zubyahn.lua delete mode 100644 scripts/zones/Aht_Urhgan_Whitegate/npcs/Zwinam.lua delete mode 100644 scripts/zones/Aht_Urhgan_Whitegate/npcs/Zyfhil.lua delete mode 100644 scripts/zones/Altar_Room/npcs/Hooknox.lua diff --git a/scripts/zones/Aht_Urhgan_Whitegate/DefaultActions.lua b/scripts/zones/Aht_Urhgan_Whitegate/DefaultActions.lua index 6cde61fd7e5..4e19bee0a85 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/DefaultActions.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/DefaultActions.lua @@ -1,21 +1,77 @@ local ID = zones[xi.zone.AHT_URHGAN_WHITEGATE] return { + ['Ahaadah'] = { event = 870 }, + ['Amajal'] = { event = 675 }, + ['Arzizah'] = { event = 246 }, ['Balakaf'] = { event = 515 }, + ['Bujahwa'] = { event = 683 }, + ['Burnished_Bones'] = { event = 228 }, ['Cacaroon'] = { event = 248 }, + ['Dhima_Polevhia'] = { event = 788 }, + ['Esoteric_Hound'] = { event = 229 }, + ['Fari-Wari'] = { event = 831 }, + ['Furious_Boulder'] = { event = 230 }, + ['Galzweesh'] = { event = 658 }, + ['Giehnz'] = { event = 249 }, + ['Gigirk'] = { event = 664 }, ['Hadahda'] = { event = 518 }, + ['Hajaom'] = { event = 666 }, + ['Halbeeya'] = { event = 670 }, + ['Hamnahb'] = { event = 657 }, + ['Hashayra'] = { event = 676 }, + ['Hishahma'] = { event = 571 }, ['Imperial_Whitegate'] = { messageSpecial = ID.text.GATE_IS_FIRMLY_CLOSED }, + ['Jarafah'] = { event = 702 }, + ['Jumaaf'] = { event = 243 }, + ['Kabihyam'] = { event = 245 }, + ['Kalimahf'] = { event = 680 }, + ['Kamnahb'] = { event = 677 }, + ['Kantila'] = { event = 271 }, + ['Kelsha-Melansha'] = { event = 669 }, + ['Khoi_Gamduhla'] = { event = 847 }, + ['Kuhmden'] = { event = 252 }, ['Lathuya'] = { event = 770 }, + ['Mafwahb'] = { event = 647 }, ['Mathlouq'] = { event = 543 }, ['Matifa'] = { event = 541 }, ['Maudaal'] = { event = 240 }, ['Mhasbaf'] = { event = 542 }, + ['Milazahn'] = { event = 594 }, + ['Mishhar'] = { event = 562 }, + ['Musdahl'] = { event = 242 }, ['Mushayra'] = { event = 519 }, + ['Muyadah'] = { event = 222 }, ['Nadee_Periyaha'] = { event = 90 }, + ['Nadeey'] = { event = 251 }, + ['Nafiwaa'] = { event = 661 }, + ['Nijaom'] = { event = 673 }, + ['Nonoroon'] = { event = 660 }, + ['Prillaure'] = { event = 503 }, + ['Pursuivant'] = { event = 773 }, + ['Qahzwin'] = { event = 244 }, + ['Qulsun'] = { event = 272 }, ['Rodin-Comidin'] = { event = 665 }, + ['Rujen-Gorgen'] = { event = 667 }, + ['Sajahb'] = { event = 681 }, ['Saliyahf'] = { event = 700 }, + ['Sashosho'] = { event = 250 }, + ['Shahbizu'] = { event = 659 }, + ['Somnolent_Rooster'] = { event = 231 }, + ['Tafeesa'] = { event = 655 }, + ['Talwahn'] = { event = 656 }, ['Tehf_Kimasnahya'] = { event = 529 }, + ['Teteroon'] = { event = 671 }, ['Tohka_Telposkha'] = { event = 663 }, + ['Tsih_Kolgimih'] = { event = 807 }, + ['Ubahrid'] = { event = 672 }, + ['Ugahar'] = { event = 253 }, ['Waoud'] = { event = 61 }, ['Wazyih'] = { event = 699 }, + ['Zaranf'] = { event = 668 }, + ['Zarfhid'] = { event = 220 }, + ['Zhamwaa'] = { event = 500 }, + ['Zubyahn'] = { event = 674 }, + ['Zwinam'] = { event = 682 }, + ['Zyfhil'] = { event = 653 }, } diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Abda-Lurabda.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Abda-Lurabda.lua index 393bdfa4aa5..4cae1d5ffa5 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Abda-Lurabda.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Abda-Lurabda.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.AHT_URHGAN_WHITEGATE] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getMainJob() == xi.job.PUP then player:startEvent(648, 0, 9800, player:getGil()) @@ -18,9 +15,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 648 and bit.band(option, 0x80000000) ~= 0 then player:delGil(9800) diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Abquhbah.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Abquhbah.lua index 23f5696428e..01d994505c1 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Abquhbah.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Abquhbah.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local promotion = player:getCharVar('AssaultPromotion') local rank = 0 @@ -27,10 +24,4 @@ entity.onTrigger = function(player, npc) player:startEvent(255, rank) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Ahaadah.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Ahaadah.lua deleted file mode 100644 index 50ee5e1b3b8..00000000000 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Ahaadah.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Aht Urhgan Whitegate --- NPC: Ahaadah --- !pos -70 -6 105 50 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(870) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Amajal.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Amajal.lua deleted file mode 100644 index 33086b4ea38..00000000000 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Amajal.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Aht Urhgan Whitegate --- NPC: Amajal ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(675) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Arzizah.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Arzizah.lua deleted file mode 100644 index 56c19372ad8..00000000000 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Arzizah.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Aht Urhgan Whitegate --- NPC: Arzizah ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(246) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Asrahd.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Asrahd.lua index 66af8ca0cfc..db6627deac2 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Asrahd.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Asrahd.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.besieged.onTrigger(player, npc, 630) end diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Atiza.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Atiza.lua index 80e8db7200f..039aeec6fd4 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Atiza.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Atiza.lua @@ -7,16 +7,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(223, player:getGil(), 100) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 223 and option == 333 then player:delGil(100) diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Auction_Counter.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Auction_Counter.lua index 0f274e05bcd..0df005288b2 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Auction_Counter.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Auction_Counter.lua @@ -5,17 +5,8 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:sendMenu(xi.menuType.AUCTION) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Bajahb.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Bajahb.lua index 28c04a9bc9a..bedb043ce9b 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Bajahb.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Bajahb.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.AHT_URHGAN_WHITEGATE] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -24,10 +21,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/Aht_Urhgan_Whitegate/npcs/Baya_Hiramayuh.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Baya_Hiramayuh.lua index 5216f5c0356..11734401b80 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Baya_Hiramayuh.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Baya_Hiramayuh.lua @@ -6,17 +6,8 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.transport.onDockTimekeeperTrigger(player, 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/Aht_Urhgan_Whitegate/npcs/Bhoy_Yhupplo.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Bhoy_Yhupplo.lua index f2a0bf6a9d3..50c2eff1186 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Bhoy_Yhupplo.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Bhoy_Yhupplo.lua @@ -24,9 +24,6 @@ local items = [13] = { itemid = xi.item.CIPHER_OF_MNEJINGS_ALTER_EGO, price = 3000 }, } -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local rank = xi.besieged.getMercenaryRank(player) local haveimperialIDtag = player:hasKeyItem(xi.ki.IMPERIAL_ARMY_ID_TAG) and 1 or 0 diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Bujahwa.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Bujahwa.lua deleted file mode 100644 index 5b373fb5ae3..00000000000 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Bujahwa.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Aht Urhgan Whitegate --- NPC: Bujahwa ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(683) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Burnished_Bones.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Burnished_Bones.lua deleted file mode 100644 index 7ecb02a8069..00000000000 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Burnished_Bones.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Aht Urhgan Whitegate --- NPC: Burnished Bones ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(228) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Dhima_Polevhia.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Dhima_Polevhia.lua deleted file mode 100644 index baa20783270..00000000000 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Dhima_Polevhia.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Aht Urhgan Whitegate --- NPC: Dhima Polevhia ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(788) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Drahbah.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Drahbah.lua index 2876fe39f30..54e4fffe987 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Drahbah.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Drahbah.lua @@ -15,9 +15,6 @@ entity.onTrigger = function(player, npc) player:startEvent(678, 500) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.appraisal.appraisalOnEventFinish(player, csid, option, 500, 679, npc) end diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Dwago.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Dwago.lua index af83519e815..c6d98b0b726 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Dwago.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Dwago.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.AHT_URHGAN_WHITEGATE] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -24,10 +21,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/Aht_Urhgan_Whitegate/npcs/Esoteric_Hound.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Esoteric_Hound.lua deleted file mode 100644 index e95e2c787be..00000000000 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Esoteric_Hound.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Aht Urhgan Whitegate --- NPC: Esoteric Hound ------------------------------------ ----@type TNpcEntity -local entity = {} - -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/Aht_Urhgan_Whitegate/npcs/Famad.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Famad.lua index c7681eb1703..609a0ffe600 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Famad.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Famad.lua @@ -24,9 +24,6 @@ local items = [13] = { itemid = xi.item.CIPHER_OF_MNEJINGS_ALTER_EGO, price = 3000 }, } -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local rank = xi.besieged.getMercenaryRank(player) local haveimperialIDtag = player:hasKeyItem(xi.ki.IMPERIAL_ARMY_ID_TAG) and 1 or 0 diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Fari-Wari.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Fari-Wari.lua deleted file mode 100644 index 1a4283016c8..00000000000 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Fari-Wari.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Aht Urhgan Whitegate --- NPC: Fari-Wari ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(831) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Fayeewah.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Fayeewah.lua index f7ed149b7be..64f6c8ccaf1 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Fayeewah.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Fayeewah.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.AHT_URHGAN_WHITEGATE] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -21,10 +18,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/Aht_Urhgan_Whitegate/npcs/Fubruhn.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Fubruhn.lua index 3a939c4151c..8b8cd864f6b 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Fubruhn.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Fubruhn.lua @@ -82,10 +82,6 @@ entity.onTrade = function(player, npc, trade) end entity.onTrigger = function(player, npc) - -- TODO: Check if they are >= Mission 2 - -- if < mission 2 then - -- player:startEvent(600) - -- else if player:getCurrentMission(xi.mission.log_id.TOAU) >= xi.mission.id.toau.PRESIDENT_SALAHEEM then local accessType = xi.moghouse.getMogLockerAccessType(player) local mogLockerExpiryTimestamp = xi.moghouse.getMogLockerExpiryTimestamp(player) @@ -103,9 +99,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 600 and option == 3 then local accessType = player:getCharVar(xi.moghouse.MOGLOCKER_PLAYERVAR_ACCESS_TYPE) diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Furious_Boulder.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Furious_Boulder.lua deleted file mode 100644 index cbbbe41c74d..00000000000 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Furious_Boulder.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Aht Urhgan Whitegate --- NPC: Furious Boulder ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(230) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Galzweesh.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Galzweesh.lua deleted file mode 100644 index cf1f7c042db..00000000000 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Galzweesh.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Aht Urhgan Whitegate --- NPC: Galzweesh ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(658) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Gathweeda.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Gathweeda.lua index ddf488a96d8..b978742e011 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Gathweeda.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Gathweeda.lua @@ -9,19 +9,10 @@ local ID = zones[xi.zone.AHT_URHGAN_WHITEGATE] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:sendGuild(60425, 8, 23, 5) then player:showText(npc, ID.text.GATHWEEDA_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/Aht_Urhgan_Whitegate/npcs/Gavrie.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Gavrie.lua index a4b6a889a72..7e142bce6dc 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Gavrie.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Gavrie.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.AHT_URHGAN_WHITEGATE] ---@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/Aht_Urhgan_Whitegate/npcs/Ghanraam.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Ghanraam.lua index 74eee06c542..b22eac0ec48 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Ghanraam.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Ghanraam.lua @@ -7,17 +7,8 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(893) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Giehnz.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Giehnz.lua deleted file mode 100644 index 9b24cb3078a..00000000000 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Giehnz.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Aht Urhgan Whitegate --- NPC: Giehnz ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(249) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Gigirk.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Gigirk.lua deleted file mode 100644 index b7e8f38a521..00000000000 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Gigirk.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Aht Urhgan Whitegate --- NPC: Gigirk ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(664) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Hadayah.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Hadayah.lua index 8ae30a8765e..6c8c2186b29 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Hadayah.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Hadayah.lua @@ -7,16 +7,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.crafting.ahtUhrganImageSupportOnTrigger(player, npc) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.crafting.ahtUhrganImageSupportOnEventFinish(player, csid, option, npc) end diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Hagakoff.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Hagakoff.lua index 26844e173d1..3cac7e6d273 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Hagakoff.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Hagakoff.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.AHT_URHGAN_WHITEGATE] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -38,10 +35,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/Aht_Urhgan_Whitegate/npcs/Hajaom.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Hajaom.lua deleted file mode 100644 index 53f46b1dd21..00000000000 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Hajaom.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Aht Urhgan Whitegate --- NPC: Hajaom ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(666) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Halbeeya.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Halbeeya.lua deleted file mode 100644 index 25b7d189778..00000000000 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Halbeeya.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Aht Urhgan Whitegate --- NPC: Halbeeya ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(670) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Hamnahb.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Hamnahb.lua deleted file mode 100644 index 8f9e300843d..00000000000 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Hamnahb.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Aht Urhgan Whitegate --- NPC: Hamnahb ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(657) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Hashayra.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Hashayra.lua index d6042c63af5..13934833786 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Hashayra.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Hashayra.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(676) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Hishahma.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Hishahma.lua deleted file mode 100644 index 8408f7d2f97..00000000000 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Hishahma.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Aht Urhgan Whitegate --- NPC: Hishahma ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(571) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Hunt_Registry.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Hunt_Registry.lua index 42d12b4f9b9..67e40d52fd5 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Hunt_Registry.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/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/Aht_Urhgan_Whitegate/npcs/Imperial_Whitegate.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Imperial_Whitegate.lua index 705310dfe03..5c1421d61e1 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Imperial_Whitegate.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Imperial_Whitegate.lua @@ -8,9 +8,6 @@ local whitegateShared = require('scripts/zones/Aht_Urhgan_Whitegate/Shared') ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local noWeapons = player:getEquipID(xi.slot.MAIN) == 0 and player:getEquipID(xi.slot.SUB) == 0 diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Ironbound_Gate.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Ironbound_Gate.lua index a1a3a3399cf..3a1d6dfc2d4 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Ironbound_Gate.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Ironbound_Gate.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local xPos = player:getXPos() local zPos = player:getZPos() @@ -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 == 131 and option == 1 then player:setPos(690, -18.5, 220, 128, 51) --> Wajaom Woodlands, at northeastern tower diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Iruki-Waraki.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Iruki-Waraki.lua index adc9c383ab0..71c693b37ab 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Iruki-Waraki.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Iruki-Waraki.lua @@ -85,9 +85,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 774 then player:setCharVar('TheWaywardAutomatonProgress', 1) diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Isdebaaq.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Isdebaaq.lua index fa19512bf3a..35e1981aa2c 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Isdebaaq.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Isdebaaq.lua @@ -24,9 +24,6 @@ local items = [13] = { itemid = xi.item.CIPHER_OF_MNEJINGS_ALTER_EGO, price = 3000 }, } -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local rank = xi.besieged.getMercenaryRank(player) local haveimperialIDtag = player:hasKeyItem(xi.ki.IMPERIAL_ARMY_ID_TAG) and 1 or 0 diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Jarafah.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Jarafah.lua deleted file mode 100644 index 1dc2f35c23d..00000000000 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Jarafah.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Aht Urhgan Whitegate --- NPC: Jarafah ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(702) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Jumaaf.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Jumaaf.lua deleted file mode 100644 index 273bddaae84..00000000000 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Jumaaf.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Aht Urhgan Whitegate --- NPC: Jumaaf ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(243) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Kabihyam.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Kabihyam.lua deleted file mode 100644 index c19090d0290..00000000000 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Kabihyam.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Aht Urhgan Whitegate --- NPC: Kabihyam ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(245) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Kaduru-Haiduru.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Kaduru-Haiduru.lua index 2a803a0dca7..9ce5c8ed1ed 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Kaduru-Haiduru.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Kaduru-Haiduru.lua @@ -68,9 +68,6 @@ entity.onTrade = function(player, npc, trade) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) local timesUsed = player:getCharVar('Kaduru_TimesUsed') if csid == 154 then -- At this point we should already have used Kaduru-Haiduru 3 times. diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Kalimahf.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Kalimahf.lua deleted file mode 100644 index 7349767ce9d..00000000000 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Kalimahf.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Aht Urhgan Whitegate --- NPC: Kalimahf ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(680) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Kamnahb.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Kamnahb.lua deleted file mode 100644 index 427df4ac7ec..00000000000 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Kamnahb.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Aht Urhgan Whitegate --- NPC: Kamnahb ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(677) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Kantila.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Kantila.lua deleted file mode 100644 index 110be32fab6..00000000000 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Kantila.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Aht Urhgan Whitegate --- NPC: Kantila ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(271) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Kazween.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Kazween.lua index 78342a828a1..6f741ac15a1 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Kazween.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Kazween.lua @@ -9,18 +9,9 @@ local ID = zones[xi.zone.AHT_URHGAN_WHITEGATE] ---@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/Aht_Urhgan_Whitegate/npcs/Kelsha-Melansha.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Kelsha-Melansha.lua deleted file mode 100644 index 0d10939c953..00000000000 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Kelsha-Melansha.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Aht Urhgan Whitegate --- NPC: Kelsha-Melansha ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(669) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Kemha_Flasehp.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Kemha_Flasehp.lua index dc1dd9af752..8042d62ea0c 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Kemha_Flasehp.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Kemha_Flasehp.lua @@ -15,9 +15,6 @@ entity.onTrigger = function(player, npc) xi.crafting.ahtUhrganImageSupportOnTrigger(player, npc) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.crafting.ahtUhrganImageSupportOnEventFinish(player, csid, option, npc) end diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Khaf_Jhifanm.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Khaf_Jhifanm.lua index b6b15cf3a0f..1c83af6d3de 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Khaf_Jhifanm.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Khaf_Jhifanm.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.AHT_URHGAN_WHITEGATE] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -25,10 +22,4 @@ entity.onTrigger = function(player, npc) xi.shop.general(player, stock) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Khoi_Gamduhla.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Khoi_Gamduhla.lua deleted file mode 100644 index c527b52a166..00000000000 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Khoi_Gamduhla.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Aht Urhgan Whitegate --- NPC: Khoi Gamduhla ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(847) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Koyol-Futenol.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Koyol-Futenol.lua index f2907256a45..8bce762f036 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Koyol-Futenol.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Koyol-Futenol.lua @@ -108,16 +108,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/Aht_Urhgan_Whitegate/npcs/Kuhmden.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Kuhmden.lua deleted file mode 100644 index 40a8d3ba608..00000000000 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Kuhmden.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Aht Urhgan Whitegate --- NPC: Kuhmden ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(252) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Kuhn_Tsahnpri.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Kuhn_Tsahnpri.lua index bf0dfd4bce0..9d25601686f 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Kuhn_Tsahnpri.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Kuhn_Tsahnpri.lua @@ -6,17 +6,8 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.transport.onDockTimekeeperTrigger(player, 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/Aht_Urhgan_Whitegate/npcs/Kulh_Amariyo.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Kulh_Amariyo.lua index fda9d1f4299..294e8c1f5ae 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Kulh_Amariyo.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Kulh_Amariyo.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.AHT_URHGAN_WHITEGATE] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -26,10 +23,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/Aht_Urhgan_Whitegate/npcs/Lageegee.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Lageegee.lua index 60578e5f869..25939bbcdbe 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Lageegee.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Lageegee.lua @@ -24,9 +24,6 @@ local items = [13] = { itemid = xi.item.CIPHER_OF_MNEJINGS_ALTER_EGO, price = 3000 }, } -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local rank = xi.besieged.getMercenaryRank(player) local haveimperialIDtag = player:hasKeyItem(xi.ki.IMPERIAL_ARMY_ID_TAG) and 1 or 0 diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Mafwahb.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Mafwahb.lua deleted file mode 100644 index 6c776ca2274..00000000000 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Mafwahb.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Aht Urhgan Whitegate --- NPC: Mafwahb ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(647) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Malfud.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Malfud.lua index 10621c4666a..6d37ff7726d 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Malfud.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Malfud.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.AHT_URHGAN_WHITEGATE] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -25,10 +22,4 @@ entity.onTrigger = function(player, npc) xi.shop.general(player, stock) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Mariyaam.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Mariyaam.lua index 0537dc41e99..d2b04f842bf 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Mariyaam.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Mariyaam.lua @@ -9,18 +9,9 @@ local ID = zones[xi.zone.AHT_URHGAN_WHITEGATE] ---@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/Aht_Urhgan_Whitegate/npcs/Mazween.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Mazween.lua index bf6894cc676..488d98e4ee7 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Mazween.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Mazween.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.AHT_URHGAN_WHITEGATE] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -35,10 +32,4 @@ entity.onTrigger = function(player, npc) xi.shop.general(player, stock) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Milazahn.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Milazahn.lua deleted file mode 100644 index 6ca1ec76491..00000000000 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Milazahn.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Aht Urhgan Whitegate --- NPC: Milazahn ------------------------------------ ----@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/Aht_Urhgan_Whitegate/npcs/Mishhar.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Mishhar.lua deleted file mode 100644 index 6ba8151451c..00000000000 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Mishhar.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Aht Urhgan Whitegate --- NPC: Mishhar ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(562) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Mulnith.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Mulnith.lua index 254dc29fe45..749e960f923 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Mulnith.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Mulnith.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.AHT_URHGAN_WHITEGATE] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -24,10 +21,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/Aht_Urhgan_Whitegate/npcs/Musdahl.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Musdahl.lua deleted file mode 100644 index 162c643da3b..00000000000 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Musdahl.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Aht Urhgan Whitegate --- NPC: Musdahl ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(242) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Muyadah.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Muyadah.lua deleted file mode 100644 index e3d2caa5468..00000000000 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Muyadah.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Aht Urhgan Whitegate --- NPC: Muyadah ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(222) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Nadeey.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Nadeey.lua deleted file mode 100644 index f6699249967..00000000000 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Nadeey.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Aht Urhgan Whitegate --- NPC: Nadeey ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(251) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Nafiwaa.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Nafiwaa.lua deleted file mode 100644 index 61fa2ca5f1a..00000000000 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Nafiwaa.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Aht Urhgan Whitegate --- NPC: Nafiwaa ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(661) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Naja_Salaheem.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Naja_Salaheem.lua index b169e533bda..ff90c9ab31b 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Naja_Salaheem.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Naja_Salaheem.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.AHT_URHGAN_WHITEGATE] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getCurrentMission(xi.mission.log_id.TOAU) == xi.mission.id.toau.IMPERIAL_CORONATION then player:startEvent(3150, 0, 0, 0, 0, 0, 0, 0, 0, 0) @@ -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 == 3144 then player:completeMission(xi.mission.log_id.TOAU, xi.mission.id.toau.THE_EMPRESS_CROWNED) diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Nijaom.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Nijaom.lua deleted file mode 100644 index 18e3c0b573f..00000000000 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Nijaom.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Aht Urhgan Whitegate --- NPC: Nijaom ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(673) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Nonoroon.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Nonoroon.lua deleted file mode 100644 index de05a55b424..00000000000 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Nonoroon.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Aht Urhgan Whitegate --- NPC: Nonoroon ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(660) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Prillaure.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Prillaure.lua deleted file mode 100644 index 61e70d57d5a..00000000000 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Prillaure.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Aht Urhgan Whitegate --- NPC: Prillaure --- Type: Event Scene Replayer --- !pos -143.000 0.999 9.000 50 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(503) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Pursuivant.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Pursuivant.lua deleted file mode 100644 index cd61f66601d..00000000000 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Pursuivant.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Aht Urhgan Whitegate --- NPC: Pursuivant ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(773) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Qahzwin.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Qahzwin.lua deleted file mode 100644 index 715056fa748..00000000000 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Qahzwin.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Aht Urhgan Whitegate --- NPC: Qahzwin ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(244) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Qulsun.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Qulsun.lua deleted file mode 100644 index 5b4e6a05516..00000000000 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Qulsun.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Aht Urhgan Whitegate --- NPC: Qulsun ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(272) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Ratihb.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Ratihb.lua index fe46cf70b86..c810fa594c0 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Ratihb.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Ratihb.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getCharVar('AgainstAllOdds') == 2 and @@ -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 npcUtil.giveKeyItem(player, xi.ki.LIFE_FLOAT) diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Riyadahf.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Riyadahf.lua index f21c3fa27ff..706fac6aed0 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Riyadahf.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Riyadahf.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/Aht_Urhgan_Whitegate/npcs/Rubahah.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Rubahah.lua index 4e3c40f7e38..9202827d58a 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Rubahah.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Rubahah.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.AHT_URHGAN_WHITEGATE] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -25,10 +22,4 @@ entity.onTrigger = function(player, npc) xi.shop.general(player, stock) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Rujen-Gorgen.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Rujen-Gorgen.lua deleted file mode 100644 index c0a8c2e63ef..00000000000 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Rujen-Gorgen.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Aht Urhgan Whitegate --- NPC: Rujen-Gorgen ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(667) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Runic_Portal.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Runic_Portal.lua index 0a649002892..2340b9b8e5b 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Runic_Portal.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Runic_Portal.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.AHT_URHGAN_WHITEGATE] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local runicPortals = player:getTeleport(xi.teleport.type.RUNIC_PORTAL) local assaultOrders = @@ -54,9 +51,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) local portalPick = { diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Rytaal.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Rytaal.lua index df363101558..d969bc046a9 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Rytaal.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Rytaal.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.AHT_URHGAN_WHITEGATE] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local currentAssault = player:getCurrentAssault() @@ -97,9 +94,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) local tagStock = player:getCurrency('id_tags') diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Sajaaya.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Sajaaya.lua index f66e106a6a0..7f40cd98bd0 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Sajaaya.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Sajaaya.lua @@ -6,17 +6,8 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(502, 0, 0, 0, 0, 0, 0, 0, VanadielTime()) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Sajahb.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Sajahb.lua deleted file mode 100644 index f47061ca08a..00000000000 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Sajahb.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Aht Urhgan Whitegate --- NPC: Sajahb ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(681) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Saluhwa.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Saluhwa.lua index f95f651d1b6..025dc6bf72b 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Saluhwa.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Saluhwa.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.AHT_URHGAN_WHITEGATE] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -26,10 +23,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/Aht_Urhgan_Whitegate/npcs/Sashosho.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Sashosho.lua deleted file mode 100644 index d4b0d94992a..00000000000 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Sashosho.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Aht Urhgan Whitegate --- NPC: Sashosho ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(250) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Shahau.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Shahau.lua index ffca3fd8615..8c04571b837 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Shahau.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Shahau.lua @@ -7,16 +7,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.crafting.ahtUhrganImageSupportOnTrigger(player, npc) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.crafting.ahtUhrganImageSupportOnEventFinish(player, csid, option, npc) end diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Shahbizu.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Shahbizu.lua deleted file mode 100644 index d4f2ea02751..00000000000 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Shahbizu.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Aht Urhgan Whitegate --- NPC: Shahbizu ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(659) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Shajaf.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Shajaf.lua index 3504554f2dc..7ff475b2370 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Shajaf.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Shajaf.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local imperialStanding = player:getCurrency('imperial_standing') @@ -32,9 +29,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) local imperialStanding = player:getCurrency('imperial_standing') diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Sharin-Garin.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Sharin-Garin.lua index 433a1f378aa..771662ee4c5 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Sharin-Garin.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Sharin-Garin.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local mercRank = xi.besieged.getMercenaryRank(player) local hasPermit = player:hasKeyItem(xi.ki.RUNIC_PORTAL_USE_PERMIT) and 1 or 0 @@ -21,9 +18,6 @@ entity.onTrigger = function(player, npc) player:startEvent(140, 0, mercRank, hasPermit, points, hasAstral, cost, captain) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 140 and diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Somnolent_Rooster.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Somnolent_Rooster.lua deleted file mode 100644 index 108f4250fd8..00000000000 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Somnolent_Rooster.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Aht Urhgan Whitegate --- NPC: Somnolent Rooster ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(231) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Sorrowful_Sage.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Sorrowful_Sage.lua index 29b7b74c810..5ca2cc18617 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Sorrowful_Sage.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Sorrowful_Sage.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.AHT_URHGAN_WHITEGATE] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) -- local rank = xi.besieged.getMercenaryRank(player) -- local haveimperialIDtag diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Sulbahn.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Sulbahn.lua index 71121b39e19..b6efd6bb1ab 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Sulbahn.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Sulbahn.lua @@ -15,9 +15,6 @@ entity.onTrigger = function(player, npc) xi.crafting.ahtUhrganImageSupportOnTrigger(player, npc) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.crafting.ahtUhrganImageSupportOnEventFinish(player, csid, option, npc) end diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Symphonic_Curator.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Symphonic_Curator.lua index 1f207df2bd3..78532bbf338 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Symphonic_Curator.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/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/Aht_Urhgan_Whitegate/npcs/Tafeesa.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Tafeesa.lua deleted file mode 100644 index 18cb776e5e4..00000000000 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Tafeesa.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Aht Urhgan Whitegate --- NPC: Tafeesa ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(655) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Talwahn.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Talwahn.lua deleted file mode 100644 index 28b940d1c99..00000000000 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Talwahn.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Aht Urhgan Whitegate --- NPC: Talwahn ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(656) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Tateeya.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Tateeya.lua index f7a3a459fa7..228a27ebe3c 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Tateeya.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Tateeya.lua @@ -45,9 +45,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 == 650 then --unlocking attachments explanation player:setCharVar('TateeyaTradeStatus', 1) diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Tazhaal.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Tazhaal.lua index 5fd2966e63f..fd3b35b72fa 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Tazhaal.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Tazhaal.lua @@ -7,16 +7,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(221, player:getGil(), 100) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 221 and option == 333 then player:delGil(100) diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Teteroon.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Teteroon.lua deleted file mode 100644 index 304aae90641..00000000000 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Teteroon.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Aht Urhgan Whitegate --- NPC: Teteroon ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(671) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Tsih_Kolgimih.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Tsih_Kolgimih.lua deleted file mode 100644 index 3ad8d3d68d6..00000000000 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Tsih_Kolgimih.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Aht Urhgan Whitegate --- NPC: Tsih Kolgimih --- Type: Event Scene Replayer --- !pos -143.000 0.999 11.000 50 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(807) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Ubahrid.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Ubahrid.lua deleted file mode 100644 index 98eb92e2aaf..00000000000 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Ubahrid.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Aht Urhgan Whitegate --- NPC: Ubahrid ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(672) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Ugahar.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Ugahar.lua deleted file mode 100644 index 229044250c2..00000000000 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Ugahar.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Aht Urhgan Whitegate --- NPC: Ugahar ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(253) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Ugrihd.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Ugrihd.lua index b9747f47aa4..a8fc19008be 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Ugrihd.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Ugrihd.lua @@ -33,9 +33,6 @@ local ImperialPieces = } } -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local points = player:getCurrency('imperial_standing') local rank = xi.besieged.getMercenaryRank(player) @@ -47,9 +44,6 @@ entity.onTrigger = function(player, npc) player:startEvent(150, rank, badge, points, 0, 0, 0, 0, 0, 0) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 150 and option < 0x40000000 and option > 255 then local coinType = bit.band(option, 0xFF) diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Wahnid.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Wahnid.lua index 94e9c166e1a..19a504fed5e 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Wahnid.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Wahnid.lua @@ -9,19 +9,10 @@ local ID = zones[xi.zone.AHT_URHGAN_WHITEGATE] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:sendGuild(60426, 1, 18, 6) then player:showText(npc, ID.text.WAHNID_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/Aht_Urhgan_Whitegate/npcs/Wahraga.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Wahraga.lua index 4a1c75f657f..36a94d897ba 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Wahraga.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Wahraga.lua @@ -9,19 +9,10 @@ local ID = zones[xi.zone.AHT_URHGAN_WHITEGATE] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:sendGuild(60425, 8, 23, 5) then player:showText(npc, ID.text.WAHRAGA_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/Aht_Urhgan_Whitegate/npcs/Yafaaf.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Yafaaf.lua index 1d3b85d1f15..b7f35a1c704 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Yafaaf.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Yafaaf.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.AHT_URHGAN_WHITEGATE] ---@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/Aht_Urhgan_Whitegate/npcs/Yahsra.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Yahsra.lua index 8d8cf6f7bf2..2a628937dfc 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Yahsra.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Yahsra.lua @@ -24,9 +24,6 @@ local items = [13] = { itemid = xi.item.CIPHER_OF_MNEJINGS_ALTER_EGO, price = 3000 }, } -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local rank = xi.besieged.getMercenaryRank(player) local haveimperialIDtag = player:hasKeyItem(xi.ki.IMPERIAL_ARMY_ID_TAG) and 1 or 0 diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Zaranf.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Zaranf.lua deleted file mode 100644 index b62c336caf3..00000000000 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Zaranf.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Aht Urhgan Whitegate --- NPC: Zaranf ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(668) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Zarfhid.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Zarfhid.lua deleted file mode 100644 index 424835a2d89..00000000000 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Zarfhid.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Aht Urhgan Whitegate --- NPC: Zarfhid ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(220) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Zasshal.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Zasshal.lua index d44115c9a03..d3ebce7677d 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Zasshal.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Zasshal.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) -- local currentday = tonumber(os.date('%j')) -- local lastPermit = player:getCharVar('LAST_PERMIT') diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Zhamwaa.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Zhamwaa.lua deleted file mode 100644 index 9c8428b61a9..00000000000 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Zhamwaa.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Aht Urhgan Whitegate --- NPC: Zhamwaa ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(500) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Zubyahn.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Zubyahn.lua deleted file mode 100644 index b3004f63e1c..00000000000 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Zubyahn.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Aht Urhgan Whitegate --- NPC: Zubyahn ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(674) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Zwinam.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Zwinam.lua deleted file mode 100644 index 662bfab8b27..00000000000 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Zwinam.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Aht Urhgan Whitegate --- NPC: Zwinam ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(682) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Zyfhil.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Zyfhil.lua deleted file mode 100644 index aad009a5ea8..00000000000 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Zyfhil.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Aht Urhgan Whitegate --- NPC: Zyfhil ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(653) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/_1e1.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/_1e1.lua index 1a06def52a5..7fd1e8fd86c 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/_1e1.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/_1e1.lua @@ -6,17 +6,8 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) npc:openDoor() end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/_1e6.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/_1e6.lua index 64d6139a981..ef755132296 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/_1e6.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/_1e6.lua @@ -5,17 +5,8 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(70) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/_1e8.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/_1e8.lua index 64d6139a981..ef755132296 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/_1e8.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/_1e8.lua @@ -5,17 +5,8 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(70) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/_1e9.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/_1e9.lua index 00cd83d5bf4..d7e5dde69aa 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/_1e9.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/_1e9.lua @@ -7,16 +7,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(133) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 133 and option == 1 then player:setPos(-600, 0, 40, 254, 71) diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/_1ee.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/_1ee.lua index 1249d8816b6..919d53022bd 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/_1ee.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/_1ee.lua @@ -5,17 +5,8 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) -- player:startEvent(70) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/AlTaieu/npcs/Auroral_Updraft.lua b/scripts/zones/AlTaieu/npcs/Auroral_Updraft.lua index 2d75c3a4027..49100e71eed 100644 --- a/scripts/zones/AlTaieu/npcs/Auroral_Updraft.lua +++ b/scripts/zones/AlTaieu/npcs/Auroral_Updraft.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.ALTAIEU] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local offset = npc:getID() - ID.npc.AURORAL_UPDRAFT_OFFSET if offset == 0 then @@ -19,9 +16,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 155 and option == 1 then player:setPos(-25, -1 , -620 , 208 , 33) diff --git a/scripts/zones/AlTaieu/npcs/Dimensional_Portal.lua b/scripts/zones/AlTaieu/npcs/Dimensional_Portal.lua index 824a08432d6..1609272dd32 100644 --- a/scripts/zones/AlTaieu/npcs/Dimensional_Portal.lua +++ b/scripts/zones/AlTaieu/npcs/Dimensional_Portal.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.ALTAIEU] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local offset = npc:getID() - ID.npc.DIMENSIONAL_PORTAL_OFFSET if offset >= 0 and offset <= 2 then @@ -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 == 151 and option == 1 then player:setPos(420, 19, -140, 63, 102) -- To La Theine Plateau (R) diff --git a/scripts/zones/AlTaieu/npcs/Swirling_Vortex.lua b/scripts/zones/AlTaieu/npcs/Swirling_Vortex.lua index 33a0676bba9..372c37d2fc5 100644 --- a/scripts/zones/AlTaieu/npcs/Swirling_Vortex.lua +++ b/scripts/zones/AlTaieu/npcs/Swirling_Vortex.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.ALTAIEU] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local offset = npc:getID() - ID.npc.SWIRLING_VORTEX_OFFSET if offset >= 0 and offset <= 1 then @@ -18,9 +15,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 160 and option == 1 then xi.limbus.enter(player, 1) diff --git a/scripts/zones/AlTaieu/npcs/qm_jailer_of_hope.lua b/scripts/zones/AlTaieu/npcs/qm_jailer_of_hope.lua index dba056b7e09..723ed4e66bd 100644 --- a/scripts/zones/AlTaieu/npcs/qm_jailer_of_hope.lua +++ b/scripts/zones/AlTaieu/npcs/qm_jailer_of_hope.lua @@ -23,13 +23,4 @@ entity.onTrade = function(player, npc, trade) end end -entity.onTrigger = function(player, npc) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/AlTaieu/npcs/qm_jailer_of_justice.lua b/scripts/zones/AlTaieu/npcs/qm_jailer_of_justice.lua index 1f923e321d5..1035c160625 100644 --- a/scripts/zones/AlTaieu/npcs/qm_jailer_of_justice.lua +++ b/scripts/zones/AlTaieu/npcs/qm_jailer_of_justice.lua @@ -23,13 +23,4 @@ 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/AlTaieu/npcs/qm_jailer_of_love.lua b/scripts/zones/AlTaieu/npcs/qm_jailer_of_love.lua index fc84f5e2a82..60936814375 100644 --- a/scripts/zones/AlTaieu/npcs/qm_jailer_of_love.lua +++ b/scripts/zones/AlTaieu/npcs/qm_jailer_of_love.lua @@ -25,13 +25,4 @@ 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/AlTaieu/npcs/qm_jailer_of_prudence.lua b/scripts/zones/AlTaieu/npcs/qm_jailer_of_prudence.lua index d0e9ff296c3..e1dce14d6e8 100644 --- a/scripts/zones/AlTaieu/npcs/qm_jailer_of_prudence.lua +++ b/scripts/zones/AlTaieu/npcs/qm_jailer_of_prudence.lua @@ -25,13 +25,4 @@ entity.onTrade = function(player, npc, trade) end end -entity.onTrigger = function(player, npc) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Altar_Room/DefaultActions.lua b/scripts/zones/Altar_Room/DefaultActions.lua index 23b68e387f9..e46d0dd451a 100644 --- a/scripts/zones/Altar_Room/DefaultActions.lua +++ b/scripts/zones/Altar_Room/DefaultActions.lua @@ -1,5 +1,6 @@ local ID = zones[xi.zone.ALTAR_ROOM] return { + ['Hooknox'] = { event = 46 }, ['Magicite'] = { messageSpecial = ID.text.THE_MAGICITE_GLOWS_OMINOUSLY }, } diff --git a/scripts/zones/Altar_Room/npcs/Hooknox.lua b/scripts/zones/Altar_Room/npcs/Hooknox.lua deleted file mode 100644 index c261d118563..00000000000 --- a/scripts/zones/Altar_Room/npcs/Hooknox.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Altar Room --- NPC: Hooknox --- !pos -265.248 11.693 -102.547 152 ------------------------------------ ----@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/Altar_Room/npcs/Stone_Lid.lua b/scripts/zones/Altar_Room/npcs/Stone_Lid.lua index 6596497fe29..0a692679362 100644 --- a/scripts/zones/Altar_Room/npcs/Stone_Lid.lua +++ b/scripts/zones/Altar_Room/npcs/Stone_Lid.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 == 48 then local mobs = diff --git a/scripts/zones/Alzadaal_Undersea_Ruins/npcs/Runic_Portal.lua b/scripts/zones/Alzadaal_Undersea_Ruins/npcs/Runic_Portal.lua index d43f92c8ca2..e886ad014f4 100644 --- a/scripts/zones/Alzadaal_Undersea_Ruins/npcs/Runic_Portal.lua +++ b/scripts/zones/Alzadaal_Undersea_Ruins/npcs/Runic_Portal.lua @@ -10,9 +10,6 @@ local ID = zones[xi.zone.ALZADAAL_UNDERSEA_RUINS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local npcid = npc:getID() local event = nil @@ -35,9 +32,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if option == 1 then if csid == 121 or csid == 122 then diff --git a/scripts/zones/Alzadaal_Undersea_Ruins/npcs/_20c.lua b/scripts/zones/Alzadaal_Undersea_Ruins/npcs/_20c.lua index 9e9ea0dd7a7..15bfbf1068b 100644 --- a/scripts/zones/Alzadaal_Undersea_Ruins/npcs/_20c.lua +++ b/scripts/zones/Alzadaal_Undersea_Ruins/npcs/_20c.lua @@ -26,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/Alzadaal_Undersea_Ruins/npcs/_20d.lua b/scripts/zones/Alzadaal_Undersea_Ruins/npcs/_20d.lua index 6c0b70a63ab..a575b252530 100644 --- a/scripts/zones/Alzadaal_Undersea_Ruins/npcs/_20d.lua +++ b/scripts/zones/Alzadaal_Undersea_Ruins/npcs/_20d.lua @@ -26,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/Alzadaal_Undersea_Ruins/npcs/_20m.lua b/scripts/zones/Alzadaal_Undersea_Ruins/npcs/_20m.lua index 4e6d698239a..f552e471976 100644 --- a/scripts/zones/Alzadaal_Undersea_Ruins/npcs/_20m.lua +++ b/scripts/zones/Alzadaal_Undersea_Ruins/npcs/_20m.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.ALZADAAL_UNDERSEA_RUINS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if not xi.instance.onTrigger(player, npc, xi.zone.NYZUL_ISLE) then player:messageSpecial(ID.text.NOTHING_HAPPENS) diff --git a/scripts/zones/Alzadaal_Undersea_Ruins/npcs/_20t.lua b/scripts/zones/Alzadaal_Undersea_Ruins/npcs/_20t.lua index b9a7cab8f4e..8f5d1574a6e 100644 --- a/scripts/zones/Alzadaal_Undersea_Ruins/npcs/_20t.lua +++ b/scripts/zones/Alzadaal_Undersea_Ruins/npcs/_20t.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.ALZADAAL_UNDERSEA_RUINS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) -- TODO: Fix, implement & balance Remnants --[[ diff --git a/scripts/zones/Alzadaal_Undersea_Ruins/npcs/_20u.lua b/scripts/zones/Alzadaal_Undersea_Ruins/npcs/_20u.lua index 7d2706810b3..548d91c7ee3 100644 --- a/scripts/zones/Alzadaal_Undersea_Ruins/npcs/_20u.lua +++ b/scripts/zones/Alzadaal_Undersea_Ruins/npcs/_20u.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.ALZADAAL_UNDERSEA_RUINS] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) -- TODO: Fix, implement & balance Remnants --[[ From ec61391b65ee3cd7c7d8da844b83dfa5a8766421 Mon Sep 17 00:00:00 2001 From: claywar Date: Sun, 26 Jan 2025 18:40:08 -0500 Subject: [PATCH 4/4] Remove empty NPCs, add Default Actions - Abdhaljs ~ Abyssea --- .../npcs/Pursuivant.lua | 6 ----- .../zones/Abyssea-Altepa/DefaultActions.lua | 14 ++++++++++++ .../zones/Abyssea-Altepa/npcs/Bonarpant.lua | 21 ------------------ .../Abyssea-Altepa/npcs/Cavernous_Maw.lua | 6 ----- .../Abyssea-Altepa/npcs/Conflux_Surveyor.lua | 6 ----- .../Abyssea-Altepa/npcs/Cruor_Prospector.lua | 6 ----- .../Abyssea-Altepa/npcs/DSgt_Excenmille.lua | 3 --- .../zones/Abyssea-Altepa/npcs/DSgt_Nanaa.lua | 3 --- .../zones/Abyssea-Altepa/npcs/DSgt_Volker.lua | 3 --- scripts/zones/Abyssea-Altepa/npcs/Hildith.lua | 21 ------------------ .../zones/Abyssea-Altepa/npcs/Honoi-Gomoi.lua | 21 ------------------ .../zones/Abyssea-Altepa/npcs/Justinius.lua | 21 ------------------ .../Abyssea-Altepa/npcs/Mheca_Khetashipah.lua | 21 ------------------ scripts/zones/Abyssea-Altepa/npcs/Rielle.lua | 21 ------------------ .../zones/Abyssea-Altepa/npcs/Ronta-Onta.lua | 21 ------------------ .../zones/Abyssea-Altepa/npcs/Sola_Jaab.lua | 21 ------------------ .../Abyssea-Altepa/npcs/Taraihi-Perunhi.lua | 21 ------------------ .../npcs/Veridical_Conflux_#01.lua | 3 --- .../npcs/Veridical_Conflux_#02.lua | 3 --- .../npcs/Veridical_Conflux_#03.lua | 3 --- .../npcs/Veridical_Conflux_#04.lua | 3 --- .../npcs/Veridical_Conflux_#05.lua | 3 --- .../npcs/Veridical_Conflux_#06.lua | 3 --- .../npcs/Veridical_Conflux_#07.lua | 3 --- .../npcs/Veridical_Conflux_#08.lua | 3 --- .../Abyssea-Altepa/npcs/Yuhito-Kubhito.lua | 21 ------------------ .../zones/Abyssea-Altepa/npcs/qm_amarok.lua | 6 ----- .../zones/Abyssea-Altepa/npcs/qm_bennu_1.lua | 3 --- .../zones/Abyssea-Altepa/npcs/qm_bennu_2.lua | 3 --- .../zones/Abyssea-Altepa/npcs/qm_bennu_3.lua | 3 --- .../Abyssea-Altepa/npcs/qm_bugul_noz.lua | 6 ----- .../Abyssea-Altepa/npcs/qm_chickcharney.lua | 6 ----- .../zones/Abyssea-Altepa/npcs/qm_dragua_1.lua | 3 --- .../zones/Abyssea-Altepa/npcs/qm_dragua_2.lua | 3 --- .../zones/Abyssea-Altepa/npcs/qm_dragua_3.lua | 3 --- .../npcs/qm_emperador_de_altepa.lua | 6 ----- .../npcs/qm_ironclad_smiter.lua | 6 ----- .../zones/Abyssea-Altepa/npcs/qm_orthus_1.lua | 3 --- .../zones/Abyssea-Altepa/npcs/qm_orthus_2.lua | 3 --- .../zones/Abyssea-Altepa/npcs/qm_orthus_3.lua | 3 --- .../zones/Abyssea-Altepa/npcs/qm_rani_1.lua | 3 --- .../zones/Abyssea-Altepa/npcs/qm_rani_2.lua | 3 --- .../zones/Abyssea-Altepa/npcs/qm_rani_3.lua | 3 --- .../zones/Abyssea-Altepa/npcs/qm_sharabha.lua | 6 ----- .../zones/Abyssea-Altepa/npcs/qm_shaula.lua | 6 ----- .../zones/Abyssea-Altepa/npcs/qm_tablilla.lua | 6 ----- .../zones/Abyssea-Altepa/npcs/qm_vadleany.lua | 6 ----- .../zones/Abyssea-Altepa/npcs/qm_waugyl.lua | 6 ----- .../zones/Abyssea-Attohwa/DefaultActions.lua | 15 +++++++++++++ scripts/zones/Abyssea-Attohwa/npcs/Akta.lua | 21 ------------------ .../zones/Abyssea-Attohwa/npcs/Alrauverat.lua | 22 ------------------- .../Abyssea-Attohwa/npcs/Cavernous_Maw.lua | 6 ----- .../Abyssea-Attohwa/npcs/Conflux_Surveyor.lua | 6 ----- .../Abyssea-Attohwa/npcs/Cruor_Prospector.lua | 6 ----- .../zones/Abyssea-Attohwa/npcs/Gabriele.lua | 21 ------------------ .../zones/Abyssea-Attohwa/npcs/Gurdern.lua | 21 ------------------ .../Abyssea-Attohwa/npcs/Mojuro-Nojuro.lua | 21 ------------------ .../zones/Abyssea-Attohwa/npcs/Monberaux.lua | 21 ------------------ .../zones/Abyssea-Attohwa/npcs/Navisse.lua | 21 ------------------ .../zones/Abyssea-Attohwa/npcs/Rainhard.lua | 21 ------------------ .../zones/Abyssea-Attohwa/npcs/Red_Ghost.lua | 22 ------------------- .../zones/Abyssea-Attohwa/npcs/Soni-Muni.lua | 21 ------------------ .../zones/Abyssea-Attohwa/npcs/Tsugumi.lua | 21 ------------------ .../npcs/Veridical_Conflux_#00.lua | 3 --- .../npcs/Veridical_Conflux_#01.lua | 3 --- .../npcs/Veridical_Conflux_#02.lua | 3 --- .../npcs/Veridical_Conflux_#03.lua | 3 --- .../npcs/Veridical_Conflux_#04.lua | 3 --- .../npcs/Veridical_Conflux_#05.lua | 3 --- .../npcs/Veridical_Conflux_#06.lua | 3 --- .../npcs/Veridical_Conflux_#07.lua | 3 --- .../npcs/Veridical_Conflux_#08.lua | 3 --- .../zones/Abyssea-Attohwa/npcs/qm_berstuk.lua | 6 ----- .../Abyssea-Attohwa/npcs/qm_blazing_eruca.lua | 6 ----- .../Abyssea-Attohwa/npcs/qm_drekavac.lua | 6 ----- .../zones/Abyssea-Attohwa/npcs/qm_gaizkin.lua | 6 ----- .../Abyssea-Attohwa/npcs/qm_granite_borer.lua | 6 ----- .../Abyssea-Attohwa/npcs/qm_itzpapalotl_1.lua | 3 --- .../Abyssea-Attohwa/npcs/qm_itzpapalotl_2.lua | 3 --- .../Abyssea-Attohwa/npcs/qm_itzpapalotl_3.lua | 3 --- .../zones/Abyssea-Attohwa/npcs/qm_kampe.lua | 6 ----- .../zones/Abyssea-Attohwa/npcs/qm_kharon.lua | 6 ----- .../zones/Abyssea-Attohwa/npcs/qm_maahes.lua | 6 ----- .../Abyssea-Attohwa/npcs/qm_mielikki.lua | 6 ----- .../Abyssea-Attohwa/npcs/qm_nightshade.lua | 6 ----- .../Abyssea-Attohwa/npcs/qm_pallid_percy.lua | 6 ----- .../zones/Abyssea-Attohwa/npcs/qm_smok_1.lua | 3 --- .../zones/Abyssea-Attohwa/npcs/qm_smok_2.lua | 3 --- .../zones/Abyssea-Attohwa/npcs/qm_smok_3.lua | 3 --- .../Abyssea-Attohwa/npcs/qm_svarbhanu.lua | 6 ----- .../Abyssea-Attohwa/npcs/qm_titlacauan_1.lua | 3 --- .../Abyssea-Attohwa/npcs/qm_titlacauan_2.lua | 3 --- .../Abyssea-Attohwa/npcs/qm_titlacauan_3.lua | 3 --- .../Abyssea-Attohwa/npcs/qm_ulhuadshi_1.lua | 3 --- .../Abyssea-Attohwa/npcs/qm_ulhuadshi_2.lua | 3 --- .../Abyssea-Attohwa/npcs/qm_ulhuadshi_3.lua | 3 --- .../Abyssea-Attohwa/npcs/qm_wherwetrice.lua | 6 ----- .../Abyssea-Grauberg/npcs/Cavernous_Maw.lua | 6 ----- .../npcs/Conflux_Surveyor.lua | 6 ----- .../npcs/Cruor_Prospector.lua | 6 ----- .../Abyssea-Grauberg/npcs/DSgt_Cornelia.lua | 3 --- .../Abyssea-Grauberg/npcs/DSgt_Tosuka.lua | 3 --- .../Abyssea-Grauberg/npcs/DSgt_Wolfgang.lua | 3 --- .../npcs/Dominion_Sergeant.lua | 21 ------------------ .../npcs/Dominion_Tactician.lua | 3 --- .../npcs/Veridical_Conflux_#01.lua | 3 --- .../npcs/Veridical_Conflux_#02.lua | 3 --- .../npcs/Veridical_Conflux_#03.lua | 3 --- .../npcs/Veridical_Conflux_#04.lua | 3 --- .../npcs/Veridical_Conflux_#05.lua | 3 --- .../npcs/Veridical_Conflux_#06.lua | 3 --- .../npcs/Veridical_Conflux_#07.lua | 3 --- .../npcs/Veridical_Conflux_#08.lua | 3 --- .../Abyssea-Grauberg/npcs/qm_alfard_1.lua | 3 --- .../Abyssea-Grauberg/npcs/qm_alfard_2.lua | 3 --- .../Abyssea-Grauberg/npcs/qm_alfard_3.lua | 3 --- .../Abyssea-Grauberg/npcs/qm_amphitrite_1.lua | 3 --- .../Abyssea-Grauberg/npcs/qm_amphitrite_2.lua | 3 --- .../Abyssea-Grauberg/npcs/qm_amphitrite_3.lua | 3 --- .../Abyssea-Grauberg/npcs/qm_azdaja_1.lua | 3 --- .../Abyssea-Grauberg/npcs/qm_azdaja_2.lua | 3 --- .../Abyssea-Grauberg/npcs/qm_azdaja_3.lua | 3 --- .../npcs/qm_bomblix_flamefinger.lua | 6 ----- .../npcs/qm_burstrox_powderpate.lua | 6 ----- .../Abyssea-Grauberg/npcs/qm_ika_roa.lua | 6 ----- .../npcs/qm_ironclad_sunderer.lua | 6 ----- .../Abyssea-Grauberg/npcs/qm_lorelei.lua | 6 ----- .../Abyssea-Grauberg/npcs/qm_minaruja.lua | 6 ----- .../Abyssea-Grauberg/npcs/qm_ningishzida.lua | 6 ----- .../zones/Abyssea-Grauberg/npcs/qm_raja_1.lua | 3 --- .../zones/Abyssea-Grauberg/npcs/qm_raja_2.lua | 3 --- .../zones/Abyssea-Grauberg/npcs/qm_raja_3.lua | 3 --- .../npcs/qm_teekesselchen.lua | 6 ----- .../Abyssea-Grauberg/npcs/qm_teugghia.lua | 6 ----- .../Abyssea-Grauberg/npcs/qm_xibalba.lua | 6 ----- .../Abyssea-Konschtat/npcs/Cavernous_Maw.lua | 6 ----- .../npcs/Conflux_Surveyor.lua | 6 ----- .../npcs/Cruor_Prospector.lua | 6 ----- .../npcs/Veridical_Conflux_#01.lua | 3 --- .../npcs/Veridical_Conflux_#02.lua | 3 --- .../npcs/Veridical_Conflux_#03.lua | 3 --- .../npcs/Veridical_Conflux_#04.lua | 3 --- .../npcs/Veridical_Conflux_#05.lua | 3 --- .../npcs/Veridical_Conflux_#06.lua | 3 --- .../npcs/Veridical_Conflux_#07.lua | 3 --- .../npcs/Veridical_Conflux_#08.lua | 3 --- .../Abyssea-Konschtat/npcs/qm_alkonost.lua | 6 ----- .../Abyssea-Konschtat/npcs/qm_arimaspi.lua | 6 ----- .../Abyssea-Konschtat/npcs/qm_ashtaerh.lua | 6 ----- .../npcs/qm_bloodeye_vileberry.lua | 3 --- .../npcs/qm_bloodguzzler.lua | 6 ----- .../Abyssea-Konschtat/npcs/qm_bombadeel.lua | 6 ----- .../npcs/qm_clingy_clare.lua | 6 ----- .../npcs/qm_eccentric_eve.lua | 3 --- .../Abyssea-Konschtat/npcs/qm_fear_gorta.lua | 6 ----- .../Abyssea-Konschtat/npcs/qm_hexenpilz.lua | 6 ----- .../npcs/qm_keratyrannos.lua | 6 ----- .../Abyssea-Konschtat/npcs/qm_kukulkan.lua | 3 --- .../Abyssea-Konschtat/npcs/qm_lentor.lua | 6 ----- .../Abyssea-Konschtat/npcs/qm_sarcophilus.lua | 6 ----- .../npcs/qm_siranpa-kamuy.lua | 6 ----- .../Abyssea-La_Theine/npcs/Cavernous_Maw.lua | 6 ----- .../npcs/Conflux_Surveyor.lua | 6 ----- .../npcs/Cruor_Prospector.lua | 6 ----- .../npcs/Veridical_Conflux_#01.lua | 3 --- .../npcs/Veridical_Conflux_#02.lua | 3 --- .../npcs/Veridical_Conflux_#03.lua | 3 --- .../npcs/Veridical_Conflux_#04.lua | 3 --- .../npcs/Veridical_Conflux_#05.lua | 3 --- .../npcs/Veridical_Conflux_#06.lua | 3 --- .../npcs/Veridical_Conflux_#07.lua | 3 --- .../npcs/Veridical_Conflux_#08.lua | 3 --- .../Abyssea-La_Theine/npcs/qm_adamastor.lua | 6 ----- .../Abyssea-La_Theine/npcs/qm_baba_yaga.lua | 6 ----- .../Abyssea-La_Theine/npcs/qm_briareus.lua | 3 --- .../Abyssea-La_Theine/npcs/qm_carabosse.lua | 3 --- .../npcs/qm_dozing_dorian.lua | 6 ----- .../npcs/qm_grandgousier.lua | 6 ----- .../Abyssea-La_Theine/npcs/qm_hadhayosh.lua | 3 --- .../npcs/qm_la_theine_liege.lua | 6 ----- .../Abyssea-La_Theine/npcs/qm_lugarhoo.lua | 6 ----- .../Abyssea-La_Theine/npcs/qm_megantereon.lua | 6 ----- .../Abyssea-La_Theine/npcs/qm_nguruvilu.lua | 6 ----- .../Abyssea-La_Theine/npcs/qm_pantagruel.lua | 6 ----- .../npcs/qm_poroggo_dom_juan.lua | 6 ----- .../npcs/qm_toppling_tuber.lua | 6 ----- .../npcs/qm_trudging_thomas.lua | 6 ----- .../Abyssea-Misareaux/npcs/Cavernous_Maw.lua | 6 ----- .../npcs/Conflux_Surveyor.lua | 6 ----- .../npcs/Cruor_Prospector.lua | 6 ----- .../npcs/Veridical_Conflux_#00.lua | 3 --- .../npcs/Veridical_Conflux_#01.lua | 3 --- .../npcs/Veridical_Conflux_#02.lua | 3 --- .../npcs/Veridical_Conflux_#03.lua | 3 --- .../npcs/Veridical_Conflux_#04.lua | 3 --- .../npcs/Veridical_Conflux_#05.lua | 3 --- .../npcs/Veridical_Conflux_#06.lua | 3 --- .../npcs/Veridical_Conflux_#07.lua | 3 --- .../npcs/Veridical_Conflux_#08.lua | 3 --- scripts/zones/Abyssea-Misareaux/npcs/qm1.lua | 6 ----- scripts/zones/Abyssea-Misareaux/npcs/qm10.lua | 6 ----- scripts/zones/Abyssea-Misareaux/npcs/qm11.lua | 6 ----- scripts/zones/Abyssea-Misareaux/npcs/qm12.lua | 6 ----- scripts/zones/Abyssea-Misareaux/npcs/qm2.lua | 6 ----- scripts/zones/Abyssea-Misareaux/npcs/qm3.lua | 6 ----- scripts/zones/Abyssea-Misareaux/npcs/qm4.lua | 6 ----- scripts/zones/Abyssea-Misareaux/npcs/qm5.lua | 6 ----- scripts/zones/Abyssea-Misareaux/npcs/qm6.lua | 6 ----- scripts/zones/Abyssea-Misareaux/npcs/qm7.lua | 6 ----- scripts/zones/Abyssea-Misareaux/npcs/qm8.lua | 6 ----- scripts/zones/Abyssea-Misareaux/npcs/qm9.lua | 6 ----- .../Abyssea-Tahrongi/npcs/Cavernous_Maw.lua | 6 ----- .../npcs/Conflux_Surveyor.lua | 6 ----- .../npcs/Cruor_Prospector.lua | 6 ----- .../npcs/Veridical_Conflux_#01.lua | 3 --- .../npcs/Veridical_Conflux_#02.lua | 3 --- .../npcs/Veridical_Conflux_#03.lua | 3 --- .../npcs/Veridical_Conflux_#04.lua | 3 --- .../npcs/Veridical_Conflux_#05.lua | 3 --- .../npcs/Veridical_Conflux_#06.lua | 3 --- .../npcs/Veridical_Conflux_#07.lua | 3 --- .../npcs/Veridical_Conflux_#08.lua | 3 --- .../zones/Abyssea-Tahrongi/npcs/qm_abas.lua | 6 ----- .../Abyssea-Tahrongi/npcs/qm_alectryon.lua | 6 ----- .../Abyssea-Tahrongi/npcs/qm_cannered_noz.lua | 6 ----- .../Abyssea-Tahrongi/npcs/qm_chloris.lua | 3 --- .../Abyssea-Tahrongi/npcs/qm_gancanagh.lua | 6 ----- .../Abyssea-Tahrongi/npcs/qm_glavoid.lua | 3 --- .../Abyssea-Tahrongi/npcs/qm_halimede.lua | 6 ----- .../Abyssea-Tahrongi/npcs/qm_hedetet.lua | 6 ----- .../Abyssea-Tahrongi/npcs/qm_lachrymater.lua | 6 ----- .../Abyssea-Tahrongi/npcs/qm_lacovie.lua | 3 --- .../Abyssea-Tahrongi/npcs/qm_muscaliet.lua | 6 ----- .../Abyssea-Tahrongi/npcs/qm_ophanim.lua | 6 ----- .../Abyssea-Tahrongi/npcs/qm_tefenet.lua | 6 ----- .../npcs/qm_treble_noctules.lua | 6 ----- .../Abyssea-Tahrongi/npcs/qm_vetehinen.lua | 6 ----- .../Abyssea-Uleguerand/DefaultActions.lua | 16 ++++++++++++++ .../zones/Abyssea-Uleguerand/npcs/Ardea.lua | 21 ------------------ .../zones/Abyssea-Uleguerand/npcs/Aulavia.lua | 21 ------------------ .../Abyssea-Uleguerand/npcs/Cavernous_Maw.lua | 6 ----- .../zones/Abyssea-Uleguerand/npcs/Chamama.lua | 21 ------------------ .../npcs/Conflux_Surveyor.lua | 6 ----- .../npcs/Cruor_Prospector.lua | 6 ----- .../Abyssea-Uleguerand/npcs/DSgt_Maat.lua | 3 --- .../Abyssea-Uleguerand/npcs/DSgt_Romaa.lua | 3 --- .../Abyssea-Uleguerand/npcs/DSgt_Zazarg.lua | 3 --- .../Abyssea-Uleguerand/npcs/Dheo_Nbolo.lua | 21 ------------------ .../zones/Abyssea-Uleguerand/npcs/Ehrhard.lua | 21 ------------------ .../zones/Abyssea-Uleguerand/npcs/Maat.lua | 21 ------------------ .../Abyssea-Uleguerand/npcs/Pakke-Pokke.lua | 21 ------------------ .../npcs/Polikal-Ramikal.lua | 21 ------------------ .../Abyssea-Uleguerand/npcs/Romaa_Mihgo.lua | 21 ------------------ .../Abyssea-Uleguerand/npcs/Tiger_Tooth.lua | 21 ------------------ .../zones/Abyssea-Uleguerand/npcs/Trion.lua | 21 ------------------ .../npcs/Veridical_Conflux_#01.lua | 3 --- .../npcs/Veridical_Conflux_#02.lua | 3 --- .../npcs/Veridical_Conflux_#03.lua | 3 --- .../npcs/Veridical_Conflux_#04.lua | 3 --- .../npcs/Veridical_Conflux_#05.lua | 3 --- .../npcs/Veridical_Conflux_#06.lua | 3 --- .../npcs/Veridical_Conflux_#07.lua | 3 --- .../npcs/Veridical_Conflux_#08.lua | 3 --- .../zones/Abyssea-Uleguerand/npcs/Waylea.lua | 21 ------------------ scripts/zones/Abyssea-Uleguerand/npcs/qm1.lua | 6 ----- .../zones/Abyssea-Uleguerand/npcs/qm10.lua | 6 ----- scripts/zones/Abyssea-Uleguerand/npcs/qm2.lua | 6 ----- scripts/zones/Abyssea-Uleguerand/npcs/qm3.lua | 6 ----- scripts/zones/Abyssea-Uleguerand/npcs/qm4.lua | 6 ----- scripts/zones/Abyssea-Uleguerand/npcs/qm5.lua | 6 ----- scripts/zones/Abyssea-Uleguerand/npcs/qm6.lua | 6 ----- scripts/zones/Abyssea-Uleguerand/npcs/qm7.lua | 6 ----- scripts/zones/Abyssea-Uleguerand/npcs/qm8.lua | 6 ----- scripts/zones/Abyssea-Uleguerand/npcs/qm9.lua | 6 ----- .../zones/Abyssea-Vunkerl/DefaultActions.lua | 7 ++++++ .../Abyssea-Vunkerl/npcs/Cavernous_Maw.lua | 6 ----- .../Abyssea-Vunkerl/npcs/Conflux_Surveyor.lua | 6 ----- .../Abyssea-Vunkerl/npcs/Cruor_Prospector.lua | 6 ----- .../zones/Abyssea-Vunkerl/npcs/Liloune.lua | 21 ------------------ .../zones/Abyssea-Vunkerl/npcs/Parcarin.lua | 21 ------------------ .../zones/Abyssea-Vunkerl/npcs/Solgierte.lua | 21 ------------------ .../npcs/Veridical_Conflux_#00.lua | 3 --- .../npcs/Veridical_Conflux_#01.lua | 3 --- .../npcs/Veridical_Conflux_#02.lua | 3 --- .../npcs/Veridical_Conflux_#03.lua | 3 --- .../npcs/Veridical_Conflux_#04.lua | 3 --- .../npcs/Veridical_Conflux_#05.lua | 3 --- .../npcs/Veridical_Conflux_#06.lua | 3 --- .../npcs/Veridical_Conflux_#07.lua | 3 --- .../npcs/Veridical_Conflux_#08.lua | 3 --- scripts/zones/Abyssea-Vunkerl/npcs/qm1.lua | 6 ----- scripts/zones/Abyssea-Vunkerl/npcs/qm10.lua | 6 ----- scripts/zones/Abyssea-Vunkerl/npcs/qm11.lua | 6 ----- scripts/zones/Abyssea-Vunkerl/npcs/qm12.lua | 6 ----- scripts/zones/Abyssea-Vunkerl/npcs/qm2.lua | 6 ----- scripts/zones/Abyssea-Vunkerl/npcs/qm3.lua | 6 ----- scripts/zones/Abyssea-Vunkerl/npcs/qm4.lua | 6 ----- scripts/zones/Abyssea-Vunkerl/npcs/qm5.lua | 6 ----- scripts/zones/Abyssea-Vunkerl/npcs/qm6.lua | 6 ----- scripts/zones/Abyssea-Vunkerl/npcs/qm7.lua | 6 ----- scripts/zones/Abyssea-Vunkerl/npcs/qm8.lua | 6 ----- scripts/zones/Abyssea-Vunkerl/npcs/qm9.lua | 6 ----- 302 files changed, 52 insertions(+), 1955 deletions(-) create mode 100644 scripts/zones/Abyssea-Altepa/DefaultActions.lua delete mode 100644 scripts/zones/Abyssea-Altepa/npcs/Bonarpant.lua delete mode 100644 scripts/zones/Abyssea-Altepa/npcs/Hildith.lua delete mode 100644 scripts/zones/Abyssea-Altepa/npcs/Honoi-Gomoi.lua delete mode 100644 scripts/zones/Abyssea-Altepa/npcs/Justinius.lua delete mode 100644 scripts/zones/Abyssea-Altepa/npcs/Mheca_Khetashipah.lua delete mode 100644 scripts/zones/Abyssea-Altepa/npcs/Rielle.lua delete mode 100644 scripts/zones/Abyssea-Altepa/npcs/Ronta-Onta.lua delete mode 100644 scripts/zones/Abyssea-Altepa/npcs/Sola_Jaab.lua delete mode 100644 scripts/zones/Abyssea-Altepa/npcs/Taraihi-Perunhi.lua delete mode 100644 scripts/zones/Abyssea-Altepa/npcs/Yuhito-Kubhito.lua create mode 100644 scripts/zones/Abyssea-Attohwa/DefaultActions.lua delete mode 100644 scripts/zones/Abyssea-Attohwa/npcs/Akta.lua delete mode 100644 scripts/zones/Abyssea-Attohwa/npcs/Alrauverat.lua delete mode 100644 scripts/zones/Abyssea-Attohwa/npcs/Gabriele.lua delete mode 100644 scripts/zones/Abyssea-Attohwa/npcs/Gurdern.lua delete mode 100644 scripts/zones/Abyssea-Attohwa/npcs/Mojuro-Nojuro.lua delete mode 100644 scripts/zones/Abyssea-Attohwa/npcs/Monberaux.lua delete mode 100644 scripts/zones/Abyssea-Attohwa/npcs/Navisse.lua delete mode 100644 scripts/zones/Abyssea-Attohwa/npcs/Rainhard.lua delete mode 100644 scripts/zones/Abyssea-Attohwa/npcs/Red_Ghost.lua delete mode 100644 scripts/zones/Abyssea-Attohwa/npcs/Soni-Muni.lua delete mode 100644 scripts/zones/Abyssea-Attohwa/npcs/Tsugumi.lua delete mode 100644 scripts/zones/Abyssea-Grauberg/npcs/Dominion_Sergeant.lua create mode 100644 scripts/zones/Abyssea-Uleguerand/DefaultActions.lua delete mode 100644 scripts/zones/Abyssea-Uleguerand/npcs/Ardea.lua delete mode 100644 scripts/zones/Abyssea-Uleguerand/npcs/Aulavia.lua delete mode 100644 scripts/zones/Abyssea-Uleguerand/npcs/Chamama.lua delete mode 100644 scripts/zones/Abyssea-Uleguerand/npcs/Dheo_Nbolo.lua delete mode 100644 scripts/zones/Abyssea-Uleguerand/npcs/Ehrhard.lua delete mode 100644 scripts/zones/Abyssea-Uleguerand/npcs/Maat.lua delete mode 100644 scripts/zones/Abyssea-Uleguerand/npcs/Pakke-Pokke.lua delete mode 100644 scripts/zones/Abyssea-Uleguerand/npcs/Polikal-Ramikal.lua delete mode 100644 scripts/zones/Abyssea-Uleguerand/npcs/Romaa_Mihgo.lua delete mode 100644 scripts/zones/Abyssea-Uleguerand/npcs/Tiger_Tooth.lua delete mode 100644 scripts/zones/Abyssea-Uleguerand/npcs/Trion.lua delete mode 100644 scripts/zones/Abyssea-Uleguerand/npcs/Waylea.lua create mode 100644 scripts/zones/Abyssea-Vunkerl/DefaultActions.lua delete mode 100644 scripts/zones/Abyssea-Vunkerl/npcs/Liloune.lua delete mode 100644 scripts/zones/Abyssea-Vunkerl/npcs/Parcarin.lua delete mode 100644 scripts/zones/Abyssea-Vunkerl/npcs/Solgierte.lua diff --git a/scripts/zones/Abdhaljs_Isle-Purgonorgo/npcs/Pursuivant.lua b/scripts/zones/Abdhaljs_Isle-Purgonorgo/npcs/Pursuivant.lua index 8f5af1d6f9b..7fb22165475 100644 --- a/scripts/zones/Abdhaljs_Isle-Purgonorgo/npcs/Pursuivant.lua +++ b/scripts/zones/Abdhaljs_Isle-Purgonorgo/npcs/Pursuivant.lua @@ -7,16 +7,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(3) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 3 and option == 1 then player:setPos(-0.135, 0.000, 22.880, 105, 244) diff --git a/scripts/zones/Abyssea-Altepa/DefaultActions.lua b/scripts/zones/Abyssea-Altepa/DefaultActions.lua new file mode 100644 index 00000000000..a2857f40175 --- /dev/null +++ b/scripts/zones/Abyssea-Altepa/DefaultActions.lua @@ -0,0 +1,14 @@ +-- local ID = zones[xi.zone.ABYSSEA_ALTEPA] + +return { + ['Bonarpant'] = { event = 336 }, + ['Hildith'] = { event = 342 }, + ['Honoi-Gomoi'] = { event = 331 }, + ['Justinius'] = { event = 343 }, + ['Mheca_Khetashipah'] = { event = 345 }, + ['Rielle'] = { event = 337 }, + ['Ronta-Onta'] = { event = 344 }, + ['Sola_Jaab'] = { event = 332 }, + ['Taraihi-Perunhi'] = { event = 333 }, + ['Yuhito-Kubhito'] = { event = 341 }, +} diff --git a/scripts/zones/Abyssea-Altepa/npcs/Bonarpant.lua b/scripts/zones/Abyssea-Altepa/npcs/Bonarpant.lua deleted file mode 100644 index 9fe87dbd60b..00000000000 --- a/scripts/zones/Abyssea-Altepa/npcs/Bonarpant.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Abyssea_Altepa --- NPC: Bonarpant ------------------------------------ ----@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/Abyssea-Altepa/npcs/Cavernous_Maw.lua b/scripts/zones/Abyssea-Altepa/npcs/Cavernous_Maw.lua index 5fcc7d73cd1..f1b7d72aaa7 100644 --- a/scripts/zones/Abyssea-Altepa/npcs/Cavernous_Maw.lua +++ b/scripts/zones/Abyssea-Altepa/npcs/Cavernous_Maw.lua @@ -7,16 +7,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(200) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 200 and option == 1 then player:setPos(343, 0, -679, 199, 107) diff --git a/scripts/zones/Abyssea-Altepa/npcs/Conflux_Surveyor.lua b/scripts/zones/Abyssea-Altepa/npcs/Conflux_Surveyor.lua index b7e5547c679..076c79b85df 100644 --- a/scripts/zones/Abyssea-Altepa/npcs/Conflux_Surveyor.lua +++ b/scripts/zones/Abyssea-Altepa/npcs/Conflux_Surveyor.lua @@ -5,16 +5,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.surveyorOnTrigger(player, npc) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.abyssea.surveyorOnEventFinish(player, csid, option, npc) end diff --git a/scripts/zones/Abyssea-Altepa/npcs/Cruor_Prospector.lua b/scripts/zones/Abyssea-Altepa/npcs/Cruor_Prospector.lua index 636eabf5594..03502fd5b55 100644 --- a/scripts/zones/Abyssea-Altepa/npcs/Cruor_Prospector.lua +++ b/scripts/zones/Abyssea-Altepa/npcs/Cruor_Prospector.lua @@ -128,9 +128,6 @@ local prospectorEnhancement = }, } -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local cruor = player:getCurrency('cruor') local demilune = xi.abyssea.getDemiluneAbyssite(player) @@ -138,9 +135,6 @@ entity.onTrigger = function(player, npc) player:startEvent(2002, cruor, demilune) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) local itemCategory = bit.band(option, 0x07) local itemSelected = bit.band(bit.rshift(option, 16), 0x1F) diff --git a/scripts/zones/Abyssea-Altepa/npcs/DSgt_Excenmille.lua b/scripts/zones/Abyssea-Altepa/npcs/DSgt_Excenmille.lua index d630e959011..91ff38e78fc 100644 --- a/scripts/zones/Abyssea-Altepa/npcs/DSgt_Excenmille.lua +++ b/scripts/zones/Abyssea-Altepa/npcs/DSgt_Excenmille.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.sergeantOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Altepa/npcs/DSgt_Nanaa.lua b/scripts/zones/Abyssea-Altepa/npcs/DSgt_Nanaa.lua index d630e959011..91ff38e78fc 100644 --- a/scripts/zones/Abyssea-Altepa/npcs/DSgt_Nanaa.lua +++ b/scripts/zones/Abyssea-Altepa/npcs/DSgt_Nanaa.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.sergeantOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Altepa/npcs/DSgt_Volker.lua b/scripts/zones/Abyssea-Altepa/npcs/DSgt_Volker.lua index d630e959011..91ff38e78fc 100644 --- a/scripts/zones/Abyssea-Altepa/npcs/DSgt_Volker.lua +++ b/scripts/zones/Abyssea-Altepa/npcs/DSgt_Volker.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.sergeantOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Altepa/npcs/Hildith.lua b/scripts/zones/Abyssea-Altepa/npcs/Hildith.lua deleted file mode 100644 index 0f29a8de7e4..00000000000 --- a/scripts/zones/Abyssea-Altepa/npcs/Hildith.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Abyssea_Altepa --- NPC: Hildith ------------------------------------ ----@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/Abyssea-Altepa/npcs/Honoi-Gomoi.lua b/scripts/zones/Abyssea-Altepa/npcs/Honoi-Gomoi.lua deleted file mode 100644 index 3e27930240c..00000000000 --- a/scripts/zones/Abyssea-Altepa/npcs/Honoi-Gomoi.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Abyssea_Altepa --- NPC: Honoi-Gomoi ------------------------------------ ----@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/Abyssea-Altepa/npcs/Justinius.lua b/scripts/zones/Abyssea-Altepa/npcs/Justinius.lua deleted file mode 100644 index 5a7df8bce10..00000000000 --- a/scripts/zones/Abyssea-Altepa/npcs/Justinius.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Abyssea_Altepa --- NPC: Justinius ------------------------------------ ----@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/Abyssea-Altepa/npcs/Mheca_Khetashipah.lua b/scripts/zones/Abyssea-Altepa/npcs/Mheca_Khetashipah.lua deleted file mode 100644 index 607c35a8879..00000000000 --- a/scripts/zones/Abyssea-Altepa/npcs/Mheca_Khetashipah.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Abyssea_Altepa --- NPC: Mheca Khetashipah ------------------------------------ ----@type TNpcEntity -local entity = {} - -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/Abyssea-Altepa/npcs/Rielle.lua b/scripts/zones/Abyssea-Altepa/npcs/Rielle.lua deleted file mode 100644 index 8d4dce761ce..00000000000 --- a/scripts/zones/Abyssea-Altepa/npcs/Rielle.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Abyssea_Altepa --- NPC: Rielle ------------------------------------ ----@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/Abyssea-Altepa/npcs/Ronta-Onta.lua b/scripts/zones/Abyssea-Altepa/npcs/Ronta-Onta.lua deleted file mode 100644 index 472ae86df8c..00000000000 --- a/scripts/zones/Abyssea-Altepa/npcs/Ronta-Onta.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Abyssea_Altepa --- NPC: Ronta-Onta ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(344) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Abyssea-Altepa/npcs/Sola_Jaab.lua b/scripts/zones/Abyssea-Altepa/npcs/Sola_Jaab.lua deleted file mode 100644 index 41b1a75e405..00000000000 --- a/scripts/zones/Abyssea-Altepa/npcs/Sola_Jaab.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Abyssea_Altepa --- NPC: Sola Jaab ------------------------------------ ----@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/Abyssea-Altepa/npcs/Taraihi-Perunhi.lua b/scripts/zones/Abyssea-Altepa/npcs/Taraihi-Perunhi.lua deleted file mode 100644 index bdc4bc37042..00000000000 --- a/scripts/zones/Abyssea-Altepa/npcs/Taraihi-Perunhi.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Abyssea_Altepa --- NPC: Taraihi-Perunhi ------------------------------------ ----@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/Abyssea-Altepa/npcs/Veridical_Conflux_#01.lua b/scripts/zones/Abyssea-Altepa/npcs/Veridical_Conflux_#01.lua index d353b98d0bb..8727987d2fe 100644 --- a/scripts/zones/Abyssea-Altepa/npcs/Veridical_Conflux_#01.lua +++ b/scripts/zones/Abyssea-Altepa/npcs/Veridical_Conflux_#01.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Altepa/npcs/Veridical_Conflux_#02.lua b/scripts/zones/Abyssea-Altepa/npcs/Veridical_Conflux_#02.lua index 1653b9459cc..62d75a82839 100644 --- a/scripts/zones/Abyssea-Altepa/npcs/Veridical_Conflux_#02.lua +++ b/scripts/zones/Abyssea-Altepa/npcs/Veridical_Conflux_#02.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Altepa/npcs/Veridical_Conflux_#03.lua b/scripts/zones/Abyssea-Altepa/npcs/Veridical_Conflux_#03.lua index ffb1cce739c..a9525aec270 100644 --- a/scripts/zones/Abyssea-Altepa/npcs/Veridical_Conflux_#03.lua +++ b/scripts/zones/Abyssea-Altepa/npcs/Veridical_Conflux_#03.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Altepa/npcs/Veridical_Conflux_#04.lua b/scripts/zones/Abyssea-Altepa/npcs/Veridical_Conflux_#04.lua index 01e71983ecc..65bd011b4a3 100644 --- a/scripts/zones/Abyssea-Altepa/npcs/Veridical_Conflux_#04.lua +++ b/scripts/zones/Abyssea-Altepa/npcs/Veridical_Conflux_#04.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Altepa/npcs/Veridical_Conflux_#05.lua b/scripts/zones/Abyssea-Altepa/npcs/Veridical_Conflux_#05.lua index e8b6ab32353..109659be379 100644 --- a/scripts/zones/Abyssea-Altepa/npcs/Veridical_Conflux_#05.lua +++ b/scripts/zones/Abyssea-Altepa/npcs/Veridical_Conflux_#05.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Altepa/npcs/Veridical_Conflux_#06.lua b/scripts/zones/Abyssea-Altepa/npcs/Veridical_Conflux_#06.lua index d98d971f826..690d727cdad 100644 --- a/scripts/zones/Abyssea-Altepa/npcs/Veridical_Conflux_#06.lua +++ b/scripts/zones/Abyssea-Altepa/npcs/Veridical_Conflux_#06.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Altepa/npcs/Veridical_Conflux_#07.lua b/scripts/zones/Abyssea-Altepa/npcs/Veridical_Conflux_#07.lua index c75dd99f91f..a76fd7588bf 100644 --- a/scripts/zones/Abyssea-Altepa/npcs/Veridical_Conflux_#07.lua +++ b/scripts/zones/Abyssea-Altepa/npcs/Veridical_Conflux_#07.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Altepa/npcs/Veridical_Conflux_#08.lua b/scripts/zones/Abyssea-Altepa/npcs/Veridical_Conflux_#08.lua index 67c72766fc4..a7a1a2016a7 100644 --- a/scripts/zones/Abyssea-Altepa/npcs/Veridical_Conflux_#08.lua +++ b/scripts/zones/Abyssea-Altepa/npcs/Veridical_Conflux_#08.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Altepa/npcs/Yuhito-Kubhito.lua b/scripts/zones/Abyssea-Altepa/npcs/Yuhito-Kubhito.lua deleted file mode 100644 index fc7fdf4635d..00000000000 --- a/scripts/zones/Abyssea-Altepa/npcs/Yuhito-Kubhito.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Abyssea_Altepa --- NPC: Yuhito-Kubhito ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(341) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Abyssea-Altepa/npcs/qm_amarok.lua b/scripts/zones/Abyssea-Altepa/npcs/qm_amarok.lua index a99d61f07c2..d189893bbc8 100644 --- a/scripts/zones/Abyssea-Altepa/npcs/qm_amarok.lua +++ b/scripts/zones/Abyssea-Altepa/npcs/qm_amarok.lua @@ -17,10 +17,4 @@ entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, 0, 0, { xi.item.SHARABHA_HIDE, xi.item.TIGER_KINGS_HIDE, xi.item.HIGH_QUALITY_DHALMEL_HIDE }) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Abyssea-Altepa/npcs/qm_bennu_1.lua b/scripts/zones/Abyssea-Altepa/npcs/qm_bennu_1.lua index b30f1bef7da..a371baa70c7 100644 --- a/scripts/zones/Abyssea-Altepa/npcs/qm_bennu_1.lua +++ b/scripts/zones/Abyssea-Altepa/npcs/qm_bennu_1.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.ABYSSEA_ALTEPA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, ID.mob.BENNU_OFFSET, { xi.ki.RESPLENDENT_ROC_QUILL }) end diff --git a/scripts/zones/Abyssea-Altepa/npcs/qm_bennu_2.lua b/scripts/zones/Abyssea-Altepa/npcs/qm_bennu_2.lua index e971e264c08..28f1c6854ef 100644 --- a/scripts/zones/Abyssea-Altepa/npcs/qm_bennu_2.lua +++ b/scripts/zones/Abyssea-Altepa/npcs/qm_bennu_2.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.ABYSSEA_ALTEPA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, ID.mob.BENNU_OFFSET + 4, { xi.ki.RESPLENDENT_ROC_QUILL }) end diff --git a/scripts/zones/Abyssea-Altepa/npcs/qm_bennu_3.lua b/scripts/zones/Abyssea-Altepa/npcs/qm_bennu_3.lua index c52154f0300..3304d95ca73 100644 --- a/scripts/zones/Abyssea-Altepa/npcs/qm_bennu_3.lua +++ b/scripts/zones/Abyssea-Altepa/npcs/qm_bennu_3.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.ABYSSEA_ALTEPA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, ID.mob.BENNU_OFFSET + 8, { xi.ki.RESPLENDENT_ROC_QUILL }) end diff --git a/scripts/zones/Abyssea-Altepa/npcs/qm_bugul_noz.lua b/scripts/zones/Abyssea-Altepa/npcs/qm_bugul_noz.lua index 73a2315c9a1..2482539f1e2 100644 --- a/scripts/zones/Abyssea-Altepa/npcs/qm_bugul_noz.lua +++ b/scripts/zones/Abyssea-Altepa/npcs/qm_bugul_noz.lua @@ -17,10 +17,4 @@ entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, 0, 0, { xi.item.HANDFUL_OF_SABULOUS_CLAY }) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Abyssea-Altepa/npcs/qm_chickcharney.lua b/scripts/zones/Abyssea-Altepa/npcs/qm_chickcharney.lua index 208ee95b907..ce6b264321f 100644 --- a/scripts/zones/Abyssea-Altepa/npcs/qm_chickcharney.lua +++ b/scripts/zones/Abyssea-Altepa/npcs/qm_chickcharney.lua @@ -17,10 +17,4 @@ entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, 0, 0, { xi.item.HIGH_QUALITY_COCKATRICE_SKIN }) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Abyssea-Altepa/npcs/qm_dragua_1.lua b/scripts/zones/Abyssea-Altepa/npcs/qm_dragua_1.lua index a63345fb5ac..68028d3978a 100644 --- a/scripts/zones/Abyssea-Altepa/npcs/qm_dragua_1.lua +++ b/scripts/zones/Abyssea-Altepa/npcs/qm_dragua_1.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.ABYSSEA_ALTEPA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, ID.mob.DRAGUA_OFFSET, { xi.ki.BLOODIED_DRAGON_EAR }) end diff --git a/scripts/zones/Abyssea-Altepa/npcs/qm_dragua_2.lua b/scripts/zones/Abyssea-Altepa/npcs/qm_dragua_2.lua index 10d6c65143e..649b28825a8 100644 --- a/scripts/zones/Abyssea-Altepa/npcs/qm_dragua_2.lua +++ b/scripts/zones/Abyssea-Altepa/npcs/qm_dragua_2.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.ABYSSEA_ALTEPA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, ID.mob.DRAGUA_OFFSET + 4, { xi.ki.BLOODIED_DRAGON_EAR }) end diff --git a/scripts/zones/Abyssea-Altepa/npcs/qm_dragua_3.lua b/scripts/zones/Abyssea-Altepa/npcs/qm_dragua_3.lua index 5b07057e041..ba08281fc29 100644 --- a/scripts/zones/Abyssea-Altepa/npcs/qm_dragua_3.lua +++ b/scripts/zones/Abyssea-Altepa/npcs/qm_dragua_3.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.ABYSSEA_ALTEPA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, ID.mob.DRAGUA_OFFSET + 8, { xi.ki.BLOODIED_DRAGON_EAR }) end diff --git a/scripts/zones/Abyssea-Altepa/npcs/qm_emperador_de_altepa.lua b/scripts/zones/Abyssea-Altepa/npcs/qm_emperador_de_altepa.lua index bf45177501d..d396fed6c19 100644 --- a/scripts/zones/Abyssea-Altepa/npcs/qm_emperador_de_altepa.lua +++ b/scripts/zones/Abyssea-Altepa/npcs/qm_emperador_de_altepa.lua @@ -17,10 +17,4 @@ entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, 0, 0, { xi.item.BOTTLE_OF_OASIS_WATER, xi.item.SPRIG_OF_GIANT_MISTLETOE }) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Abyssea-Altepa/npcs/qm_ironclad_smiter.lua b/scripts/zones/Abyssea-Altepa/npcs/qm_ironclad_smiter.lua index c2c00e2301c..a309780747d 100644 --- a/scripts/zones/Abyssea-Altepa/npcs/qm_ironclad_smiter.lua +++ b/scripts/zones/Abyssea-Altepa/npcs/qm_ironclad_smiter.lua @@ -17,10 +17,4 @@ entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, 0, 0, { xi.item.VIAL_OF_TABLILLA_MERCURY, xi.item.SMOLDERING_ARM }) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Abyssea-Altepa/npcs/qm_orthus_1.lua b/scripts/zones/Abyssea-Altepa/npcs/qm_orthus_1.lua index 709545c8f5d..a0029a444f7 100644 --- a/scripts/zones/Abyssea-Altepa/npcs/qm_orthus_1.lua +++ b/scripts/zones/Abyssea-Altepa/npcs/qm_orthus_1.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.ABYSSEA_ALTEPA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, ID.mob.ORTHUS_OFFSET, { xi.ki.STEAMING_CERBERUS_TONGUE }) end diff --git a/scripts/zones/Abyssea-Altepa/npcs/qm_orthus_2.lua b/scripts/zones/Abyssea-Altepa/npcs/qm_orthus_2.lua index 88f65e08dbe..0d5ce23eb9c 100644 --- a/scripts/zones/Abyssea-Altepa/npcs/qm_orthus_2.lua +++ b/scripts/zones/Abyssea-Altepa/npcs/qm_orthus_2.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.ABYSSEA_ALTEPA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, ID.mob.ORTHUS_OFFSET + 4, { xi.ki.STEAMING_CERBERUS_TONGUE }) end diff --git a/scripts/zones/Abyssea-Altepa/npcs/qm_orthus_3.lua b/scripts/zones/Abyssea-Altepa/npcs/qm_orthus_3.lua index 921e487ecca..b5d622fc60d 100644 --- a/scripts/zones/Abyssea-Altepa/npcs/qm_orthus_3.lua +++ b/scripts/zones/Abyssea-Altepa/npcs/qm_orthus_3.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.ABYSSEA_ALTEPA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, ID.mob.ORTHUS_OFFSET + 8, { xi.ki.STEAMING_CERBERUS_TONGUE }) end diff --git a/scripts/zones/Abyssea-Altepa/npcs/qm_rani_1.lua b/scripts/zones/Abyssea-Altepa/npcs/qm_rani_1.lua index 8766e16d8db..fb6c17f69b9 100644 --- a/scripts/zones/Abyssea-Altepa/npcs/qm_rani_1.lua +++ b/scripts/zones/Abyssea-Altepa/npcs/qm_rani_1.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.ABYSSEA_ALTEPA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, ID.mob.RANI_OFFSET, { xi.ki.BROKEN_IRON_GIANT_SPIKE, xi.ki.RUSTED_CHARIOT_GEAR }) end diff --git a/scripts/zones/Abyssea-Altepa/npcs/qm_rani_2.lua b/scripts/zones/Abyssea-Altepa/npcs/qm_rani_2.lua index 0f815f11251..a83547873ba 100644 --- a/scripts/zones/Abyssea-Altepa/npcs/qm_rani_2.lua +++ b/scripts/zones/Abyssea-Altepa/npcs/qm_rani_2.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.ABYSSEA_ALTEPA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, ID.mob.RANI_OFFSET + 4, { xi.ki.BROKEN_IRON_GIANT_SPIKE, xi.ki.RUSTED_CHARIOT_GEAR }) end diff --git a/scripts/zones/Abyssea-Altepa/npcs/qm_rani_3.lua b/scripts/zones/Abyssea-Altepa/npcs/qm_rani_3.lua index d94c6f8eac8..932c318ddbd 100644 --- a/scripts/zones/Abyssea-Altepa/npcs/qm_rani_3.lua +++ b/scripts/zones/Abyssea-Altepa/npcs/qm_rani_3.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.ABYSSEA_ALTEPA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, ID.mob.RANI_OFFSET + 8, { xi.ki.BROKEN_IRON_GIANT_SPIKE, xi.ki.RUSTED_CHARIOT_GEAR }) end diff --git a/scripts/zones/Abyssea-Altepa/npcs/qm_sharabha.lua b/scripts/zones/Abyssea-Altepa/npcs/qm_sharabha.lua index b9b2504cb51..c9b57f8ca96 100644 --- a/scripts/zones/Abyssea-Altepa/npcs/qm_sharabha.lua +++ b/scripts/zones/Abyssea-Altepa/npcs/qm_sharabha.lua @@ -17,10 +17,4 @@ entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, 0, 0, { xi.item.SAND_CAKED_FANG }) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Abyssea-Altepa/npcs/qm_shaula.lua b/scripts/zones/Abyssea-Altepa/npcs/qm_shaula.lua index f1f148262fa..9d2a053407f 100644 --- a/scripts/zones/Abyssea-Altepa/npcs/qm_shaula.lua +++ b/scripts/zones/Abyssea-Altepa/npcs/qm_shaula.lua @@ -17,10 +17,4 @@ entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, 0, 0, { xi.item.VIAL_OF_VADLEANY_FLUID, xi.item.HIGH_QUALITY_SCORPION_CLAW }) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Abyssea-Altepa/npcs/qm_tablilla.lua b/scripts/zones/Abyssea-Altepa/npcs/qm_tablilla.lua index 2ba877e4ea8..72f0888f116 100644 --- a/scripts/zones/Abyssea-Altepa/npcs/qm_tablilla.lua +++ b/scripts/zones/Abyssea-Altepa/npcs/qm_tablilla.lua @@ -17,10 +17,4 @@ entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, 0, 0, { xi.item.SANDY_SHARD }) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Abyssea-Altepa/npcs/qm_vadleany.lua b/scripts/zones/Abyssea-Altepa/npcs/qm_vadleany.lua index 4419506f36f..e294e61495e 100644 --- a/scripts/zones/Abyssea-Altepa/npcs/qm_vadleany.lua +++ b/scripts/zones/Abyssea-Altepa/npcs/qm_vadleany.lua @@ -17,10 +17,4 @@ entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, 0, 0, { xi.item.LADYBIRD_LEAF }) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Abyssea-Altepa/npcs/qm_waugyl.lua b/scripts/zones/Abyssea-Altepa/npcs/qm_waugyl.lua index 592c0abde19..c4ac0233668 100644 --- a/scripts/zones/Abyssea-Altepa/npcs/qm_waugyl.lua +++ b/scripts/zones/Abyssea-Altepa/npcs/qm_waugyl.lua @@ -17,10 +17,4 @@ entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, 0, 0, { xi.item.VIAL_OF_PUPPETS_BLOOD }) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Abyssea-Attohwa/DefaultActions.lua b/scripts/zones/Abyssea-Attohwa/DefaultActions.lua new file mode 100644 index 00000000000..3e73befb6db --- /dev/null +++ b/scripts/zones/Abyssea-Attohwa/DefaultActions.lua @@ -0,0 +1,15 @@ +-- local ID = zones[xi.zone.ABYSSEA_ATTOHWA] + +return { + ['Akta'] = { event = 392 }, + ['Alrauverat'] = { event = 388 }, + ['Gabriele'] = { event = 394 }, + ['Gurdern'] = { event = 390 }, + ['Mojuro-Nojuro'] = { event = 380 }, + ['Monberaux'] = { event = 381 }, + ['Navisse'] = { event = 379 }, + ['Rainhard'] = { event = 393 }, + ['Red_Ghost'] = { event = 389 }, + ['Soni-Muni'] = { event = 1100 }, + ['Tsugumi'] = { event = 392 }, +} diff --git a/scripts/zones/Abyssea-Attohwa/npcs/Akta.lua b/scripts/zones/Abyssea-Attohwa/npcs/Akta.lua deleted file mode 100644 index 55df5cd5ca6..00000000000 --- a/scripts/zones/Abyssea-Attohwa/npcs/Akta.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Abyssea-Attohwa --- NPC: Akta ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(392) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Abyssea-Attohwa/npcs/Alrauverat.lua b/scripts/zones/Abyssea-Attohwa/npcs/Alrauverat.lua deleted file mode 100644 index 3aa6224d418..00000000000 --- a/scripts/zones/Abyssea-Attohwa/npcs/Alrauverat.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- NPC: Alrauverat --- Zone: Abyssea - Attohwa --- !pos 23 -0.744 126 215 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(388) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Abyssea-Attohwa/npcs/Cavernous_Maw.lua b/scripts/zones/Abyssea-Attohwa/npcs/Cavernous_Maw.lua index 2ab9927fdd8..5b8b2b962f2 100644 --- a/scripts/zones/Abyssea-Attohwa/npcs/Cavernous_Maw.lua +++ b/scripts/zones/Abyssea-Attohwa/npcs/Cavernous_Maw.lua @@ -7,16 +7,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(200) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 200 and option == 1 then player:setPos(-338, -23, 47, 167, 118) diff --git a/scripts/zones/Abyssea-Attohwa/npcs/Conflux_Surveyor.lua b/scripts/zones/Abyssea-Attohwa/npcs/Conflux_Surveyor.lua index 7d8fc52c0a7..a9e6ef9a356 100644 --- a/scripts/zones/Abyssea-Attohwa/npcs/Conflux_Surveyor.lua +++ b/scripts/zones/Abyssea-Attohwa/npcs/Conflux_Surveyor.lua @@ -5,16 +5,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.surveyorOnTrigger(player, npc) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.abyssea.surveyorOnEventFinish(player, csid, option, npc) end diff --git a/scripts/zones/Abyssea-Attohwa/npcs/Cruor_Prospector.lua b/scripts/zones/Abyssea-Attohwa/npcs/Cruor_Prospector.lua index 63cb7d8a14c..ed43a916225 100644 --- a/scripts/zones/Abyssea-Attohwa/npcs/Cruor_Prospector.lua +++ b/scripts/zones/Abyssea-Attohwa/npcs/Cruor_Prospector.lua @@ -126,9 +126,6 @@ local prospectorEnhancement = }, } -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local cruor = player:getCurrency('cruor') local demilune = xi.abyssea.getDemiluneAbyssite(player) @@ -136,9 +133,6 @@ entity.onTrigger = function(player, npc) player:startEvent(2002, cruor, demilune) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) local itemCategory = bit.band(option, 0x07) local itemSelected = bit.band(bit.rshift(option, 16), 0x1F) diff --git a/scripts/zones/Abyssea-Attohwa/npcs/Gabriele.lua b/scripts/zones/Abyssea-Attohwa/npcs/Gabriele.lua deleted file mode 100644 index 57b55e5421a..00000000000 --- a/scripts/zones/Abyssea-Attohwa/npcs/Gabriele.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Abyssea-Attohwa --- NPC: Gabriele ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(394) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Abyssea-Attohwa/npcs/Gurdern.lua b/scripts/zones/Abyssea-Attohwa/npcs/Gurdern.lua deleted file mode 100644 index d8bc5cab094..00000000000 --- a/scripts/zones/Abyssea-Attohwa/npcs/Gurdern.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Abyssea-Attohwa --- NPC: Gurdern ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(390) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Abyssea-Attohwa/npcs/Mojuro-Nojuro.lua b/scripts/zones/Abyssea-Attohwa/npcs/Mojuro-Nojuro.lua deleted file mode 100644 index 8cf46492704..00000000000 --- a/scripts/zones/Abyssea-Attohwa/npcs/Mojuro-Nojuro.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Abyssea_attohwa --- NPC: Mojuro-Nojuro ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(380) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Abyssea-Attohwa/npcs/Monberaux.lua b/scripts/zones/Abyssea-Attohwa/npcs/Monberaux.lua deleted file mode 100644 index fdc4bfb2bdb..00000000000 --- a/scripts/zones/Abyssea-Attohwa/npcs/Monberaux.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Abyssea-Attohwa --- NPC: Monberaux ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(381) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Abyssea-Attohwa/npcs/Navisse.lua b/scripts/zones/Abyssea-Attohwa/npcs/Navisse.lua deleted file mode 100644 index 0960bbed862..00000000000 --- a/scripts/zones/Abyssea-Attohwa/npcs/Navisse.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Abyssea_Attohwa --- NPC: Navisse ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(379) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Abyssea-Attohwa/npcs/Rainhard.lua b/scripts/zones/Abyssea-Attohwa/npcs/Rainhard.lua deleted file mode 100644 index 9ec82031930..00000000000 --- a/scripts/zones/Abyssea-Attohwa/npcs/Rainhard.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Abyssea-Attohwa --- NPC: Rainhard ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(393) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Abyssea-Attohwa/npcs/Red_Ghost.lua b/scripts/zones/Abyssea-Attohwa/npcs/Red_Ghost.lua deleted file mode 100644 index 07130268116..00000000000 --- a/scripts/zones/Abyssea-Attohwa/npcs/Red_Ghost.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- NPC: Red Ghost --- Zone: Abyssea - Attohwa --- !pos 23 -0.744 126 215 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(389) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Abyssea-Attohwa/npcs/Soni-Muni.lua b/scripts/zones/Abyssea-Attohwa/npcs/Soni-Muni.lua deleted file mode 100644 index 3e0ef7a6308..00000000000 --- a/scripts/zones/Abyssea-Attohwa/npcs/Soni-Muni.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Abyssea-Attohwa --- NPC: Soni-Muni ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(1100) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Abyssea-Attohwa/npcs/Tsugumi.lua b/scripts/zones/Abyssea-Attohwa/npcs/Tsugumi.lua deleted file mode 100644 index c1e8d9131c6..00000000000 --- a/scripts/zones/Abyssea-Attohwa/npcs/Tsugumi.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Abyssea-Attohwa --- NPC: Tsugumi ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(392) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Abyssea-Attohwa/npcs/Veridical_Conflux_#00.lua b/scripts/zones/Abyssea-Attohwa/npcs/Veridical_Conflux_#00.lua index cd939728ff2..8a606bdd042 100644 --- a/scripts/zones/Abyssea-Attohwa/npcs/Veridical_Conflux_#00.lua +++ b/scripts/zones/Abyssea-Attohwa/npcs/Veridical_Conflux_#00.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Attohwa/npcs/Veridical_Conflux_#01.lua b/scripts/zones/Abyssea-Attohwa/npcs/Veridical_Conflux_#01.lua index 86b827ba611..67433f66e9b 100644 --- a/scripts/zones/Abyssea-Attohwa/npcs/Veridical_Conflux_#01.lua +++ b/scripts/zones/Abyssea-Attohwa/npcs/Veridical_Conflux_#01.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Attohwa/npcs/Veridical_Conflux_#02.lua b/scripts/zones/Abyssea-Attohwa/npcs/Veridical_Conflux_#02.lua index cc73d4a0bfa..8aaf8189cb7 100644 --- a/scripts/zones/Abyssea-Attohwa/npcs/Veridical_Conflux_#02.lua +++ b/scripts/zones/Abyssea-Attohwa/npcs/Veridical_Conflux_#02.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Attohwa/npcs/Veridical_Conflux_#03.lua b/scripts/zones/Abyssea-Attohwa/npcs/Veridical_Conflux_#03.lua index 6b2b9aad899..7aac137b8d9 100644 --- a/scripts/zones/Abyssea-Attohwa/npcs/Veridical_Conflux_#03.lua +++ b/scripts/zones/Abyssea-Attohwa/npcs/Veridical_Conflux_#03.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Attohwa/npcs/Veridical_Conflux_#04.lua b/scripts/zones/Abyssea-Attohwa/npcs/Veridical_Conflux_#04.lua index cf240e0b69e..c32da2e29d2 100644 --- a/scripts/zones/Abyssea-Attohwa/npcs/Veridical_Conflux_#04.lua +++ b/scripts/zones/Abyssea-Attohwa/npcs/Veridical_Conflux_#04.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Attohwa/npcs/Veridical_Conflux_#05.lua b/scripts/zones/Abyssea-Attohwa/npcs/Veridical_Conflux_#05.lua index a9819c2ad1e..3b3ebfaba15 100644 --- a/scripts/zones/Abyssea-Attohwa/npcs/Veridical_Conflux_#05.lua +++ b/scripts/zones/Abyssea-Attohwa/npcs/Veridical_Conflux_#05.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Attohwa/npcs/Veridical_Conflux_#06.lua b/scripts/zones/Abyssea-Attohwa/npcs/Veridical_Conflux_#06.lua index ffd4e65a9f6..96cd77c3385 100644 --- a/scripts/zones/Abyssea-Attohwa/npcs/Veridical_Conflux_#06.lua +++ b/scripts/zones/Abyssea-Attohwa/npcs/Veridical_Conflux_#06.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Attohwa/npcs/Veridical_Conflux_#07.lua b/scripts/zones/Abyssea-Attohwa/npcs/Veridical_Conflux_#07.lua index 2fb9a3e18d5..928b370d2ac 100644 --- a/scripts/zones/Abyssea-Attohwa/npcs/Veridical_Conflux_#07.lua +++ b/scripts/zones/Abyssea-Attohwa/npcs/Veridical_Conflux_#07.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Attohwa/npcs/Veridical_Conflux_#08.lua b/scripts/zones/Abyssea-Attohwa/npcs/Veridical_Conflux_#08.lua index c3019426938..a8924501244 100644 --- a/scripts/zones/Abyssea-Attohwa/npcs/Veridical_Conflux_#08.lua +++ b/scripts/zones/Abyssea-Attohwa/npcs/Veridical_Conflux_#08.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Attohwa/npcs/qm_berstuk.lua b/scripts/zones/Abyssea-Attohwa/npcs/qm_berstuk.lua index 8ed46975ed1..a3e1fd0a43b 100644 --- a/scripts/zones/Abyssea-Attohwa/npcs/qm_berstuk.lua +++ b/scripts/zones/Abyssea-Attohwa/npcs/qm_berstuk.lua @@ -17,10 +17,4 @@ entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, 0, 0, { xi.item.EXTENDED_EYESTALK }) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Abyssea-Attohwa/npcs/qm_blazing_eruca.lua b/scripts/zones/Abyssea-Attohwa/npcs/qm_blazing_eruca.lua index 8ada87b1026..9ee358d031e 100644 --- a/scripts/zones/Abyssea-Attohwa/npcs/qm_blazing_eruca.lua +++ b/scripts/zones/Abyssea-Attohwa/npcs/qm_blazing_eruca.lua @@ -17,10 +17,4 @@ entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, 0, 0, { xi.item.ERUCA_EGG }) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Abyssea-Attohwa/npcs/qm_drekavac.lua b/scripts/zones/Abyssea-Attohwa/npcs/qm_drekavac.lua index 83c3d4ebd5b..647b531a7ac 100644 --- a/scripts/zones/Abyssea-Attohwa/npcs/qm_drekavac.lua +++ b/scripts/zones/Abyssea-Attohwa/npcs/qm_drekavac.lua @@ -17,10 +17,4 @@ entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, 0, 0, { xi.item.SET_OF_WAILING_RAGS }) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Abyssea-Attohwa/npcs/qm_gaizkin.lua b/scripts/zones/Abyssea-Attohwa/npcs/qm_gaizkin.lua index bf57725399a..1996bfee4d9 100644 --- a/scripts/zones/Abyssea-Attohwa/npcs/qm_gaizkin.lua +++ b/scripts/zones/Abyssea-Attohwa/npcs/qm_gaizkin.lua @@ -17,10 +17,4 @@ entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, 0, 0, { xi.item.VIAL_OF_UNDYING_OOZE }) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Abyssea-Attohwa/npcs/qm_granite_borer.lua b/scripts/zones/Abyssea-Attohwa/npcs/qm_granite_borer.lua index 244f12d8a02..c3b3654605c 100644 --- a/scripts/zones/Abyssea-Attohwa/npcs/qm_granite_borer.lua +++ b/scripts/zones/Abyssea-Attohwa/npcs/qm_granite_borer.lua @@ -17,10 +17,4 @@ entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, 0, 0, { xi.item.WITHERED_COCOON }) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Abyssea-Attohwa/npcs/qm_itzpapalotl_1.lua b/scripts/zones/Abyssea-Attohwa/npcs/qm_itzpapalotl_1.lua index ca24a30256b..93e2beeb7a7 100644 --- a/scripts/zones/Abyssea-Attohwa/npcs/qm_itzpapalotl_1.lua +++ b/scripts/zones/Abyssea-Attohwa/npcs/qm_itzpapalotl_1.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.ABYSSEA_ATTOHWA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, ID.mob.ITZPAPALOTL_OFFSET, { xi.ki.VENOMOUS_WAMOURA_FEELER, xi.ki.BULBOUS_CRAWLER_COCOON, xi.ki.DISTENDED_CHIGOE_ABDOMEN }) end diff --git a/scripts/zones/Abyssea-Attohwa/npcs/qm_itzpapalotl_2.lua b/scripts/zones/Abyssea-Attohwa/npcs/qm_itzpapalotl_2.lua index f3579e016df..b7a4c4430a6 100644 --- a/scripts/zones/Abyssea-Attohwa/npcs/qm_itzpapalotl_2.lua +++ b/scripts/zones/Abyssea-Attohwa/npcs/qm_itzpapalotl_2.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.ABYSSEA_ATTOHWA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, ID.mob.ITZPAPALOTL_OFFSET + 4, { xi.ki.VENOMOUS_WAMOURA_FEELER, xi.ki.BULBOUS_CRAWLER_COCOON, xi.ki.DISTENDED_CHIGOE_ABDOMEN }) end diff --git a/scripts/zones/Abyssea-Attohwa/npcs/qm_itzpapalotl_3.lua b/scripts/zones/Abyssea-Attohwa/npcs/qm_itzpapalotl_3.lua index 1a14815df97..240d9d77e9f 100644 --- a/scripts/zones/Abyssea-Attohwa/npcs/qm_itzpapalotl_3.lua +++ b/scripts/zones/Abyssea-Attohwa/npcs/qm_itzpapalotl_3.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.ABYSSEA_ATTOHWA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, ID.mob.ITZPAPALOTL_OFFSET + 8, { xi.ki.VENOMOUS_WAMOURA_FEELER, xi.ki.BULBOUS_CRAWLER_COCOON, xi.ki.DISTENDED_CHIGOE_ABDOMEN }) end diff --git a/scripts/zones/Abyssea-Attohwa/npcs/qm_kampe.lua b/scripts/zones/Abyssea-Attohwa/npcs/qm_kampe.lua index 470c2e71353..f67457dd2de 100644 --- a/scripts/zones/Abyssea-Attohwa/npcs/qm_kampe.lua +++ b/scripts/zones/Abyssea-Attohwa/npcs/qm_kampe.lua @@ -17,10 +17,4 @@ entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, 0, 0, { xi.item.GORY_PINCER }) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Abyssea-Attohwa/npcs/qm_kharon.lua b/scripts/zones/Abyssea-Attohwa/npcs/qm_kharon.lua index 369d20cae10..442b552d174 100644 --- a/scripts/zones/Abyssea-Attohwa/npcs/qm_kharon.lua +++ b/scripts/zones/Abyssea-Attohwa/npcs/qm_kharon.lua @@ -17,10 +17,4 @@ entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, 0, 0, { xi.item.HANDFUL_OF_BONE_CHIPS }) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Abyssea-Attohwa/npcs/qm_maahes.lua b/scripts/zones/Abyssea-Attohwa/npcs/qm_maahes.lua index 772e387ed4e..f2cd72b0e8b 100644 --- a/scripts/zones/Abyssea-Attohwa/npcs/qm_maahes.lua +++ b/scripts/zones/Abyssea-Attohwa/npcs/qm_maahes.lua @@ -17,10 +17,4 @@ entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, 0, 0, { xi.item.COEURL_ROUND }) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Abyssea-Attohwa/npcs/qm_mielikki.lua b/scripts/zones/Abyssea-Attohwa/npcs/qm_mielikki.lua index ea106331333..b84250aa0c1 100644 --- a/scripts/zones/Abyssea-Attohwa/npcs/qm_mielikki.lua +++ b/scripts/zones/Abyssea-Attohwa/npcs/qm_mielikki.lua @@ -17,10 +17,4 @@ entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, 0, 0, { xi.item.GREAT_ROOT }) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Abyssea-Attohwa/npcs/qm_nightshade.lua b/scripts/zones/Abyssea-Attohwa/npcs/qm_nightshade.lua index 202c0b0027f..fcb1af08a76 100644 --- a/scripts/zones/Abyssea-Attohwa/npcs/qm_nightshade.lua +++ b/scripts/zones/Abyssea-Attohwa/npcs/qm_nightshade.lua @@ -17,10 +17,4 @@ entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, 0, 0, { xi.item.WITHERED_BUD }) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Abyssea-Attohwa/npcs/qm_pallid_percy.lua b/scripts/zones/Abyssea-Attohwa/npcs/qm_pallid_percy.lua index 15416e69d07..09ca589947b 100644 --- a/scripts/zones/Abyssea-Attohwa/npcs/qm_pallid_percy.lua +++ b/scripts/zones/Abyssea-Attohwa/npcs/qm_pallid_percy.lua @@ -17,10 +17,4 @@ entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, 0, 0, { xi.item.VIAL_OF_UNDYING_OOZE }) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Abyssea-Attohwa/npcs/qm_smok_1.lua b/scripts/zones/Abyssea-Attohwa/npcs/qm_smok_1.lua index f5604f1e6b1..5bbf4e4d5fe 100644 --- a/scripts/zones/Abyssea-Attohwa/npcs/qm_smok_1.lua +++ b/scripts/zones/Abyssea-Attohwa/npcs/qm_smok_1.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.ABYSSEA_ATTOHWA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, ID.mob.SMOK_OFFSET, { xi.ki.HOLLOW_DRAGON_EYE }) end diff --git a/scripts/zones/Abyssea-Attohwa/npcs/qm_smok_2.lua b/scripts/zones/Abyssea-Attohwa/npcs/qm_smok_2.lua index ad12446e8bf..a75f202c648 100644 --- a/scripts/zones/Abyssea-Attohwa/npcs/qm_smok_2.lua +++ b/scripts/zones/Abyssea-Attohwa/npcs/qm_smok_2.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.ABYSSEA_ATTOHWA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, ID.mob.SMOK_OFFSET + 4, { xi.ki.HOLLOW_DRAGON_EYE }) end diff --git a/scripts/zones/Abyssea-Attohwa/npcs/qm_smok_3.lua b/scripts/zones/Abyssea-Attohwa/npcs/qm_smok_3.lua index ff4fdfc6165..295c352c66a 100644 --- a/scripts/zones/Abyssea-Attohwa/npcs/qm_smok_3.lua +++ b/scripts/zones/Abyssea-Attohwa/npcs/qm_smok_3.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.ABYSSEA_ATTOHWA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, ID.mob.SMOK_OFFSET + 8, { xi.ki.HOLLOW_DRAGON_EYE }) end diff --git a/scripts/zones/Abyssea-Attohwa/npcs/qm_svarbhanu.lua b/scripts/zones/Abyssea-Attohwa/npcs/qm_svarbhanu.lua index 931786b04ec..76e39c7e353 100644 --- a/scripts/zones/Abyssea-Attohwa/npcs/qm_svarbhanu.lua +++ b/scripts/zones/Abyssea-Attohwa/npcs/qm_svarbhanu.lua @@ -17,10 +17,4 @@ entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, 0, 0, { xi.item.CRACKED_DRAGONSCALE }) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Abyssea-Attohwa/npcs/qm_titlacauan_1.lua b/scripts/zones/Abyssea-Attohwa/npcs/qm_titlacauan_1.lua index 1928df1200d..561e833276d 100644 --- a/scripts/zones/Abyssea-Attohwa/npcs/qm_titlacauan_1.lua +++ b/scripts/zones/Abyssea-Attohwa/npcs/qm_titlacauan_1.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.ABYSSEA_ATTOHWA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, ID.mob.TITLACAUAN_OFFSET, { xi.ki.BLOTCHED_DOOMED_TONGUE, xi.ki.CRACKED_SKELETON_CLAVICLE, xi.ki.WRITHING_GHOST_FINGER, xi.ki.RUSTED_HOUND_COLLAR }) end diff --git a/scripts/zones/Abyssea-Attohwa/npcs/qm_titlacauan_2.lua b/scripts/zones/Abyssea-Attohwa/npcs/qm_titlacauan_2.lua index 2a062d571d5..181dd460335 100644 --- a/scripts/zones/Abyssea-Attohwa/npcs/qm_titlacauan_2.lua +++ b/scripts/zones/Abyssea-Attohwa/npcs/qm_titlacauan_2.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.ABYSSEA_ATTOHWA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, ID.mob.TITLACAUAN_OFFSET + 4, { xi.ki.BLOTCHED_DOOMED_TONGUE, xi.ki.CRACKED_SKELETON_CLAVICLE, xi.ki.WRITHING_GHOST_FINGER, xi.ki.RUSTED_HOUND_COLLAR }) end diff --git a/scripts/zones/Abyssea-Attohwa/npcs/qm_titlacauan_3.lua b/scripts/zones/Abyssea-Attohwa/npcs/qm_titlacauan_3.lua index d6d0e4cb062..2e9e59c2a15 100644 --- a/scripts/zones/Abyssea-Attohwa/npcs/qm_titlacauan_3.lua +++ b/scripts/zones/Abyssea-Attohwa/npcs/qm_titlacauan_3.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.ABYSSEA_ATTOHWA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, ID.mob.TITLACAUAN_OFFSET + 8, { xi.ki.BLOTCHED_DOOMED_TONGUE, xi.ki.CRACKED_SKELETON_CLAVICLE, xi.ki.WRITHING_GHOST_FINGER, xi.ki.RUSTED_HOUND_COLLAR }) end diff --git a/scripts/zones/Abyssea-Attohwa/npcs/qm_ulhuadshi_1.lua b/scripts/zones/Abyssea-Attohwa/npcs/qm_ulhuadshi_1.lua index 2a55ccafb30..a8d008e75a8 100644 --- a/scripts/zones/Abyssea-Attohwa/npcs/qm_ulhuadshi_1.lua +++ b/scripts/zones/Abyssea-Attohwa/npcs/qm_ulhuadshi_1.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.ABYSSEA_ATTOHWA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, ID.mob.ULHUADSHI_OFFSET, { xi.ki.MUCID_WORM_SEGMENT, xi.ki.SHRIVELED_HECTEYES_STALK }) end diff --git a/scripts/zones/Abyssea-Attohwa/npcs/qm_ulhuadshi_2.lua b/scripts/zones/Abyssea-Attohwa/npcs/qm_ulhuadshi_2.lua index 67c3b893092..13e605949ca 100644 --- a/scripts/zones/Abyssea-Attohwa/npcs/qm_ulhuadshi_2.lua +++ b/scripts/zones/Abyssea-Attohwa/npcs/qm_ulhuadshi_2.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.ABYSSEA_ATTOHWA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, ID.mob.ULHUADSHI_OFFSET + 4, { xi.ki.MUCID_WORM_SEGMENT, xi.ki.SHRIVELED_HECTEYES_STALK }) end diff --git a/scripts/zones/Abyssea-Attohwa/npcs/qm_ulhuadshi_3.lua b/scripts/zones/Abyssea-Attohwa/npcs/qm_ulhuadshi_3.lua index 329d83e835f..9da8c2cd24b 100644 --- a/scripts/zones/Abyssea-Attohwa/npcs/qm_ulhuadshi_3.lua +++ b/scripts/zones/Abyssea-Attohwa/npcs/qm_ulhuadshi_3.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.ABYSSEA_ATTOHWA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, ID.mob.ULHUADSHI_OFFSET + 8, { xi.ki.MUCID_WORM_SEGMENT, xi.ki.SHRIVELED_HECTEYES_STALK }) end diff --git a/scripts/zones/Abyssea-Attohwa/npcs/qm_wherwetrice.lua b/scripts/zones/Abyssea-Attohwa/npcs/qm_wherwetrice.lua index 4dac6849743..db0df6ed98b 100644 --- a/scripts/zones/Abyssea-Attohwa/npcs/qm_wherwetrice.lua +++ b/scripts/zones/Abyssea-Attohwa/npcs/qm_wherwetrice.lua @@ -17,10 +17,4 @@ entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, 0, 0, { xi.item.MANGLED_COCKATRICE_SKIN }) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Abyssea-Grauberg/npcs/Cavernous_Maw.lua b/scripts/zones/Abyssea-Grauberg/npcs/Cavernous_Maw.lua index 89ca177c17f..ed41d4b244e 100644 --- a/scripts/zones/Abyssea-Grauberg/npcs/Cavernous_Maw.lua +++ b/scripts/zones/Abyssea-Grauberg/npcs/Cavernous_Maw.lua @@ -7,16 +7,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(200) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 200 and option == 1 then player:setPos(-71, 0.001, 601, 126, 106) diff --git a/scripts/zones/Abyssea-Grauberg/npcs/Conflux_Surveyor.lua b/scripts/zones/Abyssea-Grauberg/npcs/Conflux_Surveyor.lua index bc5df8a86e2..5eb2f88b359 100644 --- a/scripts/zones/Abyssea-Grauberg/npcs/Conflux_Surveyor.lua +++ b/scripts/zones/Abyssea-Grauberg/npcs/Conflux_Surveyor.lua @@ -5,16 +5,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.surveyorOnTrigger(player, npc) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.abyssea.surveyorOnEventFinish(player, csid, option, npc) end diff --git a/scripts/zones/Abyssea-Grauberg/npcs/Cruor_Prospector.lua b/scripts/zones/Abyssea-Grauberg/npcs/Cruor_Prospector.lua index 5aec0dc0634..f083add3a5b 100644 --- a/scripts/zones/Abyssea-Grauberg/npcs/Cruor_Prospector.lua +++ b/scripts/zones/Abyssea-Grauberg/npcs/Cruor_Prospector.lua @@ -131,9 +131,6 @@ local prospectorEnhancement = }, } -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local cruor = player:getCurrency('cruor') local demilune = xi.abyssea.getDemiluneAbyssite(player) @@ -141,9 +138,6 @@ entity.onTrigger = function(player, npc) player:startEvent(2002, cruor, demilune) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) local itemCategory = bit.band(option, 0x07) local itemSelected = bit.band(bit.rshift(option, 16), 0x1F) diff --git a/scripts/zones/Abyssea-Grauberg/npcs/DSgt_Cornelia.lua b/scripts/zones/Abyssea-Grauberg/npcs/DSgt_Cornelia.lua index 53fc6e70470..aca6f5e7d67 100644 --- a/scripts/zones/Abyssea-Grauberg/npcs/DSgt_Cornelia.lua +++ b/scripts/zones/Abyssea-Grauberg/npcs/DSgt_Cornelia.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.sergeantOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Grauberg/npcs/DSgt_Tosuka.lua b/scripts/zones/Abyssea-Grauberg/npcs/DSgt_Tosuka.lua index 53fc6e70470..aca6f5e7d67 100644 --- a/scripts/zones/Abyssea-Grauberg/npcs/DSgt_Tosuka.lua +++ b/scripts/zones/Abyssea-Grauberg/npcs/DSgt_Tosuka.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.sergeantOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Grauberg/npcs/DSgt_Wolfgang.lua b/scripts/zones/Abyssea-Grauberg/npcs/DSgt_Wolfgang.lua index 53fc6e70470..aca6f5e7d67 100644 --- a/scripts/zones/Abyssea-Grauberg/npcs/DSgt_Wolfgang.lua +++ b/scripts/zones/Abyssea-Grauberg/npcs/DSgt_Wolfgang.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.sergeantOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Grauberg/npcs/Dominion_Sergeant.lua b/scripts/zones/Abyssea-Grauberg/npcs/Dominion_Sergeant.lua deleted file mode 100644 index 881f1cd210e..00000000000 --- a/scripts/zones/Abyssea-Grauberg/npcs/Dominion_Sergeant.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Abyssea - Grauberg --- NPC: Dominion Sergeant ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(500) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Abyssea-Grauberg/npcs/Dominion_Tactician.lua b/scripts/zones/Abyssea-Grauberg/npcs/Dominion_Tactician.lua index 1c5a6371e81..7edb1ffa2b6 100644 --- a/scripts/zones/Abyssea-Grauberg/npcs/Dominion_Tactician.lua +++ b/scripts/zones/Abyssea-Grauberg/npcs/Dominion_Tactician.lua @@ -95,9 +95,6 @@ local function giveAugmentedItem(player, itemID, augmentList, maxAugments) end end -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local dominionNotes = player:getCurrency('dominion_note') local trophyMask = 0 -- 5 bits per trophy, cap at 30ea (31 can be displayed, but non-retail), 5th echelon is least sig diff --git a/scripts/zones/Abyssea-Grauberg/npcs/Veridical_Conflux_#01.lua b/scripts/zones/Abyssea-Grauberg/npcs/Veridical_Conflux_#01.lua index d0e7b73493a..779667fa5bb 100644 --- a/scripts/zones/Abyssea-Grauberg/npcs/Veridical_Conflux_#01.lua +++ b/scripts/zones/Abyssea-Grauberg/npcs/Veridical_Conflux_#01.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Grauberg/npcs/Veridical_Conflux_#02.lua b/scripts/zones/Abyssea-Grauberg/npcs/Veridical_Conflux_#02.lua index 1c21fd6eb06..d8630375fc0 100644 --- a/scripts/zones/Abyssea-Grauberg/npcs/Veridical_Conflux_#02.lua +++ b/scripts/zones/Abyssea-Grauberg/npcs/Veridical_Conflux_#02.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Grauberg/npcs/Veridical_Conflux_#03.lua b/scripts/zones/Abyssea-Grauberg/npcs/Veridical_Conflux_#03.lua index e8dd142162a..f8bae75c70f 100644 --- a/scripts/zones/Abyssea-Grauberg/npcs/Veridical_Conflux_#03.lua +++ b/scripts/zones/Abyssea-Grauberg/npcs/Veridical_Conflux_#03.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Grauberg/npcs/Veridical_Conflux_#04.lua b/scripts/zones/Abyssea-Grauberg/npcs/Veridical_Conflux_#04.lua index e065e45c7d5..f6121fc7a51 100644 --- a/scripts/zones/Abyssea-Grauberg/npcs/Veridical_Conflux_#04.lua +++ b/scripts/zones/Abyssea-Grauberg/npcs/Veridical_Conflux_#04.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Grauberg/npcs/Veridical_Conflux_#05.lua b/scripts/zones/Abyssea-Grauberg/npcs/Veridical_Conflux_#05.lua index 9ccb14ca52f..e4f50d3c463 100644 --- a/scripts/zones/Abyssea-Grauberg/npcs/Veridical_Conflux_#05.lua +++ b/scripts/zones/Abyssea-Grauberg/npcs/Veridical_Conflux_#05.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Grauberg/npcs/Veridical_Conflux_#06.lua b/scripts/zones/Abyssea-Grauberg/npcs/Veridical_Conflux_#06.lua index e6f7252c1b6..e4bfb44be16 100644 --- a/scripts/zones/Abyssea-Grauberg/npcs/Veridical_Conflux_#06.lua +++ b/scripts/zones/Abyssea-Grauberg/npcs/Veridical_Conflux_#06.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Grauberg/npcs/Veridical_Conflux_#07.lua b/scripts/zones/Abyssea-Grauberg/npcs/Veridical_Conflux_#07.lua index c8efcdb6f32..f2672fc1572 100644 --- a/scripts/zones/Abyssea-Grauberg/npcs/Veridical_Conflux_#07.lua +++ b/scripts/zones/Abyssea-Grauberg/npcs/Veridical_Conflux_#07.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Grauberg/npcs/Veridical_Conflux_#08.lua b/scripts/zones/Abyssea-Grauberg/npcs/Veridical_Conflux_#08.lua index effe07d0650..cc9fbabec08 100644 --- a/scripts/zones/Abyssea-Grauberg/npcs/Veridical_Conflux_#08.lua +++ b/scripts/zones/Abyssea-Grauberg/npcs/Veridical_Conflux_#08.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Grauberg/npcs/qm_alfard_1.lua b/scripts/zones/Abyssea-Grauberg/npcs/qm_alfard_1.lua index 27e1592620e..1fd89ced049 100644 --- a/scripts/zones/Abyssea-Grauberg/npcs/qm_alfard_1.lua +++ b/scripts/zones/Abyssea-Grauberg/npcs/qm_alfard_1.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.ABYSSEA_GRAUBERG] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, ID.mob.ALFARD_OFFSET, { xi.ki.VENOMOUS_HYDRA_FANG }) end diff --git a/scripts/zones/Abyssea-Grauberg/npcs/qm_alfard_2.lua b/scripts/zones/Abyssea-Grauberg/npcs/qm_alfard_2.lua index df18cddfe2b..3a3acb49a20 100644 --- a/scripts/zones/Abyssea-Grauberg/npcs/qm_alfard_2.lua +++ b/scripts/zones/Abyssea-Grauberg/npcs/qm_alfard_2.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.ABYSSEA_GRAUBERG] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, ID.mob.ALFARD_OFFSET + 4, { xi.ki.VENOMOUS_HYDRA_FANG }) end diff --git a/scripts/zones/Abyssea-Grauberg/npcs/qm_alfard_3.lua b/scripts/zones/Abyssea-Grauberg/npcs/qm_alfard_3.lua index fec2d1f00e9..bd5c1397fae 100644 --- a/scripts/zones/Abyssea-Grauberg/npcs/qm_alfard_3.lua +++ b/scripts/zones/Abyssea-Grauberg/npcs/qm_alfard_3.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.ABYSSEA_GRAUBERG] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, ID.mob.ALFARD_OFFSET + 8, { xi.ki.VENOMOUS_HYDRA_FANG }) end diff --git a/scripts/zones/Abyssea-Grauberg/npcs/qm_amphitrite_1.lua b/scripts/zones/Abyssea-Grauberg/npcs/qm_amphitrite_1.lua index 93adef7bcd6..6fb02b22e04 100644 --- a/scripts/zones/Abyssea-Grauberg/npcs/qm_amphitrite_1.lua +++ b/scripts/zones/Abyssea-Grauberg/npcs/qm_amphitrite_1.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.ABYSSEA_GRAUBERG] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, ID.mob.AMPHITRITE_OFFSET, { xi.ki.VARIEGATED_URAGNITE_SHELL }) end diff --git a/scripts/zones/Abyssea-Grauberg/npcs/qm_amphitrite_2.lua b/scripts/zones/Abyssea-Grauberg/npcs/qm_amphitrite_2.lua index c7741041c0f..31ea7cc190d 100644 --- a/scripts/zones/Abyssea-Grauberg/npcs/qm_amphitrite_2.lua +++ b/scripts/zones/Abyssea-Grauberg/npcs/qm_amphitrite_2.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.ABYSSEA_GRAUBERG] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, ID.mob.AMPHITRITE_OFFSET + 4, { xi.ki.VARIEGATED_URAGNITE_SHELL }) end diff --git a/scripts/zones/Abyssea-Grauberg/npcs/qm_amphitrite_3.lua b/scripts/zones/Abyssea-Grauberg/npcs/qm_amphitrite_3.lua index 4ee3f676f44..e28c4410be2 100644 --- a/scripts/zones/Abyssea-Grauberg/npcs/qm_amphitrite_3.lua +++ b/scripts/zones/Abyssea-Grauberg/npcs/qm_amphitrite_3.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.ABYSSEA_GRAUBERG] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, ID.mob.AMPHITRITE_OFFSET + 8, { xi.ki.VARIEGATED_URAGNITE_SHELL }) end diff --git a/scripts/zones/Abyssea-Grauberg/npcs/qm_azdaja_1.lua b/scripts/zones/Abyssea-Grauberg/npcs/qm_azdaja_1.lua index 03e014e451b..45a86aa9a56 100644 --- a/scripts/zones/Abyssea-Grauberg/npcs/qm_azdaja_1.lua +++ b/scripts/zones/Abyssea-Grauberg/npcs/qm_azdaja_1.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.ABYSSEA_GRAUBERG] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, ID.mob.AZDAJA_OFFSET, { xi.ki.VACANT_BUGARD_EYE }) end diff --git a/scripts/zones/Abyssea-Grauberg/npcs/qm_azdaja_2.lua b/scripts/zones/Abyssea-Grauberg/npcs/qm_azdaja_2.lua index 6b32d5a251c..a64d47792f3 100644 --- a/scripts/zones/Abyssea-Grauberg/npcs/qm_azdaja_2.lua +++ b/scripts/zones/Abyssea-Grauberg/npcs/qm_azdaja_2.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.ABYSSEA_GRAUBERG] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, ID.mob.AZDAJA_OFFSET + 4, { xi.ki.VACANT_BUGARD_EYE }) end diff --git a/scripts/zones/Abyssea-Grauberg/npcs/qm_azdaja_3.lua b/scripts/zones/Abyssea-Grauberg/npcs/qm_azdaja_3.lua index d8e15644b6d..33e62cca56d 100644 --- a/scripts/zones/Abyssea-Grauberg/npcs/qm_azdaja_3.lua +++ b/scripts/zones/Abyssea-Grauberg/npcs/qm_azdaja_3.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.ABYSSEA_GRAUBERG] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, ID.mob.AZDAJA_OFFSET + 8, { xi.ki.VACANT_BUGARD_EYE }) end diff --git a/scripts/zones/Abyssea-Grauberg/npcs/qm_bomblix_flamefinger.lua b/scripts/zones/Abyssea-Grauberg/npcs/qm_bomblix_flamefinger.lua index 78ff76e2cb3..3b558ed048b 100644 --- a/scripts/zones/Abyssea-Grauberg/npcs/qm_bomblix_flamefinger.lua +++ b/scripts/zones/Abyssea-Grauberg/npcs/qm_bomblix_flamefinger.lua @@ -17,10 +17,4 @@ entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, 0, 0, { xi.item.JAR_OF_GOBLIN_GUNPOWDER, xi.item.JAR_OF_GOBLIN_OIL }) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Abyssea-Grauberg/npcs/qm_burstrox_powderpate.lua b/scripts/zones/Abyssea-Grauberg/npcs/qm_burstrox_powderpate.lua index 44f75eee3b1..25018a536aa 100644 --- a/scripts/zones/Abyssea-Grauberg/npcs/qm_burstrox_powderpate.lua +++ b/scripts/zones/Abyssea-Grauberg/npcs/qm_burstrox_powderpate.lua @@ -17,10 +17,4 @@ entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, 0, 0, { xi.item.LENGTH_OF_GOBLIN_ROPE }) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Abyssea-Grauberg/npcs/qm_ika_roa.lua b/scripts/zones/Abyssea-Grauberg/npcs/qm_ika_roa.lua index 5ecba4469e3..ab5a9432c93 100644 --- a/scripts/zones/Abyssea-Grauberg/npcs/qm_ika_roa.lua +++ b/scripts/zones/Abyssea-Grauberg/npcs/qm_ika_roa.lua @@ -17,10 +17,4 @@ entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, 0, 0, { xi.item.HIGH_QUALITY_PUGIL_SCALE }) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Abyssea-Grauberg/npcs/qm_ironclad_sunderer.lua b/scripts/zones/Abyssea-Grauberg/npcs/qm_ironclad_sunderer.lua index 27041b2e9ee..69885fa0035 100644 --- a/scripts/zones/Abyssea-Grauberg/npcs/qm_ironclad_sunderer.lua +++ b/scripts/zones/Abyssea-Grauberg/npcs/qm_ironclad_sunderer.lua @@ -17,10 +17,4 @@ entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, 0, 0, { xi.item.TEEKESSELCHEN_FRAGMENT, xi.item.DARKFLAME_ARM }) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Abyssea-Grauberg/npcs/qm_lorelei.lua b/scripts/zones/Abyssea-Grauberg/npcs/qm_lorelei.lua index 2485d109816..2c07d366298 100644 --- a/scripts/zones/Abyssea-Grauberg/npcs/qm_lorelei.lua +++ b/scripts/zones/Abyssea-Grauberg/npcs/qm_lorelei.lua @@ -17,10 +17,4 @@ entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, 0, 0, { xi.item.FAY_TEARDROP }) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Abyssea-Grauberg/npcs/qm_minaruja.lua b/scripts/zones/Abyssea-Grauberg/npcs/qm_minaruja.lua index 91f199ec63e..ab43d64619e 100644 --- a/scripts/zones/Abyssea-Grauberg/npcs/qm_minaruja.lua +++ b/scripts/zones/Abyssea-Grauberg/npcs/qm_minaruja.lua @@ -17,10 +17,4 @@ entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, 0, 0, { xi.item.PURSUERS_WING }) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Abyssea-Grauberg/npcs/qm_ningishzida.lua b/scripts/zones/Abyssea-Grauberg/npcs/qm_ningishzida.lua index 2802490d238..13ac3c55c48 100644 --- a/scripts/zones/Abyssea-Grauberg/npcs/qm_ningishzida.lua +++ b/scripts/zones/Abyssea-Grauberg/npcs/qm_ningishzida.lua @@ -17,10 +17,4 @@ entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, 0, 0, { xi.item.MINARUJA_SKULL, xi.item.JACULUS_WING, xi.item.HIGH_QUALITY_WIVRE_HIDE }) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Abyssea-Grauberg/npcs/qm_raja_1.lua b/scripts/zones/Abyssea-Grauberg/npcs/qm_raja_1.lua index 0a5b38716d1..62ad91d8feb 100644 --- a/scripts/zones/Abyssea-Grauberg/npcs/qm_raja_1.lua +++ b/scripts/zones/Abyssea-Grauberg/npcs/qm_raja_1.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.ABYSSEA_GRAUBERG] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, ID.mob.RAJA_OFFSET, { xi.ki.WARPED_CHARIOT_PLATE, xi.ki.SHATTERED_IRON_GIANT_CHAIN }) end diff --git a/scripts/zones/Abyssea-Grauberg/npcs/qm_raja_2.lua b/scripts/zones/Abyssea-Grauberg/npcs/qm_raja_2.lua index 25caa4c22b5..70d15f82e63 100644 --- a/scripts/zones/Abyssea-Grauberg/npcs/qm_raja_2.lua +++ b/scripts/zones/Abyssea-Grauberg/npcs/qm_raja_2.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.ABYSSEA_GRAUBERG] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, ID.mob.RAJA_OFFSET + 4, { xi.ki.WARPED_CHARIOT_PLATE, xi.ki.SHATTERED_IRON_GIANT_CHAIN }) end diff --git a/scripts/zones/Abyssea-Grauberg/npcs/qm_raja_3.lua b/scripts/zones/Abyssea-Grauberg/npcs/qm_raja_3.lua index 245e14c0d5b..c06b6855ba1 100644 --- a/scripts/zones/Abyssea-Grauberg/npcs/qm_raja_3.lua +++ b/scripts/zones/Abyssea-Grauberg/npcs/qm_raja_3.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.ABYSSEA_GRAUBERG] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, ID.mob.RAJA_OFFSET + 8, { xi.ki.WARPED_CHARIOT_PLATE, xi.ki.SHATTERED_IRON_GIANT_CHAIN }) end diff --git a/scripts/zones/Abyssea-Grauberg/npcs/qm_teekesselchen.lua b/scripts/zones/Abyssea-Grauberg/npcs/qm_teekesselchen.lua index 49afa5ee608..1dd3b2cc207 100644 --- a/scripts/zones/Abyssea-Grauberg/npcs/qm_teekesselchen.lua +++ b/scripts/zones/Abyssea-Grauberg/npcs/qm_teekesselchen.lua @@ -17,10 +17,4 @@ entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, 0, 0, { xi.item.FLASK_OF_BUBBLING_OIL }) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Abyssea-Grauberg/npcs/qm_teugghia.lua b/scripts/zones/Abyssea-Grauberg/npcs/qm_teugghia.lua index 8933cd1e126..179f6227c61 100644 --- a/scripts/zones/Abyssea-Grauberg/npcs/qm_teugghia.lua +++ b/scripts/zones/Abyssea-Grauberg/npcs/qm_teugghia.lua @@ -17,10 +17,4 @@ entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, 0, 0, { xi.item.NAIADS_LOCK, xi.item.UNSEELIE_EYE }) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Abyssea-Grauberg/npcs/qm_xibalba.lua b/scripts/zones/Abyssea-Grauberg/npcs/qm_xibalba.lua index 84fa7e6d05c..46ca7f383dd 100644 --- a/scripts/zones/Abyssea-Grauberg/npcs/qm_xibalba.lua +++ b/scripts/zones/Abyssea-Grauberg/npcs/qm_xibalba.lua @@ -17,10 +17,4 @@ entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, 0, 0, { xi.item.DECAYING_MOLAR }) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Abyssea-Konschtat/npcs/Cavernous_Maw.lua b/scripts/zones/Abyssea-Konschtat/npcs/Cavernous_Maw.lua index 7ef9829d59b..519209648a7 100644 --- a/scripts/zones/Abyssea-Konschtat/npcs/Cavernous_Maw.lua +++ b/scripts/zones/Abyssea-Konschtat/npcs/Cavernous_Maw.lua @@ -7,16 +7,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(200) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 200 and option == 1 then player:setPos(91, -68, -582, 237, 108) diff --git a/scripts/zones/Abyssea-Konschtat/npcs/Conflux_Surveyor.lua b/scripts/zones/Abyssea-Konschtat/npcs/Conflux_Surveyor.lua index 165a258e4ce..0bb3f9be1f0 100644 --- a/scripts/zones/Abyssea-Konschtat/npcs/Conflux_Surveyor.lua +++ b/scripts/zones/Abyssea-Konschtat/npcs/Conflux_Surveyor.lua @@ -6,16 +6,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.surveyorOnTrigger(player, npc) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.abyssea.surveyorOnEventFinish(player, csid, option, npc) end diff --git a/scripts/zones/Abyssea-Konschtat/npcs/Cruor_Prospector.lua b/scripts/zones/Abyssea-Konschtat/npcs/Cruor_Prospector.lua index 0799bfda429..bd5afb71504 100644 --- a/scripts/zones/Abyssea-Konschtat/npcs/Cruor_Prospector.lua +++ b/scripts/zones/Abyssea-Konschtat/npcs/Cruor_Prospector.lua @@ -28,16 +28,10 @@ local localProspectorItems = [itemType.ENHANCEMENT] = xi.abyssea.visionsCruorProspectorBuffs, } -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.visionsCruorProspectorOnTrigger(player, npc) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.abyssea.visionsCruorProspectorOnEventFinish(player, csid, option, localProspectorItems) end diff --git a/scripts/zones/Abyssea-Konschtat/npcs/Veridical_Conflux_#01.lua b/scripts/zones/Abyssea-Konschtat/npcs/Veridical_Conflux_#01.lua index eefc14d11d0..d6eb5b677a2 100644 --- a/scripts/zones/Abyssea-Konschtat/npcs/Veridical_Conflux_#01.lua +++ b/scripts/zones/Abyssea-Konschtat/npcs/Veridical_Conflux_#01.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Konschtat/npcs/Veridical_Conflux_#02.lua b/scripts/zones/Abyssea-Konschtat/npcs/Veridical_Conflux_#02.lua index 5241ed2012d..9dbc43d2273 100644 --- a/scripts/zones/Abyssea-Konschtat/npcs/Veridical_Conflux_#02.lua +++ b/scripts/zones/Abyssea-Konschtat/npcs/Veridical_Conflux_#02.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Konschtat/npcs/Veridical_Conflux_#03.lua b/scripts/zones/Abyssea-Konschtat/npcs/Veridical_Conflux_#03.lua index 90e9baffd8b..1601adebb6c 100644 --- a/scripts/zones/Abyssea-Konschtat/npcs/Veridical_Conflux_#03.lua +++ b/scripts/zones/Abyssea-Konschtat/npcs/Veridical_Conflux_#03.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Konschtat/npcs/Veridical_Conflux_#04.lua b/scripts/zones/Abyssea-Konschtat/npcs/Veridical_Conflux_#04.lua index eb5e1ac9803..e4f0bb5bb61 100644 --- a/scripts/zones/Abyssea-Konschtat/npcs/Veridical_Conflux_#04.lua +++ b/scripts/zones/Abyssea-Konschtat/npcs/Veridical_Conflux_#04.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Konschtat/npcs/Veridical_Conflux_#05.lua b/scripts/zones/Abyssea-Konschtat/npcs/Veridical_Conflux_#05.lua index 7db38cbf580..5efed1919b3 100644 --- a/scripts/zones/Abyssea-Konschtat/npcs/Veridical_Conflux_#05.lua +++ b/scripts/zones/Abyssea-Konschtat/npcs/Veridical_Conflux_#05.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Konschtat/npcs/Veridical_Conflux_#06.lua b/scripts/zones/Abyssea-Konschtat/npcs/Veridical_Conflux_#06.lua index 53c3a7cfd2d..17c81cef800 100644 --- a/scripts/zones/Abyssea-Konschtat/npcs/Veridical_Conflux_#06.lua +++ b/scripts/zones/Abyssea-Konschtat/npcs/Veridical_Conflux_#06.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Konschtat/npcs/Veridical_Conflux_#07.lua b/scripts/zones/Abyssea-Konschtat/npcs/Veridical_Conflux_#07.lua index 1198f48f328..a617deaa421 100644 --- a/scripts/zones/Abyssea-Konschtat/npcs/Veridical_Conflux_#07.lua +++ b/scripts/zones/Abyssea-Konschtat/npcs/Veridical_Conflux_#07.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Konschtat/npcs/Veridical_Conflux_#08.lua b/scripts/zones/Abyssea-Konschtat/npcs/Veridical_Conflux_#08.lua index e02eabc490e..dbe7edf5941 100644 --- a/scripts/zones/Abyssea-Konschtat/npcs/Veridical_Conflux_#08.lua +++ b/scripts/zones/Abyssea-Konschtat/npcs/Veridical_Conflux_#08.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Konschtat/npcs/qm_alkonost.lua b/scripts/zones/Abyssea-Konschtat/npcs/qm_alkonost.lua index 3880bb1b997..6aa50f5de6f 100644 --- a/scripts/zones/Abyssea-Konschtat/npcs/qm_alkonost.lua +++ b/scripts/zones/Abyssea-Konschtat/npcs/qm_alkonost.lua @@ -17,10 +17,4 @@ entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, 0, 0, { xi.item.GIANT_BUGARD_TUSK }) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Abyssea-Konschtat/npcs/qm_arimaspi.lua b/scripts/zones/Abyssea-Konschtat/npcs/qm_arimaspi.lua index 68262161ad6..97b52389b00 100644 --- a/scripts/zones/Abyssea-Konschtat/npcs/qm_arimaspi.lua +++ b/scripts/zones/Abyssea-Konschtat/npcs/qm_arimaspi.lua @@ -17,10 +17,4 @@ entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, 0, 0, { xi.item.CLOUDED_LENS }) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Abyssea-Konschtat/npcs/qm_ashtaerh.lua b/scripts/zones/Abyssea-Konschtat/npcs/qm_ashtaerh.lua index bdf76eaa8fd..cc2e61e34b4 100644 --- a/scripts/zones/Abyssea-Konschtat/npcs/qm_ashtaerh.lua +++ b/scripts/zones/Abyssea-Konschtat/npcs/qm_ashtaerh.lua @@ -17,10 +17,4 @@ entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, 0, 0, { xi.item.MURMURING_GLOBULE }) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Abyssea-Konschtat/npcs/qm_bloodeye_vileberry.lua b/scripts/zones/Abyssea-Konschtat/npcs/qm_bloodeye_vileberry.lua index c8e7764b0b2..fad3bd99909 100644 --- a/scripts/zones/Abyssea-Konschtat/npcs/qm_bloodeye_vileberry.lua +++ b/scripts/zones/Abyssea-Konschtat/npcs/qm_bloodeye_vileberry.lua @@ -11,9 +11,6 @@ local ID = zones[xi.zone.ABYSSEA_KONSCHTAT] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, ID.mob.BLOODEYE_VILEBERRY_OFFSET, { xi.ki.TWISTED_TONBERRY_CROWN }) end diff --git a/scripts/zones/Abyssea-Konschtat/npcs/qm_bloodguzzler.lua b/scripts/zones/Abyssea-Konschtat/npcs/qm_bloodguzzler.lua index b136c5257d6..1dc58b39303 100644 --- a/scripts/zones/Abyssea-Konschtat/npcs/qm_bloodguzzler.lua +++ b/scripts/zones/Abyssea-Konschtat/npcs/qm_bloodguzzler.lua @@ -17,10 +17,4 @@ entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, 0, 0, { xi.item.VIAL_OF_EFT_BLOOD }) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Abyssea-Konschtat/npcs/qm_bombadeel.lua b/scripts/zones/Abyssea-Konschtat/npcs/qm_bombadeel.lua index 1835adbaa9b..0a297ed0bed 100644 --- a/scripts/zones/Abyssea-Konschtat/npcs/qm_bombadeel.lua +++ b/scripts/zones/Abyssea-Konschtat/npcs/qm_bombadeel.lua @@ -17,10 +17,4 @@ entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, 0, 0, { xi.item.CLUMP_OF_SNAKESKIN_MOSS }) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Abyssea-Konschtat/npcs/qm_clingy_clare.lua b/scripts/zones/Abyssea-Konschtat/npcs/qm_clingy_clare.lua index 33a9331a8fa..811a917b24f 100644 --- a/scripts/zones/Abyssea-Konschtat/npcs/qm_clingy_clare.lua +++ b/scripts/zones/Abyssea-Konschtat/npcs/qm_clingy_clare.lua @@ -17,10 +17,4 @@ entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, 0, 0, { xi.item.TINY_MORBOL_VINE }) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Abyssea-Konschtat/npcs/qm_eccentric_eve.lua b/scripts/zones/Abyssea-Konschtat/npcs/qm_eccentric_eve.lua index 943763cc957..66b7b8c3cae 100644 --- a/scripts/zones/Abyssea-Konschtat/npcs/qm_eccentric_eve.lua +++ b/scripts/zones/Abyssea-Konschtat/npcs/qm_eccentric_eve.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.ABYSSEA_KONSCHTAT] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, ID.mob.ECCENTRIC_EVE_OFFSET, { xi.ki.FRAGRANT_TREANT_PETAL, xi.ki.FETID_RAFFLESIA_STALK, xi.ki.DECAYING_MORBOL_TOOTH, xi.ki.TURBID_SLIME_OIL, xi.ki.VENOMOUS_PEISTE_CLAW }) end diff --git a/scripts/zones/Abyssea-Konschtat/npcs/qm_fear_gorta.lua b/scripts/zones/Abyssea-Konschtat/npcs/qm_fear_gorta.lua index 3f5b3d4fa6d..d157479c941 100644 --- a/scripts/zones/Abyssea-Konschtat/npcs/qm_fear_gorta.lua +++ b/scripts/zones/Abyssea-Konschtat/npcs/qm_fear_gorta.lua @@ -17,10 +17,4 @@ entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, 0, 0, { xi.item.SQUARE_OF_MOONGLOW_CLOTH }) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Abyssea-Konschtat/npcs/qm_hexenpilz.lua b/scripts/zones/Abyssea-Konschtat/npcs/qm_hexenpilz.lua index bf93b9f78b1..fa0b5d0bd75 100644 --- a/scripts/zones/Abyssea-Konschtat/npcs/qm_hexenpilz.lua +++ b/scripts/zones/Abyssea-Konschtat/npcs/qm_hexenpilz.lua @@ -17,10 +17,4 @@ entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, 0, 0, { xi.item.OBLIVISPORE_MUSHROOM }) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Abyssea-Konschtat/npcs/qm_keratyrannos.lua b/scripts/zones/Abyssea-Konschtat/npcs/qm_keratyrannos.lua index 574338526aa..e0f4fe7f325 100644 --- a/scripts/zones/Abyssea-Konschtat/npcs/qm_keratyrannos.lua +++ b/scripts/zones/Abyssea-Konschtat/npcs/qm_keratyrannos.lua @@ -17,10 +17,4 @@ entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, 0, 0, { xi.item.ARMORED_DRAGONHORN }) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Abyssea-Konschtat/npcs/qm_kukulkan.lua b/scripts/zones/Abyssea-Konschtat/npcs/qm_kukulkan.lua index a05950c29aa..c93b3d25996 100644 --- a/scripts/zones/Abyssea-Konschtat/npcs/qm_kukulkan.lua +++ b/scripts/zones/Abyssea-Konschtat/npcs/qm_kukulkan.lua @@ -11,9 +11,6 @@ local ID = zones[xi.zone.ABYSSEA_KONSCHTAT] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, ID.mob.KUKULKAN_OFFSET, { xi.ki.TATTERED_HIPPOGRYPH_WING, xi.ki.CRACKED_WIVRE_HORN, xi.ki.MUCID_AHRIMAN_EYEBALL }) end diff --git a/scripts/zones/Abyssea-Konschtat/npcs/qm_lentor.lua b/scripts/zones/Abyssea-Konschtat/npcs/qm_lentor.lua index 5b082db4359..28d71f4f38e 100644 --- a/scripts/zones/Abyssea-Konschtat/npcs/qm_lentor.lua +++ b/scripts/zones/Abyssea-Konschtat/npcs/qm_lentor.lua @@ -17,10 +17,4 @@ entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, 0, 0, { xi.item.GIANT_SLUG_EYESTALK }) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Abyssea-Konschtat/npcs/qm_sarcophilus.lua b/scripts/zones/Abyssea-Konschtat/npcs/qm_sarcophilus.lua index 85cd7bcf65e..d51416e054e 100644 --- a/scripts/zones/Abyssea-Konschtat/npcs/qm_sarcophilus.lua +++ b/scripts/zones/Abyssea-Konschtat/npcs/qm_sarcophilus.lua @@ -17,10 +17,4 @@ entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, 0, 0, { xi.item.RIPPED_EFT_SKIN }) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Abyssea-Konschtat/npcs/qm_siranpa-kamuy.lua b/scripts/zones/Abyssea-Konschtat/npcs/qm_siranpa-kamuy.lua index 8c7df156871..2729485315a 100644 --- a/scripts/zones/Abyssea-Konschtat/npcs/qm_siranpa-kamuy.lua +++ b/scripts/zones/Abyssea-Konschtat/npcs/qm_siranpa-kamuy.lua @@ -17,10 +17,4 @@ entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, 0, 0, { xi.item.ROTTING_EYEBALL }) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Abyssea-La_Theine/npcs/Cavernous_Maw.lua b/scripts/zones/Abyssea-La_Theine/npcs/Cavernous_Maw.lua index 84ff64effff..15118f0af5f 100644 --- a/scripts/zones/Abyssea-La_Theine/npcs/Cavernous_Maw.lua +++ b/scripts/zones/Abyssea-La_Theine/npcs/Cavernous_Maw.lua @@ -7,16 +7,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(200) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 200 and option == 1 then player:setPos(-562, 0.001, 640, 26, 102) diff --git a/scripts/zones/Abyssea-La_Theine/npcs/Conflux_Surveyor.lua b/scripts/zones/Abyssea-La_Theine/npcs/Conflux_Surveyor.lua index 9cd5aadf277..98a51475963 100644 --- a/scripts/zones/Abyssea-La_Theine/npcs/Conflux_Surveyor.lua +++ b/scripts/zones/Abyssea-La_Theine/npcs/Conflux_Surveyor.lua @@ -6,16 +6,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.surveyorOnTrigger(player, npc) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.abyssea.surveyorOnEventFinish(player, csid, option, npc) end diff --git a/scripts/zones/Abyssea-La_Theine/npcs/Cruor_Prospector.lua b/scripts/zones/Abyssea-La_Theine/npcs/Cruor_Prospector.lua index 4ce658bd3ad..50c2952e8c6 100644 --- a/scripts/zones/Abyssea-La_Theine/npcs/Cruor_Prospector.lua +++ b/scripts/zones/Abyssea-La_Theine/npcs/Cruor_Prospector.lua @@ -28,16 +28,10 @@ local localProspectorItems = [itemType.ENHANCEMENT] = xi.abyssea.visionsCruorProspectorBuffs, } -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.visionsCruorProspectorOnTrigger(player, npc) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.abyssea.visionsCruorProspectorOnEventFinish(player, csid, option, localProspectorItems) end diff --git a/scripts/zones/Abyssea-La_Theine/npcs/Veridical_Conflux_#01.lua b/scripts/zones/Abyssea-La_Theine/npcs/Veridical_Conflux_#01.lua index 82aa36428f3..6af5ac16097 100644 --- a/scripts/zones/Abyssea-La_Theine/npcs/Veridical_Conflux_#01.lua +++ b/scripts/zones/Abyssea-La_Theine/npcs/Veridical_Conflux_#01.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-La_Theine/npcs/Veridical_Conflux_#02.lua b/scripts/zones/Abyssea-La_Theine/npcs/Veridical_Conflux_#02.lua index 22167c723f4..aca8f85b072 100644 --- a/scripts/zones/Abyssea-La_Theine/npcs/Veridical_Conflux_#02.lua +++ b/scripts/zones/Abyssea-La_Theine/npcs/Veridical_Conflux_#02.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-La_Theine/npcs/Veridical_Conflux_#03.lua b/scripts/zones/Abyssea-La_Theine/npcs/Veridical_Conflux_#03.lua index 6597625c4f2..6367ee8d4f9 100644 --- a/scripts/zones/Abyssea-La_Theine/npcs/Veridical_Conflux_#03.lua +++ b/scripts/zones/Abyssea-La_Theine/npcs/Veridical_Conflux_#03.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-La_Theine/npcs/Veridical_Conflux_#04.lua b/scripts/zones/Abyssea-La_Theine/npcs/Veridical_Conflux_#04.lua index a01133090d4..8df5bf569be 100644 --- a/scripts/zones/Abyssea-La_Theine/npcs/Veridical_Conflux_#04.lua +++ b/scripts/zones/Abyssea-La_Theine/npcs/Veridical_Conflux_#04.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-La_Theine/npcs/Veridical_Conflux_#05.lua b/scripts/zones/Abyssea-La_Theine/npcs/Veridical_Conflux_#05.lua index 838f3f7ab1d..f27c3831bfa 100644 --- a/scripts/zones/Abyssea-La_Theine/npcs/Veridical_Conflux_#05.lua +++ b/scripts/zones/Abyssea-La_Theine/npcs/Veridical_Conflux_#05.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-La_Theine/npcs/Veridical_Conflux_#06.lua b/scripts/zones/Abyssea-La_Theine/npcs/Veridical_Conflux_#06.lua index 4a0e1819b90..9bc25372c60 100644 --- a/scripts/zones/Abyssea-La_Theine/npcs/Veridical_Conflux_#06.lua +++ b/scripts/zones/Abyssea-La_Theine/npcs/Veridical_Conflux_#06.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-La_Theine/npcs/Veridical_Conflux_#07.lua b/scripts/zones/Abyssea-La_Theine/npcs/Veridical_Conflux_#07.lua index f3a90ab91fe..6e8a8d28162 100644 --- a/scripts/zones/Abyssea-La_Theine/npcs/Veridical_Conflux_#07.lua +++ b/scripts/zones/Abyssea-La_Theine/npcs/Veridical_Conflux_#07.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-La_Theine/npcs/Veridical_Conflux_#08.lua b/scripts/zones/Abyssea-La_Theine/npcs/Veridical_Conflux_#08.lua index 1f4733e391e..26529e4060e 100644 --- a/scripts/zones/Abyssea-La_Theine/npcs/Veridical_Conflux_#08.lua +++ b/scripts/zones/Abyssea-La_Theine/npcs/Veridical_Conflux_#08.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-La_Theine/npcs/qm_adamastor.lua b/scripts/zones/Abyssea-La_Theine/npcs/qm_adamastor.lua index e8b9c51c115..dc981498ea0 100644 --- a/scripts/zones/Abyssea-La_Theine/npcs/qm_adamastor.lua +++ b/scripts/zones/Abyssea-La_Theine/npcs/qm_adamastor.lua @@ -17,10 +17,4 @@ entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, 0, 0, { xi.item.TROPHY_SHIELD }) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Abyssea-La_Theine/npcs/qm_baba_yaga.lua b/scripts/zones/Abyssea-La_Theine/npcs/qm_baba_yaga.lua index 59bebec9658..40388054d48 100644 --- a/scripts/zones/Abyssea-La_Theine/npcs/qm_baba_yaga.lua +++ b/scripts/zones/Abyssea-La_Theine/npcs/qm_baba_yaga.lua @@ -17,10 +17,4 @@ entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, 0, 0, { xi.item.PICEOUS_SCALE }) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Abyssea-La_Theine/npcs/qm_briareus.lua b/scripts/zones/Abyssea-La_Theine/npcs/qm_briareus.lua index 898ee055ea2..9b17b11c9d4 100644 --- a/scripts/zones/Abyssea-La_Theine/npcs/qm_briareus.lua +++ b/scripts/zones/Abyssea-La_Theine/npcs/qm_briareus.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.ABYSSEA_LA_THEINE] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, ID.mob.BRIAREUS_OFFSET, { xi.ki.DENTED_GIGAS_SHIELD, xi.ki.WARPED_GIGAS_ARMBAND, xi.ki.SEVERED_GIGAS_COLLAR }) end diff --git a/scripts/zones/Abyssea-La_Theine/npcs/qm_carabosse.lua b/scripts/zones/Abyssea-La_Theine/npcs/qm_carabosse.lua index c8a7a4837a1..61b55e7155b 100644 --- a/scripts/zones/Abyssea-La_Theine/npcs/qm_carabosse.lua +++ b/scripts/zones/Abyssea-La_Theine/npcs/qm_carabosse.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.ABYSSEA_LA_THEINE] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, ID.mob.CARABOSSE_OFFSET, { xi.ki.PELLUCID_FLY_EYE, xi.ki.SHIMMERING_PIXIE_PINION }) end diff --git a/scripts/zones/Abyssea-La_Theine/npcs/qm_dozing_dorian.lua b/scripts/zones/Abyssea-La_Theine/npcs/qm_dozing_dorian.lua index 6f585046eac..53a198fe65a 100644 --- a/scripts/zones/Abyssea-La_Theine/npcs/qm_dozing_dorian.lua +++ b/scripts/zones/Abyssea-La_Theine/npcs/qm_dozing_dorian.lua @@ -17,10 +17,4 @@ entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, 0, 0, { xi.item.DRIED_CHIGOE }) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Abyssea-La_Theine/npcs/qm_grandgousier.lua b/scripts/zones/Abyssea-La_Theine/npcs/qm_grandgousier.lua index 19055f08127..8d404e5c49f 100644 --- a/scripts/zones/Abyssea-La_Theine/npcs/qm_grandgousier.lua +++ b/scripts/zones/Abyssea-La_Theine/npcs/qm_grandgousier.lua @@ -17,10 +17,4 @@ entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, 0, 0, { xi.item.MASSIVE_ARMBAND }) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Abyssea-La_Theine/npcs/qm_hadhayosh.lua b/scripts/zones/Abyssea-La_Theine/npcs/qm_hadhayosh.lua index 78397403dfb..8579d7f1449 100644 --- a/scripts/zones/Abyssea-La_Theine/npcs/qm_hadhayosh.lua +++ b/scripts/zones/Abyssea-La_Theine/npcs/qm_hadhayosh.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.ABYSSEA_LA_THEINE] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, ID.mob.HADHAYOSH_OFFSET, { xi.ki.MARBLED_MUTTON_CHOP, xi.ki.BLOODIED_SABER_TOOTH, xi.ki.GLITTERING_PIXIE_CHOKER, xi.ki.BLOOD_SMEARED_GIGAS_HELM }) end diff --git a/scripts/zones/Abyssea-La_Theine/npcs/qm_la_theine_liege.lua b/scripts/zones/Abyssea-La_Theine/npcs/qm_la_theine_liege.lua index 92c9116f415..aac8ee541d5 100644 --- a/scripts/zones/Abyssea-La_Theine/npcs/qm_la_theine_liege.lua +++ b/scripts/zones/Abyssea-La_Theine/npcs/qm_la_theine_liege.lua @@ -17,10 +17,4 @@ entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, 0, 0, { xi.item.TRANSPARENT_INSECT_WING }) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Abyssea-La_Theine/npcs/qm_lugarhoo.lua b/scripts/zones/Abyssea-La_Theine/npcs/qm_lugarhoo.lua index b61d2098aad..c61eac262f9 100644 --- a/scripts/zones/Abyssea-La_Theine/npcs/qm_lugarhoo.lua +++ b/scripts/zones/Abyssea-La_Theine/npcs/qm_lugarhoo.lua @@ -17,10 +17,4 @@ entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, 0, 0, { xi.item.FILTHY_GNOLE_CLAW }) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Abyssea-La_Theine/npcs/qm_megantereon.lua b/scripts/zones/Abyssea-La_Theine/npcs/qm_megantereon.lua index e8402df8211..e6e3682eab3 100644 --- a/scripts/zones/Abyssea-La_Theine/npcs/qm_megantereon.lua +++ b/scripts/zones/Abyssea-La_Theine/npcs/qm_megantereon.lua @@ -17,10 +17,4 @@ entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, 0, 0, { xi.item.GARGANTUAN_BLACK_TIGER_FANG }) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Abyssea-La_Theine/npcs/qm_nguruvilu.lua b/scripts/zones/Abyssea-La_Theine/npcs/qm_nguruvilu.lua index 34de6789c0c..69919dda919 100644 --- a/scripts/zones/Abyssea-La_Theine/npcs/qm_nguruvilu.lua +++ b/scripts/zones/Abyssea-La_Theine/npcs/qm_nguruvilu.lua @@ -17,10 +17,4 @@ entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, 0, 0, { xi.item.WINTER_PUK_EGG }) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Abyssea-La_Theine/npcs/qm_pantagruel.lua b/scripts/zones/Abyssea-La_Theine/npcs/qm_pantagruel.lua index 948cc541aec..7815432f40e 100644 --- a/scripts/zones/Abyssea-La_Theine/npcs/qm_pantagruel.lua +++ b/scripts/zones/Abyssea-La_Theine/npcs/qm_pantagruel.lua @@ -17,10 +17,4 @@ entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, 0, 0, { xi.item.OVERSIZED_SOCK }) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Abyssea-La_Theine/npcs/qm_poroggo_dom_juan.lua b/scripts/zones/Abyssea-La_Theine/npcs/qm_poroggo_dom_juan.lua index 6b2ae2989b6..6afe5d0064c 100644 --- a/scripts/zones/Abyssea-La_Theine/npcs/qm_poroggo_dom_juan.lua +++ b/scripts/zones/Abyssea-La_Theine/npcs/qm_poroggo_dom_juan.lua @@ -17,10 +17,4 @@ entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, 0, 0, { xi.item.BUG_EATEN_HAT }) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Abyssea-La_Theine/npcs/qm_toppling_tuber.lua b/scripts/zones/Abyssea-La_Theine/npcs/qm_toppling_tuber.lua index 03df2faa902..6c61e30bd75 100644 --- a/scripts/zones/Abyssea-La_Theine/npcs/qm_toppling_tuber.lua +++ b/scripts/zones/Abyssea-La_Theine/npcs/qm_toppling_tuber.lua @@ -17,10 +17,4 @@ entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, 0, 0, { xi.item.GIANT_AGARICUS_MUSHROOM }) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Abyssea-La_Theine/npcs/qm_trudging_thomas.lua b/scripts/zones/Abyssea-La_Theine/npcs/qm_trudging_thomas.lua index 594851871eb..9328f4c7465 100644 --- a/scripts/zones/Abyssea-La_Theine/npcs/qm_trudging_thomas.lua +++ b/scripts/zones/Abyssea-La_Theine/npcs/qm_trudging_thomas.lua @@ -17,10 +17,4 @@ entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, 0, 0, { xi.item.RAW_MUTTON_CHOP }) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Abyssea-Misareaux/npcs/Cavernous_Maw.lua b/scripts/zones/Abyssea-Misareaux/npcs/Cavernous_Maw.lua index dab25b42ae7..5cdfaa96112 100644 --- a/scripts/zones/Abyssea-Misareaux/npcs/Cavernous_Maw.lua +++ b/scripts/zones/Abyssea-Misareaux/npcs/Cavernous_Maw.lua @@ -7,16 +7,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(200) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 200 and option == 1 then player:setPos(362, 0.001, -119, 4, 103) diff --git a/scripts/zones/Abyssea-Misareaux/npcs/Conflux_Surveyor.lua b/scripts/zones/Abyssea-Misareaux/npcs/Conflux_Surveyor.lua index d7ccac23836..f98154f1038 100644 --- a/scripts/zones/Abyssea-Misareaux/npcs/Conflux_Surveyor.lua +++ b/scripts/zones/Abyssea-Misareaux/npcs/Conflux_Surveyor.lua @@ -5,16 +5,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.surveyorOnTrigger(player, npc) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.abyssea.surveyorOnEventFinish(player, csid, option, npc) end diff --git a/scripts/zones/Abyssea-Misareaux/npcs/Cruor_Prospector.lua b/scripts/zones/Abyssea-Misareaux/npcs/Cruor_Prospector.lua index a7a8e339233..17df2046f75 100644 --- a/scripts/zones/Abyssea-Misareaux/npcs/Cruor_Prospector.lua +++ b/scripts/zones/Abyssea-Misareaux/npcs/Cruor_Prospector.lua @@ -125,9 +125,6 @@ local prospectorEnhancement = }, } -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local cruor = player:getCurrency('cruor') local demilune = xi.abyssea.getDemiluneAbyssite(player) @@ -135,9 +132,6 @@ entity.onTrigger = function(player, npc) player:startEvent(2002, cruor, demilune) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) local itemCategory = bit.band(option, 0x07) local itemSelected = bit.band(bit.rshift(option, 16), 0x1F) diff --git a/scripts/zones/Abyssea-Misareaux/npcs/Veridical_Conflux_#00.lua b/scripts/zones/Abyssea-Misareaux/npcs/Veridical_Conflux_#00.lua index 899cdd8ce23..c569de85b3e 100644 --- a/scripts/zones/Abyssea-Misareaux/npcs/Veridical_Conflux_#00.lua +++ b/scripts/zones/Abyssea-Misareaux/npcs/Veridical_Conflux_#00.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Misareaux/npcs/Veridical_Conflux_#01.lua b/scripts/zones/Abyssea-Misareaux/npcs/Veridical_Conflux_#01.lua index d17f6cbe37c..1a00595f856 100644 --- a/scripts/zones/Abyssea-Misareaux/npcs/Veridical_Conflux_#01.lua +++ b/scripts/zones/Abyssea-Misareaux/npcs/Veridical_Conflux_#01.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Misareaux/npcs/Veridical_Conflux_#02.lua b/scripts/zones/Abyssea-Misareaux/npcs/Veridical_Conflux_#02.lua index 66c734a3b30..3960f9fdbbf 100644 --- a/scripts/zones/Abyssea-Misareaux/npcs/Veridical_Conflux_#02.lua +++ b/scripts/zones/Abyssea-Misareaux/npcs/Veridical_Conflux_#02.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Misareaux/npcs/Veridical_Conflux_#03.lua b/scripts/zones/Abyssea-Misareaux/npcs/Veridical_Conflux_#03.lua index bc2627fbc14..b6e6637051a 100644 --- a/scripts/zones/Abyssea-Misareaux/npcs/Veridical_Conflux_#03.lua +++ b/scripts/zones/Abyssea-Misareaux/npcs/Veridical_Conflux_#03.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Misareaux/npcs/Veridical_Conflux_#04.lua b/scripts/zones/Abyssea-Misareaux/npcs/Veridical_Conflux_#04.lua index c83cb8ff45d..81264b56b4d 100644 --- a/scripts/zones/Abyssea-Misareaux/npcs/Veridical_Conflux_#04.lua +++ b/scripts/zones/Abyssea-Misareaux/npcs/Veridical_Conflux_#04.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Misareaux/npcs/Veridical_Conflux_#05.lua b/scripts/zones/Abyssea-Misareaux/npcs/Veridical_Conflux_#05.lua index cd96eba0132..5fdab036ac3 100644 --- a/scripts/zones/Abyssea-Misareaux/npcs/Veridical_Conflux_#05.lua +++ b/scripts/zones/Abyssea-Misareaux/npcs/Veridical_Conflux_#05.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Misareaux/npcs/Veridical_Conflux_#06.lua b/scripts/zones/Abyssea-Misareaux/npcs/Veridical_Conflux_#06.lua index 268a7d25e10..6336e6e0413 100644 --- a/scripts/zones/Abyssea-Misareaux/npcs/Veridical_Conflux_#06.lua +++ b/scripts/zones/Abyssea-Misareaux/npcs/Veridical_Conflux_#06.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Misareaux/npcs/Veridical_Conflux_#07.lua b/scripts/zones/Abyssea-Misareaux/npcs/Veridical_Conflux_#07.lua index 3cca7db99dc..635f5e43dde 100644 --- a/scripts/zones/Abyssea-Misareaux/npcs/Veridical_Conflux_#07.lua +++ b/scripts/zones/Abyssea-Misareaux/npcs/Veridical_Conflux_#07.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Misareaux/npcs/Veridical_Conflux_#08.lua b/scripts/zones/Abyssea-Misareaux/npcs/Veridical_Conflux_#08.lua index a35b268fcfe..f903b37060d 100644 --- a/scripts/zones/Abyssea-Misareaux/npcs/Veridical_Conflux_#08.lua +++ b/scripts/zones/Abyssea-Misareaux/npcs/Veridical_Conflux_#08.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Misareaux/npcs/qm1.lua b/scripts/zones/Abyssea-Misareaux/npcs/qm1.lua index 9ba769670d9..2a40248bba6 100644 --- a/scripts/zones/Abyssea-Misareaux/npcs/qm1.lua +++ b/scripts/zones/Abyssea-Misareaux/npcs/qm1.lua @@ -15,10 +15,4 @@ entity.onTrigger = function(player, npc) -- xi.abyssea.qmOnTrigger(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/Abyssea-Misareaux/npcs/qm10.lua b/scripts/zones/Abyssea-Misareaux/npcs/qm10.lua index 536f516ad1c..900a3e09e2f 100644 --- a/scripts/zones/Abyssea-Misareaux/npcs/qm10.lua +++ b/scripts/zones/Abyssea-Misareaux/npcs/qm10.lua @@ -15,10 +15,4 @@ entity.onTrigger = function(player, npc) -- xi.abyssea.qmOnTrigger(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/Abyssea-Misareaux/npcs/qm11.lua b/scripts/zones/Abyssea-Misareaux/npcs/qm11.lua index aebbdb8e2e7..d42acdc9a59 100644 --- a/scripts/zones/Abyssea-Misareaux/npcs/qm11.lua +++ b/scripts/zones/Abyssea-Misareaux/npcs/qm11.lua @@ -15,10 +15,4 @@ entity.onTrigger = function(player, npc) -- xi.abyssea.qmOnTrigger(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/Abyssea-Misareaux/npcs/qm12.lua b/scripts/zones/Abyssea-Misareaux/npcs/qm12.lua index 169111ae0bd..91f450b71e5 100644 --- a/scripts/zones/Abyssea-Misareaux/npcs/qm12.lua +++ b/scripts/zones/Abyssea-Misareaux/npcs/qm12.lua @@ -15,10 +15,4 @@ entity.onTrigger = function(player, npc) -- xi.abyssea.qmOnTrigger(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/Abyssea-Misareaux/npcs/qm2.lua b/scripts/zones/Abyssea-Misareaux/npcs/qm2.lua index a99feb9c98e..b68c0478648 100644 --- a/scripts/zones/Abyssea-Misareaux/npcs/qm2.lua +++ b/scripts/zones/Abyssea-Misareaux/npcs/qm2.lua @@ -15,10 +15,4 @@ entity.onTrigger = function(player, npc) -- xi.abyssea.qmOnTrigger(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/Abyssea-Misareaux/npcs/qm3.lua b/scripts/zones/Abyssea-Misareaux/npcs/qm3.lua index a2e8e76d176..6829605a370 100644 --- a/scripts/zones/Abyssea-Misareaux/npcs/qm3.lua +++ b/scripts/zones/Abyssea-Misareaux/npcs/qm3.lua @@ -15,10 +15,4 @@ entity.onTrigger = function(player, npc) -- xi.abyssea.qmOnTrigger(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/Abyssea-Misareaux/npcs/qm4.lua b/scripts/zones/Abyssea-Misareaux/npcs/qm4.lua index 85bbcbdc672..63f72a8a6aa 100644 --- a/scripts/zones/Abyssea-Misareaux/npcs/qm4.lua +++ b/scripts/zones/Abyssea-Misareaux/npcs/qm4.lua @@ -15,10 +15,4 @@ entity.onTrigger = function(player, npc) -- xi.abyssea.qmOnTrigger(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/Abyssea-Misareaux/npcs/qm5.lua b/scripts/zones/Abyssea-Misareaux/npcs/qm5.lua index 59feed24ab2..abf7d23088e 100644 --- a/scripts/zones/Abyssea-Misareaux/npcs/qm5.lua +++ b/scripts/zones/Abyssea-Misareaux/npcs/qm5.lua @@ -15,10 +15,4 @@ entity.onTrigger = function(player, npc) -- xi.abyssea.qmOnTrigger(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/Abyssea-Misareaux/npcs/qm6.lua b/scripts/zones/Abyssea-Misareaux/npcs/qm6.lua index 7b7dc979c3b..3caed9f1ace 100644 --- a/scripts/zones/Abyssea-Misareaux/npcs/qm6.lua +++ b/scripts/zones/Abyssea-Misareaux/npcs/qm6.lua @@ -15,10 +15,4 @@ entity.onTrigger = function(player, npc) -- xi.abyssea.qmOnTrigger(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/Abyssea-Misareaux/npcs/qm7.lua b/scripts/zones/Abyssea-Misareaux/npcs/qm7.lua index 604c205c675..f50fc377c90 100644 --- a/scripts/zones/Abyssea-Misareaux/npcs/qm7.lua +++ b/scripts/zones/Abyssea-Misareaux/npcs/qm7.lua @@ -15,10 +15,4 @@ entity.onTrigger = function(player, npc) -- xi.abyssea.qmOnTrigger(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/Abyssea-Misareaux/npcs/qm8.lua b/scripts/zones/Abyssea-Misareaux/npcs/qm8.lua index f267860c07c..f294c84dcd0 100644 --- a/scripts/zones/Abyssea-Misareaux/npcs/qm8.lua +++ b/scripts/zones/Abyssea-Misareaux/npcs/qm8.lua @@ -15,10 +15,4 @@ entity.onTrigger = function(player, npc) -- xi.abyssea.qmOnTrigger(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/Abyssea-Misareaux/npcs/qm9.lua b/scripts/zones/Abyssea-Misareaux/npcs/qm9.lua index b93f63ed555..3b863fd4657 100644 --- a/scripts/zones/Abyssea-Misareaux/npcs/qm9.lua +++ b/scripts/zones/Abyssea-Misareaux/npcs/qm9.lua @@ -15,10 +15,4 @@ entity.onTrigger = function(player, npc) -- xi.abyssea.qmOnTrigger(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/Abyssea-Tahrongi/npcs/Cavernous_Maw.lua b/scripts/zones/Abyssea-Tahrongi/npcs/Cavernous_Maw.lua index 5445a413092..ae91b8913f3 100644 --- a/scripts/zones/Abyssea-Tahrongi/npcs/Cavernous_Maw.lua +++ b/scripts/zones/Abyssea-Tahrongi/npcs/Cavernous_Maw.lua @@ -7,16 +7,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(200) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 200 and option == 1 then player:setPos(-28, 46, -680, 76, 117) diff --git a/scripts/zones/Abyssea-Tahrongi/npcs/Conflux_Surveyor.lua b/scripts/zones/Abyssea-Tahrongi/npcs/Conflux_Surveyor.lua index 40444f49eb4..590f2cb50ff 100644 --- a/scripts/zones/Abyssea-Tahrongi/npcs/Conflux_Surveyor.lua +++ b/scripts/zones/Abyssea-Tahrongi/npcs/Conflux_Surveyor.lua @@ -5,16 +5,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.surveyorOnTrigger(player, npc) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.abyssea.surveyorOnEventFinish(player, csid, option, npc) end diff --git a/scripts/zones/Abyssea-Tahrongi/npcs/Cruor_Prospector.lua b/scripts/zones/Abyssea-Tahrongi/npcs/Cruor_Prospector.lua index 32bc7413ea5..8426f1a775c 100644 --- a/scripts/zones/Abyssea-Tahrongi/npcs/Cruor_Prospector.lua +++ b/scripts/zones/Abyssea-Tahrongi/npcs/Cruor_Prospector.lua @@ -28,16 +28,10 @@ local localProspectorItems = [itemType.ENHANCEMENT] = xi.abyssea.visionsCruorProspectorBuffs, } -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.visionsCruorProspectorOnTrigger(player, npc) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.abyssea.visionsCruorProspectorOnEventFinish(player, csid, option, localProspectorItems) end diff --git a/scripts/zones/Abyssea-Tahrongi/npcs/Veridical_Conflux_#01.lua b/scripts/zones/Abyssea-Tahrongi/npcs/Veridical_Conflux_#01.lua index 979cac0743c..185bd20a63a 100644 --- a/scripts/zones/Abyssea-Tahrongi/npcs/Veridical_Conflux_#01.lua +++ b/scripts/zones/Abyssea-Tahrongi/npcs/Veridical_Conflux_#01.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Tahrongi/npcs/Veridical_Conflux_#02.lua b/scripts/zones/Abyssea-Tahrongi/npcs/Veridical_Conflux_#02.lua index bcec9a1e303..f32b2cdec31 100644 --- a/scripts/zones/Abyssea-Tahrongi/npcs/Veridical_Conflux_#02.lua +++ b/scripts/zones/Abyssea-Tahrongi/npcs/Veridical_Conflux_#02.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Tahrongi/npcs/Veridical_Conflux_#03.lua b/scripts/zones/Abyssea-Tahrongi/npcs/Veridical_Conflux_#03.lua index fd1d2eeb333..d0fb918dc07 100644 --- a/scripts/zones/Abyssea-Tahrongi/npcs/Veridical_Conflux_#03.lua +++ b/scripts/zones/Abyssea-Tahrongi/npcs/Veridical_Conflux_#03.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Tahrongi/npcs/Veridical_Conflux_#04.lua b/scripts/zones/Abyssea-Tahrongi/npcs/Veridical_Conflux_#04.lua index 48d075ed9b6..911a5a176e0 100644 --- a/scripts/zones/Abyssea-Tahrongi/npcs/Veridical_Conflux_#04.lua +++ b/scripts/zones/Abyssea-Tahrongi/npcs/Veridical_Conflux_#04.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Tahrongi/npcs/Veridical_Conflux_#05.lua b/scripts/zones/Abyssea-Tahrongi/npcs/Veridical_Conflux_#05.lua index ae2b1ffd497..ca6555cead6 100644 --- a/scripts/zones/Abyssea-Tahrongi/npcs/Veridical_Conflux_#05.lua +++ b/scripts/zones/Abyssea-Tahrongi/npcs/Veridical_Conflux_#05.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Tahrongi/npcs/Veridical_Conflux_#06.lua b/scripts/zones/Abyssea-Tahrongi/npcs/Veridical_Conflux_#06.lua index d686756133d..f90e14c2d0a 100644 --- a/scripts/zones/Abyssea-Tahrongi/npcs/Veridical_Conflux_#06.lua +++ b/scripts/zones/Abyssea-Tahrongi/npcs/Veridical_Conflux_#06.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Tahrongi/npcs/Veridical_Conflux_#07.lua b/scripts/zones/Abyssea-Tahrongi/npcs/Veridical_Conflux_#07.lua index d466878d3d3..253959ba2da 100644 --- a/scripts/zones/Abyssea-Tahrongi/npcs/Veridical_Conflux_#07.lua +++ b/scripts/zones/Abyssea-Tahrongi/npcs/Veridical_Conflux_#07.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Tahrongi/npcs/Veridical_Conflux_#08.lua b/scripts/zones/Abyssea-Tahrongi/npcs/Veridical_Conflux_#08.lua index 35c08c7acb8..fab069c5aac 100644 --- a/scripts/zones/Abyssea-Tahrongi/npcs/Veridical_Conflux_#08.lua +++ b/scripts/zones/Abyssea-Tahrongi/npcs/Veridical_Conflux_#08.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Tahrongi/npcs/qm_abas.lua b/scripts/zones/Abyssea-Tahrongi/npcs/qm_abas.lua index 20bae807aec..fdfc99c429a 100644 --- a/scripts/zones/Abyssea-Tahrongi/npcs/qm_abas.lua +++ b/scripts/zones/Abyssea-Tahrongi/npcs/qm_abas.lua @@ -17,10 +17,4 @@ entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, 0, 0, { xi.item.EFT_EGG }) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Abyssea-Tahrongi/npcs/qm_alectryon.lua b/scripts/zones/Abyssea-Tahrongi/npcs/qm_alectryon.lua index 7a58524711f..55680c74ee8 100644 --- a/scripts/zones/Abyssea-Tahrongi/npcs/qm_alectryon.lua +++ b/scripts/zones/Abyssea-Tahrongi/npcs/qm_alectryon.lua @@ -17,10 +17,4 @@ entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, 0, 0, { xi.item.CHUNK_OF_COCKATRICE_TAILMEAT, xi.item.QUIVERING_EFT_EGG }) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Abyssea-Tahrongi/npcs/qm_cannered_noz.lua b/scripts/zones/Abyssea-Tahrongi/npcs/qm_cannered_noz.lua index 74fa8082864..1aa0ca7cd48 100644 --- a/scripts/zones/Abyssea-Tahrongi/npcs/qm_cannered_noz.lua +++ b/scripts/zones/Abyssea-Tahrongi/npcs/qm_cannered_noz.lua @@ -17,10 +17,4 @@ entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, 0, 0, { xi.item.BALEFUL_SKULL }) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Abyssea-Tahrongi/npcs/qm_chloris.lua b/scripts/zones/Abyssea-Tahrongi/npcs/qm_chloris.lua index 551f034e1d6..47f7b3af362 100644 --- a/scripts/zones/Abyssea-Tahrongi/npcs/qm_chloris.lua +++ b/scripts/zones/Abyssea-Tahrongi/npcs/qm_chloris.lua @@ -11,9 +11,6 @@ local ID = zones[xi.zone.ABYSSEA_TAHRONGI] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, ID.mob.CHLORIS_OFFSET, { xi.ki.TORN_BAT_WING, xi.ki.VEINOUS_HECTEYES_EYELID, xi.ki.MOSSY_ADAMANTOISE_SHELL, xi.ki.GORY_SCORPION_CLAW }) end diff --git a/scripts/zones/Abyssea-Tahrongi/npcs/qm_gancanagh.lua b/scripts/zones/Abyssea-Tahrongi/npcs/qm_gancanagh.lua index de7004032f6..655dd7e15fa 100644 --- a/scripts/zones/Abyssea-Tahrongi/npcs/qm_gancanagh.lua +++ b/scripts/zones/Abyssea-Tahrongi/npcs/qm_gancanagh.lua @@ -17,10 +17,4 @@ entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, 0, 0, { xi.item.CLUMP_OF_ALKALINE_HUMUS }) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Abyssea-Tahrongi/npcs/qm_glavoid.lua b/scripts/zones/Abyssea-Tahrongi/npcs/qm_glavoid.lua index 2f4d4ef5f11..f274c892da4 100644 --- a/scripts/zones/Abyssea-Tahrongi/npcs/qm_glavoid.lua +++ b/scripts/zones/Abyssea-Tahrongi/npcs/qm_glavoid.lua @@ -11,9 +11,6 @@ local ID = zones[xi.zone.ABYSSEA_TAHRONGI] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, ID.mob.GLAVOID_OFFSET, { xi.ki.LUXURIANT_MANTICORE_MANE, xi.ki.FAT_LINED_COCKATRICE_SKIN, xi.ki.STICKY_GNAT_WING, xi.ki.SODDEN_SANDWORM_HUSK }) end diff --git a/scripts/zones/Abyssea-Tahrongi/npcs/qm_halimede.lua b/scripts/zones/Abyssea-Tahrongi/npcs/qm_halimede.lua index 4be32b61f7a..f616e7de2fe 100644 --- a/scripts/zones/Abyssea-Tahrongi/npcs/qm_halimede.lua +++ b/scripts/zones/Abyssea-Tahrongi/npcs/qm_halimede.lua @@ -17,10 +17,4 @@ entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, 0, 0, { xi.item.HIGH_QUALITY_CLIONID_WING }) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Abyssea-Tahrongi/npcs/qm_hedetet.lua b/scripts/zones/Abyssea-Tahrongi/npcs/qm_hedetet.lua index 030f9679169..8883cd4fc31 100644 --- a/scripts/zones/Abyssea-Tahrongi/npcs/qm_hedetet.lua +++ b/scripts/zones/Abyssea-Tahrongi/npcs/qm_hedetet.lua @@ -17,10 +17,4 @@ entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, 0, 0, { xi.item.VENOMOUS_SCORPION_STINGER, xi.item.CLUMP_OF_ACIDIC_HUMUS }) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Abyssea-Tahrongi/npcs/qm_lachrymater.lua b/scripts/zones/Abyssea-Tahrongi/npcs/qm_lachrymater.lua index 18d1aaf4f87..d043c8c1e63 100644 --- a/scripts/zones/Abyssea-Tahrongi/npcs/qm_lachrymater.lua +++ b/scripts/zones/Abyssea-Tahrongi/npcs/qm_lachrymater.lua @@ -17,10 +17,4 @@ entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, 0, 0, { xi.item.MOANING_VESTIGE }) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Abyssea-Tahrongi/npcs/qm_lacovie.lua b/scripts/zones/Abyssea-Tahrongi/npcs/qm_lacovie.lua index 6422c7077f0..2da44c2fbf0 100644 --- a/scripts/zones/Abyssea-Tahrongi/npcs/qm_lacovie.lua +++ b/scripts/zones/Abyssea-Tahrongi/npcs/qm_lacovie.lua @@ -11,9 +11,6 @@ local ID = zones[xi.zone.ABYSSEA_TAHRONGI] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, ID.mob.LACOVIE_OFFSET, { xi.ki.CHIPPED_SANDWORM_TOOTH, xi.ki.OVERGROWN_MANDRAGORA_FLOWER }) end diff --git a/scripts/zones/Abyssea-Tahrongi/npcs/qm_muscaliet.lua b/scripts/zones/Abyssea-Tahrongi/npcs/qm_muscaliet.lua index f6478df6973..1bb2113f4f9 100644 --- a/scripts/zones/Abyssea-Tahrongi/npcs/qm_muscaliet.lua +++ b/scripts/zones/Abyssea-Tahrongi/npcs/qm_muscaliet.lua @@ -17,10 +17,4 @@ entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, 0, 0, { xi.item.RESILIENT_MANE, xi.item.SMOOTH_WHISKER }) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Abyssea-Tahrongi/npcs/qm_ophanim.lua b/scripts/zones/Abyssea-Tahrongi/npcs/qm_ophanim.lua index 6005a9bf368..e4f87426de2 100644 --- a/scripts/zones/Abyssea-Tahrongi/npcs/qm_ophanim.lua +++ b/scripts/zones/Abyssea-Tahrongi/npcs/qm_ophanim.lua @@ -17,10 +17,4 @@ entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, 0, 0, { xi.item.SHRIVELED_WING, xi.item.TARNISHED_PINCER, xi.item.BLOODSHOT_HECTEYE }) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Abyssea-Tahrongi/npcs/qm_tefenet.lua b/scripts/zones/Abyssea-Tahrongi/npcs/qm_tefenet.lua index 05711d4fe22..195c60b315a 100644 --- a/scripts/zones/Abyssea-Tahrongi/npcs/qm_tefenet.lua +++ b/scripts/zones/Abyssea-Tahrongi/npcs/qm_tefenet.lua @@ -17,10 +17,4 @@ entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, 0, 0, { xi.item.SHOCKING_WHISKER }) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Abyssea-Tahrongi/npcs/qm_treble_noctules.lua b/scripts/zones/Abyssea-Tahrongi/npcs/qm_treble_noctules.lua index aee9e62354a..eaa60763662 100644 --- a/scripts/zones/Abyssea-Tahrongi/npcs/qm_treble_noctules.lua +++ b/scripts/zones/Abyssea-Tahrongi/npcs/qm_treble_noctules.lua @@ -17,10 +17,4 @@ entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, 0, 0, { xi.item.BLOODY_FANG, xi.item.EXORCISED_SKULL }) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Abyssea-Tahrongi/npcs/qm_vetehinen.lua b/scripts/zones/Abyssea-Tahrongi/npcs/qm_vetehinen.lua index 898f87c0c17..7fa228a60cc 100644 --- a/scripts/zones/Abyssea-Tahrongi/npcs/qm_vetehinen.lua +++ b/scripts/zones/Abyssea-Tahrongi/npcs/qm_vetehinen.lua @@ -17,10 +17,4 @@ entity.onTrigger = function(player, npc) xi.abyssea.qmOnTrigger(player, npc, 0, 0, { xi.item.HIGH_QUALITY_LIMULE_PINCER }) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Abyssea-Uleguerand/DefaultActions.lua b/scripts/zones/Abyssea-Uleguerand/DefaultActions.lua new file mode 100644 index 00000000000..d5050dcc44f --- /dev/null +++ b/scripts/zones/Abyssea-Uleguerand/DefaultActions.lua @@ -0,0 +1,16 @@ +-- local ID = zones[xi.zone.ABYSSEA_ULEGUERAND] + +return { + ['Ardea'] = { event = 353 }, + ['Aulavia'] = { event = 351 }, + ['Chamama'] = { event = 359 }, + ['Dheo_Nbolo'] = { event = 346 }, + ['Ehrhard'] = { event = 360 }, + ['Maat'] = { event = 355 }, + ['Pakke-Pokke'] = { event = 347 }, + ['Polikal-Ramikal'] = { event = 352 }, + ['Romaa_Mihgo'] = { event = 356 }, + ['Tiger_Tooth'] = { event = 361 }, + ['Trion'] = { event = 354 }, + ['Waylea'] = { event = 362 }, +} diff --git a/scripts/zones/Abyssea-Uleguerand/npcs/Ardea.lua b/scripts/zones/Abyssea-Uleguerand/npcs/Ardea.lua deleted file mode 100644 index 5fd3d923da8..00000000000 --- a/scripts/zones/Abyssea-Uleguerand/npcs/Ardea.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Abyssea_Uleguerand --- NPC: Ardea ------------------------------------ ----@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/Abyssea-Uleguerand/npcs/Aulavia.lua b/scripts/zones/Abyssea-Uleguerand/npcs/Aulavia.lua deleted file mode 100644 index e7fc660d90f..00000000000 --- a/scripts/zones/Abyssea-Uleguerand/npcs/Aulavia.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Abyssea_Uleguerand --- NPC: Aulavia ------------------------------------ ----@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/Abyssea-Uleguerand/npcs/Cavernous_Maw.lua b/scripts/zones/Abyssea-Uleguerand/npcs/Cavernous_Maw.lua index 68bc82c469f..226450874c9 100644 --- a/scripts/zones/Abyssea-Uleguerand/npcs/Cavernous_Maw.lua +++ b/scripts/zones/Abyssea-Uleguerand/npcs/Cavernous_Maw.lua @@ -7,16 +7,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(200) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 200 and option == 1 then player:setPos(269, -7, -75, 192, 112) diff --git a/scripts/zones/Abyssea-Uleguerand/npcs/Chamama.lua b/scripts/zones/Abyssea-Uleguerand/npcs/Chamama.lua deleted file mode 100644 index fc71ff03a61..00000000000 --- a/scripts/zones/Abyssea-Uleguerand/npcs/Chamama.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Abyssea_Uleguerand --- NPC: Chamama ------------------------------------ ----@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/Abyssea-Uleguerand/npcs/Conflux_Surveyor.lua b/scripts/zones/Abyssea-Uleguerand/npcs/Conflux_Surveyor.lua index 5674bcd4a37..03c58552352 100644 --- a/scripts/zones/Abyssea-Uleguerand/npcs/Conflux_Surveyor.lua +++ b/scripts/zones/Abyssea-Uleguerand/npcs/Conflux_Surveyor.lua @@ -5,16 +5,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.surveyorOnTrigger(player, npc) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.abyssea.surveyorOnEventFinish(player, csid, option, npc) end diff --git a/scripts/zones/Abyssea-Uleguerand/npcs/Cruor_Prospector.lua b/scripts/zones/Abyssea-Uleguerand/npcs/Cruor_Prospector.lua index e0f1594da7e..8f66180f3b2 100644 --- a/scripts/zones/Abyssea-Uleguerand/npcs/Cruor_Prospector.lua +++ b/scripts/zones/Abyssea-Uleguerand/npcs/Cruor_Prospector.lua @@ -127,9 +127,6 @@ local prospectorEnhancement = }, } -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local cruor = player:getCurrency('cruor') local demilune = xi.abyssea.getDemiluneAbyssite(player) @@ -137,9 +134,6 @@ entity.onTrigger = function(player, npc) player:startEvent(2002, cruor, demilune) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) local itemCategory = bit.band(option, 0x07) local itemSelected = bit.band(bit.rshift(option, 16), 0x1F) diff --git a/scripts/zones/Abyssea-Uleguerand/npcs/DSgt_Maat.lua b/scripts/zones/Abyssea-Uleguerand/npcs/DSgt_Maat.lua index 5d1c71f8fd8..6419f49a98d 100644 --- a/scripts/zones/Abyssea-Uleguerand/npcs/DSgt_Maat.lua +++ b/scripts/zones/Abyssea-Uleguerand/npcs/DSgt_Maat.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.sergeantOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Uleguerand/npcs/DSgt_Romaa.lua b/scripts/zones/Abyssea-Uleguerand/npcs/DSgt_Romaa.lua index 5d1c71f8fd8..6419f49a98d 100644 --- a/scripts/zones/Abyssea-Uleguerand/npcs/DSgt_Romaa.lua +++ b/scripts/zones/Abyssea-Uleguerand/npcs/DSgt_Romaa.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.sergeantOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Uleguerand/npcs/DSgt_Zazarg.lua b/scripts/zones/Abyssea-Uleguerand/npcs/DSgt_Zazarg.lua index 5d1c71f8fd8..6419f49a98d 100644 --- a/scripts/zones/Abyssea-Uleguerand/npcs/DSgt_Zazarg.lua +++ b/scripts/zones/Abyssea-Uleguerand/npcs/DSgt_Zazarg.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.sergeantOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Uleguerand/npcs/Dheo_Nbolo.lua b/scripts/zones/Abyssea-Uleguerand/npcs/Dheo_Nbolo.lua deleted file mode 100644 index e3ddae48ec7..00000000000 --- a/scripts/zones/Abyssea-Uleguerand/npcs/Dheo_Nbolo.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Abyssea_Uleguerand --- NPC: Dheo Nbolo ------------------------------------ ----@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/Abyssea-Uleguerand/npcs/Ehrhard.lua b/scripts/zones/Abyssea-Uleguerand/npcs/Ehrhard.lua deleted file mode 100644 index 549103c4db6..00000000000 --- a/scripts/zones/Abyssea-Uleguerand/npcs/Ehrhard.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Abyssea_Uleguerand --- NPC: Ehrhard ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(360) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Abyssea-Uleguerand/npcs/Maat.lua b/scripts/zones/Abyssea-Uleguerand/npcs/Maat.lua deleted file mode 100644 index e86d1e4ee92..00000000000 --- a/scripts/zones/Abyssea-Uleguerand/npcs/Maat.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Abyssea_Uleguerand --- NPC: Maat ------------------------------------ ----@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/Abyssea-Uleguerand/npcs/Pakke-Pokke.lua b/scripts/zones/Abyssea-Uleguerand/npcs/Pakke-Pokke.lua deleted file mode 100644 index 4ab8ccd4f3a..00000000000 --- a/scripts/zones/Abyssea-Uleguerand/npcs/Pakke-Pokke.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Abyssea_Uleguerand --- NPC: Pakke-Pokke ------------------------------------ ----@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/Abyssea-Uleguerand/npcs/Polikal-Ramikal.lua b/scripts/zones/Abyssea-Uleguerand/npcs/Polikal-Ramikal.lua deleted file mode 100644 index 12cb0f2c08b..00000000000 --- a/scripts/zones/Abyssea-Uleguerand/npcs/Polikal-Ramikal.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Abyssea_Uleguerand --- NPC: Polikal-Ramikal ------------------------------------ ----@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/Abyssea-Uleguerand/npcs/Romaa_Mihgo.lua b/scripts/zones/Abyssea-Uleguerand/npcs/Romaa_Mihgo.lua deleted file mode 100644 index 29a6f7db6e8..00000000000 --- a/scripts/zones/Abyssea-Uleguerand/npcs/Romaa_Mihgo.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Abyssea_Uleguerand --- NPC: Romaa Mihgo ------------------------------------ ----@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/Abyssea-Uleguerand/npcs/Tiger_Tooth.lua b/scripts/zones/Abyssea-Uleguerand/npcs/Tiger_Tooth.lua deleted file mode 100644 index aadd24f27b0..00000000000 --- a/scripts/zones/Abyssea-Uleguerand/npcs/Tiger_Tooth.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Abyssea_Uleguerand --- NPC: Tiger Tooth ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(361) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Abyssea-Uleguerand/npcs/Trion.lua b/scripts/zones/Abyssea-Uleguerand/npcs/Trion.lua deleted file mode 100644 index 041a509a2fd..00000000000 --- a/scripts/zones/Abyssea-Uleguerand/npcs/Trion.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Abyssea_Uleguerand --- NPC: Trion ------------------------------------ ----@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/Abyssea-Uleguerand/npcs/Veridical_Conflux_#01.lua b/scripts/zones/Abyssea-Uleguerand/npcs/Veridical_Conflux_#01.lua index a5410aa3f38..68e49d25570 100644 --- a/scripts/zones/Abyssea-Uleguerand/npcs/Veridical_Conflux_#01.lua +++ b/scripts/zones/Abyssea-Uleguerand/npcs/Veridical_Conflux_#01.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Uleguerand/npcs/Veridical_Conflux_#02.lua b/scripts/zones/Abyssea-Uleguerand/npcs/Veridical_Conflux_#02.lua index d36b5592076..890a7c0baaa 100644 --- a/scripts/zones/Abyssea-Uleguerand/npcs/Veridical_Conflux_#02.lua +++ b/scripts/zones/Abyssea-Uleguerand/npcs/Veridical_Conflux_#02.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Uleguerand/npcs/Veridical_Conflux_#03.lua b/scripts/zones/Abyssea-Uleguerand/npcs/Veridical_Conflux_#03.lua index 23be1472293..816ca30c319 100644 --- a/scripts/zones/Abyssea-Uleguerand/npcs/Veridical_Conflux_#03.lua +++ b/scripts/zones/Abyssea-Uleguerand/npcs/Veridical_Conflux_#03.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Uleguerand/npcs/Veridical_Conflux_#04.lua b/scripts/zones/Abyssea-Uleguerand/npcs/Veridical_Conflux_#04.lua index 9df69a37ef7..d42e53542f9 100644 --- a/scripts/zones/Abyssea-Uleguerand/npcs/Veridical_Conflux_#04.lua +++ b/scripts/zones/Abyssea-Uleguerand/npcs/Veridical_Conflux_#04.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Uleguerand/npcs/Veridical_Conflux_#05.lua b/scripts/zones/Abyssea-Uleguerand/npcs/Veridical_Conflux_#05.lua index 60a5474511f..c22f7351d2d 100644 --- a/scripts/zones/Abyssea-Uleguerand/npcs/Veridical_Conflux_#05.lua +++ b/scripts/zones/Abyssea-Uleguerand/npcs/Veridical_Conflux_#05.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Uleguerand/npcs/Veridical_Conflux_#06.lua b/scripts/zones/Abyssea-Uleguerand/npcs/Veridical_Conflux_#06.lua index 9e0977a4708..fccc771b59c 100644 --- a/scripts/zones/Abyssea-Uleguerand/npcs/Veridical_Conflux_#06.lua +++ b/scripts/zones/Abyssea-Uleguerand/npcs/Veridical_Conflux_#06.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Uleguerand/npcs/Veridical_Conflux_#07.lua b/scripts/zones/Abyssea-Uleguerand/npcs/Veridical_Conflux_#07.lua index 530f46f090f..257373873ea 100644 --- a/scripts/zones/Abyssea-Uleguerand/npcs/Veridical_Conflux_#07.lua +++ b/scripts/zones/Abyssea-Uleguerand/npcs/Veridical_Conflux_#07.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Uleguerand/npcs/Veridical_Conflux_#08.lua b/scripts/zones/Abyssea-Uleguerand/npcs/Veridical_Conflux_#08.lua index c024dc43f74..f746a7e32c0 100644 --- a/scripts/zones/Abyssea-Uleguerand/npcs/Veridical_Conflux_#08.lua +++ b/scripts/zones/Abyssea-Uleguerand/npcs/Veridical_Conflux_#08.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Uleguerand/npcs/Waylea.lua b/scripts/zones/Abyssea-Uleguerand/npcs/Waylea.lua deleted file mode 100644 index ac195cb6fb2..00000000000 --- a/scripts/zones/Abyssea-Uleguerand/npcs/Waylea.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Abyssea_Uleguerand --- NPC: Waylea ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(362) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Abyssea-Uleguerand/npcs/qm1.lua b/scripts/zones/Abyssea-Uleguerand/npcs/qm1.lua index 1a4ba3163b5..04ca225e0fe 100644 --- a/scripts/zones/Abyssea-Uleguerand/npcs/qm1.lua +++ b/scripts/zones/Abyssea-Uleguerand/npcs/qm1.lua @@ -15,10 +15,4 @@ entity.onTrigger = function(player, npc) -- xi.abyssea.qmOnTrigger(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/Abyssea-Uleguerand/npcs/qm10.lua b/scripts/zones/Abyssea-Uleguerand/npcs/qm10.lua index f9b9f63938c..3ea30a0df61 100644 --- a/scripts/zones/Abyssea-Uleguerand/npcs/qm10.lua +++ b/scripts/zones/Abyssea-Uleguerand/npcs/qm10.lua @@ -15,10 +15,4 @@ entity.onTrigger = function(player, npc) -- xi.abyssea.qmOnTrigger(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/Abyssea-Uleguerand/npcs/qm2.lua b/scripts/zones/Abyssea-Uleguerand/npcs/qm2.lua index 69b4989c884..937ddf77185 100644 --- a/scripts/zones/Abyssea-Uleguerand/npcs/qm2.lua +++ b/scripts/zones/Abyssea-Uleguerand/npcs/qm2.lua @@ -15,10 +15,4 @@ entity.onTrigger = function(player, npc) -- xi.abyssea.qmOnTrigger(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/Abyssea-Uleguerand/npcs/qm3.lua b/scripts/zones/Abyssea-Uleguerand/npcs/qm3.lua index 7d3ad37e4c1..ae77c28e3b9 100644 --- a/scripts/zones/Abyssea-Uleguerand/npcs/qm3.lua +++ b/scripts/zones/Abyssea-Uleguerand/npcs/qm3.lua @@ -15,10 +15,4 @@ entity.onTrigger = function(player, npc) -- xi.abyssea.qmOnTrigger(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/Abyssea-Uleguerand/npcs/qm4.lua b/scripts/zones/Abyssea-Uleguerand/npcs/qm4.lua index 305a7bcb398..edd4b498f6b 100644 --- a/scripts/zones/Abyssea-Uleguerand/npcs/qm4.lua +++ b/scripts/zones/Abyssea-Uleguerand/npcs/qm4.lua @@ -15,10 +15,4 @@ entity.onTrigger = function(player, npc) -- xi.abyssea.qmOnTrigger(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/Abyssea-Uleguerand/npcs/qm5.lua b/scripts/zones/Abyssea-Uleguerand/npcs/qm5.lua index d48d075a3ee..2d47163b0d7 100644 --- a/scripts/zones/Abyssea-Uleguerand/npcs/qm5.lua +++ b/scripts/zones/Abyssea-Uleguerand/npcs/qm5.lua @@ -15,10 +15,4 @@ entity.onTrigger = function(player, npc) -- xi.abyssea.qmOnTrigger(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/Abyssea-Uleguerand/npcs/qm6.lua b/scripts/zones/Abyssea-Uleguerand/npcs/qm6.lua index 930c5448669..c73384f3787 100644 --- a/scripts/zones/Abyssea-Uleguerand/npcs/qm6.lua +++ b/scripts/zones/Abyssea-Uleguerand/npcs/qm6.lua @@ -15,10 +15,4 @@ entity.onTrigger = function(player, npc) -- xi.abyssea.qmOnTrigger(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/Abyssea-Uleguerand/npcs/qm7.lua b/scripts/zones/Abyssea-Uleguerand/npcs/qm7.lua index 739bb55f7f9..1fee296c42c 100644 --- a/scripts/zones/Abyssea-Uleguerand/npcs/qm7.lua +++ b/scripts/zones/Abyssea-Uleguerand/npcs/qm7.lua @@ -15,10 +15,4 @@ entity.onTrigger = function(player, npc) -- xi.abyssea.qmOnTrigger(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/Abyssea-Uleguerand/npcs/qm8.lua b/scripts/zones/Abyssea-Uleguerand/npcs/qm8.lua index 580901f3f9c..8b734563f33 100644 --- a/scripts/zones/Abyssea-Uleguerand/npcs/qm8.lua +++ b/scripts/zones/Abyssea-Uleguerand/npcs/qm8.lua @@ -15,10 +15,4 @@ entity.onTrigger = function(player, npc) -- xi.abyssea.qmOnTrigger(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/Abyssea-Uleguerand/npcs/qm9.lua b/scripts/zones/Abyssea-Uleguerand/npcs/qm9.lua index d6643d67306..a7b24dd70d6 100644 --- a/scripts/zones/Abyssea-Uleguerand/npcs/qm9.lua +++ b/scripts/zones/Abyssea-Uleguerand/npcs/qm9.lua @@ -15,10 +15,4 @@ entity.onTrigger = function(player, npc) -- xi.abyssea.qmOnTrigger(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/Abyssea-Vunkerl/DefaultActions.lua b/scripts/zones/Abyssea-Vunkerl/DefaultActions.lua new file mode 100644 index 00000000000..eda454854fa --- /dev/null +++ b/scripts/zones/Abyssea-Vunkerl/DefaultActions.lua @@ -0,0 +1,7 @@ +-- local ID = zones[xi.zone.ABYSSEA_VUNKERL] + +return { + ['Liloune'] = { event = 1099 }, + ['Parcarin'] = { event = 1100 }, + ['Solgierte'] = { event = 1098 }, +} diff --git a/scripts/zones/Abyssea-Vunkerl/npcs/Cavernous_Maw.lua b/scripts/zones/Abyssea-Vunkerl/npcs/Cavernous_Maw.lua index acfc933d4ca..e452b44c402 100644 --- a/scripts/zones/Abyssea-Vunkerl/npcs/Cavernous_Maw.lua +++ b/scripts/zones/Abyssea-Vunkerl/npcs/Cavernous_Maw.lua @@ -7,16 +7,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(200) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 200 and option == 1 then player:setPos(241, 0.001, 11, 42, 104) diff --git a/scripts/zones/Abyssea-Vunkerl/npcs/Conflux_Surveyor.lua b/scripts/zones/Abyssea-Vunkerl/npcs/Conflux_Surveyor.lua index c7937e0255a..2a5d9e4f9f1 100644 --- a/scripts/zones/Abyssea-Vunkerl/npcs/Conflux_Surveyor.lua +++ b/scripts/zones/Abyssea-Vunkerl/npcs/Conflux_Surveyor.lua @@ -5,16 +5,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.abyssea.surveyorOnTrigger(player, npc) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.abyssea.surveyorOnEventFinish(player, csid, option, npc) end diff --git a/scripts/zones/Abyssea-Vunkerl/npcs/Cruor_Prospector.lua b/scripts/zones/Abyssea-Vunkerl/npcs/Cruor_Prospector.lua index c39f64e832e..edd48db55ed 100644 --- a/scripts/zones/Abyssea-Vunkerl/npcs/Cruor_Prospector.lua +++ b/scripts/zones/Abyssea-Vunkerl/npcs/Cruor_Prospector.lua @@ -137,9 +137,6 @@ local prospectorEnhancement = }, } -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local cruor = player:getCurrency('cruor') local demilune = xi.abyssea.getDemiluneAbyssite(player) @@ -147,9 +144,6 @@ entity.onTrigger = function(player, npc) player:startEvent(2002, cruor, demilune) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) local itemCategory = bit.band(option, 0x07) local itemSelected = bit.band(bit.rshift(option, 16), 0x1F) diff --git a/scripts/zones/Abyssea-Vunkerl/npcs/Liloune.lua b/scripts/zones/Abyssea-Vunkerl/npcs/Liloune.lua deleted file mode 100644 index acd1e3d65e9..00000000000 --- a/scripts/zones/Abyssea-Vunkerl/npcs/Liloune.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Abyssea_Vunkeral --- NPC: Liloune ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(1099) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Abyssea-Vunkerl/npcs/Parcarin.lua b/scripts/zones/Abyssea-Vunkerl/npcs/Parcarin.lua deleted file mode 100644 index 17ee9517da1..00000000000 --- a/scripts/zones/Abyssea-Vunkerl/npcs/Parcarin.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Abyssea_Vunkeral --- NPC: Parcarin ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(1100) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Abyssea-Vunkerl/npcs/Solgierte.lua b/scripts/zones/Abyssea-Vunkerl/npcs/Solgierte.lua deleted file mode 100644 index 4a325126715..00000000000 --- a/scripts/zones/Abyssea-Vunkerl/npcs/Solgierte.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Abyssea_Vunkeral --- NPC: Solgierte ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(1098) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Abyssea-Vunkerl/npcs/Veridical_Conflux_#00.lua b/scripts/zones/Abyssea-Vunkerl/npcs/Veridical_Conflux_#00.lua index ddd747b153a..49f4375f2bb 100644 --- a/scripts/zones/Abyssea-Vunkerl/npcs/Veridical_Conflux_#00.lua +++ b/scripts/zones/Abyssea-Vunkerl/npcs/Veridical_Conflux_#00.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Vunkerl/npcs/Veridical_Conflux_#01.lua b/scripts/zones/Abyssea-Vunkerl/npcs/Veridical_Conflux_#01.lua index 7f072178d6c..2470574e323 100644 --- a/scripts/zones/Abyssea-Vunkerl/npcs/Veridical_Conflux_#01.lua +++ b/scripts/zones/Abyssea-Vunkerl/npcs/Veridical_Conflux_#01.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Vunkerl/npcs/Veridical_Conflux_#02.lua b/scripts/zones/Abyssea-Vunkerl/npcs/Veridical_Conflux_#02.lua index f17b7811abe..f84a1845187 100644 --- a/scripts/zones/Abyssea-Vunkerl/npcs/Veridical_Conflux_#02.lua +++ b/scripts/zones/Abyssea-Vunkerl/npcs/Veridical_Conflux_#02.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Vunkerl/npcs/Veridical_Conflux_#03.lua b/scripts/zones/Abyssea-Vunkerl/npcs/Veridical_Conflux_#03.lua index a81767554f0..c5ac2f0ce3f 100644 --- a/scripts/zones/Abyssea-Vunkerl/npcs/Veridical_Conflux_#03.lua +++ b/scripts/zones/Abyssea-Vunkerl/npcs/Veridical_Conflux_#03.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Vunkerl/npcs/Veridical_Conflux_#04.lua b/scripts/zones/Abyssea-Vunkerl/npcs/Veridical_Conflux_#04.lua index 259cfc425c2..efebfd1a88c 100644 --- a/scripts/zones/Abyssea-Vunkerl/npcs/Veridical_Conflux_#04.lua +++ b/scripts/zones/Abyssea-Vunkerl/npcs/Veridical_Conflux_#04.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Vunkerl/npcs/Veridical_Conflux_#05.lua b/scripts/zones/Abyssea-Vunkerl/npcs/Veridical_Conflux_#05.lua index 1d294b10a3c..471a4e32fa5 100644 --- a/scripts/zones/Abyssea-Vunkerl/npcs/Veridical_Conflux_#05.lua +++ b/scripts/zones/Abyssea-Vunkerl/npcs/Veridical_Conflux_#05.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Vunkerl/npcs/Veridical_Conflux_#06.lua b/scripts/zones/Abyssea-Vunkerl/npcs/Veridical_Conflux_#06.lua index c45c94f628c..b2c67cd641b 100644 --- a/scripts/zones/Abyssea-Vunkerl/npcs/Veridical_Conflux_#06.lua +++ b/scripts/zones/Abyssea-Vunkerl/npcs/Veridical_Conflux_#06.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Vunkerl/npcs/Veridical_Conflux_#07.lua b/scripts/zones/Abyssea-Vunkerl/npcs/Veridical_Conflux_#07.lua index 1f67e9e6757..256a723c686 100644 --- a/scripts/zones/Abyssea-Vunkerl/npcs/Veridical_Conflux_#07.lua +++ b/scripts/zones/Abyssea-Vunkerl/npcs/Veridical_Conflux_#07.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Vunkerl/npcs/Veridical_Conflux_#08.lua b/scripts/zones/Abyssea-Vunkerl/npcs/Veridical_Conflux_#08.lua index 6b8da60afc2..3cdf3cb8c2d 100644 --- a/scripts/zones/Abyssea-Vunkerl/npcs/Veridical_Conflux_#08.lua +++ b/scripts/zones/Abyssea-Vunkerl/npcs/Veridical_Conflux_#08.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.conflux.confluxOnTrigger(player, npc) end diff --git a/scripts/zones/Abyssea-Vunkerl/npcs/qm1.lua b/scripts/zones/Abyssea-Vunkerl/npcs/qm1.lua index 3d10408d3d5..e843c5d77e5 100644 --- a/scripts/zones/Abyssea-Vunkerl/npcs/qm1.lua +++ b/scripts/zones/Abyssea-Vunkerl/npcs/qm1.lua @@ -15,10 +15,4 @@ entity.onTrigger = function(player, npc) -- xi.abyssea.qmOnTrigger(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/Abyssea-Vunkerl/npcs/qm10.lua b/scripts/zones/Abyssea-Vunkerl/npcs/qm10.lua index dbdd94ade42..4409f00b79d 100644 --- a/scripts/zones/Abyssea-Vunkerl/npcs/qm10.lua +++ b/scripts/zones/Abyssea-Vunkerl/npcs/qm10.lua @@ -15,10 +15,4 @@ entity.onTrigger = function(player, npc) -- xi.abyssea.qmOnTrigger(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/Abyssea-Vunkerl/npcs/qm11.lua b/scripts/zones/Abyssea-Vunkerl/npcs/qm11.lua index 161c9f5bdec..9be933f03b7 100644 --- a/scripts/zones/Abyssea-Vunkerl/npcs/qm11.lua +++ b/scripts/zones/Abyssea-Vunkerl/npcs/qm11.lua @@ -15,10 +15,4 @@ entity.onTrigger = function(player, npc) -- xi.abyssea.qmOnTrigger(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/Abyssea-Vunkerl/npcs/qm12.lua b/scripts/zones/Abyssea-Vunkerl/npcs/qm12.lua index e1f54592c78..d3b250f14d4 100644 --- a/scripts/zones/Abyssea-Vunkerl/npcs/qm12.lua +++ b/scripts/zones/Abyssea-Vunkerl/npcs/qm12.lua @@ -15,10 +15,4 @@ entity.onTrigger = function(player, npc) -- xi.abyssea.qmOnTrigger(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/Abyssea-Vunkerl/npcs/qm2.lua b/scripts/zones/Abyssea-Vunkerl/npcs/qm2.lua index 2ca27a22395..8384a87d3e9 100644 --- a/scripts/zones/Abyssea-Vunkerl/npcs/qm2.lua +++ b/scripts/zones/Abyssea-Vunkerl/npcs/qm2.lua @@ -15,10 +15,4 @@ entity.onTrigger = function(player, npc) -- xi.abyssea.qmOnTrigger(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/Abyssea-Vunkerl/npcs/qm3.lua b/scripts/zones/Abyssea-Vunkerl/npcs/qm3.lua index bcbafb225dd..d17af2fdec8 100644 --- a/scripts/zones/Abyssea-Vunkerl/npcs/qm3.lua +++ b/scripts/zones/Abyssea-Vunkerl/npcs/qm3.lua @@ -15,10 +15,4 @@ entity.onTrigger = function(player, npc) -- xi.abyssea.qmOnTrigger(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/Abyssea-Vunkerl/npcs/qm4.lua b/scripts/zones/Abyssea-Vunkerl/npcs/qm4.lua index cb03aadf9b3..ff0311d48c8 100644 --- a/scripts/zones/Abyssea-Vunkerl/npcs/qm4.lua +++ b/scripts/zones/Abyssea-Vunkerl/npcs/qm4.lua @@ -15,10 +15,4 @@ entity.onTrigger = function(player, npc) -- xi.abyssea.qmOnTrigger(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/Abyssea-Vunkerl/npcs/qm5.lua b/scripts/zones/Abyssea-Vunkerl/npcs/qm5.lua index 2618340434e..eb14e5c067c 100644 --- a/scripts/zones/Abyssea-Vunkerl/npcs/qm5.lua +++ b/scripts/zones/Abyssea-Vunkerl/npcs/qm5.lua @@ -15,10 +15,4 @@ entity.onTrigger = function(player, npc) -- xi.abyssea.qmOnTrigger(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/Abyssea-Vunkerl/npcs/qm6.lua b/scripts/zones/Abyssea-Vunkerl/npcs/qm6.lua index a1147ae76d1..efb850f7b32 100644 --- a/scripts/zones/Abyssea-Vunkerl/npcs/qm6.lua +++ b/scripts/zones/Abyssea-Vunkerl/npcs/qm6.lua @@ -15,10 +15,4 @@ entity.onTrigger = function(player, npc) -- xi.abyssea.qmOnTrigger(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/Abyssea-Vunkerl/npcs/qm7.lua b/scripts/zones/Abyssea-Vunkerl/npcs/qm7.lua index 7318aff6595..0894692c27b 100644 --- a/scripts/zones/Abyssea-Vunkerl/npcs/qm7.lua +++ b/scripts/zones/Abyssea-Vunkerl/npcs/qm7.lua @@ -15,10 +15,4 @@ entity.onTrigger = function(player, npc) -- xi.abyssea.qmOnTrigger(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/Abyssea-Vunkerl/npcs/qm8.lua b/scripts/zones/Abyssea-Vunkerl/npcs/qm8.lua index 54f5a8348c7..b85dbb9dff8 100644 --- a/scripts/zones/Abyssea-Vunkerl/npcs/qm8.lua +++ b/scripts/zones/Abyssea-Vunkerl/npcs/qm8.lua @@ -15,10 +15,4 @@ entity.onTrigger = function(player, npc) -- xi.abyssea.qmOnTrigger(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/Abyssea-Vunkerl/npcs/qm9.lua b/scripts/zones/Abyssea-Vunkerl/npcs/qm9.lua index 38e54236367..e8478bd29cb 100644 --- a/scripts/zones/Abyssea-Vunkerl/npcs/qm9.lua +++ b/scripts/zones/Abyssea-Vunkerl/npcs/qm9.lua @@ -15,10 +15,4 @@ entity.onTrigger = function(player, npc) -- xi.abyssea.qmOnTrigger(player, npc) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity