From 056e78b80ee6094a4cc30386c693b2f9193c0c76 Mon Sep 17 00:00:00 2001 From: claywar Date: Fri, 17 Jan 2025 12:11:50 -0500 Subject: [PATCH] Remove empty functions, add default actions for zones X~Z --- scripts/zones/Xarcabard/DefaultActions.lua | 16 ++++++------ .../zones/Xarcabard/npcs/Beastmens_Banner.lua | 24 ------------------ .../zones/Xarcabard/npcs/Cavernous_Maw.lua | 6 ----- scripts/zones/Xarcabard/npcs/Field_Manual.lua | 3 --- .../Xarcabard/npcs/Geomantic_Reservoir.lua | 6 ----- scripts/zones/Xarcabard/npcs/Luck_Rune.lua | 25 ------------------- scripts/zones/Xarcabard/npcs/Pelogrant.lua | 3 --- .../zones/Xarcabard/npcs/Perennial_Snow.lua | 6 ----- scripts/zones/Xarcabard/npcs/Telepoint.lua | 3 --- .../zones/Xarcabard/npcs/Trail_Markings.lua | 6 ----- .../zones/Xarcabard/npcs/Treasure_Casket.lua | 3 --- scripts/zones/Xarcabard/npcs/qm1.lua | 6 ----- scripts/zones/Xarcabard/npcs/qm6.lua | 6 ----- scripts/zones/Xarcabard/npcs/qm7.lua | 6 ----- scripts/zones/Xarcabard_[S]/npcs/_3t1.lua | 3 --- .../npcs/Geomantic_Reservoir.lua | 6 ----- .../npcs/Yahse_Wildflower.lua | 9 ------- .../zones/Yhoator_Jungle/DefaultActions.lua | 3 ++- .../Yhoator_Jungle/npcs/Beastmens_Banner.lua | 24 ------------------ .../Yhoator_Jungle/npcs/Field_Manual.lua | 3 --- .../Yhoator_Jungle/npcs/Harvesting_Point.lua | 6 ----- .../Yhoator_Jungle/npcs/Logging_Point.lua | 6 ----- .../Yhoator_Jungle/npcs/Mugha_Dovajaiho.lua | 3 --- .../zones/Yhoator_Jungle/npcs/Paurelde.lua | 3 --- .../zones/Yhoator_Jungle/npcs/Telepoint.lua | 3 --- .../Yhoator_Jungle/npcs/Treasure_Casket.lua | 3 --- scripts/zones/Yhoator_Jungle/npcs/qm1.lua | 6 ----- scripts/zones/Yhoator_Jungle/npcs/qm3.lua | 9 ------- .../Yughott_Grotto/npcs/Geomagnetic_Fount.lua | 9 ------- .../Yughott_Grotto/npcs/Mining_Point.lua | 6 ----- .../Yughott_Grotto/npcs/Treasure_Chest.lua | 6 ----- .../zones/Yuhtunga_Jungle/DefaultActions.lua | 2 ++ .../Yuhtunga_Jungle/npcs/Beastmens_Banner.lua | 24 ------------------ .../Yuhtunga_Jungle/npcs/Blue_Rafflesia.lua | 6 ----- .../Yuhtunga_Jungle/npcs/Field_Manual.lua | 3 --- .../Yuhtunga_Jungle/npcs/Harvesting_Point.lua | 6 ----- .../Yuhtunga_Jungle/npcs/Logging_Point.lua | 6 ----- .../zones/Yuhtunga_Jungle/npcs/LuckRune.lua | 25 ------------------- .../Yuhtunga_Jungle/npcs/Robino-Mobino.lua | 3 --- .../Yuhtunga_Jungle/npcs/Treasure_Casket.lua | 3 --- scripts/zones/Zeruhn_Mines/DefaultActions.lua | 17 ++++++++++--- scripts/zones/Zeruhn_Mines/npcs/Alaric.lua | 21 ---------------- .../zones/Zeruhn_Mines/npcs/Balgamirob.lua | 21 ---------------- scripts/zones/Zeruhn_Mines/npcs/Dodoi.lua | 21 ---------------- scripts/zones/Zeruhn_Mines/npcs/Gavergo.lua | 21 ---------------- scripts/zones/Zeruhn_Mines/npcs/Gildge.lua | 21 ---------------- .../zones/Zeruhn_Mines/npcs/Grounds_Tome.lua | 3 --- scripts/zones/Zeruhn_Mines/npcs/Lasthenes.lua | 9 ------- .../zones/Zeruhn_Mines/npcs/Mining_Point.lua | 6 ----- scripts/zones/Zeruhn_Mines/npcs/Ormr.lua | 21 ---------------- .../zones/Zeruhn_Mines/npcs/Smoke_Breath.lua | 21 ---------------- scripts/zones/Zeruhn_Mines/npcs/Subodh.lua | 21 ---------------- .../Zeruhn_Mines/npcs/Treasure_Casket.lua | 3 --- scripts/zones/Zeruhn_Mines/npcs/Vorzill.lua | 21 ---------------- 54 files changed, 26 insertions(+), 506 deletions(-) delete mode 100644 scripts/zones/Xarcabard/npcs/Beastmens_Banner.lua delete mode 100644 scripts/zones/Xarcabard/npcs/Luck_Rune.lua delete mode 100644 scripts/zones/Yhoator_Jungle/npcs/Beastmens_Banner.lua delete mode 100644 scripts/zones/Yuhtunga_Jungle/npcs/Beastmens_Banner.lua delete mode 100644 scripts/zones/Yuhtunga_Jungle/npcs/LuckRune.lua delete mode 100644 scripts/zones/Zeruhn_Mines/npcs/Alaric.lua delete mode 100644 scripts/zones/Zeruhn_Mines/npcs/Balgamirob.lua delete mode 100644 scripts/zones/Zeruhn_Mines/npcs/Dodoi.lua delete mode 100644 scripts/zones/Zeruhn_Mines/npcs/Gavergo.lua delete mode 100644 scripts/zones/Zeruhn_Mines/npcs/Gildge.lua delete mode 100644 scripts/zones/Zeruhn_Mines/npcs/Ormr.lua delete mode 100644 scripts/zones/Zeruhn_Mines/npcs/Smoke_Breath.lua delete mode 100644 scripts/zones/Zeruhn_Mines/npcs/Subodh.lua delete mode 100644 scripts/zones/Zeruhn_Mines/npcs/Vorzill.lua diff --git a/scripts/zones/Xarcabard/DefaultActions.lua b/scripts/zones/Xarcabard/DefaultActions.lua index f6aaedfbd53..f3e558417d1 100644 --- a/scripts/zones/Xarcabard/DefaultActions.lua +++ b/scripts/zones/Xarcabard/DefaultActions.lua @@ -1,11 +1,13 @@ local ID = zones[xi.zone.XARCABARD] return { - ['Option_One'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, - ['Option_Two'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, - ['Option_Three'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, - ['qm2'] = { messageSpecial = ID.text.ONLY_SHARDS }, - ['qm3'] = { messageSpecial = ID.text.ONLY_SHARDS }, - ['qm4'] = { messageSpecial = ID.text.ONLY_SHARDS }, - ['qm5'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, + ['Beastmens_Banner'] = { messageSpecial = ID.text.BEASTMEN_BANNER }, + ['Luck_Rune'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, + ['Option_One'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, + ['Option_Two'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, + ['Option_Three'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, + ['qm2'] = { messageSpecial = ID.text.ONLY_SHARDS }, + ['qm3'] = { messageSpecial = ID.text.ONLY_SHARDS }, + ['qm4'] = { messageSpecial = ID.text.ONLY_SHARDS }, + ['qm5'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, } diff --git a/scripts/zones/Xarcabard/npcs/Beastmens_Banner.lua b/scripts/zones/Xarcabard/npcs/Beastmens_Banner.lua deleted file mode 100644 index 54607c8dd65..00000000000 --- a/scripts/zones/Xarcabard/npcs/Beastmens_Banner.lua +++ /dev/null @@ -1,24 +0,0 @@ ------------------------------------ --- Area: Xarcabard --- NPC: Beastmen_s_Banner --- !pos 153.000 -36.444 23.500 112 ------------------------------------ -local ID = zones[xi.zone.XARCABARD] ------------------------------------ ----@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/Xarcabard/npcs/Cavernous_Maw.lua b/scripts/zones/Xarcabard/npcs/Cavernous_Maw.lua index 59ffe730f1b..fdf87d1ad0d 100644 --- a/scripts/zones/Xarcabard/npcs/Cavernous_Maw.lua +++ b/scripts/zones/Xarcabard/npcs/Cavernous_Maw.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.XARCABARD] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if xi.settings.main.ENABLE_ABYSSEA == 1 and player:getMainLvl() >= 30 then local hasStone = xi.abyssea.getHeldTraverserStones(player) @@ -29,9 +26,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 58 then player:addQuest(xi.questLog.ABYSSEA, xi.quest.id.abyssea.A_MAN_EATING_MITE) diff --git a/scripts/zones/Xarcabard/npcs/Field_Manual.lua b/scripts/zones/Xarcabard/npcs/Field_Manual.lua index 3cf630f4591..2cb4a6e654e 100644 --- a/scripts/zones/Xarcabard/npcs/Field_Manual.lua +++ b/scripts/zones/Xarcabard/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/Xarcabard/npcs/Geomantic_Reservoir.lua b/scripts/zones/Xarcabard/npcs/Geomantic_Reservoir.lua index a3983e163db..c58bfe8bb42 100644 --- a/scripts/zones/Xarcabard/npcs/Geomantic_Reservoir.lua +++ b/scripts/zones/Xarcabard/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_TORPOR) 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_TORPOR) end diff --git a/scripts/zones/Xarcabard/npcs/Luck_Rune.lua b/scripts/zones/Xarcabard/npcs/Luck_Rune.lua deleted file mode 100644 index 4da0677e40a..00000000000 --- a/scripts/zones/Xarcabard/npcs/Luck_Rune.lua +++ /dev/null @@ -1,25 +0,0 @@ ------------------------------------ --- Area: Xarcabard --- NPC: Luck Rune --- Involved in Quest: Mhaura Fortune --- !pos 576.117 -0.164 -16.935 112 ------------------------------------ -local ID = zones[xi.zone.XARCABARD] ------------------------------------ ----@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/Xarcabard/npcs/Pelogrant.lua b/scripts/zones/Xarcabard/npcs/Pelogrant.lua index 848f23d7a2b..144f5e43f46 100644 --- a/scripts/zones/Xarcabard/npcs/Pelogrant.lua +++ b/scripts/zones/Xarcabard/npcs/Pelogrant.lua @@ -10,9 +10,6 @@ local entity = {} local vendorRegion = xi.region.VALDEAUNIA 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/Xarcabard/npcs/Perennial_Snow.lua b/scripts/zones/Xarcabard/npcs/Perennial_Snow.lua index 2abc181d1ce..e375573f8f5 100644 --- a/scripts/zones/Xarcabard/npcs/Perennial_Snow.lua +++ b/scripts/zones/Xarcabard/npcs/Perennial_Snow.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.XARCABARD] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local circleOfTime = player:getQuestStatus(xi.questLog.JEUNO, xi.quest.id.jeuno.THE_CIRCLE_OF_TIME) @@ -34,9 +31,6 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 3 then player:setCharVar('star_ringburied', os.time() + 60) -- wait 1 minute diff --git a/scripts/zones/Xarcabard/npcs/Telepoint.lua b/scripts/zones/Xarcabard/npcs/Telepoint.lua index 5130959005b..e7e77f761d7 100644 --- a/scripts/zones/Xarcabard/npcs/Telepoint.lua +++ b/scripts/zones/Xarcabard/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 == 1 then npcUtil.giveKeyItem(player, xi.ki.VAHZL_GATE_CRYSTAL) diff --git a/scripts/zones/Xarcabard/npcs/Trail_Markings.lua b/scripts/zones/Xarcabard/npcs/Trail_Markings.lua index 31497052742..19179d60a5b 100644 --- a/scripts/zones/Xarcabard/npcs/Trail_Markings.lua +++ b/scripts/zones/Xarcabard/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/Xarcabard/npcs/Treasure_Casket.lua b/scripts/zones/Xarcabard/npcs/Treasure_Casket.lua index 4f00a0592fd..ee646f19e72 100644 --- a/scripts/zones/Xarcabard/npcs/Treasure_Casket.lua +++ b/scripts/zones/Xarcabard/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/Xarcabard/npcs/qm1.lua b/scripts/zones/Xarcabard/npcs/qm1.lua index 0f0c75e0097..4dcfd31a6aa 100644 --- a/scripts/zones/Xarcabard/npcs/qm1.lua +++ b/scripts/zones/Xarcabard/npcs/qm1.lua @@ -24,10 +24,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/Xarcabard/npcs/qm6.lua b/scripts/zones/Xarcabard/npcs/qm6.lua index d89e5d334c9..1df62560817 100644 --- a/scripts/zones/Xarcabard/npcs/qm6.lua +++ b/scripts/zones/Xarcabard/npcs/qm6.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local unbridledPassionCS = player:getCharVar('unbridledPassion') @@ -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 == 6 then player:setCharVar('unbridledPassion', 6) diff --git a/scripts/zones/Xarcabard/npcs/qm7.lua b/scripts/zones/Xarcabard/npcs/qm7.lua index 4500e5a5acf..426fafc8834 100644 --- a/scripts/zones/Xarcabard/npcs/qm7.lua +++ b/scripts/zones/Xarcabard/npcs/qm7.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.XARCABARD] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getCharVar('unbridledPassion') == 4 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 == 8 then SpawnMob(ID.mob.KOENIGSTIGER):updateClaim(player) diff --git a/scripts/zones/Xarcabard_[S]/npcs/_3t1.lua b/scripts/zones/Xarcabard_[S]/npcs/_3t1.lua index 207a5c72ea4..2c974948f16 100644 --- a/scripts/zones/Xarcabard_[S]/npcs/_3t1.lua +++ b/scripts/zones/Xarcabard_[S]/npcs/_3t1.lua @@ -11,9 +11,6 @@ entity.onTrigger = function(player, npc) player:startEvent(29) end -entity.onEventUpdate = function(player, csid, option, npc) -end - entity.onEventFinish = function(player, csid, option, npc) if csid == 29 and diff --git a/scripts/zones/Yahse_Hunting_Grounds/npcs/Geomantic_Reservoir.lua b/scripts/zones/Yahse_Hunting_Grounds/npcs/Geomantic_Reservoir.lua index c4fb3779d3d..4f57f36fc46 100644 --- a/scripts/zones/Yahse_Hunting_Grounds/npcs/Geomantic_Reservoir.lua +++ b/scripts/zones/Yahse_Hunting_Grounds/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_WILT) 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_WILT) end diff --git a/scripts/zones/Yahse_Hunting_Grounds/npcs/Yahse_Wildflower.lua b/scripts/zones/Yahse_Hunting_Grounds/npcs/Yahse_Wildflower.lua index b616044dc13..e4103c583aa 100644 --- a/scripts/zones/Yahse_Hunting_Grounds/npcs/Yahse_Wildflower.lua +++ b/scripts/zones/Yahse_Hunting_Grounds/npcs/Yahse_Wildflower.lua @@ -7,9 +7,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) -- CHILDREN OF THE RUNE if player:getQuestStatus(xi.questLog.ADOULIN, xi.quest.id.adoulin.CHILDREN_OF_THE_RUNE) == xi.questStatus.QUEST_ACCEPTED 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/Yhoator_Jungle/DefaultActions.lua b/scripts/zones/Yhoator_Jungle/DefaultActions.lua index 56b2b273508..4b22244006b 100644 --- a/scripts/zones/Yhoator_Jungle/DefaultActions.lua +++ b/scripts/zones/Yhoator_Jungle/DefaultActions.lua @@ -1,5 +1,6 @@ local ID = zones[xi.zone.YHOATOR_JUNGLE] return { - ['qm2'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, + ['qm2'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, + ['Beastmens_Banner'] = { messageSpecial = ID.text.BEASTMEN_BANNER }, } diff --git a/scripts/zones/Yhoator_Jungle/npcs/Beastmens_Banner.lua b/scripts/zones/Yhoator_Jungle/npcs/Beastmens_Banner.lua deleted file mode 100644 index ba3456f0bb7..00000000000 --- a/scripts/zones/Yhoator_Jungle/npcs/Beastmens_Banner.lua +++ /dev/null @@ -1,24 +0,0 @@ ------------------------------------ --- Area: Yhoator Jungle --- NPC: Beastmen_s_Banner --- !pos 366.014 -0.185 -394.801 124 ------------------------------------ -local ID = zones[xi.zone.YHOATOR_JUNGLE] ------------------------------------ ----@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/Yhoator_Jungle/npcs/Field_Manual.lua b/scripts/zones/Yhoator_Jungle/npcs/Field_Manual.lua index f60256fff7f..2d91c6c3cfa 100644 --- a/scripts/zones/Yhoator_Jungle/npcs/Field_Manual.lua +++ b/scripts/zones/Yhoator_Jungle/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/Yhoator_Jungle/npcs/Harvesting_Point.lua b/scripts/zones/Yhoator_Jungle/npcs/Harvesting_Point.lua index 21931fe54dc..fc8fab3a2e0 100644 --- a/scripts/zones/Yhoator_Jungle/npcs/Harvesting_Point.lua +++ b/scripts/zones/Yhoator_Jungle/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/Yhoator_Jungle/npcs/Logging_Point.lua b/scripts/zones/Yhoator_Jungle/npcs/Logging_Point.lua index b87f0c50267..57c467b0115 100644 --- a/scripts/zones/Yhoator_Jungle/npcs/Logging_Point.lua +++ b/scripts/zones/Yhoator_Jungle/npcs/Logging_Point.lua @@ -13,10 +13,4 @@ entity.onTrigger = function(player, npc) xi.helm.onTrigger(player, xi.helmType.LOGGING) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Yhoator_Jungle/npcs/Mugha_Dovajaiho.lua b/scripts/zones/Yhoator_Jungle/npcs/Mugha_Dovajaiho.lua index 30eff072858..b5e3a5f17fe 100644 --- a/scripts/zones/Yhoator_Jungle/npcs/Mugha_Dovajaiho.lua +++ b/scripts/zones/Yhoator_Jungle/npcs/Mugha_Dovajaiho.lua @@ -10,9 +10,6 @@ local entity = {} local vendorRegion = xi.region.ELSHIMOUPLANDS 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/Yhoator_Jungle/npcs/Paurelde.lua b/scripts/zones/Yhoator_Jungle/npcs/Paurelde.lua index 99f246d295a..5670a4d880b 100644 --- a/scripts/zones/Yhoator_Jungle/npcs/Paurelde.lua +++ b/scripts/zones/Yhoator_Jungle/npcs/Paurelde.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/Yhoator_Jungle/npcs/Telepoint.lua b/scripts/zones/Yhoator_Jungle/npcs/Telepoint.lua index d1cfabd8769..38197e9c45d 100644 --- a/scripts/zones/Yhoator_Jungle/npcs/Telepoint.lua +++ b/scripts/zones/Yhoator_Jungle/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 == 1 then npcUtil.giveKeyItem(player, xi.ki.YHOATOR_GATE_CRYSTAL) diff --git a/scripts/zones/Yhoator_Jungle/npcs/Treasure_Casket.lua b/scripts/zones/Yhoator_Jungle/npcs/Treasure_Casket.lua index 0c404f734dd..5614757c3df 100644 --- a/scripts/zones/Yhoator_Jungle/npcs/Treasure_Casket.lua +++ b/scripts/zones/Yhoator_Jungle/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/Yhoator_Jungle/npcs/qm1.lua b/scripts/zones/Yhoator_Jungle/npcs/qm1.lua index 728ceaa0287..da60385f500 100644 --- a/scripts/zones/Yhoator_Jungle/npcs/qm1.lua +++ b/scripts/zones/Yhoator_Jungle/npcs/qm1.lua @@ -37,10 +37,4 @@ entity.onTrigger = function(player, npc) player:messageSpecial(ID.text.WATER_HOLE) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Yhoator_Jungle/npcs/qm3.lua b/scripts/zones/Yhoator_Jungle/npcs/qm3.lua index 589e106226d..dbd67fee3f3 100644 --- a/scripts/zones/Yhoator_Jungle/npcs/qm3.lua +++ b/scripts/zones/Yhoator_Jungle/npcs/qm3.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.YHOATOR_JUNGLE] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getQuestStatus(xi.questLog.OUTLANDS, xi.quest.id.outlands.TRUE_WILL) == xi.questStatus.QUEST_ACCEPTED and @@ -28,10 +25,4 @@ entity.onTrigger = function(player, npc) end end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Yughott_Grotto/npcs/Geomagnetic_Fount.lua b/scripts/zones/Yughott_Grotto/npcs/Geomagnetic_Fount.lua index dc1539b5672..853553555dc 100644 --- a/scripts/zones/Yughott_Grotto/npcs/Geomagnetic_Fount.lua +++ b/scripts/zones/Yughott_Grotto/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/Yughott_Grotto/npcs/Mining_Point.lua b/scripts/zones/Yughott_Grotto/npcs/Mining_Point.lua index 6d24f7d50b0..63be779f448 100644 --- a/scripts/zones/Yughott_Grotto/npcs/Mining_Point.lua +++ b/scripts/zones/Yughott_Grotto/npcs/Mining_Point.lua @@ -13,10 +13,4 @@ entity.onTrigger = function(player, npc) xi.helm.onTrigger(player, xi.helmType.MINING) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Yughott_Grotto/npcs/Treasure_Chest.lua b/scripts/zones/Yughott_Grotto/npcs/Treasure_Chest.lua index a91ee624312..01c959e651c 100644 --- a/scripts/zones/Yughott_Grotto/npcs/Treasure_Chest.lua +++ b/scripts/zones/Yughott_Grotto/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/Yuhtunga_Jungle/DefaultActions.lua b/scripts/zones/Yuhtunga_Jungle/DefaultActions.lua index ee9a69ef88d..209d8e1a40e 100644 --- a/scripts/zones/Yuhtunga_Jungle/DefaultActions.lua +++ b/scripts/zones/Yuhtunga_Jungle/DefaultActions.lua @@ -2,5 +2,7 @@ local ID = zones[xi.zone.YUHTUNGA_JUNGLE] return { ['qm11'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, + ['Beastmens_Banner'] = { messageSpecial = ID.text.BEASTMEN_BANNER }, ['Cermet_Headstone'] = { messageSpecial = ID.text.CANNOT_REMOVE_FRAG }, + ['LuckRune'] = { messageSpecial = ID.text.NOTHING_OUT_OF_ORDINARY }, } diff --git a/scripts/zones/Yuhtunga_Jungle/npcs/Beastmens_Banner.lua b/scripts/zones/Yuhtunga_Jungle/npcs/Beastmens_Banner.lua deleted file mode 100644 index 38ce648bc02..00000000000 --- a/scripts/zones/Yuhtunga_Jungle/npcs/Beastmens_Banner.lua +++ /dev/null @@ -1,24 +0,0 @@ ------------------------------------ --- Area: Yuhtunga_Jungle --- NPC: Beastmen_s_Banner --- !pos -305.061 16.172 -438.904 123 ------------------------------------ -local ID = zones[xi.zone.YUHTUNGA_JUNGLE] ------------------------------------ ----@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/Yuhtunga_Jungle/npcs/Blue_Rafflesia.lua b/scripts/zones/Yuhtunga_Jungle/npcs/Blue_Rafflesia.lua index ec24f7d11b5..f23e1569f41 100644 --- a/scripts/zones/Yuhtunga_Jungle/npcs/Blue_Rafflesia.lua +++ b/scripts/zones/Yuhtunga_Jungle/npcs/Blue_Rafflesia.lua @@ -9,9 +9,6 @@ local ID = zones[xi.zone.YUHTUNGA_JUNGLE] ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) local evenmoreTravelsStatus = player:getQuestStatus(xi.questLog.OUTLANDS, xi.quest.id.outlands.EVEN_MORE_GULLIBLES_TRAVELS) local questprogress = player:getCharVar('EVEN_MORE_GULLIBLES_PROGRESS') @@ -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) local evenmoreTravelsStatus = player:getQuestStatus(xi.questLog.OUTLANDS, xi.quest.id.outlands.EVEN_MORE_GULLIBLES_TRAVELS) diff --git a/scripts/zones/Yuhtunga_Jungle/npcs/Field_Manual.lua b/scripts/zones/Yuhtunga_Jungle/npcs/Field_Manual.lua index 021c30221f4..c2f2855fd73 100644 --- a/scripts/zones/Yuhtunga_Jungle/npcs/Field_Manual.lua +++ b/scripts/zones/Yuhtunga_Jungle/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/Yuhtunga_Jungle/npcs/Harvesting_Point.lua b/scripts/zones/Yuhtunga_Jungle/npcs/Harvesting_Point.lua index cbbdb55c8c7..3e22459382a 100644 --- a/scripts/zones/Yuhtunga_Jungle/npcs/Harvesting_Point.lua +++ b/scripts/zones/Yuhtunga_Jungle/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/Yuhtunga_Jungle/npcs/Logging_Point.lua b/scripts/zones/Yuhtunga_Jungle/npcs/Logging_Point.lua index 7803bc03ebd..2d4939e7434 100644 --- a/scripts/zones/Yuhtunga_Jungle/npcs/Logging_Point.lua +++ b/scripts/zones/Yuhtunga_Jungle/npcs/Logging_Point.lua @@ -13,10 +13,4 @@ entity.onTrigger = function(player, npc) xi.helm.onTrigger(player, xi.helmType.LOGGING) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Yuhtunga_Jungle/npcs/LuckRune.lua b/scripts/zones/Yuhtunga_Jungle/npcs/LuckRune.lua deleted file mode 100644 index ddab52b81a3..00000000000 --- a/scripts/zones/Yuhtunga_Jungle/npcs/LuckRune.lua +++ /dev/null @@ -1,25 +0,0 @@ ------------------------------------ --- Area: Yuhtunga Jungle --- NPC: Luck Rune --- Involved in Quest: Mhaura Fortune --- !pos -95.486 11.188 418.153 123 ------------------------------------ -local ID = zones[xi.zone.YUHTUNGA_JUNGLE] ------------------------------------ ----@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/Yuhtunga_Jungle/npcs/Robino-Mobino.lua b/scripts/zones/Yuhtunga_Jungle/npcs/Robino-Mobino.lua index e89139b5c6f..123235237d3 100644 --- a/scripts/zones/Yuhtunga_Jungle/npcs/Robino-Mobino.lua +++ b/scripts/zones/Yuhtunga_Jungle/npcs/Robino-Mobino.lua @@ -10,9 +10,6 @@ local entity = {} local vendorRegion = xi.region.ELSHIMOLOWLANDS 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/Yuhtunga_Jungle/npcs/Treasure_Casket.lua b/scripts/zones/Yuhtunga_Jungle/npcs/Treasure_Casket.lua index 9eea15ecc63..325c3903062 100644 --- a/scripts/zones/Yuhtunga_Jungle/npcs/Treasure_Casket.lua +++ b/scripts/zones/Yuhtunga_Jungle/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/Zeruhn_Mines/DefaultActions.lua b/scripts/zones/Zeruhn_Mines/DefaultActions.lua index 57d3d32a5e6..950ef848efa 100644 --- a/scripts/zones/Zeruhn_Mines/DefaultActions.lua +++ b/scripts/zones/Zeruhn_Mines/DefaultActions.lua @@ -1,8 +1,17 @@ -- local ID = zones[xi.zone.ZERUHN_MINES] return { - ['Drake_Fang'] = { event = 108 }, - ['Makarim'] = { event = 104 }, - ['Rasmus'] = { event = 101 }, - ['Zelman'] = { event = 160 }, + ['Alaric'] = { event = 100 }, + ['Balgamirob'] = { event = 106 }, + ['Dodoi'] = { event = 107 }, + ['Drake_Fang'] = { event = 108 }, + ['Gavergo'] = { event = 205 }, + ['Gildge'] = { event = 105 }, + ['Makarim'] = { event = 104 }, + ['Ormr'] = { event = 109 }, + ['Rasmus'] = { event = 101 }, + ['Smoke_Breath'] = { event = 111 }, + ['Subodh'] = { event = 110 }, + ['Vorzill'] = { event = 102 }, + ['Zelman'] = { event = 160 }, } diff --git a/scripts/zones/Zeruhn_Mines/npcs/Alaric.lua b/scripts/zones/Zeruhn_Mines/npcs/Alaric.lua deleted file mode 100644 index 5da998f162a..00000000000 --- a/scripts/zones/Zeruhn_Mines/npcs/Alaric.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Zeruhn Mines --- NPC: Alaric ------------------------------------ ----@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/Zeruhn_Mines/npcs/Balgamirob.lua b/scripts/zones/Zeruhn_Mines/npcs/Balgamirob.lua deleted file mode 100644 index 95b199639b1..00000000000 --- a/scripts/zones/Zeruhn_Mines/npcs/Balgamirob.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Zeruhn Mines --- NPC: Balgamirob ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(106) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Zeruhn_Mines/npcs/Dodoi.lua b/scripts/zones/Zeruhn_Mines/npcs/Dodoi.lua deleted file mode 100644 index 15fdaac20e8..00000000000 --- a/scripts/zones/Zeruhn_Mines/npcs/Dodoi.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Zeruhn Mines --- NPC: Dodoi ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(107) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Zeruhn_Mines/npcs/Gavergo.lua b/scripts/zones/Zeruhn_Mines/npcs/Gavergo.lua deleted file mode 100644 index e3f10fdbd3b..00000000000 --- a/scripts/zones/Zeruhn_Mines/npcs/Gavergo.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Zeruhn Mines --- NPC: Gavergo ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(205) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Zeruhn_Mines/npcs/Gildge.lua b/scripts/zones/Zeruhn_Mines/npcs/Gildge.lua deleted file mode 100644 index b9e6f33a222..00000000000 --- a/scripts/zones/Zeruhn_Mines/npcs/Gildge.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Zeruhn Mines --- NPC: Gildge ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(105) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Zeruhn_Mines/npcs/Grounds_Tome.lua b/scripts/zones/Zeruhn_Mines/npcs/Grounds_Tome.lua index 81c5c30211c..4fc06103e99 100644 --- a/scripts/zones/Zeruhn_Mines/npcs/Grounds_Tome.lua +++ b/scripts/zones/Zeruhn_Mines/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/Zeruhn_Mines/npcs/Lasthenes.lua b/scripts/zones/Zeruhn_Mines/npcs/Lasthenes.lua index caf91e3011c..c2d0f6c6f34 100644 --- a/scripts/zones/Zeruhn_Mines/npcs/Lasthenes.lua +++ b/scripts/zones/Zeruhn_Mines/npcs/Lasthenes.lua @@ -6,9 +6,6 @@ ---@type TNpcEntity local entity = {} -entity.onTrade = function(player, npc, trade) -end - entity.onTrigger = function(player, npc) if player:getXPos() > -79.5 then player:startEvent(180) @@ -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/Zeruhn_Mines/npcs/Mining_Point.lua b/scripts/zones/Zeruhn_Mines/npcs/Mining_Point.lua index cd1e15999f2..8203ef69323 100644 --- a/scripts/zones/Zeruhn_Mines/npcs/Mining_Point.lua +++ b/scripts/zones/Zeruhn_Mines/npcs/Mining_Point.lua @@ -13,10 +13,4 @@ entity.onTrigger = function(player, npc) xi.helm.onTrigger(player, xi.helmType.MINING) end -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - return entity diff --git a/scripts/zones/Zeruhn_Mines/npcs/Ormr.lua b/scripts/zones/Zeruhn_Mines/npcs/Ormr.lua deleted file mode 100644 index adec61fc5c0..00000000000 --- a/scripts/zones/Zeruhn_Mines/npcs/Ormr.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Zeruhn Mines --- NPC: Ormr ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(109) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Zeruhn_Mines/npcs/Smoke_Breath.lua b/scripts/zones/Zeruhn_Mines/npcs/Smoke_Breath.lua deleted file mode 100644 index 1353b361cec..00000000000 --- a/scripts/zones/Zeruhn_Mines/npcs/Smoke_Breath.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Zeruhn Mines --- NPC: Smoke Breath ------------------------------------ ----@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/Zeruhn_Mines/npcs/Subodh.lua b/scripts/zones/Zeruhn_Mines/npcs/Subodh.lua deleted file mode 100644 index 4aa06a73cca..00000000000 --- a/scripts/zones/Zeruhn_Mines/npcs/Subodh.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Zeruhn Mines --- NPC: Subodh ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(110) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity diff --git a/scripts/zones/Zeruhn_Mines/npcs/Treasure_Casket.lua b/scripts/zones/Zeruhn_Mines/npcs/Treasure_Casket.lua index a7e36d99129..a611e8ca63f 100644 --- a/scripts/zones/Zeruhn_Mines/npcs/Treasure_Casket.lua +++ b/scripts/zones/Zeruhn_Mines/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/Zeruhn_Mines/npcs/Vorzill.lua b/scripts/zones/Zeruhn_Mines/npcs/Vorzill.lua deleted file mode 100644 index a79de25241c..00000000000 --- a/scripts/zones/Zeruhn_Mines/npcs/Vorzill.lua +++ /dev/null @@ -1,21 +0,0 @@ ------------------------------------ --- Area: Zeruhn Mines --- NPC: Vorzill ------------------------------------ ----@type TNpcEntity -local entity = {} - -entity.onTrade = function(player, npc, trade) -end - -entity.onTrigger = function(player, npc) - player:startEvent(102) -end - -entity.onEventUpdate = function(player, csid, option, npc) -end - -entity.onEventFinish = function(player, csid, option, npc) -end - -return entity