From 1032c9c89a97abed6f20e4034ef45423c024a172 Mon Sep 17 00:00:00 2001 From: claywar Date: Sat, 18 Jan 2025 13:36:08 -0500 Subject: [PATCH 1/4] Remove empty NPCs, add Default Actions - Zones V~W --- .../zones/Valkurm_Dunes/DefaultActions.lua | 6 ++++- .../Valkurm_Dunes/npcs/Beastmens_Banner.lua | 24 ----------------- .../Valkurm_Dunes/npcs/Cavernous_Maw.lua | 6 ----- .../zones/Valkurm_Dunes/npcs/Field_Manual.lua | 3 --- .../Valkurm_Dunes/npcs/Hieroglyphics.lua | 6 ----- .../zones/Valkurm_Dunes/npcs/Medicine_Axe.lua | 3 --- .../zones/Valkurm_Dunes/npcs/Signpost1.lua | 24 ----------------- .../zones/Valkurm_Dunes/npcs/Signpost2.lua | 24 ----------------- .../zones/Valkurm_Dunes/npcs/Song_Runes.lua | 6 ----- .../Valkurm_Dunes/npcs/Stone_Monument.lua | 6 ----- .../Valkurm_Dunes/npcs/Swirling_Vortex.lua | 6 ----- .../Valkurm_Dunes/npcs/Treasure_Casket.lua | 3 --- scripts/zones/Valkurm_Dunes/npcs/qm1.lua | 9 ------- scripts/zones/Valkurm_Dunes/npcs/qm2.lua | 9 ------- scripts/zones/Valkurm_Dunes/npcs/qm4.lua | 25 ------------------ .../Valley_of_Sorrows/npcs/Field_Manual.lua | 3 --- .../npcs/Treasure_Casket.lua | 3 --- scripts/zones/Valley_of_Sorrows/npcs/qm1.lua | 9 ------- .../zones/Valley_of_Sorrows/npcs/relic.lua | 3 --- .../VeLugannon_Palace/npcs/Grounds_Tome.lua | 3 --- .../zones/VeLugannon_Palace/npcs/Monolith.lua | 9 ------- .../npcs/Treasure_Casket.lua | 3 --- .../npcs/Treasure_Coffer.lua | 6 ----- scripts/zones/VeLugannon_Palace/npcs/qm1.lua | 9 ------- scripts/zones/VeLugannon_Palace/npcs/qm2.lua | 6 ----- scripts/zones/VeLugannon_Palace/npcs/qm3.lua | 6 ----- .../npcs/Indescript_Markings.lua | 9 ------- .../zones/Vunkerl_Inlet_[S]/npcs/Leadavox.lua | 3 --- scripts/zones/Vunkerl_Inlet_[S]/npcs/qm4.lua | 9 ------- scripts/zones/Vunkerl_Inlet_[S]/npcs/qm6.lua | 6 ----- .../zones/Wajaom_Woodlands/DefaultActions.lua | 1 + .../npcs/Harvesting_Point.lua | 6 ----- .../zones/Wajaom_Woodlands/npcs/Leypoint.lua | 6 ----- .../zones/Wajaom_Woodlands/npcs/Watisa.lua | 3 --- scripts/zones/Wajaom_Woodlands/npcs/_1f0.lua | 6 ----- scripts/zones/Wajaom_Woodlands/npcs/_1f1.lua | 6 ----- scripts/zones/Wajaom_Woodlands/npcs/_1f2.lua | 22 ---------------- scripts/zones/Wajaom_Woodlands/npcs/qm1.lua | 6 ----- scripts/zones/Wajaom_Woodlands/npcs/qm2.lua | 6 ----- scripts/zones/Wajaom_Woodlands/npcs/qm3.lua | 6 ----- scripts/zones/Wajaom_Woodlands/npcs/qm4.lua | 6 ----- .../Walk_of_Echoes/npcs/Veridical_Conflux.lua | 6 ----- .../npcs/Veridical_Conflux_G.lua | 6 ----- .../zones/West_Ronfaure/DefaultActions.lua | 2 ++ scripts/zones/West_Ronfaure/npcs/Cerite.lua | 22 ---------------- scripts/zones/West_Ronfaure/npcs/Esca.lua | 3 --- .../zones/West_Ronfaure/npcs/Field_Manual.lua | 3 --- .../zones/West_Ronfaure/npcs/Harvetour.lua | 3 --- .../zones/West_Ronfaure/npcs/Palcomondau.lua | 12 --------- .../zones/West_Ronfaure/npcs/Saradorial.lua | 23 ---------------- scripts/zones/West_Ronfaure/npcs/Signpost.lua | 9 ------- .../West_Ronfaure/npcs/Stone_Monument.lua | 6 ----- .../West_Ronfaure/npcs/Treasure_Casket.lua | 3 --- .../zones/West_Ronfaure/npcs/Vilatroire.lua | 3 --- scripts/zones/West_Ronfaure/npcs/Zovriace.lua | 12 --------- .../West_Sarutabaruta/npcs/Cavernous_Maw.lua | 6 ----- .../West_Sarutabaruta/npcs/Field_Manual.lua | 3 --- .../npcs/Harvesting_Point.lua | 6 ----- .../West_Sarutabaruta/npcs/Mahien-Uhien.lua | 3 --- .../zones/West_Sarutabaruta/npcs/Signpost.lua | 9 ------- .../West_Sarutabaruta/npcs/Stone_Monument.lua | 6 ----- .../npcs/Treasure_Casket.lua | 3 --- .../West_Sarutabaruta/npcs/Twinkle_Tree.lua | 6 ----- .../npcs/Cavernous_Maw.lua | 6 ----- .../npcs/Harvesting_Point.lua | 6 ----- .../npcs/Sealed_Entrance_1.lua | 6 ----- .../npcs/Sealed_Entrance_2.lua | 6 ----- .../npcs/Sealed_Entrance_3.lua | 6 ----- .../zones/West_Sarutabaruta_[S]/npcs/qm4.lua | 9 ------- .../zones/Western_Adoulin/DefaultActions.lua | 2 ++ .../zones/Western_Adoulin/npcs/Andrival.lua | 9 ------- .../zones/Western_Adoulin/npcs/Ansegusele.lua | 9 ------- .../Western_Adoulin/npcs/Auction_Counter.lua | 9 ------- .../zones/Western_Adoulin/npcs/Barenngo.lua | 6 ----- scripts/zones/Western_Adoulin/npcs/Bilp.lua | 6 ----- .../zones/Western_Adoulin/npcs/Brenton.lua | 22 ---------------- .../Western_Adoulin/npcs/Chanteillie.lua | 3 --- .../zones/Western_Adoulin/npcs/Clautaire.lua | 6 ----- .../zones/Western_Adoulin/npcs/Defliaa.lua | 3 --- scripts/zones/Western_Adoulin/npcs/Dewalt.lua | 6 ----- scripts/zones/Western_Adoulin/npcs/Eamonn.lua | 6 ----- .../zones/Western_Adoulin/npcs/Eukalline.lua | 9 ------- .../zones/Western_Adoulin/npcs/Flapano.lua | 3 --- .../zones/Western_Adoulin/npcs/Gemmerick.lua | 23 ---------------- .../zones/Western_Adoulin/npcs/Gontrain.lua | 6 ----- scripts/zones/Western_Adoulin/npcs/Grevan.lua | 6 ----- .../zones/Western_Adoulin/npcs/Hujette.lua | 3 --- scripts/zones/Western_Adoulin/npcs/Ishvad.lua | 9 ------- scripts/zones/Western_Adoulin/npcs/Jorin.lua | 6 ----- scripts/zones/Western_Adoulin/npcs/Kanil.lua | 9 ------- .../zones/Western_Adoulin/npcs/Kipligg.lua | 9 ------- .../zones/Western_Adoulin/npcs/Kongramm.lua | 6 ----- .../zones/Western_Adoulin/npcs/Ledericus.lua | 9 ------- scripts/zones/Western_Adoulin/npcs/Levil.lua | 26 ------------------- .../Western_Adoulin/npcs/Marjoirelle.lua | 6 ----- scripts/zones/Western_Adoulin/npcs/Mastan.lua | 6 ----- scripts/zones/Western_Adoulin/npcs/Merleg.lua | 6 ----- .../zones/Western_Adoulin/npcs/Nikkhail.lua | 6 ----- .../Western_Adoulin/npcs/Nunaarl_Bthtrogg.lua | 3 --- .../Western_Adoulin/npcs/Oka_Qhantari.lua | 6 ----- .../zones/Western_Adoulin/npcs/Pagnelle.lua | 6 ----- .../zones/Western_Adoulin/npcs/Preterig.lua | 9 ------- .../Western_Adoulin/npcs/Rising_Solstice.lua | 9 ------- scripts/zones/Western_Adoulin/npcs/Ruth.lua | 6 ----- .../zones/Western_Adoulin/npcs/Shipilolo.lua | 6 ----- .../npcs/Symphonic_Curator.lua | 3 --- scripts/zones/Western_Adoulin/npcs/Terwok.lua | 6 ----- .../zones/Western_Adoulin/npcs/Tevigogo.lua | 9 ------- .../Western_Adoulin/npcs/Theophylacte.lua | 9 ------- scripts/zones/Western_Adoulin/npcs/Volgoi.lua | 9 ------- .../Western_Adoulin/npcs/Westerly_Breeze.lua | 3 --- scripts/zones/Western_Adoulin/npcs/Zaoso.lua | 9 ------- .../npcs/Field_Manual.lua | 3 --- .../npcs/Treasure_Casket.lua | 3 --- .../zones/Western_Altepa_Desert/npcs/_3h0.lua | 9 ------- .../zones/Western_Altepa_Desert/npcs/_3h5.lua | 9 ------- .../zones/Western_Altepa_Desert/npcs/_3h6.lua | 9 ------- .../zones/Western_Altepa_Desert/npcs/_3h7.lua | 9 ------- .../zones/Western_Altepa_Desert/npcs/_3h8.lua | 9 ------- .../Western_Altepa_Desert/npcs/relic.lua | 3 --- 120 files changed, 10 insertions(+), 887 deletions(-) delete mode 100644 scripts/zones/Valkurm_Dunes/npcs/Beastmens_Banner.lua delete mode 100644 scripts/zones/Valkurm_Dunes/npcs/Signpost1.lua delete mode 100644 scripts/zones/Valkurm_Dunes/npcs/Signpost2.lua delete mode 100644 scripts/zones/Valkurm_Dunes/npcs/qm4.lua delete mode 100644 scripts/zones/Wajaom_Woodlands/npcs/_1f2.lua delete mode 100644 scripts/zones/West_Ronfaure/npcs/Cerite.lua delete mode 100644 scripts/zones/West_Ronfaure/npcs/Saradorial.lua delete mode 100644 scripts/zones/Western_Adoulin/npcs/Brenton.lua delete mode 100644 scripts/zones/Western_Adoulin/npcs/Gemmerick.lua delete mode 100644 scripts/zones/Western_Adoulin/npcs/Levil.lua diff --git a/scripts/zones/Valkurm_Dunes/DefaultActions.lua b/scripts/zones/Valkurm_Dunes/DefaultActions.lua index c1823a93821..c8b68562206 100644 --- a/scripts/zones/Valkurm_Dunes/DefaultActions.lua +++ b/scripts/zones/Valkurm_Dunes/DefaultActions.lua @@ -1,5 +1,9 @@ local ID = zones[xi.zone.VALKURM_DUNES] return { - ['qm3'] = { messageSpecial = ID.text.YOU_SENSE_AN_EVIL_PRESENCE }, + ['Beastmens_Banner'] = { messageSpecial = ID.text.BEASTMEN_BANNER } + ['qm3'] = { messageSpecial = ID.text.YOU_SENSE_AN_EVIL_PRESENCE }, + ['qm4'] = { messageSpecial = ID.text.MONSTERS_KILLED_ADVENTURERS }, + ['Signpost1'] = { messageSpecial = ID.text.SIGNPOST1} + ['Signpost2'] = { messageSpecial = ID.text.SIGNPOST2} } diff --git a/scripts/zones/Valkurm_Dunes/npcs/Beastmens_Banner.lua b/scripts/zones/Valkurm_Dunes/npcs/Beastmens_Banner.lua deleted file mode 100644 index 67011a08e52..00000000000 --- a/scripts/zones/Valkurm_Dunes/npcs/Beastmens_Banner.lua +++ /dev/null @@ -1,24 +0,0 @@ ------------------------------------ --- Area: Valkurm Dunes --- NPC: Beastmen_s_Banner --- !pos -116.204 4.000 -113.608 104 ------------------------------------ -local ID = zones[xi.zone.VALKURM_DUNES] ------------------------------------ ----@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/Valkurm_Dunes/npcs/Cavernous_Maw.lua b/scripts/zones/Valkurm_Dunes/npcs/Cavernous_Maw.lua index 3c07cf64710..c3e1cb705fe 100644 --- a/scripts/zones/Valkurm_Dunes/npcs/Cavernous_Maw.lua +++ b/scripts/zones/Valkurm_Dunes/npcs/Cavernous_Maw.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.VALKURM_DUNES] ---@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) @@ -30,9 +27,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 56 then player:addQuest(xi.questLog.ABYSSEA, xi.quest.id.abyssea.A_DELECTABLE_DEMON) diff --git a/scripts/zones/Valkurm_Dunes/npcs/Field_Manual.lua b/scripts/zones/Valkurm_Dunes/npcs/Field_Manual.lua index 13c1a930dd4..3e7c9c0c601 100644 --- a/scripts/zones/Valkurm_Dunes/npcs/Field_Manual.lua +++ b/scripts/zones/Valkurm_Dunes/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/Valkurm_Dunes/npcs/Hieroglyphics.lua b/scripts/zones/Valkurm_Dunes/npcs/Hieroglyphics.lua index 16d8d8d9c4a..5d02dcaca97 100644 --- a/scripts/zones/Valkurm_Dunes/npcs/Hieroglyphics.lua +++ b/scripts/zones/Valkurm_Dunes/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/Valkurm_Dunes/npcs/Medicine_Axe.lua b/scripts/zones/Valkurm_Dunes/npcs/Medicine_Axe.lua index 3b05bd0dc66..4bcfa8032ba 100644 --- a/scripts/zones/Valkurm_Dunes/npcs/Medicine_Axe.lua +++ b/scripts/zones/Valkurm_Dunes/npcs/Medicine_Axe.lua @@ -10,9 +10,6 @@ local entity = {} local vendorRegion = xi.region.ZULKHEIM 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/Valkurm_Dunes/npcs/Signpost1.lua b/scripts/zones/Valkurm_Dunes/npcs/Signpost1.lua deleted file mode 100644 index 0b30106fd5f..00000000000 --- a/scripts/zones/Valkurm_Dunes/npcs/Signpost1.lua +++ /dev/null @@ -1,24 +0,0 @@ ------------------------------------ --- Area: Valkurm Dunes --- NPC: Signpost --- !pos 350 -6 96 103 ------------------------------------ -local ID = zones[xi.zone.VALKURM_DUNES] ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:messageSpecial(ID.text.SIGNPOST1) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Valkurm_Dunes/npcs/Signpost2.lua b/scripts/zones/Valkurm_Dunes/npcs/Signpost2.lua deleted file mode 100644 index 7af23c91c07..00000000000 --- a/scripts/zones/Valkurm_Dunes/npcs/Signpost2.lua +++ /dev/null @@ -1,24 +0,0 @@ ------------------------------------ --- Area: Valkurm Dunes --- NPC: Signpost --- !pos 490 -13 146 103 ------------------------------------ -local ID = zones[xi.zone.VALKURM_DUNES] ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:messageSpecial(ID.text.SIGNPOST2) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Valkurm_Dunes/npcs/Song_Runes.lua b/scripts/zones/Valkurm_Dunes/npcs/Song_Runes.lua index 915458b4a73..9de30bcf2d8 100755 --- a/scripts/zones/Valkurm_Dunes/npcs/Song_Runes.lua +++ b/scripts/zones/Valkurm_Dunes/npcs/Song_Runes.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.VALKURM_DUNES] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) -- PATH OF THE BARD (Bard Flag) if @@ -26,9 +23,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 2 then npcUtil.giveCurrency(player, 'gil', 3000) diff --git a/scripts/zones/Valkurm_Dunes/npcs/Stone_Monument.lua b/scripts/zones/Valkurm_Dunes/npcs/Stone_Monument.lua index ec2bc033194..da302b23db1 100644 --- a/scripts/zones/Valkurm_Dunes/npcs/Stone_Monument.lua +++ b/scripts/zones/Valkurm_Dunes/npcs/Stone_Monument.lua @@ -25,10 +25,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/Valkurm_Dunes/npcs/Swirling_Vortex.lua b/scripts/zones/Valkurm_Dunes/npcs/Swirling_Vortex.lua index 580642ff188..2f75443ab22 100644 --- a/scripts/zones/Valkurm_Dunes/npcs/Swirling_Vortex.lua +++ b/scripts/zones/Valkurm_Dunes/npcs/Swirling_Vortex.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.VALKURM_DUNES] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:hasCompletedMission(xi.mission.log_id.COP, xi.mission.id.cop.THE_MOTHERCRYSTALS) then player:startEvent(12) @@ -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 == 12 and option == 1 then xi.teleport.to(player, xi.teleport.id.LUFAISE_VORTEX) diff --git a/scripts/zones/Valkurm_Dunes/npcs/Treasure_Casket.lua b/scripts/zones/Valkurm_Dunes/npcs/Treasure_Casket.lua index 68278654b30..60849a39a0f 100644 --- a/scripts/zones/Valkurm_Dunes/npcs/Treasure_Casket.lua +++ b/scripts/zones/Valkurm_Dunes/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/Valkurm_Dunes/npcs/qm1.lua b/scripts/zones/Valkurm_Dunes/npcs/qm1.lua index 562ad3e96c3..941795b4ed4 100644 --- a/scripts/zones/Valkurm_Dunes/npcs/qm1.lua +++ b/scripts/zones/Valkurm_Dunes/npcs/qm1.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.VALKURM_DUNES] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) -- NOTE: The NPC is despawned when weather is not up, we do NOT need to check weather. if player:getLocalVar('[qm1]mustZone') == 1 then @@ -20,10 +17,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Valkurm_Dunes/npcs/qm2.lua b/scripts/zones/Valkurm_Dunes/npcs/qm2.lua index 4826fabc8d7..076ce63a719 100644 --- a/scripts/zones/Valkurm_Dunes/npcs/qm2.lua +++ b/scripts/zones/Valkurm_Dunes/npcs/qm2.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.VALKURM_DUNES] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if not GetMobByID(ID.mob.MARCHELUTE):isSpawned() and @@ -24,10 +21,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Valkurm_Dunes/npcs/qm4.lua b/scripts/zones/Valkurm_Dunes/npcs/qm4.lua deleted file mode 100644 index 4b85a70a38a..00000000000 --- a/scripts/zones/Valkurm_Dunes/npcs/qm4.lua +++ /dev/null @@ -1,25 +0,0 @@ ------------------------------------ --- Area: Valkurm Dunes --- NPC: qm4 (???) --- Involved in quest: Pirate's Chart --- !pos -160 4 -131 103 ------------------------------------ -local ID = zones[xi.zone.VALKURM_DUNES] ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:messageSpecial(ID.text.MONSTERS_KILLED_ADVENTURERS) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Valley_of_Sorrows/npcs/Field_Manual.lua b/scripts/zones/Valley_of_Sorrows/npcs/Field_Manual.lua index 6dd147d9420..ee7a1e4d469 100644 --- a/scripts/zones/Valley_of_Sorrows/npcs/Field_Manual.lua +++ b/scripts/zones/Valley_of_Sorrows/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/Valley_of_Sorrows/npcs/Treasure_Casket.lua b/scripts/zones/Valley_of_Sorrows/npcs/Treasure_Casket.lua index 1a44899e534..97460887d90 100644 --- a/scripts/zones/Valley_of_Sorrows/npcs/Treasure_Casket.lua +++ b/scripts/zones/Valley_of_Sorrows/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/Valley_of_Sorrows/npcs/qm1.lua b/scripts/zones/Valley_of_Sorrows/npcs/qm1.lua index ddb32d1f350..b07e25774a4 100644 --- a/scripts/zones/Valley_of_Sorrows/npcs/qm1.lua +++ b/scripts/zones/Valley_of_Sorrows/npcs/qm1.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.VALLEY_OF_SORROWS] ---@type TNpcEntity local entity = {} -entity.onSpawn = function(npc) -end - entity.onTrade = function(player, npc, trade) if not GetMobByID(ID.mob.ADAMANTOISE):isSpawned() and @@ -35,10 +32,4 @@ entity.onTrigger = function(player, npc) player:messageSpecial(ID.text.NOTHING_OUT_OF_ORDINARY) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Valley_of_Sorrows/npcs/relic.lua b/scripts/zones/Valley_of_Sorrows/npcs/relic.lua index 6f5520cd7c6..7a2e2fe4736 100644 --- a/scripts/zones/Valley_of_Sorrows/npcs/relic.lua +++ b/scripts/zones/Valley_of_Sorrows/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 == 15 and diff --git a/scripts/zones/VeLugannon_Palace/npcs/Grounds_Tome.lua b/scripts/zones/VeLugannon_Palace/npcs/Grounds_Tome.lua index 2b6dca488c3..c5f270d46a7 100644 --- a/scripts/zones/VeLugannon_Palace/npcs/Grounds_Tome.lua +++ b/scripts/zones/VeLugannon_Palace/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/VeLugannon_Palace/npcs/Monolith.lua b/scripts/zones/VeLugannon_Palace/npcs/Monolith.lua index ac0e477b50c..71c74fc2b19 100644 --- a/scripts/zones/VeLugannon_Palace/npcs/Monolith.lua +++ b/scripts/zones/VeLugannon_Palace/npcs/Monolith.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.VELUGANNON_PALACE] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local offset = npc:getID() - ID.npc.Y_LITH_OFFSET if offset >= 0 and offset <= 20 then @@ -34,10 +31,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/VeLugannon_Palace/npcs/Treasure_Casket.lua b/scripts/zones/VeLugannon_Palace/npcs/Treasure_Casket.lua index 47a48c6af92..570763c3bf0 100644 --- a/scripts/zones/VeLugannon_Palace/npcs/Treasure_Casket.lua +++ b/scripts/zones/VeLugannon_Palace/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/VeLugannon_Palace/npcs/Treasure_Coffer.lua b/scripts/zones/VeLugannon_Palace/npcs/Treasure_Coffer.lua index c39b88976be..a8a59faec50 100644 --- a/scripts/zones/VeLugannon_Palace/npcs/Treasure_Coffer.lua +++ b/scripts/zones/VeLugannon_Palace/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/VeLugannon_Palace/npcs/qm1.lua b/scripts/zones/VeLugannon_Palace/npcs/qm1.lua index 06d4b40a0e7..9820716a417 100644 --- a/scripts/zones/VeLugannon_Palace/npcs/qm1.lua +++ b/scripts/zones/VeLugannon_Palace/npcs/qm1.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.VELUGANNON_PALACE] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local hideTime = 1 @@ -40,10 +37,4 @@ entity.onTrigger = function(player, npc) npc:hideNPC(hideTime) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/VeLugannon_Palace/npcs/qm2.lua b/scripts/zones/VeLugannon_Palace/npcs/qm2.lua index d86893959e2..7e2a7952be9 100644 --- a/scripts/zones/VeLugannon_Palace/npcs/qm2.lua +++ b/scripts/zones/VeLugannon_Palace/npcs/qm2.lua @@ -22,10 +22,4 @@ entity.onTrigger = function(player, npc) player:messageSpecial(ID.text.EVIL_PRESENCE) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/VeLugannon_Palace/npcs/qm3.lua b/scripts/zones/VeLugannon_Palace/npcs/qm3.lua index f4a3d23fbc0..bb5e3e8d90b 100644 --- a/scripts/zones/VeLugannon_Palace/npcs/qm3.lua +++ b/scripts/zones/VeLugannon_Palace/npcs/qm3.lua @@ -27,10 +27,4 @@ entity.onTrigger = function(player, npc) player:startEvent(2) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Vunkerl_Inlet_[S]/npcs/Indescript_Markings.lua b/scripts/zones/Vunkerl_Inlet_[S]/npcs/Indescript_Markings.lua index dd865058ca9..f405ca5d4ab 100644 --- a/scripts/zones/Vunkerl_Inlet_[S]/npcs/Indescript_Markings.lua +++ b/scripts/zones/Vunkerl_Inlet_[S]/npcs/Indescript_Markings.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.VUNKERL_INLET_S] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local pantsQuestProgress = player:getCharVar('AF_SCH_PANTS') @@ -33,10 +30,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Vunkerl_Inlet_[S]/npcs/Leadavox.lua b/scripts/zones/Vunkerl_Inlet_[S]/npcs/Leadavox.lua index cda1bc28e6d..85010a2f7fb 100644 --- a/scripts/zones/Vunkerl_Inlet_[S]/npcs/Leadavox.lua +++ b/scripts/zones/Vunkerl_Inlet_[S]/npcs/Leadavox.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 == 101 then player:setCharVar('BetterPartOfValProg', 3) diff --git a/scripts/zones/Vunkerl_Inlet_[S]/npcs/qm4.lua b/scripts/zones/Vunkerl_Inlet_[S]/npcs/qm4.lua index 29cf1576435..df6bcf855dd 100644 --- a/scripts/zones/Vunkerl_Inlet_[S]/npcs/qm4.lua +++ b/scripts/zones/Vunkerl_Inlet_[S]/npcs/qm4.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.VUNKERL_INLET_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.REDEEMING_ROCKS) and @@ -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/Vunkerl_Inlet_[S]/npcs/qm6.lua b/scripts/zones/Vunkerl_Inlet_[S]/npcs/qm6.lua index 835f5500aa0..228b748d726 100644 --- a/scripts/zones/Vunkerl_Inlet_[S]/npcs/qm6.lua +++ b/scripts/zones/Vunkerl_Inlet_[S]/npcs/qm6.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.VUNKERL_INLET_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.EVIL_AT_THE_INLET) == xi.questStatus.QUEST_ACCEPTED 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 == 112 then player:delKeyItem(xi.ki.EVIL_WARDING_SEAL) diff --git a/scripts/zones/Wajaom_Woodlands/DefaultActions.lua b/scripts/zones/Wajaom_Woodlands/DefaultActions.lua index 51774a075ab..5643ec53dfb 100644 --- a/scripts/zones/Wajaom_Woodlands/DefaultActions.lua +++ b/scripts/zones/Wajaom_Woodlands/DefaultActions.lua @@ -1,5 +1,6 @@ local ID = zones[xi.zone.WAJAOM_WOODLANDS] return { + ['_1f2'] = { event = 515 }, ['Giwahb_Watchtower'] = { special = ID.text.GIWAHB_WATCHTOWER_LOCKED }, } diff --git a/scripts/zones/Wajaom_Woodlands/npcs/Harvesting_Point.lua b/scripts/zones/Wajaom_Woodlands/npcs/Harvesting_Point.lua index e09646e029a..076c992cb96 100644 --- a/scripts/zones/Wajaom_Woodlands/npcs/Harvesting_Point.lua +++ b/scripts/zones/Wajaom_Woodlands/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/Wajaom_Woodlands/npcs/Leypoint.lua b/scripts/zones/Wajaom_Woodlands/npcs/Leypoint.lua index c5130eea673..1fb3beb3873 100644 --- a/scripts/zones/Wajaom_Woodlands/npcs/Leypoint.lua +++ b/scripts/zones/Wajaom_Woodlands/npcs/Leypoint.lua @@ -37,10 +37,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/Wajaom_Woodlands/npcs/Watisa.lua b/scripts/zones/Wajaom_Woodlands/npcs/Watisa.lua index 59e2d504c87..64748c85423 100644 --- a/scripts/zones/Wajaom_Woodlands/npcs/Watisa.lua +++ b/scripts/zones/Wajaom_Woodlands/npcs/Watisa.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/Wajaom_Woodlands/npcs/_1f0.lua b/scripts/zones/Wajaom_Woodlands/npcs/_1f0.lua index ca3389abb2d..d3ddec9ddcc 100644 --- a/scripts/zones/Wajaom_Woodlands/npcs/_1f0.lua +++ b/scripts/zones/Wajaom_Woodlands/npcs/_1f0.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/Wajaom_Woodlands/npcs/_1f1.lua b/scripts/zones/Wajaom_Woodlands/npcs/_1f1.lua index 40f4258049a..6fdbfa14eed 100644 --- a/scripts/zones/Wajaom_Woodlands/npcs/_1f1.lua +++ b/scripts/zones/Wajaom_Woodlands/npcs/_1f1.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:hasKeyItem(xi.ki.SICKLEMOON_SALT) then player:startEvent(514) @@ -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 == 514 and option == 1 then player:delKeyItem(xi.ki.SICKLEMOON_SALT) diff --git a/scripts/zones/Wajaom_Woodlands/npcs/_1f2.lua b/scripts/zones/Wajaom_Woodlands/npcs/_1f2.lua deleted file mode 100644 index 6e67424a0eb..00000000000 --- a/scripts/zones/Wajaom_Woodlands/npcs/_1f2.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Wajaom Woodlands --- NPC: Engraved Tablet --- !pos 233 -9 -634 51 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(515) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Wajaom_Woodlands/npcs/qm1.lua b/scripts/zones/Wajaom_Woodlands/npcs/qm1.lua index db40c9b73f0..0e2f5df9b5e 100644 --- a/scripts/zones/Wajaom_Woodlands/npcs/qm1.lua +++ b/scripts/zones/Wajaom_Woodlands/npcs/qm1.lua @@ -23,10 +23,4 @@ entity.onTrigger = function(player, npc) player:messageSpecial(ID.text.BROKEN_SHARDS) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Wajaom_Woodlands/npcs/qm2.lua b/scripts/zones/Wajaom_Woodlands/npcs/qm2.lua index dffa980f486..025fe1ce9b4 100644 --- a/scripts/zones/Wajaom_Woodlands/npcs/qm2.lua +++ b/scripts/zones/Wajaom_Woodlands/npcs/qm2.lua @@ -23,10 +23,4 @@ entity.onTrigger = function(player, npc) player:messageSpecial(ID.text.PAMAMA_PEELS) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Wajaom_Woodlands/npcs/qm3.lua b/scripts/zones/Wajaom_Woodlands/npcs/qm3.lua index 8e8ad922f18..0cee65bbc63 100644 --- a/scripts/zones/Wajaom_Woodlands/npcs/qm3.lua +++ b/scripts/zones/Wajaom_Woodlands/npcs/qm3.lua @@ -23,10 +23,4 @@ entity.onTrigger = function(player, npc) player:messageSpecial(ID.text.BROKEN_SHARDS) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Wajaom_Woodlands/npcs/qm4.lua b/scripts/zones/Wajaom_Woodlands/npcs/qm4.lua index a4ed4c6017c..781abc3637f 100644 --- a/scripts/zones/Wajaom_Woodlands/npcs/qm4.lua +++ b/scripts/zones/Wajaom_Woodlands/npcs/qm4.lua @@ -23,10 +23,4 @@ entity.onTrigger = function(player, npc) player:messageSpecial(ID.text.HEADY_FRAGRANCE) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Walk_of_Echoes/npcs/Veridical_Conflux.lua b/scripts/zones/Walk_of_Echoes/npcs/Veridical_Conflux.lua index f1776738194..033dce5bb94 100644 --- a/scripts/zones/Walk_of_Echoes/npcs/Veridical_Conflux.lua +++ b/scripts/zones/Walk_of_Echoes/npcs/Veridical_Conflux.lua @@ -6,16 +6,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(1004) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 1004 and option == 0 then player:setPos(238, -8, -248, 0, 137) diff --git a/scripts/zones/Walk_of_Echoes/npcs/Veridical_Conflux_G.lua b/scripts/zones/Walk_of_Echoes/npcs/Veridical_Conflux_G.lua index e22bbf0baf4..c774b27195b 100644 --- a/scripts/zones/Walk_of_Echoes/npcs/Veridical_Conflux_G.lua +++ b/scripts/zones/Walk_of_Echoes/npcs/Veridical_Conflux_G.lua @@ -6,16 +6,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 == 99 then player:setPos(-142.915, -6.75, 580.452, 96, xi.zone.GRAUBERG_S) diff --git a/scripts/zones/West_Ronfaure/DefaultActions.lua b/scripts/zones/West_Ronfaure/DefaultActions.lua index d34114f4105..478069927ef 100644 --- a/scripts/zones/West_Ronfaure/DefaultActions.lua +++ b/scripts/zones/West_Ronfaure/DefaultActions.lua @@ -3,6 +3,7 @@ local ID = zones[xi.zone.WEST_RONFAURE] return { ['Aaveleon'] = { event = 101 }, -- "Ow! Ouch! Gah... If only I'd remembered that ointment!" ['Adalefont'] = { text = ID.text.ADALEFONT_DIALOG }, + ['Cerite'] = { event = 50 }, ['Chatarre'] = { text = ID.text.CHATARRE_DIALOG }, ['Colmaie'] = { text = ID.text.COLMAIE_DIALOG }, ['Diadonour'] = { text = ID.text.DIADONOUR_DIALOG }, @@ -15,5 +16,6 @@ return { ['qm2'] = { messageSpecial = ID.text.DISMAYED_CUSTOMER }, ['qm3'] = { messageSpecial = ID.text.DISMAYED_CUSTOMER }, ['Ramaufont'] = { text = ID.text.RAMAUFONT_DIALOG }, + ['Saradorial'] = { event = 139 }, ['Zovriace'] = { text = ID.text.ZOVRIACE_DIALOG }, } diff --git a/scripts/zones/West_Ronfaure/npcs/Cerite.lua b/scripts/zones/West_Ronfaure/npcs/Cerite.lua deleted file mode 100644 index 2c2beb56e66..00000000000 --- a/scripts/zones/West_Ronfaure/npcs/Cerite.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: West Ronfaure --- NPC: Cerite --- !pos -263.577 -72.999 425.885 100 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(50) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/West_Ronfaure/npcs/Esca.lua b/scripts/zones/West_Ronfaure/npcs/Esca.lua index ea340214874..b6ff91f5be7 100644 --- a/scripts/zones/West_Ronfaure/npcs/Esca.lua +++ b/scripts/zones/West_Ronfaure/npcs/Esca.lua @@ -22,9 +22,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) -- CHASING QUOTAS if csid == 137 then diff --git a/scripts/zones/West_Ronfaure/npcs/Field_Manual.lua b/scripts/zones/West_Ronfaure/npcs/Field_Manual.lua index 03e6f9eae70..ce5fd2526f4 100644 --- a/scripts/zones/West_Ronfaure/npcs/Field_Manual.lua +++ b/scripts/zones/West_Ronfaure/npcs/Field_Manual.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.regime.bookOnTrigger(player, xi.regime.type.FIELDS) end diff --git a/scripts/zones/West_Ronfaure/npcs/Harvetour.lua b/scripts/zones/West_Ronfaure/npcs/Harvetour.lua index cef1788ce39..04fb2109eed 100644 --- a/scripts/zones/West_Ronfaure/npcs/Harvetour.lua +++ b/scripts/zones/West_Ronfaure/npcs/Harvetour.lua @@ -10,9 +10,6 @@ local entity = {} local vendorRegion = xi.region.RONFAURE 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/West_Ronfaure/npcs/Palcomondau.lua b/scripts/zones/West_Ronfaure/npcs/Palcomondau.lua index 43441b654ef..07254bda449 100644 --- a/scripts/zones/West_Ronfaure/npcs/Palcomondau.lua +++ b/scripts/zones/West_Ronfaure/npcs/Palcomondau.lua @@ -321,16 +321,4 @@ entity.onPath = function(npc) end 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/West_Ronfaure/npcs/Saradorial.lua b/scripts/zones/West_Ronfaure/npcs/Saradorial.lua deleted file mode 100644 index aa88c19ab5b..00000000000 --- a/scripts/zones/West_Ronfaure/npcs/Saradorial.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: West Ronfaure --- NPC: Saradorial --- Type: Goldfish Scooping --- !pos -399.671 -10.999 -438.910 100 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(139) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/West_Ronfaure/npcs/Signpost.lua b/scripts/zones/West_Ronfaure/npcs/Signpost.lua index 851f9429449..bbf96e0c7a0 100644 --- a/scripts/zones/West_Ronfaure/npcs/Signpost.lua +++ b/scripts/zones/West_Ronfaure/npcs/Signpost.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.WEST_RONFAURE] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local offset = npc:getID() - ID.npc.SIGNPOST_OFFSET @@ -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/West_Ronfaure/npcs/Stone_Monument.lua b/scripts/zones/West_Ronfaure/npcs/Stone_Monument.lua index 439d0db4fec..3a848cfd864 100644 --- a/scripts/zones/West_Ronfaure/npcs/Stone_Monument.lua +++ b/scripts/zones/West_Ronfaure/npcs/Stone_Monument.lua @@ -21,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/West_Ronfaure/npcs/Treasure_Casket.lua b/scripts/zones/West_Ronfaure/npcs/Treasure_Casket.lua index 26af4c9a36c..8db4cff77ff 100644 --- a/scripts/zones/West_Ronfaure/npcs/Treasure_Casket.lua +++ b/scripts/zones/West_Ronfaure/npcs/Treasure_Casket.lua @@ -13,9 +13,6 @@ entity.onTrade = function(player, npc, trade) xi.caskets.onTrade(player, npc, trade) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.caskets.onEventFinish(player, csid, option, npc) end diff --git a/scripts/zones/West_Ronfaure/npcs/Vilatroire.lua b/scripts/zones/West_Ronfaure/npcs/Vilatroire.lua index 0f30ab28054..116d77d9499 100644 --- a/scripts/zones/West_Ronfaure/npcs/Vilatroire.lua +++ b/scripts/zones/West_Ronfaure/npcs/Vilatroire.lua @@ -8,9 +8,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local sandyFame = player:getFameLevel(xi.fameArea.SANDORIA) diff --git a/scripts/zones/West_Ronfaure/npcs/Zovriace.lua b/scripts/zones/West_Ronfaure/npcs/Zovriace.lua index e429843a777..004037c0549 100644 --- a/scripts/zones/West_Ronfaure/npcs/Zovriace.lua +++ b/scripts/zones/West_Ronfaure/npcs/Zovriace.lua @@ -948,16 +948,4 @@ entity.onPath = function(npc) end 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/West_Sarutabaruta/npcs/Cavernous_Maw.lua b/scripts/zones/West_Sarutabaruta/npcs/Cavernous_Maw.lua index 819dec0b0ec..a3007d3f769 100644 --- a/scripts/zones/West_Sarutabaruta/npcs/Cavernous_Maw.lua +++ b/scripts/zones/West_Sarutabaruta/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/West_Sarutabaruta/npcs/Field_Manual.lua b/scripts/zones/West_Sarutabaruta/npcs/Field_Manual.lua index 410023469c8..675004e9b49 100644 --- a/scripts/zones/West_Sarutabaruta/npcs/Field_Manual.lua +++ b/scripts/zones/West_Sarutabaruta/npcs/Field_Manual.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.regime.bookOnTrigger(player, xi.regime.type.FIELDS) end diff --git a/scripts/zones/West_Sarutabaruta/npcs/Harvesting_Point.lua b/scripts/zones/West_Sarutabaruta/npcs/Harvesting_Point.lua index 20e5aa5ab3f..75621633870 100644 --- a/scripts/zones/West_Sarutabaruta/npcs/Harvesting_Point.lua +++ b/scripts/zones/West_Sarutabaruta/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/West_Sarutabaruta/npcs/Mahien-Uhien.lua b/scripts/zones/West_Sarutabaruta/npcs/Mahien-Uhien.lua index f27f01258ae..7cb63680c86 100644 --- a/scripts/zones/West_Sarutabaruta/npcs/Mahien-Uhien.lua +++ b/scripts/zones/West_Sarutabaruta/npcs/Mahien-Uhien.lua @@ -10,9 +10,6 @@ local entity = {} local vendorRegion = xi.region.SARUTABARUTA 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/West_Sarutabaruta/npcs/Signpost.lua b/scripts/zones/West_Sarutabaruta/npcs/Signpost.lua index 8113a3eafb7..e9977eaefbb 100644 --- a/scripts/zones/West_Sarutabaruta/npcs/Signpost.lua +++ b/scripts/zones/West_Sarutabaruta/npcs/Signpost.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.WEST_SARUTABARUTA] ---@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 >= 0 and offset <= 18 then @@ -17,10 +14,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/West_Sarutabaruta/npcs/Stone_Monument.lua b/scripts/zones/West_Sarutabaruta/npcs/Stone_Monument.lua index ef59d0fc752..bf7ad62551f 100644 --- a/scripts/zones/West_Sarutabaruta/npcs/Stone_Monument.lua +++ b/scripts/zones/West_Sarutabaruta/npcs/Stone_Monument.lua @@ -21,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/West_Sarutabaruta/npcs/Treasure_Casket.lua b/scripts/zones/West_Sarutabaruta/npcs/Treasure_Casket.lua index e6dec3a6262..d4dae8e856f 100644 --- a/scripts/zones/West_Sarutabaruta/npcs/Treasure_Casket.lua +++ b/scripts/zones/West_Sarutabaruta/npcs/Treasure_Casket.lua @@ -13,9 +13,6 @@ entity.onTrade = function(player, npc, trade) xi.caskets.onTrade(player, npc, trade) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.caskets.onEventFinish(player, csid, option, npc) end diff --git a/scripts/zones/West_Sarutabaruta/npcs/Twinkle_Tree.lua b/scripts/zones/West_Sarutabaruta/npcs/Twinkle_Tree.lua index bf80f39111d..63de65df794 100644 --- a/scripts/zones/West_Sarutabaruta/npcs/Twinkle_Tree.lua +++ b/scripts/zones/West_Sarutabaruta/npcs/Twinkle_Tree.lua @@ -41,10 +41,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/West_Sarutabaruta_[S]/npcs/Cavernous_Maw.lua b/scripts/zones/West_Sarutabaruta_[S]/npcs/Cavernous_Maw.lua index ca67641d096..b97ff79f23d 100644 --- a/scripts/zones/West_Sarutabaruta_[S]/npcs/Cavernous_Maw.lua +++ b/scripts/zones/West_Sarutabaruta_[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/West_Sarutabaruta_[S]/npcs/Harvesting_Point.lua b/scripts/zones/West_Sarutabaruta_[S]/npcs/Harvesting_Point.lua index 37396de4dba..9775217ae80 100644 --- a/scripts/zones/West_Sarutabaruta_[S]/npcs/Harvesting_Point.lua +++ b/scripts/zones/West_Sarutabaruta_[S]/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/West_Sarutabaruta_[S]/npcs/Sealed_Entrance_1.lua b/scripts/zones/West_Sarutabaruta_[S]/npcs/Sealed_Entrance_1.lua index 85c6b3a5f92..bbb09eb503a 100644 --- a/scripts/zones/West_Sarutabaruta_[S]/npcs/Sealed_Entrance_1.lua +++ b/scripts/zones/West_Sarutabaruta_[S]/npcs/Sealed_Entrance_1.lua @@ -37,10 +37,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/West_Sarutabaruta_[S]/npcs/Sealed_Entrance_2.lua b/scripts/zones/West_Sarutabaruta_[S]/npcs/Sealed_Entrance_2.lua index 571703fc617..b176f1c1e0b 100644 --- a/scripts/zones/West_Sarutabaruta_[S]/npcs/Sealed_Entrance_2.lua +++ b/scripts/zones/West_Sarutabaruta_[S]/npcs/Sealed_Entrance_2.lua @@ -37,10 +37,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/West_Sarutabaruta_[S]/npcs/Sealed_Entrance_3.lua b/scripts/zones/West_Sarutabaruta_[S]/npcs/Sealed_Entrance_3.lua index 1128aacc631..c4431ed577a 100644 --- a/scripts/zones/West_Sarutabaruta_[S]/npcs/Sealed_Entrance_3.lua +++ b/scripts/zones/West_Sarutabaruta_[S]/npcs/Sealed_Entrance_3.lua @@ -37,10 +37,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/West_Sarutabaruta_[S]/npcs/qm4.lua b/scripts/zones/West_Sarutabaruta_[S]/npcs/qm4.lua index bc16dd9f725..d212fd37196 100644 --- a/scripts/zones/West_Sarutabaruta_[S]/npcs/qm4.lua +++ b/scripts/zones/West_Sarutabaruta_[S]/npcs/qm4.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.WEST_SARUTABARUTA_S] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getQuestStatus(xi.questLog.CRYSTAL_WAR, xi.quest.id.crystalWar.THE_TIGRESS_STIRS) == xi.questStatus.QUEST_ACCEPTED and @@ -22,10 +19,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Western_Adoulin/DefaultActions.lua b/scripts/zones/Western_Adoulin/DefaultActions.lua index 987301810a8..15a4d1394a6 100644 --- a/scripts/zones/Western_Adoulin/DefaultActions.lua +++ b/scripts/zones/Western_Adoulin/DefaultActions.lua @@ -6,6 +6,7 @@ return { ['Barenngo'] = { event = 5018 }, ['Behff_Oibbah'] = { event = 514 }, ['Berstrogus'] = { event = 504 }, + ['Brenton'] = { event = 576 }, ['Chanteillie'] = { event = 531 }, ['Charutata'] = { event = 536 }, ['Clautaire'] = { event = 545 }, @@ -16,6 +17,7 @@ return { ['Dewalt'] = { event = 5017 }, ['Fervent_Horizon'] = { event = 517 }, ['Fontis_Xanira'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, + ['Gemmerick'] = { event = 5 }, ['Gontrain'] = { event = 5042 }, ['Gorad'] = { event = 542 }, ['Grevan'] = { event = 541 }, diff --git a/scripts/zones/Western_Adoulin/npcs/Andrival.lua b/scripts/zones/Western_Adoulin/npcs/Andrival.lua index 88ee78564f6..dc85f09a07e 100644 --- a/scripts/zones/Western_Adoulin/npcs/Andrival.lua +++ b/scripts/zones/Western_Adoulin/npcs/Andrival.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local soaMission = player:getCurrentMission(xi.mission.log_id.SOA) @@ -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/Western_Adoulin/npcs/Ansegusele.lua b/scripts/zones/Western_Adoulin/npcs/Ansegusele.lua index 0d69f43180a..9fddd6d3868 100644 --- a/scripts/zones/Western_Adoulin/npcs/Ansegusele.lua +++ b/scripts/zones/Western_Adoulin/npcs/Ansegusele.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.WESTERN_ADOULIN] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) -- Standard shop player:showText(npc, ID.text.ANSEGUSELE_SHOP_TEXT) @@ -28,10 +25,4 @@ entity.onTrigger = function(player, npc) xi.shop.general(player, stock) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Western_Adoulin/npcs/Auction_Counter.lua b/scripts/zones/Western_Adoulin/npcs/Auction_Counter.lua index c2919b61e6b..fe4a310889d 100644 --- a/scripts/zones/Western_Adoulin/npcs/Auction_Counter.lua +++ b/scripts/zones/Western_Adoulin/npcs/Auction_Counter.lua @@ -5,17 +5,8 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:sendMenu(3) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Western_Adoulin/npcs/Barenngo.lua b/scripts/zones/Western_Adoulin/npcs/Barenngo.lua index c71ac5bcdae..909e7cf72d5 100644 --- a/scripts/zones/Western_Adoulin/npcs/Barenngo.lua +++ b/scripts/zones/Western_Adoulin/npcs/Barenngo.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local DELM = player:getQuestStatus(xi.questLog.ADOULIN, xi.quest.id.adoulin.DONT_EVER_LEAF_ME) @@ -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 == 5015 then -- Progresses Quest: 'Dont Ever Leaf Me' diff --git a/scripts/zones/Western_Adoulin/npcs/Bilp.lua b/scripts/zones/Western_Adoulin/npcs/Bilp.lua index 377437524ee..91db7e00f53 100644 --- a/scripts/zones/Western_Adoulin/npcs/Bilp.lua +++ b/scripts/zones/Western_Adoulin/npcs/Bilp.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local scaredyCats = player:getQuestStatus(xi.questLog.ADOULIN, xi.quest.id.adoulin.SCAREDYCATS) local scaredyCatsStatus = player:getCharVar('Scaredycats_Status') @@ -33,9 +30,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 5024 and option == 1 then -- Starts Quest: 'Scaredy-Cats', after first refusal. diff --git a/scripts/zones/Western_Adoulin/npcs/Brenton.lua b/scripts/zones/Western_Adoulin/npcs/Brenton.lua deleted file mode 100644 index 0d095e1459d..00000000000 --- a/scripts/zones/Western_Adoulin/npcs/Brenton.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Western Adoulin (256) --- NPC: Brenton --- !pos -86.036 3.349 18.121 256 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(576) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Western_Adoulin/npcs/Chanteillie.lua b/scripts/zones/Western_Adoulin/npcs/Chanteillie.lua index 1556e305f39..e251d9da3e1 100644 --- a/scripts/zones/Western_Adoulin/npcs/Chanteillie.lua +++ b/scripts/zones/Western_Adoulin/npcs/Chanteillie.lua @@ -47,9 +47,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) -- DO NOT GO INTO THE LIGHT if csid == 5076 then diff --git a/scripts/zones/Western_Adoulin/npcs/Clautaire.lua b/scripts/zones/Western_Adoulin/npcs/Clautaire.lua index dbdc5dc6637..1fedf721709 100644 --- a/scripts/zones/Western_Adoulin/npcs/Clautaire.lua +++ b/scripts/zones/Western_Adoulin/npcs/Clautaire.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.WESTERN_ADOULIN] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local finao = player:getQuestStatus(xi.questLog.ADOULIN, xi.quest.id.adoulin.FAILURE_IS_NOT_AN_OPTION) if finao == xi.questStatus.QUEST_ACCEPTED then @@ -32,9 +29,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 78 then -- Starting Quest: 'F.A.I.L.ure Is Not an Option' diff --git a/scripts/zones/Western_Adoulin/npcs/Defliaa.lua b/scripts/zones/Western_Adoulin/npcs/Defliaa.lua index e64ab9eeb52..4856ef079ac 100644 --- a/scripts/zones/Western_Adoulin/npcs/Defliaa.lua +++ b/scripts/zones/Western_Adoulin/npcs/Defliaa.lua @@ -35,9 +35,6 @@ 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) -- ALL THE WAY TO THE BANK if csid == 5069 then diff --git a/scripts/zones/Western_Adoulin/npcs/Dewalt.lua b/scripts/zones/Western_Adoulin/npcs/Dewalt.lua index e37230a8655..1f58dc95f1a 100644 --- a/scripts/zones/Western_Adoulin/npcs/Dewalt.lua +++ b/scripts/zones/Western_Adoulin/npcs/Dewalt.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local DELM = player:getQuestStatus(xi.questLog.ADOULIN, xi.quest.id.adoulin.DONT_EVER_LEAF_ME) @@ -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 == 5013 then -- Progresses Quest: 'Dont Ever Leaf Me' diff --git a/scripts/zones/Western_Adoulin/npcs/Eamonn.lua b/scripts/zones/Western_Adoulin/npcs/Eamonn.lua index eaf10dc21c7..d3ec8dbc5c5 100644 --- a/scripts/zones/Western_Adoulin/npcs/Eamonn.lua +++ b/scripts/zones/Western_Adoulin/npcs/Eamonn.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local scaredyCats = player:getQuestStatus(xi.questLog.ADOULIN, xi.quest.id.adoulin.SCAREDYCATS) local scaredyCatsStatus = player:getCharVar('Scaredycats_Status') @@ -33,9 +30,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 5024 and option == 1 then -- Starts Quest: 'Scaredy-Cats', after first refusal. diff --git a/scripts/zones/Western_Adoulin/npcs/Eukalline.lua b/scripts/zones/Western_Adoulin/npcs/Eukalline.lua index 4757defd530..e4540fb7ff4 100644 --- a/scripts/zones/Western_Adoulin/npcs/Eukalline.lua +++ b/scripts/zones/Western_Adoulin/npcs/Eukalline.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.WESTERN_ADOULIN] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) -- Standard shop player:showText(npc, ID.text.EUKALLINE_SHOP_TEXT) @@ -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/Western_Adoulin/npcs/Flapano.lua b/scripts/zones/Western_Adoulin/npcs/Flapano.lua index 7ed89764c35..19f16c2865b 100644 --- a/scripts/zones/Western_Adoulin/npcs/Flapano.lua +++ b/scripts/zones/Western_Adoulin/npcs/Flapano.lua @@ -80,9 +80,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) -- ALL THE WAY TO THE BANK if csid == 5071 then diff --git a/scripts/zones/Western_Adoulin/npcs/Gemmerick.lua b/scripts/zones/Western_Adoulin/npcs/Gemmerick.lua deleted file mode 100644 index 69a9ae1b617..00000000000 --- a/scripts/zones/Western_Adoulin/npcs/Gemmerick.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Western Adoulin --- NPC: Gemmerick --- Type: Standard AH Info NPC --- !pos 79 4 26 256 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(5) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Western_Adoulin/npcs/Gontrain.lua b/scripts/zones/Western_Adoulin/npcs/Gontrain.lua index 973bc962766..e614ef69170 100644 --- a/scripts/zones/Western_Adoulin/npcs/Gontrain.lua +++ b/scripts/zones/Western_Adoulin/npcs/Gontrain.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local raptorRapture = player:getQuestStatus(xi.questLog.ADOULIN, xi.quest.id.adoulin.RAPTOR_RAPTURE) @@ -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 == 5034 then -- Progresses Quest: 'Raptor Rapture', spoke to Ilney. diff --git a/scripts/zones/Western_Adoulin/npcs/Grevan.lua b/scripts/zones/Western_Adoulin/npcs/Grevan.lua index 13119a59b1c..86d8b117c09 100644 --- a/scripts/zones/Western_Adoulin/npcs/Grevan.lua +++ b/scripts/zones/Western_Adoulin/npcs/Grevan.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local orderUp = player:getQuestStatus(xi.questLog.ADOULIN, xi.quest.id.adoulin.ORDER_UP) local orderGrevan = utils.mask.getBit(player:getCharVar('Order_Up_NPCs'), 10) @@ -30,9 +27,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 69 then -- Progresses Quest: 'Order Up' diff --git a/scripts/zones/Western_Adoulin/npcs/Hujette.lua b/scripts/zones/Western_Adoulin/npcs/Hujette.lua index fb12ef04d8e..2c1b4ec154b 100644 --- a/scripts/zones/Western_Adoulin/npcs/Hujette.lua +++ b/scripts/zones/Western_Adoulin/npcs/Hujette.lua @@ -32,9 +32,6 @@ 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) -- ALL THE WAY TO THE BANK if csid == 5070 then diff --git a/scripts/zones/Western_Adoulin/npcs/Ishvad.lua b/scripts/zones/Western_Adoulin/npcs/Ishvad.lua index 42e8e8743cb..04eb0bebcba 100644 --- a/scripts/zones/Western_Adoulin/npcs/Ishvad.lua +++ b/scripts/zones/Western_Adoulin/npcs/Ishvad.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.WESTERN_ADOULIN] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) -- Standard shop player:showText(npc, ID.text.ISHVAD_SHOP_TEXT) @@ -37,10 +34,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/Western_Adoulin/npcs/Jorin.lua b/scripts/zones/Western_Adoulin/npcs/Jorin.lua index 424e9731dcf..0b856670865 100644 --- a/scripts/zones/Western_Adoulin/npcs/Jorin.lua +++ b/scripts/zones/Western_Adoulin/npcs/Jorin.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.WESTERN_ADOULIN] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local tomath = player:getQuestStatus(xi.questLog.ADOULIN, xi.quest.id.adoulin.THE_OLD_MAN_AND_THE_HARPOON) @@ -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 == 2540 then -- Starting Quest: 'The Old Man and the Harpoon' diff --git a/scripts/zones/Western_Adoulin/npcs/Kanil.lua b/scripts/zones/Western_Adoulin/npcs/Kanil.lua index acd0f04e17a..613d96ec77b 100644 --- a/scripts/zones/Western_Adoulin/npcs/Kanil.lua +++ b/scripts/zones/Western_Adoulin/npcs/Kanil.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.WESTERN_ADOULIN] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) -- Standard shop player:showText(npc, ID.text.KANIL_SHOP_TEXT) @@ -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/Western_Adoulin/npcs/Kipligg.lua b/scripts/zones/Western_Adoulin/npcs/Kipligg.lua index 4899aaa04ef..222d595a8fe 100644 --- a/scripts/zones/Western_Adoulin/npcs/Kipligg.lua +++ b/scripts/zones/Western_Adoulin/npcs/Kipligg.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getCurrentMission(xi.mission.log_id.SOA) < xi.mission.id.soa.LIFE_ON_THE_FRONTIER then -- Dialogue prior to joining colonization effort @@ -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/Western_Adoulin/npcs/Kongramm.lua b/scripts/zones/Western_Adoulin/npcs/Kongramm.lua index b9f0a3fe692..fdfea2a78b0 100644 --- a/scripts/zones/Western_Adoulin/npcs/Kongramm.lua +++ b/scripts/zones/Western_Adoulin/npcs/Kongramm.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getCurrentMission(xi.mission.log_id.SOA) == xi.mission.id.soa.A_CURSE_FROM_THE_PAST and @@ -24,9 +21,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 148 then -- Gave hint for SOA Mission: 'A Curse From the Past' diff --git a/scripts/zones/Western_Adoulin/npcs/Ledericus.lua b/scripts/zones/Western_Adoulin/npcs/Ledericus.lua index 09fe3893544..d63ec9270dc 100644 --- a/scripts/zones/Western_Adoulin/npcs/Ledericus.lua +++ b/scripts/zones/Western_Adoulin/npcs/Ledericus.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.WESTERN_ADOULIN] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) -- Standard shop player:showText(npc, ID.text.LEDERICUS_SHOP_TEXT) @@ -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/Western_Adoulin/npcs/Levil.lua b/scripts/zones/Western_Adoulin/npcs/Levil.lua deleted file mode 100644 index 77b3643fe04..00000000000 --- a/scripts/zones/Western_Adoulin/npcs/Levil.lua +++ /dev/null @@ -1,26 +0,0 @@ ------------------------------------ --- Area: Western Adoulin (256) --- NPC: Levil --- Type: Quest and SoA Missions NPC --- !pos -87.204 3.350 12.655 256 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - -- TODO: - -- Levil has a bunch of different texts depending on where you are - -- in the SOA missions - -- Before Friction and Fissues day wait: cs: 127 -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Western_Adoulin/npcs/Marjoirelle.lua b/scripts/zones/Western_Adoulin/npcs/Marjoirelle.lua index 594222644b6..e664340345e 100644 --- a/scripts/zones/Western_Adoulin/npcs/Marjoirelle.lua +++ b/scripts/zones/Western_Adoulin/npcs/Marjoirelle.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local orderUp = player:getQuestStatus(xi.questLog.ADOULIN, xi.quest.id.adoulin.ORDER_UP) local orderMarjoirelle = utils.mask.getBit(player:getCharVar('Order_Up_NPCs'), 8) @@ -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 == 68 then -- Progresses Quest: 'Order Up' diff --git a/scripts/zones/Western_Adoulin/npcs/Mastan.lua b/scripts/zones/Western_Adoulin/npcs/Mastan.lua index 04fd12a58a6..330d0c80998 100644 --- a/scripts/zones/Western_Adoulin/npcs/Mastan.lua +++ b/scripts/zones/Western_Adoulin/npcs/Mastan.lua @@ -10,9 +10,6 @@ local ID = zones[xi.zone.WESTERN_ADOULIN] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local tccom = player:getQuestStatus(xi.questLog.ADOULIN, xi.quest.id.adoulin.THE_CURIOUS_CASE_OF_MELVIEN) local tccomNeedKI = player:hasKeyItem(xi.ki.MELVIENS_TURN) and not player:hasKeyItem(xi.ki.MELVIENS_DEATH) @@ -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 == 70 then -- Progresses Quest: 'Order Up' diff --git a/scripts/zones/Western_Adoulin/npcs/Merleg.lua b/scripts/zones/Western_Adoulin/npcs/Merleg.lua index 6ca980531ab..248900204e8 100644 --- a/scripts/zones/Western_Adoulin/npcs/Merleg.lua +++ b/scripts/zones/Western_Adoulin/npcs/Merleg.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.WESTERN_ADOULIN] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local apbif = player:getQuestStatus(xi.questLog.ADOULIN, xi.quest.id.adoulin.A_PIONEERS_BEST_IMAGINARY_FRIEND) if apbif == xi.questStatus.QUEST_ACCEPTED then @@ -27,9 +24,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 2520 then -- Starting Quest: 'A Pioneers Best (Imaginary) Friend' diff --git a/scripts/zones/Western_Adoulin/npcs/Nikkhail.lua b/scripts/zones/Western_Adoulin/npcs/Nikkhail.lua index 1735b45c4c4..964e642d131 100644 --- a/scripts/zones/Western_Adoulin/npcs/Nikkhail.lua +++ b/scripts/zones/Western_Adoulin/npcs/Nikkhail.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.WESTERN_ADOULIN] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local atfta = player:getQuestStatus(xi.questLog.ADOULIN, xi.quest.id.adoulin.A_THIRST_FOR_THE_AGES) local atftaNeedKI = player:getCharVar('ATFTA_Status') < 2 and not player:hasKeyItem(xi.ki.COPY_OF_THE_ALLIANCE_AGREEMENT) @@ -25,9 +22,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 5053 then -- Progresses Quest: 'A Thirst for the Ages' diff --git a/scripts/zones/Western_Adoulin/npcs/Nunaarl_Bthtrogg.lua b/scripts/zones/Western_Adoulin/npcs/Nunaarl_Bthtrogg.lua index e8a2074029a..e5fbf7ed42d 100644 --- a/scripts/zones/Western_Adoulin/npcs/Nunaarl_Bthtrogg.lua +++ b/scripts/zones/Western_Adoulin/npcs/Nunaarl_Bthtrogg.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/Western_Adoulin/npcs/Oka_Qhantari.lua b/scripts/zones/Western_Adoulin/npcs/Oka_Qhantari.lua index fd1196eed08..1c404abbb3f 100644 --- a/scripts/zones/Western_Adoulin/npcs/Oka_Qhantari.lua +++ b/scripts/zones/Western_Adoulin/npcs/Oka_Qhantari.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local orderUp = player:getQuestStatus(xi.questLog.ADOULIN, xi.quest.id.adoulin.ORDER_UP) local orderOkaQhantari = utils.mask.getBit(player:getCharVar('Order_Up_NPCs'), 9) @@ -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 == 71 then -- Progresses Quest: 'Order Up' diff --git a/scripts/zones/Western_Adoulin/npcs/Pagnelle.lua b/scripts/zones/Western_Adoulin/npcs/Pagnelle.lua index 79685607237..80d9fb6e1b2 100644 --- a/scripts/zones/Western_Adoulin/npcs/Pagnelle.lua +++ b/scripts/zones/Western_Adoulin/npcs/Pagnelle.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.WESTERN_ADOULIN] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local raptorRapture = player:getQuestStatus(xi.questLog.ADOULIN, xi.quest.id.adoulin.RAPTOR_RAPTURE) local raptorRaptureStatus = player:getCharVar('Raptor_Rapture_Status') @@ -60,9 +57,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 5032 then -- Warps player to Rala Waterways to continue intrductory CS for Quest: 'Raptor Rapture' diff --git a/scripts/zones/Western_Adoulin/npcs/Preterig.lua b/scripts/zones/Western_Adoulin/npcs/Preterig.lua index a89483cfd29..13525489f3d 100644 --- a/scripts/zones/Western_Adoulin/npcs/Preterig.lua +++ b/scripts/zones/Western_Adoulin/npcs/Preterig.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.WESTERN_ADOULIN] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) -- Standard shop player:showText(npc, ID.text.PRETERIG_SHOP_TEXT) @@ -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/Western_Adoulin/npcs/Rising_Solstice.lua b/scripts/zones/Western_Adoulin/npcs/Rising_Solstice.lua index 8b2d7b9fcbf..c9a2913b479 100644 --- a/scripts/zones/Western_Adoulin/npcs/Rising_Solstice.lua +++ b/scripts/zones/Western_Adoulin/npcs/Rising_Solstice.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local adoulinMission = player:getCurrentMission(xi.mission.log_id.SOA) @@ -22,10 +19,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Western_Adoulin/npcs/Ruth.lua b/scripts/zones/Western_Adoulin/npcs/Ruth.lua index 799d7bf77f9..366af181946 100644 --- a/scripts/zones/Western_Adoulin/npcs/Ruth.lua +++ b/scripts/zones/Western_Adoulin/npcs/Ruth.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getCurrentMission(xi.mission.log_id.SOA) >= xi.mission.id.soa.LIFE_ON_THE_FRONTIER then if @@ -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 == 2523 then -- Progresses Quest: 'A Pioneers Best (Imaginary) Friend' diff --git a/scripts/zones/Western_Adoulin/npcs/Shipilolo.lua b/scripts/zones/Western_Adoulin/npcs/Shipilolo.lua index e0c22b88f50..ab37727ed9a 100644 --- a/scripts/zones/Western_Adoulin/npcs/Shipilolo.lua +++ b/scripts/zones/Western_Adoulin/npcs/Shipilolo.lua @@ -12,9 +12,6 @@ local ID = zones[xi.zone.WESTERN_ADOULIN] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local fertileGround = player:getQuestStatus(xi.questLog.ADOULIN, xi.quest.id.adoulin.FERTILE_GROUND) @@ -42,9 +39,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 2543 then -- Progresses Quest: 'The Old Man and the Harpoon' diff --git a/scripts/zones/Western_Adoulin/npcs/Symphonic_Curator.lua b/scripts/zones/Western_Adoulin/npcs/Symphonic_Curator.lua index 1f207df2bd3..78532bbf338 100644 --- a/scripts/zones/Western_Adoulin/npcs/Symphonic_Curator.lua +++ b/scripts/zones/Western_Adoulin/npcs/Symphonic_Curator.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.symphonic_curator.onTrigger(player, npc) end diff --git a/scripts/zones/Western_Adoulin/npcs/Terwok.lua b/scripts/zones/Western_Adoulin/npcs/Terwok.lua index ebaf023c5ea..fe00a205889 100644 --- a/scripts/zones/Western_Adoulin/npcs/Terwok.lua +++ b/scripts/zones/Western_Adoulin/npcs/Terwok.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local orderUp = player:getQuestStatus(xi.questLog.ADOULIN, xi.quest.id.adoulin.ORDER_UP) local orderTerwok = utils.mask.getBit(player:getCharVar('Order_Up_NPCs'), 7) @@ -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 == 67 then -- Progresses Quest: 'Order Up' diff --git a/scripts/zones/Western_Adoulin/npcs/Tevigogo.lua b/scripts/zones/Western_Adoulin/npcs/Tevigogo.lua index c02a5bae679..d7f6fb86801 100644 --- a/scripts/zones/Western_Adoulin/npcs/Tevigogo.lua +++ b/scripts/zones/Western_Adoulin/npcs/Tevigogo.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.WESTERN_ADOULIN] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) -- Standard shop player:showText(npc, ID.text.TEVIGOGO_SHOP_TEXT) @@ -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/Western_Adoulin/npcs/Theophylacte.lua b/scripts/zones/Western_Adoulin/npcs/Theophylacte.lua index 56741f0f6ef..5eaefda185d 100644 --- a/scripts/zones/Western_Adoulin/npcs/Theophylacte.lua +++ b/scripts/zones/Western_Adoulin/npcs/Theophylacte.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.WESTERN_ADOULIN] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) -- Standard shop player:showText(npc, ID.text.THEOPHYLACTE_SHOP_TEXT) @@ -28,10 +25,4 @@ entity.onTrigger = function(player, npc) xi.shop.general(player, stock) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Western_Adoulin/npcs/Volgoi.lua b/scripts/zones/Western_Adoulin/npcs/Volgoi.lua index b6df6b05374..2cf98a99d1f 100644 --- a/scripts/zones/Western_Adoulin/npcs/Volgoi.lua +++ b/scripts/zones/Western_Adoulin/npcs/Volgoi.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local soaMission = player:getCurrentMission(xi.mission.log_id.SOA) @@ -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/Western_Adoulin/npcs/Westerly_Breeze.lua b/scripts/zones/Western_Adoulin/npcs/Westerly_Breeze.lua index c9991f20fdb..b84cc59eda3 100644 --- a/scripts/zones/Western_Adoulin/npcs/Westerly_Breeze.lua +++ b/scripts/zones/Western_Adoulin/npcs/Westerly_Breeze.lua @@ -77,9 +77,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 3010 then -- Starting Quest: 'Always More Quoth the Ravenous' diff --git a/scripts/zones/Western_Adoulin/npcs/Zaoso.lua b/scripts/zones/Western_Adoulin/npcs/Zaoso.lua index d9472d05183..c4b6d52120a 100644 --- a/scripts/zones/Western_Adoulin/npcs/Zaoso.lua +++ b/scripts/zones/Western_Adoulin/npcs/Zaoso.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getCurrentMission(xi.mission.log_id.SOA) >= xi.mission.id.soa.LIFE_ON_THE_FRONTIER then player:startEvent(574) @@ -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/Western_Altepa_Desert/npcs/Field_Manual.lua b/scripts/zones/Western_Altepa_Desert/npcs/Field_Manual.lua index 54abf399a7d..2c93bf9781f 100644 --- a/scripts/zones/Western_Altepa_Desert/npcs/Field_Manual.lua +++ b/scripts/zones/Western_Altepa_Desert/npcs/Field_Manual.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.regime.bookOnTrigger(player, xi.regime.type.FIELDS) end diff --git a/scripts/zones/Western_Altepa_Desert/npcs/Treasure_Casket.lua b/scripts/zones/Western_Altepa_Desert/npcs/Treasure_Casket.lua index a78a534607b..a23eb108cd4 100644 --- a/scripts/zones/Western_Altepa_Desert/npcs/Treasure_Casket.lua +++ b/scripts/zones/Western_Altepa_Desert/npcs/Treasure_Casket.lua @@ -13,9 +13,6 @@ entity.onTrade = function(player, npc, trade) xi.caskets.onTrade(player, npc, trade) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.caskets.onEventFinish(player, csid, option, npc) end diff --git a/scripts/zones/Western_Altepa_Desert/npcs/_3h0.lua b/scripts/zones/Western_Altepa_Desert/npcs/_3h0.lua index e9a50d5fdde..98685ce824c 100644 --- a/scripts/zones/Western_Altepa_Desert/npcs/_3h0.lua +++ b/scripts/zones/Western_Altepa_Desert/npcs/_3h0.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.WESTERN_ALTEPA_DESERT] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if npc:getAnimation() == xi.anim.CLOSE_DOOR then if player:getZPos() > 137 then @@ -21,10 +18,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Western_Altepa_Desert/npcs/_3h5.lua b/scripts/zones/Western_Altepa_Desert/npcs/_3h5.lua index d2d84db1b43..b48c6976ceb 100644 --- a/scripts/zones/Western_Altepa_Desert/npcs/_3h5.lua +++ b/scripts/zones/Western_Altepa_Desert/npcs/_3h5.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.WESTERN_ALTEPA_DESERT] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if npc:getAnimation() ~= xi.anim.OPEN_DOOR then npc:updateToEntireZone(xi.status.NORMAL, xi.anim.OPEN_DOOR) @@ -46,10 +43,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/Western_Altepa_Desert/npcs/_3h6.lua b/scripts/zones/Western_Altepa_Desert/npcs/_3h6.lua index 8253f1b202d..c23045e2232 100644 --- a/scripts/zones/Western_Altepa_Desert/npcs/_3h6.lua +++ b/scripts/zones/Western_Altepa_Desert/npcs/_3h6.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.WESTERN_ALTEPA_DESERT] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if npc:getAnimation() ~= xi.anim.OPEN_DOOR then npc:updateToEntireZone(xi.status.NORMAL, xi.anim.OPEN_DOOR) @@ -46,10 +43,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/Western_Altepa_Desert/npcs/_3h7.lua b/scripts/zones/Western_Altepa_Desert/npcs/_3h7.lua index 4044e1c1d5f..54acd77b6aa 100644 --- a/scripts/zones/Western_Altepa_Desert/npcs/_3h7.lua +++ b/scripts/zones/Western_Altepa_Desert/npcs/_3h7.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.WESTERN_ALTEPA_DESERT] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if npc:getAnimation() ~= xi.anim.OPEN_DOOR then npc:updateToEntireZone(xi.status.NORMAL, xi.anim.OPEN_DOOR) @@ -46,10 +43,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/Western_Altepa_Desert/npcs/_3h8.lua b/scripts/zones/Western_Altepa_Desert/npcs/_3h8.lua index 247112bb33d..1236ece3442 100644 --- a/scripts/zones/Western_Altepa_Desert/npcs/_3h8.lua +++ b/scripts/zones/Western_Altepa_Desert/npcs/_3h8.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.WESTERN_ALTEPA_DESERT] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if npc:getAnimation() ~= xi.anim.OPEN_DOOR then npc:updateToEntireZone(xi.status.NORMAL, xi.anim.OPEN_DOOR) @@ -46,10 +43,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/Western_Altepa_Desert/npcs/relic.lua b/scripts/zones/Western_Altepa_Desert/npcs/relic.lua index c354a2458e5..d9665d1449b 100644 --- a/scripts/zones/Western_Altepa_Desert/npcs/relic.lua +++ b/scripts/zones/Western_Altepa_Desert/npcs/relic.lua @@ -21,9 +21,6 @@ entity.onTrigger = function(player, npc) player:messageSpecial(ID.text.NOTHING_OUT_OF_ORDINARY) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 205 and From 72d51af10e54ac05aceb096a943177186afd02d0 Mon Sep 17 00:00:00 2001 From: claywar Date: Sat, 18 Jan 2025 19:25:17 -0500 Subject: [PATCH 2/4] Remove empty NPCs, add Default Actions - Upper Jeuno --- scripts/zones/Upper_Jeuno/DefaultActions.lua | 86 ++++++++++++------- scripts/zones/Upper_Jeuno/npcs/Afdeen.lua | 6 -- scripts/zones/Upper_Jeuno/npcs/Ajithaam.lua | 3 - scripts/zones/Upper_Jeuno/npcs/Antonia.lua | 9 -- scripts/zones/Upper_Jeuno/npcs/Appollonia.lua | 9 -- scripts/zones/Upper_Jeuno/npcs/Areebah.lua | 9 -- scripts/zones/Upper_Jeuno/npcs/Balkehr.lua | 21 ----- scripts/zones/Upper_Jeuno/npcs/Bheem.lua | 21 ----- scripts/zones/Upper_Jeuno/npcs/Bozz.lua | 21 ----- scripts/zones/Upper_Jeuno/npcs/Brutus.lua | 3 - .../zones/Upper_Jeuno/npcs/Champalpieu.lua | 9 -- scripts/zones/Upper_Jeuno/npcs/Chiphraix.lua | 21 ----- scripts/zones/Upper_Jeuno/npcs/Chocobo.lua | 9 -- scripts/zones/Upper_Jeuno/npcs/ChocoboA.lua | 22 ----- scripts/zones/Upper_Jeuno/npcs/ChocoboB.lua | 22 ----- scripts/zones/Upper_Jeuno/npcs/Coumuna.lua | 9 -- scripts/zones/Upper_Jeuno/npcs/Couvoullie.lua | 3 - .../zones/Upper_Jeuno/npcs/Deadly_Minnow.lua | 6 -- scripts/zones/Upper_Jeuno/npcs/Edlina.lua | 21 ----- scripts/zones/Upper_Jeuno/npcs/Finbarr.lua | 3 - scripts/zones/Upper_Jeuno/npcs/Finnela.lua | 22 ----- scripts/zones/Upper_Jeuno/npcs/Garadaut.lua | 21 ----- scripts/zones/Upper_Jeuno/npcs/Geebeh.lua | 21 ----- scripts/zones/Upper_Jeuno/npcs/Glyke.lua | 9 -- scripts/zones/Upper_Jeuno/npcs/Guslam.lua | 6 -- scripts/zones/Upper_Jeuno/npcs/Ilumida.lua | 6 -- scripts/zones/Upper_Jeuno/npcs/Indika.lua | 9 -- scripts/zones/Upper_Jeuno/npcs/Kasra.lua | 9 -- .../zones/Upper_Jeuno/npcs/Khe_Chalahko.lua | 9 -- .../zones/Upper_Jeuno/npcs/Koriso-Manriso.lua | 9 -- .../zones/Upper_Jeuno/npcs/Kortso-Paratso.lua | 21 ----- scripts/zones/Upper_Jeuno/npcs/Leillaine.lua | 9 -- scripts/zones/Upper_Jeuno/npcs/Mairee.lua | 3 - scripts/zones/Upper_Jeuno/npcs/Mapitoto.lua | 3 - scripts/zones/Upper_Jeuno/npcs/Mejuone.lua | 9 -- .../Upper_Jeuno/npcs/Mhao_Kehtsoruho.lua | 23 ----- scripts/zones/Upper_Jeuno/npcs/Migliorozz.lua | 22 ----- .../zones/Upper_Jeuno/npcs/Mojuro-Nojuro.lua | 21 ----- scripts/zones/Upper_Jeuno/npcs/Monberaux.lua | 27 ------ scripts/zones/Upper_Jeuno/npcs/Moritz.lua | 21 ----- .../zones/Upper_Jeuno/npcs/Nekha_Shachaba.lua | 21 ----- scripts/zones/Upper_Jeuno/npcs/Osker.lua | 3 - .../zones/Upper_Jeuno/npcs/Palarillont.lua | 21 ----- scripts/zones/Upper_Jeuno/npcs/Polly.lua | 21 ----- scripts/zones/Upper_Jeuno/npcs/Ratoto.lua | 21 ----- scripts/zones/Upper_Jeuno/npcs/Rusese.lua | 6 -- .../zones/Upper_Jeuno/npcs/Shama_Pikholo.lua | 9 -- .../zones/Upper_Jeuno/npcs/Sibila-Mobla.lua | 12 --- .../zones/Upper_Jeuno/npcs/Silver_Tail.lua | 21 ----- .../Upper_Jeuno/npcs/Symphonic_Curator.lua | 3 - scripts/zones/Upper_Jeuno/npcs/Taylen.lua | 21 ----- .../zones/Upper_Jeuno/npcs/Tewo_Rutuminpa.lua | 21 ----- scripts/zones/Upper_Jeuno/npcs/Theraisie.lua | 9 -- scripts/zones/Upper_Jeuno/npcs/Tinjue.lua | 23 ----- scripts/zones/Upper_Jeuno/npcs/Turlough.lua | 23 ----- scripts/zones/Upper_Jeuno/npcs/Ulesa.lua | 9 -- scripts/zones/Upper_Jeuno/npcs/Wise_Wolf.lua | 9 -- .../Upper_Jeuno/npcs/Zekobi-Morokobi.lua | 22 ----- scripts/zones/Upper_Jeuno/npcs/Zelma.lua | 21 ----- 59 files changed, 55 insertions(+), 834 deletions(-) delete mode 100644 scripts/zones/Upper_Jeuno/npcs/Balkehr.lua delete mode 100644 scripts/zones/Upper_Jeuno/npcs/Bheem.lua delete mode 100644 scripts/zones/Upper_Jeuno/npcs/Bozz.lua delete mode 100644 scripts/zones/Upper_Jeuno/npcs/Chiphraix.lua delete mode 100644 scripts/zones/Upper_Jeuno/npcs/ChocoboA.lua delete mode 100644 scripts/zones/Upper_Jeuno/npcs/ChocoboB.lua delete mode 100644 scripts/zones/Upper_Jeuno/npcs/Edlina.lua delete mode 100644 scripts/zones/Upper_Jeuno/npcs/Finnela.lua delete mode 100644 scripts/zones/Upper_Jeuno/npcs/Garadaut.lua delete mode 100644 scripts/zones/Upper_Jeuno/npcs/Geebeh.lua delete mode 100644 scripts/zones/Upper_Jeuno/npcs/Kortso-Paratso.lua delete mode 100644 scripts/zones/Upper_Jeuno/npcs/Mhao_Kehtsoruho.lua delete mode 100644 scripts/zones/Upper_Jeuno/npcs/Migliorozz.lua delete mode 100644 scripts/zones/Upper_Jeuno/npcs/Mojuro-Nojuro.lua delete mode 100644 scripts/zones/Upper_Jeuno/npcs/Moritz.lua delete mode 100644 scripts/zones/Upper_Jeuno/npcs/Nekha_Shachaba.lua delete mode 100644 scripts/zones/Upper_Jeuno/npcs/Palarillont.lua delete mode 100644 scripts/zones/Upper_Jeuno/npcs/Polly.lua delete mode 100644 scripts/zones/Upper_Jeuno/npcs/Ratoto.lua delete mode 100644 scripts/zones/Upper_Jeuno/npcs/Silver_Tail.lua delete mode 100644 scripts/zones/Upper_Jeuno/npcs/Taylen.lua delete mode 100644 scripts/zones/Upper_Jeuno/npcs/Tewo_Rutuminpa.lua delete mode 100644 scripts/zones/Upper_Jeuno/npcs/Tinjue.lua delete mode 100644 scripts/zones/Upper_Jeuno/npcs/Turlough.lua delete mode 100644 scripts/zones/Upper_Jeuno/npcs/Zekobi-Morokobi.lua delete mode 100644 scripts/zones/Upper_Jeuno/npcs/Zelma.lua diff --git a/scripts/zones/Upper_Jeuno/DefaultActions.lua b/scripts/zones/Upper_Jeuno/DefaultActions.lua index bddf652540f..076bb96c5c5 100644 --- a/scripts/zones/Upper_Jeuno/DefaultActions.lua +++ b/scripts/zones/Upper_Jeuno/DefaultActions.lua @@ -1,35 +1,59 @@ local ID = zones[xi.zone.UPPER_JEUNO] return { - ['_6s2'] = { event = 116 }, - ['_6sb'] = { text = ID.text.IT_READS_STAFF_ONLY }, - ['Ajithaam'] = { event = 10092 }, - ['Artush'] = { event = 42 }, - ['Baudin'] = { event = 122 }, - ['Chocobo'] = { event = 62 }, - ['ChocoboA'] = { event = 54 }, - ['ChocoboB'] = { event = 56 }, - ['Collet'] = { event = 114 }, - ['Constance'] = { event = 90 }, - ['Guide_Stone'] = { messageSpecial = ID.text.GUIDE_STONE }, - ['Hinda'] = { event = 161 }, - ['Ilumida'] = { event = 189 }, - ['Laila'] = { event = 10120 }, - ['Luto_Mewrilah'] = { event = 10034 }, - ['Mailloquetat'] = { event = 25 }, - ['Mapitoto'] = { event = 10222 }, - ['Nevela'] = { event = 69 }, - ['Monberaux'] = { event = 28 }, - ['Olgald'] = { event = 10122 }, - ['Osker'] = { event = 50 }, - ['Paya-Sabya'] = { event = 79 }, - ['Renik'] = { event = 168 }, - ['Rhea_Myuliah'] = { event = 10121 }, - ['Rosaline'] = { event = 96 }, - ['Rouliette'] = { event = 30 }, - ['Shalott'] = { event = 104 }, - ['Shiroro'] = { event = 85 }, - ['Sibila-Mobla'] = { event = 98 }, - ['Souren'] = { event = 88 }, - ['Zuber'] = { event = 125 }, + ['_6s2'] = { event = 116 }, + ['_6sb'] = { text = ID.text.IT_READS_STAFF_ONLY }, + ['Ajithaam'] = { event = 10092 }, + ['Artush'] = { event = 42 }, + ['Balkehr'] = { event = 39 }, + ['Baudin'] = { event = 122 }, + ['Bheem'] = { event = 157 }, + ['Bozz'] = { event = 78 }, + ['Chiphraix'] = { event = 153 }, + ['Chocobo'] = { event = 62 }, + ['ChocoboA'] = { event = 54 }, + ['ChocoboB'] = { event = 56 }, + ['Collet'] = { event = 114 }, + ['Constance'] = { event = 90 }, + ['Edlina'] = { event = 167 }, + ['Finnela'] = { event = 10125 }, + ['Garadaut'] = { event = 93 }, + ['Geebeh'] = { event = 79 }, + ['Guide_Stone'] = { messageSpecial = ID.text.GUIDE_STONE }, + ['Hinda'] = { event = 161 }, + ['Ilumida'] = { event = 189 }, + ['Kortso-Paratso'] = { event = 89 }, + ['Laila'] = { event = 10120 }, + ['Luto_Mewrilah'] = { event = 10034 }, + ['Mailloquetat'] = { event = 25 }, + ['Mapitoto'] = { event = 10222 }, + ['Mhao_Kehtsoruho'] = { event = 10173 }, + ['Migliorozz'] = { event = 10026 }, + ['Mojuro-Nojuro'] = { event = 128 }, + ['Monberaux'] = { event = 28 }, + ['Moritz'] = { event = 10027 }, + ['Nekha_Shachaba'] = { event = 123 }, + ['Nevela'] = { event = 69 }, + ['Olgald'] = { event = 10122 }, + ['Osker'] = { event = 50 }, + ['Palarillont'] = { event = 185 }, + ['Paya-Sabya'] = { event = 79 }, + ['Polly'] = { event = 160 }, + ['Ratoto'] = { event = 10009 }, + ['Renik'] = { event = 168 }, + ['Rhea_Myuliah'] = { event = 10121 }, + ['Rosaline'] = { event = 96 }, + ['Rouliette'] = { event = 30 }, + ['Shalott'] = { event = 104 }, + ['Shiroro'] = { event = 85 }, + ['Sibila-Mobla'] = { event = 98 }, + ['Silver_Tail'] = { event = 67 }, + ['Souren'] = { event = 88 }, + ['Taylen'] = { event = 188 }, + ['Tewo_Rutuminpa'] = { event = 111 }, + ['Tinjue'] = { event = 10010 }, + ['Turlough'] = { event = 10158 }, + ['Zekobi-Morokobi'] = { event = 87 }, + ['Zelma'] = { event = 184 }, + ['Zuber'] = { event = 125 }, } diff --git a/scripts/zones/Upper_Jeuno/npcs/Afdeen.lua b/scripts/zones/Upper_Jeuno/npcs/Afdeen.lua index 4849b2fd5c8..ac24e964fd6 100644 --- a/scripts/zones/Upper_Jeuno/npcs/Afdeen.lua +++ b/scripts/zones/Upper_Jeuno/npcs/Afdeen.lua @@ -6,16 +6,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(179) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 179 and option == 1 then player:setPos(0, 0, 0, 0, 44) diff --git a/scripts/zones/Upper_Jeuno/npcs/Ajithaam.lua b/scripts/zones/Upper_Jeuno/npcs/Ajithaam.lua index 7821a1e96f6..c9afb2f3c1a 100644 --- a/scripts/zones/Upper_Jeuno/npcs/Ajithaam.lua +++ b/scripts/zones/Upper_Jeuno/npcs/Ajithaam.lua @@ -24,9 +24,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 10177 then player:tradeComplete() diff --git a/scripts/zones/Upper_Jeuno/npcs/Antonia.lua b/scripts/zones/Upper_Jeuno/npcs/Antonia.lua index 80ce875e5a0..57179f7dc68 100644 --- a/scripts/zones/Upper_Jeuno/npcs/Antonia.lua +++ b/scripts/zones/Upper_Jeuno/npcs/Antonia.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.UPPER_JEUNO] ---@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/Upper_Jeuno/npcs/Appollonia.lua b/scripts/zones/Upper_Jeuno/npcs/Appollonia.lua index c8754c55600..6e5c31adb94 100644 --- a/scripts/zones/Upper_Jeuno/npcs/Appollonia.lua +++ b/scripts/zones/Upper_Jeuno/npcs/Appollonia.lua @@ -6,17 +6,8 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(10008, 0, 0, 0, 0, 0, 0, 0, VanadielTime()) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Upper_Jeuno/npcs/Areebah.lua b/scripts/zones/Upper_Jeuno/npcs/Areebah.lua index 79affae1c86..d4ad621280b 100644 --- a/scripts/zones/Upper_Jeuno/npcs/Areebah.lua +++ b/scripts/zones/Upper_Jeuno/npcs/Areebah.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.UPPER_JEUNO] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -28,10 +25,4 @@ entity.onTrigger = function(player, npc) xi.shop.general(player, stock) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Upper_Jeuno/npcs/Balkehr.lua b/scripts/zones/Upper_Jeuno/npcs/Balkehr.lua deleted file mode 100644 index be9f77a2f8d..00000000000 --- a/scripts/zones/Upper_Jeuno/npcs/Balkehr.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Upper Jeuno --- NPC: Balkehr ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(39) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Upper_Jeuno/npcs/Bheem.lua b/scripts/zones/Upper_Jeuno/npcs/Bheem.lua deleted file mode 100644 index 9b97157609a..00000000000 --- a/scripts/zones/Upper_Jeuno/npcs/Bheem.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Upper Jeuno --- NPC: Bheem ------------------------------------ ----@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/Upper_Jeuno/npcs/Bozz.lua b/scripts/zones/Upper_Jeuno/npcs/Bozz.lua deleted file mode 100644 index a0f5441d0ae..00000000000 --- a/scripts/zones/Upper_Jeuno/npcs/Bozz.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Upper Jeuno --- NPC: Bozz ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(78) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Upper_Jeuno/npcs/Brutus.lua b/scripts/zones/Upper_Jeuno/npcs/Brutus.lua index aa71559a472..8192604c925 100755 --- a/scripts/zones/Upper_Jeuno/npcs/Brutus.lua +++ b/scripts/zones/Upper_Jeuno/npcs/Brutus.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local wingsOfGold = player:getQuestStatus(xi.questLog.JEUNO, xi.quest.id.jeuno.WINGS_OF_GOLD) local scatteredIntoShadow = player:getQuestStatus(xi.questLog.JEUNO, xi.quest.id.jeuno.SCATTERED_INTO_SHADOW) diff --git a/scripts/zones/Upper_Jeuno/npcs/Champalpieu.lua b/scripts/zones/Upper_Jeuno/npcs/Champalpieu.lua index 11e0700fb3d..e9f6661eaf5 100644 --- a/scripts/zones/Upper_Jeuno/npcs/Champalpieu.lua +++ b/scripts/zones/Upper_Jeuno/npcs/Champalpieu.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.UPPER_JEUNO] ---@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/Upper_Jeuno/npcs/Chiphraix.lua b/scripts/zones/Upper_Jeuno/npcs/Chiphraix.lua deleted file mode 100644 index a55a989c419..00000000000 --- a/scripts/zones/Upper_Jeuno/npcs/Chiphraix.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Upper Jeuno --- NPC: Chiphraix ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(153) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Upper_Jeuno/npcs/Chocobo.lua b/scripts/zones/Upper_Jeuno/npcs/Chocobo.lua index a83a35701d3..979b7743845 100755 --- a/scripts/zones/Upper_Jeuno/npcs/Chocobo.lua +++ b/scripts/zones/Upper_Jeuno/npcs/Chocobo.lua @@ -12,13 +12,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/Upper_Jeuno/npcs/ChocoboA.lua b/scripts/zones/Upper_Jeuno/npcs/ChocoboA.lua deleted file mode 100644 index 917b08cf186..00000000000 --- a/scripts/zones/Upper_Jeuno/npcs/ChocoboA.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Upper Jeuno --- NPC: Chocobo --- Pos: -50 8 89 244 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(10096) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Upper_Jeuno/npcs/ChocoboB.lua b/scripts/zones/Upper_Jeuno/npcs/ChocoboB.lua deleted file mode 100644 index 0acfd215681..00000000000 --- a/scripts/zones/Upper_Jeuno/npcs/ChocoboB.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Upper Jeuno --- NPC: Chocobo --- Pos: -57 8 83 244 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(10098) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Upper_Jeuno/npcs/Coumuna.lua b/scripts/zones/Upper_Jeuno/npcs/Coumuna.lua index 9d2a12f6938..7030d85f027 100644 --- a/scripts/zones/Upper_Jeuno/npcs/Coumuna.lua +++ b/scripts/zones/Upper_Jeuno/npcs/Coumuna.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.UPPER_JEUNO] ---@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/Upper_Jeuno/npcs/Couvoullie.lua b/scripts/zones/Upper_Jeuno/npcs/Couvoullie.lua index a13e01a0095..4c46c76f68e 100644 --- a/scripts/zones/Upper_Jeuno/npcs/Couvoullie.lua +++ b/scripts/zones/Upper_Jeuno/npcs/Couvoullie.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/Upper_Jeuno/npcs/Deadly_Minnow.lua b/scripts/zones/Upper_Jeuno/npcs/Deadly_Minnow.lua index f76e468a1bc..509537e7469 100644 --- a/scripts/zones/Upper_Jeuno/npcs/Deadly_Minnow.lua +++ b/scripts/zones/Upper_Jeuno/npcs/Deadly_Minnow.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.UPPER_JEUNO] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getCharVar('BorghertzHandsFirstTime') == 1 then player:startEvent(24) @@ -35,9 +32,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 24 then player:setCharVar('BorghertzHandsFirstTime', 2) diff --git a/scripts/zones/Upper_Jeuno/npcs/Edlina.lua b/scripts/zones/Upper_Jeuno/npcs/Edlina.lua deleted file mode 100644 index 2aaaf4cd243..00000000000 --- a/scripts/zones/Upper_Jeuno/npcs/Edlina.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Upper Jeuno --- NPC: Edlina ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(167) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Upper_Jeuno/npcs/Finbarr.lua b/scripts/zones/Upper_Jeuno/npcs/Finbarr.lua index 07752d7c0ac..06cc34bbff0 100644 --- a/scripts/zones/Upper_Jeuno/npcs/Finbarr.lua +++ b/scripts/zones/Upper_Jeuno/npcs/Finbarr.lua @@ -54,9 +54,6 @@ entity.onTrigger = function(player, npc) --player:startEvent(10108) -- Purchase menu end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) -- 1: purchase gourmet -- 2: purchase sports diff --git a/scripts/zones/Upper_Jeuno/npcs/Finnela.lua b/scripts/zones/Upper_Jeuno/npcs/Finnela.lua deleted file mode 100644 index 322652c73f0..00000000000 --- a/scripts/zones/Upper_Jeuno/npcs/Finnela.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Upper Jeuno --- NPC: Finnela --- !pos -51.880 -1 106.486 244 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(10125) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Upper_Jeuno/npcs/Garadaut.lua b/scripts/zones/Upper_Jeuno/npcs/Garadaut.lua deleted file mode 100644 index e2fda0104cc..00000000000 --- a/scripts/zones/Upper_Jeuno/npcs/Garadaut.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Upper Jeuno --- NPC: Garadaut ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(93) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Upper_Jeuno/npcs/Geebeh.lua b/scripts/zones/Upper_Jeuno/npcs/Geebeh.lua deleted file mode 100644 index c7dcc0e1d0c..00000000000 --- a/scripts/zones/Upper_Jeuno/npcs/Geebeh.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Upper Jeuno --- NPC: Geebeh ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(79) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Upper_Jeuno/npcs/Glyke.lua b/scripts/zones/Upper_Jeuno/npcs/Glyke.lua index 88d2732f42b..e0060f5cf53 100644 --- a/scripts/zones/Upper_Jeuno/npcs/Glyke.lua +++ b/scripts/zones/Upper_Jeuno/npcs/Glyke.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.UPPER_JEUNO] ---@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.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/Upper_Jeuno/npcs/Guslam.lua b/scripts/zones/Upper_Jeuno/npcs/Guslam.lua index 006acb9ad80..c870d091415 100644 --- a/scripts/zones/Upper_Jeuno/npcs/Guslam.lua +++ b/scripts/zones/Upper_Jeuno/npcs/Guslam.lua @@ -36,9 +36,6 @@ local function isFirstHandsQuest(player) return true end -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local mJob = player:getMainJob() local prereq = prerequisites[mJob] @@ -76,9 +73,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 then local mJob = player:getMainJob() diff --git a/scripts/zones/Upper_Jeuno/npcs/Ilumida.lua b/scripts/zones/Upper_Jeuno/npcs/Ilumida.lua index 7c40202882c..c196505760d 100644 --- a/scripts/zones/Upper_Jeuno/npcs/Ilumida.lua +++ b/scripts/zones/Upper_Jeuno/npcs/Ilumida.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.UPPER_JEUNO] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local searchingForWords = player:getQuestStatus(xi.questLog.JEUNO, xi.quest.id.jeuno.SEARCHING_FOR_THE_RIGHT_WORDS) @@ -40,9 +37,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 197 and option == 0 then --quest denied, special eventIDs available player:setCharVar('QuestSearchRightWords_prereq', 0) --remove charVar from memory diff --git a/scripts/zones/Upper_Jeuno/npcs/Indika.lua b/scripts/zones/Upper_Jeuno/npcs/Indika.lua index d42c84ea5e1..b793d9151eb 100644 --- a/scripts/zones/Upper_Jeuno/npcs/Indika.lua +++ b/scripts/zones/Upper_Jeuno/npcs/Indika.lua @@ -5,17 +5,8 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:sendMenu(3) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Upper_Jeuno/npcs/Kasra.lua b/scripts/zones/Upper_Jeuno/npcs/Kasra.lua index 90aff03253f..cbae21a779a 100644 --- a/scripts/zones/Upper_Jeuno/npcs/Kasra.lua +++ b/scripts/zones/Upper_Jeuno/npcs/Kasra.lua @@ -9,18 +9,9 @@ local ID = zones[xi.zone.UPPER_JEUNO] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:showText(npc, ID.text.ITEM_DELIVERY_DIALOG) player:openSendBox() end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Upper_Jeuno/npcs/Khe_Chalahko.lua b/scripts/zones/Upper_Jeuno/npcs/Khe_Chalahko.lua index 34ebaeafaf1..1c99760030b 100644 --- a/scripts/zones/Upper_Jeuno/npcs/Khe_Chalahko.lua +++ b/scripts/zones/Upper_Jeuno/npcs/Khe_Chalahko.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.UPPER_JEUNO] ---@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/Upper_Jeuno/npcs/Koriso-Manriso.lua b/scripts/zones/Upper_Jeuno/npcs/Koriso-Manriso.lua index f3e7b0385ef..70c813b555f 100644 --- a/scripts/zones/Upper_Jeuno/npcs/Koriso-Manriso.lua +++ b/scripts/zones/Upper_Jeuno/npcs/Koriso-Manriso.lua @@ -9,18 +9,9 @@ local ID = zones[xi.zone.UPPER_JEUNO] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:showText(npc, ID.text.ITEM_DELIVERY_DIALOG) player:openSendBox() end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Upper_Jeuno/npcs/Kortso-Paratso.lua b/scripts/zones/Upper_Jeuno/npcs/Kortso-Paratso.lua deleted file mode 100644 index fbd0e013fd7..00000000000 --- a/scripts/zones/Upper_Jeuno/npcs/Kortso-Paratso.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Upper Jeuno --- NPC: Kortso-Paratso ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(89) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Upper_Jeuno/npcs/Leillaine.lua b/scripts/zones/Upper_Jeuno/npcs/Leillaine.lua index 736221ada17..00a52e0bab4 100644 --- a/scripts/zones/Upper_Jeuno/npcs/Leillaine.lua +++ b/scripts/zones/Upper_Jeuno/npcs/Leillaine.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.UPPER_JEUNO] ---@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/Upper_Jeuno/npcs/Mairee.lua b/scripts/zones/Upper_Jeuno/npcs/Mairee.lua index 83e48431f87..9786898525b 100644 --- a/scripts/zones/Upper_Jeuno/npcs/Mairee.lua +++ b/scripts/zones/Upper_Jeuno/npcs/Mairee.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/Upper_Jeuno/npcs/Mapitoto.lua b/scripts/zones/Upper_Jeuno/npcs/Mapitoto.lua index e6ab426a32a..819f3b39254 100644 --- a/scripts/zones/Upper_Jeuno/npcs/Mapitoto.lua +++ b/scripts/zones/Upper_Jeuno/npcs/Mapitoto.lua @@ -57,9 +57,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if (csid == 10223 or csid == 10224) and option == 1 then player:addQuest(xi.questLog.JEUNO, xi.quest.id.jeuno.FULL_SPEED_AHEAD) diff --git a/scripts/zones/Upper_Jeuno/npcs/Mejuone.lua b/scripts/zones/Upper_Jeuno/npcs/Mejuone.lua index c63d93538ee..805012e880b 100644 --- a/scripts/zones/Upper_Jeuno/npcs/Mejuone.lua +++ b/scripts/zones/Upper_Jeuno/npcs/Mejuone.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.UPPER_JEUNO] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -22,10 +19,4 @@ entity.onTrigger = function(player, npc) xi.shop.general(player, stock) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Upper_Jeuno/npcs/Mhao_Kehtsoruho.lua b/scripts/zones/Upper_Jeuno/npcs/Mhao_Kehtsoruho.lua deleted file mode 100644 index f6f1600a1cd..00000000000 --- a/scripts/zones/Upper_Jeuno/npcs/Mhao_Kehtsoruho.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Upper Jeuno --- NPC: Mhao Kehtsoruho --- Type: Past Event Watcher --- !pos -73.032 -1 146.919 244 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(10173) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Upper_Jeuno/npcs/Migliorozz.lua b/scripts/zones/Upper_Jeuno/npcs/Migliorozz.lua deleted file mode 100644 index 41e05446676..00000000000 --- a/scripts/zones/Upper_Jeuno/npcs/Migliorozz.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Upper Jeuno --- NPC: Migliorozz --- !pos -37.760 -2.499 12.924 244 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(10026) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Upper_Jeuno/npcs/Mojuro-Nojuro.lua b/scripts/zones/Upper_Jeuno/npcs/Mojuro-Nojuro.lua deleted file mode 100644 index d4a34801170..00000000000 --- a/scripts/zones/Upper_Jeuno/npcs/Mojuro-Nojuro.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Upper Jeuno --- NPC: Mojuro-Nojuro ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(128) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Upper_Jeuno/npcs/Monberaux.lua b/scripts/zones/Upper_Jeuno/npcs/Monberaux.lua index 013e0d3888e..4b735540bb7 100644 --- a/scripts/zones/Upper_Jeuno/npcs/Monberaux.lua +++ b/scripts/zones/Upper_Jeuno/npcs/Monberaux.lua @@ -10,9 +10,6 @@ local ID = zones[xi.zone.UPPER_JEUNO] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local theLostCardien = player:getQuestStatus(xi.questLog.JEUNO, xi.quest.id.jeuno.THE_LOST_CARDIAN) local cooksPride = player:getQuestStatus(xi.questLog.JEUNO, xi.quest.id.jeuno.COOK_S_PRIDE) @@ -39,30 +36,6 @@ entity.onTrigger = function(player, npc) end end ---Door:Infirmary 2 ++ ---Door:Infirmary 10 ++ ---Door:Infirmary 207 ++ ---Door:Infirmary 82 ++ ---Door:Infirmary 10059 nonCOP ---Door:Infirmary 10060 nonCOP ---Door:Infirmary 10205 nonCOP ---Door:Infirmary 10061 nonCOP ---Door:Infirmary 10062 nonCOP ---Door:Infirmary 10207 nonCOP ---Door:Infirmary 33 ++ ---Door:Infirmary 34 ++ ---Door:Infirmary 2 ++ ---Door:Infirmary 82 ++ ---Door:Infirmary 75 ++ ---Door:Infirmary 10060 nonCOP ---Door:Infirmary 10205 nonCOP - ---Tenzen 10011 ---Tenzen 10012 - -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if (csid == 33 and option == 0) or diff --git a/scripts/zones/Upper_Jeuno/npcs/Moritz.lua b/scripts/zones/Upper_Jeuno/npcs/Moritz.lua deleted file mode 100644 index c19e554976d..00000000000 --- a/scripts/zones/Upper_Jeuno/npcs/Moritz.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Upper Jeuno --- NPC: Moritz ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(10027) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Upper_Jeuno/npcs/Nekha_Shachaba.lua b/scripts/zones/Upper_Jeuno/npcs/Nekha_Shachaba.lua deleted file mode 100644 index 0597b62769b..00000000000 --- a/scripts/zones/Upper_Jeuno/npcs/Nekha_Shachaba.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Upper Jeuno --- NPC: Shachaba ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(123) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Upper_Jeuno/npcs/Osker.lua b/scripts/zones/Upper_Jeuno/npcs/Osker.lua index 28819602898..eae08fbbf68 100755 --- a/scripts/zones/Upper_Jeuno/npcs/Osker.lua +++ b/scripts/zones/Upper_Jeuno/npcs/Osker.lua @@ -38,9 +38,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) local aNewDawnEvent = player:getCharVar('ANewDawn_Event') diff --git a/scripts/zones/Upper_Jeuno/npcs/Palarillont.lua b/scripts/zones/Upper_Jeuno/npcs/Palarillont.lua deleted file mode 100644 index bee2f94f5cb..00000000000 --- a/scripts/zones/Upper_Jeuno/npcs/Palarillont.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Upper Jeuno --- NPC: Palarillont ------------------------------------ ----@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/Upper_Jeuno/npcs/Polly.lua b/scripts/zones/Upper_Jeuno/npcs/Polly.lua deleted file mode 100644 index 4bc48a01f2b..00000000000 --- a/scripts/zones/Upper_Jeuno/npcs/Polly.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Upper Jeuno --- NPC: Polly ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(160) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Upper_Jeuno/npcs/Ratoto.lua b/scripts/zones/Upper_Jeuno/npcs/Ratoto.lua deleted file mode 100644 index 7f72094b752..00000000000 --- a/scripts/zones/Upper_Jeuno/npcs/Ratoto.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Upper Jeuno --- NPC: Ratoto ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(10009) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Upper_Jeuno/npcs/Rusese.lua b/scripts/zones/Upper_Jeuno/npcs/Rusese.lua index 620637c9532..99a6361a519 100644 --- a/scripts/zones/Upper_Jeuno/npcs/Rusese.lua +++ b/scripts/zones/Upper_Jeuno/npcs/Rusese.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/Upper_Jeuno/npcs/Shama_Pikholo.lua b/scripts/zones/Upper_Jeuno/npcs/Shama_Pikholo.lua index 36f1f500603..97efe24b7c8 100644 --- a/scripts/zones/Upper_Jeuno/npcs/Shama_Pikholo.lua +++ b/scripts/zones/Upper_Jeuno/npcs/Shama_Pikholo.lua @@ -5,17 +5,8 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:sendMenu(3) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Upper_Jeuno/npcs/Sibila-Mobla.lua b/scripts/zones/Upper_Jeuno/npcs/Sibila-Mobla.lua index f620202be77..364fe91363f 100644 --- a/scripts/zones/Upper_Jeuno/npcs/Sibila-Mobla.lua +++ b/scripts/zones/Upper_Jeuno/npcs/Sibila-Mobla.lua @@ -33,16 +33,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/Upper_Jeuno/npcs/Silver_Tail.lua b/scripts/zones/Upper_Jeuno/npcs/Silver_Tail.lua deleted file mode 100644 index f4cd6ec7d25..00000000000 --- a/scripts/zones/Upper_Jeuno/npcs/Silver_Tail.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Upper Jeuno --- NPC: Silver Tail ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(67) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Upper_Jeuno/npcs/Symphonic_Curator.lua b/scripts/zones/Upper_Jeuno/npcs/Symphonic_Curator.lua index 1f207df2bd3..78532bbf338 100644 --- a/scripts/zones/Upper_Jeuno/npcs/Symphonic_Curator.lua +++ b/scripts/zones/Upper_Jeuno/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/Upper_Jeuno/npcs/Taylen.lua b/scripts/zones/Upper_Jeuno/npcs/Taylen.lua deleted file mode 100644 index fc090ccb407..00000000000 --- a/scripts/zones/Upper_Jeuno/npcs/Taylen.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Upper Jeuno --- NPC: Taylen ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(188) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Upper_Jeuno/npcs/Tewo_Rutuminpa.lua b/scripts/zones/Upper_Jeuno/npcs/Tewo_Rutuminpa.lua deleted file mode 100644 index 4f0763bcfcb..00000000000 --- a/scripts/zones/Upper_Jeuno/npcs/Tewo_Rutuminpa.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Upper Jeuno --- NPC: Tewo Rutuminpa ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(111) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Upper_Jeuno/npcs/Theraisie.lua b/scripts/zones/Upper_Jeuno/npcs/Theraisie.lua index 15fcfe928b9..955f255a1df 100644 --- a/scripts/zones/Upper_Jeuno/npcs/Theraisie.lua +++ b/scripts/zones/Upper_Jeuno/npcs/Theraisie.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.UPPER_JEUNO] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -41,10 +38,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/Upper_Jeuno/npcs/Tinjue.lua b/scripts/zones/Upper_Jeuno/npcs/Tinjue.lua deleted file mode 100644 index f85cc03688f..00000000000 --- a/scripts/zones/Upper_Jeuno/npcs/Tinjue.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Upper Jeuno --- NPC: Tinjue --- Type: Past Event Watcher --- !pos -73.790 -1 148.181 244 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(10010) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Upper_Jeuno/npcs/Turlough.lua b/scripts/zones/Upper_Jeuno/npcs/Turlough.lua deleted file mode 100644 index a2a454adbcd..00000000000 --- a/scripts/zones/Upper_Jeuno/npcs/Turlough.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Upper Jeuno --- NPC: Turlough --- Mission NPC --- !pos -58.697 0.000 103.553 244 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(10158) -- default dialogue -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Upper_Jeuno/npcs/Ulesa.lua b/scripts/zones/Upper_Jeuno/npcs/Ulesa.lua index c0b57a04328..6153d1a73d7 100644 --- a/scripts/zones/Upper_Jeuno/npcs/Ulesa.lua +++ b/scripts/zones/Upper_Jeuno/npcs/Ulesa.lua @@ -5,17 +5,8 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:sendMenu(3) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Upper_Jeuno/npcs/Wise_Wolf.lua b/scripts/zones/Upper_Jeuno/npcs/Wise_Wolf.lua index 8adbdd68889..3899504617a 100644 --- a/scripts/zones/Upper_Jeuno/npcs/Wise_Wolf.lua +++ b/scripts/zones/Upper_Jeuno/npcs/Wise_Wolf.lua @@ -5,17 +5,8 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:sendMenu(3) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Upper_Jeuno/npcs/Zekobi-Morokobi.lua b/scripts/zones/Upper_Jeuno/npcs/Zekobi-Morokobi.lua deleted file mode 100644 index aa7579339a9..00000000000 --- a/scripts/zones/Upper_Jeuno/npcs/Zekobi-Morokobi.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Upper Jeuno --- NPC: Zekobi-Morokobi --- !pos 41.258 -5.999 -74.105 244 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(87) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Upper_Jeuno/npcs/Zelma.lua b/scripts/zones/Upper_Jeuno/npcs/Zelma.lua deleted file mode 100644 index 48d17611e89..00000000000 --- a/scripts/zones/Upper_Jeuno/npcs/Zelma.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Upper Jeuno --- NPC: Zelma ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(184) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity From e4e2a9830f8f3b3b5a53d4fdaabb254379fefb30 Mon Sep 17 00:00:00 2001 From: claywar Date: Sun, 19 Jan 2025 09:21:20 -0500 Subject: [PATCH 3/4] Remove empty NPCs, add Default Actions - Zones Temenos ~ U --- .../zones/Temenos/npcs/Scanning_Device.lua | 3 --- .../Temple_of_Uggalepih/DefaultActions.lua | 13 +++++----- .../npcs/Chef_Nonberry.lua | 22 ----------------- .../Temple_of_Uggalepih/npcs/Grounds_Tome.lua | 3 --- .../Temple_of_Uggalepih/npcs/Old_Casket.lua | 6 ----- .../npcs/Stone_Picture_Frame.lua | 6 ----- .../npcs/Tome_of_Magic.lua | 9 ------- .../npcs/Treasure_Casket.lua | 3 --- .../npcs/Treasure_Coffer.lua | 6 ----- .../Temple_of_Uggalepih/npcs/Worn_Book.lua | 6 ----- .../zones/Temple_of_Uggalepih/npcs/_4f3.lua | 6 ----- .../zones/Temple_of_Uggalepih/npcs/_4fx.lua | 6 ----- .../zones/Temple_of_Uggalepih/npcs/_4fz.lua | 3 --- .../zones/Temple_of_Uggalepih/npcs/_mf1.lua | 9 ------- .../zones/Temple_of_Uggalepih/npcs/_mf6.lua | 6 ----- .../zones/Temple_of_Uggalepih/npcs/_mf8.lua | 6 ----- .../zones/Temple_of_Uggalepih/npcs/_mf9.lua | 6 ----- .../zones/Temple_of_Uggalepih/npcs/qm1.lua | 3 --- .../zones/Temple_of_Uggalepih/npcs/qm15.lua | 6 ----- .../zones/Temple_of_Uggalepih/npcs/qm2.lua | 3 --- .../zones/Temple_of_Uggalepih/npcs/qm3.lua | 3 --- .../zones/Temple_of_Uggalepih/npcs/qm8.lua | 6 ----- .../zones/The_Boyahda_Tree/DefaultActions.lua | 6 +++-- .../The_Boyahda_Tree/npcs/Grounds_Tome.lua | 3 --- .../npcs/Mandragora_Warden_Left.lua | 22 ----------------- .../npcs/Mandragora_Warden_Right.lua | 22 ----------------- .../The_Boyahda_Tree/npcs/Treasure_Casket.lua | 3 --- .../The_Boyahda_Tree/npcs/Treasure_Coffer.lua | 6 ----- scripts/zones/The_Boyahda_Tree/npcs/qm2.lua | 6 ----- scripts/zones/The_Colosseum/npcs/Zandjarl.lua | 3 --- scripts/zones/The_Colosseum/npcs/_1e9.lua | 6 ----- .../The_Eldieme_Necropolis/DefaultActions.lua | 1 + .../The_Eldieme_Necropolis/npcs/Cannau.lua | 23 ------------------ .../npcs/Geomagnetic_Fount.lua | 9 ------- .../npcs/Geomantic_Reservoir.lua | 6 ----- .../npcs/Gravestone.lua | 6 ----- .../npcs/Grounds_Tome.lua | 3 --- .../npcs/Sarcophagus.lua | 3 --- .../npcs/Treasure_Casket.lua | 3 --- .../npcs/Treasure_Chest.lua | 6 ----- .../npcs/Treasure_Coffer.lua | 6 ----- .../The_Eldieme_Necropolis/npcs/_5f1.lua | 9 ------- .../The_Eldieme_Necropolis/npcs/_5f2.lua | 9 ------- .../The_Eldieme_Necropolis/npcs/_5f3.lua | 9 ------- .../The_Eldieme_Necropolis/npcs/_5f4.lua | 9 ------- .../The_Eldieme_Necropolis/npcs/_5f5.lua | 9 ------- .../The_Eldieme_Necropolis/npcs/_5f6.lua | 9 ------- .../The_Eldieme_Necropolis/npcs/_5f7.lua | 9 ------- .../The_Eldieme_Necropolis/npcs/_5f8.lua | 9 ------- .../The_Eldieme_Necropolis/npcs/_5f9.lua | 9 ------- .../The_Eldieme_Necropolis/npcs/_5fa.lua | 9 ------- .../The_Eldieme_Necropolis/npcs/_5fb.lua | 9 ------- .../The_Eldieme_Necropolis/npcs/_5fc.lua | 9 ------- .../The_Eldieme_Necropolis/npcs/_5fd.lua | 9 ------- .../The_Eldieme_Necropolis/npcs/_5fe.lua | 9 ------- .../The_Eldieme_Necropolis/npcs/_5ff.lua | 9 ------- .../The_Eldieme_Necropolis/npcs/_5fg.lua | 9 ------- .../The_Eldieme_Necropolis/npcs/_5fh.lua | 9 ------- .../The_Eldieme_Necropolis/npcs/_5fi.lua | 9 ------- .../The_Eldieme_Necropolis/npcs/_5fj.lua | 9 ------- .../The_Eldieme_Necropolis/npcs/_5fk.lua | 9 ------- .../The_Eldieme_Necropolis/npcs/_5fl.lua | 9 ------- .../The_Eldieme_Necropolis/npcs/_5fm.lua | 9 ------- .../The_Eldieme_Necropolis/npcs/_5fn.lua | 9 ------- .../The_Eldieme_Necropolis/npcs/_5fo.lua | 9 ------- .../The_Eldieme_Necropolis/npcs/_5fp.lua | 9 ------- .../The_Eldieme_Necropolis/npcs/_5fq.lua | 9 ------- .../The_Eldieme_Necropolis/npcs/_5fr.lua | 9 ------- .../The_Eldieme_Necropolis/npcs/_5fs.lua | 9 ------- .../npcs/Heptachiond.lua | 6 ----- .../npcs/Layton.lua | 9 ------- .../npcs/Lennart.lua | 9 ------- .../npcs/Turbulent_Storm.lua | 6 ----- .../zones/The_Garden_of_RuHmet/npcs/_0zs.lua | 6 ----- .../zones/The_Garden_of_RuHmet/npcs/_0zy.lua | 9 ------- .../npcs/qm_ixaern_drk.lua | 9 ------- .../npcs/qm_jailer_of_faith.lua | 9 ------- .../npcs/qm_jailer_of_fortitude.lua | 9 ------- .../The_Sanctuary_of_ZiTah/DefaultActions.lua | 1 + .../npcs/Beastmens_Banner.lua | 24 ------------------- .../npcs/Field_Manual.lua | 3 --- .../The_Sanctuary_of_ZiTah/npcs/Kasim.lua | 3 --- .../npcs/Treasure_Casket.lua | 3 --- .../npcs/relic_mandau.lua | 3 --- .../npcs/relic_mjollnir.lua | 3 --- .../The_Shrine_of_RuAvitau/DefaultActions.lua | 6 ++++- .../npcs/Grounds_Tome.lua | 3 --- .../The_Shrine_of_RuAvitau/npcs/Monolith.lua | 9 ------- .../npcs/Treasure_Casket.lua | 3 --- .../The_Shrine_of_RuAvitau/npcs/Yvenoile.lua | 23 ------------------ .../zones/The_Shrine_of_RuAvitau/npcs/qm1.lua | 6 ----- .../zones/The_Shrine_of_RuAvitau/npcs/qm2.lua | 10 -------- .../zones/The_Shrine_of_RuAvitau/npcs/qm3.lua | 10 -------- .../npcs/Geomagnetic_Fount.lua | 9 ------- .../Toraimarai_Canal/npcs/Grounds_Tome.lua | 3 --- .../Toraimarai_Canal/npcs/Tome_of_Magic.lua | 9 ------- .../Toraimarai_Canal/npcs/Transporter.lua | 6 ----- .../Toraimarai_Canal/npcs/Treasure_Casket.lua | 3 --- .../Toraimarai_Canal/npcs/Treasure_Coffer.lua | 6 ----- scripts/zones/Toraimarai_Canal/npcs/qm10.lua | 6 ----- scripts/zones/Toraimarai_Canal/npcs/qm11.lua | 6 ----- scripts/zones/Toraimarai_Canal/npcs/qm9.lua | 6 ----- .../Uleguerand_Range/npcs/Chamnaet_Spring.lua | 3 --- .../Uleguerand_Range/npcs/Eternal_Ice.lua | 3 --- .../zones/Uleguerand_Range/npcs/Fissure.lua | 6 ----- .../npcs/Rabbit_Footprint.lua | 9 ------- .../zones/Uleguerand_Range/npcs/Zebada.lua | 3 --- .../Uleguerand_Range/npcs/qm_geush_urvan.lua | 9 ------- .../npcs/qm_moblin_hotrok.lua | 3 --- .../Upper_Delkfutts_Tower/DefaultActions.lua | 5 ++++ .../npcs/Geomantic_Reservoir.lua | 6 ----- .../npcs/Grounds_Tome.lua | 3 --- .../npcs/Treasure_Casket.lua | 3 --- .../npcs/Treasure_Chest.lua | 6 ----- .../zones/Upper_Delkfutts_Tower/npcs/_4e1.lua | 6 ----- .../zones/Upper_Delkfutts_Tower/npcs/_4e2.lua | 3 --- .../zones/Upper_Delkfutts_Tower/npcs/qm1.lua | 9 ------- .../zones/Upper_Delkfutts_Tower/npcs/qm2.lua | 9 ------- .../zones/Upper_Delkfutts_Tower/npcs/qm3.lua | 23 ------------------ .../zones/Valkurm_Dunes/DefaultActions.lua | 6 ++--- 120 files changed, 26 insertions(+), 860 deletions(-) delete mode 100644 scripts/zones/Temple_of_Uggalepih/npcs/Chef_Nonberry.lua delete mode 100644 scripts/zones/The_Boyahda_Tree/npcs/Mandragora_Warden_Left.lua delete mode 100644 scripts/zones/The_Boyahda_Tree/npcs/Mandragora_Warden_Right.lua delete mode 100644 scripts/zones/The_Eldieme_Necropolis/npcs/Cannau.lua delete mode 100644 scripts/zones/The_Sanctuary_of_ZiTah/npcs/Beastmens_Banner.lua delete mode 100644 scripts/zones/The_Shrine_of_RuAvitau/npcs/Yvenoile.lua create mode 100644 scripts/zones/Upper_Delkfutts_Tower/DefaultActions.lua delete mode 100644 scripts/zones/Upper_Delkfutts_Tower/npcs/qm3.lua diff --git a/scripts/zones/Temenos/npcs/Scanning_Device.lua b/scripts/zones/Temenos/npcs/Scanning_Device.lua index 4fb40cade6a..682b80b659c 100644 --- a/scripts/zones/Temenos/npcs/Scanning_Device.lua +++ b/scripts/zones/Temenos/npcs/Scanning_Device.lua @@ -40,7 +40,4 @@ entity.onEventUpdate = function(player, csid, option, npc) player:updateEvent(0, GetServerVariable(timeVarNames[option]), 0, 0, 0, 0, 0, 0) end -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Temple_of_Uggalepih/DefaultActions.lua b/scripts/zones/Temple_of_Uggalepih/DefaultActions.lua index aa556a96fdc..257c961caa0 100644 --- a/scripts/zones/Temple_of_Uggalepih/DefaultActions.lua +++ b/scripts/zones/Temple_of_Uggalepih/DefaultActions.lua @@ -1,10 +1,11 @@ local ID = zones[xi.zone.TEMPLE_OF_UGGALEPIH] return { - ['_4fx'] = { messageSpecial = ID.text.DOOR_LOCKED }, - ['qm9'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, - ['qm11'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, - ['qm12'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, - ['qm13'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, - ['qm16'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, + ['_4fx'] = { messageSpecial = ID.text.DOOR_LOCKED }, + ['Chef_Nonberry'] = { event = 27 }, + ['qm9'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, + ['qm11'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, + ['qm12'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, + ['qm13'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, + ['qm16'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, } diff --git a/scripts/zones/Temple_of_Uggalepih/npcs/Chef_Nonberry.lua b/scripts/zones/Temple_of_Uggalepih/npcs/Chef_Nonberry.lua deleted file mode 100644 index e221afc10aa..00000000000 --- a/scripts/zones/Temple_of_Uggalepih/npcs/Chef_Nonberry.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Temple of Uggalepih --- NPC: Chef Nonberry --- !pos -135.225 -1 -92.232 159 ------------------------------------ ----@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/Temple_of_Uggalepih/npcs/Grounds_Tome.lua b/scripts/zones/Temple_of_Uggalepih/npcs/Grounds_Tome.lua index e62020f5e41..3247a03552f 100644 --- a/scripts/zones/Temple_of_Uggalepih/npcs/Grounds_Tome.lua +++ b/scripts/zones/Temple_of_Uggalepih/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/Temple_of_Uggalepih/npcs/Old_Casket.lua b/scripts/zones/Temple_of_Uggalepih/npcs/Old_Casket.lua index 9ded2fd287a..b0563488a75 100644 --- a/scripts/zones/Temple_of_Uggalepih/npcs/Old_Casket.lua +++ b/scripts/zones/Temple_of_Uggalepih/npcs/Old_Casket.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.TEMPLE_OF_UGGALEPIH] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:hasKeyItem(xi.ki.OLD_RUSTY_KEY) then player:startEvent(64, xi.ki.OLD_RUSTY_KEY) @@ -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 == 64 and option == 1 then player:delKeyItem(xi.ki.OLD_RUSTY_KEY) diff --git a/scripts/zones/Temple_of_Uggalepih/npcs/Stone_Picture_Frame.lua b/scripts/zones/Temple_of_Uggalepih/npcs/Stone_Picture_Frame.lua index 2843e61c104..92ac35bbf83 100644 --- a/scripts/zones/Temple_of_Uggalepih/npcs/Stone_Picture_Frame.lua +++ b/scripts/zones/Temple_of_Uggalepih/npcs/Stone_Picture_Frame.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.TEMPLE_OF_UGGALEPIH] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local xPos = player:getXPos() local zPos = player:getZPos() @@ -55,9 +52,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 50 then -- Soon ! diff --git a/scripts/zones/Temple_of_Uggalepih/npcs/Tome_of_Magic.lua b/scripts/zones/Temple_of_Uggalepih/npcs/Tome_of_Magic.lua index 574d673303e..bfea03182fc 100644 --- a/scripts/zones/Temple_of_Uggalepih/npcs/Tome_of_Magic.lua +++ b/scripts/zones/Temple_of_Uggalepih/npcs/Tome_of_Magic.lua @@ -7,18 +7,9 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local cs = math.random(20, 22) player:startEvent(cs) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Temple_of_Uggalepih/npcs/Treasure_Casket.lua b/scripts/zones/Temple_of_Uggalepih/npcs/Treasure_Casket.lua index 9d93a8b7597..d5587683e18 100644 --- a/scripts/zones/Temple_of_Uggalepih/npcs/Treasure_Casket.lua +++ b/scripts/zones/Temple_of_Uggalepih/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/Temple_of_Uggalepih/npcs/Treasure_Coffer.lua b/scripts/zones/Temple_of_Uggalepih/npcs/Treasure_Coffer.lua index bebe6ea2622..ea17f2321ff 100644 --- a/scripts/zones/Temple_of_Uggalepih/npcs/Treasure_Coffer.lua +++ b/scripts/zones/Temple_of_Uggalepih/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/Temple_of_Uggalepih/npcs/Worn_Book.lua b/scripts/zones/Temple_of_Uggalepih/npcs/Worn_Book.lua index 2b1f2e7a5a4..bd98141f605 100644 --- a/scripts/zones/Temple_of_Uggalepih/npcs/Worn_Book.lua +++ b/scripts/zones/Temple_of_Uggalepih/npcs/Worn_Book.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.TEMPLE_OF_UGGALEPIH] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:hasKeyItem(xi.ki.OLD_RUSTY_KEY) or @@ -24,9 +21,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) local book = player:getCharVar('paintbrushOfSouls_book') diff --git a/scripts/zones/Temple_of_Uggalepih/npcs/_4f3.lua b/scripts/zones/Temple_of_Uggalepih/npcs/_4f3.lua index 641ae6a7d01..b6c1e3af0a9 100644 --- a/scripts/zones/Temple_of_Uggalepih/npcs/_4f3.lua +++ b/scripts/zones/Temple_of_Uggalepih/npcs/_4f3.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.TEMPLE_OF_UGGALEPIH] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local killCount = player:getCharVar('EVERYONES_GRUDGE_KILLS') @@ -27,9 +24,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 66 and option == 1 then if player:delGil(250 * (player:getCharVar('EVERYONES_GRUDGE_KILLS') / 20 + 1)) then diff --git a/scripts/zones/Temple_of_Uggalepih/npcs/_4fx.lua b/scripts/zones/Temple_of_Uggalepih/npcs/_4fx.lua index bf59a512fdc..d8bac6cc77f 100644 --- a/scripts/zones/Temple_of_Uggalepih/npcs/_4fx.lua +++ b/scripts/zones/Temple_of_Uggalepih/npcs/_4fx.lua @@ -30,10 +30,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Temple_of_Uggalepih/npcs/_4fz.lua b/scripts/zones/Temple_of_Uggalepih/npcs/_4fz.lua index 5c5ad9745f5..a68250510f2 100644 --- a/scripts/zones/Temple_of_Uggalepih/npcs/_4fz.lua +++ b/scripts/zones/Temple_of_Uggalepih/npcs/_4fz.lua @@ -26,9 +26,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 46 then player:confirmTrade() diff --git a/scripts/zones/Temple_of_Uggalepih/npcs/_mf1.lua b/scripts/zones/Temple_of_Uggalepih/npcs/_mf1.lua index 7613142c3b1..e037bd5112f 100644 --- a/scripts/zones/Temple_of_Uggalepih/npcs/_mf1.lua +++ b/scripts/zones/Temple_of_Uggalepih/npcs/_mf1.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.TEMPLE_OF_UGGALEPIH] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local guardian = GetMobByID(ID.mob.TEMPLE_GUARDIAN) @@ -24,10 +21,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Temple_of_Uggalepih/npcs/_mf6.lua b/scripts/zones/Temple_of_Uggalepih/npcs/_mf6.lua index 13995797df5..b0513969aae 100644 --- a/scripts/zones/Temple_of_Uggalepih/npcs/_mf6.lua +++ b/scripts/zones/Temple_of_Uggalepih/npcs/_mf6.lua @@ -25,10 +25,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Temple_of_Uggalepih/npcs/_mf8.lua b/scripts/zones/Temple_of_Uggalepih/npcs/_mf8.lua index 6c1304d2783..086f562d8a0 100644 --- a/scripts/zones/Temple_of_Uggalepih/npcs/_mf8.lua +++ b/scripts/zones/Temple_of_Uggalepih/npcs/_mf8.lua @@ -25,10 +25,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Temple_of_Uggalepih/npcs/_mf9.lua b/scripts/zones/Temple_of_Uggalepih/npcs/_mf9.lua index 069e1607f79..dd0e5606d17 100644 --- a/scripts/zones/Temple_of_Uggalepih/npcs/_mf9.lua +++ b/scripts/zones/Temple_of_Uggalepih/npcs/_mf9.lua @@ -25,10 +25,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Temple_of_Uggalepih/npcs/qm1.lua b/scripts/zones/Temple_of_Uggalepih/npcs/qm1.lua index 110815186e7..ffd125926b7 100644 --- a/scripts/zones/Temple_of_Uggalepih/npcs/qm1.lua +++ b/scripts/zones/Temple_of_Uggalepih/npcs/qm1.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.TEMPLE_OF_UGGALEPIH] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if not player:hasItem(xi.item.TONBERRY_RATTLE) then if npcUtil.giveItem(player, xi.item.TONBERRY_RATTLE) then -- Tonberry Rattle diff --git a/scripts/zones/Temple_of_Uggalepih/npcs/qm15.lua b/scripts/zones/Temple_of_Uggalepih/npcs/qm15.lua index eb7dd257f71..aef1347b7e2 100644 --- a/scripts/zones/Temple_of_Uggalepih/npcs/qm15.lua +++ b/scripts/zones/Temple_of_Uggalepih/npcs/qm15.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.TEMPLE_OF_UGGALEPIH] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local pet = player:getPet() if @@ -30,9 +27,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 67 and diff --git a/scripts/zones/Temple_of_Uggalepih/npcs/qm2.lua b/scripts/zones/Temple_of_Uggalepih/npcs/qm2.lua index 9a5fa51cb2f..08606c63654 100644 --- a/scripts/zones/Temple_of_Uggalepih/npcs/qm2.lua +++ b/scripts/zones/Temple_of_Uggalepih/npcs/qm2.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.TEMPLE_OF_UGGALEPIH] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if not player:hasItem(xi.item.OFFERING_TO_UGGALEPIH) then if npcUtil.giveItem(player, xi.item.OFFERING_TO_UGGALEPIH) then -- Uggalepih Offering diff --git a/scripts/zones/Temple_of_Uggalepih/npcs/qm3.lua b/scripts/zones/Temple_of_Uggalepih/npcs/qm3.lua index ab6091f0bc6..51679875c41 100644 --- a/scripts/zones/Temple_of_Uggalepih/npcs/qm3.lua +++ b/scripts/zones/Temple_of_Uggalepih/npcs/qm3.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.TEMPLE_OF_UGGALEPIH] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if not player:hasItem(xi.item.UGGALEPIH_WHISTLE) then if npcUtil.giveItem(player, xi.item.UGGALEPIH_WHISTLE) then -- Uggalepih Whistle diff --git a/scripts/zones/Temple_of_Uggalepih/npcs/qm8.lua b/scripts/zones/Temple_of_Uggalepih/npcs/qm8.lua index 6e980522cfd..17565f68ca0 100644 --- a/scripts/zones/Temple_of_Uggalepih/npcs/qm8.lua +++ b/scripts/zones/Temple_of_Uggalepih/npcs/qm8.lua @@ -26,10 +26,4 @@ entity.onTrigger = function(player, npc) player:messageSpecial(ID.text.BITS_OF_VEGETABLE) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/The_Boyahda_Tree/DefaultActions.lua b/scripts/zones/The_Boyahda_Tree/DefaultActions.lua index 5fc4605b153..cc39f32ec3b 100644 --- a/scripts/zones/The_Boyahda_Tree/DefaultActions.lua +++ b/scripts/zones/The_Boyahda_Tree/DefaultActions.lua @@ -1,6 +1,8 @@ local ID = zones[xi.zone.THE_BOYAHDA_TREE] return { - ['Mandragora_Warden'] = { event = 10 }, - ['qm1'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, + ['Mandragora_Warden'] = { event = 10 }, + ['Mandragora_Warden_Left'] = { event = 11 }, + ['Mandragora_Warden_Right'] = { event = 12 }, + ['qm1'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, } diff --git a/scripts/zones/The_Boyahda_Tree/npcs/Grounds_Tome.lua b/scripts/zones/The_Boyahda_Tree/npcs/Grounds_Tome.lua index fce10fe4828..c282a7eb0ec 100644 --- a/scripts/zones/The_Boyahda_Tree/npcs/Grounds_Tome.lua +++ b/scripts/zones/The_Boyahda_Tree/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/The_Boyahda_Tree/npcs/Mandragora_Warden_Left.lua b/scripts/zones/The_Boyahda_Tree/npcs/Mandragora_Warden_Left.lua deleted file mode 100644 index 7df69d00d4a..00000000000 --- a/scripts/zones/The_Boyahda_Tree/npcs/Mandragora_Warden_Left.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: The Boyahda Tree --- NPC: Mandragora Warden --- !pos 99.068 8.548 122.514 153 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(11) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/The_Boyahda_Tree/npcs/Mandragora_Warden_Right.lua b/scripts/zones/The_Boyahda_Tree/npcs/Mandragora_Warden_Right.lua deleted file mode 100644 index f2fa4104d62..00000000000 --- a/scripts/zones/The_Boyahda_Tree/npcs/Mandragora_Warden_Right.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: The Boyahda Tree --- NPC: Mandragora Warden --- !pos 101.978 8.369 121.969 153 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(12) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/The_Boyahda_Tree/npcs/Treasure_Casket.lua b/scripts/zones/The_Boyahda_Tree/npcs/Treasure_Casket.lua index 8316c28ba82..71a28ba33b5 100644 --- a/scripts/zones/The_Boyahda_Tree/npcs/Treasure_Casket.lua +++ b/scripts/zones/The_Boyahda_Tree/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/The_Boyahda_Tree/npcs/Treasure_Coffer.lua b/scripts/zones/The_Boyahda_Tree/npcs/Treasure_Coffer.lua index 3c603b2ea9a..f62d6c85ed0 100644 --- a/scripts/zones/The_Boyahda_Tree/npcs/Treasure_Coffer.lua +++ b/scripts/zones/The_Boyahda_Tree/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/The_Boyahda_Tree/npcs/qm2.lua b/scripts/zones/The_Boyahda_Tree/npcs/qm2.lua index 26b0cedb878..db6e23f398d 100644 --- a/scripts/zones/The_Boyahda_Tree/npcs/qm2.lua +++ b/scripts/zones/The_Boyahda_Tree/npcs/qm2.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.THE_BOYAHDA_TREE] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) -- Notes: does ??? depop when Agas is spawned? -- current implementation: when Agas is active, triggering ??? will result in detarget @@ -43,9 +40,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 14 then player:addKeyItem(xi.ki.MOONDROP) diff --git a/scripts/zones/The_Colosseum/npcs/Zandjarl.lua b/scripts/zones/The_Colosseum/npcs/Zandjarl.lua index 5abab04dab6..4cfa174d8d4 100644 --- a/scripts/zones/The_Colosseum/npcs/Zandjarl.lua +++ b/scripts/zones/The_Colosseum/npcs/Zandjarl.lua @@ -43,9 +43,6 @@ entity.onTrigger = function(player, npc) player:startEvent(1900, player:getCurrency('jetton')) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 1900 then -- onTrigger local shop = diff --git a/scripts/zones/The_Colosseum/npcs/_1e9.lua b/scripts/zones/The_Colosseum/npcs/_1e9.lua index 1ad7293e27e..b1d3d1ca49b 100644 --- a/scripts/zones/The_Colosseum/npcs/_1e9.lua +++ b/scripts/zones/The_Colosseum/npcs/_1e9.lua @@ -6,16 +6,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(51) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 51 and option == 1 then player:setPos(79.981, 0, -104.897, 190, 50) diff --git a/scripts/zones/The_Eldieme_Necropolis/DefaultActions.lua b/scripts/zones/The_Eldieme_Necropolis/DefaultActions.lua index 7c1475f528e..2486a624249 100644 --- a/scripts/zones/The_Eldieme_Necropolis/DefaultActions.lua +++ b/scripts/zones/The_Eldieme_Necropolis/DefaultActions.lua @@ -3,5 +3,6 @@ local ID = zones[xi.zone.THE_ELDIEME_NECROPOLIS] return { ['qm1'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, ['Brazier'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, + ['Cannau'] = { event = 51 }, ['Hume_Bones'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, } diff --git a/scripts/zones/The_Eldieme_Necropolis/npcs/Cannau.lua b/scripts/zones/The_Eldieme_Necropolis/npcs/Cannau.lua deleted file mode 100644 index 2ba238c9bb8..00000000000 --- a/scripts/zones/The_Eldieme_Necropolis/npcs/Cannau.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: The Eldieme Necropolis --- NPC: Cannau --- Type: Escort NPC --- !pos 419.838 -56.999 -114.870 195 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(51) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/The_Eldieme_Necropolis/npcs/Geomagnetic_Fount.lua b/scripts/zones/The_Eldieme_Necropolis/npcs/Geomagnetic_Fount.lua index d629eb98b2b..496e260bdc4 100644 --- a/scripts/zones/The_Eldieme_Necropolis/npcs/Geomagnetic_Fount.lua +++ b/scripts/zones/The_Eldieme_Necropolis/npcs/Geomagnetic_Fount.lua @@ -6,17 +6,8 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.geomagneticFount.checkFount(player, npc) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/The_Eldieme_Necropolis/npcs/Geomantic_Reservoir.lua b/scripts/zones/The_Eldieme_Necropolis/npcs/Geomantic_Reservoir.lua index ad21e8adc31..b04dc1a72a4 100644 --- a/scripts/zones/The_Eldieme_Necropolis/npcs/Geomantic_Reservoir.lua +++ b/scripts/zones/The_Eldieme_Necropolis/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_SLIP) 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_SLIP) end diff --git a/scripts/zones/The_Eldieme_Necropolis/npcs/Gravestone.lua b/scripts/zones/The_Eldieme_Necropolis/npcs/Gravestone.lua index 72444608488..4581d38c444 100644 --- a/scripts/zones/The_Eldieme_Necropolis/npcs/Gravestone.lua +++ b/scripts/zones/The_Eldieme_Necropolis/npcs/Gravestone.lua @@ -7,18 +7,12 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getCharVar('fireAndBrimstone') == 3 then player:startEvent(5) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 5 then player:setCharVar('fireAndBrimstone', 4) diff --git a/scripts/zones/The_Eldieme_Necropolis/npcs/Grounds_Tome.lua b/scripts/zones/The_Eldieme_Necropolis/npcs/Grounds_Tome.lua index 7b8c662392a..94dd1636925 100644 --- a/scripts/zones/The_Eldieme_Necropolis/npcs/Grounds_Tome.lua +++ b/scripts/zones/The_Eldieme_Necropolis/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/The_Eldieme_Necropolis/npcs/Sarcophagus.lua b/scripts/zones/The_Eldieme_Necropolis/npcs/Sarcophagus.lua index 1b5d6e72b90..d254c9a78b1 100644 --- a/scripts/zones/The_Eldieme_Necropolis/npcs/Sarcophagus.lua +++ b/scripts/zones/The_Eldieme_Necropolis/npcs/Sarcophagus.lua @@ -63,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) -- THE REQUIEM if csid == 46 then diff --git a/scripts/zones/The_Eldieme_Necropolis/npcs/Treasure_Casket.lua b/scripts/zones/The_Eldieme_Necropolis/npcs/Treasure_Casket.lua index 79969e32dfc..d332f0d3b32 100644 --- a/scripts/zones/The_Eldieme_Necropolis/npcs/Treasure_Casket.lua +++ b/scripts/zones/The_Eldieme_Necropolis/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/The_Eldieme_Necropolis/npcs/Treasure_Chest.lua b/scripts/zones/The_Eldieme_Necropolis/npcs/Treasure_Chest.lua index b91609e799e..e86677afc54 100644 --- a/scripts/zones/The_Eldieme_Necropolis/npcs/Treasure_Chest.lua +++ b/scripts/zones/The_Eldieme_Necropolis/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/The_Eldieme_Necropolis/npcs/Treasure_Coffer.lua b/scripts/zones/The_Eldieme_Necropolis/npcs/Treasure_Coffer.lua index 029eb161782..5ab5d0cd19e 100644 --- a/scripts/zones/The_Eldieme_Necropolis/npcs/Treasure_Coffer.lua +++ b/scripts/zones/The_Eldieme_Necropolis/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/The_Eldieme_Necropolis/npcs/_5f1.lua b/scripts/zones/The_Eldieme_Necropolis/npcs/_5f1.lua index c78c25783f9..fa21834922f 100644 --- a/scripts/zones/The_Eldieme_Necropolis/npcs/_5f1.lua +++ b/scripts/zones/The_Eldieme_Necropolis/npcs/_5f1.lua @@ -8,17 +8,8 @@ local func = require('scripts/zones/The_Eldieme_Necropolis/globals') ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) func.gateOnTrigger(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/The_Eldieme_Necropolis/npcs/_5f2.lua b/scripts/zones/The_Eldieme_Necropolis/npcs/_5f2.lua index 753bf33767e..73e7fb0956f 100644 --- a/scripts/zones/The_Eldieme_Necropolis/npcs/_5f2.lua +++ b/scripts/zones/The_Eldieme_Necropolis/npcs/_5f2.lua @@ -8,17 +8,8 @@ local func = require('scripts/zones/The_Eldieme_Necropolis/globals') ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) func.gateOnTrigger(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/The_Eldieme_Necropolis/npcs/_5f3.lua b/scripts/zones/The_Eldieme_Necropolis/npcs/_5f3.lua index 4506cdaeb22..6060c3dc671 100644 --- a/scripts/zones/The_Eldieme_Necropolis/npcs/_5f3.lua +++ b/scripts/zones/The_Eldieme_Necropolis/npcs/_5f3.lua @@ -8,17 +8,8 @@ local func = require('scripts/zones/The_Eldieme_Necropolis/globals') ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) func.gateOnTrigger(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/The_Eldieme_Necropolis/npcs/_5f4.lua b/scripts/zones/The_Eldieme_Necropolis/npcs/_5f4.lua index f1c06ff5c14..f418095a73f 100644 --- a/scripts/zones/The_Eldieme_Necropolis/npcs/_5f4.lua +++ b/scripts/zones/The_Eldieme_Necropolis/npcs/_5f4.lua @@ -8,17 +8,8 @@ local func = require('scripts/zones/The_Eldieme_Necropolis/globals') ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) func.gateOnTrigger(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/The_Eldieme_Necropolis/npcs/_5f5.lua b/scripts/zones/The_Eldieme_Necropolis/npcs/_5f5.lua index f08b005f720..f039e92f96a 100644 --- a/scripts/zones/The_Eldieme_Necropolis/npcs/_5f5.lua +++ b/scripts/zones/The_Eldieme_Necropolis/npcs/_5f5.lua @@ -8,17 +8,8 @@ local func = require('scripts/zones/The_Eldieme_Necropolis/globals') ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) func.gateOnTrigger(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/The_Eldieme_Necropolis/npcs/_5f6.lua b/scripts/zones/The_Eldieme_Necropolis/npcs/_5f6.lua index 04fe9af7438..487a5c5f2aa 100644 --- a/scripts/zones/The_Eldieme_Necropolis/npcs/_5f6.lua +++ b/scripts/zones/The_Eldieme_Necropolis/npcs/_5f6.lua @@ -8,17 +8,8 @@ local func = require('scripts/zones/The_Eldieme_Necropolis/globals') ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) func.gateOnTrigger(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/The_Eldieme_Necropolis/npcs/_5f7.lua b/scripts/zones/The_Eldieme_Necropolis/npcs/_5f7.lua index 155a91c7524..d1a64c3f71b 100644 --- a/scripts/zones/The_Eldieme_Necropolis/npcs/_5f7.lua +++ b/scripts/zones/The_Eldieme_Necropolis/npcs/_5f7.lua @@ -8,17 +8,8 @@ local func = require('scripts/zones/The_Eldieme_Necropolis/globals') ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) func.gateOnTrigger(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/The_Eldieme_Necropolis/npcs/_5f8.lua b/scripts/zones/The_Eldieme_Necropolis/npcs/_5f8.lua index 0903941db8f..70b4259cbef 100644 --- a/scripts/zones/The_Eldieme_Necropolis/npcs/_5f8.lua +++ b/scripts/zones/The_Eldieme_Necropolis/npcs/_5f8.lua @@ -8,17 +8,8 @@ local func = require('scripts/zones/The_Eldieme_Necropolis/globals') ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) func.gateOnTrigger(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/The_Eldieme_Necropolis/npcs/_5f9.lua b/scripts/zones/The_Eldieme_Necropolis/npcs/_5f9.lua index d320d7f4d7e..75fa8259cda 100644 --- a/scripts/zones/The_Eldieme_Necropolis/npcs/_5f9.lua +++ b/scripts/zones/The_Eldieme_Necropolis/npcs/_5f9.lua @@ -8,17 +8,8 @@ local func = require('scripts/zones/The_Eldieme_Necropolis/globals') ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) func.gateOnTrigger(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/The_Eldieme_Necropolis/npcs/_5fa.lua b/scripts/zones/The_Eldieme_Necropolis/npcs/_5fa.lua index 553ddfacdb8..2a59c5cf1eb 100644 --- a/scripts/zones/The_Eldieme_Necropolis/npcs/_5fa.lua +++ b/scripts/zones/The_Eldieme_Necropolis/npcs/_5fa.lua @@ -8,17 +8,8 @@ local func = require('scripts/zones/The_Eldieme_Necropolis/globals') ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) func.gateOnTrigger(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/The_Eldieme_Necropolis/npcs/_5fb.lua b/scripts/zones/The_Eldieme_Necropolis/npcs/_5fb.lua index 606f6c352c0..a70173bade1 100644 --- a/scripts/zones/The_Eldieme_Necropolis/npcs/_5fb.lua +++ b/scripts/zones/The_Eldieme_Necropolis/npcs/_5fb.lua @@ -8,17 +8,8 @@ local func = require('scripts/zones/The_Eldieme_Necropolis/globals') ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) func.gateOnTrigger(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/The_Eldieme_Necropolis/npcs/_5fc.lua b/scripts/zones/The_Eldieme_Necropolis/npcs/_5fc.lua index c189be2d33e..6d67f588ea4 100644 --- a/scripts/zones/The_Eldieme_Necropolis/npcs/_5fc.lua +++ b/scripts/zones/The_Eldieme_Necropolis/npcs/_5fc.lua @@ -8,17 +8,8 @@ local func = require('scripts/zones/The_Eldieme_Necropolis/globals') ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) func.gateOnTrigger(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/The_Eldieme_Necropolis/npcs/_5fd.lua b/scripts/zones/The_Eldieme_Necropolis/npcs/_5fd.lua index f9db50151dd..93f58c2de6b 100644 --- a/scripts/zones/The_Eldieme_Necropolis/npcs/_5fd.lua +++ b/scripts/zones/The_Eldieme_Necropolis/npcs/_5fd.lua @@ -8,17 +8,8 @@ local func = require('scripts/zones/The_Eldieme_Necropolis/globals') ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) func.gateOnTrigger(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/The_Eldieme_Necropolis/npcs/_5fe.lua b/scripts/zones/The_Eldieme_Necropolis/npcs/_5fe.lua index 1eb73169139..89728236edb 100644 --- a/scripts/zones/The_Eldieme_Necropolis/npcs/_5fe.lua +++ b/scripts/zones/The_Eldieme_Necropolis/npcs/_5fe.lua @@ -8,17 +8,8 @@ local func = require('scripts/zones/The_Eldieme_Necropolis/globals') ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) func.gateOnTrigger(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/The_Eldieme_Necropolis/npcs/_5ff.lua b/scripts/zones/The_Eldieme_Necropolis/npcs/_5ff.lua index 93c5e1b9675..274d1b44596 100644 --- a/scripts/zones/The_Eldieme_Necropolis/npcs/_5ff.lua +++ b/scripts/zones/The_Eldieme_Necropolis/npcs/_5ff.lua @@ -8,17 +8,8 @@ local func = require('scripts/zones/The_Eldieme_Necropolis/globals') ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) func.gateOnTrigger(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/The_Eldieme_Necropolis/npcs/_5fg.lua b/scripts/zones/The_Eldieme_Necropolis/npcs/_5fg.lua index 2ef3ad29ca4..64355ee3a42 100644 --- a/scripts/zones/The_Eldieme_Necropolis/npcs/_5fg.lua +++ b/scripts/zones/The_Eldieme_Necropolis/npcs/_5fg.lua @@ -8,17 +8,8 @@ local func = require('scripts/zones/The_Eldieme_Necropolis/globals') ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) func.gateOnTrigger(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/The_Eldieme_Necropolis/npcs/_5fh.lua b/scripts/zones/The_Eldieme_Necropolis/npcs/_5fh.lua index c5d874298a9..6e26894bad7 100644 --- a/scripts/zones/The_Eldieme_Necropolis/npcs/_5fh.lua +++ b/scripts/zones/The_Eldieme_Necropolis/npcs/_5fh.lua @@ -8,17 +8,8 @@ local func = require('scripts/zones/The_Eldieme_Necropolis/globals') ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) func.gateOnTrigger(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/The_Eldieme_Necropolis/npcs/_5fi.lua b/scripts/zones/The_Eldieme_Necropolis/npcs/_5fi.lua index d406f030897..f646d963e36 100644 --- a/scripts/zones/The_Eldieme_Necropolis/npcs/_5fi.lua +++ b/scripts/zones/The_Eldieme_Necropolis/npcs/_5fi.lua @@ -8,17 +8,8 @@ local func = require('scripts/zones/The_Eldieme_Necropolis/globals') ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) func.gateOnTrigger(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/The_Eldieme_Necropolis/npcs/_5fj.lua b/scripts/zones/The_Eldieme_Necropolis/npcs/_5fj.lua index a9875ecf352..d79b963964f 100644 --- a/scripts/zones/The_Eldieme_Necropolis/npcs/_5fj.lua +++ b/scripts/zones/The_Eldieme_Necropolis/npcs/_5fj.lua @@ -8,17 +8,8 @@ local func = require('scripts/zones/The_Eldieme_Necropolis/globals') ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) func.gateOnTrigger(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/The_Eldieme_Necropolis/npcs/_5fk.lua b/scripts/zones/The_Eldieme_Necropolis/npcs/_5fk.lua index d1f6b86b20e..8c6230d7ff3 100644 --- a/scripts/zones/The_Eldieme_Necropolis/npcs/_5fk.lua +++ b/scripts/zones/The_Eldieme_Necropolis/npcs/_5fk.lua @@ -8,17 +8,8 @@ local func = require('scripts/zones/The_Eldieme_Necropolis/globals') ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) func.gateOnTrigger(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/The_Eldieme_Necropolis/npcs/_5fl.lua b/scripts/zones/The_Eldieme_Necropolis/npcs/_5fl.lua index 11763307b4b..3eba6d4d49c 100644 --- a/scripts/zones/The_Eldieme_Necropolis/npcs/_5fl.lua +++ b/scripts/zones/The_Eldieme_Necropolis/npcs/_5fl.lua @@ -8,17 +8,8 @@ local func = require('scripts/zones/The_Eldieme_Necropolis/globals') ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) func.plateOnTrigger(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/The_Eldieme_Necropolis/npcs/_5fm.lua b/scripts/zones/The_Eldieme_Necropolis/npcs/_5fm.lua index 1648297ef73..a690288a6f3 100644 --- a/scripts/zones/The_Eldieme_Necropolis/npcs/_5fm.lua +++ b/scripts/zones/The_Eldieme_Necropolis/npcs/_5fm.lua @@ -8,17 +8,8 @@ local func = require('scripts/zones/The_Eldieme_Necropolis/globals') ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) func.plateOnTrigger(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/The_Eldieme_Necropolis/npcs/_5fn.lua b/scripts/zones/The_Eldieme_Necropolis/npcs/_5fn.lua index 111de23df97..cca57ccd6e4 100644 --- a/scripts/zones/The_Eldieme_Necropolis/npcs/_5fn.lua +++ b/scripts/zones/The_Eldieme_Necropolis/npcs/_5fn.lua @@ -8,17 +8,8 @@ local func = require('scripts/zones/The_Eldieme_Necropolis/globals') ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) func.plateOnTrigger(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/The_Eldieme_Necropolis/npcs/_5fo.lua b/scripts/zones/The_Eldieme_Necropolis/npcs/_5fo.lua index b87a325184d..7dbd1cab34f 100644 --- a/scripts/zones/The_Eldieme_Necropolis/npcs/_5fo.lua +++ b/scripts/zones/The_Eldieme_Necropolis/npcs/_5fo.lua @@ -8,17 +8,8 @@ local func = require('scripts/zones/The_Eldieme_Necropolis/globals') ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) func.plateOnTrigger(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/The_Eldieme_Necropolis/npcs/_5fp.lua b/scripts/zones/The_Eldieme_Necropolis/npcs/_5fp.lua index e5346b6aded..012af39d812 100644 --- a/scripts/zones/The_Eldieme_Necropolis/npcs/_5fp.lua +++ b/scripts/zones/The_Eldieme_Necropolis/npcs/_5fp.lua @@ -8,17 +8,8 @@ local func = require('scripts/zones/The_Eldieme_Necropolis/globals') ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) func.plateOnTrigger(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/The_Eldieme_Necropolis/npcs/_5fq.lua b/scripts/zones/The_Eldieme_Necropolis/npcs/_5fq.lua index 66455076e46..3ab7a10516e 100644 --- a/scripts/zones/The_Eldieme_Necropolis/npcs/_5fq.lua +++ b/scripts/zones/The_Eldieme_Necropolis/npcs/_5fq.lua @@ -8,17 +8,8 @@ local func = require('scripts/zones/The_Eldieme_Necropolis/globals') ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) func.plateOnTrigger(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/The_Eldieme_Necropolis/npcs/_5fr.lua b/scripts/zones/The_Eldieme_Necropolis/npcs/_5fr.lua index d6791e9af16..48f6f914d63 100644 --- a/scripts/zones/The_Eldieme_Necropolis/npcs/_5fr.lua +++ b/scripts/zones/The_Eldieme_Necropolis/npcs/_5fr.lua @@ -8,17 +8,8 @@ local func = require('scripts/zones/The_Eldieme_Necropolis/globals') ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) func.plateOnTrigger(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/The_Eldieme_Necropolis/npcs/_5fs.lua b/scripts/zones/The_Eldieme_Necropolis/npcs/_5fs.lua index a9ddbc68e44..b9ba5c5a1af 100644 --- a/scripts/zones/The_Eldieme_Necropolis/npcs/_5fs.lua +++ b/scripts/zones/The_Eldieme_Necropolis/npcs/_5fs.lua @@ -8,17 +8,8 @@ local func = require('scripts/zones/The_Eldieme_Necropolis/globals') ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) func.plateOnTrigger(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/The_Eldieme_Necropolis_[S]/npcs/Heptachiond.lua b/scripts/zones/The_Eldieme_Necropolis_[S]/npcs/Heptachiond.lua index 92b7e4aa6c8..622fed8d23f 100644 --- a/scripts/zones/The_Eldieme_Necropolis_[S]/npcs/Heptachiond.lua +++ b/scripts/zones/The_Eldieme_Necropolis_[S]/npcs/Heptachiond.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local rftd = player:getQuestStatus(xi.questLog.CRYSTAL_WAR, xi.quest.id.crystalWar.REQUIEM_FOR_THE_DEPARTED) @@ -33,9 +30,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 105 then player:addQuest(xi.questLog.CRYSTAL_WAR, xi.quest.id.crystalWar.REQUIEM_FOR_THE_DEPARTED) diff --git a/scripts/zones/The_Eldieme_Necropolis_[S]/npcs/Layton.lua b/scripts/zones/The_Eldieme_Necropolis_[S]/npcs/Layton.lua index 3f4debe734c..5520e5b9967 100644 --- a/scripts/zones/The_Eldieme_Necropolis_[S]/npcs/Layton.lua +++ b/scripts/zones/The_Eldieme_Necropolis_[S]/npcs/Layton.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.THE_ELDIEME_NECROPOLIS_S] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -37,10 +34,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/The_Eldieme_Necropolis_[S]/npcs/Lennart.lua b/scripts/zones/The_Eldieme_Necropolis_[S]/npcs/Lennart.lua index fa8add87ed1..8bba6ae445b 100644 --- a/scripts/zones/The_Eldieme_Necropolis_[S]/npcs/Lennart.lua +++ b/scripts/zones/The_Eldieme_Necropolis_[S]/npcs/Lennart.lua @@ -9,18 +9,9 @@ local ID = zones[xi.zone.THE_ELDIEME_NECROPOLIS_S] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:showText(npc, ID.text.ITEM_DELIVERY_DIALOG) player:openSendBox() end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/The_Eldieme_Necropolis_[S]/npcs/Turbulent_Storm.lua b/scripts/zones/The_Eldieme_Necropolis_[S]/npcs/Turbulent_Storm.lua index 3eeaec8e243..7dd837af942 100644 --- a/scripts/zones/The_Eldieme_Necropolis_[S]/npcs/Turbulent_Storm.lua +++ b/scripts/zones/The_Eldieme_Necropolis_[S]/npcs/Turbulent_Storm.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.THE_ELDIEME_NECROPOLIS_S] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getCampaignAllegiance() > 0 then if player:getCampaignAllegiance() == 2 then @@ -27,9 +24,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 7 and option == 0 then player:addKeyItem(xi.ki.BLUE_RECOMMENDATION_LETTER) diff --git a/scripts/zones/The_Garden_of_RuHmet/npcs/_0zs.lua b/scripts/zones/The_Garden_of_RuHmet/npcs/_0zs.lua index c9a147fe3c5..d406537624f 100644 --- a/scripts/zones/The_Garden_of_RuHmet/npcs/_0zs.lua +++ b/scripts/zones/The_Garden_of_RuHmet/npcs/_0zs.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:hasCompletedMission(xi.mission.log_id.COP, xi.mission.id.cop.WHEN_ANGELS_FALL) or @@ -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 == 112 and option == 1 then player:setPos(-20, 0, -355, 192, 34) diff --git a/scripts/zones/The_Garden_of_RuHmet/npcs/_0zy.lua b/scripts/zones/The_Garden_of_RuHmet/npcs/_0zy.lua index 79ea244f398..5f027925178 100644 --- a/scripts/zones/The_Garden_of_RuHmet/npcs/_0zy.lua +++ b/scripts/zones/The_Garden_of_RuHmet/npcs/_0zy.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.THE_GARDEN_OF_RUHMET] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) -- This applies to pre-COP Dawn only. Mission script overrides with the broken state. @@ -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/The_Garden_of_RuHmet/npcs/qm_ixaern_drk.lua b/scripts/zones/The_Garden_of_RuHmet/npcs/qm_ixaern_drk.lua index 76ac931ba7b..b2bcfdf4e6c 100644 --- a/scripts/zones/The_Garden_of_RuHmet/npcs/qm_ixaern_drk.lua +++ b/scripts/zones/The_Garden_of_RuHmet/npcs/qm_ixaern_drk.lua @@ -14,9 +14,6 @@ local gardenGlobal = require('scripts/zones/The_Garden_of_RuHmet/globals') ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local hatedPlayer = npc:getLocalVar('hatedPlayer') local isInTime = npc:getLocalVar('hateTimer') > os.time() @@ -52,10 +49,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/The_Garden_of_RuHmet/npcs/qm_jailer_of_faith.lua b/scripts/zones/The_Garden_of_RuHmet/npcs/qm_jailer_of_faith.lua index d680d1c97ea..1191c509be8 100644 --- a/scripts/zones/The_Garden_of_RuHmet/npcs/qm_jailer_of_faith.lua +++ b/scripts/zones/The_Garden_of_RuHmet/npcs/qm_jailer_of_faith.lua @@ -22,13 +22,4 @@ entity.onTrade = function(player, npc, trade) end end -entity.onTrigger = function(player, npc) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/The_Garden_of_RuHmet/npcs/qm_jailer_of_fortitude.lua b/scripts/zones/The_Garden_of_RuHmet/npcs/qm_jailer_of_fortitude.lua index 82eee7089a9..cacc7e389fc 100644 --- a/scripts/zones/The_Garden_of_RuHmet/npcs/qm_jailer_of_fortitude.lua +++ b/scripts/zones/The_Garden_of_RuHmet/npcs/qm_jailer_of_fortitude.lua @@ -22,13 +22,4 @@ entity.onTrade = function(player, npc, trade) end end -entity.onTrigger = function(player, npc) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/The_Sanctuary_of_ZiTah/DefaultActions.lua b/scripts/zones/The_Sanctuary_of_ZiTah/DefaultActions.lua index 7ec3694371b..69ac8039a0f 100644 --- a/scripts/zones/The_Sanctuary_of_ZiTah/DefaultActions.lua +++ b/scripts/zones/The_Sanctuary_of_ZiTah/DefaultActions.lua @@ -1,6 +1,7 @@ local ID = zones[xi.zone.THE_SANCTUARY_OF_ZITAH] return { + ['Beastmens_Banner'] = { messageSpecial = ID.text.BEASTMEN_BANNER }, ['qm1'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, ['qm2'] = { messageSpecial = ID.text.BEAUTIFUL_STURDY_BRANCH }, ['qm3'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, diff --git a/scripts/zones/The_Sanctuary_of_ZiTah/npcs/Beastmens_Banner.lua b/scripts/zones/The_Sanctuary_of_ZiTah/npcs/Beastmens_Banner.lua deleted file mode 100644 index 9e973bd196a..00000000000 --- a/scripts/zones/The_Sanctuary_of_ZiTah/npcs/Beastmens_Banner.lua +++ /dev/null @@ -1,24 +0,0 @@ ------------------------------------ --- Area: The_Sanctuary_of_ZiTah --- NPC: Beastmen_s_Banner --- !pos -399.822 0.161 -168.998 121 ------------------------------------ -local ID = zones[xi.zone.THE_SANCTUARY_OF_ZITAH] ------------------------------------ ----@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/The_Sanctuary_of_ZiTah/npcs/Field_Manual.lua b/scripts/zones/The_Sanctuary_of_ZiTah/npcs/Field_Manual.lua index 347a8d4f228..5843652d1c3 100644 --- a/scripts/zones/The_Sanctuary_of_ZiTah/npcs/Field_Manual.lua +++ b/scripts/zones/The_Sanctuary_of_ZiTah/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/The_Sanctuary_of_ZiTah/npcs/Kasim.lua b/scripts/zones/The_Sanctuary_of_ZiTah/npcs/Kasim.lua index d8fbe1a8160..c55a92a3f80 100644 --- a/scripts/zones/The_Sanctuary_of_ZiTah/npcs/Kasim.lua +++ b/scripts/zones/The_Sanctuary_of_ZiTah/npcs/Kasim.lua @@ -10,9 +10,6 @@ local entity = {} local vendorRegion = xi.region.LITELOR 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/The_Sanctuary_of_ZiTah/npcs/Treasure_Casket.lua b/scripts/zones/The_Sanctuary_of_ZiTah/npcs/Treasure_Casket.lua index e996998c5e4..2348d04c61b 100644 --- a/scripts/zones/The_Sanctuary_of_ZiTah/npcs/Treasure_Casket.lua +++ b/scripts/zones/The_Sanctuary_of_ZiTah/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/The_Sanctuary_of_ZiTah/npcs/relic_mandau.lua b/scripts/zones/The_Sanctuary_of_ZiTah/npcs/relic_mandau.lua index 3b14eb48dae..a0581ef13fb 100644 --- a/scripts/zones/The_Sanctuary_of_ZiTah/npcs/relic_mandau.lua +++ b/scripts/zones/The_Sanctuary_of_ZiTah/npcs/relic_mandau.lua @@ -25,9 +25,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 == 207 and diff --git a/scripts/zones/The_Sanctuary_of_ZiTah/npcs/relic_mjollnir.lua b/scripts/zones/The_Sanctuary_of_ZiTah/npcs/relic_mjollnir.lua index 8407cd2c87d..c2f943363ad 100644 --- a/scripts/zones/The_Sanctuary_of_ZiTah/npcs/relic_mjollnir.lua +++ b/scripts/zones/The_Sanctuary_of_ZiTah/npcs/relic_mjollnir.lua @@ -24,9 +24,6 @@ entity.onTrigger = function(player, npc) player:messageSpecial(ID.text.NOTHING_OUT_OF_ORDINARY) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 216 and diff --git a/scripts/zones/The_Shrine_of_RuAvitau/DefaultActions.lua b/scripts/zones/The_Shrine_of_RuAvitau/DefaultActions.lua index d69af873836..eb3a582c2bb 100644 --- a/scripts/zones/The_Shrine_of_RuAvitau/DefaultActions.lua +++ b/scripts/zones/The_Shrine_of_RuAvitau/DefaultActions.lua @@ -1,5 +1,9 @@ local ID = zones[xi.zone.THE_SHRINE_OF_RUAVITAU] return { - ['blank_divine_might'] = { text = ID.text.NOTHING_OUT_OF_ORDINARY }, + ['blank_divine_might'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, + ['qm1'] = { messageSpecial = ID.text.SMALL_HOLE_HERE }, + ['qm2'] = { event = 100 }, + ['qm3'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, + ['Yvenoile'] = { event = 53 }, } diff --git a/scripts/zones/The_Shrine_of_RuAvitau/npcs/Grounds_Tome.lua b/scripts/zones/The_Shrine_of_RuAvitau/npcs/Grounds_Tome.lua index 089f6f5acb1..0ea1d8ad0a6 100644 --- a/scripts/zones/The_Shrine_of_RuAvitau/npcs/Grounds_Tome.lua +++ b/scripts/zones/The_Shrine_of_RuAvitau/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/The_Shrine_of_RuAvitau/npcs/Monolith.lua b/scripts/zones/The_Shrine_of_RuAvitau/npcs/Monolith.lua index 40262600888..1611cba56bd 100644 --- a/scripts/zones/The_Shrine_of_RuAvitau/npcs/Monolith.lua +++ b/scripts/zones/The_Shrine_of_RuAvitau/npcs/Monolith.lua @@ -37,9 +37,6 @@ local monoliths = [18] = 'y', [19] = 'b', } -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local offset = npc:getID() - ID.npc.MONOLITH_OFFSET if offset >= 0 and offset <= 38 then @@ -56,10 +53,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/The_Shrine_of_RuAvitau/npcs/Treasure_Casket.lua b/scripts/zones/The_Shrine_of_RuAvitau/npcs/Treasure_Casket.lua index 9a227fd061c..942e4393cdc 100644 --- a/scripts/zones/The_Shrine_of_RuAvitau/npcs/Treasure_Casket.lua +++ b/scripts/zones/The_Shrine_of_RuAvitau/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/The_Shrine_of_RuAvitau/npcs/Yvenoile.lua b/scripts/zones/The_Shrine_of_RuAvitau/npcs/Yvenoile.lua deleted file mode 100644 index 47d315da79d..00000000000 --- a/scripts/zones/The_Shrine_of_RuAvitau/npcs/Yvenoile.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: The Shrine of Ru'Avitau --- NPC: Yve'noile --- Type: Quest Giver --- !pos 0.001 -1 0.001 178 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(53) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/The_Shrine_of_RuAvitau/npcs/qm1.lua b/scripts/zones/The_Shrine_of_RuAvitau/npcs/qm1.lua index 4a7b0834aa1..647ec6e6a09 100644 --- a/scripts/zones/The_Shrine_of_RuAvitau/npcs/qm1.lua +++ b/scripts/zones/The_Shrine_of_RuAvitau/npcs/qm1.lua @@ -29,10 +29,4 @@ entity.onTrigger = function(player, npc) player:messageSpecial(ID.text.SMALL_HOLE_HERE) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/The_Shrine_of_RuAvitau/npcs/qm2.lua b/scripts/zones/The_Shrine_of_RuAvitau/npcs/qm2.lua index 172a6e7fb54..5fe948c4d9d 100644 --- a/scripts/zones/The_Shrine_of_RuAvitau/npcs/qm2.lua +++ b/scripts/zones/The_Shrine_of_RuAvitau/npcs/qm2.lua @@ -18,14 +18,4 @@ entity.onTrade = function(player, npc, trade) end end -entity.onTrigger = function(player, npc) - player:startEvent(100) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/The_Shrine_of_RuAvitau/npcs/qm3.lua b/scripts/zones/The_Shrine_of_RuAvitau/npcs/qm3.lua index 6a591307f99..8fbb7aae175 100644 --- a/scripts/zones/The_Shrine_of_RuAvitau/npcs/qm3.lua +++ b/scripts/zones/The_Shrine_of_RuAvitau/npcs/qm3.lua @@ -18,14 +18,4 @@ entity.onTrade = function(player, npc, trade) end 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/Toraimarai_Canal/npcs/Geomagnetic_Fount.lua b/scripts/zones/Toraimarai_Canal/npcs/Geomagnetic_Fount.lua index 801be47d630..83ac2c5d239 100644 --- a/scripts/zones/Toraimarai_Canal/npcs/Geomagnetic_Fount.lua +++ b/scripts/zones/Toraimarai_Canal/npcs/Geomagnetic_Fount.lua @@ -6,17 +6,8 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.geomagneticFount.checkFount(player, npc) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Toraimarai_Canal/npcs/Grounds_Tome.lua b/scripts/zones/Toraimarai_Canal/npcs/Grounds_Tome.lua index cdb5a44a9ef..5096217a72d 100644 --- a/scripts/zones/Toraimarai_Canal/npcs/Grounds_Tome.lua +++ b/scripts/zones/Toraimarai_Canal/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/Toraimarai_Canal/npcs/Tome_of_Magic.lua b/scripts/zones/Toraimarai_Canal/npcs/Tome_of_Magic.lua index 69a6b8a90a7..243e54be6b9 100644 --- a/scripts/zones/Toraimarai_Canal/npcs/Tome_of_Magic.lua +++ b/scripts/zones/Toraimarai_Canal/npcs/Tome_of_Magic.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.TORAIMARAI_CANAL] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local offset = npc:getID() - ID.npc.TOME_OF_MAGIC_OFFSET @@ -20,10 +17,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Toraimarai_Canal/npcs/Transporter.lua b/scripts/zones/Toraimarai_Canal/npcs/Transporter.lua index ea8aee6a81a..86ee018bdcb 100644 --- a/scripts/zones/Toraimarai_Canal/npcs/Transporter.lua +++ b/scripts/zones/Toraimarai_Canal/npcs/Transporter.lua @@ -7,16 +7,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(71) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 71 and option == 1 then player:setPos(0, 0, -22, 192, 242) diff --git a/scripts/zones/Toraimarai_Canal/npcs/Treasure_Casket.lua b/scripts/zones/Toraimarai_Canal/npcs/Treasure_Casket.lua index ae5573e207a..dc53563c31f 100644 --- a/scripts/zones/Toraimarai_Canal/npcs/Treasure_Casket.lua +++ b/scripts/zones/Toraimarai_Canal/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/Toraimarai_Canal/npcs/Treasure_Coffer.lua b/scripts/zones/Toraimarai_Canal/npcs/Treasure_Coffer.lua index d4379bce90e..4251dc5bfe5 100644 --- a/scripts/zones/Toraimarai_Canal/npcs/Treasure_Coffer.lua +++ b/scripts/zones/Toraimarai_Canal/npcs/Treasure_Coffer.lua @@ -15,10 +15,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/Toraimarai_Canal/npcs/qm10.lua b/scripts/zones/Toraimarai_Canal/npcs/qm10.lua index 0da99944b61..68e7e624bf0 100644 --- a/scripts/zones/Toraimarai_Canal/npcs/qm10.lua +++ b/scripts/zones/Toraimarai_Canal/npcs/qm10.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getCharVar('rootProblem') == 2 then if player:getCharVar('rootProblemQ2') <= 1 then @@ -24,9 +21,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 47 then player:setCharVar('rootProblemQ2', 2) diff --git a/scripts/zones/Toraimarai_Canal/npcs/qm11.lua b/scripts/zones/Toraimarai_Canal/npcs/qm11.lua index 6d621dfafe6..a4831c564d6 100644 --- a/scripts/zones/Toraimarai_Canal/npcs/qm11.lua +++ b/scripts/zones/Toraimarai_Canal/npcs/qm11.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.TORAIMARAI_CANAL] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getCharVar('rootProblem') == 2 then if @@ -26,9 +23,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 48 and option ~= 0 then SpawnMob(ID.mob.MAGIC_SLUDGE):updateClaim(player) diff --git a/scripts/zones/Toraimarai_Canal/npcs/qm9.lua b/scripts/zones/Toraimarai_Canal/npcs/qm9.lua index 84cd8ef0ae6..3ac65b85c32 100644 --- a/scripts/zones/Toraimarai_Canal/npcs/qm9.lua +++ b/scripts/zones/Toraimarai_Canal/npcs/qm9.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getCharVar('rootProblem') == 2 then if player:getCharVar('rootProblemQ1') <= 1 then @@ -20,9 +17,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 42 then player:setCharVar('rootProblemQ1', 2) diff --git a/scripts/zones/Uleguerand_Range/npcs/Chamnaet_Spring.lua b/scripts/zones/Uleguerand_Range/npcs/Chamnaet_Spring.lua index 433babe2afb..dbdd42c3242 100644 --- a/scripts/zones/Uleguerand_Range/npcs/Chamnaet_Spring.lua +++ b/scripts/zones/Uleguerand_Range/npcs/Chamnaet_Spring.lua @@ -22,7 +22,4 @@ entity.onTrade = function(player, npc, trade) end end -entity.onTrigger = function(player, npc) -end - return entity diff --git a/scripts/zones/Uleguerand_Range/npcs/Eternal_Ice.lua b/scripts/zones/Uleguerand_Range/npcs/Eternal_Ice.lua index d75690f8b44..165f48ff340 100644 --- a/scripts/zones/Uleguerand_Range/npcs/Eternal_Ice.lua +++ b/scripts/zones/Uleguerand_Range/npcs/Eternal_Ice.lua @@ -11,9 +11,6 @@ local ID = zones[xi.zone.ULEGUERAND_RANGE] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if not player:hasKeyItem(xi.ki.MYSTIC_ICE) then player:addKeyItem(xi.ki.MYSTIC_ICE) diff --git a/scripts/zones/Uleguerand_Range/npcs/Fissure.lua b/scripts/zones/Uleguerand_Range/npcs/Fissure.lua index 5a33913beb0..42771d32e15 100644 --- a/scripts/zones/Uleguerand_Range/npcs/Fissure.lua +++ b/scripts/zones/Uleguerand_Range/npcs/Fissure.lua @@ -11,9 +11,6 @@ local ID = zones[xi.zone.ULEGUERAND_RANGE] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local z = player:getZPos() @@ -30,9 +27,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if (csid == 2 or csid == 3 or csid == 4) and option == 2 then player:delKeyItem(xi.ki.MYSTIC_ICE) diff --git a/scripts/zones/Uleguerand_Range/npcs/Rabbit_Footprint.lua b/scripts/zones/Uleguerand_Range/npcs/Rabbit_Footprint.lua index b7bbe3edf6a..a56d6af2bdb 100644 --- a/scripts/zones/Uleguerand_Range/npcs/Rabbit_Footprint.lua +++ b/scripts/zones/Uleguerand_Range/npcs/Rabbit_Footprint.lua @@ -52,15 +52,6 @@ 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 - local function moveFootprint(npc) -- ffxiclopedia's pages for Black Coney and White Coney say 7 and 5 Earth seconds respectively, in game it is very fast -- https://ffxiclopedia.fandom.com/wiki/Black_Coney diff --git a/scripts/zones/Uleguerand_Range/npcs/Zebada.lua b/scripts/zones/Uleguerand_Range/npcs/Zebada.lua index 01c722870e1..d446c526ff9 100644 --- a/scripts/zones/Uleguerand_Range/npcs/Zebada.lua +++ b/scripts/zones/Uleguerand_Range/npcs/Zebada.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 == 13 then player:addKeyItem(xi.ki.ZEPHYR_FAN) diff --git a/scripts/zones/Uleguerand_Range/npcs/qm_geush_urvan.lua b/scripts/zones/Uleguerand_Range/npcs/qm_geush_urvan.lua index 10db6b5868f..29462b18346 100644 --- a/scripts/zones/Uleguerand_Range/npcs/qm_geush_urvan.lua +++ b/scripts/zones/Uleguerand_Range/npcs/qm_geush_urvan.lua @@ -16,13 +16,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/Uleguerand_Range/npcs/qm_moblin_hotrok.lua b/scripts/zones/Uleguerand_Range/npcs/qm_moblin_hotrok.lua index 8de29b72cd6..cc33c2c9ce3 100644 --- a/scripts/zones/Uleguerand_Range/npcs/qm_moblin_hotrok.lua +++ b/scripts/zones/Uleguerand_Range/npcs/qm_moblin_hotrok.lua @@ -62,9 +62,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 10 and diff --git a/scripts/zones/Upper_Delkfutts_Tower/DefaultActions.lua b/scripts/zones/Upper_Delkfutts_Tower/DefaultActions.lua new file mode 100644 index 00000000000..7990f4facdb --- /dev/null +++ b/scripts/zones/Upper_Delkfutts_Tower/DefaultActions.lua @@ -0,0 +1,5 @@ +-- local ID = zones[xi.zone.UPPER_DELKFUTTS_TOWER] + +return { + ['qm3'] = { event = 17 }, +} diff --git a/scripts/zones/Upper_Delkfutts_Tower/npcs/Geomantic_Reservoir.lua b/scripts/zones/Upper_Delkfutts_Tower/npcs/Geomantic_Reservoir.lua index 51e073f2f45..5ba2e9d338b 100644 --- a/scripts/zones/Upper_Delkfutts_Tower/npcs/Geomantic_Reservoir.lua +++ b/scripts/zones/Upper_Delkfutts_Tower/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_VEX) 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_VEX) end diff --git a/scripts/zones/Upper_Delkfutts_Tower/npcs/Grounds_Tome.lua b/scripts/zones/Upper_Delkfutts_Tower/npcs/Grounds_Tome.lua index 533be9ac9f0..50b18724ba1 100644 --- a/scripts/zones/Upper_Delkfutts_Tower/npcs/Grounds_Tome.lua +++ b/scripts/zones/Upper_Delkfutts_Tower/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/Upper_Delkfutts_Tower/npcs/Treasure_Casket.lua b/scripts/zones/Upper_Delkfutts_Tower/npcs/Treasure_Casket.lua index f419763f600..f7dc9de1dde 100644 --- a/scripts/zones/Upper_Delkfutts_Tower/npcs/Treasure_Casket.lua +++ b/scripts/zones/Upper_Delkfutts_Tower/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/Upper_Delkfutts_Tower/npcs/Treasure_Chest.lua b/scripts/zones/Upper_Delkfutts_Tower/npcs/Treasure_Chest.lua index 76f57415922..bd9875a3719 100644 --- a/scripts/zones/Upper_Delkfutts_Tower/npcs/Treasure_Chest.lua +++ b/scripts/zones/Upper_Delkfutts_Tower/npcs/Treasure_Chest.lua @@ -15,10 +15,4 @@ entity.onTrigger = function(player, npc) xi.treasure.onTrigger(player, xi.treasure.type.CHEST) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Upper_Delkfutts_Tower/npcs/_4e1.lua b/scripts/zones/Upper_Delkfutts_Tower/npcs/_4e1.lua index 7dd2e763247..5db00cdf092 100644 --- a/scripts/zones/Upper_Delkfutts_Tower/npcs/_4e1.lua +++ b/scripts/zones/Upper_Delkfutts_Tower/npcs/_4e1.lua @@ -6,16 +6,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(2) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 2 and option == 1 then player:setPos(524, 16, 20, 0, 184) -- to Lower Delkfutt's Tower diff --git a/scripts/zones/Upper_Delkfutts_Tower/npcs/_4e2.lua b/scripts/zones/Upper_Delkfutts_Tower/npcs/_4e2.lua index 5d49cb9d45f..86b7b87ffe8 100644 --- a/scripts/zones/Upper_Delkfutts_Tower/npcs/_4e2.lua +++ b/scripts/zones/Upper_Delkfutts_Tower/npcs/_4e2.lua @@ -22,9 +22,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 6 then if not player:hasKeyItem(xi.ki.DELKFUTT_KEY) then diff --git a/scripts/zones/Upper_Delkfutts_Tower/npcs/qm1.lua b/scripts/zones/Upper_Delkfutts_Tower/npcs/qm1.lua index 247d74bc4d9..2d2aa46db47 100644 --- a/scripts/zones/Upper_Delkfutts_Tower/npcs/qm1.lua +++ b/scripts/zones/Upper_Delkfutts_Tower/npcs/qm1.lua @@ -17,13 +17,4 @@ entity.onTrade = function(player, npc, trade) end end -entity.onTrigger = function(player, npc) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Upper_Delkfutts_Tower/npcs/qm2.lua b/scripts/zones/Upper_Delkfutts_Tower/npcs/qm2.lua index 6f5d54c03c6..66e196b0c24 100644 --- a/scripts/zones/Upper_Delkfutts_Tower/npcs/qm2.lua +++ b/scripts/zones/Upper_Delkfutts_Tower/npcs/qm2.lua @@ -17,13 +17,4 @@ entity.onTrade = function(player, npc, trade) end end -entity.onTrigger = function(player, npc) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Upper_Delkfutts_Tower/npcs/qm3.lua b/scripts/zones/Upper_Delkfutts_Tower/npcs/qm3.lua deleted file mode 100644 index 5bfaa4e63f1..00000000000 --- a/scripts/zones/Upper_Delkfutts_Tower/npcs/qm3.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Upper Delkfutt's Tower --- NPC: ??? --- Notes: Teleports you to the 10th floor. --- !pos 261 19 20 158 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(17) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Valkurm_Dunes/DefaultActions.lua b/scripts/zones/Valkurm_Dunes/DefaultActions.lua index c8b68562206..c97d06a328f 100644 --- a/scripts/zones/Valkurm_Dunes/DefaultActions.lua +++ b/scripts/zones/Valkurm_Dunes/DefaultActions.lua @@ -1,9 +1,9 @@ local ID = zones[xi.zone.VALKURM_DUNES] return { - ['Beastmens_Banner'] = { messageSpecial = ID.text.BEASTMEN_BANNER } + ['Beastmens_Banner'] = { messageSpecial = ID.text.BEASTMEN_BANNER }, ['qm3'] = { messageSpecial = ID.text.YOU_SENSE_AN_EVIL_PRESENCE }, ['qm4'] = { messageSpecial = ID.text.MONSTERS_KILLED_ADVENTURERS }, - ['Signpost1'] = { messageSpecial = ID.text.SIGNPOST1} - ['Signpost2'] = { messageSpecial = ID.text.SIGNPOST2} + ['Signpost1'] = { messageSpecial = ID.text.SIGNPOST1 }, + ['Signpost2'] = { messageSpecial = ID.text.SIGNPOST2 }, } From ca2291968125bad9d4a1fcf82b263040e14a465b Mon Sep 17 00:00:00 2001 From: claywar Date: Sun, 19 Jan 2025 10:49:38 -0500 Subject: [PATCH 4/4] Remove empty NPCs, add Default Actions - Souther San d'Oria ~ T --- .../zones/South_Gustaberg/DefaultActions.lua | 3 +- .../South_Gustaberg/npcs/Cavernous_Maw.lua | 6 --- .../South_Gustaberg/npcs/Field_Manual.lua | 3 -- .../zones/South_Gustaberg/npcs/Fish_Eyes.lua | 23 --------- .../South_Gustaberg/npcs/Goblin_Footprint.lua | 3 -- .../South_Gustaberg/npcs/Stone_Monument.lua | 6 --- .../South_Gustaberg/npcs/Treasure_Casket.lua | 3 -- scripts/zones/South_Gustaberg/npcs/qm1.lua | 8 --- .../Southern_San_dOria/DefaultActions.lua | 49 +++++++++++++++---- .../Southern_San_dOria/npcs/AMAN_Liaison.lua | 3 -- .../npcs/AMAN_Validator.lua | 3 -- .../zones/Southern_San_dOria/npcs/Adaunel.lua | 11 ----- .../zones/Southern_San_dOria/npcs/Ailevia.lua | 3 -- .../zones/Southern_San_dOria/npcs/Alaune.lua | 6 --- .../zones/Southern_San_dOria/npcs/Amaura.lua | 6 --- .../Southern_San_dOria/npcs/Ambrotien.lua | 6 --- .../Southern_San_dOria/npcs/Amutiyaal.lua | 3 -- .../Southern_San_dOria/npcs/Anxaberoute.lua | 22 --------- .../Southern_San_dOria/npcs/Apairemant.lua | 6 --- .../Southern_San_dOria/npcs/Arpetion.lua | 23 --------- .../Southern_San_dOria/npcs/Arvilauge.lua | 12 +---- .../zones/Southern_San_dOria/npcs/Ashene.lua | 9 ---- .../Southern_San_dOria/npcs/Aubejart.lua | 23 --------- .../npcs/Auction_Counter.lua | 9 ---- .../zones/Southern_San_dOria/npcs/Authere.lua | 6 --- .../zones/Southern_San_dOria/npcs/Aveline.lua | 9 ---- .../Southern_San_dOria/npcs/Balasiel.lua | 3 -- .../zones/Southern_San_dOria/npcs/Benaige.lua | 9 ---- .../Southern_San_dOria/npcs/Blendare.lua | 3 -- .../Southern_San_dOria/npcs/Camereine.lua | 3 -- .../Southern_San_dOria/npcs/Capucine.lua | 9 ---- .../Southern_San_dOria/npcs/Carautia.lua | 9 ---- .../Southern_San_dOria/npcs/Celyddon.lua | 9 ---- .../zones/Southern_San_dOria/npcs/Ceraule.lua | 23 --------- .../zones/Southern_San_dOria/npcs/Chanpau.lua | 8 +-- .../zones/Southern_San_dOria/npcs/Chocobo.lua | 29 ----------- .../Southern_San_dOria/npcs/Chocobo_1.lua | 13 ----- .../Southern_San_dOria/npcs/Chocobo_2.lua | 13 ----- .../Southern_San_dOria/npcs/Chocobo_3.lua | 13 ----- .../Southern_San_dOria/npcs/Clainomille.lua | 13 ----- .../zones/Southern_San_dOria/npcs/Cletae.lua | 6 --- .../Southern_San_dOria/npcs/Coderiant.lua | 23 --------- .../Southern_San_dOria/npcs/Collione.lua | 27 ---------- .../zones/Southern_San_dOria/npcs/Corua.lua | 6 --- .../zones/Southern_San_dOria/npcs/Daggao.lua | 6 --- .../Southern_San_dOria/npcs/Deraquien.lua | 6 --- .../zones/Southern_San_dOria/npcs/Diary.lua | 6 --- .../Southern_San_dOria/npcs/Emoussine.lua | 3 -- .../Southern_San_dOria/npcs/Endracion.lua | 6 --- .../npcs/Enigmatic_Footprints.lua | 24 --------- .../zones/Southern_San_dOria/npcs/Ephauge.lua | 23 --------- .../Southern_San_dOria/npcs/Esmallegue.lua | 24 --------- .../Southern_San_dOria/npcs/Estiliphire.lua | 23 --------- .../Southern_San_dOria/npcs/Exoroche.lua | 6 --- .../zones/Southern_San_dOria/npcs/Faulpie.lua | 3 -- .../zones/Southern_San_dOria/npcs/Femitte.lua | 6 --- .../Southern_San_dOria/npcs/Ferdoulemiont.lua | 9 ---- .../zones/Southern_San_dOria/npcs/Foletta.lua | 22 --------- .../zones/Southern_San_dOria/npcs/Fulchia.lua | 22 --------- .../zones/Southern_San_dOria/npcs/Gizel.lua | 23 --------- .../zones/Southern_San_dOria/npcs/Glenne.lua | 12 ----- .../Southern_San_dOria/npcs/Gondebaud.lua | 3 -- .../Southern_San_dOria/npcs/Guilboire.lua | 22 --------- .../zones/Southern_San_dOria/npcs/Helbort.lua | 6 --- .../Southern_San_dOria/npcs/Katharina.lua | 22 --------- .../zones/Southern_San_dOria/npcs/Kipopo.lua | 3 -- .../npcs/Kueh_Igunahmori.lua | 9 ---- .../Southern_San_dOria/npcs/Lanqueron.lua | 9 ---- .../zones/Southern_San_dOria/npcs/Legata.lua | 3 -- .../Southern_San_dOria/npcs/Leuveret.lua | 6 --- .../zones/Southern_San_dOria/npcs/Lotte.lua | 22 --------- .../zones/Southern_San_dOria/npcs/Lusiane.lua | 9 ---- .../Southern_San_dOria/npcs/Luthiaque.lua | 22 --------- .../Southern_San_dOria/npcs/Machielle.lua | 6 --- .../zones/Southern_San_dOria/npcs/Maleme.lua | 9 ---- .../zones/Southern_San_dOria/npcs/Maugie.lua | 3 -- .../Southern_San_dOria/npcs/Melledanne.lua | 23 --------- .../Southern_San_dOria/npcs/Meuneille.lua | 3 -- .../Southern_San_dOria/npcs/Miogique.lua | 9 ---- .../Southern_San_dOria/npcs/Moozo-Koozo.lua | 6 --- .../zones/Southern_San_dOria/npcs/Najjar.lua | 6 --- .../Southern_San_dOria/npcs/Namonutice.lua | 9 ---- .../zones/Southern_San_dOria/npcs/Nenne.lua | 6 --- .../npcs/Nokkhi_Jinjahl.lua | 6 --- .../Southern_San_dOria/npcs/Norejaie.lua | 6 --- .../Southern_San_dOria/npcs/Ominous_Cloud.lua | 6 --- .../zones/Southern_San_dOria/npcs/Ophelia.lua | 22 --------- .../Southern_San_dOria/npcs/Orechiniel.lua | 6 --- .../zones/Southern_San_dOria/npcs/Ostalie.lua | 9 ---- .../zones/Southern_San_dOria/npcs/Paouala.lua | 3 -- .../Southern_San_dOria/npcs/Parvipon.lua | 3 -- .../Southern_San_dOria/npcs/Paunelie.lua | 9 ---- .../Southern_San_dOria/npcs/Phamelise.lua | 6 --- .../Southern_San_dOria/npcs/Phillone.lua | 22 --------- .../Southern_San_dOria/npcs/Poudoruchant.lua | 22 --------- .../Southern_San_dOria/npcs/Pourette.lua | 6 --- .../zones/Southern_San_dOria/npcs/Raminel.lua | 9 ---- .../zones/Southern_San_dOria/npcs/Rosel.lua | 9 ---- .../zones/Southern_San_dOria/npcs/Rouva.lua | 6 --- .../zones/Southern_San_dOria/npcs/Rumoie.lua | 23 --------- .../Southern_San_dOria/npcs/Sharzalion.lua | 6 --- .../zones/Southern_San_dOria/npcs/Shilah.lua | 9 ---- .../zones/Southern_San_dOria/npcs/Simmie.lua | 22 --------- .../zones/Southern_San_dOria/npcs/Sobane.lua | 6 --- .../npcs/Symphonic_Curator.lua | 3 -- .../zones/Southern_San_dOria/npcs/Taumila.lua | 3 -- .../Southern_San_dOria/npcs/Tek_Lengyon.lua | 6 --- .../Southern_San_dOria/npcs/Thadiene.lua | 9 ---- .../npcs/Trail_Markings.lua | 6 --- .../zones/Southern_San_dOria/npcs/Ullasa.lua | 6 --- .../Southern_San_dOria/npcs/Urbiolaine.lua | 3 -- .../Southern_San_dOria/npcs/Valeriano.lua | 9 ---- .../Southern_San_dOria/npcs/Vaquelage.lua | 9 ---- .../zones/Southern_San_dOria/npcs/Varchet.lua | 3 -- .../Southern_San_dOria/npcs/Vemalpeau.lua | 6 --- .../Southern_San_dOria/npcs/Victoire.lua | 9 ---- .../Southern_San_dOria/npcs/Violitte.lua | 6 --- scripts/zones/Southern_San_dOria/npcs/qm2.lua | 24 --------- scripts/zones/Southern_San_dOria/npcs/qm3.lua | 6 --- scripts/zones/Southern_San_dOria/npcs/qm4.lua | 24 --------- .../Southern_San_dOria_[S]/DefaultActions.lua | 5 ++ .../Southern_San_dOria_[S]/npcs/Adjutant.lua | 22 --------- .../Southern_San_dOria_[S]/npcs/Alfred.lua | 23 --------- .../npcs/Chauxnatte.lua | 6 --- .../npcs/Eauvague_TK.lua | 6 --- .../Southern_San_dOria_[S]/npcs/Fiaudie.lua | 9 ---- .../Southern_San_dOria_[S]/npcs/Geltpix.lua | 9 ---- .../npcs/Houilloumie.lua | 23 --------- .../npcs/Hunt_Registry.lua | 3 -- .../npcs/Lurouillat.lua | 6 --- .../npcs/Miliart_TK.lua | 3 -- .../Southern_San_dOria_[S]/npcs/Nembet.lua | 9 ---- .../npcs/Saphiriance_TK.lua | 6 --- .../npcs/Tamba-Namba.lua | 23 --------- .../Southern_San_dOria_[S]/npcs/Thierride.lua | 3 -- .../Southern_San_dOria_[S]/npcs/Thirkell.lua | 23 --------- .../Southern_San_dOria_[S]/npcs/Zidalf.lua | 23 --------- .../Southern_San_dOria_[S]/npcs/_6eo.lua | 6 --- .../Spire_of_Dem/npcs/Radiant_Aureole.lua | 6 --- .../Spire_of_Holla/npcs/Radiant_Aureole.lua | 6 --- .../Spire_of_Mea/npcs/Radiant_Aureole.lua | 6 --- .../Spire_of_Vahzl/npcs/Radiant_Aureole.lua | 6 --- .../zones/Tahrongi_Canyon/DefaultActions.lua | 1 + .../Tahrongi_Canyon/npcs/Cavernous_Maw.lua | 6 --- .../npcs/Dimensional_Portal.lua | 6 --- .../Tahrongi_Canyon/npcs/Ergon_Locus.lua | 9 ---- .../Tahrongi_Canyon/npcs/Excavation_Point.lua | 6 --- .../Tahrongi_Canyon/npcs/Field_Manual.lua | 3 -- .../npcs/Geomantic_Reservoir.lua | 6 --- .../zones/Tahrongi_Canyon/npcs/Luck_Rune.lua | 25 ---------- .../zones/Tahrongi_Canyon/npcs/Pucotte.lua | 3 -- .../zones/Tahrongi_Canyon/npcs/Signpost.lua | 9 ---- .../Tahrongi_Canyon/npcs/Stone_Monument.lua | 6 --- .../Tahrongi_Canyon/npcs/Tahrongi_Cacti.lua | 6 --- .../zones/Tahrongi_Canyon/npcs/Telepoint.lua | 3 -- .../Tahrongi_Canyon/npcs/Treasure_Casket.lua | 3 -- scripts/zones/Tahrongi_Canyon/npcs/qm2.lua | 6 --- .../Tavnazian_Safehold/DefaultActions.lua | 10 +++- .../Tavnazian_Safehold/npcs/Aligi-Kufongi.lua | 6 --- .../Tavnazian_Safehold/npcs/Anteurephiaux.lua | 21 -------- .../Tavnazian_Safehold/npcs/Caiphimonride.lua | 9 ---- .../zones/Tavnazian_Safehold/npcs/Eliot.lua | 9 ---- .../zones/Tavnazian_Safehold/npcs/Elysia.lua | 6 --- .../Tavnazian_Safehold/npcs/Enaremand.lua | 22 --------- .../zones/Tavnazian_Safehold/npcs/Equette.lua | 22 --------- .../Tavnazian_Safehold/npcs/Ferchinne.lua | 3 -- .../npcs/Ferocious_Artisan.lua | 9 ---- .../zones/Tavnazian_Safehold/npcs/Gennoue.lua | 9 ---- .../Tavnazian_Safehold/npcs/Havillione.lua | 9 ---- .../Tavnazian_Safehold/npcs/Hieroglyphics.lua | 6 --- .../Tavnazian_Safehold/npcs/Hunt_Registry.lua | 3 -- .../npcs/Ironclad_Gorilla.lua | 23 --------- .../Tavnazian_Safehold/npcs/Justinius.lua | 25 ---------- .../Tavnazian_Safehold/npcs/Komalata.lua | 9 ---- .../Tavnazian_Safehold/npcs/Latteaune.lua | 23 --------- .../Tavnazian_Safehold/npcs/Leporaitceau.lua | 21 -------- .../Tavnazian_Safehold/npcs/Maturiri.lua | 9 ---- .../Tavnazian_Safehold/npcs/Mazuro-Oozuro.lua | 9 ---- .../Tavnazian_Safehold/npcs/Melleupaux.lua | 9 ---- .../zones/Tavnazian_Safehold/npcs/Meret.lua | 3 -- .../zones/Tavnazian_Safehold/npcs/Migran.lua | 9 ---- .../Tavnazian_Safehold/npcs/Misseulieu.lua | 9 ---- .../Tavnazian_Safehold/npcs/Morangeart.lua | 24 --------- .../Tavnazian_Safehold/npcs/Nilerouche.lua | 9 ---- .../Tavnazian_Safehold/npcs/Nivorajean.lua | 23 --------- .../Tavnazian_Safehold/npcs/Nomad_Moogle.lua | 9 ---- .../Tavnazian_Safehold/npcs/Pradiulot.lua | 6 --- .../zones/Tavnazian_Safehold/npcs/Raminey.lua | 22 --------- .../Tavnazian_Safehold/npcs/Resauchamet.lua | 9 ---- .../Tavnazian_Safehold/npcs/Senvaleget.lua | 9 ---- .../zones/Tavnazian_Safehold/npcs/Suzel.lua | 9 ---- .../zones/Tavnazian_Safehold/npcs/Tiruru.lua | 21 -------- .../Tavnazian_Safehold/npcs/Travonce.lua | 22 --------- .../zones/Tavnazian_Safehold/npcs/Yurim.lua | 3 -- .../zones/Tavnazian_Safehold/npcs/Zadant.lua | 21 -------- .../zones/Tavnazian_Safehold/npcs/_0q1.lua | 6 --- .../Tavnazian_Safehold/npcs/qm_unforgiven.lua | 14 +----- 197 files changed, 61 insertions(+), 2040 deletions(-) delete mode 100644 scripts/zones/South_Gustaberg/npcs/Fish_Eyes.lua delete mode 100644 scripts/zones/Southern_San_dOria/npcs/Anxaberoute.lua delete mode 100644 scripts/zones/Southern_San_dOria/npcs/Arpetion.lua delete mode 100644 scripts/zones/Southern_San_dOria/npcs/Aubejart.lua delete mode 100644 scripts/zones/Southern_San_dOria/npcs/Ceraule.lua delete mode 100644 scripts/zones/Southern_San_dOria/npcs/Chocobo.lua delete mode 100644 scripts/zones/Southern_San_dOria/npcs/Coderiant.lua delete mode 100644 scripts/zones/Southern_San_dOria/npcs/Collione.lua delete mode 100644 scripts/zones/Southern_San_dOria/npcs/Enigmatic_Footprints.lua delete mode 100644 scripts/zones/Southern_San_dOria/npcs/Ephauge.lua delete mode 100644 scripts/zones/Southern_San_dOria/npcs/Esmallegue.lua delete mode 100644 scripts/zones/Southern_San_dOria/npcs/Estiliphire.lua delete mode 100644 scripts/zones/Southern_San_dOria/npcs/Foletta.lua delete mode 100644 scripts/zones/Southern_San_dOria/npcs/Fulchia.lua delete mode 100644 scripts/zones/Southern_San_dOria/npcs/Gizel.lua delete mode 100644 scripts/zones/Southern_San_dOria/npcs/Guilboire.lua delete mode 100644 scripts/zones/Southern_San_dOria/npcs/Katharina.lua delete mode 100644 scripts/zones/Southern_San_dOria/npcs/Lotte.lua delete mode 100644 scripts/zones/Southern_San_dOria/npcs/Luthiaque.lua delete mode 100644 scripts/zones/Southern_San_dOria/npcs/Melledanne.lua delete mode 100644 scripts/zones/Southern_San_dOria/npcs/Ophelia.lua delete mode 100644 scripts/zones/Southern_San_dOria/npcs/Phillone.lua delete mode 100644 scripts/zones/Southern_San_dOria/npcs/Poudoruchant.lua delete mode 100644 scripts/zones/Southern_San_dOria/npcs/Rumoie.lua delete mode 100644 scripts/zones/Southern_San_dOria/npcs/Simmie.lua delete mode 100644 scripts/zones/Southern_San_dOria/npcs/qm2.lua delete mode 100644 scripts/zones/Southern_San_dOria/npcs/qm4.lua delete mode 100644 scripts/zones/Southern_San_dOria_[S]/npcs/Adjutant.lua delete mode 100644 scripts/zones/Southern_San_dOria_[S]/npcs/Alfred.lua delete mode 100644 scripts/zones/Southern_San_dOria_[S]/npcs/Houilloumie.lua delete mode 100644 scripts/zones/Southern_San_dOria_[S]/npcs/Tamba-Namba.lua delete mode 100644 scripts/zones/Southern_San_dOria_[S]/npcs/Thirkell.lua delete mode 100644 scripts/zones/Southern_San_dOria_[S]/npcs/Zidalf.lua delete mode 100644 scripts/zones/Tahrongi_Canyon/npcs/Luck_Rune.lua delete mode 100644 scripts/zones/Tavnazian_Safehold/npcs/Anteurephiaux.lua delete mode 100644 scripts/zones/Tavnazian_Safehold/npcs/Enaremand.lua delete mode 100644 scripts/zones/Tavnazian_Safehold/npcs/Equette.lua delete mode 100644 scripts/zones/Tavnazian_Safehold/npcs/Ironclad_Gorilla.lua delete mode 100644 scripts/zones/Tavnazian_Safehold/npcs/Justinius.lua delete mode 100644 scripts/zones/Tavnazian_Safehold/npcs/Latteaune.lua delete mode 100644 scripts/zones/Tavnazian_Safehold/npcs/Leporaitceau.lua delete mode 100644 scripts/zones/Tavnazian_Safehold/npcs/Morangeart.lua delete mode 100644 scripts/zones/Tavnazian_Safehold/npcs/Nivorajean.lua delete mode 100644 scripts/zones/Tavnazian_Safehold/npcs/Raminey.lua delete mode 100644 scripts/zones/Tavnazian_Safehold/npcs/Tiruru.lua delete mode 100644 scripts/zones/Tavnazian_Safehold/npcs/Travonce.lua delete mode 100644 scripts/zones/Tavnazian_Safehold/npcs/Zadant.lua diff --git a/scripts/zones/South_Gustaberg/DefaultActions.lua b/scripts/zones/South_Gustaberg/DefaultActions.lua index 2e5feec1efe..b63c9439fcd 100644 --- a/scripts/zones/South_Gustaberg/DefaultActions.lua +++ b/scripts/zones/South_Gustaberg/DefaultActions.lua @@ -1,5 +1,6 @@ local ID = zones[xi.zone.SOUTH_GUSTABERG] return { - ['qm2'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, + ['Fish_Eyes'] = { event = 903 }, + ['qm2'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, } diff --git a/scripts/zones/South_Gustaberg/npcs/Cavernous_Maw.lua b/scripts/zones/South_Gustaberg/npcs/Cavernous_Maw.lua index f251a3b85d4..3c0061be700 100644 --- a/scripts/zones/South_Gustaberg/npcs/Cavernous_Maw.lua +++ b/scripts/zones/South_Gustaberg/npcs/Cavernous_Maw.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.SOUTH_GUSTABERG] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if xi.settings.main.ENABLE_ABYSSEA == 1 and player:getMainLvl() >= 30 then if @@ -28,9 +25,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 0 then player:addQuest(xi.questLog.ABYSSEA, xi.quest.id.abyssea.A_BEAKED_BLUSTERER) diff --git a/scripts/zones/South_Gustaberg/npcs/Field_Manual.lua b/scripts/zones/South_Gustaberg/npcs/Field_Manual.lua index 032f1568932..2155cadc12f 100644 --- a/scripts/zones/South_Gustaberg/npcs/Field_Manual.lua +++ b/scripts/zones/South_Gustaberg/npcs/Field_Manual.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.regime.bookOnTrigger(player, xi.regime.type.FIELDS) end diff --git a/scripts/zones/South_Gustaberg/npcs/Fish_Eyes.lua b/scripts/zones/South_Gustaberg/npcs/Fish_Eyes.lua deleted file mode 100644 index 1283c05a5c1..00000000000 --- a/scripts/zones/South_Gustaberg/npcs/Fish_Eyes.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: South Gustaberg --- NPC: Fish Eyes --- Type: Goldfish Scooping --- !pos -444.459 39.106 -390.885 107 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(903) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/South_Gustaberg/npcs/Goblin_Footprint.lua b/scripts/zones/South_Gustaberg/npcs/Goblin_Footprint.lua index 18ec84c2f4e..3e041b20a4a 100644 --- a/scripts/zones/South_Gustaberg/npcs/Goblin_Footprint.lua +++ b/scripts/zones/South_Gustaberg/npcs/Goblin_Footprint.lua @@ -14,9 +14,6 @@ entity.onTrigger = function(player, npc) xi.goblinfootprint.rewatch(player, true) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.goblinfootprint.startEvent(player, csid, option, npc) end diff --git a/scripts/zones/South_Gustaberg/npcs/Stone_Monument.lua b/scripts/zones/South_Gustaberg/npcs/Stone_Monument.lua index 1721906587d..8ef12bd02ac 100644 --- a/scripts/zones/South_Gustaberg/npcs/Stone_Monument.lua +++ b/scripts/zones/South_Gustaberg/npcs/Stone_Monument.lua @@ -21,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/South_Gustaberg/npcs/Treasure_Casket.lua b/scripts/zones/South_Gustaberg/npcs/Treasure_Casket.lua index 8c57a1ded37..e5cfae5f893 100644 --- a/scripts/zones/South_Gustaberg/npcs/Treasure_Casket.lua +++ b/scripts/zones/South_Gustaberg/npcs/Treasure_Casket.lua @@ -13,9 +13,6 @@ entity.onTrade = function(player, npc, trade) xi.caskets.onTrade(player, npc, trade) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.caskets.onEventFinish(player, csid, option, npc) end diff --git a/scripts/zones/South_Gustaberg/npcs/qm1.lua b/scripts/zones/South_Gustaberg/npcs/qm1.lua index 49f82da8cc1..b45f6e5069a 100755 --- a/scripts/zones/South_Gustaberg/npcs/qm1.lua +++ b/scripts/zones/South_Gustaberg/npcs/qm1.lua @@ -15,8 +15,6 @@ entity.onTrade = function(player, npc, trade) npcUtil.popFromQM(player, npc, ID.mob.BUBBLY_BERNIE, { hide = 0 }) then player:confirmTrade() - else - player:messageSpecial(ID.text.NOTHING_OUT_OF_ORDINARY) end end @@ -24,10 +22,4 @@ entity.onTrigger = function(player, npc) player:messageSpecial(ID.text.MONSTER_TRACKS) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Southern_San_dOria/DefaultActions.lua b/scripts/zones/Southern_San_dOria/DefaultActions.lua index 6d561b22e52..b3589a64824 100644 --- a/scripts/zones/Southern_San_dOria/DefaultActions.lua +++ b/scripts/zones/Southern_San_dOria/DefaultActions.lua @@ -1,13 +1,44 @@ local ID = zones[xi.zone.SOUTHERN_SAN_DORIA] return { - ['Amaura'] = { event = 642 }, - ['Atelloune'] = { event = 884 }, - ['Balasiel'] = { event = 667 }, - ['Baunise'] = { text = ID.text.NOTHING_TO_REPORT }, - ['Cahaurme'] = { text = ID.text.NOTHING_TO_REPORT }, - ['Hae_Jakhya'] = { event = 610 }, - ['Rosel'] = { text = ID.text.ROSEL_GREETINGS }, - ['Sobane'] = { text = ID.text.SOBANE_DIALOG }, - ['Valderotaux'] = { event = 58 }, + ['Adaunel'] = { event = 656 }, + ['Amaura'] = { event = 642 }, + ['Anxaberoute'] = { event = 886 }, + ['Arpetion'] = { event = 660 }, + ['Atelloune'] = { event = 884 }, + ['Aubejart'] = { event = 582 }, + ['Balasiel'] = { event = 667 }, + ['Baunise'] = { text = ID.text.NOTHING_TO_REPORT }, + ['Cahaurme'] = { text = ID.text.NOTHING_TO_REPORT }, + ['Ceraule'] = { event = 509 }, + ['Chocobo'] = { event = 818 }, -- TODO: Verify all chocobos use the same event + ['Chocobo_1'] = { event = 818 }, + ['Chocobo_2'] = { event = 818 }, + ['Chocobo_3'] = { event = 818 }, + ['Clainomille'] = { event = 613 }, + ['Coderiant'] = { event = 583 }, + ['Collione'] = { event = 859 }, + ['Enigmatic Footprints'] = { messageSpecial = ID.text.TEAR_IN_FABRIC_OF_SPACE }, + ['Ephauge'] = { event = 581 }, + ['Esmallegue'] = { event = 885 }, + ['Estiliphire'] = { event = 897 }, + ['Foletta'] = { event = 666 }, + ['Fulchia'] = { event = 587 }, + ['Gizel'] = { event = 676 }, + ['Guilboire'] = { event = 657 }, + ['Hae_Jakhya'] = { event = 610 }, + ['Katharina'] = { event = 887 }, + ['Lotte'] = { event = 564 }, + ['Luthiaque'] = { event = 658 }, + ['Melledanne'] = { event = 943 }, + ['Ophelia'] = { event = 751 }, + ['Phillone'] = { event = 29 }, + ['Poudoruchant'] = { event = 779 }, + ['qm2'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, + ['qm4'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, + ['Rosel'] = { text = ID.text.ROSEL_GREETINGS }, + ['Rumoie'] = { event = 863 }, + ['Simmie'] = { event = 673 }, + ['Sobane'] = { text = ID.text.SOBANE_DIALOG }, + ['Valderotaux'] = { event = 58 }, } diff --git a/scripts/zones/Southern_San_dOria/npcs/AMAN_Liaison.lua b/scripts/zones/Southern_San_dOria/npcs/AMAN_Liaison.lua index f78eb980de9..4aaf951a695 100644 --- a/scripts/zones/Southern_San_dOria/npcs/AMAN_Liaison.lua +++ b/scripts/zones/Southern_San_dOria/npcs/AMAN_Liaison.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local firstStepForwardCompleted = player:getEminenceCompleted(1) local assistChannelCompleted = player:getEminenceCompleted(1448) diff --git a/scripts/zones/Southern_San_dOria/npcs/AMAN_Validator.lua b/scripts/zones/Southern_San_dOria/npcs/AMAN_Validator.lua index 5316bf6ec7d..02370b57692 100644 --- a/scripts/zones/Southern_San_dOria/npcs/AMAN_Validator.lua +++ b/scripts/zones/Southern_San_dOria/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/Southern_San_dOria/npcs/Adaunel.lua b/scripts/zones/Southern_San_dOria/npcs/Adaunel.lua index 987f8b32a9c..8259414216d 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Adaunel.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Adaunel.lua @@ -1,7 +1,6 @@ ----------------------------------- -- Area: Southern San d'Oria -- NPC: Adaunel --- General Info NPC -- !pos 80 -7 -22 230 ----------------------------------- require('scripts/quests/flyers_for_regine') @@ -13,14 +12,4 @@ entity.onTrade = function(player, npc, trade) quests.ffr.onTrade(player, npc, trade, 13) -- FLYERS FOR REGINE 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/Southern_San_dOria/npcs/Ailevia.lua b/scripts/zones/Southern_San_dOria/npcs/Ailevia.lua index 81475fc7110..120190a3df9 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Ailevia.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Ailevia.lua @@ -23,9 +23,6 @@ entity.onTrigger = function(player, npc) player:startEvent(615) -- i know a thing or 2 about these streets end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 655 then player:tradeComplete() diff --git a/scripts/zones/Southern_San_dOria/npcs/Alaune.lua b/scripts/zones/Southern_San_dOria/npcs/Alaune.lua index 5a3a0611520..64667a68c12 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Alaune.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Alaune.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, 916, 0) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) xi.tutorial.onEventFinish(player, csid, option, 916, 0) end diff --git a/scripts/zones/Southern_San_dOria/npcs/Amaura.lua b/scripts/zones/Southern_San_dOria/npcs/Amaura.lua index 603c6c94610..4a4aebbd64c 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Amaura.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Amaura.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.SOUTHERN_SAN_DORIA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local toCureaCough = player:getQuestStatus(xi.questLog.SANDORIA, xi.quest.id.sandoria.TO_CURE_A_COUGH) @@ -30,9 +27,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 645 then player:addQuest(xi.questLog.SANDORIA, xi.quest.id.sandoria.TO_CURE_A_COUGH) diff --git a/scripts/zones/Southern_San_dOria/npcs/Ambrotien.lua b/scripts/zones/Southern_San_dOria/npcs/Ambrotien.lua index bdf5c23b81a..2ce92afec8a 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Ambrotien.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Ambrotien.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/Southern_San_dOria/npcs/Amutiyaal.lua b/scripts/zones/Southern_San_dOria/npcs/Amutiyaal.lua index 30948d3cffd..4146982cb2e 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Amutiyaal.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Amutiyaal.lua @@ -78,9 +78,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 == 812 then player:addQuest(xi.questLog.SANDORIA, xi.quest.id.sandoria.LURE_OF_THE_WILDCAT) diff --git a/scripts/zones/Southern_San_dOria/npcs/Anxaberoute.lua b/scripts/zones/Southern_San_dOria/npcs/Anxaberoute.lua deleted file mode 100644 index a666d4c5ee4..00000000000 --- a/scripts/zones/Southern_San_dOria/npcs/Anxaberoute.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Southern San dOria --- NPC: Anxaberoute --- !pos 108.892 0.000 -49.038 230 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(886) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Southern_San_dOria/npcs/Apairemant.lua b/scripts/zones/Southern_San_dOria/npcs/Apairemant.lua index 0d6465c6d3d..59f0c9a5e64 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Apairemant.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Apairemant.lua @@ -30,10 +30,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Southern_San_dOria/npcs/Arpetion.lua b/scripts/zones/Southern_San_dOria/npcs/Arpetion.lua deleted file mode 100644 index 9f8fb0c5e42..00000000000 --- a/scripts/zones/Southern_San_dOria/npcs/Arpetion.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Southern San d'Oria --- NPC: Arpetion --- General Info NPC --- !pos -11 1 -30 230 ------------------------------------ ----@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/Southern_San_dOria/npcs/Arvilauge.lua b/scripts/zones/Southern_San_dOria/npcs/Arvilauge.lua index 12f795625c3..deac0f1644f 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Arvilauge.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Arvilauge.lua @@ -7,17 +7,9 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) - player:showText(npc, 11076)--temp dialog -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) + -- TODO: Use enum, verify this message is relevant + player:showText(npc, 11076) end return entity diff --git a/scripts/zones/Southern_San_dOria/npcs/Ashene.lua b/scripts/zones/Southern_San_dOria/npcs/Ashene.lua index 1ba3d735d71..44320f180ba 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Ashene.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Ashene.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.SOUTHERN_SAN_DORIA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -35,10 +32,4 @@ entity.onTrigger = function(player, npc) xi.shop.nation(player, stock, xi.nation.SANDORIA) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Southern_San_dOria/npcs/Aubejart.lua b/scripts/zones/Southern_San_dOria/npcs/Aubejart.lua deleted file mode 100644 index ff602ee6bac..00000000000 --- a/scripts/zones/Southern_San_dOria/npcs/Aubejart.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Southern San d'Oria --- NPC: Aubejart --- General Info NPC --- !pos 3 -2 46 230 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(582) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Southern_San_dOria/npcs/Auction_Counter.lua b/scripts/zones/Southern_San_dOria/npcs/Auction_Counter.lua index a2f835e6a6d..b9ca9f42a96 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Auction_Counter.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Auction_Counter.lua @@ -7,18 +7,9 @@ require('scripts/quests/tutorial') ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.tutorial.onAuctionTrigger(player) player:sendMenu(3) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Southern_San_dOria/npcs/Authere.lua b/scripts/zones/Southern_San_dOria/npcs/Authere.lua index 288abdd95a8..51672e834a4 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Authere.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Authere.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local wildcatSandy = player:getCharVar('WildcatSandy') @@ -25,9 +22,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 809 then player:setCharVar('WildcatSandy', utils.mask.setBit(player:getCharVar('WildcatSandy'), 1, true)) diff --git a/scripts/zones/Southern_San_dOria/npcs/Aveline.lua b/scripts/zones/Southern_San_dOria/npcs/Aveline.lua index bb97e05e044..bff0f7ead62 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Aveline.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Aveline.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.SOUTHERN_SAN_DORIA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -30,10 +27,4 @@ entity.onTrigger = function(player, npc) xi.shop.nation(player, stock, xi.nation.SANDORIA) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Southern_San_dOria/npcs/Balasiel.lua b/scripts/zones/Southern_San_dOria/npcs/Balasiel.lua index d43d13a7a4d..39cf2ceaa47 100755 --- a/scripts/zones/Southern_San_dOria/npcs/Balasiel.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Balasiel.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getQuestStatus(xi.questLog.SANDORIA, xi.quest.id.sandoria.KNIGHT_STALKER) == xi.questStatus.QUEST_ACCEPTED and diff --git a/scripts/zones/Southern_San_dOria/npcs/Benaige.lua b/scripts/zones/Southern_San_dOria/npcs/Benaige.lua index d801685a33e..a96213fefb3 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Benaige.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Benaige.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.SOUTHERN_SAN_DORIA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -33,10 +30,4 @@ entity.onTrigger = function(player, npc) xi.shop.nation(player, stock, xi.nation.SANDORIA) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Southern_San_dOria/npcs/Blendare.lua b/scripts/zones/Southern_San_dOria/npcs/Blendare.lua index 09524381dd5..461b8be34f4 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Blendare.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Blendare.lua @@ -16,9 +16,6 @@ entity.onTrigger = function(player, npc) player:startEvent(606) -- my brother always takes my sweets end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 606 then player:setCharVar('BrothersCS', 1) diff --git a/scripts/zones/Southern_San_dOria/npcs/Camereine.lua b/scripts/zones/Southern_San_dOria/npcs/Camereine.lua index 93400b689e1..4c781dada9e 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Camereine.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Camereine.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/Southern_San_dOria/npcs/Capucine.lua b/scripts/zones/Southern_San_dOria/npcs/Capucine.lua index e975f210327..5d73306b754 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Capucine.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Capucine.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.SOUTHERN_SAN_DORIA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -28,10 +25,4 @@ entity.onTrigger = function(player, npc) xi.shop.general(player, stock) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Southern_San_dOria/npcs/Carautia.lua b/scripts/zones/Southern_San_dOria/npcs/Carautia.lua index ce6411ba3b2..7b113e8ebce 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Carautia.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Carautia.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.SOUTHERN_SAN_DORIA] ---@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.SANDORIA) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Southern_San_dOria/npcs/Celyddon.lua b/scripts/zones/Southern_San_dOria/npcs/Celyddon.lua index ade128bb961..43b54ef9303 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Celyddon.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Celyddon.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local aSquiresTest = player:getQuestStatus(xi.questLog.SANDORIA, xi.quest.id.sandoria.A_SQUIRES_TEST) @@ -22,10 +19,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Southern_San_dOria/npcs/Ceraule.lua b/scripts/zones/Southern_San_dOria/npcs/Ceraule.lua deleted file mode 100644 index 4266fd4a4a6..00000000000 --- a/scripts/zones/Southern_San_dOria/npcs/Ceraule.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Southern San d'Oria --- NPC: Ceraule --- General Info NPC --- !pos -86 2 -35 230 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(509) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Southern_San_dOria/npcs/Chanpau.lua b/scripts/zones/Southern_San_dOria/npcs/Chanpau.lua index fca985dea56..03def6de842 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Chanpau.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Chanpau.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getQuestStatus(xi.questLog.SANDORIA, xi.quest.id.sandoria.THE_BRUGAIRE_CONSORTIUM) == xi.questStatus.QUEST_COMPLETED then local fired = player:getCharVar('Fired') @@ -24,16 +21,13 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 505 then player:setCharVar('Fired', 1) end end --------for future use +-- for future use -- player:startEvent(32691) -- starlight celebration return entity diff --git a/scripts/zones/Southern_San_dOria/npcs/Chocobo.lua b/scripts/zones/Southern_San_dOria/npcs/Chocobo.lua deleted file mode 100644 index 95dd5487050..00000000000 --- a/scripts/zones/Southern_San_dOria/npcs/Chocobo.lua +++ /dev/null @@ -1,29 +0,0 @@ ------------------------------------ --- Area: Southern San d'Oria --- NPC: Chocobo --- Chocobo ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - -- player:startEvent(601) - -- player:startEvent(820) --crazy hang - -- player:startEvent(821) --crazy hang - -- player:startEvent(600) - -- player:startEvent(599) - -- player:startEvent(862) -- cool choco debug menu - -- player:startEvent(819) - player:startEvent(818) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Southern_San_dOria/npcs/Chocobo_1.lua b/scripts/zones/Southern_San_dOria/npcs/Chocobo_1.lua index 578141d1c02..7865fe95358 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Chocobo_1.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Chocobo_1.lua @@ -22,17 +22,4 @@ entity.onSpawn = function(npc) npc:pathThrough(pathNodes, xi.path.flag.PATROL) end -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(818) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Southern_San_dOria/npcs/Chocobo_2.lua b/scripts/zones/Southern_San_dOria/npcs/Chocobo_2.lua index 1766c4b4588..25d34ea72f7 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Chocobo_2.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Chocobo_2.lua @@ -28,17 +28,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(818) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Southern_San_dOria/npcs/Chocobo_3.lua b/scripts/zones/Southern_San_dOria/npcs/Chocobo_3.lua index 4c00a3acbb2..4574088c822 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Chocobo_3.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Chocobo_3.lua @@ -35,17 +35,4 @@ entity.onSpawn = function(npc) npc:pathThrough(pathNodes, xi.path.flag.PATROL) end -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(818) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Southern_San_dOria/npcs/Clainomille.lua b/scripts/zones/Southern_San_dOria/npcs/Clainomille.lua index f2ad8d3d5fe..7fd29e4a983 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Clainomille.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Clainomille.lua @@ -22,17 +22,4 @@ entity.onSpawn = function(npc) npc:pathThrough(pathNodes, xi.path.flag.PATROL) end -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(613) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Southern_San_dOria/npcs/Cletae.lua b/scripts/zones/Southern_San_dOria/npcs/Cletae.lua index 5d4bd46b0c2..453255d2788 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Cletae.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Cletae.lua @@ -28,10 +28,4 @@ entity.onTrigger = function(player, npc) player:showText(npc, ID.text.CLETAE_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/Southern_San_dOria/npcs/Coderiant.lua b/scripts/zones/Southern_San_dOria/npcs/Coderiant.lua deleted file mode 100644 index 75a2a34a080..00000000000 --- a/scripts/zones/Southern_San_dOria/npcs/Coderiant.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Southern San d'Oria --- NPC: Coderiant --- General Info NPC --- !pos -111 -2 33 230 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(583) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Southern_San_dOria/npcs/Collione.lua b/scripts/zones/Southern_San_dOria/npcs/Collione.lua deleted file mode 100644 index 1e25d00fd3d..00000000000 --- a/scripts/zones/Southern_San_dOria/npcs/Collione.lua +++ /dev/null @@ -1,27 +0,0 @@ ------------------------------------ --- Area: Southern San d'Oria --- NPC: Collione --- General Info NPC --- !pos 10 2 -66 230 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(859) --- player:startEvent(854) --chocobo dig game --- player:startEvent(856) -- play the chocobo game --- player:startEvent(857) -- rules for choc game --- player:startEvent(858) -- cant give more greens -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Southern_San_dOria/npcs/Corua.lua b/scripts/zones/Southern_San_dOria/npcs/Corua.lua index 6a2795eb744..0c27ece9d64 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Corua.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Corua.lua @@ -30,10 +30,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Southern_San_dOria/npcs/Daggao.lua b/scripts/zones/Southern_San_dOria/npcs/Daggao.lua index b63937239d2..da7c0b46943 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Daggao.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Daggao.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local wildcatSandy = player:getCharVar('WildcatSandy') @@ -27,9 +24,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 810 then player:setCharVar('WildcatSandy', utils.mask.setBit(player:getCharVar('WildcatSandy'), 0, true)) diff --git a/scripts/zones/Southern_San_dOria/npcs/Deraquien.lua b/scripts/zones/Southern_San_dOria/npcs/Deraquien.lua index bc782f7f6d5..2be3890cb0a 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Deraquien.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Deraquien.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local wildcatSandy = player:getCharVar('WildcatSandy') @@ -23,9 +20,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 811 then player:setCharVar('WildcatSandy', utils.mask.setBit(player:getCharVar('WildcatSandy'), 4, true)) diff --git a/scripts/zones/Southern_San_dOria/npcs/Diary.lua b/scripts/zones/Southern_San_dOria/npcs/Diary.lua index 215091c0c0c..10c18115956 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Diary.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Diary.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local aSquiresTestII = player:getQuestStatus(xi.questLog.SANDORIA, xi.quest.id.sandoria.A_SQUIRES_TEST_II) local medicineWoman = player:getQuestStatus(xi.questLog.SANDORIA, xi.quest.id.sandoria.THE_MEDICINE_WOMAN) @@ -45,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) local diaryPage = player:getCharVar('DiaryPage') diff --git a/scripts/zones/Southern_San_dOria/npcs/Emoussine.lua b/scripts/zones/Southern_San_dOria/npcs/Emoussine.lua index 98f6e17546a..8ae2936f87d 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Emoussine.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Emoussine.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/Southern_San_dOria/npcs/Endracion.lua b/scripts/zones/Southern_San_dOria/npcs/Endracion.lua index 0160367524e..84c8a800a20 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Endracion.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Endracion.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/Southern_San_dOria/npcs/Enigmatic_Footprints.lua b/scripts/zones/Southern_San_dOria/npcs/Enigmatic_Footprints.lua deleted file mode 100644 index 5ed28c8b00a..00000000000 --- a/scripts/zones/Southern_San_dOria/npcs/Enigmatic_Footprints.lua +++ /dev/null @@ -1,24 +0,0 @@ ------------------------------------ --- Area: Southern San d'Oria --- NPC: Enigmatic Footprints --- Entry NPC for Dynamis Divergence ------------------------------------ -local ID = zones[xi.zone.SOUTHERN_SAN_DORIA] ------------------------------------ ----@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/Southern_San_dOria/npcs/Ephauge.lua b/scripts/zones/Southern_San_dOria/npcs/Ephauge.lua deleted file mode 100644 index 9e77af19e6b..00000000000 --- a/scripts/zones/Southern_San_dOria/npcs/Ephauge.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Southern San d'Oria --- NPC: Ephauge --- General Info NPC --- !pos -2 -2 45 230 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(581) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Southern_San_dOria/npcs/Esmallegue.lua b/scripts/zones/Southern_San_dOria/npcs/Esmallegue.lua deleted file mode 100644 index 6dbdb5867dc..00000000000 --- a/scripts/zones/Southern_San_dOria/npcs/Esmallegue.lua +++ /dev/null @@ -1,24 +0,0 @@ ------------------------------------ --- Area: Southern San d'Oria --- NPC: Esmallegue --- General Info NPC --- !pos 0 2 -83 230 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) --- player:startEvent(894)-- cavernous maw - player:startEvent(885) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Southern_San_dOria/npcs/Estiliphire.lua b/scripts/zones/Southern_San_dOria/npcs/Estiliphire.lua deleted file mode 100644 index db6899bf143..00000000000 --- a/scripts/zones/Southern_San_dOria/npcs/Estiliphire.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Southern Sandoria --- NPC: Estiliphire --- Type: Event Sideshow NPC --- !pos -41.550 1.999 -2.845 230 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(897) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Southern_San_dOria/npcs/Exoroche.lua b/scripts/zones/Southern_San_dOria/npcs/Exoroche.lua index b0ec29dd44d..91f47151537 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Exoroche.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Exoroche.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) -- player:startEvent(79) -- how the paper works -- under oath -- player:startEvent(51) -- it says what i dont beleive you -- under oath @@ -38,9 +35,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 50 then player:setCharVar('aBoysDreamCS', 3) diff --git a/scripts/zones/Southern_San_dOria/npcs/Faulpie.lua b/scripts/zones/Southern_San_dOria/npcs/Faulpie.lua index 3dca76e5358..f4a4109350f 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Faulpie.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Faulpie.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/Southern_San_dOria/npcs/Femitte.lua b/scripts/zones/Southern_San_dOria/npcs/Femitte.lua index 24076241532..0e0c4212098 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Femitte.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Femitte.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.SOUTHERN_SAN_DORIA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local distantLoyaltiesProgress = player:getCharVar('DistantLoyaltiesProgress') local distantLoyalties = player:getQuestStatus(xi.questLog.SANDORIA, xi.quest.id.sandoria.DISTANT_LOYALTIES) @@ -40,9 +37,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 807 then player:setCharVar('WildcatSandy', utils.mask.setBit(player:getCharVar('WildcatSandy'), 3, true)) diff --git a/scripts/zones/Southern_San_dOria/npcs/Ferdoulemiont.lua b/scripts/zones/Southern_San_dOria/npcs/Ferdoulemiont.lua index 6d2beb2b85c..72c436e8326 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Ferdoulemiont.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Ferdoulemiont.lua @@ -21,9 +21,6 @@ entity.onSpawn = function(npc) npc:pathThrough(pathNodes, xi.path.flag.PATROL) end -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -49,10 +46,4 @@ entity.onTrigger = function(player, npc) xi.shop.nation(player, stock, xi.nation.SANDORIA) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Southern_San_dOria/npcs/Foletta.lua b/scripts/zones/Southern_San_dOria/npcs/Foletta.lua deleted file mode 100644 index 156528cd95e..00000000000 --- a/scripts/zones/Southern_San_dOria/npcs/Foletta.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Southern San d'Oria --- NPC: Foletta --- General Info NPC ------------------------------------ ----@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/Southern_San_dOria/npcs/Fulchia.lua b/scripts/zones/Southern_San_dOria/npcs/Fulchia.lua deleted file mode 100644 index 75e33eeb36d..00000000000 --- a/scripts/zones/Southern_San_dOria/npcs/Fulchia.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Southern San d'Oria --- NPC: Fulchia --- General Info NPC ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(587) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Southern_San_dOria/npcs/Gizel.lua b/scripts/zones/Southern_San_dOria/npcs/Gizel.lua deleted file mode 100644 index 013545c46b4..00000000000 --- a/scripts/zones/Southern_San_dOria/npcs/Gizel.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Southern San dOria --- NPC: Gizel --- Type: Event Scene Replayer NPC --- !pos -34.412 0.000 33.362 230 ------------------------------------ ----@type TNpcEntity -local entity = {} - -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/Southern_San_dOria/npcs/Glenne.lua b/scripts/zones/Southern_San_dOria/npcs/Glenne.lua index 38007b159a4..c62455b1864 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Glenne.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Glenne.lua @@ -29,16 +29,4 @@ entity.onSpawn = function(npc) npc:pathThrough(pathNodes, xi.path.flag.PATROL) end -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Southern_San_dOria/npcs/Gondebaud.lua b/scripts/zones/Southern_San_dOria/npcs/Gondebaud.lua index 687b41a9bf2..2e71cb8d449 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Gondebaud.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Gondebaud.lua @@ -43,9 +43,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if (csid == 3500 or csid == 3504) and option == 2 then player:addQuest(xi.questLog.SANDORIA, xi.quest.id.sandoria.TRUST_SANDORIA) diff --git a/scripts/zones/Southern_San_dOria/npcs/Guilboire.lua b/scripts/zones/Southern_San_dOria/npcs/Guilboire.lua deleted file mode 100644 index 0aa38b833c3..00000000000 --- a/scripts/zones/Southern_San_dOria/npcs/Guilboire.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Southern San d'Oria --- NPC: Guilboire --- General Info NPC ------------------------------------ ----@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/Southern_San_dOria/npcs/Helbort.lua b/scripts/zones/Southern_San_dOria/npcs/Helbort.lua index 42121069580..a4333b5ce28 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Helbort.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Helbort.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.SOUTHERN_SAN_DORIA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getFameLevel(xi.fameArea.SANDORIA) >= 2 and @@ -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 == 594 and option == 0 then player:addQuest(xi.questLog.SANDORIA, xi.quest.id.sandoria.A_PURCHASE_OF_ARMS) diff --git a/scripts/zones/Southern_San_dOria/npcs/Katharina.lua b/scripts/zones/Southern_San_dOria/npcs/Katharina.lua deleted file mode 100644 index 458ebf18bcf..00000000000 --- a/scripts/zones/Southern_San_dOria/npcs/Katharina.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Southern San d'Oria --- NPC: Katharina --- General Info NPC ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(887) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Southern_San_dOria/npcs/Kipopo.lua b/scripts/zones/Southern_San_dOria/npcs/Kipopo.lua index cdd0b097278..4ef05777e39 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Kipopo.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Kipopo.lua @@ -53,9 +53,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 914 then player:setCharVar('sayItWithAHandbagBonusCS', 0) diff --git a/scripts/zones/Southern_San_dOria/npcs/Kueh_Igunahmori.lua b/scripts/zones/Southern_San_dOria/npcs/Kueh_Igunahmori.lua index c15c0978157..82d88ba57e1 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Kueh_Igunahmori.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Kueh_Igunahmori.lua @@ -9,19 +9,10 @@ local ID = zones[xi.zone.SOUTHERN_SAN_DORIA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:sendGuild(529, 3, 18, 4) then player:showText(npc, ID.text.KUEH_IGUNAHMORI_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/Southern_San_dOria/npcs/Lanqueron.lua b/scripts/zones/Southern_San_dOria/npcs/Lanqueron.lua index 264c0fc8e67..c9f4ccc00c0 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Lanqueron.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Lanqueron.lua @@ -10,18 +10,9 @@ local ID = zones[xi.zone.SOUTHERN_SAN_DORIA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:showText(npc, ID.text.ITEM_DELIVERY_DIALOG) player:openSendBox() end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Southern_San_dOria/npcs/Legata.lua b/scripts/zones/Southern_San_dOria/npcs/Legata.lua index e335ee76005..4cc4ab27972 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Legata.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Legata.lua @@ -26,9 +26,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 37 and option == 1 then player:addQuest(xi.questLog.SANDORIA, xi.quest.id.sandoria.STARTING_A_FLAME) diff --git a/scripts/zones/Southern_San_dOria/npcs/Leuveret.lua b/scripts/zones/Southern_San_dOria/npcs/Leuveret.lua index ea9936514ac..2fa18ea8ebc 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Leuveret.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Leuveret.lua @@ -16,10 +16,4 @@ entity.onTrigger = function(player, npc) player:startEvent(621) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Southern_San_dOria/npcs/Lotte.lua b/scripts/zones/Southern_San_dOria/npcs/Lotte.lua deleted file mode 100644 index edb61b10ed4..00000000000 --- a/scripts/zones/Southern_San_dOria/npcs/Lotte.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Southern San d'Oria --- NPC: Lotte --- General Info NPC ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(564) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Southern_San_dOria/npcs/Lusiane.lua b/scripts/zones/Southern_San_dOria/npcs/Lusiane.lua index 7d080d0342f..ff7810e5171 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Lusiane.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Lusiane.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.SOUTHERN_SAN_DORIA] ---@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.nation(player, stock, xi.nation.SANDORIA) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Southern_San_dOria/npcs/Luthiaque.lua b/scripts/zones/Southern_San_dOria/npcs/Luthiaque.lua deleted file mode 100644 index 90c1c4447e8..00000000000 --- a/scripts/zones/Southern_San_dOria/npcs/Luthiaque.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Southern San d'Oria --- NPC: Luthiaque --- General Info NPC ------------------------------------ ----@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/Southern_San_dOria/npcs/Machielle.lua b/scripts/zones/Southern_San_dOria/npcs/Machielle.lua index 88d2341fc5d..285381450ec 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Machielle.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Machielle.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/Southern_San_dOria/npcs/Maleme.lua b/scripts/zones/Southern_San_dOria/npcs/Maleme.lua index 87a425001d7..e103dc60cb5 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Maleme.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Maleme.lua @@ -7,17 +7,8 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(632, 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/Southern_San_dOria/npcs/Maugie.lua b/scripts/zones/Southern_San_dOria/npcs/Maugie.lua index ccc18d62ea1..d22db6cb4bc 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Maugie.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Maugie.lua @@ -31,9 +31,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 45 and option == 0 then player:addQuest(xi.questLog.SANDORIA, xi.quest.id.sandoria.GRIMY_SIGNPOSTS) diff --git a/scripts/zones/Southern_San_dOria/npcs/Melledanne.lua b/scripts/zones/Southern_San_dOria/npcs/Melledanne.lua deleted file mode 100644 index 7befe272913..00000000000 --- a/scripts/zones/Southern_San_dOria/npcs/Melledanne.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Southern San dOria --- NPC: Melledanne --- Type: Melody Minstrel NPC --- !pos -33.194 0.000 34.662 230 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(943) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Southern_San_dOria/npcs/Meuneille.lua b/scripts/zones/Southern_San_dOria/npcs/Meuneille.lua index c2bbc7c9559..a440309daa3 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Meuneille.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Meuneille.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/Southern_San_dOria/npcs/Miogique.lua b/scripts/zones/Southern_San_dOria/npcs/Miogique.lua index c5edd368f69..926abb6a7c2 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Miogique.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Miogique.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.SOUTHERN_SAN_DORIA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -35,10 +32,4 @@ entity.onTrigger = function(player, npc) xi.shop.nation(player, stock, xi.nation.SANDORIA) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Southern_San_dOria/npcs/Moozo-Koozo.lua b/scripts/zones/Southern_San_dOria/npcs/Moozo-Koozo.lua index 9b90e3322a9..7e0950bbf92 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Moozo-Koozo.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Moozo-Koozo.lua @@ -158,16 +158,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/Southern_San_dOria/npcs/Najjar.lua b/scripts/zones/Southern_San_dOria/npcs/Najjar.lua index d0c5ac59381..d31c4dea28e 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Najjar.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Najjar.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getCharVar('UnderOathCS') == 1 then -- Quest: Under Oath - PLD AF3 player:startEvent(16) @@ -16,9 +13,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 == 16 then player:setCharVar('UnderOathCS', 2) -- Quest: Under Oath - PLD AF3 diff --git a/scripts/zones/Southern_San_dOria/npcs/Namonutice.lua b/scripts/zones/Southern_San_dOria/npcs/Namonutice.lua index 3a48f4fc02e..6738db82542 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Namonutice.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Namonutice.lua @@ -7,17 +7,8 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(31, player:getFame(xi.fameArea.SANDORIA)) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Southern_San_dOria/npcs/Nenne.lua b/scripts/zones/Southern_San_dOria/npcs/Nenne.lua index 6b0443bc9ac..6a7da1c08da 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Nenne.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Nenne.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.SOUTHERN_SAN_DORIA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local medicineWoman = player:getQuestStatus(xi.questLog.SANDORIA, xi.quest.id.sandoria.THE_MEDICINE_WOMAN) local toCureaCough = player:getQuestStatus(xi.questLog.SANDORIA, xi.quest.id.sandoria.TO_CURE_A_COUGH) @@ -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 == 538 then player:setCharVar('toCureaCough', 1) diff --git a/scripts/zones/Southern_San_dOria/npcs/Nokkhi_Jinjahl.lua b/scripts/zones/Southern_San_dOria/npcs/Nokkhi_Jinjahl.lua index b55cf754407..7c16f6a6616 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Nokkhi_Jinjahl.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Nokkhi_Jinjahl.lua @@ -149,10 +149,4 @@ entity.onTrigger = function(player, npc) player:startEvent(683, npc:getID()) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Southern_San_dOria/npcs/Norejaie.lua b/scripts/zones/Southern_San_dOria/npcs/Norejaie.lua index 6a951e4b0a8..2ec357adefa 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Norejaie.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Norejaie.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local ecoStatus = player:getCharVar('EcoStatus') @@ -29,9 +26,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 677 and option == 1 then if player:getQuestStatus(xi.questLog.SANDORIA, xi.quest.id.sandoria.ECO_WARRIOR) == xi.questStatus.QUEST_AVAILABLE then diff --git a/scripts/zones/Southern_San_dOria/npcs/Ominous_Cloud.lua b/scripts/zones/Southern_San_dOria/npcs/Ominous_Cloud.lua index 20caa5b9303..c7a876d1452 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Ominous_Cloud.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Ominous_Cloud.lua @@ -107,10 +107,4 @@ entity.onTrigger = function(player, npc) player:startEvent(759, npc:getID()) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Southern_San_dOria/npcs/Ophelia.lua b/scripts/zones/Southern_San_dOria/npcs/Ophelia.lua deleted file mode 100644 index 66b168e00ce..00000000000 --- a/scripts/zones/Southern_San_dOria/npcs/Ophelia.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Southern San d'Oria --- NPC: Ophelia --- General Info NPC ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(751) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Southern_San_dOria/npcs/Orechiniel.lua b/scripts/zones/Southern_San_dOria/npcs/Orechiniel.lua index 0eeaee36e16..2f4e846d79e 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Orechiniel.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Orechiniel.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/Southern_San_dOria/npcs/Ostalie.lua b/scripts/zones/Southern_San_dOria/npcs/Ostalie.lua index 5a58e1b47c7..44789ed9299 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Ostalie.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Ostalie.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.SOUTHERN_SAN_DORIA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -46,10 +43,4 @@ entity.onTrigger = function(player, npc) xi.shop.nation(player, stock, xi.nation.SANDORIA) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Southern_San_dOria/npcs/Paouala.lua b/scripts/zones/Southern_San_dOria/npcs/Paouala.lua index 8d20f9d1f2b..07558c6bc1d 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Paouala.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Paouala.lua @@ -35,9 +35,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 85 and option == 1 then player:addQuest(xi.questLog.SANDORIA, xi.quest.id.sandoria.SLEEPLESS_NIGHTS) diff --git a/scripts/zones/Southern_San_dOria/npcs/Parvipon.lua b/scripts/zones/Southern_San_dOria/npcs/Parvipon.lua index 506d41406b6..81ade81aa45 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Parvipon.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Parvipon.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 == 90 and option == 1 then player:addQuest(xi.questLog.SANDORIA, xi.quest.id.sandoria.THE_MERCHANT_S_BIDDING) diff --git a/scripts/zones/Southern_San_dOria/npcs/Paunelie.lua b/scripts/zones/Southern_San_dOria/npcs/Paunelie.lua index b3ee06d7d3a..e58fb1504d3 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Paunelie.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Paunelie.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.SOUTHERN_SAN_DORIA] ---@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/Southern_San_dOria/npcs/Phamelise.lua b/scripts/zones/Southern_San_dOria/npcs/Phamelise.lua index 068f6edc928..a81f48fc018 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Phamelise.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Phamelise.lua @@ -32,10 +32,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/Southern_San_dOria/npcs/Phillone.lua b/scripts/zones/Southern_San_dOria/npcs/Phillone.lua deleted file mode 100644 index 2e32ea0a6e6..00000000000 --- a/scripts/zones/Southern_San_dOria/npcs/Phillone.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Southern San d'Oria --- NPC: Phillone --- General Info NPC ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(29) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Southern_San_dOria/npcs/Poudoruchant.lua b/scripts/zones/Southern_San_dOria/npcs/Poudoruchant.lua deleted file mode 100644 index 317ff6f39d1..00000000000 --- a/scripts/zones/Southern_San_dOria/npcs/Poudoruchant.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Southern San d'Oria --- NPC: Poudoruchant --- General Info NPC ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(779) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Southern_San_dOria/npcs/Pourette.lua b/scripts/zones/Southern_San_dOria/npcs/Pourette.lua index 77bf38b1d80..03040f6510d 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Pourette.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Pourette.lua @@ -31,10 +31,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Southern_San_dOria/npcs/Raminel.lua b/scripts/zones/Southern_San_dOria/npcs/Raminel.lua index 429dda02922..1aa5d6e9ec4 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Raminel.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Raminel.lua @@ -79,17 +79,8 @@ entity.onPath = function(npc) end end -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(614) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Southern_San_dOria/npcs/Rosel.lua b/scripts/zones/Southern_San_dOria/npcs/Rosel.lua index 513c9b48ad4..215451b042a 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Rosel.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Rosel.lua @@ -13,13 +13,4 @@ entity.onTrade = function(player, npc, trade) quests.ffr.onTrade(player, npc, trade, 11) -- FLYERS FOR REGINE end -entity.onTrigger = function(player, npc) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Southern_San_dOria/npcs/Rouva.lua b/scripts/zones/Southern_San_dOria/npcs/Rouva.lua index e2139e3bd29..1ffbec07cf2 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Rouva.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Rouva.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local wildcatSandy = player:getCharVar('WildcatSandy') @@ -23,9 +20,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 808 then player:setCharVar('WildcatSandy', utils.mask.setBit(player:getCharVar('WildcatSandy'), 2, true)) diff --git a/scripts/zones/Southern_San_dOria/npcs/Rumoie.lua b/scripts/zones/Southern_San_dOria/npcs/Rumoie.lua deleted file mode 100644 index 424a77ae23d..00000000000 --- a/scripts/zones/Southern_San_dOria/npcs/Rumoie.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Southern San d'Oria --- NPC: Rumoie --- Type: Map Marker NPC --- !pos 149.696 -2.000 151.631 230 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(863) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Southern_San_dOria/npcs/Sharzalion.lua b/scripts/zones/Southern_San_dOria/npcs/Sharzalion.lua index 5d09dbd92a4..b55fdec9567 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Sharzalion.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Sharzalion.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local envelopedInDarkness = player:getQuestStatus(xi.questLog.SANDORIA, xi.quest.id.sandoria.ENVELOPED_IN_DARKNESS) local peaceForTheSpirit = player:getQuestStatus(xi.questLog.SANDORIA, xi.quest.id.sandoria.PEACE_FOR_THE_SPIRIT) @@ -39,9 +36,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 64 then player:setCharVar('peaceForTheSpiritCS', 1) diff --git a/scripts/zones/Southern_San_dOria/npcs/Shilah.lua b/scripts/zones/Southern_San_dOria/npcs/Shilah.lua index 70b7c185e30..c8cda2e99a8 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Shilah.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Shilah.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.SOUTHERN_SAN_DORIA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -32,10 +29,4 @@ entity.onTrigger = function(player, npc) xi.shop.nation(player, stock, xi.nation.SANDORIA) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Southern_San_dOria/npcs/Simmie.lua b/scripts/zones/Southern_San_dOria/npcs/Simmie.lua deleted file mode 100644 index 48386ba8e48..00000000000 --- a/scripts/zones/Southern_San_dOria/npcs/Simmie.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Southern San d'Oria --- NPC: Simmie --- General Info NPC ------------------------------------ ----@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/Southern_San_dOria/npcs/Sobane.lua b/scripts/zones/Southern_San_dOria/npcs/Sobane.lua index c658535f48b..f2e3238b44b 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Sobane.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Sobane.lua @@ -9,9 +9,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) -- SHARPENING THE SWORD if player:getCharVar('sharpeningTheSwordCS') >= 2 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) -- SHARPENING THE SWORD if csid == 52 then diff --git a/scripts/zones/Southern_San_dOria/npcs/Symphonic_Curator.lua b/scripts/zones/Southern_San_dOria/npcs/Symphonic_Curator.lua index 1f207df2bd3..78532bbf338 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Symphonic_Curator.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Symphonic_Curator.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) xi.symphonic_curator.onTrigger(player, npc) end diff --git a/scripts/zones/Southern_San_dOria/npcs/Taumila.lua b/scripts/zones/Southern_San_dOria/npcs/Taumila.lua index 8bde110d460..2ec6748cebf 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Taumila.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Taumila.lua @@ -35,9 +35,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 574 and option == 0 then player:addQuest(xi.questLog.SANDORIA, xi.quest.id.sandoria.TIGER_S_TEETH) diff --git a/scripts/zones/Southern_San_dOria/npcs/Tek_Lengyon.lua b/scripts/zones/Southern_San_dOria/npcs/Tek_Lengyon.lua index 44fd6c587a7..8cedfa7cb0d 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Tek_Lengyon.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Tek_Lengyon.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/Southern_San_dOria/npcs/Thadiene.lua b/scripts/zones/Southern_San_dOria/npcs/Thadiene.lua index f1004917785..39743304239 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Thadiene.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Thadiene.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.SOUTHERN_SAN_DORIA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -31,10 +28,4 @@ entity.onTrigger = function(player, npc) xi.shop.nation(player, stock, xi.nation.SANDORIA) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Southern_San_dOria/npcs/Trail_Markings.lua b/scripts/zones/Southern_San_dOria/npcs/Trail_Markings.lua index 13d0d8e689f..99e707c4231 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Trail_Markings.lua +++ b/scripts/zones/Southern_San_dOria/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/Southern_San_dOria/npcs/Ullasa.lua b/scripts/zones/Southern_San_dOria/npcs/Ullasa.lua index 7b87370b8b2..3687106a9b8 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Ullasa.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Ullasa.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getCharVar('UnderOathCS') == 2 then -- Quest: Under Oath - PLD AF3 player:startEvent(40) @@ -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 == 40 then player:setCharVar('UnderOathCS', 3) -- Quest: Under Oath - PLD AF3 diff --git a/scripts/zones/Southern_San_dOria/npcs/Urbiolaine.lua b/scripts/zones/Southern_San_dOria/npcs/Urbiolaine.lua index a7cff4b0ae4..45136d8f33d 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Urbiolaine.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Urbiolaine.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/Southern_San_dOria/npcs/Valeriano.lua b/scripts/zones/Southern_San_dOria/npcs/Valeriano.lua index 5a037f7f0d1..a3f16f78441 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Valeriano.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Valeriano.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.SOUTHERN_SAN_DORIA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -32,10 +29,4 @@ entity.onTrigger = function(player, npc) xi.shop.general(player, stock, xi.fameArea.SANDORIA) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Southern_San_dOria/npcs/Vaquelage.lua b/scripts/zones/Southern_San_dOria/npcs/Vaquelage.lua index 5e8a77293f5..84c0205ffe2 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Vaquelage.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Vaquelage.lua @@ -9,18 +9,9 @@ local ID = zones[xi.zone.SOUTHERN_SAN_DORIA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:showText(npc, ID.text.ITEM_DELIVERY_DIALOG) player:openSendBox() end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Southern_San_dOria/npcs/Varchet.lua b/scripts/zones/Southern_San_dOria/npcs/Varchet.lua index 33428e8c324..1fc8c75372d 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Varchet.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Varchet.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 == 519 then local result = player:getLocalVar('VarchetGame') diff --git a/scripts/zones/Southern_San_dOria/npcs/Vemalpeau.lua b/scripts/zones/Southern_San_dOria/npcs/Vemalpeau.lua index 143d8ff0be3..6e623514373 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Vemalpeau.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Vemalpeau.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.SANDORIA, xi.quest.id.sandoria.UNDER_OATH) == xi.questStatus.QUEST_ACCEPTED and @@ -35,9 +32,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 7 then player:setCharVar('UnderOathCS', 1) diff --git a/scripts/zones/Southern_San_dOria/npcs/Victoire.lua b/scripts/zones/Southern_San_dOria/npcs/Victoire.lua index 637f6a72813..ebef829e982 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Victoire.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Victoire.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.SOUTHERN_SAN_DORIA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -29,10 +26,4 @@ entity.onTrigger = function(player, npc) xi.shop.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/Southern_San_dOria/npcs/Violitte.lua b/scripts/zones/Southern_San_dOria/npcs/Violitte.lua index 426d674cf9f..c238fc4ab87 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Violitte.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Violitte.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/Southern_San_dOria/npcs/qm2.lua b/scripts/zones/Southern_San_dOria/npcs/qm2.lua deleted file mode 100644 index 422dc4e98bf..00000000000 --- a/scripts/zones/Southern_San_dOria/npcs/qm2.lua +++ /dev/null @@ -1,24 +0,0 @@ ------------------------------------ --- Area: Southern San d'Oria --- NPC: The ??? on the Ink Well in 2nd Flr of Vemalpeau's house. --- General Info NPC ------------------------------------ -local ID = zones[xi.zone.SOUTHERN_SAN_DORIA] ------------------------------------ ----@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/Southern_San_dOria/npcs/qm3.lua b/scripts/zones/Southern_San_dOria/npcs/qm3.lua index 78cfc5d9e04..bc39b88f592 100644 --- a/scripts/zones/Southern_San_dOria/npcs/qm3.lua +++ b/scripts/zones/Southern_San_dOria/npcs/qm3.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.SOUTHERN_SAN_DORIA] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getCharVar('UnderOathCS') == 4 then -- Quest: Under Oath - PLD AF3 player:startEvent(41) @@ -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 == 41 and option == 1 then player:addKeyItem(xi.ki.STRANGE_SHEET_OF_PAPER) diff --git a/scripts/zones/Southern_San_dOria/npcs/qm4.lua b/scripts/zones/Southern_San_dOria/npcs/qm4.lua deleted file mode 100644 index 38a9762c7ba..00000000000 --- a/scripts/zones/Southern_San_dOria/npcs/qm4.lua +++ /dev/null @@ -1,24 +0,0 @@ ------------------------------------ --- Area: Southern San d'Oria --- NPC: The ??? on the stack of papers in 2nd Flr of Vemalpeau's house. --- General Info NPC ------------------------------------ -local ID = zones[xi.zone.SOUTHERN_SAN_DORIA] ------------------------------------ ----@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/Southern_San_dOria_[S]/DefaultActions.lua b/scripts/zones/Southern_San_dOria_[S]/DefaultActions.lua index 65f2f10fce3..442dfc8740d 100644 --- a/scripts/zones/Southern_San_dOria_[S]/DefaultActions.lua +++ b/scripts/zones/Southern_San_dOria_[S]/DefaultActions.lua @@ -5,6 +5,7 @@ return { ['Achtelle'] = { text = ID.text.ACHTELLE_FROM_ADOULIN }, ['Adjutant'] = { text = ID.text.TOO_BUSY }, ['Aissaville'] = { event = 605 }, + ['Alfred'] = { event = 314 }, ['Andagge'] = { event = 53 }, ['Areuhat'] = { text = ID.text.ONE_OF_THESE_CITIES }, ['Ashmea_B_Greinner'] = { text = ID.text.BASEBORN_PEASANT }, @@ -26,6 +27,7 @@ return { ['Febrenard_C_Brunnaut'] = { text = ID.text.EYES_OF_THE_GODDESS }, ['Feldrautte_I_Rouhent'] = { text = ID.text.KINGDOMS_DEFEAT }, ['Hauberliond'] = { event = 92 }, + ['Houilloumie'] = { event = 103 }, ['Illeuse'] = { event = 617 }, ['Kilhwch'] = { text = ID.text.DISTANCE_YOURSELF }, ['Laisavie_X_Berlends'] = { text = ID.text.HOLY_DOCTRINES_PROHIBIT }, @@ -56,7 +58,9 @@ return { ['Saphiriance_TK'] = { event = 450 }, ['Scarlette_CA'] = { event = 459 }, ['Suspicious_Object'] = { text = ID.text.NOTHING_OUT_OF_ORDINARY }, + ['Tamba-Namba'] = { event = 305 }, ['Thierride'] = { event = 333 }, + ['Thirkell'] = { event = 93 }, ['Touttaures'] = { event = 603 }, ['Tree_Hollow'] = { text = ID.text.NOTHING_OUT_OF_ORDINARY }, ['Ulla'] = { event = 508 }, @@ -67,4 +71,5 @@ return { ['Wyatt'] = { text = ID.text.WYATT_DIALOG }, ['Yrvaulair_S_Cousseraux'] = { text = ID.text.NOT_ONCE_IN_400_YEARS }, ['Ysayle'] = { event = 112 }, + ['Zidalf'] = { event = 0 }, } diff --git a/scripts/zones/Southern_San_dOria_[S]/npcs/Adjutant.lua b/scripts/zones/Southern_San_dOria_[S]/npcs/Adjutant.lua deleted file mode 100644 index 874bec4b554..00000000000 --- a/scripts/zones/Southern_San_dOria_[S]/npcs/Adjutant.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Southern SandOria [S] --- NPC: Adjutant --- !pos -197 -1 39 80 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - -- player:startEvent(304) - This event is related to Campaign Ops Crystal Fist or Iron Anvil. -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Southern_San_dOria_[S]/npcs/Alfred.lua b/scripts/zones/Southern_San_dOria_[S]/npcs/Alfred.lua deleted file mode 100644 index 22b3290d5d6..00000000000 --- a/scripts/zones/Southern_San_dOria_[S]/npcs/Alfred.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Southern SandOria [S] --- NPC: Alfred --- !pos 94 1 -58 80 --- Campaign Evaluation NPC ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(314) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Southern_San_dOria_[S]/npcs/Chauxnatte.lua b/scripts/zones/Southern_San_dOria_[S]/npcs/Chauxnatte.lua index 618575fcb71..43e0070148d 100644 --- a/scripts/zones/Southern_San_dOria_[S]/npcs/Chauxnatte.lua +++ b/scripts/zones/Southern_San_dOria_[S]/npcs/Chauxnatte.lua @@ -10,16 +10,10 @@ local entity = {} local eventSucceed = 106 local eventFail = 107 -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/Southern_San_dOria_[S]/npcs/Eauvague_TK.lua b/scripts/zones/Southern_San_dOria_[S]/npcs/Eauvague_TK.lua index a7223c4e475..9b05d7155e9 100644 --- a/scripts/zones/Southern_San_dOria_[S]/npcs/Eauvague_TK.lua +++ b/scripts/zones/Southern_San_dOria_[S]/npcs/Eauvague_TK.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(94, -62, 266, 40, 81) diff --git a/scripts/zones/Southern_San_dOria_[S]/npcs/Fiaudie.lua b/scripts/zones/Southern_San_dOria_[S]/npcs/Fiaudie.lua index 6128df64cc9..097fa32c4dd 100644 --- a/scripts/zones/Southern_San_dOria_[S]/npcs/Fiaudie.lua +++ b/scripts/zones/Southern_San_dOria_[S]/npcs/Fiaudie.lua @@ -8,9 +8,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local allegiance = player:getCampaignAllegiance() local rank = xi.campaign.getMedalRank(player) @@ -18,10 +15,4 @@ entity.onTrigger = function(player, npc) player:startEvent(312, allegiance, rank, 0, 0, 0, 0, 0) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Southern_San_dOria_[S]/npcs/Geltpix.lua b/scripts/zones/Southern_San_dOria_[S]/npcs/Geltpix.lua index c75be2239e7..1dc257649d6 100644 --- a/scripts/zones/Southern_San_dOria_[S]/npcs/Geltpix.lua +++ b/scripts/zones/Southern_San_dOria_[S]/npcs/Geltpix.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.SOUTHERN_SAN_DORIA_S] ---@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/Southern_San_dOria_[S]/npcs/Houilloumie.lua b/scripts/zones/Southern_San_dOria_[S]/npcs/Houilloumie.lua deleted file mode 100644 index 7220d8880af..00000000000 --- a/scripts/zones/Southern_San_dOria_[S]/npcs/Houilloumie.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Southern SandOria [S] --- NPC: Houilloume --- !pos 17.19 1.4 -29 80 --- Allegiance Change NPC ------------------------------------ ----@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/Southern_San_dOria_[S]/npcs/Hunt_Registry.lua b/scripts/zones/Southern_San_dOria_[S]/npcs/Hunt_Registry.lua index fd3382e1499..858e70745b8 100644 --- a/scripts/zones/Southern_San_dOria_[S]/npcs/Hunt_Registry.lua +++ b/scripts/zones/Southern_San_dOria_[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/Southern_San_dOria_[S]/npcs/Lurouillat.lua b/scripts/zones/Southern_San_dOria_[S]/npcs/Lurouillat.lua index 573b888b266..78af4436df8 100644 --- a/scripts/zones/Southern_San_dOria_[S]/npcs/Lurouillat.lua +++ b/scripts/zones/Southern_San_dOria_[S]/npcs/Lurouillat.lua @@ -38,10 +38,4 @@ entity.onTrigger = function(player, npc) player:startEvent(350) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Southern_San_dOria_[S]/npcs/Miliart_TK.lua b/scripts/zones/Southern_San_dOria_[S]/npcs/Miliart_TK.lua index 30338c2eb6a..ca936c45dca 100644 --- a/scripts/zones/Southern_San_dOria_[S]/npcs/Miliart_TK.lua +++ b/scripts/zones/Southern_San_dOria_[S]/npcs/Miliart_TK.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/Southern_San_dOria_[S]/npcs/Nembet.lua b/scripts/zones/Southern_San_dOria_[S]/npcs/Nembet.lua index 0935a8c27de..58ed575f70b 100644 --- a/scripts/zones/Southern_San_dOria_[S]/npcs/Nembet.lua +++ b/scripts/zones/Southern_San_dOria_[S]/npcs/Nembet.lua @@ -8,18 +8,9 @@ local ID = zones[xi.zone.SOUTHERN_SAN_DORIA_S] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:showText(npc, ID.text.ITEM_DELIVERY_DIALOG) player:openSendBox() end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Southern_San_dOria_[S]/npcs/Saphiriance_TK.lua b/scripts/zones/Southern_San_dOria_[S]/npcs/Saphiriance_TK.lua index 047d3d35c11..9905464c2f9 100644 --- a/scripts/zones/Southern_San_dOria_[S]/npcs/Saphiriance_TK.lua +++ b/scripts/zones/Southern_San_dOria_[S]/npcs/Saphiriance_TK.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local allegiance = player:getCampaignAllegiance() local alliedNotes = player:getCurrency('allied_notes') @@ -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 == 454 then player:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.RETRACE, 0, 3) diff --git a/scripts/zones/Southern_San_dOria_[S]/npcs/Tamba-Namba.lua b/scripts/zones/Southern_San_dOria_[S]/npcs/Tamba-Namba.lua deleted file mode 100644 index 989d1e4a909..00000000000 --- a/scripts/zones/Southern_San_dOria_[S]/npcs/Tamba-Namba.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Southern SandOria [S] --- NPC: Tamba-Namba --- !pos 104 4 21 80 --- Traveling Bard ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(305) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Southern_San_dOria_[S]/npcs/Thierride.lua b/scripts/zones/Southern_San_dOria_[S]/npcs/Thierride.lua index 4bbe6c4339f..e73a8f58912 100644 --- a/scripts/zones/Southern_San_dOria_[S]/npcs/Thierride.lua +++ b/scripts/zones/Southern_San_dOria_[S]/npcs/Thierride.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 == 334 then player:addQuest(xi.questLog.CRYSTAL_WAR, xi.quest.id.crystalWar.BEANS_AHOY) diff --git a/scripts/zones/Southern_San_dOria_[S]/npcs/Thirkell.lua b/scripts/zones/Southern_San_dOria_[S]/npcs/Thirkell.lua deleted file mode 100644 index 195694beac7..00000000000 --- a/scripts/zones/Southern_San_dOria_[S]/npcs/Thirkell.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Southern SandOria [S] --- NPC: Thirkell --- !pos 102 1 109 80 --- Allied Notes Notorious Monster Proprietor ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(93) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Southern_San_dOria_[S]/npcs/Zidalf.lua b/scripts/zones/Southern_San_dOria_[S]/npcs/Zidalf.lua deleted file mode 100644 index f8723e3af33..00000000000 --- a/scripts/zones/Southern_San_dOria_[S]/npcs/Zidalf.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Southern SandOria [S] --- NPC: Zidalf --- !pos -33 0 33 80 --- Melody Minstrel ------------------------------------ ----@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/Southern_San_dOria_[S]/npcs/_6eo.lua b/scripts/zones/Southern_San_dOria_[S]/npcs/_6eo.lua index 56ab97f6239..fdcb4ca4a2f 100644 --- a/scripts/zones/Southern_San_dOria_[S]/npcs/_6eo.lua +++ b/scripts/zones/Southern_San_dOria_[S]/npcs/_6eo.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.SOUTHERN_SAN_DORIA_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.KNOT_QUITE_THERE) == xi.questStatus.QUEST_ACCEPTED and @@ -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 == 63 then if player:getFreeSlotsCount() == 0 then diff --git a/scripts/zones/Spire_of_Dem/npcs/Radiant_Aureole.lua b/scripts/zones/Spire_of_Dem/npcs/Radiant_Aureole.lua index 59df6b4a524..c79db789ef0 100644 --- a/scripts/zones/Spire_of_Dem/npcs/Radiant_Aureole.lua +++ b/scripts/zones/Spire_of_Dem/npcs/Radiant_Aureole.lua @@ -6,16 +6,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(14) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 14 and option == 1 then player:setPos(139.974, 19.103, 219.989, 128, 108) -- To Konschtat Highlands (R) diff --git a/scripts/zones/Spire_of_Holla/npcs/Radiant_Aureole.lua b/scripts/zones/Spire_of_Holla/npcs/Radiant_Aureole.lua index 2bc25814751..5afc1404233 100644 --- a/scripts/zones/Spire_of_Holla/npcs/Radiant_Aureole.lua +++ b/scripts/zones/Spire_of_Holla/npcs/Radiant_Aureole.lua @@ -5,16 +5,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(14) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 14 and option == 1 then player:setPos(340.082, 19.103, -59.979, 127, 102) -- To La Theine Plateau (R) diff --git a/scripts/zones/Spire_of_Mea/npcs/Radiant_Aureole.lua b/scripts/zones/Spire_of_Mea/npcs/Radiant_Aureole.lua index 08074e24eb5..b2aa0b74759 100644 --- a/scripts/zones/Spire_of_Mea/npcs/Radiant_Aureole.lua +++ b/scripts/zones/Spire_of_Mea/npcs/Radiant_Aureole.lua @@ -5,16 +5,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(14) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 14 and option == 1 then player:setPos(179.92, 35.15, 260.137, 64, 117) -- To Tahrongi Canyon (R) diff --git a/scripts/zones/Spire_of_Vahzl/npcs/Radiant_Aureole.lua b/scripts/zones/Spire_of_Vahzl/npcs/Radiant_Aureole.lua index 536a3b7711f..aa3d0562af7 100644 --- a/scripts/zones/Spire_of_Vahzl/npcs/Radiant_Aureole.lua +++ b/scripts/zones/Spire_of_Vahzl/npcs/Radiant_Aureole.lua @@ -5,16 +5,10 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(15) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 15 and option == 1 then player:setPos(-379.947, 48.045, 334.059, 192, 9) -- To Pso'Xja (R) diff --git a/scripts/zones/Tahrongi_Canyon/DefaultActions.lua b/scripts/zones/Tahrongi_Canyon/DefaultActions.lua index a16185cf853..45a275af721 100644 --- a/scripts/zones/Tahrongi_Canyon/DefaultActions.lua +++ b/scripts/zones/Tahrongi_Canyon/DefaultActions.lua @@ -1,5 +1,6 @@ local ID = zones[xi.zone.TAHRONGI_CANYON] return { + ['Luck_Rune'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, ['Shattered_Telepoint'] = { messageSpecial = ID.text.TELEPOINT_HAS_BEEN_SHATTERED }, } diff --git a/scripts/zones/Tahrongi_Canyon/npcs/Cavernous_Maw.lua b/scripts/zones/Tahrongi_Canyon/npcs/Cavernous_Maw.lua index 726b711f89c..f06c9fe75a7 100644 --- a/scripts/zones/Tahrongi_Canyon/npcs/Cavernous_Maw.lua +++ b/scripts/zones/Tahrongi_Canyon/npcs/Cavernous_Maw.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.TAHRONGI_CANYON] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if xi.settings.main.ENABLE_ABYSSEA == 1 and player:getMainLvl() >= 30 then if @@ -28,9 +25,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 38 then player:addQuest(xi.questLog.ABYSSEA, xi.quest.id.abyssea.MEGADRILE_MENACE) diff --git a/scripts/zones/Tahrongi_Canyon/npcs/Dimensional_Portal.lua b/scripts/zones/Tahrongi_Canyon/npcs/Dimensional_Portal.lua index 878b53f8748..464972b90d9 100644 --- a/scripts/zones/Tahrongi_Canyon/npcs/Dimensional_Portal.lua +++ b/scripts/zones/Tahrongi_Canyon/npcs/Dimensional_Portal.lua @@ -8,9 +8,6 @@ local ID = zones[xi.zone.TAHRONGI_CANYON] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getCurrentMission(xi.mission.log_id.COP) > xi.mission.id.cop.THE_WARRIORS_PATH then player:startEvent(915) @@ -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 == 915 and option == 1 then player:setPos(654.200, -2.799, 100.700, 193, 33) -- To AlTaieu (R) diff --git a/scripts/zones/Tahrongi_Canyon/npcs/Ergon_Locus.lua b/scripts/zones/Tahrongi_Canyon/npcs/Ergon_Locus.lua index d130e9bdf8f..da47fe0647e 100644 --- a/scripts/zones/Tahrongi_Canyon/npcs/Ergon_Locus.lua +++ b/scripts/zones/Tahrongi_Canyon/npcs/Ergon_Locus.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) -- DANCES WITH LUOPANS if @@ -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/Tahrongi_Canyon/npcs/Excavation_Point.lua b/scripts/zones/Tahrongi_Canyon/npcs/Excavation_Point.lua index d73aa94581d..623738c0428 100644 --- a/scripts/zones/Tahrongi_Canyon/npcs/Excavation_Point.lua +++ b/scripts/zones/Tahrongi_Canyon/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/Tahrongi_Canyon/npcs/Field_Manual.lua b/scripts/zones/Tahrongi_Canyon/npcs/Field_Manual.lua index 4412e8d81a5..f536ec714e9 100644 --- a/scripts/zones/Tahrongi_Canyon/npcs/Field_Manual.lua +++ b/scripts/zones/Tahrongi_Canyon/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/Tahrongi_Canyon/npcs/Geomantic_Reservoir.lua b/scripts/zones/Tahrongi_Canyon/npcs/Geomantic_Reservoir.lua index 3c95c03f74d..d53be2c1ae0 100644 --- a/scripts/zones/Tahrongi_Canyon/npcs/Geomantic_Reservoir.lua +++ b/scripts/zones/Tahrongi_Canyon/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_VOIDANCE) 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_VOIDANCE) end diff --git a/scripts/zones/Tahrongi_Canyon/npcs/Luck_Rune.lua b/scripts/zones/Tahrongi_Canyon/npcs/Luck_Rune.lua deleted file mode 100644 index 240dfe615a5..00000000000 --- a/scripts/zones/Tahrongi_Canyon/npcs/Luck_Rune.lua +++ /dev/null @@ -1,25 +0,0 @@ ------------------------------------ --- Area: Tahrongi Canyon --- NPC: Luck Rune --- Involved in Quest: Mhaura Fortune --- !pos -54.755 7.647 -379.945 117 ------------------------------------ -local ID = zones[xi.zone.TAHRONGI_CANYON] ------------------------------------ ----@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/Tahrongi_Canyon/npcs/Pucotte.lua b/scripts/zones/Tahrongi_Canyon/npcs/Pucotte.lua index 06d7045a496..dc8d194c865 100644 --- a/scripts/zones/Tahrongi_Canyon/npcs/Pucotte.lua +++ b/scripts/zones/Tahrongi_Canyon/npcs/Pucotte.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/Tahrongi_Canyon/npcs/Signpost.lua b/scripts/zones/Tahrongi_Canyon/npcs/Signpost.lua index ab0199cf5c5..6a874f2b28b 100644 --- a/scripts/zones/Tahrongi_Canyon/npcs/Signpost.lua +++ b/scripts/zones/Tahrongi_Canyon/npcs/Signpost.lua @@ -7,18 +7,9 @@ local ID = zones[xi.zone.TAHRONGI_CANYON] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local offset = math.floor((npc:getID() - ID.npc.SIGNPOST_OFFSET) / 2) player:messageSpecial(ID.text.SIGN_1 + offset) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Tahrongi_Canyon/npcs/Stone_Monument.lua b/scripts/zones/Tahrongi_Canyon/npcs/Stone_Monument.lua index 6b6363efaf0..b4445bedf8b 100644 --- a/scripts/zones/Tahrongi_Canyon/npcs/Stone_Monument.lua +++ b/scripts/zones/Tahrongi_Canyon/npcs/Stone_Monument.lua @@ -21,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/Tahrongi_Canyon/npcs/Tahrongi_Cacti.lua b/scripts/zones/Tahrongi_Canyon/npcs/Tahrongi_Cacti.lua index 5b64de99354..a2f64de0099 100644 --- a/scripts/zones/Tahrongi_Canyon/npcs/Tahrongi_Cacti.lua +++ b/scripts/zones/Tahrongi_Canyon/npcs/Tahrongi_Cacti.lua @@ -28,10 +28,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Tahrongi_Canyon/npcs/Telepoint.lua b/scripts/zones/Tahrongi_Canyon/npcs/Telepoint.lua index 100b8b2466e..8f1de6f5871 100644 --- a/scripts/zones/Tahrongi_Canyon/npcs/Telepoint.lua +++ b/scripts/zones/Tahrongi_Canyon/npcs/Telepoint.lua @@ -29,9 +29,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 32 then npcUtil.giveKeyItem(player, xi.ki.MEA_GATE_CRYSTAL) diff --git a/scripts/zones/Tahrongi_Canyon/npcs/Treasure_Casket.lua b/scripts/zones/Tahrongi_Canyon/npcs/Treasure_Casket.lua index 71e108ecbe2..ebad35d5e7f 100644 --- a/scripts/zones/Tahrongi_Canyon/npcs/Treasure_Casket.lua +++ b/scripts/zones/Tahrongi_Canyon/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/Tahrongi_Canyon/npcs/qm2.lua b/scripts/zones/Tahrongi_Canyon/npcs/qm2.lua index 686ab4da48e..42991efc359 100644 --- a/scripts/zones/Tahrongi_Canyon/npcs/qm2.lua +++ b/scripts/zones/Tahrongi_Canyon/npcs/qm2.lua @@ -45,10 +45,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/Tavnazian_Safehold/DefaultActions.lua b/scripts/zones/Tavnazian_Safehold/DefaultActions.lua index 72ea0d9e539..141f68baf91 100644 --- a/scripts/zones/Tavnazian_Safehold/DefaultActions.lua +++ b/scripts/zones/Tavnazian_Safehold/DefaultActions.lua @@ -4,12 +4,14 @@ return { ['_0q1'] = { messageSpecial = ID.text.DOOR_IS_LOCKED_TIGHT }, ['_0qa'] = { messageSpecial = ID.text.DOOR_IS_LOCKED_TIGHT }, ['Angieurol'] = { event = 361 }, + ['Anteurephiaux'] = { event = 177 }, ['Arquil'] = { event = 290 }, ['Bibokk-Molbukk'] = { event = 339 }, ['Calengeard'] = { event = 260 }, ['Chemioue'] = { event = 280 }, ['Despachiaire'] = { event = 106 }, -- NOTE: 0-Parameter values appear to be default, but this has multiple outputs ['Dominec'] = { event = 380 }, + ['Enaremand'] = { event = 537 }, ['Epinolle'] = { event = 230 }, ['Equette'] = { event = 162 }, ['Evindigar'] = { event = 361 }, @@ -23,6 +25,8 @@ return { ['Justinius'] = { event = 265 }, ['Kokila'] = { event = 376 }, ['Korbi-Marobi'] = { event = 324 }, + ['Latteaune'] = { event = 100 }, + ['Leporaitceau'] = { event = 171 }, ['Liphatte'] = { event = 300 }, ['Masis'] = { event = 337 }, ['Mengrenaux'] = { event = 270 }, @@ -30,7 +34,7 @@ return { ['Merol'] = { event = 340 }, ['Morangeart'] = { event = 523 }, ['Nery'] = { event = 372 }, - ['Nivorajean'] = { event = 382 }, + ['Nivorajean'] = { event = 382 }, -- TODO: Default cycles between 221 and 382, 382 in Default. 382 from one cap ['Noam'] = { event = 363 }, ['Odeya'] = { event = 150 }, ['Ondieulix'] = { event = 285 }, @@ -43,9 +47,13 @@ return { ['qm5_in_search_of_truth'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, ['qm_unforgiven'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, ['Quelveuiat'] = { event = 122 }, + ['Raminey'] = { event = 159 }, -- TODO: Needs verification ['Reaugettie'] = { event = 391 }, ['Risunela'] = { event = 333 }, + ['Tiruru'] = { event = 330 }, + ['Travonce'] = { event = 210 }, ['Tressia'] = { event = 310 }, ['Yasuji'] = { event = 335 }, ['Yurim'] = { event = 527 }, + ['Zadant'] = { event = 326 }, } diff --git a/scripts/zones/Tavnazian_Safehold/npcs/Aligi-Kufongi.lua b/scripts/zones/Tavnazian_Safehold/npcs/Aligi-Kufongi.lua index 71001d6672c..057d780b41b 100644 --- a/scripts/zones/Tavnazian_Safehold/npcs/Aligi-Kufongi.lua +++ b/scripts/zones/Tavnazian_Safehold/npcs/Aligi-Kufongi.lua @@ -64,16 +64,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/Tavnazian_Safehold/npcs/Anteurephiaux.lua b/scripts/zones/Tavnazian_Safehold/npcs/Anteurephiaux.lua deleted file mode 100644 index 2ba31fdf5fe..00000000000 --- a/scripts/zones/Tavnazian_Safehold/npcs/Anteurephiaux.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Tavnazian Safehold --- NPC: Anteurephiaux ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(177) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Tavnazian_Safehold/npcs/Caiphimonride.lua b/scripts/zones/Tavnazian_Safehold/npcs/Caiphimonride.lua index 0da923aea95..cfc849becc6 100644 --- a/scripts/zones/Tavnazian_Safehold/npcs/Caiphimonride.lua +++ b/scripts/zones/Tavnazian_Safehold/npcs/Caiphimonride.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.TAVNAZIAN_SAFEHOLD] ---@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.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/Tavnazian_Safehold/npcs/Eliot.lua b/scripts/zones/Tavnazian_Safehold/npcs/Eliot.lua index 3e7f64ce987..ff023fa9207 100644 --- a/scripts/zones/Tavnazian_Safehold/npcs/Eliot.lua +++ b/scripts/zones/Tavnazian_Safehold/npcs/Eliot.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:hasCompletedMission(xi.mission.log_id.COP, xi.mission.id.cop.DARKNESS_NAMED) then player:sendMenu(3) @@ -16,10 +13,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Tavnazian_Safehold/npcs/Elysia.lua b/scripts/zones/Tavnazian_Safehold/npcs/Elysia.lua index edd59635f48..2816a464065 100644 --- a/scripts/zones/Tavnazian_Safehold/npcs/Elysia.lua +++ b/scripts/zones/Tavnazian_Safehold/npcs/Elysia.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local unforgiven = player:getQuestStatus(xi.questLog.OTHER_AREAS, xi.quest.id.otherAreas.UNFORGIVEN) @@ -32,9 +29,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 200 then player:addQuest(xi.questLog.OTHER_AREAS, xi.quest.id.otherAreas.UNFORGIVEN) diff --git a/scripts/zones/Tavnazian_Safehold/npcs/Enaremand.lua b/scripts/zones/Tavnazian_Safehold/npcs/Enaremand.lua deleted file mode 100644 index d3e005b912b..00000000000 --- a/scripts/zones/Tavnazian_Safehold/npcs/Enaremand.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Tavnazian Safehold --- NPC: Enaremand --- !pos 95.962 -42.003 51.613 26 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(537) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Tavnazian_Safehold/npcs/Equette.lua b/scripts/zones/Tavnazian_Safehold/npcs/Equette.lua deleted file mode 100644 index c82cac4ba23..00000000000 --- a/scripts/zones/Tavnazian_Safehold/npcs/Equette.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Tavnazian Safehold --- NPC: Equette ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - -- With no quests completed, first time in Safehold, 170, then after defaults to 162 - player:startEvent(162) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Tavnazian_Safehold/npcs/Ferchinne.lua b/scripts/zones/Tavnazian_Safehold/npcs/Ferchinne.lua index ae16380005e..0aae858c817 100644 --- a/scripts/zones/Tavnazian_Safehold/npcs/Ferchinne.lua +++ b/scripts/zones/Tavnazian_Safehold/npcs/Ferchinne.lua @@ -41,9 +41,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 241 then player:addQuest(xi.questLog.OTHER_AREAS, xi.quest.id.otherAreas.FLY_HIGH) diff --git a/scripts/zones/Tavnazian_Safehold/npcs/Ferocious_Artisan.lua b/scripts/zones/Tavnazian_Safehold/npcs/Ferocious_Artisan.lua index 3d6d0ac2313..2a2a797d162 100644 --- a/scripts/zones/Tavnazian_Safehold/npcs/Ferocious_Artisan.lua +++ b/scripts/zones/Tavnazian_Safehold/npcs/Ferocious_Artisan.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:hasCompletedMission(xi.mission.log_id.COP, xi.mission.id.cop.DARKNESS_NAMED) then player:sendMenu(3) @@ -16,10 +13,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Tavnazian_Safehold/npcs/Gennoue.lua b/scripts/zones/Tavnazian_Safehold/npcs/Gennoue.lua index a257ca146db..bb938a6790d 100644 --- a/scripts/zones/Tavnazian_Safehold/npcs/Gennoue.lua +++ b/scripts/zones/Tavnazian_Safehold/npcs/Gennoue.lua @@ -6,17 +6,8 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:startEvent(509, 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/Tavnazian_Safehold/npcs/Havillione.lua b/scripts/zones/Tavnazian_Safehold/npcs/Havillione.lua index f7d3709f5ac..1d12ed81e34 100644 --- a/scripts/zones/Tavnazian_Safehold/npcs/Havillione.lua +++ b/scripts/zones/Tavnazian_Safehold/npcs/Havillione.lua @@ -5,18 +5,9 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) -- TODO: Alternates between 383 and 320 player:startEvent(320) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Tavnazian_Safehold/npcs/Hieroglyphics.lua b/scripts/zones/Tavnazian_Safehold/npcs/Hieroglyphics.lua index 7d2241a950e..f167ab6973b 100644 --- a/scripts/zones/Tavnazian_Safehold/npcs/Hieroglyphics.lua +++ b/scripts/zones/Tavnazian_Safehold/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/Tavnazian_Safehold/npcs/Hunt_Registry.lua b/scripts/zones/Tavnazian_Safehold/npcs/Hunt_Registry.lua index 3b6df3de52b..eb609020b97 100644 --- a/scripts/zones/Tavnazian_Safehold/npcs/Hunt_Registry.lua +++ b/scripts/zones/Tavnazian_Safehold/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/Tavnazian_Safehold/npcs/Ironclad_Gorilla.lua b/scripts/zones/Tavnazian_Safehold/npcs/Ironclad_Gorilla.lua deleted file mode 100644 index 3a679f74d39..00000000000 --- a/scripts/zones/Tavnazian_Safehold/npcs/Ironclad_Gorilla.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Tavnazian Safehold --- NPC: Ironclad Gorilla ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - -- First entry into Tavnazian Safehold only shows 305, - -- 306 first observed in One to be Feared, verify if it persists. - -- player:startEvent(306) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Tavnazian_Safehold/npcs/Justinius.lua b/scripts/zones/Tavnazian_Safehold/npcs/Justinius.lua deleted file mode 100644 index 133257341e0..00000000000 --- a/scripts/zones/Tavnazian_Safehold/npcs/Justinius.lua +++ /dev/null @@ -1,25 +0,0 @@ ------------------------------------ --- Area: Tavnazian Safehold --- NPC: Justinius --- Involved in mission : COP2-3 --- !pos 76 -34 68 26 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - -- else - -- TODO: True default is 265, need to investigate this message - -- player:startEvent(123) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Tavnazian_Safehold/npcs/Komalata.lua b/scripts/zones/Tavnazian_Safehold/npcs/Komalata.lua index aab704e127b..b5d14370929 100644 --- a/scripts/zones/Tavnazian_Safehold/npcs/Komalata.lua +++ b/scripts/zones/Tavnazian_Safehold/npcs/Komalata.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.TAVNAZIAN_SAFEHOLD] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -39,10 +36,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/Tavnazian_Safehold/npcs/Latteaune.lua b/scripts/zones/Tavnazian_Safehold/npcs/Latteaune.lua deleted file mode 100644 index 294971c4454..00000000000 --- a/scripts/zones/Tavnazian_Safehold/npcs/Latteaune.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Tavnazian Safehold --- NPC: Latteaune --- Type: Event Scene Replayer --- !pos -16.426 -28.889 109.626 26 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(100) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Tavnazian_Safehold/npcs/Leporaitceau.lua b/scripts/zones/Tavnazian_Safehold/npcs/Leporaitceau.lua deleted file mode 100644 index acbb055caa4..00000000000 --- a/scripts/zones/Tavnazian_Safehold/npcs/Leporaitceau.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Tavnazian Safehold --- NPC: Leporaitceau ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(171) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Tavnazian_Safehold/npcs/Maturiri.lua b/scripts/zones/Tavnazian_Safehold/npcs/Maturiri.lua index 7bf763c75f6..0480e7fbd95 100644 --- a/scripts/zones/Tavnazian_Safehold/npcs/Maturiri.lua +++ b/scripts/zones/Tavnazian_Safehold/npcs/Maturiri.lua @@ -9,19 +9,10 @@ local ID = zones[xi.zone.TAVNAZIAN_SAFEHOLD] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) -- TODO: if not completed darkness named, 10919 (One thing Tav has is a lot of storage space) 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/Tavnazian_Safehold/npcs/Mazuro-Oozuro.lua b/scripts/zones/Tavnazian_Safehold/npcs/Mazuro-Oozuro.lua index 5bbd263d26c..0105767c89e 100644 --- a/scripts/zones/Tavnazian_Safehold/npcs/Mazuro-Oozuro.lua +++ b/scripts/zones/Tavnazian_Safehold/npcs/Mazuro-Oozuro.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.TAVNAZIAN_SAFEHOLD] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -40,10 +37,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/Tavnazian_Safehold/npcs/Melleupaux.lua b/scripts/zones/Tavnazian_Safehold/npcs/Melleupaux.lua index ad164c80cf0..32f9941cd5d 100644 --- a/scripts/zones/Tavnazian_Safehold/npcs/Melleupaux.lua +++ b/scripts/zones/Tavnazian_Safehold/npcs/Melleupaux.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.TAVNAZIAN_SAFEHOLD] ---@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.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/Tavnazian_Safehold/npcs/Meret.lua b/scripts/zones/Tavnazian_Safehold/npcs/Meret.lua index fce35b25e5f..30ffeb7b80a 100644 --- a/scripts/zones/Tavnazian_Safehold/npcs/Meret.lua +++ b/scripts/zones/Tavnazian_Safehold/npcs/Meret.lua @@ -57,9 +57,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 586 and option == player:getLocalVar('meretReward') then player:setLocalVar('meretReward', 0) diff --git a/scripts/zones/Tavnazian_Safehold/npcs/Migran.lua b/scripts/zones/Tavnazian_Safehold/npcs/Migran.lua index 58b8f7541ae..b79540c83a3 100644 --- a/scripts/zones/Tavnazian_Safehold/npcs/Migran.lua +++ b/scripts/zones/Tavnazian_Safehold/npcs/Migran.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.TAVNAZIAN_SAFEHOLD] ---@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/Tavnazian_Safehold/npcs/Misseulieu.lua b/scripts/zones/Tavnazian_Safehold/npcs/Misseulieu.lua index 2a529731fdb..ec840c0178a 100644 --- a/scripts/zones/Tavnazian_Safehold/npcs/Misseulieu.lua +++ b/scripts/zones/Tavnazian_Safehold/npcs/Misseulieu.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.TAVNAZIAN_SAFEHOLD] ---@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/Tavnazian_Safehold/npcs/Morangeart.lua b/scripts/zones/Tavnazian_Safehold/npcs/Morangeart.lua deleted file mode 100644 index 93978772609..00000000000 --- a/scripts/zones/Tavnazian_Safehold/npcs/Morangeart.lua +++ /dev/null @@ -1,24 +0,0 @@ ------------------------------------ --- Area: Tavnazian Safehold --- NPC: Morangeart --- Type: ENM Quest Activator --- !pos -74.308 -24.782 -28.475 26 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - -- True default is 523, TODO: Find out what 520 is for - -- player:startEvent(520) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Tavnazian_Safehold/npcs/Nilerouche.lua b/scripts/zones/Tavnazian_Safehold/npcs/Nilerouche.lua index 8b1c39bb752..59ce08cb583 100644 --- a/scripts/zones/Tavnazian_Safehold/npcs/Nilerouche.lua +++ b/scripts/zones/Tavnazian_Safehold/npcs/Nilerouche.lua @@ -7,9 +7,6 @@ local ID = zones[xi.zone.TAVNAZIAN_SAFEHOLD] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local stock = { @@ -40,10 +37,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/Tavnazian_Safehold/npcs/Nivorajean.lua b/scripts/zones/Tavnazian_Safehold/npcs/Nivorajean.lua deleted file mode 100644 index c2150c6b242..00000000000 --- a/scripts/zones/Tavnazian_Safehold/npcs/Nivorajean.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------ --- Area: Tavnazian Safehold --- NPC: Nivorajean --- !pos 15.890 -22.999 13.322 26 ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - -- TODO: Default cycles between 221 and 382, 382 in Default - player:startEvent(221) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Tavnazian_Safehold/npcs/Nomad_Moogle.lua b/scripts/zones/Tavnazian_Safehold/npcs/Nomad_Moogle.lua index 9126bfde3eb..91d807e5ac5 100644 --- a/scripts/zones/Tavnazian_Safehold/npcs/Nomad_Moogle.lua +++ b/scripts/zones/Tavnazian_Safehold/npcs/Nomad_Moogle.lua @@ -7,18 +7,9 @@ local ID = zones[xi.zone.TAVNAZIAN_SAFEHOLD] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) player:showText(npc, ID.text.NOMAD_MOOGLE_DIALOG) player:sendMenu(1) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Tavnazian_Safehold/npcs/Pradiulot.lua b/scripts/zones/Tavnazian_Safehold/npcs/Pradiulot.lua index e1358b9b3a3..f406aca2c0d 100644 --- a/scripts/zones/Tavnazian_Safehold/npcs/Pradiulot.lua +++ b/scripts/zones/Tavnazian_Safehold/npcs/Pradiulot.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.TAVNAZIAN_SAFEHOLD] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local unforgiven = player:getQuestStatus(xi.questLog.OTHER_AREAS, xi.quest.id.otherAreas.UNFORGIVEN) @@ -30,9 +27,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 204 then player:setCharVar('UnforgivenVar', 2) diff --git a/scripts/zones/Tavnazian_Safehold/npcs/Raminey.lua b/scripts/zones/Tavnazian_Safehold/npcs/Raminey.lua deleted file mode 100644 index 5419eef3992..00000000000 --- a/scripts/zones/Tavnazian_Safehold/npcs/Raminey.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Tavnazian Safehold --- NPC: Raminey ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - -- TODO: Needs verification - player:startEvent(159) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Tavnazian_Safehold/npcs/Resauchamet.lua b/scripts/zones/Tavnazian_Safehold/npcs/Resauchamet.lua index ee573edb479..4a22d701cd6 100644 --- a/scripts/zones/Tavnazian_Safehold/npcs/Resauchamet.lua +++ b/scripts/zones/Tavnazian_Safehold/npcs/Resauchamet.lua @@ -5,9 +5,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local kill = player:getCharVar('FOMOR_HATE') local n = 0 @@ -25,10 +22,4 @@ entity.onTrigger = function(player, npc) player:startEvent(355, n) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Tavnazian_Safehold/npcs/Senvaleget.lua b/scripts/zones/Tavnazian_Safehold/npcs/Senvaleget.lua index 272f37a8eba..df48c78b5bf 100644 --- a/scripts/zones/Tavnazian_Safehold/npcs/Senvaleget.lua +++ b/scripts/zones/Tavnazian_Safehold/npcs/Senvaleget.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:hasCompletedMission(xi.mission.log_id.COP, xi.mission.id.cop.DARKNESS_NAMED) then player:sendMenu(3) @@ -16,10 +13,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Tavnazian_Safehold/npcs/Suzel.lua b/scripts/zones/Tavnazian_Safehold/npcs/Suzel.lua index b4afcd258d2..81491ec8057 100644 --- a/scripts/zones/Tavnazian_Safehold/npcs/Suzel.lua +++ b/scripts/zones/Tavnazian_Safehold/npcs/Suzel.lua @@ -9,19 +9,10 @@ local ID = zones[xi.zone.TAVNAZIAN_SAFEHOLD] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) -- TODO: if not completed darkness named, 10921 (One thing Tav has is a lot of storage space) 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/Tavnazian_Safehold/npcs/Tiruru.lua b/scripts/zones/Tavnazian_Safehold/npcs/Tiruru.lua deleted file mode 100644 index 56ecf48eab1..00000000000 --- a/scripts/zones/Tavnazian_Safehold/npcs/Tiruru.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Tavnazian Safehold --- NPC: Tiruru ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(330) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Tavnazian_Safehold/npcs/Travonce.lua b/scripts/zones/Tavnazian_Safehold/npcs/Travonce.lua deleted file mode 100644 index cd4a98fdccb..00000000000 --- a/scripts/zones/Tavnazian_Safehold/npcs/Travonce.lua +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------ --- Area: Tavnazian Safehold --- NPC: Travonce --- !pos -89.068 -14.367 -0.030 26 ------------------------------------ ----@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/Tavnazian_Safehold/npcs/Yurim.lua b/scripts/zones/Tavnazian_Safehold/npcs/Yurim.lua index eb8d4c1a52e..f5c49e45795 100644 --- a/scripts/zones/Tavnazian_Safehold/npcs/Yurim.lua +++ b/scripts/zones/Tavnazian_Safehold/npcs/Yurim.lua @@ -358,9 +358,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 == 524 then player:addQuest(xi.questLog.OTHER_AREAS, xi.quest.id.otherAreas.IN_THE_NAME_OF_SCIENCE) diff --git a/scripts/zones/Tavnazian_Safehold/npcs/Zadant.lua b/scripts/zones/Tavnazian_Safehold/npcs/Zadant.lua deleted file mode 100644 index fa3306db925..00000000000 --- a/scripts/zones/Tavnazian_Safehold/npcs/Zadant.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Tavnazian Safehold --- NPC: Zadant ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(326) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Tavnazian_Safehold/npcs/_0q1.lua b/scripts/zones/Tavnazian_Safehold/npcs/_0q1.lua index eb93f6d583a..699eb5c5a1c 100644 --- a/scripts/zones/Tavnazian_Safehold/npcs/_0q1.lua +++ b/scripts/zones/Tavnazian_Safehold/npcs/_0q1.lua @@ -6,18 +6,12 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:hasCompletedMission(xi.mission.log_id.COP, xi.mission.id.cop.THE_LOST_CITY) then player:startEvent(502) end 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(260.068, 0, -283.568, 190, 27) -- To Phomiuna Aqueducts (R) diff --git a/scripts/zones/Tavnazian_Safehold/npcs/qm_unforgiven.lua b/scripts/zones/Tavnazian_Safehold/npcs/qm_unforgiven.lua index 91f9ac048b0..2c585a94935 100644 --- a/scripts/zones/Tavnazian_Safehold/npcs/qm_unforgiven.lua +++ b/scripts/zones/Tavnazian_Safehold/npcs/qm_unforgiven.lua @@ -4,14 +4,9 @@ -- Involved in Quest: Unforgiven -- !pos 110.714 -40.856 -53.154 26 ----------------------------------- -local ID = zones[xi.zone.TAVNAZIAN_SAFEHOLD] ------------------------------------ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local unforgiven = player:getQuestStatus(xi.questLog.OTHER_AREAS, xi.quest.id.otherAreas.UNFORGIVEN) @@ -19,15 +14,8 @@ entity.onTrigger = function(player, npc) unforgiven == xi.questStatus.QUEST_ACCEPTED and not player:hasKeyItem(xi.ki.ALABASTER_HAIRPIN) then - player:addKeyItem(xi.ki.ALABASTER_HAIRPIN) - player:messageSpecial(ID.text.KEYITEM_OBTAINED, xi.ki.ALABASTER_HAIRPIN) -- ALABASTER HAIRPIN for Unforgiven Quest + npcUtil.giveKeyItem(player, xi.ki.ALABASTER_HAIRPIN) -- ALABASTER HAIRPIN for Unforgiven Quest end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity