From c6a372ad8323acf86056fe07ca401762183b451f Mon Sep 17 00:00:00 2001 From: Filip Maj Date: Sun, 20 Feb 2022 23:20:45 -0500 Subject: [PATCH 01/23] Fixed replaced quests not being added to the complete list --- Map Server/Actors/Chara/Player/Player.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Map Server/Actors/Chara/Player/Player.cs b/Map Server/Actors/Chara/Player/Player.cs index 7cee6f45..ce4436cd 100644 --- a/Map Server/Actors/Chara/Player/Player.cs +++ b/Map Server/Actors/Chara/Player/Player.cs @@ -1495,6 +1495,7 @@ namespace Meteor.Map.Actors { SendQuestClientUpdate(i); oldQuestInstance.OnComplete(); + Database.SaveCompletedQuests(playerSession.GetActor()); questStateManager.UpdateQuestCompleted(oldQuestInstance); Quest newQuestInstance = questStateManager.GetActiveQuest(((Quest)Server.GetStaticActors(questName)).GetQuestId()); questScenario[i] = newQuestInstance; From 5c495637909cecc76fe4262ab4db328b171e4746 Mon Sep 17 00:00:00 2001 From: Filip Maj Date: Sun, 20 Feb 2022 23:23:28 -0500 Subject: [PATCH 02/23] Removed useless uniques after DftSea and DftWil got replaced --- .../sea0Town01/PopulaceStandard/aergwynt.lua | 7 ------- .../sea0Town01/PopulaceStandard/baderon.lua | 7 ------- .../sea0Town01/PopulaceStandard/chantine.lua | 7 ------- .../sea0Town01/PopulaceStandard/estrilda.lua | 7 ------- .../sea0Town01/PopulaceStandard/frithuric.lua | 7 ------- .../sea0Town01/PopulaceStandard/fzhumii.lua | 7 ------- .../sea0Town01/PopulaceStandard/gigirya.lua | 7 ------- .../sea0Town01/PopulaceStandard/gnibnpha.lua | 7 ------- .../sea0Town01/PopulaceStandard/gregory.lua | 7 ------- .../sea0Town01/PopulaceStandard/isleen.lua | 7 ------- .../sea0Town01/PopulaceStandard/josias.lua | 7 ------- .../sea0Town01/PopulaceStandard/kakamehi.lua | 7 ------- .../sea0Town01/PopulaceStandard/kokoto.lua | 7 ------- .../sea0Town01/PopulaceStandard/laniaitte.lua | 7 ------- .../sea0Town01/PopulaceStandard/lauda.lua | 7 ------- .../sea0Town01/PopulaceStandard/maunie.lua | 7 ------- .../sea0Town01/PopulaceStandard/merewina.lua | 7 ------- .../sea0Town01/PopulaceStandard/mytesyn.lua | 19 ------------------- .../sea0Town01/PopulaceStandard/nanaka.lua | 7 ------- .../PopulaceStandard/stephannot.lua | 7 ------- .../PopulaceStandard/sweetnix_rosycheeks.lua | 7 ------- .../sea0Town01/PopulaceStandard/tirauland.lua | 7 ------- .../sea0Town01/PopulaceStandard/zanthael.lua | 7 ------- .../sea0Town01/PopulaceStandard/zehrymm.lua | 7 ------- .../sea0Town01a/PopulaceStandard/aentfoet.lua | 7 ------- .../sea0Town01a/PopulaceStandard/aergwynt.lua | 7 ------- .../sea0Town01a/PopulaceStandard/ahldskyf.lua | 7 ------- .../PopulaceStandard/angry_river.lua | 7 ------- .../sea0Town01a/PopulaceStandard/ansgor.lua | 7 ------- .../sea0Town01a/PopulaceStandard/arnegis.lua | 7 ------- .../PopulaceStandard/arthurioux.lua | 7 ------- .../sea0Town01a/PopulaceStandard/astrid.lua | 7 ------- .../sea0Town01a/PopulaceStandard/audaine.lua | 7 ------- .../PopulaceStandard/bango_zango.lua | 7 ------- .../sea0Town01a/PopulaceStandard/bayard.lua | 7 ------- .../sea0Town01a/PopulaceStandard/bibiraka.lua | 7 ------- .../sea0Town01a/PopulaceStandard/bloemerl.lua | 7 ------- .../sea0Town01a/PopulaceStandard/bmallpa.lua | 7 ------- .../sea0Town01a/PopulaceStandard/bnhapla.lua | 7 ------- .../sea0Town01a/PopulaceStandard/bodenolf.lua | 7 ------- .../sea0Town01a/PopulaceStandard/brictt.lua | 7 ------- .../sea0Town01a/PopulaceStandard/buburoon.lua | 7 ------- .../PopulaceStandard/carrilaut.lua | 7 ------- .../sea0Town01a/PopulaceStandard/ceadda.lua | 7 ------- .../sea0Town01a/PopulaceStandard/charlys.lua | 7 ------- .../PopulaceStandard/chaunollet.lua | 7 ------- .../PopulaceStandard/chichiroon.lua | 7 ------- .../sea0Town01a/PopulaceStandard/clifton.lua | 7 ------- .../sea0Town01a/PopulaceStandard/colson.lua | 7 ------- .../PopulaceStandard/daca_jinjahl.lua | 7 ------- .../PopulaceStandard/delado_madalado.lua | 7 ------- .../sea0Town01a/PopulaceStandard/dhemsunn.lua | 7 ------- .../sea0Town01a/PopulaceStandard/dodoroba.lua | 7 ------- .../drowsy-eyed_adventurer.lua | 7 ------- .../sea0Town01a/PopulaceStandard/dympna.lua | 7 ------- .../sea0Town01a/PopulaceStandard/elilwaen.lua | 7 ------- .../PopulaceStandard/enraptured_traveler.lua | 7 ------- .../PopulaceStandard/eugennoix.lua | 7 ------- .../sea0Town01a/PopulaceStandard/fabodji.lua | 7 ------- .../PopulaceStandard/ferdillaix.lua | 7 ------- .../PopulaceStandard/fickle_beggar.lua | 7 ------- .../PopulaceStandard/frailoise.lua | 7 ------- .../sea0Town01a/PopulaceStandard/fufuna.lua | 7 ------- .../PopulaceStandard/fuzak_anzak.lua | 7 ------- .../PopulaceStandard/gautzelin.lua | 7 ------- .../sea0Town01a/PopulaceStandard/gert.lua | 7 ------- .../sea0Town01a/PopulaceStandard/gerulf.lua | 7 ------- .../sea0Town01a/PopulaceStandard/ginnade.lua | 7 ------- .../PopulaceStandard/glowing_goodwife.lua | 7 ------- .../sea0Town01a/PopulaceStandard/gnanghal.lua | 7 ------- .../sea0Town01a/PopulaceStandard/gnibnpha.lua | 7 ------- .../sea0Town01a/PopulaceStandard/haldberk.lua | 7 ------- .../sea0Town01a/PopulaceStandard/hasthwab.lua | 7 ------- .../sea0Town01a/PopulaceStandard/hihine.lua | 7 ------- .../sea0Town01a/PopulaceStandard/hlahono.lua | 7 ------- .../sea0Town01a/PopulaceStandard/hob.lua | 7 ------- .../sea0Town01a/PopulaceStandard/hobriaut.lua | 7 ------- .../PopulaceStandard/hrhanbolo.lua | 7 ------- .../PopulaceStandard/ighii_moui.lua | 7 ------- .../sea0Town01a/PopulaceStandard/imania.lua | 7 ------- .../sea0Town01a/PopulaceStandard/iofa.lua | 7 ------- .../PopulaceStandard/isaudorel.lua | 7 ------- .../sea0Town01a/PopulaceStandard/ivan.lua | 7 ------- .../PopulaceStandard/jainelette.lua | 7 ------- .../sea0Town01a/PopulaceStandard/jghonako.lua | 7 ------- .../sea0Town01a/PopulaceStandard/joellaut.lua | 7 ------- .../sea0Town01a/PopulaceStandard/jojoroon.lua | 7 ------- .../PopulaceStandard/kehda_mujuuk.lua | 7 ------- .../sea0Town01a/PopulaceStandard/kikichua.lua | 7 ------- .../PopulaceStandard/laniaitte.lua | 7 ------- .../PopulaceStandard/leveridge.lua | 7 ------- .../PopulaceStandard/liautroix.lua | 7 ------- .../sea0Town01a/PopulaceStandard/lilina.lua | 7 ------- .../sea0Town01a/PopulaceStandard/lorhzant.lua | 7 ------- .../PopulaceStandard/maetistym.lua | 7 ------- .../sea0Town01a/PopulaceStandard/maisie.lua | 7 ------- .../PopulaceStandard/mareillie.lua | 7 ------- .../PopulaceStandard/martiallais.lua | 7 ------- .../sea0Town01a/PopulaceStandard/merlzirn.lua | 7 ------- .../sea0Town01a/PopulaceStandard/mharelak.lua | 7 ------- .../sea0Town01a/PopulaceStandard/mimiroon.lua | 7 ------- .../muscle-bound_deckhand.lua | 7 ------- .../sea0Town01a/PopulaceStandard/mynadaeg.lua | 7 ------- .../sea0Town01a/PopulaceStandard/mzimzizi.lua | 7 ------- .../sea0Town01a/PopulaceStandard/nanapiri.lua | 7 ------- .../sea0Town01a/PopulaceStandard/neale.lua | 7 ------- .../PopulaceStandard/nheu_jawantal.lua | 7 ------- .../sea0Town01a/PopulaceStandard/ninianne.lua | 7 ------- .../sea0Town01a/PopulaceStandard/nnmulika.lua | 7 ------- .../sea0Town01a/PopulaceStandard/nunuba.lua | 7 ------- .../sea0Town01a/PopulaceStandard/ortolf.lua | 7 ------- .../sea0Town01a/PopulaceStandard/ositha.lua | 7 ------- .../PopulaceStandard/overweening_woman.lua | 7 ------- .../pasty-faced_adventurer.lua | 7 ------- .../pearly-toothed_porter.lua | 7 ------- .../PopulaceStandard/pfynhaemr.lua | 8 -------- .../PopulaceStandard/pissed_pirate.lua | 7 ------- .../positively_pungent_pirate.lua | 7 ------- .../PopulaceStandard/prudentia.lua | 7 ------- .../sea0Town01a/PopulaceStandard/ptahjha.lua | 7 ------- .../sea0Town01a/PopulaceStandard/pulmia.lua | 7 ------- .../sea0Town01a/PopulaceStandard/raragun.lua | 7 ------- .../sea0Town01a/PopulaceStandard/rbaharra.lua | 7 ------- .../sea0Town01a/PopulaceStandard/rerenasu.lua | 7 ------- .../PopulaceStandard/robairlain.lua | 7 ------- .../PopulaceStandard/roosting_crow.lua | 7 ------- .../sea0Town01a/PopulaceStandard/rsushmo.lua | 7 ------- .../PopulaceStandard/rubh_epocan.lua | 7 ------- .../sea0Town01a/PopulaceStandard/rubh_hob.lua | 7 ------- .../sea0Town01a/PopulaceStandard/sathzant.lua | 7 ------- .../PopulaceStandard/satiated_shopkeep.lua | 7 ------- .../sea0Town01a/PopulaceStandard/shoshoma.lua | 7 ------- .../PopulaceStandard/skarnwaen.lua | 7 ------- .../PopulaceStandard/skoefmynd.lua | 7 ------- .../sea0Town01a/PopulaceStandard/slaiboli.lua | 7 ------- .../sea0Town01a/PopulaceStandard/sosoze.lua | 7 ------- .../PopulaceStandard/sundhimal.lua | 7 ------- .../sure-voiced_barracuda_knight.lua | 7 ------- .../suspicious-looking_traveler.lua | 7 ------- .../sea0Town01a/PopulaceStandard/syhrdaeg.lua | 7 ------- .../sea0Town01a/PopulaceStandard/syngsmyd.lua | 7 ------- .../sea0Town01a/PopulaceStandard/syntberk.lua | 7 ------- .../sea0Town01a/PopulaceStandard/tatasako.lua | 7 ------- .../PopulaceStandard/tefh_moshroca.lua | 8 -------- .../PopulaceStandard/thata_khamazom.lua | 7 ------- .../PopulaceStandard/thosinbaen.lua | 7 ------- .../PopulaceStandard/tittering_traveler.lua | 7 ------- .../sea0Town01a/PopulaceStandard/totoruto.lua | 7 ------- .../sea0Town01a/PopulaceStandard/triaine.lua | 7 ------- .../sea0Town01a/PopulaceStandard/trinne.lua | 7 ------- .../unconscious_adventurer.lua | 7 ------- .../sea0Town01a/PopulaceStandard/undsatz.lua | 7 ------- .../sea0Town01a/PopulaceStandard/vhynho.lua | 7 ------- .../sea0Town01a/PopulaceStandard/waekbyrt.lua | 7 ------- .../sea0Town01a/PopulaceStandard/whahtoa.lua | 7 ------- .../PopulaceStandard/wyra_khamazom.lua | 7 ------- .../PopulaceStandard/wyrstmann.lua | 8 -------- .../sea0Town01a/PopulaceStandard/xavalien.lua | 7 ------- .../sea0Town01a/PopulaceStandard/zonggo.lua | 7 ------- .../sea0Town01a/PopulaceStandard/zuzule.lua | 7 ------- .../wil0Town01/PopulaceStandard/aistan.lua | 7 ------- .../wil0Town01/PopulaceStandard/baterich.lua | 7 ------- .../wil0Town01/PopulaceStandard/berndan.lua | 7 ------- .../wil0Town01/PopulaceStandard/bertram.lua | 7 ------- .../wil0Town01/PopulaceStandard/claroise.lua | 7 ------- .../wil0Town01/PopulaceStandard/drew.lua | 7 ------- .../PopulaceStandard/dural_tharal.lua | 7 ------- .../flame_lieutenant_somber_meadow.lua | 7 ------- .../flame_private_sisimuza_tetemuza.lua | 7 ------- .../flame_sergeant_mimio_mio.lua | 8 -------- .../wil0Town01/PopulaceStandard/gagaruna.lua | 7 ------- .../wil0Town01/PopulaceStandard/gairbert.lua | 7 ------- .../wil0Town01/PopulaceStandard/gegeissa.lua | 7 ------- .../PopulaceStandard/guillaunaux.lua | 7 ------- .../wil0Town01/PopulaceStandard/gunnulf.lua | 7 ------- .../wil0Town01/PopulaceStandard/halstein.lua | 7 ------- .../wil0Town01/PopulaceStandard/hehena.lua | 7 ------- .../wil0Town01/PopulaceStandard/heibert.lua | 8 -------- .../wil0Town01/PopulaceStandard/hildie.lua | 7 ------- .../wil0Town01/PopulaceStandard/ipaghlo.lua | 7 ------- .../wil0Town01/PopulaceStandard/judithe.lua | 8 -------- .../wil0Town01/PopulaceStandard/kiora.lua | 7 ------- .../wil0Town01/PopulaceStandard/kokobi.lua | 7 ------- .../wil0Town01/PopulaceStandard/kukumuko.lua | 8 -------- .../wil0Town01/PopulaceStandard/lettice.lua | 7 ------- .../wil0Town01/PopulaceStandard/lulumo.lua | 7 ------- .../wil0Town01/PopulaceStandard/mammet.lua | 7 ------- .../wil0Town01/PopulaceStandard/melisie.lua | 7 ------- .../wil0Town01/PopulaceStandard/mimishu.lua | 7 ------- .../wil0Town01/PopulaceStandard/minerva.lua | 7 ------- .../wil0Town01/PopulaceStandard/momodi.lua | 7 ------- .../PopulaceStandard/naida_zamaida.lua | 7 ------- .../PopulaceStandard/nokksu_shanksu.lua | 7 ------- .../wil0Town01/PopulaceStandard/ococo.lua | 7 ------- .../wil0Town01/PopulaceStandard/opondhao.lua | 7 ------- .../PopulaceStandard/otopa_pottopa.lua | 7 ------- .../wil0Town01/PopulaceStandard/popori.lua | 7 ------- .../wil0Town01/PopulaceStandard/qaruru.lua | 7 ------- .../PopulaceStandard/qata_nelhah.lua | 7 ------- .../wil0Town01/PopulaceStandard/roarich.lua | 7 ------- .../wil0Town01/PopulaceStandard/robyn.lua | 7 ------- .../wil0Town01/PopulaceStandard/rorojaru.lua | 7 ------- .../wil0Town01/PopulaceStandard/rururaji.lua | 8 -------- .../PopulaceStandard/shamani_lohmani.lua | 7 ------- .../wil0Town01/PopulaceStandard/sibold.lua | 7 ------- .../wil0Town01/PopulaceStandard/styrmoeya.lua | 7 ------- .../wil0Town01/PopulaceStandard/thimm.lua | 7 ------- .../wil0Town01/PopulaceStandard/titinin.lua | 8 -------- .../wil0Town01/PopulaceStandard/tyon.lua | 7 ------- .../wil0Town01/PopulaceStandard/wenefreda.lua | 7 ------- .../wil0Town01/PopulaceStandard/wracwulf.lua | 7 ------- .../wil0Town01/PopulaceStandard/yayatoki.lua | 7 ------- .../PopulaceStandard/yhah_amariyo.lua | 7 ------- .../wil0Town01/PopulaceStandard/yuyuhase.lua | 7 ------- .../PopulaceStandard/zoengterbin.lua | 7 ------- 215 files changed, 1526 deletions(-) delete mode 100644 Data/scripts/unique/sea0Town01/PopulaceStandard/aergwynt.lua delete mode 100644 Data/scripts/unique/sea0Town01/PopulaceStandard/baderon.lua delete mode 100644 Data/scripts/unique/sea0Town01/PopulaceStandard/chantine.lua delete mode 100644 Data/scripts/unique/sea0Town01/PopulaceStandard/estrilda.lua delete mode 100644 Data/scripts/unique/sea0Town01/PopulaceStandard/frithuric.lua delete mode 100644 Data/scripts/unique/sea0Town01/PopulaceStandard/fzhumii.lua delete mode 100644 Data/scripts/unique/sea0Town01/PopulaceStandard/gigirya.lua delete mode 100644 Data/scripts/unique/sea0Town01/PopulaceStandard/gnibnpha.lua delete mode 100644 Data/scripts/unique/sea0Town01/PopulaceStandard/gregory.lua delete mode 100644 Data/scripts/unique/sea0Town01/PopulaceStandard/isleen.lua delete mode 100644 Data/scripts/unique/sea0Town01/PopulaceStandard/josias.lua delete mode 100644 Data/scripts/unique/sea0Town01/PopulaceStandard/kakamehi.lua delete mode 100644 Data/scripts/unique/sea0Town01/PopulaceStandard/kokoto.lua delete mode 100644 Data/scripts/unique/sea0Town01/PopulaceStandard/laniaitte.lua delete mode 100644 Data/scripts/unique/sea0Town01/PopulaceStandard/lauda.lua delete mode 100644 Data/scripts/unique/sea0Town01/PopulaceStandard/maunie.lua delete mode 100644 Data/scripts/unique/sea0Town01/PopulaceStandard/merewina.lua delete mode 100644 Data/scripts/unique/sea0Town01/PopulaceStandard/mytesyn.lua delete mode 100644 Data/scripts/unique/sea0Town01/PopulaceStandard/nanaka.lua delete mode 100644 Data/scripts/unique/sea0Town01/PopulaceStandard/stephannot.lua delete mode 100644 Data/scripts/unique/sea0Town01/PopulaceStandard/sweetnix_rosycheeks.lua delete mode 100644 Data/scripts/unique/sea0Town01/PopulaceStandard/tirauland.lua delete mode 100644 Data/scripts/unique/sea0Town01/PopulaceStandard/zanthael.lua delete mode 100644 Data/scripts/unique/sea0Town01/PopulaceStandard/zehrymm.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/aentfoet.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/aergwynt.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/ahldskyf.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/angry_river.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/ansgor.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/arnegis.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/arthurioux.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/astrid.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/audaine.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/bango_zango.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/bayard.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/bibiraka.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/bloemerl.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/bmallpa.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/bnhapla.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/bodenolf.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/brictt.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/buburoon.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/carrilaut.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/ceadda.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/charlys.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/chaunollet.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/chichiroon.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/clifton.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/colson.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/daca_jinjahl.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/delado_madalado.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/dhemsunn.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/dodoroba.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/drowsy-eyed_adventurer.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/dympna.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/elilwaen.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/enraptured_traveler.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/eugennoix.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/fabodji.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/ferdillaix.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/fickle_beggar.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/frailoise.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/fufuna.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/fuzak_anzak.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/gautzelin.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/gert.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/gerulf.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/ginnade.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/glowing_goodwife.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/gnanghal.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/gnibnpha.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/haldberk.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/hasthwab.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/hihine.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/hlahono.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/hob.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/hobriaut.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/hrhanbolo.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/ighii_moui.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/imania.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/iofa.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/isaudorel.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/ivan.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/jainelette.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/jghonako.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/joellaut.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/jojoroon.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/kehda_mujuuk.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/kikichua.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/laniaitte.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/leveridge.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/liautroix.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/lilina.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/lorhzant.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/maetistym.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/maisie.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/mareillie.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/martiallais.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/merlzirn.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/mharelak.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/mimiroon.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/muscle-bound_deckhand.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/mynadaeg.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/mzimzizi.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/nanapiri.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/neale.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/nheu_jawantal.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/ninianne.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/nnmulika.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/nunuba.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/ortolf.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/ositha.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/overweening_woman.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/pasty-faced_adventurer.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/pearly-toothed_porter.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/pfynhaemr.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/pissed_pirate.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/positively_pungent_pirate.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/prudentia.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/ptahjha.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/pulmia.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/raragun.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/rbaharra.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/rerenasu.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/robairlain.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/roosting_crow.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/rsushmo.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/rubh_epocan.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/rubh_hob.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/sathzant.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/satiated_shopkeep.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/shoshoma.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/skarnwaen.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/skoefmynd.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/slaiboli.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/sosoze.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/sundhimal.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/sure-voiced_barracuda_knight.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/suspicious-looking_traveler.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/syhrdaeg.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/syngsmyd.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/syntberk.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/tatasako.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/tefh_moshroca.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/thata_khamazom.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/thosinbaen.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/tittering_traveler.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/totoruto.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/triaine.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/trinne.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/unconscious_adventurer.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/undsatz.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/vhynho.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/waekbyrt.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/whahtoa.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/wyra_khamazom.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/wyrstmann.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/xavalien.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/zonggo.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceStandard/zuzule.lua delete mode 100644 Data/scripts/unique/wil0Town01/PopulaceStandard/aistan.lua delete mode 100644 Data/scripts/unique/wil0Town01/PopulaceStandard/baterich.lua delete mode 100644 Data/scripts/unique/wil0Town01/PopulaceStandard/berndan.lua delete mode 100644 Data/scripts/unique/wil0Town01/PopulaceStandard/bertram.lua delete mode 100644 Data/scripts/unique/wil0Town01/PopulaceStandard/claroise.lua delete mode 100644 Data/scripts/unique/wil0Town01/PopulaceStandard/drew.lua delete mode 100644 Data/scripts/unique/wil0Town01/PopulaceStandard/dural_tharal.lua delete mode 100644 Data/scripts/unique/wil0Town01/PopulaceStandard/flame_lieutenant_somber_meadow.lua delete mode 100644 Data/scripts/unique/wil0Town01/PopulaceStandard/flame_private_sisimuza_tetemuza.lua delete mode 100644 Data/scripts/unique/wil0Town01/PopulaceStandard/flame_sergeant_mimio_mio.lua delete mode 100644 Data/scripts/unique/wil0Town01/PopulaceStandard/gagaruna.lua delete mode 100644 Data/scripts/unique/wil0Town01/PopulaceStandard/gairbert.lua delete mode 100644 Data/scripts/unique/wil0Town01/PopulaceStandard/gegeissa.lua delete mode 100644 Data/scripts/unique/wil0Town01/PopulaceStandard/guillaunaux.lua delete mode 100644 Data/scripts/unique/wil0Town01/PopulaceStandard/gunnulf.lua delete mode 100644 Data/scripts/unique/wil0Town01/PopulaceStandard/halstein.lua delete mode 100644 Data/scripts/unique/wil0Town01/PopulaceStandard/hehena.lua delete mode 100644 Data/scripts/unique/wil0Town01/PopulaceStandard/heibert.lua delete mode 100644 Data/scripts/unique/wil0Town01/PopulaceStandard/hildie.lua delete mode 100644 Data/scripts/unique/wil0Town01/PopulaceStandard/ipaghlo.lua delete mode 100644 Data/scripts/unique/wil0Town01/PopulaceStandard/judithe.lua delete mode 100644 Data/scripts/unique/wil0Town01/PopulaceStandard/kiora.lua delete mode 100644 Data/scripts/unique/wil0Town01/PopulaceStandard/kokobi.lua delete mode 100644 Data/scripts/unique/wil0Town01/PopulaceStandard/kukumuko.lua delete mode 100644 Data/scripts/unique/wil0Town01/PopulaceStandard/lettice.lua delete mode 100644 Data/scripts/unique/wil0Town01/PopulaceStandard/lulumo.lua delete mode 100644 Data/scripts/unique/wil0Town01/PopulaceStandard/mammet.lua delete mode 100644 Data/scripts/unique/wil0Town01/PopulaceStandard/melisie.lua delete mode 100644 Data/scripts/unique/wil0Town01/PopulaceStandard/mimishu.lua delete mode 100644 Data/scripts/unique/wil0Town01/PopulaceStandard/minerva.lua delete mode 100644 Data/scripts/unique/wil0Town01/PopulaceStandard/momodi.lua delete mode 100644 Data/scripts/unique/wil0Town01/PopulaceStandard/naida_zamaida.lua delete mode 100644 Data/scripts/unique/wil0Town01/PopulaceStandard/nokksu_shanksu.lua delete mode 100644 Data/scripts/unique/wil0Town01/PopulaceStandard/ococo.lua delete mode 100644 Data/scripts/unique/wil0Town01/PopulaceStandard/opondhao.lua delete mode 100644 Data/scripts/unique/wil0Town01/PopulaceStandard/otopa_pottopa.lua delete mode 100644 Data/scripts/unique/wil0Town01/PopulaceStandard/popori.lua delete mode 100644 Data/scripts/unique/wil0Town01/PopulaceStandard/qaruru.lua delete mode 100644 Data/scripts/unique/wil0Town01/PopulaceStandard/qata_nelhah.lua delete mode 100644 Data/scripts/unique/wil0Town01/PopulaceStandard/roarich.lua delete mode 100644 Data/scripts/unique/wil0Town01/PopulaceStandard/robyn.lua delete mode 100644 Data/scripts/unique/wil0Town01/PopulaceStandard/rorojaru.lua delete mode 100644 Data/scripts/unique/wil0Town01/PopulaceStandard/rururaji.lua delete mode 100644 Data/scripts/unique/wil0Town01/PopulaceStandard/shamani_lohmani.lua delete mode 100644 Data/scripts/unique/wil0Town01/PopulaceStandard/sibold.lua delete mode 100644 Data/scripts/unique/wil0Town01/PopulaceStandard/styrmoeya.lua delete mode 100644 Data/scripts/unique/wil0Town01/PopulaceStandard/thimm.lua delete mode 100644 Data/scripts/unique/wil0Town01/PopulaceStandard/titinin.lua delete mode 100644 Data/scripts/unique/wil0Town01/PopulaceStandard/tyon.lua delete mode 100644 Data/scripts/unique/wil0Town01/PopulaceStandard/wenefreda.lua delete mode 100644 Data/scripts/unique/wil0Town01/PopulaceStandard/wracwulf.lua delete mode 100644 Data/scripts/unique/wil0Town01/PopulaceStandard/yayatoki.lua delete mode 100644 Data/scripts/unique/wil0Town01/PopulaceStandard/yhah_amariyo.lua delete mode 100644 Data/scripts/unique/wil0Town01/PopulaceStandard/yuyuhase.lua delete mode 100644 Data/scripts/unique/wil0Town01/PopulaceStandard/zoengterbin.lua diff --git a/Data/scripts/unique/sea0Town01/PopulaceStandard/aergwynt.lua b/Data/scripts/unique/sea0Town01/PopulaceStandard/aergwynt.lua deleted file mode 100644 index a3d954ad..00000000 --- a/Data/scripts/unique/sea0Town01/PopulaceStandard/aergwynt.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithAergwynt_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01/PopulaceStandard/baderon.lua b/Data/scripts/unique/sea0Town01/PopulaceStandard/baderon.lua deleted file mode 100644 index e76af814..00000000 --- a/Data/scripts/unique/sea0Town01/PopulaceStandard/baderon.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithBaderon_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01/PopulaceStandard/chantine.lua b/Data/scripts/unique/sea0Town01/PopulaceStandard/chantine.lua deleted file mode 100644 index 6d18097c..00000000 --- a/Data/scripts/unique/sea0Town01/PopulaceStandard/chantine.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithChantine_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01/PopulaceStandard/estrilda.lua b/Data/scripts/unique/sea0Town01/PopulaceStandard/estrilda.lua deleted file mode 100644 index 201b28f9..00000000 --- a/Data/scripts/unique/sea0Town01/PopulaceStandard/estrilda.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithEstrilda_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01/PopulaceStandard/frithuric.lua b/Data/scripts/unique/sea0Town01/PopulaceStandard/frithuric.lua deleted file mode 100644 index c434e2d4..00000000 --- a/Data/scripts/unique/sea0Town01/PopulaceStandard/frithuric.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithFrithuric_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01/PopulaceStandard/fzhumii.lua b/Data/scripts/unique/sea0Town01/PopulaceStandard/fzhumii.lua deleted file mode 100644 index 8e6adcd1..00000000 --- a/Data/scripts/unique/sea0Town01/PopulaceStandard/fzhumii.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithFzhumii_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01/PopulaceStandard/gigirya.lua b/Data/scripts/unique/sea0Town01/PopulaceStandard/gigirya.lua deleted file mode 100644 index bff5c847..00000000 --- a/Data/scripts/unique/sea0Town01/PopulaceStandard/gigirya.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithGigirya_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01/PopulaceStandard/gnibnpha.lua b/Data/scripts/unique/sea0Town01/PopulaceStandard/gnibnpha.lua deleted file mode 100644 index 51a9c126..00000000 --- a/Data/scripts/unique/sea0Town01/PopulaceStandard/gnibnpha.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithGnibnpha_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01/PopulaceStandard/gregory.lua b/Data/scripts/unique/sea0Town01/PopulaceStandard/gregory.lua deleted file mode 100644 index 304c6792..00000000 --- a/Data/scripts/unique/sea0Town01/PopulaceStandard/gregory.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithGregory_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01/PopulaceStandard/isleen.lua b/Data/scripts/unique/sea0Town01/PopulaceStandard/isleen.lua deleted file mode 100644 index da207ca5..00000000 --- a/Data/scripts/unique/sea0Town01/PopulaceStandard/isleen.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithIsleen_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01/PopulaceStandard/josias.lua b/Data/scripts/unique/sea0Town01/PopulaceStandard/josias.lua deleted file mode 100644 index 8b2ddaab..00000000 --- a/Data/scripts/unique/sea0Town01/PopulaceStandard/josias.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithJosias_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01/PopulaceStandard/kakamehi.lua b/Data/scripts/unique/sea0Town01/PopulaceStandard/kakamehi.lua deleted file mode 100644 index 1fd8192f..00000000 --- a/Data/scripts/unique/sea0Town01/PopulaceStandard/kakamehi.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithKakamehi_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01/PopulaceStandard/kokoto.lua b/Data/scripts/unique/sea0Town01/PopulaceStandard/kokoto.lua deleted file mode 100644 index 57842f54..00000000 --- a/Data/scripts/unique/sea0Town01/PopulaceStandard/kokoto.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithKokoto_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01/PopulaceStandard/laniaitte.lua b/Data/scripts/unique/sea0Town01/PopulaceStandard/laniaitte.lua deleted file mode 100644 index 2bc7af95..00000000 --- a/Data/scripts/unique/sea0Town01/PopulaceStandard/laniaitte.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithLaniaitte_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01/PopulaceStandard/lauda.lua b/Data/scripts/unique/sea0Town01/PopulaceStandard/lauda.lua deleted file mode 100644 index 802c9725..00000000 --- a/Data/scripts/unique/sea0Town01/PopulaceStandard/lauda.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithLauda_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01/PopulaceStandard/maunie.lua b/Data/scripts/unique/sea0Town01/PopulaceStandard/maunie.lua deleted file mode 100644 index a8bc7c4b..00000000 --- a/Data/scripts/unique/sea0Town01/PopulaceStandard/maunie.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithMaunie_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01/PopulaceStandard/merewina.lua b/Data/scripts/unique/sea0Town01/PopulaceStandard/merewina.lua deleted file mode 100644 index 5259cbf1..00000000 --- a/Data/scripts/unique/sea0Town01/PopulaceStandard/merewina.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "tribeTalk", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01/PopulaceStandard/mytesyn.lua b/Data/scripts/unique/sea0Town01/PopulaceStandard/mytesyn.lua deleted file mode 100644 index 7c2f594c..00000000 --- a/Data/scripts/unique/sea0Town01/PopulaceStandard/mytesyn.lua +++ /dev/null @@ -1,19 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - choice = callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithInn_Desk", nil, nil, nil); - - if (choice == 1) then - GetWorldManager():DoZoneChange(player, 244, nil, 0, 15, -160.048, 0, -165.737, 0); - elseif (choice == 2) then - if (player:GetHomePointInn() ~= 1) then - player:SetHomePointInn(1); - player:SendGameMessage(GetWorldMaster(), 60019, 0x20, 1070); --Secondary homepoint set to the Mizzenmast - else - player:SendGameMessage(GetWorldMaster(), 51140, 0x20); --This inn is already your Secondary Homepoint - end - end - - player:EndEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01/PopulaceStandard/nanaka.lua b/Data/scripts/unique/sea0Town01/PopulaceStandard/nanaka.lua deleted file mode 100644 index f9727a03..00000000 --- a/Data/scripts/unique/sea0Town01/PopulaceStandard/nanaka.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithNanaka_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01/PopulaceStandard/stephannot.lua b/Data/scripts/unique/sea0Town01/PopulaceStandard/stephannot.lua deleted file mode 100644 index 52a62b12..00000000 --- a/Data/scripts/unique/sea0Town01/PopulaceStandard/stephannot.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithStephannot_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01/PopulaceStandard/sweetnix_rosycheeks.lua b/Data/scripts/unique/sea0Town01/PopulaceStandard/sweetnix_rosycheeks.lua deleted file mode 100644 index e1af982c..00000000 --- a/Data/scripts/unique/sea0Town01/PopulaceStandard/sweetnix_rosycheeks.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithSweetnix_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01/PopulaceStandard/tirauland.lua b/Data/scripts/unique/sea0Town01/PopulaceStandard/tirauland.lua deleted file mode 100644 index 562a3b02..00000000 --- a/Data/scripts/unique/sea0Town01/PopulaceStandard/tirauland.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithTirauland_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01/PopulaceStandard/zanthael.lua b/Data/scripts/unique/sea0Town01/PopulaceStandard/zanthael.lua deleted file mode 100644 index 060127c1..00000000 --- a/Data/scripts/unique/sea0Town01/PopulaceStandard/zanthael.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithZanthael_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01/PopulaceStandard/zehrymm.lua b/Data/scripts/unique/sea0Town01/PopulaceStandard/zehrymm.lua deleted file mode 100644 index 0af2eb18..00000000 --- a/Data/scripts/unique/sea0Town01/PopulaceStandard/zehrymm.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithZehrymm_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/aentfoet.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/aentfoet.lua deleted file mode 100644 index 2fad9898..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/aentfoet.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithAentfoet_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/aergwynt.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/aergwynt.lua deleted file mode 100644 index 06001a51..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/aergwynt.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithAergwynt_001", nil, nil, nil"); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/ahldskyf.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/ahldskyf.lua deleted file mode 100644 index 1a090f6e..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/ahldskyf.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithAhldskyff_001"); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/angry_river.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/angry_river.lua deleted file mode 100644 index fa9855e9..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/angry_river.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithAngryriver_001"); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/ansgor.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/ansgor.lua deleted file mode 100644 index 70234f8f..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/ansgor.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithANSGOR_100"); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/arnegis.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/arnegis.lua deleted file mode 100644 index b285d09f..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/arnegis.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithArnegis_001"); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/arthurioux.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/arthurioux.lua deleted file mode 100644 index 0fd68229..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/arthurioux.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithArthurioux_001"); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/astrid.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/astrid.lua deleted file mode 100644 index e67496ad..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/astrid.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithAstrid_001"); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/audaine.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/audaine.lua deleted file mode 100644 index b7a57044..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/audaine.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithAudaine_001"); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/bango_zango.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/bango_zango.lua deleted file mode 100644 index 78558052..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/bango_zango.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithKakalan_001"); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/bayard.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/bayard.lua deleted file mode 100644 index ea5930a3..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/bayard.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithBayard_001"); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/bibiraka.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/bibiraka.lua deleted file mode 100644 index c9c044c3..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/bibiraka.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithBibiraka_001", nil, nil, nil); - player:endEvent(); -end diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/bloemerl.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/bloemerl.lua deleted file mode 100644 index 3a2b223a..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/bloemerl.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithBloemerl_001"); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/bmallpa.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/bmallpa.lua deleted file mode 100644 index b6479d94..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/bmallpa.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithBmallpa_001"); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/bnhapla.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/bnhapla.lua deleted file mode 100644 index a653e092..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/bnhapla.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithBnhapla_001"); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/bodenolf.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/bodenolf.lua deleted file mode 100644 index 9dd8bbff..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/bodenolf.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithBodenolf_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/brictt.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/brictt.lua deleted file mode 100644 index 5bf6eb23..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/brictt.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithBrictt_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/buburoon.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/buburoon.lua deleted file mode 100644 index 302b2d5e..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/buburoon.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithBuburoon_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/carrilaut.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/carrilaut.lua deleted file mode 100644 index 9c331375..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/carrilaut.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithCarrilaut_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/ceadda.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/ceadda.lua deleted file mode 100644 index 011f51ac..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/ceadda.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithCeadda_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/charlys.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/charlys.lua deleted file mode 100644 index 8f663213..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/charlys.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithCharlys_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/chaunollet.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/chaunollet.lua deleted file mode 100644 index 73f764d3..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/chaunollet.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithChaunollet_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/chichiroon.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/chichiroon.lua deleted file mode 100644 index e6bb6a3e..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/chichiroon.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithChichiroon_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/clifton.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/clifton.lua deleted file mode 100644 index 0bbd7e94..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/clifton.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithClifton_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/colson.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/colson.lua deleted file mode 100644 index 4433e694..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/colson.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithColson_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/daca_jinjahl.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/daca_jinjahl.lua deleted file mode 100644 index 06e6117b..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/daca_jinjahl.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithDacajinjahl_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/delado_madalado.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/delado_madalado.lua deleted file mode 100644 index 961f0623..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/delado_madalado.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithDeladomadalado_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/dhemsunn.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/dhemsunn.lua deleted file mode 100644 index fdd21596..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/dhemsunn.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithDhemsunn_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/dodoroba.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/dodoroba.lua deleted file mode 100644 index d33d1141..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/dodoroba.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithDodoroba_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/drowsy-eyed_adventurer.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/drowsy-eyed_adventurer.lua deleted file mode 100644 index 1d4fa36d..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/drowsy-eyed_adventurer.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithAdventurer031_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/dympna.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/dympna.lua deleted file mode 100644 index ceba178a..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/dympna.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithDympna_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/elilwaen.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/elilwaen.lua deleted file mode 100644 index 029d4cce..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/elilwaen.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithElilwaen_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/enraptured_traveler.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/enraptured_traveler.lua deleted file mode 100644 index f1554088..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/enraptured_traveler.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithTraveler032_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/eugennoix.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/eugennoix.lua deleted file mode 100644 index 54f16c22..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/eugennoix.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithEugennoix_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/fabodji.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/fabodji.lua deleted file mode 100644 index 3a4ad7fc..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/fabodji.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithFabodji_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/ferdillaix.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/ferdillaix.lua deleted file mode 100644 index 6915f27f..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/ferdillaix.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithFerdillaix_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/fickle_beggar.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/fickle_beggar.lua deleted file mode 100644 index 6fc7c517..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/fickle_beggar.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithYouty001_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/frailoise.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/frailoise.lua deleted file mode 100644 index 75f15f9b..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/frailoise.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithFrailoise_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/fufuna.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/fufuna.lua deleted file mode 100644 index ab47e30e..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/fufuna.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithFufuna_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/fuzak_anzak.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/fuzak_anzak.lua deleted file mode 100644 index 563c7231..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/fuzak_anzak.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithFuzakanzak_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/gautzelin.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/gautzelin.lua deleted file mode 100644 index a2e3e561..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/gautzelin.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithGautzelin_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/gert.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/gert.lua deleted file mode 100644 index 5df8e0b1..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/gert.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithGert_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/gerulf.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/gerulf.lua deleted file mode 100644 index 264ae50f..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/gerulf.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithGerulf_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/ginnade.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/ginnade.lua deleted file mode 100644 index 142987a7..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/ginnade.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithGinnade_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/glowing_goodwife.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/glowing_goodwife.lua deleted file mode 100644 index 5553caa1..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/glowing_goodwife.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithLady001_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/gnanghal.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/gnanghal.lua deleted file mode 100644 index 3b8437bc..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/gnanghal.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithGnanghal_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/gnibnpha.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/gnibnpha.lua deleted file mode 100644 index 51a9c126..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/gnibnpha.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithGnibnpha_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/haldberk.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/haldberk.lua deleted file mode 100644 index dad2a3e1..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/haldberk.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithHaldberk_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/hasthwab.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/hasthwab.lua deleted file mode 100644 index 0c65fd85..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/hasthwab.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithHasthwab_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/hihine.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/hihine.lua deleted file mode 100644 index 00233eb5..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/hihine.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithHihine_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/hlahono.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/hlahono.lua deleted file mode 100644 index 3773d694..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/hlahono.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithH_lahono_001", nil, nil, nil); - player:endEvent(); -end diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/hob.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/hob.lua deleted file mode 100644 index 6e5a9b2f..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/hob.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithHob_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/hobriaut.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/hobriaut.lua deleted file mode 100644 index 1316026f..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/hobriaut.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithHobriaut_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/hrhanbolo.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/hrhanbolo.lua deleted file mode 100644 index 4404343d..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/hrhanbolo.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithNnagali_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/ighii_moui.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/ighii_moui.lua deleted file mode 100644 index d57c791f..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/ighii_moui.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithIghiimoui_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/imania.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/imania.lua deleted file mode 100644 index 7b0b9603..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/imania.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithImania_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/iofa.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/iofa.lua deleted file mode 100644 index e91607c1..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/iofa.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithIofa_001", nil, nil, nil); - player:endEvent(); -end diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/isaudorel.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/isaudorel.lua deleted file mode 100644 index a203e164..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/isaudorel.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithIsaudorel_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/ivan.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/ivan.lua deleted file mode 100644 index 6e607080..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/ivan.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithIvan_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/jainelette.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/jainelette.lua deleted file mode 100644 index faeb74b3..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/jainelette.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithJainelette_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/jghonako.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/jghonako.lua deleted file mode 100644 index 9a888eca..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/jghonako.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithJghonako_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/joellaut.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/joellaut.lua deleted file mode 100644 index e3dac822..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/joellaut.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithJoellaut_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/jojoroon.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/jojoroon.lua deleted file mode 100644 index ac4dea12..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/jojoroon.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithJojoroon_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/kehda_mujuuk.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/kehda_mujuuk.lua deleted file mode 100644 index 5cfc63c7..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/kehda_mujuuk.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithKehdamujuuk_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/kikichua.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/kikichua.lua deleted file mode 100644 index a1d4a2d8..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/kikichua.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithKikichua_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/laniaitte.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/laniaitte.lua deleted file mode 100644 index 2bc7af95..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/laniaitte.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithLaniaitte_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/leveridge.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/leveridge.lua deleted file mode 100644 index 6223d68b..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/leveridge.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithDavyd_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/liautroix.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/liautroix.lua deleted file mode 100644 index d95ccb93..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/liautroix.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithLiautroix_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/lilina.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/lilina.lua deleted file mode 100644 index 48a7c958..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/lilina.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithLilina_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/lorhzant.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/lorhzant.lua deleted file mode 100644 index 55094a0b..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/lorhzant.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithLorhzant_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/maetistym.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/maetistym.lua deleted file mode 100644 index d791804d..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/maetistym.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithMaetistym_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/maisie.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/maisie.lua deleted file mode 100644 index bce4e8c3..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/maisie.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithMaisie_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/mareillie.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/mareillie.lua deleted file mode 100644 index ea790f88..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/mareillie.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithMareillie_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/martiallais.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/martiallais.lua deleted file mode 100644 index 4c16d72b..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/martiallais.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithMartiallais_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/merlzirn.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/merlzirn.lua deleted file mode 100644 index 5bdff937..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/merlzirn.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithMerlzirn_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/mharelak.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/mharelak.lua deleted file mode 100644 index 390e071f..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/mharelak.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithMharelak_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/mimiroon.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/mimiroon.lua deleted file mode 100644 index 092e93a0..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/mimiroon.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithMimiroon_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/muscle-bound_deckhand.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/muscle-bound_deckhand.lua deleted file mode 100644 index b20100b1..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/muscle-bound_deckhand.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithSailor031_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/mynadaeg.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/mynadaeg.lua deleted file mode 100644 index bba278f3..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/mynadaeg.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithMynadaeg_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/mzimzizi.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/mzimzizi.lua deleted file mode 100644 index e4ac3231..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/mzimzizi.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithMzimzizi_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/nanapiri.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/nanapiri.lua deleted file mode 100644 index 096b4316..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/nanapiri.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithNanapiri_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/neale.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/neale.lua deleted file mode 100644 index 539e951b..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/neale.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithNeale_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/nheu_jawantal.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/nheu_jawantal.lua deleted file mode 100644 index e10f21e2..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/nheu_jawantal.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithNheujawantal_001", nil, nil, nil); - player:endEvent(); -end diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/ninianne.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/ninianne.lua deleted file mode 100644 index 33cd4146..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/ninianne.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithNinianne_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/nnmulika.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/nnmulika.lua deleted file mode 100644 index ea9df741..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/nnmulika.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithNnmulika_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/nunuba.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/nunuba.lua deleted file mode 100644 index 151db8ce..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/nunuba.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithNunuba_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/ortolf.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/ortolf.lua deleted file mode 100644 index cac534ef..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/ortolf.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithOrtolf_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/ositha.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/ositha.lua deleted file mode 100644 index 5d4e0285..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/ositha.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithOsitha_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/overweening_woman.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/overweening_woman.lua deleted file mode 100644 index 126afa33..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/overweening_woman.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithLady002_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/pasty-faced_adventurer.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/pasty-faced_adventurer.lua deleted file mode 100644 index 81e126b6..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/pasty-faced_adventurer.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithAdventurer030_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/pearly-toothed_porter.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/pearly-toothed_porter.lua deleted file mode 100644 index b0c34235..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/pearly-toothed_porter.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithPorter001_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/pfynhaemr.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/pfynhaemr.lua deleted file mode 100644 index 6bd3107e..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/pfynhaemr.lua +++ /dev/null @@ -1,8 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithPfynhaemr_001", nil, nil, nil); - player:endEvent(); -end - diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/pissed_pirate.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/pissed_pirate.lua deleted file mode 100644 index 8dc396a2..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/pissed_pirate.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithPirate030_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/positively_pungent_pirate.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/positively_pungent_pirate.lua deleted file mode 100644 index dd944c18..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/positively_pungent_pirate.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithPirate031_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/prudentia.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/prudentia.lua deleted file mode 100644 index 11f7ad48..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/prudentia.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithPrudentia_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/ptahjha.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/ptahjha.lua deleted file mode 100644 index 1cc825fc..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/ptahjha.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithP_tahjha_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/pulmia.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/pulmia.lua deleted file mode 100644 index 94ad44fc..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/pulmia.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithPulmia_001", nil, nil, nil); - player:endEvent(); -end diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/raragun.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/raragun.lua deleted file mode 100644 index bc77c7b7..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/raragun.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithRaragun_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/rbaharra.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/rbaharra.lua deleted file mode 100644 index ce69b8f9..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/rbaharra.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithRbaharra_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/rerenasu.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/rerenasu.lua deleted file mode 100644 index 472abefd..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/rerenasu.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithRerenasu_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/robairlain.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/robairlain.lua deleted file mode 100644 index 7d8d05b8..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/robairlain.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithRobairlain_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/roosting_crow.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/roosting_crow.lua deleted file mode 100644 index 0cb6bf06..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/roosting_crow.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithRoostingcrow_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/rsushmo.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/rsushmo.lua deleted file mode 100644 index 661ff4d5..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/rsushmo.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithRsushmo_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/rubh_epocan.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/rubh_epocan.lua deleted file mode 100644 index d5925ab0..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/rubh_epocan.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithRubh_epocan_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/rubh_hob.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/rubh_hob.lua deleted file mode 100644 index 2b97c724..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/rubh_hob.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithRubh_hob_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/sathzant.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/sathzant.lua deleted file mode 100644 index 5eeeda62..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/sathzant.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithSathzant_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/satiated_shopkeep.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/satiated_shopkeep.lua deleted file mode 100644 index 4e6ade94..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/satiated_shopkeep.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithMerchant002_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/shoshoma.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/shoshoma.lua deleted file mode 100644 index f602939c..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/shoshoma.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithShoshoma_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/skarnwaen.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/skarnwaen.lua deleted file mode 100644 index d1b19d1d..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/skarnwaen.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithSkarnwaen_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/skoefmynd.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/skoefmynd.lua deleted file mode 100644 index f0f28acd..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/skoefmynd.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithSkoefmynd_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/slaiboli.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/slaiboli.lua deleted file mode 100644 index f73c2d21..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/slaiboli.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithSlaiboli_001", nil, nil, nil); - player:endEvent(); -end diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/sosoze.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/sosoze.lua deleted file mode 100644 index 453fabc9..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/sosoze.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithSosoze_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/sundhimal.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/sundhimal.lua deleted file mode 100644 index 5f236b2f..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/sundhimal.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithSundhimal_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/sure-voiced_barracuda_knight.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/sure-voiced_barracuda_knight.lua deleted file mode 100644 index a24d5e0f..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/sure-voiced_barracuda_knight.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithKob031_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/suspicious-looking_traveler.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/suspicious-looking_traveler.lua deleted file mode 100644 index de45d24d..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/suspicious-looking_traveler.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithTraveler031_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/syhrdaeg.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/syhrdaeg.lua deleted file mode 100644 index bf119926..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/syhrdaeg.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithSyhrdaeg_001"); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/syngsmyd.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/syngsmyd.lua deleted file mode 100644 index 6a49528e..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/syngsmyd.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithSyngsmyd_001"); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/syntberk.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/syntberk.lua deleted file mode 100644 index 37db1a3b..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/syntberk.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithSyntberk_001", nil, nil, nil); - player:endEvent(); -end diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/tatasako.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/tatasako.lua deleted file mode 100644 index 60953fb2..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/tatasako.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithTatasako_001"); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/tefh_moshroca.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/tefh_moshroca.lua deleted file mode 100644 index 2caa6ac3..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/tefh_moshroca.lua +++ /dev/null @@ -1,8 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithTefhmoshroca_001"); - player:endEvent(); -end - diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/thata_khamazom.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/thata_khamazom.lua deleted file mode 100644 index 51d06971..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/thata_khamazom.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithThatakhamazom_001"); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/thosinbaen.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/thosinbaen.lua deleted file mode 100644 index 6b0116c8..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/thosinbaen.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithThosinbaen_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/tittering_traveler.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/tittering_traveler.lua deleted file mode 100644 index ed528ee1..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/tittering_traveler.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithTraveler030_001"); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/totoruto.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/totoruto.lua deleted file mode 100644 index ebbd41c4..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/totoruto.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithTotoruto_001"); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/triaine.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/triaine.lua deleted file mode 100644 index 22a5a1e4..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/triaine.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithTriaine_001"); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/trinne.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/trinne.lua deleted file mode 100644 index d9fdd41d..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/trinne.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithTrinne_001"); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/unconscious_adventurer.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/unconscious_adventurer.lua deleted file mode 100644 index 0f883a7a..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/unconscious_adventurer.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithAdventurer032_001"); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/undsatz.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/undsatz.lua deleted file mode 100644 index 0124774a..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/undsatz.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithUndsatz_001"); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/vhynho.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/vhynho.lua deleted file mode 100644 index 91af9e21..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/vhynho.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithVhynho_001"); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/waekbyrt.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/waekbyrt.lua deleted file mode 100644 index b5b322f5..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/waekbyrt.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithWaekbyrt_001"); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/whahtoa.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/whahtoa.lua deleted file mode 100644 index f8eae722..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/whahtoa.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithWhahtoa_001"); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/wyra_khamazom.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/wyra_khamazom.lua deleted file mode 100644 index 5b577db2..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/wyra_khamazom.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithWyrakhamazom_001"); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/wyrstmann.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/wyrstmann.lua deleted file mode 100644 index c6f5f5ea..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/wyrstmann.lua +++ /dev/null @@ -1,8 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithWyrstmann_001"); - player:endEvent(); -end - diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/xavalien.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/xavalien.lua deleted file mode 100644 index 20ce7fb0..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/xavalien.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithXavalien_001"); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/zonggo.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/zonggo.lua deleted file mode 100644 index 8d046300..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/zonggo.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithZonggo_001"); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceStandard/zuzule.lua b/Data/scripts/unique/sea0Town01a/PopulaceStandard/zuzule.lua deleted file mode 100644 index 31d599d7..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceStandard/zuzule.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithZuzule_001"); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01/PopulaceStandard/aistan.lua b/Data/scripts/unique/wil0Town01/PopulaceStandard/aistan.lua deleted file mode 100644 index 7fd3ef67..00000000 --- a/Data/scripts/unique/wil0Town01/PopulaceStandard/aistan.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithAistan_001", nil, nil, nil); - player:endEvent(); -end diff --git a/Data/scripts/unique/wil0Town01/PopulaceStandard/baterich.lua b/Data/scripts/unique/wil0Town01/PopulaceStandard/baterich.lua deleted file mode 100644 index 76f59996..00000000 --- a/Data/scripts/unique/wil0Town01/PopulaceStandard/baterich.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithBATERICH_100", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01/PopulaceStandard/berndan.lua b/Data/scripts/unique/wil0Town01/PopulaceStandard/berndan.lua deleted file mode 100644 index f6444fe8..00000000 --- a/Data/scripts/unique/wil0Town01/PopulaceStandard/berndan.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithBerndan_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01/PopulaceStandard/bertram.lua b/Data/scripts/unique/wil0Town01/PopulaceStandard/bertram.lua deleted file mode 100644 index bf2d205a..00000000 --- a/Data/scripts/unique/wil0Town01/PopulaceStandard/bertram.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithBertram_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01/PopulaceStandard/claroise.lua b/Data/scripts/unique/wil0Town01/PopulaceStandard/claroise.lua deleted file mode 100644 index db8784f6..00000000 --- a/Data/scripts/unique/wil0Town01/PopulaceStandard/claroise.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithGuildleveClientU_002", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01/PopulaceStandard/drew.lua b/Data/scripts/unique/wil0Town01/PopulaceStandard/drew.lua deleted file mode 100644 index 411a26ce..00000000 --- a/Data/scripts/unique/wil0Town01/PopulaceStandard/drew.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithDrew_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01/PopulaceStandard/dural_tharal.lua b/Data/scripts/unique/wil0Town01/PopulaceStandard/dural_tharal.lua deleted file mode 100644 index 2e321cb8..00000000 --- a/Data/scripts/unique/wil0Town01/PopulaceStandard/dural_tharal.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithDuraltharal_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01/PopulaceStandard/flame_lieutenant_somber_meadow.lua b/Data/scripts/unique/wil0Town01/PopulaceStandard/flame_lieutenant_somber_meadow.lua deleted file mode 100644 index c8d235d1..00000000 --- a/Data/scripts/unique/wil0Town01/PopulaceStandard/flame_lieutenant_somber_meadow.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithSomber_001", nil, nil, nil); - player:endEvent(); -end diff --git a/Data/scripts/unique/wil0Town01/PopulaceStandard/flame_private_sisimuza_tetemuza.lua b/Data/scripts/unique/wil0Town01/PopulaceStandard/flame_private_sisimuza_tetemuza.lua deleted file mode 100644 index dd06fcaf..00000000 --- a/Data/scripts/unique/wil0Town01/PopulaceStandard/flame_private_sisimuza_tetemuza.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - Spl = GetStaticActor("Spl000"); - callClientFunction(player, "delegateEvent", player, Spl, "processEventSISIMUZA"); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01/PopulaceStandard/flame_sergeant_mimio_mio.lua b/Data/scripts/unique/wil0Town01/PopulaceStandard/flame_sergeant_mimio_mio.lua deleted file mode 100644 index c3ea9ab8..00000000 --- a/Data/scripts/unique/wil0Town01/PopulaceStandard/flame_sergeant_mimio_mio.lua +++ /dev/null @@ -1,8 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - Spl = GetStaticActor("Spl000"); - callClientFunction(player, "delegateEvent", player, Spl, "processEventMIMIO"); - player:endEvent(); -end - diff --git a/Data/scripts/unique/wil0Town01/PopulaceStandard/gagaruna.lua b/Data/scripts/unique/wil0Town01/PopulaceStandard/gagaruna.lua deleted file mode 100644 index 197ffd31..00000000 --- a/Data/scripts/unique/wil0Town01/PopulaceStandard/gagaruna.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithGagaruna_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01/PopulaceStandard/gairbert.lua b/Data/scripts/unique/wil0Town01/PopulaceStandard/gairbert.lua deleted file mode 100644 index 9d4b7032..00000000 --- a/Data/scripts/unique/wil0Town01/PopulaceStandard/gairbert.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithGairbert_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01/PopulaceStandard/gegeissa.lua b/Data/scripts/unique/wil0Town01/PopulaceStandard/gegeissa.lua deleted file mode 100644 index 02e55bcb..00000000 --- a/Data/scripts/unique/wil0Town01/PopulaceStandard/gegeissa.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithGegeissa_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01/PopulaceStandard/guillaunaux.lua b/Data/scripts/unique/wil0Town01/PopulaceStandard/guillaunaux.lua deleted file mode 100644 index 1c9353d5..00000000 --- a/Data/scripts/unique/wil0Town01/PopulaceStandard/guillaunaux.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithGuillaunaux_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01/PopulaceStandard/gunnulf.lua b/Data/scripts/unique/wil0Town01/PopulaceStandard/gunnulf.lua deleted file mode 100644 index d09062b7..00000000 --- a/Data/scripts/unique/wil0Town01/PopulaceStandard/gunnulf.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithMaginfred_001", nil, nil, nil); - player:endEvent(); -end diff --git a/Data/scripts/unique/wil0Town01/PopulaceStandard/halstein.lua b/Data/scripts/unique/wil0Town01/PopulaceStandard/halstein.lua deleted file mode 100644 index 24801914..00000000 --- a/Data/scripts/unique/wil0Town01/PopulaceStandard/halstein.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithHalstein_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01/PopulaceStandard/hehena.lua b/Data/scripts/unique/wil0Town01/PopulaceStandard/hehena.lua deleted file mode 100644 index 0cda50a7..00000000 --- a/Data/scripts/unique/wil0Town01/PopulaceStandard/hehena.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithHehena_001", nil, nil, nil); - player:endEvent(); -end diff --git a/Data/scripts/unique/wil0Town01/PopulaceStandard/heibert.lua b/Data/scripts/unique/wil0Town01/PopulaceStandard/heibert.lua deleted file mode 100644 index 01b3544d..00000000 --- a/Data/scripts/unique/wil0Town01/PopulaceStandard/heibert.lua +++ /dev/null @@ -1,8 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithOrisic_001", nil, nil, nil); - player:endEvent(); -end - diff --git a/Data/scripts/unique/wil0Town01/PopulaceStandard/hildie.lua b/Data/scripts/unique/wil0Town01/PopulaceStandard/hildie.lua deleted file mode 100644 index 3ddb8f4f..00000000 --- a/Data/scripts/unique/wil0Town01/PopulaceStandard/hildie.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithHildie_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01/PopulaceStandard/ipaghlo.lua b/Data/scripts/unique/wil0Town01/PopulaceStandard/ipaghlo.lua deleted file mode 100644 index ba1d7480..00000000 --- a/Data/scripts/unique/wil0Town01/PopulaceStandard/ipaghlo.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithKlamahni_001", nil, nil, nil); - player:endEvent(); -end diff --git a/Data/scripts/unique/wil0Town01/PopulaceStandard/judithe.lua b/Data/scripts/unique/wil0Town01/PopulaceStandard/judithe.lua deleted file mode 100644 index 35476b3b..00000000 --- a/Data/scripts/unique/wil0Town01/PopulaceStandard/judithe.lua +++ /dev/null @@ -1,8 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithJudithe_001", nil, nil, nil); - player:endEvent(); -end - diff --git a/Data/scripts/unique/wil0Town01/PopulaceStandard/kiora.lua b/Data/scripts/unique/wil0Town01/PopulaceStandard/kiora.lua deleted file mode 100644 index 1eb82309..00000000 --- a/Data/scripts/unique/wil0Town01/PopulaceStandard/kiora.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithKiora_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01/PopulaceStandard/kokobi.lua b/Data/scripts/unique/wil0Town01/PopulaceStandard/kokobi.lua deleted file mode 100644 index ffc2d608..00000000 --- a/Data/scripts/unique/wil0Town01/PopulaceStandard/kokobi.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultWil, "downTownTalk", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01/PopulaceStandard/kukumuko.lua b/Data/scripts/unique/wil0Town01/PopulaceStandard/kukumuko.lua deleted file mode 100644 index e0b9e38c..00000000 --- a/Data/scripts/unique/wil0Town01/PopulaceStandard/kukumuko.lua +++ /dev/null @@ -1,8 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithKukumuko_001", nil, nil, nil); - player:endEvent(); -end - diff --git a/Data/scripts/unique/wil0Town01/PopulaceStandard/lettice.lua b/Data/scripts/unique/wil0Town01/PopulaceStandard/lettice.lua deleted file mode 100644 index 61c51ad7..00000000 --- a/Data/scripts/unique/wil0Town01/PopulaceStandard/lettice.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithLettice_001", nil, nil, nil); - player:endEvent(); -end diff --git a/Data/scripts/unique/wil0Town01/PopulaceStandard/lulumo.lua b/Data/scripts/unique/wil0Town01/PopulaceStandard/lulumo.lua deleted file mode 100644 index 10c12311..00000000 --- a/Data/scripts/unique/wil0Town01/PopulaceStandard/lulumo.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithLulumo_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01/PopulaceStandard/mammet.lua b/Data/scripts/unique/wil0Town01/PopulaceStandard/mammet.lua deleted file mode 100644 index bc8983b9..00000000 --- a/Data/scripts/unique/wil0Town01/PopulaceStandard/mammet.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithDoll005_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01/PopulaceStandard/melisie.lua b/Data/scripts/unique/wil0Town01/PopulaceStandard/melisie.lua deleted file mode 100644 index 09f2ddff..00000000 --- a/Data/scripts/unique/wil0Town01/PopulaceStandard/melisie.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithMelisie_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01/PopulaceStandard/mimishu.lua b/Data/scripts/unique/wil0Town01/PopulaceStandard/mimishu.lua deleted file mode 100644 index bb561e86..00000000 --- a/Data/scripts/unique/wil0Town01/PopulaceStandard/mimishu.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithMimishu_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01/PopulaceStandard/minerva.lua b/Data/scripts/unique/wil0Town01/PopulaceStandard/minerva.lua deleted file mode 100644 index 0c4a11a0..00000000 --- a/Data/scripts/unique/wil0Town01/PopulaceStandard/minerva.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithMinerva_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01/PopulaceStandard/momodi.lua b/Data/scripts/unique/wil0Town01/PopulaceStandard/momodi.lua deleted file mode 100644 index 7f3a82fe..00000000 --- a/Data/scripts/unique/wil0Town01/PopulaceStandard/momodi.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithMomodi_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01/PopulaceStandard/naida_zamaida.lua b/Data/scripts/unique/wil0Town01/PopulaceStandard/naida_zamaida.lua deleted file mode 100644 index 6ec4b0a5..00000000 --- a/Data/scripts/unique/wil0Town01/PopulaceStandard/naida_zamaida.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithNaidazamaida_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01/PopulaceStandard/nokksu_shanksu.lua b/Data/scripts/unique/wil0Town01/PopulaceStandard/nokksu_shanksu.lua deleted file mode 100644 index 8f07e3a0..00000000 --- a/Data/scripts/unique/wil0Town01/PopulaceStandard/nokksu_shanksu.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithNokksushanksu_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01/PopulaceStandard/ococo.lua b/Data/scripts/unique/wil0Town01/PopulaceStandard/ococo.lua deleted file mode 100644 index ad0b7b47..00000000 --- a/Data/scripts/unique/wil0Town01/PopulaceStandard/ococo.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithOcoco_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01/PopulaceStandard/opondhao.lua b/Data/scripts/unique/wil0Town01/PopulaceStandard/opondhao.lua deleted file mode 100644 index f6faa1fb..00000000 --- a/Data/scripts/unique/wil0Town01/PopulaceStandard/opondhao.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithOpondhao_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01/PopulaceStandard/otopa_pottopa.lua b/Data/scripts/unique/wil0Town01/PopulaceStandard/otopa_pottopa.lua deleted file mode 100644 index ec7bc5d1..00000000 --- a/Data/scripts/unique/wil0Town01/PopulaceStandard/otopa_pottopa.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithInn_Desk", nil, nil, nil); - player:endEvent(); -end diff --git a/Data/scripts/unique/wil0Town01/PopulaceStandard/popori.lua b/Data/scripts/unique/wil0Town01/PopulaceStandard/popori.lua deleted file mode 100644 index 7977be00..00000000 --- a/Data/scripts/unique/wil0Town01/PopulaceStandard/popori.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithPopori_001", nil, nil, nil); - player:endEvent(); -end diff --git a/Data/scripts/unique/wil0Town01/PopulaceStandard/qaruru.lua b/Data/scripts/unique/wil0Town01/PopulaceStandard/qaruru.lua deleted file mode 100644 index fd8d4ce2..00000000 --- a/Data/scripts/unique/wil0Town01/PopulaceStandard/qaruru.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithQaruru_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01/PopulaceStandard/qata_nelhah.lua b/Data/scripts/unique/wil0Town01/PopulaceStandard/qata_nelhah.lua deleted file mode 100644 index 32dc8a2f..00000000 --- a/Data/scripts/unique/wil0Town01/PopulaceStandard/qata_nelhah.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithQatanelhah_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01/PopulaceStandard/roarich.lua b/Data/scripts/unique/wil0Town01/PopulaceStandard/roarich.lua deleted file mode 100644 index 112d2075..00000000 --- a/Data/scripts/unique/wil0Town01/PopulaceStandard/roarich.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithGuildleveClientU_001", nil, nil, nil); - player:endEvent(); -end diff --git a/Data/scripts/unique/wil0Town01/PopulaceStandard/robyn.lua b/Data/scripts/unique/wil0Town01/PopulaceStandard/robyn.lua deleted file mode 100644 index dfa72e61..00000000 --- a/Data/scripts/unique/wil0Town01/PopulaceStandard/robyn.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithRobyn_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01/PopulaceStandard/rorojaru.lua b/Data/scripts/unique/wil0Town01/PopulaceStandard/rorojaru.lua deleted file mode 100644 index 32832998..00000000 --- a/Data/scripts/unique/wil0Town01/PopulaceStandard/rorojaru.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithRorojaru_001", nil, nil, nil); - player:endEvent(); -end diff --git a/Data/scripts/unique/wil0Town01/PopulaceStandard/rururaji.lua b/Data/scripts/unique/wil0Town01/PopulaceStandard/rururaji.lua deleted file mode 100644 index b411193e..00000000 --- a/Data/scripts/unique/wil0Town01/PopulaceStandard/rururaji.lua +++ /dev/null @@ -1,8 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithRururaji_001", nil, nil, nil); - player:endEvent(); -end - diff --git a/Data/scripts/unique/wil0Town01/PopulaceStandard/shamani_lohmani.lua b/Data/scripts/unique/wil0Town01/PopulaceStandard/shamani_lohmani.lua deleted file mode 100644 index 5242f4ff..00000000 --- a/Data/scripts/unique/wil0Town01/PopulaceStandard/shamani_lohmani.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithShamanilohmani_001", nil, nil, nil); - player:endEvent(); -end diff --git a/Data/scripts/unique/wil0Town01/PopulaceStandard/sibold.lua b/Data/scripts/unique/wil0Town01/PopulaceStandard/sibold.lua deleted file mode 100644 index 5964cf9a..00000000 --- a/Data/scripts/unique/wil0Town01/PopulaceStandard/sibold.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithSIBOLD_001", nil, nil, nil); - player:endEvent(); -end diff --git a/Data/scripts/unique/wil0Town01/PopulaceStandard/styrmoeya.lua b/Data/scripts/unique/wil0Town01/PopulaceStandard/styrmoeya.lua deleted file mode 100644 index cf106041..00000000 --- a/Data/scripts/unique/wil0Town01/PopulaceStandard/styrmoeya.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithStyrmoeya_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01/PopulaceStandard/thimm.lua b/Data/scripts/unique/wil0Town01/PopulaceStandard/thimm.lua deleted file mode 100644 index 144051eb..00000000 --- a/Data/scripts/unique/wil0Town01/PopulaceStandard/thimm.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithThimm_001", nil, nil, nil); - player:endEvent(); -end diff --git a/Data/scripts/unique/wil0Town01/PopulaceStandard/titinin.lua b/Data/scripts/unique/wil0Town01/PopulaceStandard/titinin.lua deleted file mode 100644 index 3cabf71c..00000000 --- a/Data/scripts/unique/wil0Town01/PopulaceStandard/titinin.lua +++ /dev/null @@ -1,8 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithTitinin_001", nil, nil, nil); - player:endEvent(); -end - diff --git a/Data/scripts/unique/wil0Town01/PopulaceStandard/tyon.lua b/Data/scripts/unique/wil0Town01/PopulaceStandard/tyon.lua deleted file mode 100644 index d73fc647..00000000 --- a/Data/scripts/unique/wil0Town01/PopulaceStandard/tyon.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithTyon_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01/PopulaceStandard/wenefreda.lua b/Data/scripts/unique/wil0Town01/PopulaceStandard/wenefreda.lua deleted file mode 100644 index dc1c9486..00000000 --- a/Data/scripts/unique/wil0Town01/PopulaceStandard/wenefreda.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithWenefreda_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01/PopulaceStandard/wracwulf.lua b/Data/scripts/unique/wil0Town01/PopulaceStandard/wracwulf.lua deleted file mode 100644 index 52ef830a..00000000 --- a/Data/scripts/unique/wil0Town01/PopulaceStandard/wracwulf.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithWracwulf_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01/PopulaceStandard/yayatoki.lua b/Data/scripts/unique/wil0Town01/PopulaceStandard/yayatoki.lua deleted file mode 100644 index 0700f47e..00000000 --- a/Data/scripts/unique/wil0Town01/PopulaceStandard/yayatoki.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithYayatoki_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01/PopulaceStandard/yhah_amariyo.lua b/Data/scripts/unique/wil0Town01/PopulaceStandard/yhah_amariyo.lua deleted file mode 100644 index 79aeafc2..00000000 --- a/Data/scripts/unique/wil0Town01/PopulaceStandard/yhah_amariyo.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithYhahamariyo_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01/PopulaceStandard/yuyuhase.lua b/Data/scripts/unique/wil0Town01/PopulaceStandard/yuyuhase.lua deleted file mode 100644 index 2e9abad7..00000000 --- a/Data/scripts/unique/wil0Town01/PopulaceStandard/yuyuhase.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithYuyuhase_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01/PopulaceStandard/zoengterbin.lua b/Data/scripts/unique/wil0Town01/PopulaceStandard/zoengterbin.lua deleted file mode 100644 index d8ad2c6b..00000000 --- a/Data/scripts/unique/wil0Town01/PopulaceStandard/zoengterbin.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithZoengterbin_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file From 90115f7c835e32ae29af51f483de28d1234dc9cf Mon Sep 17 00:00:00 2001 From: Filip Maj Date: Wed, 23 Feb 2022 23:10:11 -0500 Subject: [PATCH 03/23] Added Tug of the Whorl. Fixed up prereqs not working when using debug command. Fixed giveexp command. Added seq constants. --- Data/scripts/commands/gm/giveexp.lua | 4 +- .../directors/Quest/QuestDirectorMan0l101.lua | 37 ++++ Data/scripts/global.lua | 4 + Data/scripts/quests/etc/etc3g0.lua | 2 +- Data/scripts/quests/etc/etc3l0.lua | 181 ++++++++++++++++++ Data/scripts/quests/etc/etc5g0.lua | 13 +- Data/scripts/quests/man/man0l1.lua | 169 +++++++++++++++- Map Server/Actors/Chara/Player/Player.cs | 4 +- Map Server/Actors/Quest/QuestStateManager.cs | 8 + Map Server/Lua/LuaUtils.cs | 4 +- Map Server/WorldManager.cs | 24 +++ 11 files changed, 435 insertions(+), 15 deletions(-) create mode 100644 Data/scripts/directors/Quest/QuestDirectorMan0l101.lua create mode 100644 Data/scripts/quests/etc/etc3l0.lua diff --git a/Data/scripts/commands/gm/giveexp.lua b/Data/scripts/commands/gm/giveexp.lua index 5ac50b62..f8b87c75 100644 --- a/Data/scripts/commands/gm/giveexp.lua +++ b/Data/scripts/commands/gm/giveexp.lua @@ -26,8 +26,8 @@ function onTrigger(player, argc, qty, name, lastName) currency = 1000001; qty = tonumber(qty) or 1; location = INVENTORY_CURRENCY; - - actionList = player:AddExp(qty, player.charaWork.parameterSave.state_mainSkill[0], 0); + print("ASDASDASDASDASD"); + actionList = player:AddExp(qty, player.charaWork.parameterSave.state_mainSkill[1], 0); player:DoBattleAction(0, 0, actionList); else print(sender.."unable to add experience, ensure player name is valid."); diff --git a/Data/scripts/directors/Quest/QuestDirectorMan0l101.lua b/Data/scripts/directors/Quest/QuestDirectorMan0l101.lua new file mode 100644 index 00000000..4a7bb414 --- /dev/null +++ b/Data/scripts/directors/Quest/QuestDirectorMan0l101.lua @@ -0,0 +1,37 @@ +require ("global") +require ("quests/man/man0l1") + +function init() + return "/Director/Quest/QuestDirectorMan0l101"; +end + +function onCreateContentArea(players, director, contentArea, contentGroup) + + sisipu = contentArea:SpawnActor(2290007, "sisipu", -8, 16.35, 6, 0.5); + + mob1 = contentArea:SpawnActor(2205403, "mob1", -3.02+3, 17.35, 14.24, -2.81); + mob2 = contentArea:SpawnActor(2205403, "mob2", -3.02, 17.35, 14.24, -2.81); + mob3 = contentArea:SpawnActor(2205403, "mob3", -3.02-3, 17.35, 14.24, -2.81); + + for _, player in pairs(players) do + contentGroup:AddMember(player); + end; + + contentGroup:AddMember(director); + contentGroup:AddMember(yshtola); + contentGroup:AddMember(stahlmann); + contentGroup:AddMember(mob1); + contentGroup:AddMember(mob2); + contentGroup:AddMember(mob3); + +end + +function onEventStarted(player, director, triggerName) + + local man0l1Quest = player:GetQuest("Man0l1"); + + callClientFunction(player, "delegateEvent", player, man0l1Quest, "processEvent604"); + player:EndEvent(); + + +end diff --git a/Data/scripts/global.lua b/Data/scripts/global.lua index e3eaa18d..6f247e03 100644 --- a/Data/scripts/global.lua +++ b/Data/scripts/global.lua @@ -159,6 +159,10 @@ QFLAG_PLATE = 2; QFLAG_MAP = 3; QFLAG_REWARD = 4; +-- SPECIAL SEQUENCE CONSTANTS +SEQ_ACCEPT = 65535; +SEQ_COMPLETE = 65534; + -- MUSIC MUSIC_IMMEDIATE = 1; MUSIC_CROSSFADE = 2; diff --git a/Data/scripts/quests/etc/etc3g0.lua b/Data/scripts/quests/etc/etc3g0.lua index 50abbeb9..79cc7076 100644 --- a/Data/scripts/quests/etc/etc3g0.lua +++ b/Data/scripts/quests/etc/etc3g0.lua @@ -49,7 +49,7 @@ function onFinish(player, quest) end function onStateChange(player, quest, sequence) - if (sequence == 65535) then + if (sequence == SEQ_ACCEPT) then quest:SetENpc(KINNISON, QFLAG_PLATE); end diff --git a/Data/scripts/quests/etc/etc3l0.lua b/Data/scripts/quests/etc/etc3l0.lua new file mode 100644 index 00000000..7ea9372f --- /dev/null +++ b/Data/scripts/quests/etc/etc3l0.lua @@ -0,0 +1,181 @@ +require ("global") + +--[[ + +Quest Script + +Name: The Tug of the Whorl +Code: Etc3l0 +Id: 110653 +Prereq: Level 5, Any Class + +]] + +-- Sequence Numbers +SEQ_000 = 0; -- Talk to all the citizens. +SEQ_001 = 1; -- Return to Ginnade. + +-- Actor Class Ids +GINNADE = 1000132; +ZONGGO = 1000057; +WHAHTOA = 1000475; +FERDILLAIX = 1000344; +FRAILOISE = 1000065; +ARNEGIS = 1000227; + +-- Quest Markers +MRKR_ZONGGO = 11070001 +MRKR_WHAHTOA = 11070002 +MRKR_FERDILLAIX = 11070003 +MRKR_FRAILOISE = 11070004 +MRKR_ARNEGIS = 11070005 +MRKR_GINNADE = 11070006 + +-- Quest Flags +FLAG_TALKED_ZONGGO = 0; +FLAG_TALKED_WHAHTOA = 1; +FLAG_TALKED_FERDILLAIX = 2; +FLAG_TALKED_FRAILOISE = 3; +FLAG_TALKED_ARNEGIS = 4; + +-- Quest Counters +COUNTER_TALKED = 0; + +function onStart(player, quest) + quest:StartSequence(SEQ_000); +end + +function onFinish(player, quest) +end + +function onStateChange(player, quest, sequence) + if (sequence == SEQ_ACCEPT) then + quest:SetENpc(GINNADE, QFLAG_NORM); + end + + local data = quest:GetData(); + if (sequence == SEQ_000) then + quest:SetENpc(GINNADE); + quest:SetENpc(ZONGGO, (not data:GetFlag(FLAG_TALKED_ZONGGO) and QFLAG_NORM or QFLAG_NONE)); + quest:SetENpc(WHAHTOA, (not data:GetFlag(FLAG_TALKED_WHAHTOA) and QFLAG_NORM or QFLAG_NONE)); + quest:SetENpc(FERDILLAIX, (not data:GetFlag(FLAG_TALKED_FERDILLAIX) and QFLAG_NORM or QFLAG_NONE)); + quest:SetENpc(FRAILOISE, (not data:GetFlag(FLAG_TALKED_FRAILOISE) and QFLAG_NORM or QFLAG_NONE)); + quest:SetENpc(ARNEGIS, (not data:GetFlag(FLAG_TALKED_ARNEGIS) and QFLAG_NORM or QFLAG_NONE)); + elseif (sequence == SEQ_001) then + quest:SetENpc(GINNADE, QFLAG_REWARD); + end +end + +function onTalk(player, quest, npc, eventName) + local npcClassId = npc.GetActorClassId(); + local seq = quest:GetSequence(); + local incCounter = false; + + -- Offer the quest + if (npcClassId == GINNADE and not player:HasQuest(quest)) then + local questAccepted = callClientFunction(player, "delegateEvent", player, quest, "processEventGinnadeStart"); + if (questAccepted == 1) then + player:AcceptQuest(quest); + end + player:EndEvent(); + return; + end + + -- Quest Progress + local data = quest:GetData(); + if (seq == SEQ_000) then + if (npcClassId == GINNADE) then + callClientFunction(player, "delegateEvent", player, quest, "followEvent005"); + elseif (npcClassId == ZONGGO) then + if (not data:GetFlag(FLAG_TALKED_ZONGGO)) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent010"); + data:SetFlag(FLAG_TALKED_ZONGGO); + incCounter = true; + else + callClientFunction(player, "delegateEvent", player, quest, "followEvent010"); + end + elseif (npcClassId == WHAHTOA) then + if (not data:GetFlag(FLAG_TALKED_WHAHTOA)) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent020"); + data:SetFlag(FLAG_TALKED_WHAHTOA); + incCounter = true; + else + callClientFunction(player, "delegateEvent", player, quest, "followEvent020"); + end + elseif (npcClassId == FERDILLAIX) then + if (not data:GetFlag(FLAG_TALKED_FERDILLAIX)) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent030"); + data:SetFlag(FLAG_TALKED_FERDILLAIX); + incCounter = true; + else + callClientFunction(player, "delegateEvent", player, quest, "followEvent030"); + end + elseif (npcClassId == FRAILOISE) then + if (not data:GetFlag(FLAG_TALKED_FRAILOISE)) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent040"); + data:SetFlag(FLAG_TALKED_FRAILOISE); + incCounter = true; + else + callClientFunction(player, "delegateEvent", player, quest, "followEvent040"); + end + elseif (npcClassId == ARNEGIS) then + if (not data:GetFlag(FLAG_TALKED_ARNEGIS)) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent050"); + data:SetFlag(FLAG_TALKED_ARNEGIS); + incCounter = true; + else + callClientFunction(player, "delegateEvent", player, quest, "followEvent050"); + end + end + + -- Increase objective counter & play relevant messages + if (incCounter == true) then + local counterAmount = data:IncCounter(COUNTER_TALKED); + + attentionMessage(player, 51060, 0, counterAmount, 5); -- You have spoken with a Barracuda informant. (... of 5) + + if (seq000_checkCondition(data)) then -- All informants spoken to + attentionMessage(player, 25225, quest.GetQuestId()); -- "The Tug of the Whorl" objectives complete! + quest:UpdateENPCs(); -- Band-aid for a QFLAG_NORM issue + quest:StartSequence(SEQ_001); + end + end + + elseif (seq == SEQ_001) then + --Quest Complete + if (npcClassId == GINNADE) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent060"); + callClientFunction(player, "delegateEvent", player, quest, "sqrwa", 200, 1, 1, 9); + player:CompleteQuest(quest); + end + end + quest:UpdateENPCs(); + player:EndEvent(); +end + +-- Check if all informants are talked to +function seq000_checkCondition(data) + return (data:GetFlag(FLAG_TALKED_ZONGGO) and + data:GetFlag(FLAG_TALKED_WHAHTOA) and + data:GetFlag(FLAG_TALKED_FERDILLAIX) and + data:GetFlag(FLAG_TALKED_FRAILOISE) and + data:GetFlag(FLAG_TALKED_ARNEGIS)); +end + +function getJournalMapMarkerList(player, quest) + local sequence = quest:getSequence(); + local data = quest:GetData(); + local possibleMarkers = {}; + + if (sequence == SEQ_000) then + if (not data:GetFlag(FLAG_TALKED_ZONGGO)) then table.insert(possibleMarkers, MRKR_ZONGGO); end + if (not data:GetFlag(FLAG_TALKED_WHAHTOA)) then table.insert(possibleMarkers, MRKR_WHAHTOA); end + if (not data:GetFlag(FLAG_TALKED_FERDILLAIX)) then table.insert(possibleMarkers, MRKR_FERDILLAIX); end + if (not data:GetFlag(FLAG_TALKED_FRAILOISE)) then table.insert(possibleMarkers, MRKR_FRAILOISE); end + if (not data:GetFlag(FLAG_TALKED_ARNEGIS)) then table.insert(possibleMarkers, MRKR_ARNEGIS); end + elseif (sequence == SEQ_001) then + table.insert(possibleMarkers, MRKR_GINNADE); + end + + return unpack(possibleMarkers) +end \ No newline at end of file diff --git a/Data/scripts/quests/etc/etc5g0.lua b/Data/scripts/quests/etc/etc5g0.lua index 08893374..4d3588a5 100644 --- a/Data/scripts/quests/etc/etc5g0.lua +++ b/Data/scripts/quests/etc/etc5g0.lua @@ -27,10 +27,7 @@ ITEM_WELL_WORN_BAG = 11000224; MRKR_PFARAHR = 11082001; MRKR_VKOROLON = 11082002; - - function onStart(player, quest) - -- processEventVKOROLONStart -- No means of properly accepting quests yet quest:StartSequence(SEQ_000); player:SendGameMessage(GetWorldMaster(), 25246, MESSAGE_TYPE_SYSTEM, ITEM_WELL_WORN_BAG, 1); end @@ -38,9 +35,11 @@ end function onFinish(player, quest) end - - function onStateChange(player, quest, sequence) + if (sequence == SEQ_ACCEPT) then + quest:SetENpc(VKOROLON, QFLAG_PLATE); + end + if (sequence == SEQ_000) then quest:SetENpc(VKOROLON); quest:SetENpc(PFARAHR, QFLAG_PLATE); @@ -54,6 +53,10 @@ function onTalk(player, quest, npc) local sequence = quest:getSequence(); local classId = npc:GetActorClassId(); + if (sequence == SEQ_ACCEPT) then + callClientFunction(player, "delegateEvent", player, quest, "processEventVKOROLONStart"); + end + if (sequence == SEQ_000) then if (classId == VKOROLON) then callClientFunction(player, "delegateEvent", player, quest, "processEvent_000_1"); diff --git a/Data/scripts/quests/man/man0l1.lua b/Data/scripts/quests/man/man0l1.lua index 4c32e5b2..21c43169 100644 --- a/Data/scripts/quests/man/man0l1.lua +++ b/Data/scripts/quests/man/man0l1.lua @@ -26,13 +26,14 @@ SEQ_055 = 55; -- Search lighthouse for corpse SEQ_060 = 60; -- Talk to Sisipu SEQ_065 = 65; -- Return to FSH Guild SEQ_070 = 70; -- Contact Baderon on LS -SEQ_075 = 75; -- Go to the ARM and BSM Guilds. +SEQ_075 = 75; -- Go to the ARM and BSM Guilds. Talk to Bodenolf. SEQ_080 = 80; -- Speak with H'naanza SEQ_085 = 85; -- Speak with Bodenolf SEQ_090 = 90; -- Contact Baderon on LS SEQ_092 = 92; -- Return to Baderon. -- Actor Class Ids +-- Echo in Adv Guild YSHTOLA = 1000001; CRAPULOUS_ADVENTURER = 1000075; DUPLICITOUS_TRADER = 1000076; @@ -46,13 +47,16 @@ COCKAHOOP_COCKSWAIN = 1001643; SENTENIOUS_SELLSWORD = 1001649; SOLICITOUS_SELLSWORD = 1001650; +-- Sequence 003 BEARDEDROCK_AETHERYTE = 1280002; +-- Sequence 007 CHARLYS = 1000138; ISANDOREL = 1000152; MERLZIRN = 1000472; MSK_TRIGGER = 1090001; +-- Echo in Mrd Guild NERVOUS_BARRACUDA = 1000096; INTIMIDATING_BARRACUDA = 1000097; OVEREAGER_BARRACUDA = 1000107; @@ -65,8 +69,24 @@ ADVENTURER2 = 1000870; ADVENTURER3 = 1000871; ECHO_EXIT_TRIGGER = 1090003; +-- FSH Guild +NNMULIKA = 1000153; +SISIPU = 1000155; +ZEPHYR_TRIGGER = 1900001; + +-- Echo in the Bsm Guild +TATTOOED_PIRATE = 1000111; +IOFA = 1000135; +BODENOLF = 1000144; +HNAANZA = 1000145; +MIMIDOA = 1000176; +JOELLAUT = 1000163; +WERNER = 1000247; +HIHINE = 1000267; +TRINNE = 1000268; +ECHO_EXIT_TRIGGER2 = 1090001; + -- Quest Markers -MRKR_HOB = 11000202; -- Quest Data CNTR_SEQ7_CUL = 1; @@ -140,6 +160,32 @@ function onStateChange(player, quest, sequence) if (subseqCUL == 1 and subseqMRD == 4) then player:SetNpcLS(1, 1); end + elseif (sequence == SEQ_035) then + quest:SetENpc(NNMULIKA, QFLAG_PLATE); + elseif (sequence == SEQ_048) then + quest:SetENpc(BADERON); + quest:SetENpc(ZEPHYR_TRIGGER); + elseif (sequence == SEQ_075) then + quest:SetENpc(BODENOLF, QFLAG_PLATE); + elseif (sequence == SEQ_080) then + quest:SetENpc(HNAANZA, QFLAG_PLATE); + quest:SetENpc(TATTOOED_PIRATE); + quest:SetENpc(IOFA); + quest:SetENpc(BODENOLF); + quest:SetENpc(MIMIDOA); + quest:SetENpc(JOELLAUT); + quest:SetENpc(WERNER); + quest:SetENpc(HIHINE); + quest:SetENpc(TRINNE); + elseif (sequence == SEQ_085) then + quest:SetENpc(HNAANZA); + quest:SetENpc(TATTOOED_PIRATE); + quest:SetENpc(WERNER); + quest:SetENpc(HIHINE); + quest:SetENpc(TRINNE); + quest:SetENpc(ECHO_EXIT_TRIGGER2, QFLAG_MAP, false, true); + elseif (sequence == SEQ_092) then + quest:SetENpc(BADERON, QFLAG_REWARD); end end @@ -158,17 +204,68 @@ function onTalk(player, quest, npc) elseif (sequence == SEQ_005) then if (classId == BADERON) then callClientFunction(player, "delegateEvent", player, quest, "processEvent026"); - quest:StartSequence(SEQ_006); player:EndEvent(); + quest:StartSequence(SEQ_006); end elseif (sequence == SEQ_006) then if (classId == BADERON) then callClientFunction(player, "delegateEvent", player, quest, "processEvent027"); - quest:StartSequence(SEQ_007); player:EndEvent(); + player:SendGameMessage(GetWorldMaster(), 25117, 0x20, 11000125); -- You obtain Baderon's Recommendation + quest:StartSequence(SEQ_007); end elseif (sequence == SEQ_007) then seq007_onTalk(player, quest, npc, classId); + elseif (sequence == SEQ_035) then + if (classId == NNMULIKA) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent602"); + callClientFunction(player, "delegateEvent", player, quest, "processEvent602_2"); + callClientFunction(player, "delegateEvent", player, quest, "processEvent602_3"); + callClientFunction(player, "delegateEvent", player, quest, "processEvent604"); + --quest:StartSequence(SEQ_040); + player:EndEvent(); + end + elseif (sequence == SEQ_040) then + + elseif (sequence == SEQ_048) then + if (classId == BADERON) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent602_3"); + player:EndEvent(); + elseif (classId == ZEPHYR_TRIGGER) then + local startDuty = callClientFunction(player, "delegateEvent", player, quest, "processEvent602_3"); + if (startDuty) then + end + player:EndEvent(); + end + elseif (sequence == SEQ_075) then + if (classId == BODENOLF) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent630"); + player:EndEvent(); + quest:StartSequence(SEQ_080); + GetWorldManager():WarpToPrivateArea(player, "PrivateAreaMasterPast", 4, -504.985, 42.490, 433.712, 2.35); + end + elseif (sequence == SEQ_080) then + if (classId == HNAANZA) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent632"); + player:EndEvent(); + quest:StartSequence(SEQ_085); + else + seq080_085_onTalk(player, quest, npc, classId); + end + elseif (sequence == SEQ_085) then + if (classId == HNAANZA) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent632_2"); + else + seq080_085_onTalk(player, quest, npc, classId); + end + elseif (sequence == SEQ_092) then + if (classId == BADERON) then + callClientFunction(player, "delegateEvent", player, quest, "processEventComplete"); + callClientFunction(player, "delegateEvent", player, quest, "sqrwa", 300, 1, 1, 2); + player:EndEvent(); + player:CompleteQuest(quest); + return; + end end quest:UpdateENPCs(); @@ -279,6 +376,27 @@ function seq007_onTalk(player, quest, npc, classId) player:EndEvent(); end +function seq080_085_onTalk(player, quest, npc, classId) + if (classId == IOFA) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent630_2"); + elseif (classId == TRINNE) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent630_3"); + elseif (classId == HIHINE) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent630_4"); + elseif (classId == MIMIDOA) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent630_5"); + elseif (classId == WERNER) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent630_6"); + elseif (classId == TATTOOED_PIRATE) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent630_7"); + elseif (classId == JOELLAUT) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent630_8"); + elseif (classId == BODENOLF) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent630_9"); + end + player:EndEvent(); +end + function onPush(player, quest, npc) local data = quest:GetData(); local sequence = quest:getSequence(); @@ -298,9 +416,33 @@ function onPush(player, quest, npc) quest:UpdateENPCs(); GetWorldManager():WarpToPublicArea(player); end + elseif (sequence == SEQ_048) then + if (classId == ZEPHYR_TRIGGER) then + local result = callClientFunction(player, "delegateEvent", player, quest, "contentsJoinAskInBasaClass"); + if (result == 1) then + startMan0l1Content(player, quest); + return; + end + end + elseif (sequence == SEQ_085) then + if (classId == ECHO_EXIT_TRIGGER2) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent635"); + player:EndEvent(); + quest:UpdateENPCs(); + GetWorldManager():WarpToPublicArea(player); + end end end +function onEmote(player, quest, npc, emoteId) + local sequence = quest:getSequence(); + + if (sequence == SEQ_040) then + end + + quest:UpdateENPCs(); +end + function onNotice(player, quest, target) local sequence = quest:getSequence(); @@ -329,6 +471,25 @@ function onNpcLS(player, quest, npcLSId) end end +function startMan0l1Content(player, quest) + quest:StartSequence(SEQ_050); + + local contentArea = player.CurrentArea:CreateContentArea(player, "/Area/PrivateArea/Content/PrivateAreaMasterSimpleContent", "Man0l101", "SimpleContent30002", "Quest/QuestDirectorMan0l101"); + + if (contentArea == nil) then + return; + end + + local director = contentArea:GetContentDirector(); + + player:AddDirector(director); + director:StartDirector(false); + player:KickEvent(director, "noticeEvent", true); + player:SetLoginDirector(director); + + GetWorldManager():DoZoneChangeContent(player, contentArea, -5, 16.35, 6, 0.5, 16); +end + function getJournalInformation(player, quest) return 0, quest:GetData():GetCounter(CNTR_SEQ7_CUL) * 5, quest:GetData():GetCounter(CNTR_SEQ7_MRD) * 5; end diff --git a/Map Server/Actors/Chara/Player/Player.cs b/Map Server/Actors/Chara/Player/Player.cs index ce4436cd..a1971f3e 100644 --- a/Map Server/Actors/Chara/Player/Player.cs +++ b/Map Server/Actors/Chara/Player/Player.cs @@ -1476,7 +1476,9 @@ namespace Meteor.Map.Actors if (!isSilent) { - SendGameMessage(Server.GetWorldManager().GetActor(), 25224, 0x20, (object)questScenario[freeSlot].GetQuestId()); // " accepted." + WorldMaster worldMaster = Server.GetWorldManager().GetActor(); + SendDataPacket("attention", worldMaster, "", 25224, (object)questScenario[freeSlot].GetQuestId()); // " accepted." + SendGameMessage(worldMaster, 25224, 0x20, (object)questScenario[freeSlot].GetQuestId()); // " accepted." } instance.OnAccept(); diff --git a/Map Server/Actors/Quest/QuestStateManager.cs b/Map Server/Actors/Quest/QuestStateManager.cs index 6dd15b13..8dd2b8c3 100644 --- a/Map Server/Actors/Quest/QuestStateManager.cs +++ b/Map Server/Actors/Quest/QuestStateManager.cs @@ -172,6 +172,14 @@ namespace Meteor.Map.Actors.QuestNS CompletedQuestsBitfield.Set(questId - SCENARIO_START); else CompletedQuestsBitfield.Clear(questId - SCENARIO_START); + QuestGameData[] updated = Server.GetQuestGamedataByPrerequisite(questId); + foreach (var questData in updated) + { + if (flag) + PrereqBitfield.Set(questData.Id - SCENARIO_START); + else + PrereqBitfield.Clear(questData.Id - SCENARIO_START); + } ComputeAvailable(); } } diff --git a/Map Server/Lua/LuaUtils.cs b/Map Server/Lua/LuaUtils.cs index 4c58f520..27ade494 100644 --- a/Map Server/Lua/LuaUtils.cs +++ b/Map Server/Lua/LuaUtils.cs @@ -409,11 +409,11 @@ namespace Meteor.Map private static void AddToList(object o, List luaParams) { - if (o is int) + if (o is int || o is short) { luaParams.Add(new LuaParam(0x0, (int)o)); } - else if (o is uint) + else if (o is uint || o is ushort) { luaParams.Add(new LuaParam(0x1, (uint)o)); } diff --git a/Map Server/WorldManager.cs b/Map Server/WorldManager.cs index d1723e2e..74df5960 100644 --- a/Map Server/WorldManager.cs +++ b/Map Server/WorldManager.cs @@ -932,6 +932,30 @@ namespace Meteor.Map if (player.CurrentArea.IsPrivate()) DoZoneChange(player, player.CurrentArea.ZoneId, null, 0, 15, x, y, z, rotation); } + + public void WarpToPosition(Player player, float x, float y, float z, float rotation) + { + //Remove player from currentZone if transfer else it's login + if (player.CurrentArea != null) + { + player.playerSession.LockUpdates(true); + player.CurrentArea.RemoveActorFromZone(player); + player.CurrentArea.AddActorToZone(player); + + //Update player actor's properties; + player.positionX = x; + player.positionY = y; + player.positionZ = z; + player.rotation = rotation; + + //Send packets + player.playerSession.QueuePacket(_0xE2Packet.BuildPacket(player.Id, 0x10)); + player.playerSession.QueuePacket(player.CreateSpawnTeleportPacket(0)); + + player.playerSession.LockUpdates(false); + player.SendInstanceUpdate(); + } + } //Moves actor to new zone, and sends packets to spawn at the given coords. public void DoZoneChangeContent(Player player, PrivateAreaContent contentArea, float spawnX, float spawnY, float spawnZ, float spawnRotation, ushort spawnType = SetActorPositionPacket.SPAWNTYPE_WARP_DUTY) From 0faa056589d5ddeab496f8369f54f78b5e3ff3de Mon Sep 17 00:00:00 2001 From: Filip Maj Date: Thu, 24 Feb 2022 00:00:58 -0500 Subject: [PATCH 04/23] Added A Call to Arms. Fixed up Seeking the Seers. --- Data/scripts/quests/etc/etc3g0.lua | 3 +- Data/scripts/quests/etc/etc3u0.lua | 183 +++++++++++++++++++++++++++++ 2 files changed, 185 insertions(+), 1 deletion(-) create mode 100644 Data/scripts/quests/etc/etc3u0.lua diff --git a/Data/scripts/quests/etc/etc3g0.lua b/Data/scripts/quests/etc/etc3g0.lua index 79cc7076..8faf63cb 100644 --- a/Data/scripts/quests/etc/etc3g0.lua +++ b/Data/scripts/quests/etc/etc3g0.lua @@ -135,7 +135,7 @@ function onTalk(player, quest, npc, eventName) attentionMessage(player, 51061, 0, counterAmount, 5); -- You have heard word of the Seedseers. (... of 5) if (seq000_checkCondition(data)) then -- All Seers spoken to - attentionMessage(player, 25225, 110674); -- "Seeing the Seers" objectives complete! + attentionMessage(player, 25225, quest:GetQuestId()); -- "Seeing the Seers" objectives complete! quest:UpdateENPCs(); -- Band-aid for a QFLAG_PLATE issue quest:StartSequence(SEQ_001); end @@ -166,6 +166,7 @@ end function getJournalMapMarkerList(player, quest) local sequence = quest:getSequence(); + local data = quest:GetData(); local possibleMarkers = {}; if (sequence == SEQ_000) then diff --git a/Data/scripts/quests/etc/etc3u0.lua b/Data/scripts/quests/etc/etc3u0.lua new file mode 100644 index 00000000..422718d1 --- /dev/null +++ b/Data/scripts/quests/etc/etc3u0.lua @@ -0,0 +1,183 @@ +require ("global") + +--[[ + +Quest Script + +Name: A Call to Arms +Code: Etc3u0 +Id: 110695 +Prereq: Level 5, Any Class + +]] + +-- Sequence Numbers +SEQ_000 = 0; -- Talk to all the ___. +SEQ_001 = 1; -- Return to Fruhybolg. + +-- Actor Class Ids +FRUHYBOLG = 1000964; +ZOENGTERBIN = 1000784; +LETTICE = 1000788; +THIMM = 1001439; +VANNES = 1001464; +JEGER = 1000655; + +-- Quest Markers +MRKR_FRUHYBOLG = 11090001; +MRKR_ZOENGTERBIN = 11090002; +MRKR_LETTICE = 11090003; +MRKR_THIMM = 11090004; +MRKR_VANNES = 11090005; +MRKR_JEGER = 11090006; + +-- Quest Flags +FLAG_TALKED_VANNES = 1; +FLAG_TALKED_JEGER = 2; +FLAG_TALKED_LETTICE = 3; +FLAG_TALKED_ZOENGTERBIN = 4; +FLAG_TALKED_THIMM = 5; + +-- Quest Counters +COUNTER_TALKED = 0; + +function onStart(player, quest) + quest:StartSequence(SEQ_000); +end + +function onFinish(player, quest) +end + +function onStateChange(player, quest, sequence) + if (sequence == SEQ_ACCEPT) then + quest:SetENpc(FRUHYBOLG, QFLAG_PLATE); + end + + local data = quest:GetData(); + if (sequence == SEQ_000) then + quest:SetENpc(FRUHYBOLG); + quest:SetENpc(VANNES, (not data:GetFlag(FLAG_TALKED_VANNES) and QFLAG_PLATE or QFLAG_NONE)); + quest:SetENpc(JEGER, (not data:GetFlag(FLAG_TALKED_JEGER) and QFLAG_PLATE or QFLAG_NONE)); + quest:SetENpc(LETTICE, (not data:GetFlag(FLAG_TALKED_LETTICE) and QFLAG_PLATE or QFLAG_NONE)); + quest:SetENpc(ZOENGTERBIN, (not data:GetFlag(FLAG_TALKED_ZOENGTERBIN) and QFLAG_PLATE or QFLAG_NONE)); + quest:SetENpc(THIMM, (not data:GetFlag(FLAG_TALKED_THIMM) and QFLAG_PLATE or QFLAG_NONE)); + elseif (sequence == SEQ_001) then + quest:SetENpc(FRUHYBOLG, QFLAG_REWARD); + end +end + +function onTalk(player, quest, npc, eventName) + local npcClassId = npc.GetActorClassId(); + local seq = quest:GetSequence(); + local incCounter = false; + + -- Offer the quest + if (npcClassId == FRUHYBOLG and not player:HasQuest(quest)) then + local questAccepted = callClientFunction(player, "delegateEvent", player, quest, "processEventFhruybolgStart"); + if (questAccepted == 1) then + player:AcceptQuest(quest); + end + player:EndEvent(); + return; + end + + -- Quest Progress + local data = quest:GetData(); + if (seq == SEQ_000) then + if (npcClassId == FRUHYBOLG) then + callClientFunction(player, "delegateEvent", player, quest, "processEventOffersAfter"); + elseif (npcClassId == VANNES) then + if (not data:GetFlag(FLAG_TALKED_VANNES)) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent005_V"); + data:SetFlag(FLAG_TALKED_VANNES); + incCounter = true; + else + callClientFunction(player, "delegateEvent", player, quest, "processEvent005_V_2"); + end + elseif (npcClassId == JEGER) then + if (not data:GetFlag(FLAG_TALKED_JEGER)) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent005_J"); + data:SetFlag(FLAG_TALKED_JEGER); + incCounter = true; + else + callClientFunction(player, "delegateEvent", player, quest, "processEvent005_J_2"); + end + elseif (npcClassId == LETTICE) then + if (not data:GetFlag(FLAG_TALKED_LETTICE)) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent005_L"); + data:SetFlag(FLAG_TALKED_LETTICE); + incCounter = true; + else + callClientFunction(player, "delegateEvent", player, quest, "processEvent005_L_2"); + end + elseif (npcClassId == ZOENGTERBIN) then + if (not data:GetFlag(FLAG_TALKED_ZOENGTERBIN)) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent005_Z"); + data:SetFlag(FLAG_TALKED_ZOENGTERBIN); + incCounter = true; + else + callClientFunction(player, "delegateEvent", player, quest, "processEvent005_Z_2"); + end + elseif (npcClassId == THIMM) then + if (not data:GetFlag(FLAG_TALKED_THIMM)) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent005_T"); + data:SetFlag(FLAG_TALKED_THIMM); + incCounter = true; + else + callClientFunction(player, "delegateEvent", player, quest, "processEvent005_T_2"); + end + end + + -- Increase objective counter & play relevant messages + if (incCounter == true) then + local counterAmount = data:IncCounter(COUNTER_TALKED); + + attentionMessage(player, 51062, 0, counterAmount, 5); -- You have passed on word of the rite. (... of 5) + + if (seq000_checkCondition(data)) then -- All people spoken to + attentionMessage(player, 25225, quest:GetQuestId()); -- "A Call to Arms" objectives complete! + quest:UpdateENPCs(); -- Band-aid for a QFLAG_PLATE issue + quest:StartSequence(SEQ_001); + end + end + + elseif (seq == SEQ_001) then + --Quest Complete + if (npcClassId == FRUHYBOLG) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent010"); + callClientFunction(player, "delegateEvent", player, quest, "sqrwa", 200, 1, 1, 9); + player:CompleteQuest(quest); + end + end + quest:UpdateENPCs(); + player:EndEvent(); +end + + +-- Check if all people are talked to +function seq000_checkCondition(data) + return (data:GetFlag(FLAG_TALKED_VANNES) and + data:GetFlag(FLAG_TALKED_JEGER) and + data:GetFlag(FLAG_TALKED_LETTICE) and + data:GetFlag(FLAG_TALKED_ZOENGTERBIN) and + data:GetFlag(FLAG_TALKED_THIMM)); +end + + +function getJournalMapMarkerList(player, quest) + local sequence = quest:getSequence(); + local data = quest:GetData(); + local possibleMarkers = {}; + + if (sequence == SEQ_000) then + if (not data:GetFlag(FLAG_TALKED_VANNES)) then table.insert(possibleMarkers, MRKR_SYBELL); end + if (not data:GetFlag(FLAG_TALKED_JEGER)) then table.insert(possibleMarkers, MRKR_KHUMA_MOSHROCA); end + if (not data:GetFlag(FLAG_TALKED_LETTICE)) then table.insert(possibleMarkers, MRKR_LETTICE); end + if (not data:GetFlag(FLAG_TALKED_ZOENGTERBIN)) then table.insert(possibleMarkers, MRKR_ZOENGTERBIN); end + if (not data:GetFlag(FLAG_TALKED_THIMM)) then table.insert(possibleMarkers, MRKR_THIMM); end + elseif (sequence == SEQ_001) then + table.insert(possibleMarkers, MRKR_KINNISON); + end + + return unpack(possibleMarkers) +end \ No newline at end of file From 7de153dde146363c9bffb40f36ae8d1765e036e6 Mon Sep 17 00:00:00 2001 From: Filip Maj Date: Thu, 24 Feb 2022 00:03:16 -0500 Subject: [PATCH 05/23] Fixed markers in etc3u0 --- Data/scripts/quests/etc/etc3u0.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Data/scripts/quests/etc/etc3u0.lua b/Data/scripts/quests/etc/etc3u0.lua index 422718d1..5399e143 100644 --- a/Data/scripts/quests/etc/etc3u0.lua +++ b/Data/scripts/quests/etc/etc3u0.lua @@ -170,13 +170,13 @@ function getJournalMapMarkerList(player, quest) local possibleMarkers = {}; if (sequence == SEQ_000) then - if (not data:GetFlag(FLAG_TALKED_VANNES)) then table.insert(possibleMarkers, MRKR_SYBELL); end - if (not data:GetFlag(FLAG_TALKED_JEGER)) then table.insert(possibleMarkers, MRKR_KHUMA_MOSHROCA); end + if (not data:GetFlag(FLAG_TALKED_VANNES)) then table.insert(possibleMarkers, MRKR_VANNES); end + if (not data:GetFlag(FLAG_TALKED_JEGER)) then table.insert(possibleMarkers, MRKR_JEGER); end if (not data:GetFlag(FLAG_TALKED_LETTICE)) then table.insert(possibleMarkers, MRKR_LETTICE); end if (not data:GetFlag(FLAG_TALKED_ZOENGTERBIN)) then table.insert(possibleMarkers, MRKR_ZOENGTERBIN); end if (not data:GetFlag(FLAG_TALKED_THIMM)) then table.insert(possibleMarkers, MRKR_THIMM); end elseif (sequence == SEQ_001) then - table.insert(possibleMarkers, MRKR_KINNISON); + table.insert(possibleMarkers, MRKR_FRUHYBOLG); end return unpack(possibleMarkers) From 3393eb4c9dfbb14511560eac99c2b26c8150baae Mon Sep 17 00:00:00 2001 From: Filip Maj Date: Thu, 24 Feb 2022 00:54:03 -0500 Subject: [PATCH 06/23] Trading Tongueflaps is done! --- Data/scripts/quests/wld/wld0l1.lua | 93 ++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) create mode 100644 Data/scripts/quests/wld/wld0l1.lua diff --git a/Data/scripts/quests/wld/wld0l1.lua b/Data/scripts/quests/wld/wld0l1.lua new file mode 100644 index 00000000..117423c7 --- /dev/null +++ b/Data/scripts/quests/wld/wld0l1.lua @@ -0,0 +1,93 @@ +require ("global") + +--[[ + +Quest Script + +Name: Trading Tongueflaps +Code: Wld0l1 +Id: 110771 +Prereq: Level 5, Any Class + +]] + +-- Sequence Numbers +SEQ_000 = 0; -- Talk to Ryssfloh. +SEQ_001 = 1; -- Talk to Sweetnix Rosycheeks. + +-- Actor Class Ids +SWEETNIX = 1001573; +RYSSFLOH = 1000359; + +-- Quest Markers +MRKR_RYSSFLOH = 11110001; +MRKR_SWEETNIX = 11110002; + +function onStart(player, quest) + quest:StartSequence(SEQ_000); +end + +function onFinish(player, quest) +end + +function onStateChange(player, quest, sequence) + if (sequence == SEQ_ACCEPT) then + quest:SetENpc(SWEETNIX, QFLAG_PLATE); + end + + if (sequence == SEQ_000) then + quest:SetENpc(SWEETNIX); + quest:SetENpc(RYSSFLOH, QFLAG_PLATE); + elseif (sequence == SEQ_001) then + quest:SetENpc(RYSSFLOH); + quest:SetENpc(SWEETNIX, QFLAG_REWARD); + end +end + +function onTalk(player, quest, npc, eventName) + local npcClassId = npc.GetActorClassId(); + local seq = quest:GetSequence(); + + -- Offer the quest + if (npcClassId == SWEETNIX and not player:HasQuest(quest)) then + local questAccepted = callClientFunction(player, "delegateEvent", player, quest, "processEventSweetnixStart"); + if (questAccepted == 1) then + player:AcceptQuest(quest); + end + player:EndEvent(); + return; + end + + -- Quest Progress + if (seq == SEQ_000) then + if (npcClassId == SWEETNIX) then + callClientFunction(player, "delegateEvent", player, quest, "followEvent005"); + elseif (npcClassId == RYSSFLOH) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent010"); + quest:StartSequence(SEQ_001); + end + elseif (seq == SEQ_001) then + --Quest Complete + if (npcClassId == SWEETNIX) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent020"); + callClientFunction(player, "delegateEvent", player, quest, "sqrwa", 200, 1, 1, 9); + player:CompleteQuest(quest); + elseif (npcClassId == RYSSFLOH) then + callClientFunction(player, "delegateEvent", player, quest, "followEvent015"); + quest:StartSequence(SEQ_001); + end + end + + quest:UpdateENPCs(); + player:EndEvent(); +end + +function getJournalMapMarkerList(player, quest) + local sequence = quest:getSequence(); + + if (sequence == SEQ_000) then + return MRKR_RYSSFLOH; + elseif (sequence == SEQ_001) then + return MRKR_SWEETNIX; + end +end \ No newline at end of file From b46160763c6cdd933922f788b391b5f6070e99af Mon Sep 17 00:00:00 2001 From: Filip Maj Date: Thu, 24 Feb 2022 01:34:26 -0500 Subject: [PATCH 07/23] Finished In the Name of Science --- Data/scripts/quests/wld/wld0g1.lua | 101 +++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+) create mode 100644 Data/scripts/quests/wld/wld0g1.lua diff --git a/Data/scripts/quests/wld/wld0g1.lua b/Data/scripts/quests/wld/wld0g1.lua new file mode 100644 index 00000000..c04081af --- /dev/null +++ b/Data/scripts/quests/wld/wld0g1.lua @@ -0,0 +1,101 @@ +require ("global") + +--[[ + +Quest Script + +Name: In the Name of Science +Code: Wld0g1 +Id: 110762 +Prereq: Level 10, Any Class + +]] + +-- Sequence Numbers +SEQ_000 = 0; -- Kill Sabletooth Spriggans. +SEQ_001 = 1; -- Talk to Marcette. + +-- Actor Class Ids +ENPC_MARCETTE = 1001583; +BNPC_SABLETOOTH_SPRIGGAN = 2106214; + +-- Quest Markers +MRKR_MARCETTE = 11120001; +MRKR_SPRIGGAN_AREA = 11120002; + +-- Counters +COUNTER_TEETH = 0; + +function onStart(player, quest) + quest:StartSequence(SEQ_000); +end + +function onFinish(player, quest) +end + +function onStateChange(player, quest, sequence) + if (sequence == SEQ_ACCEPT) then + quest:SetENpc(ENPC_MARCETTE, QFLAG_PLATE); + elseif (sequence == SEQ_000) then + quest:SetENpc(ENPC_MARCETTE); + quest:SetENpc(BNPC_SABLETOOTH_SPRIGGAN); + elseif (sequence == SEQ_001) then + quest:SetENpc(ENPC_MARCETTE, QFLAG_REWARD); + end +end + +function onTalk(player, quest, npc, eventName) + local npcClassId = npc.GetActorClassId(); + local seq = quest:GetSequence(); + + -- Offer the quest + if (npcClassId == ENPC_MARCETTE and seq == SEQ_ACCEPT) then + local questAccepted = callClientFunction(player, "delegateEvent", player, quest, "processEventAtellouneStart"); + if (questAccepted == 1) then + player:AcceptQuest(quest); + end + player:EndEvent(); + return; + -- Quest Progress + elseif (seq == SEQ_000) then + if (npcClassId == ENPC_MARCETTE) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent000_2"); + end + --Quest Complete + elseif (seq == SEQ_001) then + if (npcClassId == ENPC_MARCETTE) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent010"); + callClientFunction(player, "delegateEvent", player, quest, "sqrwa", 200, 1, 1, 9); + player:CompleteQuest(quest); + end + end + + quest:UpdateENPCs(); + player:EndEvent(); +end + +-- TODO FINISH THIS +function onKillBNpc(player, quest, bnpc) + if (bnpc == BNPC_SABLETOOTH_SPRIGGAN) then + local counterAmount = quest:GetData():IncCounter(COUNTER_TEETH); + attentionMessage(player, 51062, 0, counterAmount, 4); -- You have passed on word of the rite. (... of 5) + if (counterAmount >= 4) then + attentionMessage(player, 25225, quest:GetQuestId()); -- Objectives complete! + quest:StartSequence(SEQ_001); + end + end +end + +function getJournalInformation(player, quest) + return quest:GetData():GetCounter(COUNTER_TEETH); +end + +function getJournalMapMarkerList(player, quest) + local sequence = quest:getSequence(); + + if (sequence == SEQ_000) then + return MRKR_SPRIGGAN_AREA; + elseif (sequence == SEQ_001) then + return MRKR_MARCETTE; + end +end \ No newline at end of file From 495bdf4ba614994f253f1df45ec6ebb2f7395ea1 Mon Sep 17 00:00:00 2001 From: Filip Maj Date: Thu, 24 Feb 2022 02:16:28 -0500 Subject: [PATCH 08/23] Added Hearing Confessions. --- Data/scripts/quests/wld/wld0g2.lua | 164 +++++++++++++++++++++++++++++ 1 file changed, 164 insertions(+) create mode 100644 Data/scripts/quests/wld/wld0g2.lua diff --git a/Data/scripts/quests/wld/wld0g2.lua b/Data/scripts/quests/wld/wld0g2.lua new file mode 100644 index 00000000..4a10e407 --- /dev/null +++ b/Data/scripts/quests/wld/wld0g2.lua @@ -0,0 +1,164 @@ +require("global"); + +--[[ + +Quest Script + +Name: Hearing Confession +Code: Wld0g2 +Id: 110763 +Prereq: Level 10 on any class. +Notes: Rewards 200 gil + +]] + +-- Sequence Numbers +SEQ_000 = 0; -- Talk to the four lost souls. +SEQ_001 = 1; -- Return to Swaenhylt + +-- Actor Class Ids +SWAENHYLT = 1001582; +FLAVIELLE = 1001459; +KEKETO = 1001346; +CEADDA = 1000330; +THIMM = 1001439; + +-- Quest Markers +MRKR_FLAVIELLE = 11120101; +MRKR_KEKETO = 11120102; +MRKR_CEADDA = 11120103; +MRKR_THIMM = 11120104; +MRKR_SWAENHYLT = 11120105; + +-- Quest Flags +FLAG_TALKED_FLAVIELLE = 0; +FLAG_TALKED_KEKETO = 1; +FLAG_TALKED_CEADDA = 2; +FLAG_TALKED_THIMM = 3; + +-- Quest Counters +COUNTER_TALKED = 0; + +function onStart(player, quest) + quest:StartSequence(SEQ_000); +end + +function onFinish(player, quest) +end + +function onStateChange(player, quest, sequence) + if (sequence == SEQ_ACCEPT) then + quest:SetENpc(SWAENHYLT, QFLAG_PLATE); + elseif (sequence == SEQ_000) then + local data = quest:GetData(); + quest:SetENpc(SWAENHYLT); + quest:SetENpc(FLAVIELLE, (not data:GetFlag(FLAG_TALKED_FLAVIELLE) and QFLAG_PLATE or QFLAG_NONE)); + quest:SetENpc(KEKETO, (not data:GetFlag(FLAG_TALKED_KEKETO) and QFLAG_PLATE or QFLAG_NONE)); + quest:SetENpc(CEADDA, (not data:GetFlag(FLAG_TALKED_CEADDA) and QFLAG_PLATE or QFLAG_NONE)); + quest:SetENpc(THIMM, (not data:GetFlag(FLAG_TALKED_THIMM) and QFLAG_PLATE or QFLAG_NONE)); + elseif (sequence == SEQ_001) then + quest:SetENpc(SWAENHYLT, QFLAG_REWARD); + end +end + +function onTalk(player, quest, npc) + local sequence = quest:getSequence(); + local classId = npc:GetActorClassId(); + + if (sequence == SEQ_ACCEPT) then + local questAccepted = callClientFunction(player, "delegateEvent", player, quest, "processEventSwaenhyltStart"); + if (questAccepted == 1) then + player:AcceptQuest(quest); + end + player:EndEvent(); + return; + elseif (sequence == SEQ_000) then + local incCounter = false; + local data = quest:GetData(); + + if (npcClassId == SWAENHYLT) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent000_2"); + elseif (classId == FLAVIELLE) then + if (not data:GetFlag(FLAG_TALKED_FLAVIELLE)) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent005"); + data:SetFlag(FLAG_TALKED_FLAVIELLE); + incCounter = true; + else + callClientFunction(player, "delegateEvent", player, quest, "processEvent005_2"); + end + elseif (classId == KEKETO) then + if (not data:GetFlag(FLAG_TALKED_KEKETO)) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent010"); + data:SetFlag(FLAG_TALKED_KEKETO); + incCounter = true; + else + callClientFunction(player, "delegateEvent", player, quest, "processEvent010_2"); + end + elseif (classId == CEADDA) then + if (not data:GetFlag(FLAG_TALKED_CEADDA)) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent015"); + data:SetFlag(FLAG_TALKED_CEADDA); + incCounter = true; + else + callClientFunction(player, "delegateEvent", player, quest, "processEvent015_2"); + end + elseif (classId == THIMM) then + if (not data:GetFlag(FLAG_TALKED_THIMM)) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent020"); + data:SetFlag(FLAG_TALKED_THIMM); + incCounter = true; + else + callClientFunction(player, "delegateEvent", player, quest, "processEvent020_2"); + end + end + + -- Increase objective counter & play relevant messages + if (incCounter == true) then + local counterAmount = data:IncCounter(COUNTER_TALKED); + + attentionMessage(player, 51063, 0, counterAmount, 4); -- You have heard a lost soul's confession. (... of 5) + + if (seq000_checkCondition(data)) then -- All lost souls spoken to + attentionMessage(player, 25225, quest:GetQuestId()); -- "Hearing Confessions" objectives complete! + quest:UpdateENPCs(); -- Band-aid for a QFLAG_PLATE issue + quest:StartSequence(SEQ_001); + end + end + elseif (sequence == SEQ_001) then + if (classId == SWAENHYLT) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent025"); + callClientFunction(player, "delegateEvent", player, quest, "sqrwa", 200, 1, 1, 9); + player:CompleteQuest(quest); + end + end + player:EndEvent() + quest:UpdateENPCs(); +end + +-- Check if all souls are talked to +function seq000_checkCondition(data) + return (data:GetFlag(FLAG_TALKED_FLAVIELLE) and + data:GetFlag(FLAG_TALKED_KEKETO) and + data:GetFlag(FLAG_TALKED_CEADDA) and + data:GetFlag(FLAG_TALKED_THIMM)); +end + +function getJournalMapMarkerList(player, quest) + local sequence = quest:getSequence(); + local data = quest:GetData(); + local possibleMarkers = {}; + + if (sequence == SEQ_000) then + if (not data:GetFlag(FLAG_TALKED_FLAVIELLE)) then table.insert(possibleMarkers, MRKR_FLAVIELLE); end + if (not data:GetFlag(FLAG_TALKED_KEKETO)) then table.insert(possibleMarkers, MRKR_KEKETO); end + if (not data:GetFlag(FLAG_TALKED_CEADDA)) then table.insert(possibleMarkers, MRKR_CEADDA); end + if (not data:GetFlag(FLAG_TALKED_THIMM)) then table.insert(possibleMarkers, MRKR_THIMM); end + elseif (sequence == SEQ_001) then + table.insert(possibleMarkers, MRKR_SWAENHYLT); + end + + return unpack(possibleMarkers) +end + + + From c9f18f541591560215efcb652958cf93140aed32 Mon Sep 17 00:00:00 2001 From: Filip Maj Date: Thu, 24 Feb 2022 12:40:59 -0500 Subject: [PATCH 09/23] Added Of Archons and Muses --- Data/scripts/quests/wld/wld0u1.lua | 93 ++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) create mode 100644 Data/scripts/quests/wld/wld0u1.lua diff --git a/Data/scripts/quests/wld/wld0u1.lua b/Data/scripts/quests/wld/wld0u1.lua new file mode 100644 index 00000000..9e78fbfb --- /dev/null +++ b/Data/scripts/quests/wld/wld0u1.lua @@ -0,0 +1,93 @@ +require ("global") + +--[[ + +Quest Script + +Name: Of Archons and Muses +Code: Wld0u1 +Id: 110753 +Prereq: Level 10, Any Class + +]] + +-- Sequence Numbers +SEQ_000 = 0; -- Talk to Lyngwaek. +SEQ_001 = 1; -- Talk to Tyago Moui. + +-- Actor Class Ids +TYAGO_MOUI = 1001203; +LYNGWAEK = 1000647; + +-- Quest Markers +MRKR_LYNGWAEK = 11130001; +MRKR_TYAGO_MOUI = 11130002; + +function onStart(player, quest) + quest:StartSequence(SEQ_000); +end + +function onFinish(player, quest) +end + +function onStateChange(player, quest, sequence) + if (sequence == SEQ_ACCEPT) then + quest:SetENpc(TYAGO_MOUI, QFLAG_PLATE); + end + + if (sequence == SEQ_000) then + quest:SetENpc(MRKR_TYAGO_MOUI); + quest:SetENpc(LYNGWAEK, QFLAG_PLATE); + elseif (sequence == SEQ_001) then + quest:SetENpc(LYNGWAEK); + quest:SetENpc(TYAGO_MOUI, QFLAG_REWARD); + end +end + +function onTalk(player, quest, npc, eventName) + local npcClassId = npc.GetActorClassId(); + local seq = quest:GetSequence(); + + -- Offer the quest + if (npcClassId == MRKR_TYAGO_MOUI and seq == SEQ_ACCEPT) then + local questAccepted = callClientFunction(player, "delegateEvent", player, quest, "processEventTyagomouiStart"); + if (questAccepted == 1) then + player:AcceptQuest(quest); + end + player:EndEvent(); + return; + end + + -- Quest Progress + if (seq == SEQ_000) then + if (npcClassId == MRKR_TYAGO_MOUI) then + callClientFunction(player, "delegateEvent", player, quest, "followEvent005"); + elseif (npcClassId == LYNGWAEK) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent010"); + quest:StartSequence(SEQ_001); + end + elseif (seq == SEQ_001) then + --Quest Complete + if (npcClassId == MRKR_TYAGO_MOUI) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent020"); + callClientFunction(player, "delegateEvent", player, quest, "sqrwa", 200, 1, 1, 9); + player:CompleteQuest(quest); + elseif (npcClassId == LYNGWAEK) then + callClientFunction(player, "delegateEvent", player, quest, "followEvent015"); + quest:StartSequence(SEQ_001); + end + end + + quest:UpdateENPCs(); + player:EndEvent(); +end + +function getJournalMapMarkerList(player, quest) + local sequence = quest:getSequence(); + + if (sequence == SEQ_000) then + return MRKR_LYNGWAEK; + elseif (sequence == SEQ_001) then + return MRKR_TYAGO_MOUI; + end +end \ No newline at end of file From 59f4e4bbd5bef7aaecc3ba30fc0a8eaf02b658e3 Mon Sep 17 00:00:00 2001 From: Filip Maj Date: Thu, 24 Feb 2022 18:46:55 -0500 Subject: [PATCH 10/23] Fixed bug in Hearing Confessions. Added Letting Out Orions Belt and Sniff Out a Profit. The former still needs the correct attention message though when talking to a NPC. --- Data/scripts/quests/wld/wld0g2.lua | 2 +- Data/scripts/quests/wld/wld0l2.lua | 164 +++++++++++++++++++++++++++++ Data/scripts/quests/wld/wld0l4.lua | 93 ++++++++++++++++ 3 files changed, 258 insertions(+), 1 deletion(-) create mode 100644 Data/scripts/quests/wld/wld0l2.lua create mode 100644 Data/scripts/quests/wld/wld0l4.lua diff --git a/Data/scripts/quests/wld/wld0g2.lua b/Data/scripts/quests/wld/wld0g2.lua index 4a10e407..fbad2186 100644 --- a/Data/scripts/quests/wld/wld0g2.lua +++ b/Data/scripts/quests/wld/wld0g2.lua @@ -76,7 +76,7 @@ function onTalk(player, quest, npc) local incCounter = false; local data = quest:GetData(); - if (npcClassId == SWAENHYLT) then + if (classId == SWAENHYLT) then callClientFunction(player, "delegateEvent", player, quest, "processEvent000_2"); elseif (classId == FLAVIELLE) then if (not data:GetFlag(FLAG_TALKED_FLAVIELLE)) then diff --git a/Data/scripts/quests/wld/wld0l2.lua b/Data/scripts/quests/wld/wld0l2.lua new file mode 100644 index 00000000..8d86277c --- /dev/null +++ b/Data/scripts/quests/wld/wld0l2.lua @@ -0,0 +1,164 @@ +require("global"); + +--[[ + +Quest Script + +Name: Letting Out Orion's Belt +Code: Wld0l2 +Id: 110772 +Prereq: Level 10 on any class. +Notes: Rewards 200 gil + +]] + +-- Sequence Numbers +SEQ_000 = 0; -- Talk to the four gourmands. +SEQ_001 = 1; -- Return to Ahldskyf. + +-- Actor Class Ids +AHLDSKYF = 1000332; +FZHUMII = 1000226; +SHOSHOMA = 1000334; +DACA_JINJAHL = 1000202; +AENTFOET = 1000064; + +-- Quest Markers +MRKR_FZHUMII = 11110101; +MRKR_SHOSHOMA = 11110102; +MRKR_DACA_JINJAHL = 11110103; +MRKR_AENTFOET = 11110104; +MRKR_AHLDSKYF = 11110105; + +-- Quest Flags +FLAG_TALKED_FZHUMII = 0; +FLAG_TALKED_SHOSHOMA = 1; +FLAG_TALKED_DACA_JINJAHL = 2; +FLAG_TALKED_AENTFOET = 3; + +-- Quest Counters +COUNTER_TALKED = 0; + +function onStart(player, quest) + quest:StartSequence(SEQ_000); +end + +function onFinish(player, quest) +end + +function onStateChange(player, quest, sequence) + if (sequence == SEQ_ACCEPT) then + quest:SetENpc(AHLDSKYF, QFLAG_PLATE); + elseif (sequence == SEQ_000) then + local data = quest:GetData(); + quest:SetENpc(AHLDSKYF); + quest:SetENpc(FZHUMII, (not data:GetFlag(FLAG_TALKED_FZHUMII) and QFLAG_PLATE or QFLAG_NONE)); + quest:SetENpc(SHOSHOMA, (not data:GetFlag(FLAG_TALKED_SHOSHOMA) and QFLAG_PLATE or QFLAG_NONE)); + quest:SetENpc(DACA_JINJAHL, (not data:GetFlag(FLAG_TALKED_DACA_JINJAHL) and QFLAG_PLATE or QFLAG_NONE)); + quest:SetENpc(AENTFOET, (not data:GetFlag(FLAG_TALKED_AENTFOET) and QFLAG_PLATE or QFLAG_NONE)); + elseif (sequence == SEQ_001) then + quest:SetENpc(AHLDSKYF, QFLAG_REWARD); + end +end + +function onTalk(player, quest, npc) + local sequence = quest:getSequence(); + local classId = npc:GetActorClassId(); + + if (sequence == SEQ_ACCEPT and classId == AHLDSKYF) then + local questAccepted = callClientFunction(player, "delegateEvent", player, quest, "processEventAhldskyffStart"); + if (questAccepted == 1) then + player:AcceptQuest(quest); + end + player:EndEvent(); + return; + elseif (sequence == SEQ_000) then + local incCounter = false; + local data = quest:GetData(); + + if (classId == AHLDSKYF) then + callClientFunction(player, "delegateEvent", player, quest, "processEventAhldskyffStart_1"); + elseif (classId == FZHUMII) then + if (not data:GetFlag(FLAG_TALKED_FZHUMII)) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent000"); + data:SetFlag(FLAG_TALKED_FZHUMII); + incCounter = true; + else + callClientFunction(player, "delegateEvent", player, quest, "processEvent000_1"); + end + elseif (classId == SHOSHOMA) then + if (not data:GetFlag(FLAG_TALKED_SHOSHOMA)) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent005"); + data:SetFlag(FLAG_TALKED_SHOSHOMA); + incCounter = true; + else + callClientFunction(player, "delegateEvent", player, quest, "processEvent005_1"); + end + elseif (classId == DACA_JINJAHL) then + if (not data:GetFlag(FLAG_TALKED_DACA_JINJAHL)) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent010"); + data:SetFlag(FLAG_TALKED_KEKETO); + incCounter = true; + else + callClientFunction(player, "delegateEvent", player, quest, "processEvent010_1"); + end + elseif (classId == AENTFOET) then + if (not data:GetFlag(FLAG_TALKED_AENTFOET)) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent015"); + data:SetFlag(FLAG_TALKED_AENTFOET); + incCounter = true; + else + callClientFunction(player, "delegateEvent", player, quest, "processEvent015_1"); + end + end + + -- Increase objective counter & play relevant messages + if (incCounter == true) then + local counterAmount = data:IncCounter(COUNTER_TALKED); + + attentionMessage(player, 51063, 0, counterAmount, 4); -- ????. (... of 5) + + if (seq000_checkCondition(data)) then -- All lost souls spoken to + attentionMessage(player, 25225, quest:GetQuestId()); -- "Letting Out Orion's Belt" objectives complete! + quest:UpdateENPCs(); -- Band-aid for a QFLAG_PLATE issue + quest:StartSequence(SEQ_001); + end + end + elseif (sequence == SEQ_001) then + if (classId == AHLDSKYF) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent020"); + callClientFunction(player, "delegateEvent", player, quest, "sqrwa", 200, 1, 1, 9); + player:CompleteQuest(quest); + end + end + player:EndEvent() + quest:UpdateENPCs(); +end + +-- Check if all souls are talked to +function seq000_checkCondition(data) + return (data:GetFlag(FLAG_TALKED_FZHUMII) and + data:GetFlag(FLAG_TALKED_SHOSHOMA) and + data:GetFlag(FLAG_TALKED_DACA_JINJAHL) and + data:GetFlag(FLAG_TALKED_AENTFOET)); +end + +function getJournalMapMarkerList(player, quest) + local sequence = quest:getSequence(); + local data = quest:GetData(); + local possibleMarkers = {}; + + if (sequence == SEQ_000) then + if (not data:GetFlag(FLAG_TALKED_FZHUMII)) then table.insert(possibleMarkers, MRKR_FZHUMII); end + if (not data:GetFlag(FLAG_TALKED_SHOSHOMA)) then table.insert(possibleMarkers, MRKR_SHOSHOMA); end + if (not data:GetFlag(FLAG_TALKED_DACA_JINJAHL)) then table.insert(possibleMarkers, MRKR_DACA_JINJAHL); end + if (not data:GetFlag(FLAG_TALKED_AENTFOET)) then table.insert(possibleMarkers, MRKR_AENTFOET); end + elseif (sequence == SEQ_001) then + table.insert(possibleMarkers, MRKR_AHLDSKYF); + end + + return unpack(possibleMarkers) +end + + + diff --git a/Data/scripts/quests/wld/wld0l4.lua b/Data/scripts/quests/wld/wld0l4.lua new file mode 100644 index 00000000..9d5a7b94 --- /dev/null +++ b/Data/scripts/quests/wld/wld0l4.lua @@ -0,0 +1,93 @@ +require ("global") + +--[[ + +Quest Script + +Name: Sniffing Out a Profit +Code: Wld0l4 +Id: 110774 +Prereq: Level 37, Any Class, Requires "Letting Out Orion's Belt" + +]] + +-- Sequence Numbers +SEQ_000 = 0; -- Talk to Ryssfloh. +SEQ_001 = 1; -- Talk to Faine. + +-- Actor Class Ids +AHLDSKYF = 1000332; +FAINE = 1001608; + +-- Quest Markers +MRKR_FAINE = 11110301; +MRKR_AHLDSKYF = 11110302; + +function onStart(player, quest) + quest:StartSequence(SEQ_000); +end + +function onFinish(player, quest) +end + +function onStateChange(player, quest, sequence) + if (sequence == SEQ_ACCEPT) then + quest:SetENpc(AHLDSKYF, QFLAG_PLATE); + end + + if (sequence == SEQ_000) then + quest:SetENpc(AHLDSKYF); + quest:SetENpc(FAINE, QFLAG_PLATE); + elseif (sequence == SEQ_001) then + quest:SetENpc(FAINE); + quest:SetENpc(AHLDSKYF, QFLAG_REWARD); + end +end + +function onTalk(player, quest, npc, eventName) + local npcClassId = npc.GetActorClassId(); + local seq = quest:GetSequence(); + + -- Offer the quest + if (npcClassId == AHLDSKYF and not player:HasQuest(quest)) then + local questAccepted = callClientFunction(player, "delegateEvent", player, quest, "processEventAhldskyffStart"); + if (questAccepted == 1) then + player:AcceptQuest(quest); + end + player:EndEvent(); + return; + end + + -- Quest Progress + if (seq == SEQ_000) then + if (npcClassId == AHLDSKYF) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent000"); + elseif (npcClassId == FAINE) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent005"); + quest:StartSequence(SEQ_001); + end + elseif (seq == SEQ_001) then + --Quest Complete + if (npcClassId == AHLDSKYF) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent010"); + callClientFunction(player, "delegateEvent", player, quest, "sqrwa", 200, 1, 1, 9); + player:CompleteQuest(quest); + elseif (npcClassId == FAINE) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent005_2"); + quest:StartSequence(SEQ_001); + end + end + + quest:UpdateENPCs(); + player:EndEvent(); +end + +function getJournalMapMarkerList(player, quest) + local sequence = quest:getSequence(); + + if (sequence == SEQ_000) then + return MRKR_FAINE; + elseif (sequence == SEQ_001) then + return MRKR_AHLDSKYF; + end +end \ No newline at end of file From b4227cdc4461ccdc7483dfdcf73075227c2ac341 Mon Sep 17 00:00:00 2001 From: Filip Maj Date: Thu, 24 Feb 2022 19:07:09 -0500 Subject: [PATCH 11/23] Added Sour Grapes --- Data/scripts/quests/wld/wld0l3.lua | 93 ++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) create mode 100644 Data/scripts/quests/wld/wld0l3.lua diff --git a/Data/scripts/quests/wld/wld0l3.lua b/Data/scripts/quests/wld/wld0l3.lua new file mode 100644 index 00000000..f305f194 --- /dev/null +++ b/Data/scripts/quests/wld/wld0l3.lua @@ -0,0 +1,93 @@ +require ("global") + +--[[ + +Quest Script + +Name: Sniffing Out a Profit +Code: Wld0l3 +Id: 110773 +Prereq: Level 17, Any Class + +]] + +-- Sequence Numbers +SEQ_000 = 0; -- Talk to Lolojo. +SEQ_001 = 1; -- Talk to Syzfrusk. + +-- Actor Class Ids +SYZFRUSK = 1001306; +LOLOJO = 1001603; + +-- Quest Markers +MRKR_LOLOJO = 11110201; +MRKR_SYZFRUSK = 11110202; + +function onStart(player, quest) + quest:StartSequence(SEQ_000); +end + +function onFinish(player, quest) +end + +function onStateChange(player, quest, sequence) + if (sequence == SEQ_ACCEPT) then + quest:SetENpc(SYZFRUSK, QFLAG_PLATE); + end + + if (sequence == SEQ_000) then + quest:SetENpc(SYZFRUSK); + quest:SetENpc(LOLOJO, QFLAG_PLATE); + elseif (sequence == SEQ_001) then + quest:SetENpc(LOLOJO); + quest:SetENpc(SYZFRUSK, QFLAG_REWARD); + end +end + +function onTalk(player, quest, npc, eventName) + local npcClassId = npc.GetActorClassId(); + local seq = quest:GetSequence(); + + -- Offer the quest + if (npcClassId == SYZFRUSK and not player:HasQuest(quest)) then + local questAccepted = callClientFunction(player, "delegateEvent", player, quest, "processEventOffersStart"); + if (questAccepted == 1) then + player:AcceptQuest(quest); + end + player:EndEvent(); + return; + end + + -- Quest Progress + if (seq == SEQ_000) then + if (npcClassId == SYZFRUSK) then + callClientFunction(player, "delegateEvent", player, quest, "processEventFree"); + elseif (npcClassId == LOLOJO) then + callClientFunction(player, "delegateEvent", player, quest, "processlolojoEvent"); + quest:StartSequence(SEQ_001); + end + elseif (seq == SEQ_001) then + --Quest Complete + if (npcClassId == SYZFRUSK) then + callClientFunction(player, "delegateEvent", player, quest, "processEventClear"); + callClientFunction(player, "delegateEvent", player, quest, "sqrwa", 200, 1, 1, 9); + player:CompleteQuest(quest); + elseif (npcClassId == LOLOJO) then + callClientFunction(player, "delegateEvent", player, quest, "processlolojoEventFree"); + quest:StartSequence(SEQ_001); + end + end + + quest:UpdateENPCs(); + player:EndEvent(); +end + +function getJournalMapMarkerList(player, quest) + local sequence = quest:getSequence(); + + if (sequence == SEQ_000) then + return MRKR_LOLOJO; + elseif (sequence == SEQ_001) then + return MRKR_SYZFRUSK; + end +end \ No newline at end of file From e8ee9074772fae9bdb0d9d502f47c0e74ea3d4da Mon Sep 17 00:00:00 2001 From: Filip Maj Date: Thu, 24 Feb 2022 19:23:11 -0500 Subject: [PATCH 12/23] Added A Bitter Oil to Swallow --- Data/scripts/quests/wld/wld0g3.lua | 104 +++++++++++++++++++++++++++++ 1 file changed, 104 insertions(+) create mode 100644 Data/scripts/quests/wld/wld0g3.lua diff --git a/Data/scripts/quests/wld/wld0g3.lua b/Data/scripts/quests/wld/wld0g3.lua new file mode 100644 index 00000000..c3cd8740 --- /dev/null +++ b/Data/scripts/quests/wld/wld0g3.lua @@ -0,0 +1,104 @@ +require ("global") + +--[[ + +Quest Script + +Name: A Bitter Oil to Swallow +Code: Wld0g3 +Id: 110764 +Prereq: Level 17, Any Class + +]] + +-- Sequence Numbers +SEQ_000 = 0; -- Kill Sabletooth Spriggans. +SEQ_001 = 1; -- Talk to Marcette. + +-- Actor Class Ids +ENPC_EUGENAIRE = 1001190; +BNPC_OILBUG = 2103910; + +-- Quest Markers +MRKR_EUGENAIRE = 11120201; +MRKR_OILBUG_AREA = 11120202; + +-- Counters +COUNTER_OIL = 0; + +-- Quest Details +OBJECTIVE_OIL = 8; + +function onStart(player, quest) + quest:StartSequence(SEQ_000); +end + +function onFinish(player, quest) +end + +function onStateChange(player, quest, sequence) + if (sequence == SEQ_ACCEPT) then + quest:SetENpc(ENPC_EUGENAIRE, QFLAG_PLATE); + elseif (sequence == SEQ_000) then + quest:SetENpc(ENPC_EUGENAIRE); + quest:SetENpc(BNPC_OILBUG); + elseif (sequence == SEQ_001) then + quest:SetENpc(ENPC_EUGENAIRE, QFLAG_REWARD); + end +end + +function onTalk(player, quest, npc, eventName) + local npcClassId = npc.GetActorClassId(); + local seq = quest:GetSequence(); + + -- Offer the quest + if (npcClassId == ENPC_EUGENAIRE and seq == SEQ_ACCEPT) then + local questAccepted = callClientFunction(player, "delegateEvent", player, quest, "processEventEugenaireStart"); + if (questAccepted == 1) then + player:AcceptQuest(quest); + end + player:EndEvent(); + return; + -- Quest Progress + elseif (seq == SEQ_000) then + if (npcClassId == ENPC_EUGENAIRE) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent_000"); + end + --Quest Complete + elseif (seq == SEQ_001) then + if (npcClassId == ENPC_EUGENAIRE) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent_010"); + callClientFunction(player, "delegateEvent", player, quest, "sqrwa", 200, 1, 1, 9); + player:CompleteQuest(quest); + end + end + + quest:UpdateENPCs(); + player:EndEvent(); +end + +-- TODO FINISH THIS +function onKillBNpc(player, quest, bnpc) + if (bnpc == BNPC_OILBUG) then + local counterAmount = quest:GetData():IncCounter(COUNTER_OIL); + attentionMessage(player, 51062, 0, counterAmount, 4); -- You obtain + if (counterAmount >= OBJECTIVE_OIL) then + attentionMessage(player, 25225, quest:GetQuestId()); -- Objectives complete! + quest:StartSequence(SEQ_001); + end + end +end + +function getJournalInformation(player, quest) + return quest:GetData():GetCounter(COUNTER_OIL); +end + +function getJournalMapMarkerList(player, quest) + local sequence = quest:getSequence(); + + if (sequence == SEQ_000) then + return MRKR_OILBUG_AREA; + elseif (sequence == SEQ_001) then + return MRKR_EUGENAIRE; + end +end \ No newline at end of file From b9ab842fdd9430e75d7f4162d3eaebb205b02323 Mon Sep 17 00:00:00 2001 From: Filip Maj Date: Thu, 24 Feb 2022 19:31:32 -0500 Subject: [PATCH 13/23] Added Spores on the Brain --- Data/scripts/quests/wld/wld0g3.lua | 4 +- Data/scripts/quests/wld/wld0g4.lua | 104 +++++++++++++++++++++++++++++ 2 files changed, 106 insertions(+), 2 deletions(-) create mode 100644 Data/scripts/quests/wld/wld0g4.lua diff --git a/Data/scripts/quests/wld/wld0g3.lua b/Data/scripts/quests/wld/wld0g3.lua index c3cd8740..e7577ccb 100644 --- a/Data/scripts/quests/wld/wld0g3.lua +++ b/Data/scripts/quests/wld/wld0g3.lua @@ -12,8 +12,8 @@ Prereq: Level 17, Any Class ]] -- Sequence Numbers -SEQ_000 = 0; -- Kill Sabletooth Spriggans. -SEQ_001 = 1; -- Talk to Marcette. +SEQ_000 = 0; -- Kill Oilbugs. +SEQ_001 = 1; -- Talk to Eugenaire. -- Actor Class Ids ENPC_EUGENAIRE = 1001190; diff --git a/Data/scripts/quests/wld/wld0g4.lua b/Data/scripts/quests/wld/wld0g4.lua new file mode 100644 index 00000000..ddf27916 --- /dev/null +++ b/Data/scripts/quests/wld/wld0g4.lua @@ -0,0 +1,104 @@ +require ("global") + +--[[ + +Quest Script + +Name: Spores on the Brain +Code: Wld0g4 +Id: 110765 +Prereq: Level 11, Any Class, Requires "In the Name of Science" + +]] + +-- Sequence Numbers +SEQ_000 = 0; -- Kill Mature Funguars. +SEQ_001 = 1; -- Talk to Marcette. + +-- Actor Class Ids +ENPC_MARCETTE = 1001583; +BNPC_MATURE_FUNGUAR = 2105916; + +-- Quest Markers +MRKR_MARCETTE = 11120302; +MRKR_FUNGUAR_AREA = 11120301; + +-- Counters +COUNTER_SPORESAC = 0; + +-- Quest Details +OBJECTIVE_SPORESAC = 8; + +function onStart(player, quest) + quest:StartSequence(SEQ_000); +end + +function onFinish(player, quest) +end + +function onStateChange(player, quest, sequence) + if (sequence == SEQ_ACCEPT) then + quest:SetENpc(ENPC_MARCETTE, QFLAG_PLATE); + elseif (sequence == SEQ_000) then + quest:SetENpc(ENPC_MARCETTE); + quest:SetENpc(BNPC_MATURE_FUNGUAR); + elseif (sequence == SEQ_001) then + quest:SetENpc(ENPC_MARCETTE, QFLAG_REWARD); + end +end + +function onTalk(player, quest, npc, eventName) + local npcClassId = npc.GetActorClassId(); + local seq = quest:GetSequence(); + + -- Offer the quest + if (npcClassId == ENPC_MARCETTE and seq == SEQ_ACCEPT) then + local questAccepted = callClientFunction(player, "delegateEvent", player, quest, "processEventMarcetteStart"); + if (questAccepted == 1) then + player:AcceptQuest(quest); + end + player:EndEvent(); + return; + -- Quest Progress + elseif (seq == SEQ_000) then + if (npcClassId == ENPC_MARCETTE) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent000_2"); + end + --Quest Complete + elseif (seq == SEQ_001) then + if (npcClassId == ENPC_MARCETTE) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent010"); + callClientFunction(player, "delegateEvent", player, quest, "sqrwa", 200, 1, 1, 9); + player:CompleteQuest(quest); + end + end + + quest:UpdateENPCs(); + player:EndEvent(); +end + +-- TODO FINISH THIS +function onKillBNpc(player, quest, bnpc) + if (bnpc == BNPC_MATURE_FUNGUAR) then + local counterAmount = quest:GetData():IncCounter(COUNTER_SPORESAC); + attentionMessage(player, 51062, 0, counterAmount, 4); -- You obtain + if (counterAmount >= OBJECTIVE_SPORESAC) then + attentionMessage(player, 25225, quest:GetQuestId()); -- Objectives complete! + quest:StartSequence(SEQ_001); + end + end +end + +function getJournalInformation(player, quest) + return quest:GetData():GetCounter(COUNTER_SPORESAC); +end + +function getJournalMapMarkerList(player, quest) + local sequence = quest:getSequence(); + + if (sequence == SEQ_000) then + return MRKR_FUNGUAR_AREA; + elseif (sequence == SEQ_001) then + return MRKR_MARCETTE; + end +end \ No newline at end of file From c5198783a16c1021e71057a878acec902de4f15d Mon Sep 17 00:00:00 2001 From: Filip Maj Date: Thu, 24 Feb 2022 20:31:05 -0500 Subject: [PATCH 14/23] Adding `Sleepless in Eorzea`, `Bridging the Gap`, and `The Search for Sicksa`. --- Data/scripts/quests/etc/etc1g5.lua | 104 +++++++++++++++++++++++++++++ Data/scripts/quests/etc/etc1l1.lua | 104 +++++++++++++++++++++++++++++ Data/scripts/quests/etc/etc1u1.lua | 104 +++++++++++++++++++++++++++++ 3 files changed, 312 insertions(+) create mode 100644 Data/scripts/quests/etc/etc1g5.lua create mode 100644 Data/scripts/quests/etc/etc1l1.lua create mode 100644 Data/scripts/quests/etc/etc1u1.lua diff --git a/Data/scripts/quests/etc/etc1g5.lua b/Data/scripts/quests/etc/etc1g5.lua new file mode 100644 index 00000000..3a3bba1e --- /dev/null +++ b/Data/scripts/quests/etc/etc1g5.lua @@ -0,0 +1,104 @@ +require ("global") + +--[[ + +Quest Script + +Name: The Search for Sicksa +Code: Etc1g5 +Id: 110659 +Prereq: Level 10, Any Class + +]] + +-- Sequence Numbers +SEQ_000 = 0; -- Kill Bristletail Marmots. +SEQ_001 = 1; -- Talk to Beli. + +-- Actor Class Ids +ENPC_BELI = 1001077; +BNPC_BRISTLETAIL_MARMOT = 2104022; + +-- Quest Markers +MRKR_BRISTLETAIL_AREA = 11065901; +MRKR_BELI = 11065902; + +-- Counters +COUNTER_MARMOTHIDE = 0; + +-- Quest Details +OBJECTIVE_MARMOTHIDE = 8; + +function onStart(player, quest) + quest:StartSequence(SEQ_000); +end + +function onFinish(player, quest) +end + +function onStateChange(player, quest, sequence) + if (sequence == SEQ_ACCEPT) then + quest:SetENpc(ENPC_BELI, QFLAG_PLATE); + elseif (sequence == SEQ_000) then + quest:SetENpc(ENPC_BELI); + quest:SetENpc(BNPC_BRISTLETAIL_MARMOT); + elseif (sequence == SEQ_001) then + quest:SetENpc(ENPC_BELI, QFLAG_REWARD); + end +end + +function onTalk(player, quest, npc, eventName) + local npcClassId = npc.GetActorClassId(); + local seq = quest:GetSequence(); + + -- Offer the quest + if (npcClassId == ENPC_BELI and seq == SEQ_ACCEPT) then + local questAccepted = callClientFunction(player, "delegateEvent", player, quest, "processEventLahonoStart"); + if (questAccepted == 1) then + player:AcceptQuest(quest); + end + player:EndEvent(); + return; + -- Quest Progress + elseif (seq == SEQ_000) then + if (npcClassId == ENPC_BELI) then + callClientFunction(player, "delegateEvent", player, quest, "processEventFree"); + end + --Quest Complete + elseif (seq == SEQ_001) then + if (npcClassId == ENPC_BELI) then + callClientFunction(player, "delegateEvent", player, quest, "processEventAfter"); + callClientFunction(player, "delegateEvent", player, quest, "sqrwa", 200, 1, 1, 9); + player:CompleteQuest(quest); + end + end + + quest:UpdateENPCs(); + player:EndEvent(); +end + +-- TODO FINISH THIS +function onKillBNpc(player, quest, bnpc) + if (bnpc == BNPC_BRISTLETAIL_MARMOT) then + local counterAmount = quest:GetData():IncCounter(COUNTER_MARMOTHIDE); + attentionMessage(player, 51062, 0, counterAmount, 4); -- You obtain + if (counterAmount >= OBJECTIVE_MARMOTHIDE) then + attentionMessage(player, 25225, quest:GetQuestId()); -- Objectives complete! + quest:StartSequence(SEQ_001); + end + end +end + +function getJournalInformation(player, quest) + return quest:GetData():GetCounter(COUNTER_MARMOTHIDE); +end + +function getJournalMapMarkerList(player, quest) + local sequence = quest:getSequence(); + + if (sequence == SEQ_000) then + return MRKR_BRISTLETAIL_AREA; + elseif (sequence == SEQ_001) then + return MRKR_BELI; + end +end \ No newline at end of file diff --git a/Data/scripts/quests/etc/etc1l1.lua b/Data/scripts/quests/etc/etc1l1.lua new file mode 100644 index 00000000..4a9cbe04 --- /dev/null +++ b/Data/scripts/quests/etc/etc1l1.lua @@ -0,0 +1,104 @@ +require ("global") + +--[[ + +Quest Script + +Name: Bridging the Gap +Code: Etc1l1 +Id: 110634 +Prereq: Level 10, Any Class + +]] + +-- Sequence Numbers +SEQ_000 = 0; -- Kill Toll Puks. +SEQ_001 = 1; -- Talk to Hihine. + +-- Actor Class Ids +ENPC_HIHINE = 1000267; +BNPC_TOLL_PUK = 2100113; + +-- Quest Markers +MRKR_TOLLPUK_AREA = 11063401; +MRKR_HIHINE = 11063402; + +-- Counters +COUNTER_KILLS = 0; + +-- Quest Details +OBJECTIVE_KILLS = 8; + +function onStart(player, quest) + quest:StartSequence(SEQ_000); +end + +function onFinish(player, quest) +end + +function onStateChange(player, quest, sequence) + if (sequence == SEQ_ACCEPT) then + quest:SetENpc(ENPC_HIHINE, QFLAG_PLATE); + elseif (sequence == SEQ_000) then + quest:SetENpc(ENPC_HIHINE); + quest:SetENpc(BNPC_TOLL_PUK); + elseif (sequence == SEQ_001) then + quest:SetENpc(ENPC_HIHINE, QFLAG_REWARD); + end +end + +function onTalk(player, quest, npc, eventName) + local npcClassId = npc.GetActorClassId(); + local seq = quest:GetSequence(); + + -- Offer the quest + if (npcClassId == ENPC_HIHINE and seq == SEQ_ACCEPT) then + local questAccepted = callClientFunction(player, "delegateEvent", player, quest, "processEventHihineStart"); + if (questAccepted == 1) then + player:AcceptQuest(quest); + end + player:EndEvent(); + return; + -- Quest Progress + elseif (seq == SEQ_000) then + if (npcClassId == ENPC_HIHINE) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent005_2"); + end + --Quest Complete + elseif (seq == SEQ_001) then + if (npcClassId == ENPC_HIHINE) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent010"); + callClientFunction(player, "delegateEvent", player, quest, "sqrwa", 200, 1, 1, 9); + player:CompleteQuest(quest); + end + end + + quest:UpdateENPCs(); + player:EndEvent(); +end + +-- TODO FINISH THIS +function onKillBNpc(player, quest, bnpc) + if (bnpc == BNPC_TOLL_PUK) then + local counterAmount = quest:GetData():IncCounter(COUNTER_SLUMBERNUT); + attentionMessage(player, 51062, 0, counterAmount, 4); -- You obtain + if (counterAmount >= OBJECTIVE_SLUMBERNUT) then + attentionMessage(player, 25225, quest:GetQuestId()); -- Objectives complete! + quest:StartSequence(SEQ_001); + end + end +end + +function getJournalInformation(player, quest) + return quest:GetData():GetCounter(COUNTER_SLUMBERNUT); +end + +function getJournalMapMarkerList(player, quest) + local sequence = quest:getSequence(); + + if (sequence == SEQ_000) then + return MRKR_TOLLPUK_AREA; + elseif (sequence == SEQ_001) then + return MRKR_HIHINE; + end +end \ No newline at end of file diff --git a/Data/scripts/quests/etc/etc1u1.lua b/Data/scripts/quests/etc/etc1u1.lua new file mode 100644 index 00000000..d5c13804 --- /dev/null +++ b/Data/scripts/quests/etc/etc1u1.lua @@ -0,0 +1,104 @@ +require ("global") + +--[[ + +Quest Script + +Name: Sleepless in Eorzea +Code: Etc1u1 +Id: 110676 +Prereq: Level 10, Any Class + +]] + +-- Sequence Numbers +SEQ_000 = 0; -- Kill Nutgrabber Marmots. +SEQ_001 = 1; -- Talk to Kukusi. + +-- Actor Class Ids +ENPC_KUKUSI = 1001463; +BNPC_NUTGRABBER_MARMOT = 2104021; + +-- Quest Markers +MRKR_NUTGRABBER_AREA = 11067601; +MRKR_KUKUSI = 11067602; + +-- Counters +COUNTER_SLUMBERNUT = 0; + +-- Quest Details +OBJECTIVE_SLUMBERNUT = 8; + +function onStart(player, quest) + quest:StartSequence(SEQ_000); +end + +function onFinish(player, quest) +end + +function onStateChange(player, quest, sequence) + if (sequence == SEQ_ACCEPT) then + quest:SetENpc(ENPC_KUKUSI, QFLAG_PLATE); + elseif (sequence == SEQ_000) then + quest:SetENpc(ENPC_KUKUSI); + quest:SetENpc(BNPC_NUTGRABBER_MARMOT); + elseif (sequence == SEQ_001) then + quest:SetENpc(ENPC_KUKUSI, QFLAG_REWARD); + end +end + +function onTalk(player, quest, npc, eventName) + local npcClassId = npc.GetActorClassId(); + local seq = quest:GetSequence(); + + -- Offer the quest + if (npcClassId == ENPC_KUKUSI and seq == SEQ_ACCEPT) then + local questAccepted = callClientFunction(player, "delegateEvent", player, quest, "processEventKukusiStart"); + if (questAccepted == 1) then + player:AcceptQuest(quest); + end + player:EndEvent(); + return; + -- Quest Progress + elseif (seq == SEQ_000) then + if (npcClassId == ENPC_KUKUSI) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent000_2"); + end + --Quest Complete + elseif (seq == SEQ_001) then + if (npcClassId == ENPC_KUKUSI) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent000_3"); + callClientFunction(player, "delegateEvent", player, quest, "sqrwa", 200, 1, 1, 9); + player:CompleteQuest(quest); + end + end + + quest:UpdateENPCs(); + player:EndEvent(); +end + +-- TODO FINISH THIS +function onKillBNpc(player, quest, bnpc) + if (bnpc == BNPC_NUTGRABBER_MARMOT) then + local counterAmount = quest:GetData():IncCounter(COUNTER_SLUMBERNUT); + attentionMessage(player, 51062, 0, counterAmount, 4); -- You obtain + if (counterAmount >= OBJECTIVE_SLUMBERNUT) then + attentionMessage(player, 25225, quest:GetQuestId()); -- Objectives complete! + quest:StartSequence(SEQ_001); + end + end +end + +function getJournalInformation(player, quest) + return quest:GetData():GetCounter(COUNTER_SLUMBERNUT); +end + +function getJournalMapMarkerList(player, quest) + local sequence = quest:getSequence(); + + if (sequence == SEQ_000) then + return MRKR_NUTGRABBER_AREA; + elseif (sequence == SEQ_001) then + return MRKR_KUKUSI; + end +end \ No newline at end of file From f84899ff2e74f4377519aa9cabd16543562880b3 Mon Sep 17 00:00:00 2001 From: Filip Maj Date: Thu, 24 Feb 2022 22:48:55 -0500 Subject: [PATCH 15/23] Added Assessin the Damage --- Data/scripts/quests/etc/etc1l0.lua | 104 +++++++++++++++++++++++++++++ 1 file changed, 104 insertions(+) create mode 100644 Data/scripts/quests/etc/etc1l0.lua diff --git a/Data/scripts/quests/etc/etc1l0.lua b/Data/scripts/quests/etc/etc1l0.lua new file mode 100644 index 00000000..f65d550a --- /dev/null +++ b/Data/scripts/quests/etc/etc1l0.lua @@ -0,0 +1,104 @@ +require ("global") + +--[[ + +Quest Script + +Name: Assessing the Damage +Code: Etc1l0 +Id: 110633 +Prereq: Level 20, Any Class + +]] + +-- Sequence Numbers +SEQ_000 = 0; -- Kill Toll Puks. +SEQ_001 = 1; -- Talk to HALDBERK. + +-- Actor Class Ids +ENPC_HALDBERK = 1000160; +BNPC_JETSAM_JELLIES = 2105409; + +-- Quest Markers +MRKR_JELLIES_AREA = 11063301; +MRKR_HALDBERK = 11063302; + +-- Counters +COUNTER_RINGS = 0; + +-- Quest Details +OBJECTIVE_RINGS = 8; + +function onStart(player, quest) + quest:StartSequence(SEQ_000); +end + +function onFinish(player, quest) +end + +function onStateChange(player, quest, sequence) + if (sequence == SEQ_ACCEPT) then + quest:SetENpc(ENPC_HALDBERK, QFLAG_PLATE); + elseif (sequence == SEQ_000) then + quest:SetENpc(ENPC_HALDBERK); + quest:SetENpc(BNPC_JETSAM_JELLIES); + elseif (sequence == SEQ_001) then + quest:SetENpc(ENPC_HALDBERK, QFLAG_REWARD); + end +end + +function onTalk(player, quest, npc, eventName) + local npcClassId = npc.GetActorClassId(); + local seq = quest:GetSequence(); + + -- Offer the quest + if (npcClassId == ENPC_HALDBERK and seq == SEQ_ACCEPT) then + local questAccepted = callClientFunction(player, "delegateEvent", player, quest, "processEventHaldberkStart"); + if (questAccepted == 1) then + player:AcceptQuest(quest); + end + player:EndEvent(); + return; + -- Quest Progress + elseif (seq == SEQ_000) then + if (npcClassId == ENPC_HALDBERK) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent000"); + end + --Quest Complete + elseif (seq == SEQ_001) then + if (npcClassId == ENPC_HALDBERK) then + callClientFunction(player, "delegateEvent", player, quest, "Etc1l0.processEvent010"); + callClientFunction(player, "delegateEvent", player, quest, "sqrwa", 200, 1, 1, 9); + player:CompleteQuest(quest); + end + end + + quest:UpdateENPCs(); + player:EndEvent(); +end + +-- TODO FINISH THIS +function onKillBNpc(player, quest, bnpc) + if (bnpc == BNPC_JETSAM_JELLIES) then + local counterAmount = quest:GetData():IncCounter(COUNTER_RINGS); + attentionMessage(player, 51062, 0, counterAmount, 4); -- You obtain + if (counterAmount >= OBJECTIVE_RINGS) then + attentionMessage(player, 25225, quest:GetQuestId()); -- Objectives complete! + quest:StartSequence(SEQ_001); + end + end +end + +function getJournalInformation(player, quest) + return quest:GetData():GetCounter(COUNTER_RINGS); +end + +function getJournalMapMarkerList(player, quest) + local sequence = quest:getSequence(); + + if (sequence == SEQ_000) then + return MRKR_JELLIES_AREA; + elseif (sequence == SEQ_001) then + return MRKR_HALDBERK; + end +end \ No newline at end of file From 96f9119cca278e5889f1c54b8dbddff31b693944 Mon Sep 17 00:00:00 2001 From: Filip Maj Date: Thu, 24 Feb 2022 22:59:06 -0500 Subject: [PATCH 16/23] Fixed Waste Not Want Not now that the quest system is final. --- Data/scripts/quests/etc/etc5g0.lua | 34 +++++++++++++----------------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/Data/scripts/quests/etc/etc5g0.lua b/Data/scripts/quests/etc/etc5g0.lua index 4d3588a5..5ab4d179 100644 --- a/Data/scripts/quests/etc/etc5g0.lua +++ b/Data/scripts/quests/etc/etc5g0.lua @@ -13,8 +13,8 @@ Notes: Rewards 200 gil ]] -- Sequence Numbers -SEQ_000 = 0; -- Talk to Pfarahr -SEQ_001 = 1; -- Return to V'korolon +SEQ_000 = 0; -- Talk to Pfarahr. +SEQ_001 = 1; -- Return to V'korolon. -- Actor Class Ids VKOROLON = 1000458; @@ -54,23 +54,25 @@ function onTalk(player, quest, npc) local classId = npc:GetActorClassId(); if (sequence == SEQ_ACCEPT) then - callClientFunction(player, "delegateEvent", player, quest, "processEventVKOROLONStart"); - end - - if (sequence == SEQ_000) then + local questAccepted = callClientFunction(player, "delegateEvent", player, quest, "processEventVKOROLONStart"); + if (questAccepted == 1) then + player:AcceptQuest(quest); + end + player:EndEvent(); + return; + elseif (sequence == SEQ_000) then if (classId == VKOROLON) then callClientFunction(player, "delegateEvent", player, quest, "processEvent_000_1"); elseif (classId == PFARAHR) then callClientFunction(player, "delegateEvent", player, quest, "processEvent_010"); quest:StartSequence(SEQ_001); - quest:DoComplete(); -- Need ref since it feels out of place. Just placing it here since original script had it. end elseif (sequence == SEQ_001) then if (classId == VKOROLON) then callClientFunction(player, "delegateEvent", player, quest, "processEvent_020"); - --callClientFunction(player, "delegateEvent", player, quest, "sqrwa", 200, 1); -- Reward window, shouldn't be handled by quest script - player:CompleteQuest(quest:GetQuestId()); + callClientFunction(player, "delegateEvent", player, quest, "sqrwa", 200, 1) + player:CompleteQuest(quest); elseif (classId == PFARAHR) then callClientFunction(player, "delegateEvent", player, quest, "processEvent_010_1"); end @@ -79,27 +81,21 @@ function onTalk(player, quest, npc) quest:UpdateENPCs(); end - function getJournalInformation(player, quest) - local sequence = quest:getSequence(); - + local sequence = quest:getSequence(); if (sequence == SEQ_000) then return ITEM_WELL_WORN_BAG; end end - function getJournalMapMarkerList(player, quest) local sequence = quest:getSequence(); - local possibleMarkers = {}; if (sequence == SEQ_000) then - table.insert(possibleMarkers, MRKR_PFARAHR); + return MRKR_PFARAHR; elseif (sequence == SEQ_001) then - table.insert(possibleMarkers, MRKR_VKOROLON); - end - - return unpack(possibleMarkers) + return MRKR_VKOROLON; + end end From f491c63b9818ab3bb2fb5d88aa1d77bf61d1ad1b Mon Sep 17 00:00:00 2001 From: Filip Maj Date: Tue, 1 Mar 2022 14:29:59 -0500 Subject: [PATCH 17/23] The journal update msg shows even when completing quests now. Added Revenge on the Reavers, Till Death Do Us Part, Beryl Overboard, Have You Seen My Son, and Food for Thought. --- Data/scripts/quests/etc/etc1l3.lua | 108 +++++++++++++++ Data/scripts/quests/etc/etc1l5.lua | 104 ++++++++++++++ Data/scripts/quests/etc/etc1l6.lua | 104 ++++++++++++++ Data/scripts/quests/etc/etc1l7.lua | 133 ++++++++++++++++++ Data/scripts/quests/etc/etc1l8.lua | 213 +++++++++++++++++++++++++++++ Map Server/Actors/Quest/Quest.cs | 3 +- 6 files changed, 663 insertions(+), 2 deletions(-) create mode 100644 Data/scripts/quests/etc/etc1l3.lua create mode 100644 Data/scripts/quests/etc/etc1l5.lua create mode 100644 Data/scripts/quests/etc/etc1l6.lua create mode 100644 Data/scripts/quests/etc/etc1l7.lua create mode 100644 Data/scripts/quests/etc/etc1l8.lua diff --git a/Data/scripts/quests/etc/etc1l3.lua b/Data/scripts/quests/etc/etc1l3.lua new file mode 100644 index 00000000..a6f58c8e --- /dev/null +++ b/Data/scripts/quests/etc/etc1l3.lua @@ -0,0 +1,108 @@ +require ("global") + +--[[ + +Quest Script + +Name: Revenge on the Reavers +Code: Etc1l3 +Id: 110636 +Prereq: Level 45, Any DoW/DoM + +]] + +-- Sequence Numbers +SEQ_000 = 0; -- Kill Reavers. +SEQ_001 = 1; -- Talk to Chaunollet. + +-- Actor Class Ids +ENPC_CHAUNOLLET = 1000125; +BNPC_REAVER_CLAWS = 2180301; +BNPC_REAVER_FINS = 2180302; +BNPC_REAVER_EYES = 2180303; + +-- Quest Markers +MRKR_REAVER_AREA = 11063601; +MRKR_CHAUNOLLET = 11063602; + +-- Counters +COUNTER_QUESTITEM = 0; + +-- Quest Details +OBJECTIVE_AMOUNT = 8; + +function onStart(player, quest) + quest:StartSequence(SEQ_000); +end + +function onFinish(player, quest) +end + +function onStateChange(player, quest, sequence) + if (sequence == SEQ_ACCEPT) then + quest:SetENpc(ENPC_CHAUNOLLET, QFLAG_PLATE); + elseif (sequence == SEQ_000) then + quest:SetENpc(ENPC_CHAUNOLLET); + quest:SetENpc(BNPC_REAVER_EYES); + quest:SetENpc(BNPC_REAVER_FINS); + quest:SetENpc(BNPC_REAVER_CLAWS); + elseif (sequence == SEQ_001) then + quest:SetENpc(ENPC_CHAUNOLLET, QFLAG_REWARD); + end +end + +function onTalk(player, quest, npc, eventName) + local npcClassId = npc.GetActorClassId(); + local seq = quest:GetSequence(); + + -- Offer the quest + if (npcClassId == ENPC_CHAUNOLLET and seq == SEQ_ACCEPT) then + local questAccepted = callClientFunction(player, "delegateEvent", player, quest, "processEventChaunolletStart"); + if (questAccepted == 1) then + player:AcceptQuest(quest); + end + player:EndEvent(); + return; + -- Quest Progress + elseif (seq == SEQ_000) then + if (npcClassId == ENPC_CHAUNOLLET) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent000Chaunollet"); + end + --Quest Complete + elseif (seq == SEQ_001) then + if (npcClassId == ENPC_CHAUNOLLET) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent010Chaunollet"); + callClientFunction(player, "delegateEvent", player, quest, "sqrwa", 200, 1, 1, 9); + player:CompleteQuest(quest); + end + end + + quest:UpdateENPCs(); + player:EndEvent(); +end + +-- TODO FINISH THIS +function onKillBNpc(player, quest, bnpc) + if (bnpc == BNPC_REAVER_EYES or bnpc == BNPC_REAVER_FINS or bnpc == BNPC_REAVER_CLAWS) then + local counterAmount = quest:GetData():IncCounter(COUNTER_QUESTITEM); + attentionMessage(player, 51062, 0, counterAmount, 4); -- You obtain + if (counterAmount >= OBJECTIVE_AMOUNT) then + attentionMessage(player, 25225, quest:GetQuestId()); -- Objectives complete! + quest:StartSequence(SEQ_001); + end + end +end + +function getJournalInformation(player, quest) + return quest:GetData():GetCounter(COUNTER_QUESTITEM); +end + +function getJournalMapMarkerList(player, quest) + local sequence = quest:getSequence(); + + if (sequence == SEQ_000) then + return MRKR_REAVER_AREA; + elseif (sequence == SEQ_001) then + return MRKR_CHAUNOLLET; + end +end \ No newline at end of file diff --git a/Data/scripts/quests/etc/etc1l5.lua b/Data/scripts/quests/etc/etc1l5.lua new file mode 100644 index 00000000..46e69825 --- /dev/null +++ b/Data/scripts/quests/etc/etc1l5.lua @@ -0,0 +1,104 @@ +require ("global") + +--[[ + +Quest Script + +Name: Till Death Do Us Part +Code: Etc1l5 +Id: 110638 +Prereq: Level 20, Any DoW/DoM + +]] + +-- Sequence Numbers +SEQ_000 = 0; -- Kill Musk Roselings. +SEQ_001 = 1; -- Talk to H'lahono. + +-- Actor Class Ids +ENPC_HLAHONO = 1000250; +BNPC_MUSK_ROSELING = 2102717; + +-- Quest Markers +MRKR_ROSELING_AREA = 11063801; +MRKR_HLAHONO = 11063802; + +-- Counters +COUNTER_QUESTITEM = 0; + +-- Quest Details +OBJECTIVE_AMOUNT = 8; + +function onStart(player, quest) + quest:StartSequence(SEQ_000); +end + +function onFinish(player, quest) +end + +function onStateChange(player, quest, sequence) + if (sequence == SEQ_ACCEPT) then + quest:SetENpc(ENPC_HLAHONO, QFLAG_PLATE); + elseif (sequence == SEQ_000) then + quest:SetENpc(ENPC_HLAHONO); + quest:SetENpc(BNPC_MUSK_ROSELING); + elseif (sequence == SEQ_001) then + quest:SetENpc(ENPC_HLAHONO, QFLAG_REWARD); + end +end + +function onTalk(player, quest, npc, eventName) + local npcClassId = npc.GetActorClassId(); + local seq = quest:GetSequence(); + + -- Offer the quest + if (npcClassId == ENPC_HLAHONO and seq == SEQ_ACCEPT) then + local questAccepted = callClientFunction(player, "delegateEvent", player, quest, "processEventLahonoStart"); + if (questAccepted == 1) then + player:AcceptQuest(quest); + end + player:EndEvent(); + return; + -- Quest Progress + elseif (seq == SEQ_000) then + if (npcClassId == ENPC_HLAHONO) then + callClientFunction(player, "delegateEvent", player, quest, "processEventFree"); + end + --Quest Complete + elseif (seq == SEQ_001) then + if (npcClassId == ENPC_HLAHONO) then + callClientFunction(player, "delegateEvent", player, quest, "processEventAfter"); + callClientFunction(player, "delegateEvent", player, quest, "sqrwa", 200, 1, 1, 9); + player:CompleteQuest(quest); + end + end + + quest:UpdateENPCs(); + player:EndEvent(); +end + +-- TODO FINISH THIS +function onKillBNpc(player, quest, bnpc) + if (bnpc == BNPC_MUSK_ROSELING) then + local counterAmount = quest:GetData():IncCounter(COUNTER_QUESTITEM); + attentionMessage(player, 51062, 0, counterAmount, 4); -- You obtain + if (counterAmount >= OBJECTIVE_AMOUNT) then + attentionMessage(player, 25225, quest:GetQuestId()); -- Objectives complete! + quest:StartSequence(SEQ_001); + end + end +end + +function getJournalInformation(player, quest) + return quest:GetData():GetCounter(COUNTER_QUESTITEM); +end + +function getJournalMapMarkerList(player, quest) + local sequence = quest:getSequence(); + + if (sequence == SEQ_000) then + return MRKR_ROSELING_AREA; + elseif (sequence == SEQ_001) then + return MRKR_HLAHONO; + end +end \ No newline at end of file diff --git a/Data/scripts/quests/etc/etc1l6.lua b/Data/scripts/quests/etc/etc1l6.lua new file mode 100644 index 00000000..ce29c0cc --- /dev/null +++ b/Data/scripts/quests/etc/etc1l6.lua @@ -0,0 +1,104 @@ +require ("global") + +--[[ + +Quest Script + +Name: Beryl Overboard +Code: Etc1l6 +Id: 110639 +Prereq: Level 20, Any DoW/DoM, Requires Etc1l5 + +]] + +-- Sequence Numbers +SEQ_000 = 0; -- Kill Beryl Crabs. +SEQ_001 = 1; -- Talk to Nanapiri. + +-- Actor Class Ids +ENPC_NANAPIRI = 1000136; +BNPC_BERYL_CRAB = 2107613; + +-- Quest Markers +MRKR_CRAB_AREA = 11063901; +MRKR_NANAPIRI = 11063902; + +-- Counters +COUNTER_QUESTITEM = 0; + +-- Quest Details +OBJECTIVE_AMOUNT = 8; + +function onStart(player, quest) + quest:StartSequence(SEQ_000); +end + +function onFinish(player, quest) +end + +function onStateChange(player, quest, sequence) + if (sequence == SEQ_ACCEPT) then + quest:SetENpc(ENPC_NANAPIRI, QFLAG_PLATE); + elseif (sequence == SEQ_000) then + quest:SetENpc(ENPC_NANAPIRI); + quest:SetENpc(BNPC_BERYL_CRAB); + elseif (sequence == SEQ_001) then + quest:SetENpc(ENPC_NANAPIRI, QFLAG_REWARD); + end +end + +function onTalk(player, quest, npc, eventName) + local npcClassId = npc.GetActorClassId(); + local seq = quest:GetSequence(); + + -- Offer the quest + if (npcClassId == ENPC_NANAPIRI and seq == SEQ_ACCEPT) then + local questAccepted = callClientFunction(player, "delegateEvent", player, quest, "processEventNanapiriStart"); + if (questAccepted == 1) then + player:AcceptQuest(quest); + end + player:EndEvent(); + return; + -- Quest Progress + elseif (seq == SEQ_000) then + if (npcClassId == ENPC_NANAPIRI) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent005_2"); + end + --Quest Complete + elseif (seq == SEQ_001) then + if (npcClassId == ENPC_NANAPIRI) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent010"); + callClientFunction(player, "delegateEvent", player, quest, "sqrwa", 200, 1, 1, 9); + player:CompleteQuest(quest); + end + end + + quest:UpdateENPCs(); + player:EndEvent(); +end + +-- TODO FINISH THIS +function onKillBNpc(player, quest, bnpc) + if (bnpc == BNPC_BERYL_CRAB) then + local counterAmount = quest:GetData():IncCounter(COUNTER_QUESTITEM); + attentionMessage(player, 51062, 0, counterAmount, 4); -- You obtain + if (counterAmount >= OBJECTIVE_AMOUNT) then + attentionMessage(player, 25225, quest:GetQuestId()); -- Objectives complete! + quest:StartSequence(SEQ_001); + end + end +end + +function getJournalInformation(player, quest) + return quest:GetData():GetCounter(COUNTER_QUESTITEM); +end + +function getJournalMapMarkerList(player, quest) + local sequence = quest:getSequence(); + + if (sequence == SEQ_000) then + return MRKR_CRAB_AREA; + elseif (sequence == SEQ_001) then + return MRKR_NANAPIRI; + end +end \ No newline at end of file diff --git a/Data/scripts/quests/etc/etc1l7.lua b/Data/scripts/quests/etc/etc1l7.lua new file mode 100644 index 00000000..1679a1e8 --- /dev/null +++ b/Data/scripts/quests/etc/etc1l7.lua @@ -0,0 +1,133 @@ +require ("global") + +--[[ + +Quest Script + +Name: Have You Seen My Son +Code: Etc1l7 +Id: 110640 +Prereq: Level 30, Any DoW/DoM + +]] + +-- Sequence Numbers +SEQ_000 = 0; -- Talk to Yuyubesu. +SEQ_001 = 1; -- Kill Bomb Embers. +SEQ_002 = 2; -- Return to Yuyubesu. +SEQ_003 = 3; -- Talk to Hildie. + +-- Actor Class Ids +ENPC_IMANIA = 1001567; +ENPC_YUYUBESU = 1001166; +ENPC_HILDIE = 1000787; +BNPC_BOMB_EMBER = 2101609; + +-- Quest Markers +MRKR_YUYUBESU = 11064001; +MRKR_HILDIE = 11064002; +MRKR_BOMB_AREA = 11064003; + +-- Counters +COUNTER_QUESTITEM = 0; + +-- Quest Details +OBJECTIVE_AMOUNT = 8; + +function onStart(player, quest) + quest:StartSequence(SEQ_000); +end + +function onFinish(player, quest) +end + +function onStateChange(player, quest, sequence) + if (sequence == SEQ_ACCEPT) then + quest:SetENpc(ENPC_IMANIA, QFLAG_PLATE); + elseif (sequence == SEQ_000) then + quest:SetENpc(ENPC_IMANIA); + quest:SetENpc(ENPC_YUYUBESU, QFLAG_REWARD); + elseif (sequence == SEQ_001) then + quest:SetENpc(ENPC_YUYUBESU); + quest:SetENpc(BNPC_BOMB_EMBER); + elseif (sequence == SEQ_002) then + quest:SetENpc(ENPC_YUYUBESU, QFLAG_REWARD); + elseif (sequence == SEQ_003) then + quest:SetENpc(ENPC_YUYUBESU); + quest:SetENpc(ENPC_HILDIE, QFLAG_REWARD); + end +end + +function onTalk(player, quest, npc, eventName) + local npcClassId = npc.GetActorClassId(); + local seq = quest:GetSequence(); + + -- Offer the quest + if (npcClassId == ENPC_IMANIA and seq == SEQ_ACCEPT) then + local questAccepted = callClientFunction(player, "delegateEvent", player, quest, "processEventImaniaStart"); + if (questAccepted == 1) then + player:AcceptQuest(quest); + end + player:EndEvent(); + return; + -- Quest Progress + elseif (seq == SEQ_000) then + if (npcClassId == ENPC_IMANIA) then + callClientFunction(player, "delegateEvent", player, quest, "processEventImaniaFree"); + elseif (npcClassId == ENPC_YUYUBESU) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent000"); + quest:StartSequence(SEQ_001); + end + --Quest Complete + elseif (seq == SEQ_001) then + if (npcClassId == ENPC_YUYUBESU) then + callClientFunction(player, "delegateEvent", player, quest, "processEventYuyubesuFree"); + end + elseif (seq == SEQ_002) then + if (npcClassId == ENPC_YUYUBESU) then + callClientFunction(player, "delegateEvent", player, quest, "processEventYuyubesuAfter"); + quest:StartSequence(SEQ_003); + end + elseif (seq == SEQ_003) then + if (npcClassId == ENPC_YUYUBESU) then + callClientFunction(player, "delegateEvent", player, quest, "processEventYuyubesuAfterFree"); + elseif (npcClassId == ENPC_HILDIE) then + callClientFunction(player, "delegateEvent", player, quest, "processEventHildie"); + callClientFunction(player, "delegateEvent", player, quest, "sqrwa", 200, 1, 1, 9); + player:CompleteQuest(quest); + end + end + + quest:UpdateENPCs(); + player:EndEvent(); +end + +-- TODO FINISH THIS +function onKillBNpc(player, quest, bnpc) + if (bnpc == BNPC_BOMB_EMBER) then + local counterAmount = quest:GetData():IncCounter(COUNTER_QUESTITEM); + attentionMessage(player, 51062, 0, counterAmount, 4); -- You obtain + if (counterAmount >= OBJECTIVE_AMOUNT) then + attentionMessage(player, 25225, quest:GetQuestId()); -- Objectives complete! + quest:StartSequence(SEQ_002); + end + end +end + +function getJournalInformation(player, quest) + return quest:GetData():GetCounter(COUNTER_QUESTITEM); +end + +function getJournalMapMarkerList(player, quest) + local sequence = quest:getSequence(); + + if (sequence == SEQ_000) then + return MRKR_YUYUBESU; + elseif (sequence == SEQ_001) then + return MRKR_BOMB_AREA; + elseif (sequence == SEQ_002) then + return MRKR_YUYUBESU; + elseif (sequence == SEQ_003) then + return MRKR_HILDIE; + end +end \ No newline at end of file diff --git a/Data/scripts/quests/etc/etc1l8.lua b/Data/scripts/quests/etc/etc1l8.lua new file mode 100644 index 00000000..32acc653 --- /dev/null +++ b/Data/scripts/quests/etc/etc1l8.lua @@ -0,0 +1,213 @@ +require ("global") + +--[[ + +Quest Script + +Name: Food for Thought +Code: Etc1l8 +Id: 110641 +Prereq: Level 20, Any Class + +]] + +-- Sequence Numbers +SEQ_000 = 0; -- Spread rumors to all, must perform /psych. +SEQ_001 = 1; -- Return to Dympna. + +-- Actor Class Ids +DYMPNA = 1000331; +AERGWNYT = 1000347; +FERDILLAIX = 1000344; +BUBUROON = 1000219; +RBAHARRA = 1000340; +FUFUNA = 1000345; + +-- Quest Markers +MRKR_DYMPNA = 11064101; +MRKR_AERGWNYT = 11064102; +MRKR_FERDILLAIX = 11064103; +MRKR_BUBUROON = 11064104; +MRKR_RBAHARRA = 11064105; +MRKR_FUFUNA = 11064106; + +-- Quest Flags +FLAG_TALKED_AERGWNYT = 0; +FLAG_TALKED_FERDILLAIX = 1; +FLAG_TALKED_BUBUROON = 2; +FLAG_TALKED_RBAHARRA = 3; +FLAG_TALKED_FUFUNA = 4; + +-- Quest Counters +COUNTER_TALKED = 0; + +function onStart(player, quest) + quest:StartSequence(SEQ_000); +end + +function onFinish(player, quest) +end + +function onStateChange(player, quest, sequence) + if (sequence == SEQ_ACCEPT) then + quest:SetENpc(DYMPNA, QFLAG_NORM); + end + + local data = quest:GetData(); + if (sequence == SEQ_000) then + quest:SetENpc(DYMPNA); + quest:SetENpc(AERGWNYT, (not data:GetFlag(FLAG_TALKED_AERGWNYT) and QFLAG_NORM or QFLAG_NONE)); + quest:SetENpc(FERDILLAIX, (not data:GetFlag(FLAG_TALKED_FERDILLAIX) and QFLAG_NORM or QFLAG_NONE)); + quest:SetENpc(BUBUROON, (not data:GetFlag(FLAG_TALKED_BUBUROON) and QFLAG_NORM or QFLAG_NONE)); + quest:SetENpc(RBAHARRA, (not data:GetFlag(FLAG_TALKED_RBAHARRA) and QFLAG_NORM or QFLAG_NONE)); + quest:SetENpc(FUFUNA, (not data:GetFlag(FLAG_TALKED_FUFUNA) and QFLAG_NORM or QFLAG_NONE)); + elseif (sequence == SEQ_001) then + quest:SetENpc(DYMPNA, QFLAG_REWARD); + end +end + +function onTalk(player, quest, npc, eventName) + local npcClassId = npc.GetActorClassId(); + local seq = quest:GetSequence(); + + -- Offer the quest + if (npcClassId == DYMPNA and not player:HasQuest(quest)) then + local questAccepted = callClientFunction(player, "delegateEvent", player, quest, "processEventOffersStart"); + if (questAccepted == 1) then + player:AcceptQuest(quest); + end + player:EndEvent(); + return; + end + + -- Quest Progress + local data = quest:GetData(); + if (seq == SEQ_000) then + if (npcClassId == DYMPNA) then + callClientFunction(player, "delegateEvent", player, quest, "processEventOffersAfter"); + elseif (npcClassId == AERGWNYT) then + if (not data:GetFlag(FLAG_TALKED_AERGWNYT)) then + callClientFunction(player, "delegateEvent", player, quest, "processEventAergwyntSpeak"); + else + callClientFunction(player, "delegateEvent", player, quest, "processEventAergwyntAfter"); + end + elseif (npcClassId == FERDILLAIX) then + if (not data:GetFlag(FLAG_TALKED_FERDILLAIX)) then + callClientFunction(player, "delegateEvent", player, quest, "processEventFerdillaixSpeak"); + else + callClientFunction(player, "delegateEvent", player, quest, "processEventFerdillaixAfter"); + end + elseif (npcClassId == BUBUROON) then + if (not data:GetFlag(FLAG_TALKED_BUBUROON)) then + callClientFunction(player, "delegateEvent", player, quest, "processEventBuburoonSpeak"); + else + callClientFunction(player, "delegateEvent", player, quest, "processEventBuburoonAfter"); + end + elseif (npcClassId == RBAHARRA) then + if (not data:GetFlag(FLAG_TALKED_RBAHARRA)) then + callClientFunction(player, "delegateEvent", player, quest, "processEventBaharraSpeak"); + else + callClientFunction(player, "delegateEvent", player, quest, "processEventBaharraAfter"); + end + elseif (npcClassId == FUFUNA) then + if (not data:GetFlag(FLAG_TALKED_FUFUNA)) then + callClientFunction(player, "delegateEvent", player, quest, "processEventFufunaSpeak"); + else + callClientFunction(player, "delegateEvent", player, quest, "processEventFufunaAfter"); + end + end + elseif (seq == SEQ_001) then + --Quest Complete + if (npcClassId == DYMPNA) then + callClientFunction(player, "delegateEvent", player, quest, "processEventClear"); + callClientFunction(player, "delegateEvent", player, quest, "sqrwa", 200, 1, 1, 9); + player:CompleteQuest(quest); + end + end + quest:UpdateENPCs(); + player:EndEvent(); +end + +function onEmote(player, quest, npc, emoteId, eventName) + local npcClassId = npc.GetActorClassId(); + local seq = quest:GetSequence(); + local data = quest:GetData(); + local incCounter = false; + + if (seq == SEQ_000 and emoteId == 123) then + if (npcClassId == AERGWNYT) then + if (not data:GetFlag(FLAG_TALKED_AERGWNYT)) then + callClientFunction(player, "delegateEvent", player, quest, "processEventAergwynt"); + data:SetFlag(FLAG_TALKED_AERGWNYT); + incCounter = true; + end + elseif (npcClassId == FERDILLAIX) then + if (not data:GetFlag(FLAG_TALKED_FERDILLAIX)) then + callClientFunction(player, "delegateEvent", player, quest, "processEventFerdillaix"); + data:SetFlag(FLAG_TALKED_FERDILLAIX); + incCounter = true; + end + elseif (npcClassId == BUBUROON) then + if (not data:GetFlag(FLAG_TALKED_BUBUROON)) then + callClientFunction(player, "delegateEvent", player, quest, "processEventBuburoon"); + data:SetFlag(FLAG_TALKED_BUBUROON); + incCounter = true; + end + elseif (npcClassId == RBAHARRA) then + if (not data:GetFlag(FLAG_TALKED_RBAHARRA)) then + callClientFunction(player, "delegateEvent", player, quest, "processEventBaharra"); + data:SetFlag(FLAG_TALKED_RBAHARRA); + incCounter = true; + end + elseif (npcClassId == FUFUNA) then + if (not data:GetFlag(FLAG_TALKED_FUFUNA)) then + callClientFunction(player, "delegateEvent", player, quest, "processEventFufuna"); + data:SetFlag(FLAG_TALKED_FUFUNA); + incCounter = true; + end + end + + -- Increase objective counter & play relevant messages + if (incCounter == true) then + local counterAmount = data:IncCounter(COUNTER_TALKED); + + attentionMessage(player, 51059, 0, counterAmount, 5); -- You have helped spread Dympna's rumor. (... of 5) + + if (seq000_checkCondition(data)) then -- All informants spoken to + attentionMessage(player, 25225, quest.GetQuestId()); -- objectives complete! + quest:UpdateENPCs(); -- Band-aid for a QFLAG_NORM issue + quest:StartSequence(SEQ_001); + end + end + end + + quest:UpdateENPCs(); + player:EndEvent(); +end + +-- Check if all informants are talked to +function seq000_checkCondition(data) + return (data:GetFlag(FLAG_TALKED_AERGWNYT) and + data:GetFlag(FLAG_TALKED_FERDILLAIX) and + data:GetFlag(FLAG_TALKED_BUBUROON) and + data:GetFlag(FLAG_TALKED_RBAHARRA) and + data:GetFlag(FLAG_TALKED_FUFUNA)); +end + +function getJournalMapMarkerList(player, quest) + local sequence = quest:getSequence(); + local data = quest:GetData(); + local possibleMarkers = {}; + + if (sequence == SEQ_000) then + if (not data:GetFlag(FLAG_TALKED_AERGWNYT)) then table.insert(possibleMarkers, MRKR_AERGWNYT); end + if (not data:GetFlag(FLAG_TALKED_FERDILLAIX)) then table.insert(possibleMarkers, MRKR_FERDILLAIX); end + if (not data:GetFlag(FLAG_TALKED_BUBUROON)) then table.insert(possibleMarkers, MRKR_BUBUROON); end + if (not data:GetFlag(FLAG_TALKED_RBAHARRA)) then table.insert(possibleMarkers, MRKR_RBAHARRA); end + if (not data:GetFlag(FLAG_TALKED_FUFUNA)) then table.insert(possibleMarkers, MRKR_FUFUNA); end + elseif (sequence == SEQ_001) then + table.insert(possibleMarkers, MRKR_DYMPNA); + end + + return unpack(possibleMarkers) +end \ No newline at end of file diff --git a/Map Server/Actors/Quest/Quest.cs b/Map Server/Actors/Quest/Quest.cs index a6fbb8a7..72e3cbc9 100644 --- a/Map Server/Actors/Quest/Quest.cs +++ b/Map Server/Actors/Quest/Quest.cs @@ -201,8 +201,7 @@ namespace Meteor.Map.Actors.QuestNS return; // Send the message that the journal has been updated - if (currentSequence != SEQ_NOT_STARTED) - owner.SendGameMessage(Server.GetWorldManager().GetActor(), 25116, 0x20, (object)GetQuestId()); + owner.SendGameMessage(Server.GetWorldManager().GetActor(), 25116, 0x20, (object)GetQuestId()); currentSequence = sequence; questState.UpdateState(); From b773098abffafcf817842999f89e982a97e71756 Mon Sep 17 00:00:00 2001 From: Filip Maj Date: Thu, 3 Mar 2022 01:59:13 -0500 Subject: [PATCH 18/23] Added the PGL200 quest The House Always Wins. Fixed quest instances not being set on spawn. Fixed PrivateAreaPast. Added You have left the instance messages when leaving a PrivateArea. Fixed EmoteEvents. DefaultTalk has been disabled temporarily to speed up warps. --- .../chara/npc/object/PrivateAreaPastExit.lua | 17 +- .../chara/npc/populace/PopulaceStandard.lua | 87 +++-- .../scripts/commands/EmoteStandardCommand.lua | 2 +- Data/scripts/quests/pgl/pgl200.lua | 301 ++++++++++++++++++ .../DoorStandard/pgl200_gsm_door.lua | 3 + Map Server/Actors/Quest/Quest.cs | 18 +- Map Server/DataObjects/Session.cs | 2 +- .../Events/SetPushEventConditionWithCircle.cs | 2 +- Map Server/WorldManager.cs | 4 + 9 files changed, 383 insertions(+), 53 deletions(-) create mode 100644 Data/scripts/quests/pgl/pgl200.lua create mode 100644 Data/scripts/unique/wil0Town01a/privatearea/PrivateAreaMasterPast_5/DoorStandard/pgl200_gsm_door.lua diff --git a/Data/scripts/base/chara/npc/object/PrivateAreaPastExit.lua b/Data/scripts/base/chara/npc/object/PrivateAreaPastExit.lua index d7140e37..6149b464 100644 --- a/Data/scripts/base/chara/npc/object/PrivateAreaPastExit.lua +++ b/Data/scripts/base/chara/npc/object/PrivateAreaPastExit.lua @@ -2,11 +2,16 @@ function init(npc) return false, false, 0, 0; end -function onEventStarted(player, npc, triggerName) - if (triggerName == "caution") then - worldMaster = GetWorldMaster(); - player:SendGameMessage(player, worldMaster, 34109, 0x20); - elseif (triggerName == "exit") then - end +function onEventStarted(player, npc, eventType, eventName) player:EndEvent(); + + if (eventName == "caution") then + player:SendGameMessage(player, GetWorldMaster(), 34109, 0x20); + elseif (eventName == "exit") then + local activeQuests = player:GetQuestsForNpc(npc); + print(tostring(#activeQuests)); + if (#activeQuests >= 1) then + activeQuests[1]:OnPush(player, npc, eventName); + end + end end \ No newline at end of file diff --git a/Data/scripts/base/chara/npc/populace/PopulaceStandard.lua b/Data/scripts/base/chara/npc/populace/PopulaceStandard.lua index 90d06334..b5471805 100644 --- a/Data/scripts/base/chara/npc/populace/PopulaceStandard.lua +++ b/Data/scripts/base/chara/npc/populace/PopulaceStandard.lua @@ -22,44 +22,61 @@ function init(npc) end function onEventStarted(player, npc, eventType, eventName) - local defaultTalk = player:GetDefaultTalkQuest(npc); - local tutorialTalk = player:GetTutorialQuest(npc); - local activeQuests = player:GetQuestsForNpc(npc); - local possibleQuests = {}; - - -- Create the switch table for this npc - if (defaultTalk ~= nil and eventType == ETYPE_TALK) then - table.insert(possibleQuests, defaultTalk); - end - if (tutorialTalk ~= nil and eventType == ETYPE_TALK) then - table.insert(possibleQuests, tutorialTalk); - end - if (activeQuests ~= nil) then - table.insert(possibleQuests, unpack(activeQuests)); - end - - -- Either let the player choose the quest or start it if it's the only one. local chosenQuest = nil; - if (#possibleQuests > 1) then - local currentPage = 0; - local numPages = math.floor((#possibleQuests-1)/4) + 1; + + print(tostring(eventType)); + print(tostring(eventType)); + print(tostring(eventType)); + print(tostring(eventType)); + print(tostring(eventType)); + print(tostring(eventType)); + print(tostring(eventType)); + if (eventType == 1) then + local defaultTalk = player:GetDefaultTalkQuest(npc); + local tutorialTalk = player:GetTutorialQuest(npc); + local activeQuests = player:GetQuestsForNpc(npc); + local possibleQuests = {}; - while (true) do - local page, index = callClientFunction(player, "switchEvent", possibleQuests[currentPage * 4 + 1], possibleQuests[currentPage * 4 + 2], possibleQuests[currentPage * 4 + 3], possibleQuests[currentPage * 4 + 4], currentPage + 1, numPages, 0x3F1); - - if (page == 0) then - chosenQuest = possibleQuests[(currentPage * 4) + index]; - break; - elseif (page > 0) then - currentPage = page - 1; - else - player:EndEvent(); - return; + -- Create the switch table for this npc + if (defaultTalk ~= nil and eventType == ETYPE_TALK) then + table.insert(possibleQuests, defaultTalk); + end + if (tutorialTalk ~= nil and eventType == ETYPE_TALK) then + table.insert(possibleQuests, tutorialTalk); + end + if (activeQuests ~= nil) then + for i=1,#activeQuests do + table.insert(possibleQuests, activeQuests[i]); end - end - elseif (#possibleQuests == 1) then - chosenQuest = possibleQuests[1]; - end + end + + -- Either let the player choose the quest or start it if it's the only one. + if (#possibleQuests > 1) then + local currentPage = 0; + local numPages = math.floor((#possibleQuests-1)/4) + 1; + + while (true) do + local page, index = callClientFunction(player, "switchEvent", possibleQuests[currentPage * 4 + 1], possibleQuests[currentPage * 4 + 2], possibleQuests[currentPage * 4 + 3], possibleQuests[currentPage * 4 + 4], currentPage + 1, numPages, 0x3F1); + + if (page == 0) then + chosenQuest = possibleQuests[(currentPage * 4) + index]; + break; + elseif (page > 0) then + currentPage = page - 1; + else + player:EndEvent(); + return; + end + end + elseif (#possibleQuests == 1) then + chosenQuest = possibleQuests[1]; + end + else + local activeQuests = player:GetQuestsForNpc(npc); + if (#activeQuests != 0) then + chosenQuest = activeQuests[1]; + end + end -- Run the quest event or tell the devs it's missing. if (chosenQuest ~= nil) then diff --git a/Data/scripts/commands/EmoteStandardCommand.lua b/Data/scripts/commands/EmoteStandardCommand.lua index 7e23b356..89f71fef 100644 --- a/Data/scripts/commands/EmoteStandardCommand.lua +++ b/Data/scripts/commands/EmoteStandardCommand.lua @@ -66,7 +66,7 @@ emoteTable = { }; -function onEventStarted(player, actor, triggerName, emoteId, showText, arg2, arg3, targetId) +function onEventStarted(player, actor, eventType, triggerName, emoteId, showText, arg2, arg3, targetId) if (targetId == nil) then targetId = 0; diff --git a/Data/scripts/quests/pgl/pgl200.lua b/Data/scripts/quests/pgl/pgl200.lua new file mode 100644 index 00000000..07254c7a --- /dev/null +++ b/Data/scripts/quests/pgl/pgl200.lua @@ -0,0 +1,301 @@ +require ("global") + +--[[ + +Quest Script + +Name: The House Always Wins +Code: Pgl200 +Id: 110060 +Prereq: Level 20, Pugilist + +]] + +-- Sequence Numbers +SEQ_000 = 0; -- Talk to Titinin. +SEQ_005 = 5; -- Head to the GSM guild and talk to Esperaunce 3 times. +SEQ_010 = 10; -- Warp into a duty; pickup coins. +SEQ_015 = 15; -- Head to the ADV guild and talk to the Wise Miser. Journal Data 3: Set to 1 if talked to Titinin. +SEQ_025 = 25; -- Head to the PGL guild entrence and talk to Lady Lewena. Journal Data 4: Set to 1 if talked to Titinin. +SEQ_030 = 30; -- Head to GLA guild and warp into the duty and fight. Journal Data 5: Set to 1 once you win the fight. +SEQ_035 = 35; -- Return to Titinin. + +-- Actor Class Ids +ENPC_GAGARUNA = 1000862; +ENPC_TITININ = 1000934; +ENPC_NAIDA_ZAMAIDA = 1000955; +ENPC_SINGLETON = 1001445; +ENPC_TRIGGER_GSM = 1090058; +ENPC_TRIGGER_PGL = 1090042; +ENPC_PRIVAREA_EXIT = 1290002; + +-- PGL Actors +ENPC_MELISIE = 1001009; +ENPC_GUNNULF = 1001256; +ENPC_SHAMANI = 1001012; +ENPC_HALSTEIN = 1001007; +ENPC_HEIBERT = 1001257; +ENPC_IPAGHLO = 1001260; + +-- GSM Actors +ENPC_SULTRY_STRUMPET = 1000952; +ENPC_BEAUTEOUS_BEAUTY = 1000953; +ENPC_ESPERAUNCE = 1000954; + +-- Quest Markers +MRKR_TITININ = 11006001; +MRKR_OBJECTIVE = 11006002; +MRKR_ESPERAUNCE1 = 11006003; +MRKR_ESPERAUNCE2 = 11006004; +MRKR_NAIDA_ZAMADIA = 11006005; +MRKR_OBJECTIVE2 = 11006006; +MRKR_SINGLETON = 11006007; +MRKR_TITININ2 = 11006008; + +-- Quest Details +ITEM_PLATINUM_LEDGER = 11000134; +ITEM_KINGOFPLOTS_GIL = 11000097; +ITEM_WISEMISER_GIL = 11000098; +ITEM_LEWENA_GIL = 11000099; +COUNTER_005 = 0; +COUNTER_015 = 1; +COUNTER_025 = 2; +COUNTER_030 = 3; + +function onStart(player, quest) + quest:StartSequence(SEQ_000); +end + +function onFinish(player, quest) +end + +function onStateChange(player, quest, sequence) + if (sequence == SEQ_ACCEPT) then + quest:SetENpc(ENPC_GAGARUNA, QFLAG_PLATE); + elseif (sequence == SEQ_000) then + quest:SetENpc(ENPC_TITININ, QFLAG_PLATE); + quest:SetENpc(ENPC_GAGARUNA); + quest:SetENpc(ENPC_MELISIE); + quest:SetENpc(ENPC_GUNNULF); + quest:SetENpc(ENPC_SHAMANI); + quest:SetENpc(ENPC_HALSTEIN); + quest:SetENpc(ENPC_HEIBERT); + quest:SetENpc(ENPC_IPAGHLO); + elseif (sequence == SEQ_005) then + quest:SetENpc(ENPC_TITININ); + quest:SetENpc(ENPC_GAGARUNA); + quest:SetENpc(ENPC_SULTRY_STRUMPET); + quest:SetENpc(ENPC_BEAUTEOUS_BEAUTY); + quest:SetENpc(ENPC_ESPERAUNCE, QFLAG_PLATE); + quest:SetENpc(ENPC_TRIGGER_GSM, QFLAG_NONE, false, true); + quest:SetENpc(ENPC_PRIVAREA_EXIT, QFLAG_NONE, false, true); + elseif (sequence == SEQ_010) then + quest:SetENpc(ENPC_SULTRY_STRUMPET); + quest:SetENpc(ENPC_BEAUTEOUS_BEAUTY); + quest:SetENpc(ENPC_ESPERAUNCE); + elseif (sequence == SEQ_015) then + quest:SetENpc(ENPC_TITININ); + quest:SetENpc(ENPC_NAIDA_ZAMAIDA, QFLAG_PLATE); + quest:SetENpc(ENPC_GAGARUNA); + elseif (sequence == SEQ_025) then + quest:SetENpc(ENPC_TITININ); + quest:SetENpc(ENPC_GAGARUNA); + quest:SetENpc(ENPC_TRIGGER_PGL, QFLAG_MAP, false, true); + elseif (sequence == SEQ_030) then + quest:SetENpc(ENPC_TITININ); + quest:SetENpc(ENPC_GAGARUNA); + quest:SetENpc(ENPC_SINGLETON, QFLAG_PLATE); + elseif (sequence == SEQ_035) then + quest:SetENpc(ENPC_TITININ, QFLAG_REWARD); + quest:SetENpc(ENPC_GAGARUNA); + quest:SetENpc(ENPC_MELISIE); + quest:SetENpc(ENPC_GUNNULF); + quest:SetENpc(ENPC_SHAMANI); + quest:SetENpc(ENPC_HALSTEIN); + quest:SetENpc(ENPC_HEIBERT); + quest:SetENpc(ENPC_IPAGHLO); + end +end + +function onTalk(player, quest, npc, eventName) + local npcClassId = npc.GetActorClassId(); + local seq = quest:GetSequence(); + local data = quest:GetData(); + + -- Offer the quest + if (npcClassId == ENPC_GAGARUNA and seq == SEQ_ACCEPT) then + local questAccepted = callClientFunction(player, "delegateEvent", player, quest, "processEventGagarunaStart"); + if (questAccepted == 1) then + player:AcceptQuest(quest); + end + player:EndEvent(); + return; + -- Quest Progress + elseif (seq == SEQ_000) then + if (npcClassId == ENPC_TITININ) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent010"); + player:SendGameMessage(GetWorldMaster(), 25246, MESSAGE_TYPE_SYSTEM, ITEM_PLATINUM_LEDGER, 1); + quest:StartSequence(SEQ_005); + elseif (npcClassId == ENPC_GAGARUNA) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent005_2"); + elseif (npcClassId == ENPC_IPAGHLO) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent005_3"); + elseif (npcClassId == ENPC_HALSTEIN) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent005_4"); + elseif (npcClassId == ENPC_MELISIE) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent005_5"); + elseif (npcClassId == ENPC_HEIBERT) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent005_6"); + elseif (npcClassId == ENPC_GUNNULF) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent005_7"); + elseif (npcClassId == ENPC_SHAMANI) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent005_8"); + end + elseif (seq == SEQ_005) then + if (npcClassId == ENPC_ESPERAUNCE) then + local talkCount = data:IncCounter(COUNTER_005); + if (talkCount == 1) then + player:SendGameMessage(quest, 117, MESSAGE_TYPE_SYSTEM); + elseif (talkCount == 2) then + player:SendGameMessage(quest, 118, MESSAGE_TYPE_SYSTEM); + elseif (talkCount >= 3) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent020"); + quest:StartSequence(SEQ_010); -- Temp until Duty is finished. Should go to a duty here. + end + elseif (npcClassId == ENPC_TITININ) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent010_2"); + elseif (npcClassId == ENPC_GAGARUNA) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent010_3"); + elseif (npcClassId == ENPC_SULTRY_STRUMPET) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent010_4"); + elseif (npcClassId == ENPC_BEAUTEOUS_BEAUTY) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent010_5"); + end + elseif (seq == SEQ_010) then + if (npcClassId == ENPC_ESPERAUNCE) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent020_2"); + callClientFunction(player, "delegateEvent", player, quest, "processEvent030"); + quest:StartSequence(SEQ_015); -- Temp until Duty is finished. + player:SendGameMessage(GetWorldMaster(), 25246, MESSAGE_TYPE_SYSTEM, ITEM_KINGOFPLOTS_GIL, 1); + player:EndEvent(); + GetWorldManager():WarpToPublicArea(player); + return; + elseif (npcClassId == ENPC_SULTRY_STRUMPET) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent020_3"); + elseif (npcClassId == ENPC_BEAUTEOUS_BEAUTY) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent020_4"); + end + elseif (seq == SEQ_015) then + if (npcClassId == ENPC_NAIDA_ZAMAIDA) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent040"); + quest:StartSequence(SEQ_025); + player:SendGameMessage(GetWorldMaster(), 25246, MESSAGE_TYPE_SYSTEM, ITEM_WISEMISER_GIL, 1); + elseif (npcClassId == ENPC_TITININ) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent030_2"); + data:SetCounter(COUNTER_015, 1); + elseif (npcClassId == ENPC_GAGARUNA) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent030_3"); + end + elseif (seq == SEQ_025) then + if (npcClassId == ENPC_PUSH_PGL) then + elseif (npcClassId == ENPC_TITININ) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent040_2"); + data:SetCounter(COUNTER_025, 1); + elseif (npcClassId == ENPC_GAGARUNA) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent040_3"); + end + elseif (seq == SEQ_030) then + if (npcClassId == ENPC_SINGLETON) then + local enterDuty = callClientFunction(player, "delegateEvent", player, quest, "processEvent050_4"); + if (enterDuty == 1) then + --Enter duty at this point.... + callClientFunction(player, "delegateEvent", player, quest, "processEvent060"); + data:SetCounter(COUNTER_030, 1); + quest:StartSequence(SEQ_035); -- Temp until Duty is finished. + player:SendGameMessage(GetWorldMaster(), 25246, MESSAGE_TYPE_SYSTEM, ITEM_LEWENA_GIL, 1); + GetWorldManager():DoZoneChange(player, 209, nil, 0, 0x2, -192.0, 194.5, 193.785, 3.0); + end + elseif (npcClassId == ENPC_TITININ) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent050_2"); + elseif (npcClassId == ENPC_GAGARUNA) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent050_3"); + end + elseif (seq == SEQ_035) then + if (npcClassId == ENPC_TITININ) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent070"); + callClientFunction(player, "delegateEvent", player, quest, "sqrwa", 200, 2) + player:CompleteQuest(quest); + elseif (npcClassId == ENPC_GAGARUNA) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent060_2"); + elseif (npcClassId == ENPC_IPAGHLO) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent060_3"); + elseif (npcClassId == ENPC_HALSTEIN) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent060_4"); + elseif (npcClassId == ENPC_MELISIE) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent060_5"); + elseif (npcClassId == ENPC_HEIBERT) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent060_6"); + elseif (npcClassId == ENPC_GUNNULF) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent060_7"); + elseif (npcClassId == ENPC_SHAMANI) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent060_8"); + end + end + + quest:UpdateENPCs(); + player:EndEvent(); +end + +function onPush(player, quest, npc) + local npcClassId = npc.GetActorClassId(); + local seq = quest:GetSequence(); + local data = quest:GetData(); + + if (seq == SEQ_005) then + player:EndEvent(); + if (npcClassId == ENPC_TRIGGER_GSM) then + GetWorldManager():WarpToPrivateArea(player, "PrivateAreaMasterPast", 5); + elseif (npcClassId == ENPC_PRIVAREA_EXIT) then + GetWorldManager():WarpToPublicArea(player); + end + elseif (seq == SEQ_025) then + if (npcClassId == ENPC_TRIGGER_PGL) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent050"); + quest:StartSequence(SEQ_030); + player:EndEvent(); + end + end + +end + +function getJournalInformation(player, quest) + local data = quest:GetData(); + return 0, data:GetCounter(COUNTER_015), data:GetCounter(COUNTER_025), data:GetCounter(COUNTER_030); +end + +function getJournalMapMarkerList(player, quest) + local seq = quest:getSequence(); + local data = quest:GetData(); + + if (seq == SEQ_000) then + return MRKR_TITININ; + elseif (seq == SEQ_005) then + return MRKR_ESPERAUNCE1; + elseif (seq == SEQ_010) then + return MRKR_OBJECTIVE; + elseif (seq == SEQ_015) then + if (data:GetCounter(COUNTER_015) == 1) then + return MRKR_NAIDA_ZAMADIA; + end + elseif (seq == SEQ_025) then + if (data:GetCounter(COUNTER_025) == 1) then + return MRKR_OBJECTIVE2; + end + elseif (seq == SEQ_030) then + return MRKR_SINGLETON; + elseif (seq == SEQ_035) then + return MRKR_TITININ2; + end + + return; +end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01a/privatearea/PrivateAreaMasterPast_5/DoorStandard/pgl200_gsm_door.lua b/Data/scripts/unique/wil0Town01a/privatearea/PrivateAreaMasterPast_5/DoorStandard/pgl200_gsm_door.lua new file mode 100644 index 00000000..cb3caf27 --- /dev/null +++ b/Data/scripts/unique/wil0Town01a/privatearea/PrivateAreaMasterPast_5/DoorStandard/pgl200_gsm_door.lua @@ -0,0 +1,3 @@ +function init(npc) + return false, false, 0, 0, 0x1A5, 0xFCB; +end \ No newline at end of file diff --git a/Map Server/Actors/Quest/Quest.cs b/Map Server/Actors/Quest/Quest.cs index 72e3cbc9..2f6a1c73 100644 --- a/Map Server/Actors/Quest/Quest.cs +++ b/Map Server/Actors/Quest/Quest.cs @@ -149,19 +149,19 @@ namespace Meteor.Map.Actors.QuestNS LuaEngine.GetInstance().CallLuaFunction(caller, this, "onTalk", true, npc); } - public void OnEmote(Player caller, Npc npc, Command command) + public void OnEmote(Player caller, Npc npc, string triggerName) { - LuaEngine.GetInstance().CallLuaFunction(caller, this, "onEmote", true, npc, command); + LuaEngine.GetInstance().CallLuaFunction(caller, this, "onEmote", true, npc, triggerName); } - public void OnPush(Player caller, Npc npc) + public void OnPush(Player caller, Npc npc, string triggerName) { - LuaEngine.GetInstance().CallLuaFunction(caller, this, "onPush", true, npc); + LuaEngine.GetInstance().CallLuaFunction(caller, this, "onPush", true, npc, triggerName); } - public void OnNotice(Player caller) + public void OnNotice(Player caller, string triggerName) { - LuaEngine.GetInstance().CallLuaFunction(caller, this, "onNotice", true); + LuaEngine.GetInstance().CallLuaFunction(caller, this, "onNotice", true, triggerName); } public void OnNpcLS(Player caller, uint npcLSId) @@ -190,9 +190,9 @@ namespace Meteor.Map.Actors.QuestNS public bool IsQuestENPC(Player caller, Npc npc) { - List returned = LuaEngine.GetInstance().CallLuaFunctionForReturn(caller, this, "IsQuestENPC", true, npc, this); - bool scriptReturned = returned != null && returned.Count != 0 && returned[0].typeID == 3; - return scriptReturned || (questState?.HasENpc(npc.GetActorClassId()) ?? false); + //List returned = LuaEngine.GetInstance().CallLuaFunctionForReturn(caller, this, "IsQuestENPC", true, npc, this); + //bool scriptReturned = returned != null && returned.Count != 0 && returned[0].typeID == 3; + return (questState?.HasENpc(npc.GetActorClassId()) ?? false); } public void StartSequence(ushort sequence) diff --git a/Map Server/DataObjects/Session.cs b/Map Server/DataObjects/Session.cs index 28233d26..23b91fdc 100644 --- a/Map Server/DataObjects/Session.cs +++ b/Map Server/DataObjects/Session.cs @@ -169,7 +169,7 @@ namespace Meteor.Map.DataObjects if (quests.Length != 0) { QuestENpc questInstance = quests[0].GetQuestState().GetENpc(npc.GetActorClassId()); - QueuePacket(npc.GetSetEventStatusPackets()); + QueuePacket(npc.GetSetEventStatusPackets(questInstance.isTalkEnabled, questInstance.isEmoteEnabled, questInstance.isPushEnabled)); QueuePacket(SetActorQuestGraphicPacket.BuildPacket(npc.Id, questInstance.questFlagType)); } } diff --git a/Map Server/Packets/Send/Actor/Events/SetPushEventConditionWithCircle.cs b/Map Server/Packets/Send/Actor/Events/SetPushEventConditionWithCircle.cs index 66176f97..cda3d9ca 100644 --- a/Map Server/Packets/Send/Actor/Events/SetPushEventConditionWithCircle.cs +++ b/Map Server/Packets/Send/Actor/Events/SetPushEventConditionWithCircle.cs @@ -45,7 +45,7 @@ namespace Meteor.Map.packets.send.actor.events binWriter.Write((UInt32)0x44533088); binWriter.Write((Single)100.0f); binWriter.Seek(4, SeekOrigin.Current); - binWriter.Write((Byte)(condition.outwards ? 0x11 : 0x1)); //If == 0x10, Inverted Bounding Box + binWriter.Write((Byte)(condition.outwards ? 0x10 : 0x1)); //If == 0x10, Inverted Bounding Box binWriter.Write((Byte)0); binWriter.Write((Byte)(condition.silent ? 0x1 : 0x0)); //Silent Trigger binWriter.Write(Encoding.ASCII.GetBytes(condition.conditionName), 0, Encoding.ASCII.GetByteCount(condition.conditionName) >= 0x24 ? 0x24 : Encoding.ASCII.GetByteCount(condition.conditionName)); diff --git a/Map Server/WorldManager.cs b/Map Server/WorldManager.cs index 74df5960..0bb89e59 100644 --- a/Map Server/WorldManager.cs +++ b/Map Server/WorldManager.cs @@ -878,6 +878,10 @@ namespace Meteor.Map player.playerSession.LockUpdates(false); + //Send "You have left the instance" if old area is a Private Area + if (oldArea is PrivateArea) + player.SendGameMessage(GetActor(), 34110, 0x20); + //Send "You have entered an instance" if it's a Private Area if (newArea is PrivateArea) player.SendGameMessage(GetActor(), 34108, 0x20); From 2cb6a9f6bdb3349bc7edeac41e6af442b16ae39f Mon Sep 17 00:00:00 2001 From: Filip Maj Date: Thu, 3 Mar 2022 19:34:33 -0500 Subject: [PATCH 19/23] Added back loading defaulttalk npcs through script. Should speed up warps now! Added loading mapobj ifno through a db table, removing the need for unique scripts. Deleted ported mapobj scripts. --- .../chara/npc/populace/PopulaceStandard.lua | 7 ---- Data/scripts/quests/etc/etc1l8.lua | 4 +- .../MapObjShipPort/gridania_shipport.lua | 5 --- .../MapObjShipPort/gridania_shipport2.lua | 5 --- .../fst0Town01a/DoorStandard/centaurs_eye.lua | 3 -- .../DoorStandard/fenyll_fineries.lua | 3 -- .../fst0Town01a/DoorStandard/guild_arc.lua | 3 -- .../fst0Town01a/DoorStandard/guild_btn.lua | 3 -- .../fst0Town01a/DoorStandard/guild_cnj.lua | 3 -- .../fst0Town01a/DoorStandard/guild_crp.lua | 3 -- .../fst0Town01a/DoorStandard/guild_lnc.lua | 3 -- .../fst0Town01a/DoorStandard/guild_ltw.lua | 3 -- .../DoorStandard/whistling_miller.lua | 3 -- .../DoorStandard/guild_acn_south.lua | 3 -- .../DoorStandard/guild_acn_southsouth.lua | 3 -- .../DoorStandard/guild_bsm_east.lua | 3 -- .../DoorStandard/guild_bsm_west.lua | 3 -- .../DoorStandard/guild_cul_nwest.lua | 3 -- .../DoorStandard/guild_cul_south.lua | 3 -- .../DoorStandard/guild_mrd_bot.lua | 3 -- .../DoorStandard/guild_mrd_mid.lua | 3 -- .../DoorStandard/guild_mrd_top.lua | 3 -- .../sea0Town01a/DoorStandard/guild_msk.lua | 3 -- .../DoorStandard/guild_msk_se_ne.lua | 3 -- .../DoorStandard/guild_msk_se_nw.lua | 3 -- .../DoorStandard/guild_msk_se_se.lua | 3 -- .../DoorStandard/guild_msk_se_sw.lua | 3 -- .../sea0Town01a/DoorStandard/hyaline_east.lua | 3 -- .../DoorStandard/hyaline_north.lua | 3 -- .../DoorStandard/hyaline_south.lua | 3 -- .../sea0Town01a/DoorStandard/hyaline_west.lua | 3 -- .../sea0Town01a/DoorStandard/marketward.lua | 3 -- .../DoorStandard/northofseventhsage_east.lua | 3 -- .../DoorStandard/northofseventhsage_north.lua | 3 -- .../DoorStandard/northofseventhsage_south.lua | 3 -- .../DoorStandard/northofseventhsage_west.lua | 3 -- .../DoorStandard/seventhsage_east.lua | 3 -- .../DoorStandard/seventhsage_north.lua | 3 -- .../DoorStandard/seventhsage_south.lua | 3 -- .../DoorStandard/seventhsage_west.lua | 3 -- .../DoorStandard/thundersquall_east.lua | 3 -- .../DoorStandard/thundersquall_north.lua | 3 -- .../DoorStandard/thundersquall_south.lua | 3 -- .../MapObjShipPort/limsa_shipport.lua | 5 --- .../MapObjShipPort/limsa_shipport2.lua | 5 --- .../DoorStandard/ferry_door1_nosceatothan.lua | 5 --- .../DoorStandard/ferry_door1_thantonoscea.lua | 5 --- .../DoorStandard/ferry_door2_nosceatothan.lua | 5 --- .../DoorStandard/ferry_door2_thantonoscea.lua | 5 --- .../ferry_route_nosceatothan.lua | 5 --- .../ferry_route_thantonoscea.lua | 5 --- .../ferry_man_noceatothan.lua | 7 ---- .../ferry_man_thantonocea.lua | 7 ---- .../DoorStandard/adv_guild_east.lua | 3 -- .../DoorStandard/adv_guild_north.lua | 3 -- .../DoorStandard/adv_guild_west.lua | 3 -- .../wil0Town01/DoorStandard/guild_pug.lua | 3 -- .../DoorStandard/east_of_goldcourt.lua | 3 -- .../wil0Town01a/DoorStandard/guild_alc.lua | 3 -- .../wil0Town01a/DoorStandard/guild_gla.lua | 3 -- .../wil0Town01a/DoorStandard/guild_gsm.lua | 3 -- .../wil0Town01a/DoorStandard/guild_min.lua | 3 -- .../wil0Town01a/DoorStandard/guild_wvr.lua | 3 -- .../DoorStandard/ne_of_eshtaimes.lua | 3 -- .../DoorStandard/nw_of_guild_wvr.lua | 3 -- .../MapObjShipPort/uldah_mapshipport_1.lua | 5 --- .../MapObjShipPort/uldah_mapshipport_2.lua | 5 --- Map Server/Actors/Area/Area.cs | 2 +- Map Server/Actors/Area/SpawnLocation.cs | 9 ++++- Map Server/Actors/Chara/Npc/Npc.cs | 39 +++++++++---------- Map Server/Actors/Chara/Player/Player.cs | 2 +- Map Server/Actors/Quest/Quest.cs | 6 +++ .../Send/Actor/SetActorBGPropertiesPacket.cs | 6 +-- Map Server/WorldManager.cs | 14 +++++-- 74 files changed, 49 insertions(+), 267 deletions(-) delete mode 100644 Data/scripts/unique/fst0Town01/MapObjShipPort/gridania_shipport.lua delete mode 100644 Data/scripts/unique/fst0Town01/MapObjShipPort/gridania_shipport2.lua delete mode 100644 Data/scripts/unique/fst0Town01a/DoorStandard/centaurs_eye.lua delete mode 100644 Data/scripts/unique/fst0Town01a/DoorStandard/fenyll_fineries.lua delete mode 100644 Data/scripts/unique/fst0Town01a/DoorStandard/guild_arc.lua delete mode 100644 Data/scripts/unique/fst0Town01a/DoorStandard/guild_btn.lua delete mode 100644 Data/scripts/unique/fst0Town01a/DoorStandard/guild_cnj.lua delete mode 100644 Data/scripts/unique/fst0Town01a/DoorStandard/guild_crp.lua delete mode 100644 Data/scripts/unique/fst0Town01a/DoorStandard/guild_lnc.lua delete mode 100644 Data/scripts/unique/fst0Town01a/DoorStandard/guild_ltw.lua delete mode 100644 Data/scripts/unique/fst0Town01a/DoorStandard/whistling_miller.lua delete mode 100644 Data/scripts/unique/sea0Town01a/DoorStandard/guild_acn_south.lua delete mode 100644 Data/scripts/unique/sea0Town01a/DoorStandard/guild_acn_southsouth.lua delete mode 100644 Data/scripts/unique/sea0Town01a/DoorStandard/guild_bsm_east.lua delete mode 100644 Data/scripts/unique/sea0Town01a/DoorStandard/guild_bsm_west.lua delete mode 100644 Data/scripts/unique/sea0Town01a/DoorStandard/guild_cul_nwest.lua delete mode 100644 Data/scripts/unique/sea0Town01a/DoorStandard/guild_cul_south.lua delete mode 100644 Data/scripts/unique/sea0Town01a/DoorStandard/guild_mrd_bot.lua delete mode 100644 Data/scripts/unique/sea0Town01a/DoorStandard/guild_mrd_mid.lua delete mode 100644 Data/scripts/unique/sea0Town01a/DoorStandard/guild_mrd_top.lua delete mode 100644 Data/scripts/unique/sea0Town01a/DoorStandard/guild_msk.lua delete mode 100644 Data/scripts/unique/sea0Town01a/DoorStandard/guild_msk_se_ne.lua delete mode 100644 Data/scripts/unique/sea0Town01a/DoorStandard/guild_msk_se_nw.lua delete mode 100644 Data/scripts/unique/sea0Town01a/DoorStandard/guild_msk_se_se.lua delete mode 100644 Data/scripts/unique/sea0Town01a/DoorStandard/guild_msk_se_sw.lua delete mode 100644 Data/scripts/unique/sea0Town01a/DoorStandard/hyaline_east.lua delete mode 100644 Data/scripts/unique/sea0Town01a/DoorStandard/hyaline_north.lua delete mode 100644 Data/scripts/unique/sea0Town01a/DoorStandard/hyaline_south.lua delete mode 100644 Data/scripts/unique/sea0Town01a/DoorStandard/hyaline_west.lua delete mode 100644 Data/scripts/unique/sea0Town01a/DoorStandard/marketward.lua delete mode 100644 Data/scripts/unique/sea0Town01a/DoorStandard/northofseventhsage_east.lua delete mode 100644 Data/scripts/unique/sea0Town01a/DoorStandard/northofseventhsage_north.lua delete mode 100644 Data/scripts/unique/sea0Town01a/DoorStandard/northofseventhsage_south.lua delete mode 100644 Data/scripts/unique/sea0Town01a/DoorStandard/northofseventhsage_west.lua delete mode 100644 Data/scripts/unique/sea0Town01a/DoorStandard/seventhsage_east.lua delete mode 100644 Data/scripts/unique/sea0Town01a/DoorStandard/seventhsage_north.lua delete mode 100644 Data/scripts/unique/sea0Town01a/DoorStandard/seventhsage_south.lua delete mode 100644 Data/scripts/unique/sea0Town01a/DoorStandard/seventhsage_west.lua delete mode 100644 Data/scripts/unique/sea0Town01a/DoorStandard/thundersquall_east.lua delete mode 100644 Data/scripts/unique/sea0Town01a/DoorStandard/thundersquall_north.lua delete mode 100644 Data/scripts/unique/sea0Town01a/DoorStandard/thundersquall_south.lua delete mode 100644 Data/scripts/unique/sea0Town01a/MapObjShipPort/limsa_shipport.lua delete mode 100644 Data/scripts/unique/sea0Town01a/MapObjShipPort/limsa_shipport2.lua delete mode 100644 Data/scripts/unique/sea1Cruise01/DoorStandard/ferry_door1_nosceatothan.lua delete mode 100644 Data/scripts/unique/sea1Cruise01/DoorStandard/ferry_door1_thantonoscea.lua delete mode 100644 Data/scripts/unique/sea1Cruise01/DoorStandard/ferry_door2_nosceatothan.lua delete mode 100644 Data/scripts/unique/sea1Cruise01/DoorStandard/ferry_door2_thantonoscea.lua delete mode 100644 Data/scripts/unique/sea1Cruise01/MapObjShipRouteLand/ferry_route_nosceatothan.lua delete mode 100644 Data/scripts/unique/sea1Cruise01/MapObjShipRouteLand/ferry_route_thantonoscea.lua delete mode 100644 Data/scripts/unique/sea1Cruise01/PopulaceStandard/ferry_man_noceatothan.lua delete mode 100644 Data/scripts/unique/sea1Cruise01/PopulaceStandard/ferry_man_thantonocea.lua delete mode 100644 Data/scripts/unique/wil0Town01/DoorStandard/adv_guild_east.lua delete mode 100644 Data/scripts/unique/wil0Town01/DoorStandard/adv_guild_north.lua delete mode 100644 Data/scripts/unique/wil0Town01/DoorStandard/adv_guild_west.lua delete mode 100644 Data/scripts/unique/wil0Town01/DoorStandard/guild_pug.lua delete mode 100644 Data/scripts/unique/wil0Town01a/DoorStandard/east_of_goldcourt.lua delete mode 100644 Data/scripts/unique/wil0Town01a/DoorStandard/guild_alc.lua delete mode 100644 Data/scripts/unique/wil0Town01a/DoorStandard/guild_gla.lua delete mode 100644 Data/scripts/unique/wil0Town01a/DoorStandard/guild_gsm.lua delete mode 100644 Data/scripts/unique/wil0Town01a/DoorStandard/guild_min.lua delete mode 100644 Data/scripts/unique/wil0Town01a/DoorStandard/guild_wvr.lua delete mode 100644 Data/scripts/unique/wil0Town01a/DoorStandard/ne_of_eshtaimes.lua delete mode 100644 Data/scripts/unique/wil0Town01a/DoorStandard/nw_of_guild_wvr.lua delete mode 100644 Data/scripts/unique/wil0Town01a/MapObjShipPort/uldah_mapshipport_1.lua delete mode 100644 Data/scripts/unique/wil0Town01a/MapObjShipPort/uldah_mapshipport_2.lua diff --git a/Data/scripts/base/chara/npc/populace/PopulaceStandard.lua b/Data/scripts/base/chara/npc/populace/PopulaceStandard.lua index b5471805..c8150e10 100644 --- a/Data/scripts/base/chara/npc/populace/PopulaceStandard.lua +++ b/Data/scripts/base/chara/npc/populace/PopulaceStandard.lua @@ -24,13 +24,6 @@ end function onEventStarted(player, npc, eventType, eventName) local chosenQuest = nil; - print(tostring(eventType)); - print(tostring(eventType)); - print(tostring(eventType)); - print(tostring(eventType)); - print(tostring(eventType)); - print(tostring(eventType)); - print(tostring(eventType)); if (eventType == 1) then local defaultTalk = player:GetDefaultTalkQuest(npc); local tutorialTalk = player:GetTutorialQuest(npc); diff --git a/Data/scripts/quests/etc/etc1l8.lua b/Data/scripts/quests/etc/etc1l8.lua index 32acc653..3bf7d57c 100644 --- a/Data/scripts/quests/etc/etc1l8.lua +++ b/Data/scripts/quests/etc/etc1l8.lua @@ -128,13 +128,13 @@ function onTalk(player, quest, npc, eventName) player:EndEvent(); end -function onEmote(player, quest, npc, emoteId, eventName) +function onEmote(player, quest, npc, eventName) local npcClassId = npc.GetActorClassId(); local seq = quest:GetSequence(); local data = quest:GetData(); local incCounter = false; - if (seq == SEQ_000 and emoteId == 123) then + if (seq == SEQ_000 and eventName == "emoteDefault1") then if (npcClassId == AERGWNYT) then if (not data:GetFlag(FLAG_TALKED_AERGWNYT)) then callClientFunction(player, "delegateEvent", player, quest, "processEventAergwynt"); diff --git a/Data/scripts/unique/fst0Town01/MapObjShipPort/gridania_shipport.lua b/Data/scripts/unique/fst0Town01/MapObjShipPort/gridania_shipport.lua deleted file mode 100644 index 670c0f3c..00000000 --- a/Data/scripts/unique/fst0Town01/MapObjShipPort/gridania_shipport.lua +++ /dev/null @@ -1,5 +0,0 @@ -require ("global") - -function init(npc) - return false, false, 0, 0, 0x141, 0xcde; -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01/MapObjShipPort/gridania_shipport2.lua b/Data/scripts/unique/fst0Town01/MapObjShipPort/gridania_shipport2.lua deleted file mode 100644 index 3b372965..00000000 --- a/Data/scripts/unique/fst0Town01/MapObjShipPort/gridania_shipport2.lua +++ /dev/null @@ -1,5 +0,0 @@ -require ("global") - -function init(npc) - return false, false, 0, 0, 0x187, 0x2; -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/DoorStandard/centaurs_eye.lua b/Data/scripts/unique/fst0Town01a/DoorStandard/centaurs_eye.lua deleted file mode 100644 index 4599e553..00000000 --- a/Data/scripts/unique/fst0Town01a/DoorStandard/centaurs_eye.lua +++ /dev/null @@ -1,3 +0,0 @@ -function init(npc) - return false, false, 0, 0, 0x141, 0xB84; -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/DoorStandard/fenyll_fineries.lua b/Data/scripts/unique/fst0Town01a/DoorStandard/fenyll_fineries.lua deleted file mode 100644 index 254cc79e..00000000 --- a/Data/scripts/unique/fst0Town01a/DoorStandard/fenyll_fineries.lua +++ /dev/null @@ -1,3 +0,0 @@ -function init(npc) - return false, false, 0, 0, 0x141, 0xB83; -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/DoorStandard/guild_arc.lua b/Data/scripts/unique/fst0Town01a/DoorStandard/guild_arc.lua deleted file mode 100644 index 6f8845dc..00000000 --- a/Data/scripts/unique/fst0Town01a/DoorStandard/guild_arc.lua +++ /dev/null @@ -1,3 +0,0 @@ -function init(npc) - return false, false, 0, 0, 0x141, 0xB81; -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/DoorStandard/guild_btn.lua b/Data/scripts/unique/fst0Town01a/DoorStandard/guild_btn.lua deleted file mode 100644 index 6ac7c400..00000000 --- a/Data/scripts/unique/fst0Town01a/DoorStandard/guild_btn.lua +++ /dev/null @@ -1,3 +0,0 @@ -function init(npc) - return false, false, 0, 0, 0x141, 0xB7D; -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/DoorStandard/guild_cnj.lua b/Data/scripts/unique/fst0Town01a/DoorStandard/guild_cnj.lua deleted file mode 100644 index 5a29b9d2..00000000 --- a/Data/scripts/unique/fst0Town01a/DoorStandard/guild_cnj.lua +++ /dev/null @@ -1,3 +0,0 @@ -function init(npc) - return false, false, 0, 0, 0x14b, 0x14aa; -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/DoorStandard/guild_crp.lua b/Data/scripts/unique/fst0Town01a/DoorStandard/guild_crp.lua deleted file mode 100644 index d1ff322a..00000000 --- a/Data/scripts/unique/fst0Town01a/DoorStandard/guild_crp.lua +++ /dev/null @@ -1,3 +0,0 @@ -function init(npc) - return false, false, 0, 0, 0x141, 0xB7E; -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/DoorStandard/guild_lnc.lua b/Data/scripts/unique/fst0Town01a/DoorStandard/guild_lnc.lua deleted file mode 100644 index 405f1b66..00000000 --- a/Data/scripts/unique/fst0Town01a/DoorStandard/guild_lnc.lua +++ /dev/null @@ -1,3 +0,0 @@ -function init(npc) - return false, false, 0, 0, 0x141, 0xB80; -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/DoorStandard/guild_ltw.lua b/Data/scripts/unique/fst0Town01a/DoorStandard/guild_ltw.lua deleted file mode 100644 index d9bc8bf6..00000000 --- a/Data/scripts/unique/fst0Town01a/DoorStandard/guild_ltw.lua +++ /dev/null @@ -1,3 +0,0 @@ -function init(npc) - return false, false, 0, 0, 0x141, 0xB7F; -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/DoorStandard/whistling_miller.lua b/Data/scripts/unique/fst0Town01a/DoorStandard/whistling_miller.lua deleted file mode 100644 index 9ab7eb7a..00000000 --- a/Data/scripts/unique/fst0Town01a/DoorStandard/whistling_miller.lua +++ /dev/null @@ -1,3 +0,0 @@ -function init(npc) - return false, false, 0, 0, 0x141, 0xB82; -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/DoorStandard/guild_acn_south.lua b/Data/scripts/unique/sea0Town01a/DoorStandard/guild_acn_south.lua deleted file mode 100644 index 210840bc..00000000 --- a/Data/scripts/unique/sea0Town01a/DoorStandard/guild_acn_south.lua +++ /dev/null @@ -1,3 +0,0 @@ -function init(npc) - return false, false, 0, 0, 0x79, 0x96C; -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/DoorStandard/guild_acn_southsouth.lua b/Data/scripts/unique/sea0Town01a/DoorStandard/guild_acn_southsouth.lua deleted file mode 100644 index 505bee05..00000000 --- a/Data/scripts/unique/sea0Town01a/DoorStandard/guild_acn_southsouth.lua +++ /dev/null @@ -1,3 +0,0 @@ -function init(npc) - return false, false, 0, 0, 0x79, 0x96A; -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/DoorStandard/guild_bsm_east.lua b/Data/scripts/unique/sea0Town01a/DoorStandard/guild_bsm_east.lua deleted file mode 100644 index 8ecca881..00000000 --- a/Data/scripts/unique/sea0Town01a/DoorStandard/guild_bsm_east.lua +++ /dev/null @@ -1,3 +0,0 @@ -function init(npc) - return false, false, 0, 0, 0x79, 0x96D; -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/DoorStandard/guild_bsm_west.lua b/Data/scripts/unique/sea0Town01a/DoorStandard/guild_bsm_west.lua deleted file mode 100644 index 03e587d7..00000000 --- a/Data/scripts/unique/sea0Town01a/DoorStandard/guild_bsm_west.lua +++ /dev/null @@ -1,3 +0,0 @@ -function init(npc) - return false, false, 0, 0, 0x79, 0x970; -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/DoorStandard/guild_cul_nwest.lua b/Data/scripts/unique/sea0Town01a/DoorStandard/guild_cul_nwest.lua deleted file mode 100644 index 2d469516..00000000 --- a/Data/scripts/unique/sea0Town01a/DoorStandard/guild_cul_nwest.lua +++ /dev/null @@ -1,3 +0,0 @@ -function init(npc) - return false, false, 0, 0, 0x79, 0x974; -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/DoorStandard/guild_cul_south.lua b/Data/scripts/unique/sea0Town01a/DoorStandard/guild_cul_south.lua deleted file mode 100644 index b0aa7f1b..00000000 --- a/Data/scripts/unique/sea0Town01a/DoorStandard/guild_cul_south.lua +++ /dev/null @@ -1,3 +0,0 @@ -function init(npc) - return false, false, 0, 0, 0x79, 0x972; -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/DoorStandard/guild_mrd_bot.lua b/Data/scripts/unique/sea0Town01a/DoorStandard/guild_mrd_bot.lua deleted file mode 100644 index 89be3b49..00000000 --- a/Data/scripts/unique/sea0Town01a/DoorStandard/guild_mrd_bot.lua +++ /dev/null @@ -1,3 +0,0 @@ -function init(npc) - return false, false, 0, 0, 0x83, 0x1B8E; -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/DoorStandard/guild_mrd_mid.lua b/Data/scripts/unique/sea0Town01a/DoorStandard/guild_mrd_mid.lua deleted file mode 100644 index ae21d3d3..00000000 --- a/Data/scripts/unique/sea0Town01a/DoorStandard/guild_mrd_mid.lua +++ /dev/null @@ -1,3 +0,0 @@ -function init(npc) - return false, false, 0, 0, 0x83, 0x1B89; -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/DoorStandard/guild_mrd_top.lua b/Data/scripts/unique/sea0Town01a/DoorStandard/guild_mrd_top.lua deleted file mode 100644 index 0462b75e..00000000 --- a/Data/scripts/unique/sea0Town01a/DoorStandard/guild_mrd_top.lua +++ /dev/null @@ -1,3 +0,0 @@ -function init(npc) - return false, false, 0, 0, 0x83, 0x1B90; -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/DoorStandard/guild_msk.lua b/Data/scripts/unique/sea0Town01a/DoorStandard/guild_msk.lua deleted file mode 100644 index c53c3ed8..00000000 --- a/Data/scripts/unique/sea0Town01a/DoorStandard/guild_msk.lua +++ /dev/null @@ -1,3 +0,0 @@ -function init(npc) - return false, false, 0, 0, 0x79, 0x976; -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/DoorStandard/guild_msk_se_ne.lua b/Data/scripts/unique/sea0Town01a/DoorStandard/guild_msk_se_ne.lua deleted file mode 100644 index 1eae8de7..00000000 --- a/Data/scripts/unique/sea0Town01a/DoorStandard/guild_msk_se_ne.lua +++ /dev/null @@ -1,3 +0,0 @@ -function init(npc) - return false, false, 0, 0, 0x79, 0x954; -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/DoorStandard/guild_msk_se_nw.lua b/Data/scripts/unique/sea0Town01a/DoorStandard/guild_msk_se_nw.lua deleted file mode 100644 index 5fa06738..00000000 --- a/Data/scripts/unique/sea0Town01a/DoorStandard/guild_msk_se_nw.lua +++ /dev/null @@ -1,3 +0,0 @@ -function init(npc) - return false, false, 0, 0, 0x79, 0x956; -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/DoorStandard/guild_msk_se_se.lua b/Data/scripts/unique/sea0Town01a/DoorStandard/guild_msk_se_se.lua deleted file mode 100644 index e120aa1a..00000000 --- a/Data/scripts/unique/sea0Town01a/DoorStandard/guild_msk_se_se.lua +++ /dev/null @@ -1,3 +0,0 @@ -function init(npc) - return false, false, 0, 0, 0x79, 0x952; -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/DoorStandard/guild_msk_se_sw.lua b/Data/scripts/unique/sea0Town01a/DoorStandard/guild_msk_se_sw.lua deleted file mode 100644 index 468e6aac..00000000 --- a/Data/scripts/unique/sea0Town01a/DoorStandard/guild_msk_se_sw.lua +++ /dev/null @@ -1,3 +0,0 @@ -function init(npc) - return false, false, 0, 0, 0x79, 0x958; -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/DoorStandard/hyaline_east.lua b/Data/scripts/unique/sea0Town01a/DoorStandard/hyaline_east.lua deleted file mode 100644 index 96110c7f..00000000 --- a/Data/scripts/unique/sea0Town01a/DoorStandard/hyaline_east.lua +++ /dev/null @@ -1,3 +0,0 @@ -function init(npc) - return false, false, 0, 0, 0x79, 0x960; -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/DoorStandard/hyaline_north.lua b/Data/scripts/unique/sea0Town01a/DoorStandard/hyaline_north.lua deleted file mode 100644 index 58d19093..00000000 --- a/Data/scripts/unique/sea0Town01a/DoorStandard/hyaline_north.lua +++ /dev/null @@ -1,3 +0,0 @@ -function init(npc) - return false, false, 0, 0, 0x79, 0x95A; -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/DoorStandard/hyaline_south.lua b/Data/scripts/unique/sea0Town01a/DoorStandard/hyaline_south.lua deleted file mode 100644 index 507ba45c..00000000 --- a/Data/scripts/unique/sea0Town01a/DoorStandard/hyaline_south.lua +++ /dev/null @@ -1,3 +0,0 @@ -function init(npc) - return false, false, 0, 0, 0x79, 0x95E; -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/DoorStandard/hyaline_west.lua b/Data/scripts/unique/sea0Town01a/DoorStandard/hyaline_west.lua deleted file mode 100644 index 30809872..00000000 --- a/Data/scripts/unique/sea0Town01a/DoorStandard/hyaline_west.lua +++ /dev/null @@ -1,3 +0,0 @@ -function init(npc) - return false, false, 0, 0, 0x79, 0x95C; -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/DoorStandard/marketward.lua b/Data/scripts/unique/sea0Town01a/DoorStandard/marketward.lua deleted file mode 100644 index 8ecca881..00000000 --- a/Data/scripts/unique/sea0Town01a/DoorStandard/marketward.lua +++ /dev/null @@ -1,3 +0,0 @@ -function init(npc) - return false, false, 0, 0, 0x79, 0x96D; -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/DoorStandard/northofseventhsage_east.lua b/Data/scripts/unique/sea0Town01a/DoorStandard/northofseventhsage_east.lua deleted file mode 100644 index 4f024ec5..00000000 --- a/Data/scripts/unique/sea0Town01a/DoorStandard/northofseventhsage_east.lua +++ /dev/null @@ -1,3 +0,0 @@ -function init(npc) - return false, false, 0, 0, 0x79, 0x94C; -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/DoorStandard/northofseventhsage_north.lua b/Data/scripts/unique/sea0Town01a/DoorStandard/northofseventhsage_north.lua deleted file mode 100644 index f02ac4b0..00000000 --- a/Data/scripts/unique/sea0Town01a/DoorStandard/northofseventhsage_north.lua +++ /dev/null @@ -1,3 +0,0 @@ -function init(npc) - return false, false, 0, 0, 0x79, 0x94E; -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/DoorStandard/northofseventhsage_south.lua b/Data/scripts/unique/sea0Town01a/DoorStandard/northofseventhsage_south.lua deleted file mode 100644 index e7f6cd9e..00000000 --- a/Data/scripts/unique/sea0Town01a/DoorStandard/northofseventhsage_south.lua +++ /dev/null @@ -1,3 +0,0 @@ -function init(npc) - return false, false, 0, 0, 0x79, 0x94A; -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/DoorStandard/northofseventhsage_west.lua b/Data/scripts/unique/sea0Town01a/DoorStandard/northofseventhsage_west.lua deleted file mode 100644 index 1097fd72..00000000 --- a/Data/scripts/unique/sea0Town01a/DoorStandard/northofseventhsage_west.lua +++ /dev/null @@ -1,3 +0,0 @@ -function init(npc) - return false, false, 0, 0, 0x79, 0x950; -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/DoorStandard/seventhsage_east.lua b/Data/scripts/unique/sea0Town01a/DoorStandard/seventhsage_east.lua deleted file mode 100644 index d862d0b1..00000000 --- a/Data/scripts/unique/sea0Town01a/DoorStandard/seventhsage_east.lua +++ /dev/null @@ -1,3 +0,0 @@ -function init(npc) - return false, false, 0, 0, 0x79, 0x944; -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/DoorStandard/seventhsage_north.lua b/Data/scripts/unique/sea0Town01a/DoorStandard/seventhsage_north.lua deleted file mode 100644 index 8d58b1ab..00000000 --- a/Data/scripts/unique/sea0Town01a/DoorStandard/seventhsage_north.lua +++ /dev/null @@ -1,3 +0,0 @@ -function init(npc) - return false, false, 0, 0, 0x79, 0x946; -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/DoorStandard/seventhsage_south.lua b/Data/scripts/unique/sea0Town01a/DoorStandard/seventhsage_south.lua deleted file mode 100644 index d8d32aac..00000000 --- a/Data/scripts/unique/sea0Town01a/DoorStandard/seventhsage_south.lua +++ /dev/null @@ -1,3 +0,0 @@ -function init(npc) - return false, false, 0, 0, 0x79, 0x942; -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/DoorStandard/seventhsage_west.lua b/Data/scripts/unique/sea0Town01a/DoorStandard/seventhsage_west.lua deleted file mode 100644 index 593f38eb..00000000 --- a/Data/scripts/unique/sea0Town01a/DoorStandard/seventhsage_west.lua +++ /dev/null @@ -1,3 +0,0 @@ -function init(npc) - return false, false, 0, 0, 0x79, 0x948; -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/DoorStandard/thundersquall_east.lua b/Data/scripts/unique/sea0Town01a/DoorStandard/thundersquall_east.lua deleted file mode 100644 index e5b9827a..00000000 --- a/Data/scripts/unique/sea0Town01a/DoorStandard/thundersquall_east.lua +++ /dev/null @@ -1,3 +0,0 @@ -function init(npc) - return false, false, 0, 0, 0x79, 0x968; -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/DoorStandard/thundersquall_north.lua b/Data/scripts/unique/sea0Town01a/DoorStandard/thundersquall_north.lua deleted file mode 100644 index 5fa8fa23..00000000 --- a/Data/scripts/unique/sea0Town01a/DoorStandard/thundersquall_north.lua +++ /dev/null @@ -1,3 +0,0 @@ -function init(npc) - return false, false, 0, 0, 0x79, 0x962; -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/DoorStandard/thundersquall_south.lua b/Data/scripts/unique/sea0Town01a/DoorStandard/thundersquall_south.lua deleted file mode 100644 index 8fca2d58..00000000 --- a/Data/scripts/unique/sea0Town01a/DoorStandard/thundersquall_south.lua +++ /dev/null @@ -1,3 +0,0 @@ -function init(npc) - return false, false, 0, 0, 0x79, 0x966; -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/MapObjShipPort/limsa_shipport.lua b/Data/scripts/unique/sea0Town01a/MapObjShipPort/limsa_shipport.lua deleted file mode 100644 index 839a2f7e..00000000 --- a/Data/scripts/unique/sea0Town01a/MapObjShipPort/limsa_shipport.lua +++ /dev/null @@ -1,5 +0,0 @@ -require ("global") - -function init(npc) - return false, false, 0, 0, 0xC4, 0x1C8; -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/MapObjShipPort/limsa_shipport2.lua b/Data/scripts/unique/sea0Town01a/MapObjShipPort/limsa_shipport2.lua deleted file mode 100644 index 3b372965..00000000 --- a/Data/scripts/unique/sea0Town01a/MapObjShipPort/limsa_shipport2.lua +++ /dev/null @@ -1,5 +0,0 @@ -require ("global") - -function init(npc) - return false, false, 0, 0, 0x187, 0x2; -end \ No newline at end of file diff --git a/Data/scripts/unique/sea1Cruise01/DoorStandard/ferry_door1_nosceatothan.lua b/Data/scripts/unique/sea1Cruise01/DoorStandard/ferry_door1_nosceatothan.lua deleted file mode 100644 index 68bf6c78..00000000 --- a/Data/scripts/unique/sea1Cruise01/DoorStandard/ferry_door1_nosceatothan.lua +++ /dev/null @@ -1,5 +0,0 @@ -require ("global") - -function init(npc) - return false, false, 0, 0, 5142, 323; -end \ No newline at end of file diff --git a/Data/scripts/unique/sea1Cruise01/DoorStandard/ferry_door1_thantonoscea.lua b/Data/scripts/unique/sea1Cruise01/DoorStandard/ferry_door1_thantonoscea.lua deleted file mode 100644 index 171b623b..00000000 --- a/Data/scripts/unique/sea1Cruise01/DoorStandard/ferry_door1_thantonoscea.lua +++ /dev/null @@ -1,5 +0,0 @@ -require ("global") - -function init(npc) - return false, false, 0, 0, 5143, 323; -end \ No newline at end of file diff --git a/Data/scripts/unique/sea1Cruise01/DoorStandard/ferry_door2_nosceatothan.lua b/Data/scripts/unique/sea1Cruise01/DoorStandard/ferry_door2_nosceatothan.lua deleted file mode 100644 index 244b2ac8..00000000 --- a/Data/scripts/unique/sea1Cruise01/DoorStandard/ferry_door2_nosceatothan.lua +++ /dev/null @@ -1,5 +0,0 @@ -require ("global") - -function init(npc) - return false, false, 0, 0, 5142, 326; -end \ No newline at end of file diff --git a/Data/scripts/unique/sea1Cruise01/DoorStandard/ferry_door2_thantonoscea.lua b/Data/scripts/unique/sea1Cruise01/DoorStandard/ferry_door2_thantonoscea.lua deleted file mode 100644 index ee98a388..00000000 --- a/Data/scripts/unique/sea1Cruise01/DoorStandard/ferry_door2_thantonoscea.lua +++ /dev/null @@ -1,5 +0,0 @@ -require ("global") - -function init(npc) - return false, false, 0, 0, 5143, 326; -end \ No newline at end of file diff --git a/Data/scripts/unique/sea1Cruise01/MapObjShipRouteLand/ferry_route_nosceatothan.lua b/Data/scripts/unique/sea1Cruise01/MapObjShipRouteLand/ferry_route_nosceatothan.lua deleted file mode 100644 index d9f69ef0..00000000 --- a/Data/scripts/unique/sea1Cruise01/MapObjShipRouteLand/ferry_route_nosceatothan.lua +++ /dev/null @@ -1,5 +0,0 @@ -require ("global") - -function init(npc) - return false, false, 0, 0, 5145, 252; -end \ No newline at end of file diff --git a/Data/scripts/unique/sea1Cruise01/MapObjShipRouteLand/ferry_route_thantonoscea.lua b/Data/scripts/unique/sea1Cruise01/MapObjShipRouteLand/ferry_route_thantonoscea.lua deleted file mode 100644 index af43e66d..00000000 --- a/Data/scripts/unique/sea1Cruise01/MapObjShipRouteLand/ferry_route_thantonoscea.lua +++ /dev/null @@ -1,5 +0,0 @@ -require ("global") - -function init(npc) - return false, false, 0, 0, 5144, 201; -end \ No newline at end of file diff --git a/Data/scripts/unique/sea1Cruise01/PopulaceStandard/ferry_man_noceatothan.lua b/Data/scripts/unique/sea1Cruise01/PopulaceStandard/ferry_man_noceatothan.lua deleted file mode 100644 index e2c3ed12..00000000 --- a/Data/scripts/unique/sea1Cruise01/PopulaceStandard/ferry_man_noceatothan.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc, triggerName) - defaultSrt = GetStaticActor("DftSrt"); - callClientFunction(player, "delegateEvent", player, defaultSrt, "defaultTalkWithPilot_001"); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea1Cruise01/PopulaceStandard/ferry_man_thantonocea.lua b/Data/scripts/unique/sea1Cruise01/PopulaceStandard/ferry_man_thantonocea.lua deleted file mode 100644 index e2c3ed12..00000000 --- a/Data/scripts/unique/sea1Cruise01/PopulaceStandard/ferry_man_thantonocea.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc, triggerName) - defaultSrt = GetStaticActor("DftSrt"); - callClientFunction(player, "delegateEvent", player, defaultSrt, "defaultTalkWithPilot_001"); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01/DoorStandard/adv_guild_east.lua b/Data/scripts/unique/wil0Town01/DoorStandard/adv_guild_east.lua deleted file mode 100644 index c349fe93..00000000 --- a/Data/scripts/unique/wil0Town01/DoorStandard/adv_guild_east.lua +++ /dev/null @@ -1,3 +0,0 @@ -function init(npc) - return false, false, 0, 0, 0x1A5, 0xFC8; -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01/DoorStandard/adv_guild_north.lua b/Data/scripts/unique/wil0Town01/DoorStandard/adv_guild_north.lua deleted file mode 100644 index 20b34e2f..00000000 --- a/Data/scripts/unique/wil0Town01/DoorStandard/adv_guild_north.lua +++ /dev/null @@ -1,3 +0,0 @@ -function init(npc) - return false, false, 0, 0, 0x1A5, 0xFC6; -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01/DoorStandard/adv_guild_west.lua b/Data/scripts/unique/wil0Town01/DoorStandard/adv_guild_west.lua deleted file mode 100644 index baa3b958..00000000 --- a/Data/scripts/unique/wil0Town01/DoorStandard/adv_guild_west.lua +++ /dev/null @@ -1,3 +0,0 @@ -function init(npc) - return false, false, 0, 0, 0x1A5, 0xFC7; -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01/DoorStandard/guild_pug.lua b/Data/scripts/unique/wil0Town01/DoorStandard/guild_pug.lua deleted file mode 100644 index 56998447..00000000 --- a/Data/scripts/unique/wil0Town01/DoorStandard/guild_pug.lua +++ /dev/null @@ -1,3 +0,0 @@ -function init(npc) - return false, false, 0, 0, 0x1A5, 0x101D; -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01a/DoorStandard/east_of_goldcourt.lua b/Data/scripts/unique/wil0Town01a/DoorStandard/east_of_goldcourt.lua deleted file mode 100644 index eab2f11d..00000000 --- a/Data/scripts/unique/wil0Town01a/DoorStandard/east_of_goldcourt.lua +++ /dev/null @@ -1,3 +0,0 @@ -function init(npc) - return false, false, 0, 0, 0x1A5, 0xFD7; -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01a/DoorStandard/guild_alc.lua b/Data/scripts/unique/wil0Town01a/DoorStandard/guild_alc.lua deleted file mode 100644 index 54ba5c66..00000000 --- a/Data/scripts/unique/wil0Town01a/DoorStandard/guild_alc.lua +++ /dev/null @@ -1,3 +0,0 @@ -function init(npc) - return false, false, 0, 0, 0x1A5, 0xFCC; -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01a/DoorStandard/guild_gla.lua b/Data/scripts/unique/wil0Town01a/DoorStandard/guild_gla.lua deleted file mode 100644 index 2b1e88dd..00000000 --- a/Data/scripts/unique/wil0Town01a/DoorStandard/guild_gla.lua +++ /dev/null @@ -1,3 +0,0 @@ -function init(npc) - return false, false, 0, 0, 0x1A5, 0x101E; -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01a/DoorStandard/guild_gsm.lua b/Data/scripts/unique/wil0Town01a/DoorStandard/guild_gsm.lua deleted file mode 100644 index cb3caf27..00000000 --- a/Data/scripts/unique/wil0Town01a/DoorStandard/guild_gsm.lua +++ /dev/null @@ -1,3 +0,0 @@ -function init(npc) - return false, false, 0, 0, 0x1A5, 0xFCB; -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01a/DoorStandard/guild_min.lua b/Data/scripts/unique/wil0Town01a/DoorStandard/guild_min.lua deleted file mode 100644 index 16abe2f3..00000000 --- a/Data/scripts/unique/wil0Town01a/DoorStandard/guild_min.lua +++ /dev/null @@ -1,3 +0,0 @@ -function init(npc) - return false, false, 0, 0, 0x1A5, 0xFCA; -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01a/DoorStandard/guild_wvr.lua b/Data/scripts/unique/wil0Town01a/DoorStandard/guild_wvr.lua deleted file mode 100644 index 474f0060..00000000 --- a/Data/scripts/unique/wil0Town01a/DoorStandard/guild_wvr.lua +++ /dev/null @@ -1,3 +0,0 @@ -function init(npc) - return false, false, 0, 0, 0x1A5, 0xFC9; -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01a/DoorStandard/ne_of_eshtaimes.lua b/Data/scripts/unique/wil0Town01a/DoorStandard/ne_of_eshtaimes.lua deleted file mode 100644 index 1cffd8b4..00000000 --- a/Data/scripts/unique/wil0Town01a/DoorStandard/ne_of_eshtaimes.lua +++ /dev/null @@ -1,3 +0,0 @@ -function init(npc) - return false, false, 0, 0, 0x1A5, 0xFD9; -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01a/DoorStandard/nw_of_guild_wvr.lua b/Data/scripts/unique/wil0Town01a/DoorStandard/nw_of_guild_wvr.lua deleted file mode 100644 index 4b750a94..00000000 --- a/Data/scripts/unique/wil0Town01a/DoorStandard/nw_of_guild_wvr.lua +++ /dev/null @@ -1,3 +0,0 @@ -function init(npc) - return false, false, 0, 0, 0x1A5, 0xFDB; -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01a/MapObjShipPort/uldah_mapshipport_1.lua b/Data/scripts/unique/wil0Town01a/MapObjShipPort/uldah_mapshipport_1.lua deleted file mode 100644 index efe1e2e5..00000000 --- a/Data/scripts/unique/wil0Town01a/MapObjShipPort/uldah_mapshipport_1.lua +++ /dev/null @@ -1,5 +0,0 @@ -require ("global") - -function init(npc) - return false, false, 0, 0, 0x1af, 0xDC5; -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01a/MapObjShipPort/uldah_mapshipport_2.lua b/Data/scripts/unique/wil0Town01a/MapObjShipPort/uldah_mapshipport_2.lua deleted file mode 100644 index 5cbed1d0..00000000 --- a/Data/scripts/unique/wil0Town01a/MapObjShipPort/uldah_mapshipport_2.lua +++ /dev/null @@ -1,5 +0,0 @@ -require ("global") - -function init(npc) - return false, false, 0, 0, 0x1eb, 0x2; -end \ No newline at end of file diff --git a/Map Server/Actors/Area/Area.cs b/Map Server/Actors/Area/Area.cs index 17a89bde..d7b749d1 100644 --- a/Map Server/Actors/Area/Area.cs +++ b/Map Server/Actors/Area/Area.cs @@ -517,7 +517,7 @@ namespace Meteor.Map.Actors if (actorClass == null) return; - Npc npc = new Npc(mActorList.Count + 1, actorClass, location.uniqueId, this, location.x, location.y, location.z, location.rot, 0, location.motionPack, null); + Npc npc = new Npc(mActorList.Count + 1, actorClass, location.uniqueId, this, location.x, location.y, location.z, location.rot, 0, location.motionPack, null, location.mapObjLayoutId, location.mapObjInstanceId); npc.LoadEventConditions(actorClass.eventConditions); diff --git a/Map Server/Actors/Area/SpawnLocation.cs b/Map Server/Actors/Area/SpawnLocation.cs index de61c3aa..f57fe9c7 100644 --- a/Map Server/Actors/Area/SpawnLocation.cs +++ b/Map Server/Actors/Area/SpawnLocation.cs @@ -34,7 +34,10 @@ namespace Meteor.Map.actors.area public float rot; public uint motionPack; - public SpawnLocation(uint classId, string uniqueId, uint zoneId, string privAreaName, int privAreaLevel, float x, float y, float z, float rot, uint animId) + public uint mapObjLayoutId; + public uint mapObjInstanceId; + + public SpawnLocation(uint classId, string uniqueId, uint zoneId, string privAreaName, int privAreaLevel, float x, float y, float z, float rot, uint animId, uint mapObjLayoutId, uint mapObjInstanceId) { this.classId = classId; this.uniqueId = uniqueId; @@ -46,6 +49,8 @@ namespace Meteor.Map.actors.area this.z = z; this.rot = rot; this.motionPack = animId; - } + this.mapObjLayoutId = mapObjLayoutId; + this.mapObjInstanceId = mapObjInstanceId; + } } } diff --git a/Map Server/Actors/Chara/Npc/Npc.cs b/Map Server/Actors/Chara/Npc/Npc.cs index e62b1e90..777c1d7c 100644 --- a/Map Server/Actors/Chara/Npc/Npc.cs +++ b/Map Server/Actors/Chara/Npc/Npc.cs @@ -51,13 +51,13 @@ namespace Meteor.Map.Actors private uint actorClassId; private string uniqueIdentifier; - private bool isMapObj = false; - private uint layout, instance; + private bool IsMapObjChara = false; + private uint MapObjLayoutId, MapObjInstanceId; public NpcWork npcWork = new NpcWork(); public NpcSpawnType npcSpawnType; - public Npc(int actorNumber, ActorClass actorClass, string uniqueId, Area spawnedArea, float posX, float posY, float posZ, float rot, ushort actorState, uint animationId, string customDisplayName) + public Npc(int actorNumber, ActorClass actorClass, string uniqueId, Area spawnedArea, float posX, float posY, float posZ, float rot, ushort actorState, uint animationId, string customDisplayName, uint mapObjLayoutId = 0, uint mapObjInstanceId = 0) : base((4 << 28 | spawnedArea.Id << 19 | ((uint)actorNumber + 5))) { this.positionX = posX; @@ -101,24 +101,19 @@ namespace Meteor.Map.Actors npcWork.pushCommandSub = actorClass.pushCommandSub; npcWork.pushCommandPriority = actorClass.pushCommandPriority; - if (actorClassId == 1080078 || actorClassId == 1080079 || actorClassId == 1080080 || (actorClassId >= 1080123 && actorClassId <= 1080135) || (actorClassId >= 5000001 && actorClassId <= 5000090) || (actorClassId >= 5900001 && actorClassId <= 5900038)) + if (mapObjLayoutId != 0 && mapObjInstanceId != 0) { - isMapObj = true; - List lParams = LuaEngine.GetInstance().CallLuaFunctionForReturn(null, this, "init", false); - if (lParams == null || lParams.Count < 6) - isMapObj = false; - else - { - layout = (uint)(Int32)lParams[4].value; - instance = (uint)(Int32)lParams[5].value; - isStatic = true; - } + isStatic = true; + IsMapObjChara = true; + MapObjLayoutId = mapObjLayoutId; + MapObjInstanceId = mapObjInstanceId; } + GenerateActorName((int)actorNumber); this.aiContainer = new AIContainer(this, null, new PathFind(this), new TargetFind(this)); } - public Npc(int actorNumber, ActorClass actorClass, string uniqueId, Area spawnedArea, float posX, float posY, float posZ, float rot, uint layout, uint instance) + public Npc(int actorNumber, ActorClass actorClass, string uniqueId, Area spawnedArea, float posX, float posY, float posZ, float rot, uint mapObjLayoutId = 0, uint mapObjInstanceId = 0) : base((4 << 28 | spawnedArea.Id << 19 | (uint)actorNumber)) { this.positionX = posX; @@ -148,9 +143,13 @@ namespace Meteor.Map.Actors npcWork.pushCommandSub = actorClass.pushCommandSub; npcWork.pushCommandPriority = actorClass.pushCommandPriority; - this.isMapObj = true; - this.layout = layout; - this.instance = instance; + if (mapObjLayoutId != 0 && mapObjInstanceId != 0) + { + isStatic = true; + IsMapObjChara = true; + MapObjLayoutId = mapObjLayoutId; + MapObjInstanceId = mapObjInstanceId; + } GenerateActorName((int)actorNumber); this.aiContainer = new AIContainer(this, null, new PathFind(this), new TargetFind(null)); @@ -208,8 +207,8 @@ namespace Meteor.Map.Actors subpackets.Add(CreateSpeedPacket()); subpackets.Add(CreateSpawnPositonPacket(0x0)); - if (isMapObj) - subpackets.Add(SetActorBGPropertiesPacket.BuildPacket(Id, instance, layout)); + if (IsMapObjChara) + subpackets.Add(SetActorBGPropertiesPacket.BuildPacket(Id, MapObjLayoutId, MapObjInstanceId)); else subpackets.Add(CreateAppearancePacket()); diff --git a/Map Server/Actors/Chara/Player/Player.cs b/Map Server/Actors/Chara/Player/Player.cs index a1971f3e..ce203b5d 100644 --- a/Map Server/Actors/Chara/Player/Player.cs +++ b/Map Server/Actors/Chara/Player/Player.cs @@ -1815,7 +1815,7 @@ namespace Meteor.Map.Actors break; } - if (defaultTalk != null && defaultTalk.IsQuestENPC(this, npc)) + if (defaultTalk != null && defaultTalk.IsQuestENPCByScript(this, npc)) return defaultTalk; return null; diff --git a/Map Server/Actors/Quest/Quest.cs b/Map Server/Actors/Quest/Quest.cs index 2f6a1c73..690555ed 100644 --- a/Map Server/Actors/Quest/Quest.cs +++ b/Map Server/Actors/Quest/Quest.cs @@ -195,6 +195,12 @@ namespace Meteor.Map.Actors.QuestNS return (questState?.HasENpc(npc.GetActorClassId()) ?? false); } + public bool IsQuestENPCByScript(Player caller, Npc npc) + { + List returned = LuaEngine.GetInstance().CallLuaFunctionForReturn(caller, this, "IsQuestENPC", true, npc, this); + return returned != null && returned.Count != 0 && returned[0].typeID == 3; + } + public void StartSequence(ushort sequence) { if (sequence == SEQ_NOT_STARTED) diff --git a/Map Server/Packets/Send/Actor/SetActorBGPropertiesPacket.cs b/Map Server/Packets/Send/Actor/SetActorBGPropertiesPacket.cs index 80a488bb..33188f03 100644 --- a/Map Server/Packets/Send/Actor/SetActorBGPropertiesPacket.cs +++ b/Map Server/Packets/Send/Actor/SetActorBGPropertiesPacket.cs @@ -31,7 +31,7 @@ namespace Meteor.Map.packets.send.actor public const ushort OPCODE = 0x00D8; public const uint PACKET_SIZE = 0x28; - public static SubPacket BuildPacket(uint sourceActorId, uint val1, uint val2) + public static SubPacket BuildPacket(uint sourceActorId, uint layoutId, uint instanceId) { byte[] data = new byte[PACKET_SIZE - 0x20]; @@ -39,8 +39,8 @@ namespace Meteor.Map.packets.send.actor { using (BinaryWriter binWriter = new BinaryWriter(mem)) { - binWriter.Write((UInt32)val1); - binWriter.Write((UInt32)val2); + binWriter.Write((UInt32)instanceId); + binWriter.Write((UInt32)layoutId); } } diff --git a/Map Server/WorldManager.cs b/Map Server/WorldManager.cs index 0bb89e59..9130aac2 100644 --- a/Map Server/WorldManager.cs +++ b/Map Server/WorldManager.cs @@ -335,8 +335,11 @@ namespace Meteor.Map positionY, positionZ, rotation, - motionPack - FROM server_eventnpc_spawn_locations + motionPack, + layoutId, + instanceId + FROM server_eventnpc_spawn_locations + LEFT JOIN server_eventnpc_mapobj ON server_eventnpc_spawn_locations.id = server_eventnpc_mapobj.id "; MySqlCommand cmd = new MySqlCommand(query, conn); @@ -363,8 +366,11 @@ namespace Meteor.Map float z = reader.GetFloat("positionZ"); float rot = reader.GetFloat("rotation"); uint motionPack = reader.GetUInt32("motionPack"); - - SpawnLocation spawn = new SpawnLocation(classId, uniqueId, zoneId, privAreaName, privAreaType, x, y, z, rot, motionPack); + + uint layoutId = !reader.IsDBNull(reader.GetOrdinal("layoutId")) ? reader.GetUInt32("layoutId") : 0; + uint instanceId = !reader.IsDBNull(reader.GetOrdinal("instanceId")) ? reader.GetUInt32("instanceId") : 0; + + SpawnLocation spawn = new SpawnLocation(classId, uniqueId, zoneId, privAreaName, privAreaType, x, y, z, rot, motionPack, layoutId, instanceId); zone.AddSpawnLocation(spawn); From b57f91470a60cfdbf51d48cfb110b4fa9349d8c8 Mon Sep 17 00:00:00 2001 From: Filip Maj Date: Thu, 3 Mar 2022 20:03:36 -0500 Subject: [PATCH 20/23] Deleting more useless scripts. Moved all the elevator scripts into 1 base script. --- .../chara/npc/object/ElevatorStandard.lua | 94 ++++++++++++++++++- .../PopulaceStandard/miraudont.lua | 7 -- .../serpent_private_dauremant.lua | 10 -- .../serpent_private_hodder.lua | 10 -- .../scripts/unique/fst0Town01/Monster/ass.lua | 2 - .../fst0Town01/PopulaceStandard/aeduin.lua | 7 -- .../fst0Town01/PopulaceStandard/anene.lua | 7 -- .../fst0Town01/PopulaceStandard/anselm.lua | 7 -- .../fst0Town01/PopulaceStandard/basewin.lua | 7 -- .../fst0Town01/PopulaceStandard/beaudonet.lua | 7 -- .../PopulaceStandard/bertennant.lua | 7 -- .../fst0Town01/PopulaceStandard/drividot.lua | 7 -- .../fst0Town01/PopulaceStandard/edasshym.lua | 7 -- .../fst0Town01/PopulaceStandard/emoni.lua | 7 -- .../fst0Town01/PopulaceStandard/flavielle.lua | 7 -- .../fst0Town01/PopulaceStandard/fryswyde.lua | 7 -- .../fst0Town01/PopulaceStandard/gontrant.lua | 7 -- .../fst0Town01/PopulaceStandard/gyles.lua | 7 -- .../fst0Town01/PopulaceStandard/hida.lua | 7 -- .../PopulaceStandard/honga_vunga.lua | 7 -- .../fst0Town01/PopulaceStandard/l'tandhaa.lua | 7 -- .../PopulaceStandard/lionnellais.lua | 7 -- .../fst0Town01/PopulaceStandard/lonsygg.lua | 7 -- .../fst0Town01/PopulaceStandard/mathye.lua | 7 -- .../fst0Town01/PopulaceStandard/memama.lua | 7 -- .../PopulaceStandard/miniaeth_adv.lua | 7 -- .../fst0Town01/PopulaceStandard/miounne.lua | 7 -- .../PopulaceStandard/naih_khamazom.lua | 7 -- .../PopulaceStandard/nonco_menanco.lua | 7 -- .../fst0Town01/PopulaceStandard/odilie.lua | 7 -- .../fst0Town01/PopulaceStandard/penelope.lua | 7 -- .../fst0Town01/PopulaceStandard/pfarahr.lua | 46 --------- .../fst0Town01/PopulaceStandard/pofufu.lua | 7 -- .../fst0Town01/PopulaceStandard/seikfrae.lua | 7 -- .../serpent_private_dauremant.lua | 7 -- .../PopulaceStandard/serpent_private_hill.lua | 7 -- .../serpent_private_hodder.lua | 7 -- .../fst0Town01/PopulaceStandard/sylbyrt.lua | 7 -- .../PopulaceStandard/task_board.lua | 7 -- .../fst0Town01/PopulaceStandard/tierney.lua | 7 -- .../fst0Town01/PopulaceStandard/torsefers.lua | 7 -- .../fst0Town01/PopulaceStandard/ulta.lua | 7 -- .../fst0Town01/PopulaceStandard/vkorolon.lua | 67 ------------- .../PopulaceStandard/willielmus.lua | 7 -- .../PopulaceStandard/zagylhaemr.lua | 7 -- .../InstanceRaidGuide/louisoix.lua | 7 -- .../PopulacePassiveGLPublisher/anaidjaa.lua | 7 -- .../fst0Town01a/PopulaceStandard/aerstsyn.lua | 7 -- .../fst0Town01a/PopulaceStandard/ahldiym.lua | 7 -- .../fst0Town01a/PopulaceStandard/alaire.lua | 7 -- .../fst0Town01a/PopulaceStandard/alixe.lua | 7 -- .../fst0Town01a/PopulaceStandard/anaidjaa.lua | 7 -- .../fst0Town01a/PopulaceStandard/animuili.lua | 7 -- .../PopulaceStandard/aubrenard.lua | 7 -- .../PopulaceStandard/beaudefoin.lua | 7 -- .../fst0Town01a/PopulaceStandard/beli.lua | 7 -- .../PopulaceStandard/bkonbalha.lua | 7 -- .../fst0Town01a/PopulaceStandard/bubuku.lua | 7 -- .../fst0Town01a/PopulaceStandard/burchard.lua | 7 -- .../fst0Town01a/PopulaceStandard/caplan.lua | 7 -- .../PopulaceStandard/cassandra.lua | 7 -- .../PopulaceStandard/ceinguled.lua | 7 -- .../PopulaceStandard/chalyo_tamlyo.lua | 7 -- .../fst0Town01a/PopulaceStandard/chloe.lua | 7 -- .../fst0Town01a/PopulaceStandard/cicely.lua | 7 -- .../PopulaceStandard/clarembald.lua | 7 -- .../fst0Town01a/PopulaceStandard/dadalo.lua | 7 -- .../fst0Town01a/PopulaceStandard/dbhonja.lua | 7 -- .../fst0Town01a/PopulaceStandard/decima.lua | 7 -- .../fst0Town01a/PopulaceStandard/dhemdaeg.lua | 7 -- .../fst0Town01a/PopulaceStandard/doelle.lua | 7 -- .../PopulaceStandard/drystbrod.lua | 7 -- .../PopulaceStandard/dyrstbrod.lua | 7 -- .../fst0Town01a/PopulaceStandard/eburhart.lua | 7 -- .../fst0Town01a/PopulaceStandard/eldid.lua | 7 -- .../fst0Town01a/PopulaceStandard/enie.lua | 7 -- .../fst0Town01a/PopulaceStandard/foinine.lua | 7 -- .../fst0Town01a/PopulaceStandard/frances.lua | 7 -- .../fst0Town01a/PopulaceStandard/francis.lua | 7 -- .../fst0Town01a/PopulaceStandard/fruhdhem.lua | 7 -- .../fst0Town01a/PopulaceStandard/gagaroon.lua | 7 -- .../fst0Town01a/PopulaceStandard/gagaulu.lua | 7 -- .../fst0Town01a/PopulaceStandard/gallia.lua | 7 -- .../fst0Town01a/PopulaceStandard/genna.lua | 7 -- .../PopulaceStandard/georjeaux.lua | 7 -- .../fst0Town01a/PopulaceStandard/goldyve.lua | 7 -- .../fst0Town01a/PopulaceStandard/gunzelin.lua | 7 -- .../fst0Town01a/PopulaceStandard/habreham.lua | 7 -- .../PopulaceStandard/haurtefert.lua | 7 -- .../fst0Town01a/PopulaceStandard/hereward.lua | 7 -- .../fst0Town01a/PopulaceStandard/hfudzol.lua | 7 -- .../fst0Town01a/PopulaceStandard/humphrey.lua | 7 -- .../fst0Town01a/PopulaceStandard/jmoldva.lua | 7 -- .../fst0Town01a/PopulaceStandard/jolline.lua | 7 -- .../fst0Town01a/PopulaceStandard/kain.lua | 7 -- .../PopulaceStandard/khuma_moshroca.lua | 54 ----------- .../fst0Town01a/PopulaceStandard/kinnison.lua | 66 ------------- .../fst0Town01a/PopulaceStandard/kipopo.lua | 7 -- .../fst0Town01a/PopulaceStandard/lefwyne.lua | 53 ----------- .../PopulaceStandard/littlejohn.lua | 7 -- .../fst0Town01a/PopulaceStandard/louisoix.lua | 7 -- .../fst0Town01a/PopulaceStandard/luilda.lua | 7 -- .../fst0Town01a/PopulaceStandard/luitfrid.lua | 7 -- .../PopulaceStandard/maddeline.lua | 7 -- .../fst0Town01a/PopulaceStandard/maisenta.lua | 7 -- .../fst0Town01a/PopulaceStandard/marcette.lua | 7 -- .../PopulaceStandard/matheonien.lua | 7 -- .../fst0Town01a/PopulaceStandard/meara.lua | 7 -- .../PopulaceStandard/mestonnaux.lua | 54 ----------- .../fst0Town01a/PopulaceStandard/mianne.lua | 7 -- .../PopulaceStandard/miniaeth_arc.lua | 7 -- .../PopulaceStandard/miniaeth_lnc.lua | 7 -- .../PopulaceStandard/miniaeth_ltw.lua | 7 -- .../fst0Town01a/PopulaceStandard/mumuko.lua | 7 -- .../fst0Town01a/PopulaceStandard/nellaure.lua | 51 ---------- .../fst0Town01a/PopulaceStandard/noes.lua | 7 -- .../fst0Town01a/PopulaceStandard/nonolato.lua | 7 -- .../fst0Town01a/PopulaceStandard/nuala.lua | 7 -- .../fst0Town01a/PopulaceStandard/odhinek.lua | 7 -- .../fst0Town01a/PopulaceStandard/onguen.lua | 7 -- .../fst0Town01a/PopulaceStandard/opyltyl.lua | 7 -- .../fst0Town01a/PopulaceStandard/osgar.lua | 7 -- .../fst0Town01a/PopulaceStandard/owyne.lua | 7 -- .../fst0Town01a/PopulaceStandard/piers.lua | 7 -- .../PopulaceStandard/prosperlain.lua | 7 -- .../fst0Town01a/PopulaceStandard/pukiki.lua | 7 -- .../fst0Town01a/PopulaceStandard/roderic.lua | 7 -- .../PopulaceStandard/roustebant.lua | 7 -- .../fst0Town01a/PopulaceStandard/sandre.lua | 7 -- .../serpent_lieutenant_marette.lua | 18 ---- .../serpent_private_carver.lua | 7 -- .../serpent_private_holmes.lua | 7 -- .../PopulaceStandard/serpent_private_kirk.lua | 7 -- .../serpent_private_stone.lua | 7 -- .../serpent_private_tristelle.lua | 7 -- .../serpent_private_white.lua | 7 -- .../serpent_sergeant_frilaix.lua | 7 -- .../PopulaceStandard/spaerfedar.lua | 7 -- .../fst0Town01a/PopulaceStandard/stanilde.lua | 7 -- .../PopulaceStandard/swaenhylt.lua | 7 -- .../fst0Town01a/PopulaceStandard/sybell.lua | 54 ----------- .../fst0Town01a/PopulaceStandard/tatagoi.lua | 7 -- .../fst0Town01a/PopulaceStandard/twyrmoht.lua | 7 -- .../fst0Town01a/PopulaceStandard/ulmhylt.lua | 7 -- .../fst0Town01a/PopulaceStandard/ulric.lua | 7 -- .../fst0Town01a/PopulaceStandard/vnabyano.lua | 7 -- .../fst0Town01a/PopulaceStandard/voyce.lua | 7 -- .../fst0Town01a/PopulaceStandard/willelda.lua | 7 -- .../PopulaceStandard/wulfthryth.lua | 7 -- .../fst0Town01a/PopulaceStandard/ylessa.lua | 7 -- .../fst0Town01a/PopulaceStandard/yolaine.lua | 7 -- .../fst0Town01a/PopulaceStandard/zaesoeya.lua | 7 -- .../fst0Town01a/PopulaceStandard/zelia.lua | 7 -- .../fst0Town01a/PopulaceStandard/zpahtalo.lua | 7 -- .../fst0Town01a/PopulaceStandard/zuzupoja.lua | 7 -- .../PopulaceShopSalesman/sungyve.lua | 6 -- .../PopulaceStandard/kiht_gamduhla.lua | 9 -- .../sea0Field01/PopulaceStandard/ryssfloh.lua | 7 -- .../sea0Field02/PopulaceStandard/solelle.lua | 9 -- .../PopulaceStandard/storm_sergeant_nolan.lua | 7 -- .../ElevatorStandard/crows_lift_lvl1.lua | 15 --- .../ElevatorStandard/crows_lift_lvl2.lua | 15 --- .../ElevatorStandard/crows_lift_lvl3.lua | 15 --- .../PopulaceShopSalesman/jossy.lua | 6 -- .../PopulaceStandard/pack_chocobo.lua | 7 -- .../wil0Field02/PopulaceStandard/zllayan.lua | 7 -- .../ElevatorStandard/wellhead_lift_lvl1.lua | 15 --- .../PopulaceShopSalesman/allenaure.lua | 5 - .../PopulaceShopSalesman/barryn.lua | 5 - .../PopulaceShopSalesman/doesdornn.lua | 5 - .../PopulaceShopSalesman/elgiva.lua | 5 - .../PopulaceShopSalesman/eormengild.lua | 5 - .../wil0Town01/PopulaceShopSalesman/etgar.lua | 7 -- .../PopulaceShopSalesman/fabrellet.lua | 5 - .../PopulaceShopSalesman/ganelon.lua | 7 -- .../PopulaceShopSalesman/gugudi.lua | 5 - .../PopulaceShopSalesman/helena.lua | 5 - .../PopulaceShopSalesman/johannes.lua | 5 - .../PopulaceShopSalesman/pimelle.lua | 5 - .../PopulaceShopSalesman/psonjha.lua | 5 - .../PopulaceShopSalesman/quiloud.lua | 5 - .../PopulaceShopSalesman/roserette.lua | 5 - .../PopulaceShopSalesman/tataroga.lua | 5 - .../PopulaceShopSalesman/wawapo.lua | 5 - .../PopulaceShopSalesman/wysslorh.lua | 5 - .../ElevatorStandard/wellhead_lift_lvl2.lua | 15 --- .../ElevatorStandard/wellhead_lift_lvl3.lua | 15 --- .../PopulaceShopSalesman/jemimi.lua | 6 -- .../PopulaceShopSalesman/norbettaux.lua | 6 -- .../PopulaceShopSalesman/nortmoen.lua | 6 -- .../PopulaceShopSalesman/pamisolaux.lua | 6 -- .../PopulaceShopSalesman/waeksatz.lua | 5 - .../PopulaceShopSalesman/wnhalki.lua | 5 - .../PopulaceShopSalesman/zagylswerd.lua | 5 - 194 files changed, 92 insertions(+), 1762 deletions(-) delete mode 100644 Data/scripts/unique/fst0Field03/PopulaceStandard/miraudont.lua delete mode 100644 Data/scripts/unique/fst0Town01/InstanceRaidGuide/serpent_private_dauremant.lua delete mode 100644 Data/scripts/unique/fst0Town01/InstanceRaidGuide/serpent_private_hodder.lua delete mode 100644 Data/scripts/unique/fst0Town01/Monster/ass.lua delete mode 100644 Data/scripts/unique/fst0Town01/PopulaceStandard/aeduin.lua delete mode 100644 Data/scripts/unique/fst0Town01/PopulaceStandard/anene.lua delete mode 100644 Data/scripts/unique/fst0Town01/PopulaceStandard/anselm.lua delete mode 100644 Data/scripts/unique/fst0Town01/PopulaceStandard/basewin.lua delete mode 100644 Data/scripts/unique/fst0Town01/PopulaceStandard/beaudonet.lua delete mode 100644 Data/scripts/unique/fst0Town01/PopulaceStandard/bertennant.lua delete mode 100644 Data/scripts/unique/fst0Town01/PopulaceStandard/drividot.lua delete mode 100644 Data/scripts/unique/fst0Town01/PopulaceStandard/edasshym.lua delete mode 100644 Data/scripts/unique/fst0Town01/PopulaceStandard/emoni.lua delete mode 100644 Data/scripts/unique/fst0Town01/PopulaceStandard/flavielle.lua delete mode 100644 Data/scripts/unique/fst0Town01/PopulaceStandard/fryswyde.lua delete mode 100644 Data/scripts/unique/fst0Town01/PopulaceStandard/gontrant.lua delete mode 100644 Data/scripts/unique/fst0Town01/PopulaceStandard/gyles.lua delete mode 100644 Data/scripts/unique/fst0Town01/PopulaceStandard/hida.lua delete mode 100644 Data/scripts/unique/fst0Town01/PopulaceStandard/honga_vunga.lua delete mode 100644 Data/scripts/unique/fst0Town01/PopulaceStandard/l'tandhaa.lua delete mode 100644 Data/scripts/unique/fst0Town01/PopulaceStandard/lionnellais.lua delete mode 100644 Data/scripts/unique/fst0Town01/PopulaceStandard/lonsygg.lua delete mode 100644 Data/scripts/unique/fst0Town01/PopulaceStandard/mathye.lua delete mode 100644 Data/scripts/unique/fst0Town01/PopulaceStandard/memama.lua delete mode 100644 Data/scripts/unique/fst0Town01/PopulaceStandard/miniaeth_adv.lua delete mode 100644 Data/scripts/unique/fst0Town01/PopulaceStandard/miounne.lua delete mode 100644 Data/scripts/unique/fst0Town01/PopulaceStandard/naih_khamazom.lua delete mode 100644 Data/scripts/unique/fst0Town01/PopulaceStandard/nonco_menanco.lua delete mode 100644 Data/scripts/unique/fst0Town01/PopulaceStandard/odilie.lua delete mode 100644 Data/scripts/unique/fst0Town01/PopulaceStandard/penelope.lua delete mode 100644 Data/scripts/unique/fst0Town01/PopulaceStandard/pfarahr.lua delete mode 100644 Data/scripts/unique/fst0Town01/PopulaceStandard/pofufu.lua delete mode 100644 Data/scripts/unique/fst0Town01/PopulaceStandard/seikfrae.lua delete mode 100644 Data/scripts/unique/fst0Town01/PopulaceStandard/serpent_private_dauremant.lua delete mode 100644 Data/scripts/unique/fst0Town01/PopulaceStandard/serpent_private_hill.lua delete mode 100644 Data/scripts/unique/fst0Town01/PopulaceStandard/serpent_private_hodder.lua delete mode 100644 Data/scripts/unique/fst0Town01/PopulaceStandard/sylbyrt.lua delete mode 100644 Data/scripts/unique/fst0Town01/PopulaceStandard/task_board.lua delete mode 100644 Data/scripts/unique/fst0Town01/PopulaceStandard/tierney.lua delete mode 100644 Data/scripts/unique/fst0Town01/PopulaceStandard/torsefers.lua delete mode 100644 Data/scripts/unique/fst0Town01/PopulaceStandard/ulta.lua delete mode 100644 Data/scripts/unique/fst0Town01/PopulaceStandard/vkorolon.lua delete mode 100644 Data/scripts/unique/fst0Town01/PopulaceStandard/willielmus.lua delete mode 100644 Data/scripts/unique/fst0Town01/PopulaceStandard/zagylhaemr.lua delete mode 100644 Data/scripts/unique/fst0Town01a/InstanceRaidGuide/louisoix.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulacePassiveGLPublisher/anaidjaa.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/aerstsyn.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/ahldiym.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/alaire.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/alixe.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/anaidjaa.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/animuili.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/aubrenard.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/beaudefoin.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/beli.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/bkonbalha.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/bubuku.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/burchard.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/caplan.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/cassandra.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/ceinguled.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/chalyo_tamlyo.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/chloe.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/cicely.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/clarembald.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/dadalo.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/dbhonja.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/decima.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/dhemdaeg.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/doelle.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/drystbrod.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/dyrstbrod.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/eburhart.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/eldid.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/enie.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/foinine.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/frances.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/francis.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/fruhdhem.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/gagaroon.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/gagaulu.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/gallia.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/genna.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/georjeaux.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/goldyve.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/gunzelin.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/habreham.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/haurtefert.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/hereward.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/hfudzol.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/humphrey.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/jmoldva.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/jolline.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/kain.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/khuma_moshroca.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/kinnison.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/kipopo.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/lefwyne.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/littlejohn.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/louisoix.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/luilda.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/luitfrid.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/maddeline.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/maisenta.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/marcette.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/matheonien.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/meara.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/mestonnaux.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/mianne.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/miniaeth_arc.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/miniaeth_lnc.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/miniaeth_ltw.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/mumuko.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/nellaure.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/noes.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/nonolato.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/nuala.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/odhinek.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/onguen.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/opyltyl.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/osgar.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/owyne.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/piers.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/prosperlain.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/pukiki.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/roderic.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/roustebant.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/sandre.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/serpent_lieutenant_marette.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/serpent_private_carver.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/serpent_private_holmes.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/serpent_private_kirk.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/serpent_private_stone.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/serpent_private_tristelle.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/serpent_private_white.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/serpent_sergeant_frilaix.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/spaerfedar.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/stanilde.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/swaenhylt.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/sybell.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/tatagoi.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/twyrmoht.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/ulmhylt.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/ulric.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/vnabyano.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/voyce.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/willelda.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/wulfthryth.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/ylessa.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/yolaine.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/zaesoeya.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/zelia.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/zpahtalo.lua delete mode 100644 Data/scripts/unique/fst0Town01a/PopulaceStandard/zuzupoja.lua delete mode 100644 Data/scripts/unique/sea0Field01/PopulaceShopSalesman/sungyve.lua delete mode 100644 Data/scripts/unique/sea0Field01/PopulaceStandard/kiht_gamduhla.lua delete mode 100644 Data/scripts/unique/sea0Field01/PopulaceStandard/ryssfloh.lua delete mode 100644 Data/scripts/unique/sea0Field02/PopulaceStandard/solelle.lua delete mode 100644 Data/scripts/unique/sea0Field04/PopulaceStandard/storm_sergeant_nolan.lua delete mode 100644 Data/scripts/unique/sea0Town01/ElevatorStandard/crows_lift_lvl1.lua delete mode 100644 Data/scripts/unique/sea0Town01/ElevatorStandard/crows_lift_lvl2.lua delete mode 100644 Data/scripts/unique/sea0Town01/ElevatorStandard/crows_lift_lvl3.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceShopSalesman/jossy.lua delete mode 100644 Data/scripts/unique/wil0Field02/PopulaceStandard/pack_chocobo.lua delete mode 100644 Data/scripts/unique/wil0Field02/PopulaceStandard/zllayan.lua delete mode 100644 Data/scripts/unique/wil0Town01/ElevatorStandard/wellhead_lift_lvl1.lua delete mode 100644 Data/scripts/unique/wil0Town01/PopulaceShopSalesman/allenaure.lua delete mode 100644 Data/scripts/unique/wil0Town01/PopulaceShopSalesman/barryn.lua delete mode 100644 Data/scripts/unique/wil0Town01/PopulaceShopSalesman/doesdornn.lua delete mode 100644 Data/scripts/unique/wil0Town01/PopulaceShopSalesman/elgiva.lua delete mode 100644 Data/scripts/unique/wil0Town01/PopulaceShopSalesman/eormengild.lua delete mode 100644 Data/scripts/unique/wil0Town01/PopulaceShopSalesman/etgar.lua delete mode 100644 Data/scripts/unique/wil0Town01/PopulaceShopSalesman/fabrellet.lua delete mode 100644 Data/scripts/unique/wil0Town01/PopulaceShopSalesman/ganelon.lua delete mode 100644 Data/scripts/unique/wil0Town01/PopulaceShopSalesman/gugudi.lua delete mode 100644 Data/scripts/unique/wil0Town01/PopulaceShopSalesman/helena.lua delete mode 100644 Data/scripts/unique/wil0Town01/PopulaceShopSalesman/johannes.lua delete mode 100644 Data/scripts/unique/wil0Town01/PopulaceShopSalesman/pimelle.lua delete mode 100644 Data/scripts/unique/wil0Town01/PopulaceShopSalesman/psonjha.lua delete mode 100644 Data/scripts/unique/wil0Town01/PopulaceShopSalesman/quiloud.lua delete mode 100644 Data/scripts/unique/wil0Town01/PopulaceShopSalesman/roserette.lua delete mode 100644 Data/scripts/unique/wil0Town01/PopulaceShopSalesman/tataroga.lua delete mode 100644 Data/scripts/unique/wil0Town01/PopulaceShopSalesman/wawapo.lua delete mode 100644 Data/scripts/unique/wil0Town01/PopulaceShopSalesman/wysslorh.lua delete mode 100644 Data/scripts/unique/wil0Town01a/ElevatorStandard/wellhead_lift_lvl2.lua delete mode 100644 Data/scripts/unique/wil0Town01a/ElevatorStandard/wellhead_lift_lvl3.lua delete mode 100644 Data/scripts/unique/wil0Town01a/PopulaceShopSalesman/jemimi.lua delete mode 100644 Data/scripts/unique/wil0Town01a/PopulaceShopSalesman/norbettaux.lua delete mode 100644 Data/scripts/unique/wil0Town01a/PopulaceShopSalesman/nortmoen.lua delete mode 100644 Data/scripts/unique/wil0Town01a/PopulaceShopSalesman/pamisolaux.lua delete mode 100644 Data/scripts/unique/wil0Town01a/PopulaceShopSalesman/waeksatz.lua delete mode 100644 Data/scripts/unique/wil0Town01a/PopulaceShopSalesman/wnhalki.lua delete mode 100644 Data/scripts/unique/wil0Town01a/PopulaceShopSalesman/zagylswerd.lua diff --git a/Data/scripts/base/chara/npc/object/ElevatorStandard.lua b/Data/scripts/base/chara/npc/object/ElevatorStandard.lua index 08e2ea14..9acf9450 100644 --- a/Data/scripts/base/chara/npc/object/ElevatorStandard.lua +++ b/Data/scripts/base/chara/npc/object/ElevatorStandard.lua @@ -1,5 +1,95 @@ require ("global") -function init(npc) - return false, false, 0, 0; +--[[ + +Elevator Standard Script + +Functions: + +elevatorAskLimsa001(eventNum) - Shows the ask dialog, and plays the event cutscenes for the Crow's Head Lift Lvl 1. +elevatorAskLimsa002(eventNum) - Shows the ask dialog, and plays the event cutscenes for the Crow's Head Lift Lvl 2. +elevatorAskLimsa003(eventNum) - Shows the ask dialog, and plays the event cutscenes for the Crow's Head Lift Lvl 3. +elevatorAskUldah001(eventNum) - Shows the ask dialog, and plays the event cutscenes for the Wellhead Lift Lvl 1. +elevatorAskUldah002(eventNum) - Shows the ask dialog, and plays the event cutscenes for the Wellhead Lift Lvl 2. +elevatorAskUldah003(eventNum) - Shows the ask dialog, and plays the event cutscenes for the Wellhead Lift Lvl 3. +elevatorQuestAskEvent(questId) - Special quest related elevator dialog. + +Notes: + +Script to control the elevators in Limsa Lominsa and Ul'dah. Each elevator entrance has a specific event for it's floor. +The only param is used to either show the ask dialog to the player or player the appropriate cutscene given the choice +made. + +--]] + +function onEventStarted(player, npc, eventType, eventName) + local actorClassId = npc.GetActorClassId(); + + -- Limsa; Crow's Lift Level 1 + if (actorClassId == 1290007) then + local floorChoice = callClientFunction(player, "elevatorAskLimsa001", 0); + if (floorChoice == 1) then + callClientFunction(player, "elevatorAskLimsa001", 1); + endEventAndWarp(player, 133, -447, 40, 220, -1.574); + elseif (floorChoice == 2) then + callClientFunction(player, "elevatorAskLimsa001", 2); + endEventAndWarp(player, 133, -458, 92, 175, -0.383); + end + -- Limsa; Crow's Lift Level 2 + elseif (actorClassId == 1290008) then + local floorChoice = callClientFunction(player, "elevatorAskLimsa002", 0); + if (floorChoice == 1) then + callClientFunction(player, "elevatorAskLimsa002", 1); + endEventAndWarp(player, 133, -447, 19, 220, -1.574); + elseif (floorChoice == 2) then + callClientFunction(player, "elevatorAskLimsa002", 2); + endEventAndWarp(player, 133, -458, 92, 175, -0.383); + end + -- Limsa; Crow's Lift Level 3 + elseif (actorClassId == 1290009) then + local floorChoice = callClientFunction(player, "elevatorAskLimsa003", 0); + if (floorChoice == 1) then + callClientFunction(player, "elevatorAskLimsa003", 1); + endEventAndWarp(player, 133, -447, 19, 220, -1.574); + elseif (floorChoice == 2) then + callClientFunction(player, "elevatorAskLimsa003", 2); + endEventAndWarp(player, 133, -447, 40, 220, -1.574); + end + -- Ul'dah; Wellhead Lift Level 1 + elseif (actorClassId == 1090460) then + local floorChoice = callClientFunction(player, "elevatorAskUldah001", 0); + if (floorChoice == 1) then + callClientFunction(player, "elevatorAskUldah001", 1); + endEventAndWarp(player, 209, -116.78, 222, 115.7, 2.85); + elseif (floorChoice == 2) then + callClientFunction(player, "elevatorAskUldah001", 2); + endEventAndWarp(player, 209, -121.60, 269.8, 135.28, -0.268); + end + -- Ul'dah; Wellhead Lift Level 2 + elseif (actorClassId == 1090461) then + local floorChoice = callClientFunction(player, "elevatorAskUldah002", 0); + if (floorChoice == 1) then + callClientFunction(player, "elevatorAskUldah002", 1); + endEventAndWarp(player, 175, -116.78, 198, 115.7, -2.8911); + elseif (floorChoice == 2) then + callClientFunction(player, "elevatorAskUldah002", 2); + endEventAndWarp(player, 209, -121.60, 269.8, 135.28, -0.268); + end + -- Ul'dah; Wellhead Lift Level 3 + elseif (actorClassId == 1090462) then + local floorChoice = callClientFunction(player, "elevatorAskUldah003", 0); + if (floorChoice == 1) then + callClientFunction(player, "elevatorAskUldah003", 1); + endEventAndWarp(player, 175, -116.78, 198, 115.7, -2.8911); + elseif (floorChoice == 2) then + callClientFunction(player, "elevatorAskUldah003", 2); + endEventAndWarp(player, 209, -116.78, 222, 115.7, 2.85); + end + end + +end + +function endEventAndWarp(player, zoneId, x, y, z, rotation) + player:EndEvent(); + GetWorldManager():DoZoneChange(player, zoneId, nil, 0, 15, x, y, z, rotation); end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Field03/PopulaceStandard/miraudont.lua b/Data/scripts/unique/fst0Field03/PopulaceStandard/miraudont.lua deleted file mode 100644 index df4c4a25..00000000 --- a/Data/scripts/unique/fst0Field03/PopulaceStandard/miraudont.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithMiraudont_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01/InstanceRaidGuide/serpent_private_dauremant.lua b/Data/scripts/unique/fst0Town01/InstanceRaidGuide/serpent_private_dauremant.lua deleted file mode 100644 index a56b8190..00000000 --- a/Data/scripts/unique/fst0Town01/InstanceRaidGuide/serpent_private_dauremant.lua +++ /dev/null @@ -1,10 +0,0 @@ -require ("global") - -function init(npc) - return false, false, 0, 0, 0x1eb, 0x2; -end - -function onEventStarted(player, npc) - callClientFunction(player, "askEnterInstanceRaid", 16); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01/InstanceRaidGuide/serpent_private_hodder.lua b/Data/scripts/unique/fst0Town01/InstanceRaidGuide/serpent_private_hodder.lua deleted file mode 100644 index 7c754fdc..00000000 --- a/Data/scripts/unique/fst0Town01/InstanceRaidGuide/serpent_private_hodder.lua +++ /dev/null @@ -1,10 +0,0 @@ -require ("global") - -function init(npc) - return false, false, 0, 0, 0x1eb, 0x2; -end - -function onEventStarted(player, npc) - callClientFunction(player, "askEnterInstanceRaid", 15); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01/Monster/ass.lua b/Data/scripts/unique/fst0Town01/Monster/ass.lua deleted file mode 100644 index 21e27867..00000000 --- a/Data/scripts/unique/fst0Town01/Monster/ass.lua +++ /dev/null @@ -1,2 +0,0 @@ -function onDeath(monster, player, lastAttacker) -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01/PopulaceStandard/aeduin.lua b/Data/scripts/unique/fst0Town01/PopulaceStandard/aeduin.lua deleted file mode 100644 index 10d67a8a..00000000 --- a/Data/scripts/unique/fst0Town01/PopulaceStandard/aeduin.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithAeduin_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01/PopulaceStandard/anene.lua b/Data/scripts/unique/fst0Town01/PopulaceStandard/anene.lua deleted file mode 100644 index 4b0461b7..00000000 --- a/Data/scripts/unique/fst0Town01/PopulaceStandard/anene.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithAnene_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01/PopulaceStandard/anselm.lua b/Data/scripts/unique/fst0Town01/PopulaceStandard/anselm.lua deleted file mode 100644 index 32b822d8..00000000 --- a/Data/scripts/unique/fst0Town01/PopulaceStandard/anselm.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithAnselm_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01/PopulaceStandard/basewin.lua b/Data/scripts/unique/fst0Town01/PopulaceStandard/basewin.lua deleted file mode 100644 index 7f7a5ff7..00000000 --- a/Data/scripts/unique/fst0Town01/PopulaceStandard/basewin.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithBasewin_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01/PopulaceStandard/beaudonet.lua b/Data/scripts/unique/fst0Town01/PopulaceStandard/beaudonet.lua deleted file mode 100644 index a3f57545..00000000 --- a/Data/scripts/unique/fst0Town01/PopulaceStandard/beaudonet.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithBeaudonet_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01/PopulaceStandard/bertennant.lua b/Data/scripts/unique/fst0Town01/PopulaceStandard/bertennant.lua deleted file mode 100644 index 1a7fe00d..00000000 --- a/Data/scripts/unique/fst0Town01/PopulaceStandard/bertennant.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithBertennant_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01/PopulaceStandard/drividot.lua b/Data/scripts/unique/fst0Town01/PopulaceStandard/drividot.lua deleted file mode 100644 index 868fb996..00000000 --- a/Data/scripts/unique/fst0Town01/PopulaceStandard/drividot.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithDrividot_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01/PopulaceStandard/edasshym.lua b/Data/scripts/unique/fst0Town01/PopulaceStandard/edasshym.lua deleted file mode 100644 index 43108cf5..00000000 --- a/Data/scripts/unique/fst0Town01/PopulaceStandard/edasshym.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithEdasshym_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01/PopulaceStandard/emoni.lua b/Data/scripts/unique/fst0Town01/PopulaceStandard/emoni.lua deleted file mode 100644 index 6c6f7c81..00000000 --- a/Data/scripts/unique/fst0Town01/PopulaceStandard/emoni.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithEmoni_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01/PopulaceStandard/flavielle.lua b/Data/scripts/unique/fst0Town01/PopulaceStandard/flavielle.lua deleted file mode 100644 index 11d862e2..00000000 --- a/Data/scripts/unique/fst0Town01/PopulaceStandard/flavielle.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithFlavielle_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01/PopulaceStandard/fryswyde.lua b/Data/scripts/unique/fst0Town01/PopulaceStandard/fryswyde.lua deleted file mode 100644 index 73f4ec3a..00000000 --- a/Data/scripts/unique/fst0Town01/PopulaceStandard/fryswyde.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithFryswyde_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01/PopulaceStandard/gontrant.lua b/Data/scripts/unique/fst0Town01/PopulaceStandard/gontrant.lua deleted file mode 100644 index 3b46c444..00000000 --- a/Data/scripts/unique/fst0Town01/PopulaceStandard/gontrant.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithGontrant_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01/PopulaceStandard/gyles.lua b/Data/scripts/unique/fst0Town01/PopulaceStandard/gyles.lua deleted file mode 100644 index 3b71d575..00000000 --- a/Data/scripts/unique/fst0Town01/PopulaceStandard/gyles.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithGyles_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01/PopulaceStandard/hida.lua b/Data/scripts/unique/fst0Town01/PopulaceStandard/hida.lua deleted file mode 100644 index 9f53667a..00000000 --- a/Data/scripts/unique/fst0Town01/PopulaceStandard/hida.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithHida_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01/PopulaceStandard/honga_vunga.lua b/Data/scripts/unique/fst0Town01/PopulaceStandard/honga_vunga.lua deleted file mode 100644 index 30042eb2..00000000 --- a/Data/scripts/unique/fst0Town01/PopulaceStandard/honga_vunga.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithHongavunga_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01/PopulaceStandard/l'tandhaa.lua b/Data/scripts/unique/fst0Town01/PopulaceStandard/l'tandhaa.lua deleted file mode 100644 index d74d7a84..00000000 --- a/Data/scripts/unique/fst0Town01/PopulaceStandard/l'tandhaa.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithLtandhaa_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01/PopulaceStandard/lionnellais.lua b/Data/scripts/unique/fst0Town01/PopulaceStandard/lionnellais.lua deleted file mode 100644 index 7a6a8c3a..00000000 --- a/Data/scripts/unique/fst0Town01/PopulaceStandard/lionnellais.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithLionnellais_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01/PopulaceStandard/lonsygg.lua b/Data/scripts/unique/fst0Town01/PopulaceStandard/lonsygg.lua deleted file mode 100644 index d26669f7..00000000 --- a/Data/scripts/unique/fst0Town01/PopulaceStandard/lonsygg.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithLonsygg_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01/PopulaceStandard/mathye.lua b/Data/scripts/unique/fst0Town01/PopulaceStandard/mathye.lua deleted file mode 100644 index 6cf85ad9..00000000 --- a/Data/scripts/unique/fst0Town01/PopulaceStandard/mathye.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithMathye_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01/PopulaceStandard/memama.lua b/Data/scripts/unique/fst0Town01/PopulaceStandard/memama.lua deleted file mode 100644 index 2466888b..00000000 --- a/Data/scripts/unique/fst0Town01/PopulaceStandard/memama.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithMemama_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01/PopulaceStandard/miniaeth_adv.lua b/Data/scripts/unique/fst0Town01/PopulaceStandard/miniaeth_adv.lua deleted file mode 100644 index 0fe03ebf..00000000 --- a/Data/scripts/unique/fst0Town01/PopulaceStandard/miniaeth_adv.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithMiniaeth_adv_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01/PopulaceStandard/miounne.lua b/Data/scripts/unique/fst0Town01/PopulaceStandard/miounne.lua deleted file mode 100644 index 7d15aff6..00000000 --- a/Data/scripts/unique/fst0Town01/PopulaceStandard/miounne.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithMiounne_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01/PopulaceStandard/naih_khamazom.lua b/Data/scripts/unique/fst0Town01/PopulaceStandard/naih_khamazom.lua deleted file mode 100644 index e3a914dc..00000000 --- a/Data/scripts/unique/fst0Town01/PopulaceStandard/naih_khamazom.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithNaih_khamazom_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01/PopulaceStandard/nonco_menanco.lua b/Data/scripts/unique/fst0Town01/PopulaceStandard/nonco_menanco.lua deleted file mode 100644 index fddd2363..00000000 --- a/Data/scripts/unique/fst0Town01/PopulaceStandard/nonco_menanco.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithNoncomananco_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01/PopulaceStandard/odilie.lua b/Data/scripts/unique/fst0Town01/PopulaceStandard/odilie.lua deleted file mode 100644 index 78a97b7b..00000000 --- a/Data/scripts/unique/fst0Town01/PopulaceStandard/odilie.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithOdilie_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01/PopulaceStandard/penelope.lua b/Data/scripts/unique/fst0Town01/PopulaceStandard/penelope.lua deleted file mode 100644 index ce5e5aaa..00000000 --- a/Data/scripts/unique/fst0Town01/PopulaceStandard/penelope.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithPenelope_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01/PopulaceStandard/pfarahr.lua b/Data/scripts/unique/fst0Town01/PopulaceStandard/pfarahr.lua deleted file mode 100644 index 5a5d3db2..00000000 --- a/Data/scripts/unique/fst0Town01/PopulaceStandard/pfarahr.lua +++ /dev/null @@ -1,46 +0,0 @@ -require ("global") -require ("quests/etc/etc5g0") - -function onSpawn(player, npc) - - if (player:HasQuest("Etc5g0") == true and player:GetQuest("Etc5g0"):GetPhase() == 0) then - npc:SetQuestGraphic(player, 0x2); - else - npc:SetQuestGraphic(player, 0x0); - end - -end - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - quest = player:GetQuest("Etc5g0"); - - result = 1; - if (player:HasQuest("Etc5g0")) then - unknown, result = callClientFunction(player, "switchEvent", defaultFst, quest, nil, nil, 1, 1, 0x3f1); - end - - if (result == 1) then - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithPfarahr_001", -1, -1); - elseif (result == 2) then - - ownedQuest = player:GetQuest("Etc5g0"); - if (ownedQuest:GetPhase() == 0) then - callClientFunction(player, "delegateEvent", player, quest, "processEvent_010"); - worldMaster = GetWorldMaster(); - player:SendGameMessage(player, worldMaster, 25225, ownedQuest:GetQuestId()); - player:SendDataPacket("attention", worldMaster, "", 25225, ownedQuest:GetQuestId()); - ownedQuest:NextPhase(1); - npc:SetQuestGraphic(player, 0x0); - vkorolon = GetWorldManager():GetActorInWorldByUniqueId("vkorolon"); - if (vkorolon ~= nil) then - vkorolon:SetQuestGraphic(player, 0x4); - end - else - callClientFunction(player, "delegateEvent", player, quest, "processEvent_010_1"); - end - - end - - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01/PopulaceStandard/pofufu.lua b/Data/scripts/unique/fst0Town01/PopulaceStandard/pofufu.lua deleted file mode 100644 index bf6356dc..00000000 --- a/Data/scripts/unique/fst0Town01/PopulaceStandard/pofufu.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithPofufu_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01/PopulaceStandard/seikfrae.lua b/Data/scripts/unique/fst0Town01/PopulaceStandard/seikfrae.lua deleted file mode 100644 index 909fd94c..00000000 --- a/Data/scripts/unique/fst0Town01/PopulaceStandard/seikfrae.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithSeikfrae_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01/PopulaceStandard/serpent_private_dauremant.lua b/Data/scripts/unique/fst0Town01/PopulaceStandard/serpent_private_dauremant.lua deleted file mode 100644 index da9b97a5..00000000 --- a/Data/scripts/unique/fst0Town01/PopulaceStandard/serpent_private_dauremant.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithSerpent_private_dauremant_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01/PopulaceStandard/serpent_private_hill.lua b/Data/scripts/unique/fst0Town01/PopulaceStandard/serpent_private_hill.lua deleted file mode 100644 index 02e67d32..00000000 --- a/Data/scripts/unique/fst0Town01/PopulaceStandard/serpent_private_hill.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithSerpent_private_hill_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01/PopulaceStandard/serpent_private_hodder.lua b/Data/scripts/unique/fst0Town01/PopulaceStandard/serpent_private_hodder.lua deleted file mode 100644 index 7d086ce5..00000000 --- a/Data/scripts/unique/fst0Town01/PopulaceStandard/serpent_private_hodder.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithSerpent_private_hodder_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01/PopulaceStandard/sylbyrt.lua b/Data/scripts/unique/fst0Town01/PopulaceStandard/sylbyrt.lua deleted file mode 100644 index 2d3930f3..00000000 --- a/Data/scripts/unique/fst0Town01/PopulaceStandard/sylbyrt.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithSylbyrt_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01/PopulaceStandard/task_board.lua b/Data/scripts/unique/fst0Town01/PopulaceStandard/task_board.lua deleted file mode 100644 index b7448428..00000000 --- a/Data/scripts/unique/fst0Town01/PopulaceStandard/task_board.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithTask_board_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01/PopulaceStandard/tierney.lua b/Data/scripts/unique/fst0Town01/PopulaceStandard/tierney.lua deleted file mode 100644 index 9bc3ac7a..00000000 --- a/Data/scripts/unique/fst0Town01/PopulaceStandard/tierney.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithTierney_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01/PopulaceStandard/torsefers.lua b/Data/scripts/unique/fst0Town01/PopulaceStandard/torsefers.lua deleted file mode 100644 index f965cbe5..00000000 --- a/Data/scripts/unique/fst0Town01/PopulaceStandard/torsefers.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithTorsefers_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01/PopulaceStandard/ulta.lua b/Data/scripts/unique/fst0Town01/PopulaceStandard/ulta.lua deleted file mode 100644 index 76b4c013..00000000 --- a/Data/scripts/unique/fst0Town01/PopulaceStandard/ulta.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithUlta_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01/PopulaceStandard/vkorolon.lua b/Data/scripts/unique/fst0Town01/PopulaceStandard/vkorolon.lua deleted file mode 100644 index a27d1622..00000000 --- a/Data/scripts/unique/fst0Town01/PopulaceStandard/vkorolon.lua +++ /dev/null @@ -1,67 +0,0 @@ -require ("global") -require ("quests/etc/etc5g0") - -function onSpawn(player, npc) - - if (player:HasQuest("Etc5g0") == true and player:GetQuest("Etc5g0"):GetPhase() == 1) then - npc:SetQuestGraphic(player, 0x4); - elseif (canAcceptQuest(player)) then - npc:SetQuestGraphic(player, 0x2); - else - npc:SetQuestGraphic(player, 0x0); - end - -end - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - quest = GetStaticActor("Etc5g0"); - - result = 1; - - if (player:IsQuestCompleted("Etc5g0") == true) then - result = 0; - else - unknown, result = callClientFunction(player, "switchEvent", defaultFst, quest, nil, nil, 1, 1, 0x3f1); - end - - if (result == 0) then - choice = callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithInn_Desk", nil, nil, nil); - - if (choice == 1) then - GetWorldManager():DoZoneChange(player, 244, nil, 0, 15, 160.048, 0, 154.263, 0); - elseif (choice == 2) then - if (player:GetHomePointInn() ~= 2) then - player:SetHomePointInn(2); - player:SendGameMessage(GetWorldMaster(), 60019, 0x20, 2075); --Secondary homepoint set to the Roost - else - player:SendGameMessage(GetWorldMaster(), 51140, 0x20); --This inn is already your Secondary Homepoint - end - end - elseif (result == 1) then - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithVkorolon_001", -1, -1); - elseif (result == 2) then - if (player:HasQuest("Etc5g0") == false) then - offerQuestResult = callClientFunction(player, "delegateEvent", player, quest, "processEventVKOROLONStart"); - if (offerQuestResult == 1) then - player:AddQuest("Etc5g0"); - npc:SetQuestGraphic(player, 0x0); - pfarahr = GetWorldManager():GetActorInWorldByUniqueId("pfarahr"); - if (pfarahr ~= nil) then - pfarahr:SetQuestGraphic(player, 0x2); - end - end - elseif (player:GetQuest("Etc5g0"):GetPhase() == 0) then - callClientFunction(player, "delegateEvent", player, quest, "processEvent_000_1"); - elseif (player:GetQuest("Etc5g0"):GetPhase() == 1) then - callClientFunction(player, "delegateEvent", player, quest, "processEvent_020"); - callClientFunction(player, "delegateEvent", player, quest, "sqrwa", 200, 1); - player:CompleteQuest("Etc5g0"); - npc:SetQuestGraphic(player, 0x0); - end - - end - - player:EndEvent(); - -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01/PopulaceStandard/willielmus.lua b/Data/scripts/unique/fst0Town01/PopulaceStandard/willielmus.lua deleted file mode 100644 index 16def888..00000000 --- a/Data/scripts/unique/fst0Town01/PopulaceStandard/willielmus.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithWillielmus_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01/PopulaceStandard/zagylhaemr.lua b/Data/scripts/unique/fst0Town01/PopulaceStandard/zagylhaemr.lua deleted file mode 100644 index 9af757e2..00000000 --- a/Data/scripts/unique/fst0Town01/PopulaceStandard/zagylhaemr.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithZagylhaemr_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/InstanceRaidGuide/louisoix.lua b/Data/scripts/unique/fst0Town01a/InstanceRaidGuide/louisoix.lua deleted file mode 100644 index 7c903a8b..00000000 --- a/Data/scripts/unique/fst0Town01a/InstanceRaidGuide/louisoix.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkLouisoix_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulacePassiveGLPublisher/anaidjaa.lua b/Data/scripts/unique/fst0Town01a/PopulacePassiveGLPublisher/anaidjaa.lua deleted file mode 100644 index 988ebb7e..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulacePassiveGLPublisher/anaidjaa.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithAnaidjaa_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/aerstsyn.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/aerstsyn.lua deleted file mode 100644 index b55e4b1c..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/aerstsyn.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithAerstsyn_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/ahldiym.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/ahldiym.lua deleted file mode 100644 index 082f9630..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/ahldiym.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithAhldiym_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/alaire.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/alaire.lua deleted file mode 100644 index 57ee130d..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/alaire.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithAlaire_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/alixe.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/alixe.lua deleted file mode 100644 index 32b4566a..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/alixe.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithAlixe_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/anaidjaa.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/anaidjaa.lua deleted file mode 100644 index 988ebb7e..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/anaidjaa.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithAnaidjaa_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/animuili.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/animuili.lua deleted file mode 100644 index 02b62cda..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/animuili.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithAnimuili_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/aubrenard.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/aubrenard.lua deleted file mode 100644 index 8fcfb4e0..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/aubrenard.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithAUBRENARD_100", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/beaudefoin.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/beaudefoin.lua deleted file mode 100644 index c7bb9425..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/beaudefoin.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithBeaudefoin_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/beli.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/beli.lua deleted file mode 100644 index b03e5c44..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/beli.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithBeli_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/bkonbalha.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/bkonbalha.lua deleted file mode 100644 index 0f4b2c0d..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/bkonbalha.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithBkonbalha_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/bubuku.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/bubuku.lua deleted file mode 100644 index a30a424b..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/bubuku.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithBubuku_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/burchard.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/burchard.lua deleted file mode 100644 index a0094293..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/burchard.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithBurchard_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/caplan.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/caplan.lua deleted file mode 100644 index 4ea6d7ee..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/caplan.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "downTownTalk", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/cassandra.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/cassandra.lua deleted file mode 100644 index bc51e10b..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/cassandra.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithCassandra_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/ceinguled.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/ceinguled.lua deleted file mode 100644 index 650ae478..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/ceinguled.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithCeinguled_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/chalyo_tamlyo.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/chalyo_tamlyo.lua deleted file mode 100644 index d9d265f3..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/chalyo_tamlyo.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithChalyotamlyo_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/chloe.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/chloe.lua deleted file mode 100644 index 42fa8423..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/chloe.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithChloe_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/cicely.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/cicely.lua deleted file mode 100644 index cdc13c74..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/cicely.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithCicely_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/clarembald.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/clarembald.lua deleted file mode 100644 index f3420b1b..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/clarembald.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithClarembald_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/dadalo.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/dadalo.lua deleted file mode 100644 index 3869643d..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/dadalo.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithDadalo_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/dbhonja.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/dbhonja.lua deleted file mode 100644 index 11a5f709..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/dbhonja.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithDbhonja_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/decima.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/decima.lua deleted file mode 100644 index 824e5f63..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/decima.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithDecima_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/dhemdaeg.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/dhemdaeg.lua deleted file mode 100644 index 1ff4faef..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/dhemdaeg.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithDhemdaeg_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/doelle.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/doelle.lua deleted file mode 100644 index ab8d90fc..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/doelle.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithDoelle_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/drystbrod.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/drystbrod.lua deleted file mode 100644 index 1ea2fcd3..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/drystbrod.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithDyrstbrod_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/dyrstbrod.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/dyrstbrod.lua deleted file mode 100644 index 1ea2fcd3..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/dyrstbrod.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithDyrstbrod_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/eburhart.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/eburhart.lua deleted file mode 100644 index cce66c19..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/eburhart.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithEburhart_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/eldid.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/eldid.lua deleted file mode 100644 index 4ea6d7ee..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/eldid.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "downTownTalk", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/enie.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/enie.lua deleted file mode 100644 index 82de1962..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/enie.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkEnie_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/foinine.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/foinine.lua deleted file mode 100644 index 163006a7..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/foinine.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithFoinine_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/frances.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/frances.lua deleted file mode 100644 index 9928bc94..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/frances.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithFrances_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/francis.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/francis.lua deleted file mode 100644 index 2da0fd1c..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/francis.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithFrancis_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/fruhdhem.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/fruhdhem.lua deleted file mode 100644 index e4535c86..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/fruhdhem.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithFruhdhem_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/gagaroon.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/gagaroon.lua deleted file mode 100644 index 19143bdf..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/gagaroon.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithGagaroon_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/gagaulu.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/gagaulu.lua deleted file mode 100644 index 4c5834d5..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/gagaulu.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithGagaulu_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/gallia.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/gallia.lua deleted file mode 100644 index 49dc3284..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/gallia.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithGallia_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/genna.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/genna.lua deleted file mode 100644 index a12431eb..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/genna.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithGenna_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/georjeaux.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/georjeaux.lua deleted file mode 100644 index 764552a3..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/georjeaux.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithGeorjeaux_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/goldyve.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/goldyve.lua deleted file mode 100644 index d0d0bc6a..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/goldyve.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithGoldyve_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/gunzelin.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/gunzelin.lua deleted file mode 100644 index 1fda5960..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/gunzelin.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithGunzelin_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/habreham.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/habreham.lua deleted file mode 100644 index 9de8b884..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/habreham.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithHabreham_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/haurtefert.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/haurtefert.lua deleted file mode 100644 index f564e6e7..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/haurtefert.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithHaurtefert_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/hereward.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/hereward.lua deleted file mode 100644 index 2b190a01..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/hereward.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithHereward_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/hfudzol.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/hfudzol.lua deleted file mode 100644 index 313acf9d..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/hfudzol.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithHfudzol_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/humphrey.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/humphrey.lua deleted file mode 100644 index a2d65ba1..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/humphrey.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithHumphrey_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/jmoldva.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/jmoldva.lua deleted file mode 100644 index b3b3e96b..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/jmoldva.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithJmoldva_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/jolline.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/jolline.lua deleted file mode 100644 index 0d3d71e8..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/jolline.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithJolline_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/kain.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/kain.lua deleted file mode 100644 index 69394cc3..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/kain.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithKain_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/khuma_moshroca.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/khuma_moshroca.lua deleted file mode 100644 index 06ffc4b7..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/khuma_moshroca.lua +++ /dev/null @@ -1,54 +0,0 @@ -require ("global") -require ("quests/etc/etc3g0") - -function onSpawn(player, npc) - - if (player:HasQuest("Etc3g0") == true and player:GetQuest("Etc3g0"):GetPhase() == 0) then - if player:GetQuest("Etc3g0"):GetQuestFlag(FLAG_TALKED_KHUMA_MOSHROCA) == false then - npc:SetQuestGraphic(player, 0x2); - else - npc:SetQuestGraphic(player, 0x0); - end - else - npc:SetQuestGraphic(player, 0x0); - end - -end - - - -function onEventStarted(player, npc) - - defaultFst = GetStaticActor("DftFst"); - quest = GetStaticActor("Etc3g0"); - - if (player:HasQuest("Etc3g0") == true) then - - unknown, result = callClientFunction(player, "switchEvent", defaultFst, quest, nil, nil, 1, 1, 0x3f1); - - if (result == 1) then - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithKhumamoshroca_001", nil, nil, nil); - elseif (result == 2) then - ownedQuest = player:GetQuest("Etc3g0"); - - if (ownedQuest:GetQuestFlag(FLAG_TALKED_KHUMA_MOSHROCA)) == false then - callClientFunction(player, "delegateEvent", player, quest, "processEventKhumaSpeak", nil, nil, nil); - ownedQuest:SetQuestFlag(FLAG_TALKED_KHUMA_MOSHROCA, true); - ownedQuest:SaveData(); - npc:SetQuestGraphic(player, 0x0); - checkNextPhase(player); - else - callClientFunction(player, "delegateEvent", player, quest, "processEventKhumaSpeakAfter", nil, nil, nil); - end - end - - else - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithKhumamoshroca_001", nil, nil, nil); - end - - player:endEvent(); - -end - - - diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/kinnison.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/kinnison.lua deleted file mode 100644 index ce82ccd3..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/kinnison.lua +++ /dev/null @@ -1,66 +0,0 @@ -require ("global") -require ("quests/etc/etc3g0") - -function onSpawn(player, npc) - - if (player:HasQuest("Etc3g0") == true and player:GetQuest("Etc3g0"):GetPhase() == 243) then - npc:SetQuestGraphic(player, 0x4); - elseif (canAcceptQuest(player)) then - npc:SetQuestGraphic(player, 0x2); - else - npc:SetQuestGraphic(player, 0x0); - end - -end - -function onEventStarted(player, npc) - - defaultFst = GetStaticActor("DftFst"); - quest = GetStaticActor("Etc3g0"); - - if ((canAcceptQuest(player) == true) or (player:HasQuest("Etc3g0") == true)) then - - unknown, result = callClientFunction(player, "switchEvent", defaultFst, quest, nil, nil, 1, 1, 0x3f1); - - if (result == 1) then - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithKinnison_001", -1, -1); - elseif (result == 2) then - if (player:HasQuest("Etc3g0") == false) then - offerQuestResult = callClientFunction(player, "delegateEvent", player, quest, "processEventOffersStart"); - if (offerQuestResult == 1) then - player:AddQuest("Etc3g0"); - npc:SetQuestGraphic(player, 0x0); - - -- This is to overcome some weirdness where some NPCs are not updating their quest marker upon quest accepted - -- So we're just going to force the change to be sure - mestonnaux = GetWorldManager():GetActorInWorldByUniqueId("mestonnaux"); - sybell = GetWorldManager():GetActorInWorldByUniqueId("sybell"); - khuma_moshroca = GetWorldManager():GetActorInWorldByUniqueId("khuma_moshroca"); - lefwyne = GetWorldManager():GetActorInWorldByUniqueId("lefwyne"); - nellaure = GetWorldManager():GetActorInWorldByUniqueId("nellaure"); - - if (mestonnaux ~= nil) then mestonnaux:SetQuestGraphic(player, 0x2); end - if (sybell ~= nil) then sybell:SetQuestGraphic(player, 0x2); end - if (khuma_moshroca ~= nil) then khuma_moshroca:SetQuestGraphic(player, 0x2); end - if (lefwyne ~= nil) then lefwyne:SetQuestGraphic(player, 0x2); end - if (nellaure ~= nil) then nellaure:SetQuestGraphic(player, 0x2); end - - end - else - ownedQuest = player:GetQuest("Etc3g0"); - if (ownedQuest:GetPhase() == 243) then - callClientFunction(player, "delegateEvent", player, quest, "processEventClear"); - callClientFunction(player, "delegateEvent", player, quest, "sqrwa", 200, 1, 1, 9); - player:CompleteQuest("Etc3g0"); - npc:SetQuestGraphic(player, 0x0); - else - callClientFunction(player, "delegateEvent", player, quest, "processEventOffersAfter"); - end - end - end - else - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithKinnison_001", -1, -1); - end - - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/kipopo.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/kipopo.lua deleted file mode 100644 index 6b9315c3..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/kipopo.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithKipopo_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/lefwyne.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/lefwyne.lua deleted file mode 100644 index d59e65b0..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/lefwyne.lua +++ /dev/null @@ -1,53 +0,0 @@ -require ("global") -require ("quests/etc/etc3g0") - -function onSpawn(player, npc) - - if (player:HasQuest("Etc3g0") == true and player:GetQuest("Etc3g0"):GetPhase() == 0) then - if player:GetQuest("Etc3g0"):GetQuestFlag(FLAG_TALKED_LEFWYNE) == false then - npc:SetQuestGraphic(player, 0x2); - else - npc:SetQuestGraphic(player, 0x0); - end - else - npc:SetQuestGraphic(player, 0x0); - end - -end - - - -function onEventStarted(player, npc) - - defaultFst = GetStaticActor("DftFst"); - quest = GetStaticActor("Etc3g0"); - - if (player:HasQuest("Etc3g0") == true) then - - unknown, result = callClientFunction(player, "switchEvent", defaultFst, quest, nil, nil, 1, 1, 0x3f1); - - if (result == 1) then - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithLefwyne_001", nil, nil, nil); - elseif (result == 2) then - ownedQuest = player:GetQuest("Etc3g0"); - - if (ownedQuest:GetQuestFlag(FLAG_TALKED_LEFWYNE)) == false then - callClientFunction(player, "delegateEvent", player, quest, "processEventLefwyneSpeak", nil, nil, nil); - ownedQuest:SetQuestFlag(FLAG_TALKED_LEFWYNE, true); - ownedQuest:SaveData(); - npc:SetQuestGraphic(player, 0x0); - checkNextPhase(player); - else - callClientFunction(player, "delegateEvent", player, quest, "processEventLefwyneSpeakAfter", nil, nil, nil); - end - end - - else - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithLefwyne_001", nil, nil, nil); - end - - player:endEvent(); -end - - - diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/littlejohn.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/littlejohn.lua deleted file mode 100644 index dcf4e55f..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/littlejohn.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithLittlejohn_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/louisoix.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/louisoix.lua deleted file mode 100644 index b0b08cd5..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/louisoix.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithLouisoix_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/luilda.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/luilda.lua deleted file mode 100644 index 38ea5908..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/luilda.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithLuilda_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/luitfrid.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/luitfrid.lua deleted file mode 100644 index a202c940..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/luitfrid.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithLuitfrid_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/maddeline.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/maddeline.lua deleted file mode 100644 index cac9651d..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/maddeline.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithMaddeline_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/maisenta.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/maisenta.lua deleted file mode 100644 index 32477946..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/maisenta.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithGuildleveClientG_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/marcette.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/marcette.lua deleted file mode 100644 index 7e163776..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/marcette.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithMarcette_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/matheonien.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/matheonien.lua deleted file mode 100644 index a54313c7..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/matheonien.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithMatheonien_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/meara.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/meara.lua deleted file mode 100644 index f9216a3c..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/meara.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithMeara_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/mestonnaux.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/mestonnaux.lua deleted file mode 100644 index 52604eac..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/mestonnaux.lua +++ /dev/null @@ -1,54 +0,0 @@ -require ("global") -require ("quests/etc/etc3g0") - -function onSpawn(player, npc) - - if (player:HasQuest("Etc3g0") == true and player:GetQuest("Etc3g0"):GetPhase() == 0) then - if player:GetQuest("Etc3g0"):GetQuestFlag(FLAG_TALKED_MESTONNAUX) == false then - npc:SetQuestGraphic(player, 0x2); - else - npc:SetQuestGraphic(player, 0x0); - end - else - npc:SetQuestGraphic(player, 0x0); - end - -end - - - -function onEventStarted(player, npc) - - defaultFst = GetStaticActor("DftFst"); - quest = GetStaticActor("Etc3g0"); - - if (player:HasQuest("Etc3g0") == true) then - - unknown, result = callClientFunction(player, "switchEvent", defaultFst, quest, nil, nil, 1, 1, 0x3f1); - - if (result == 1) then - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithMestonnaux_001", nil, nil, nil); - elseif (result == 2) then - ownedQuest = player:GetQuest("Etc3g0"); - - if (ownedQuest:GetQuestFlag(FLAG_TALKED_MESTONNAUX)) == false then - callClientFunction(player, "delegateEvent", player, quest, "processEventMestonnauxSpeak", nil, nil, nil); - ownedQuest:SetQuestFlag(FLAG_TALKED_MESTONNAUX, true); - ownedQuest:SaveData(); - npc:SetQuestGraphic(player, 0x0); - checkNextPhase(player); - else - callClientFunction(player, "delegateEvent", player, quest, "processEventMestonnauxSpeakAfter", nil, nil, nil); - end - end - - else - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithMestonnaux_001", nil, nil, nil); - end - - - player:endEvent(); -end - - - diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/mianne.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/mianne.lua deleted file mode 100644 index 3ad89dab..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/mianne.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithMianne_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/miniaeth_arc.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/miniaeth_arc.lua deleted file mode 100644 index 2d7bae01..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/miniaeth_arc.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithMiniaeth_arc_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/miniaeth_lnc.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/miniaeth_lnc.lua deleted file mode 100644 index 91f0aaff..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/miniaeth_lnc.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithMiniaeth_lnc_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/miniaeth_ltw.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/miniaeth_ltw.lua deleted file mode 100644 index 6e67af97..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/miniaeth_ltw.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithMiniaeth_ltw_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/mumuko.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/mumuko.lua deleted file mode 100644 index 75714463..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/mumuko.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithMumuko_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/nellaure.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/nellaure.lua deleted file mode 100644 index 211b7ea7..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/nellaure.lua +++ /dev/null @@ -1,51 +0,0 @@ -require ("global") -require ("quests/etc/etc3g0") - -function onSpawn(player, npc) - - if (player:HasQuest("Etc3g0") == true and player:GetQuest("Etc3g0"):GetPhase() == 0) then - if player:GetQuest("Etc3g0"):GetQuestFlag(FLAG_TALKED_NELLAURE) == false then - npc:SetQuestGraphic(player, 0x2); - else - npc:SetQuestGraphic(player, 0x0); - end - else - npc:SetQuestGraphic(player, 0x0); - end - -end - - - -function onEventStarted(player, npc) - - defaultFst = GetStaticActor("DftFst"); - quest = GetStaticActor("Etc3g0"); - - if (player:HasQuest("Etc3g0") == true) then - - unknown, result = callClientFunction(player, "switchEvent", defaultFst, quest, nil, nil, 1, 1, 0x3f1); - - if (result == 1) then - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithNellaure_001", nil, nil, nil); - elseif (result == 2) then - ownedQuest = player:GetQuest("Etc3g0"); - - if (ownedQuest:GetQuestFlag(FLAG_TALKED_NELLAURE)) == false then - callClientFunction(player, "delegateEvent", player, quest, "processEventNellaureSpeak", nil, nil, nil); - ownedQuest:SetQuestFlag(FLAG_TALKED_NELLAURE, true); - ownedQuest:SaveData(); - npc:SetQuestGraphic(player, 0x0); - checkNextPhase(player); - else - callClientFunction(player, "delegateEvent", player, quest, "processEventNellaureSpeakAfter", nil, nil, nil); - end - end - - else - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithNellaure_001", nil, nil, nil); - end - - - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/noes.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/noes.lua deleted file mode 100644 index 03c2851d..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/noes.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithNoes_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/nonolato.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/nonolato.lua deleted file mode 100644 index 461d2288..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/nonolato.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithNonolato_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/nuala.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/nuala.lua deleted file mode 100644 index 678c072b..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/nuala.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithNuala_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/odhinek.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/odhinek.lua deleted file mode 100644 index fe5055c5..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/odhinek.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithOdhinek_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/onguen.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/onguen.lua deleted file mode 100644 index 4d1dbd0c..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/onguen.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithOnguen_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/opyltyl.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/opyltyl.lua deleted file mode 100644 index f2e8e535..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/opyltyl.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithOpyltyl_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/osgar.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/osgar.lua deleted file mode 100644 index 9846804d..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/osgar.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithOsgar_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/owyne.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/owyne.lua deleted file mode 100644 index cfa09494..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/owyne.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithOwyne_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/piers.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/piers.lua deleted file mode 100644 index f113449d..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/piers.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithPiers_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/prosperlain.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/prosperlain.lua deleted file mode 100644 index e3be638d..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/prosperlain.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "tribeTalk", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/pukiki.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/pukiki.lua deleted file mode 100644 index eeda46d7..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/pukiki.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithGuildleveClientG_002", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/roderic.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/roderic.lua deleted file mode 100644 index 76858ec9..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/roderic.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithRoderic_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/roustebant.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/roustebant.lua deleted file mode 100644 index 8d4f1d1a..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/roustebant.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithRoustebant_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/sandre.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/sandre.lua deleted file mode 100644 index c86c5a6b..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/sandre.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithSandre_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/serpent_lieutenant_marette.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/serpent_lieutenant_marette.lua deleted file mode 100644 index 44b89d81..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/serpent_lieutenant_marette.lua +++ /dev/null @@ -1,18 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - Spl = GetStaticActor("Spl000"); - magickedPrism = 3020615; - - if not player:GetItemPackage(INVENTORY_NORMAL):HasItem(magickedPrism) then - callClientFunction(player, "delegateEvent", player, Spl, "processEventELNAURE", 2); - local invCheck = player:GetItemPackage(INVENTORY_NORMAL):AddItem(magickedPrism, 10, 1); - if invCheck == INV_ERROR_SUCCESS then - player:SendGameMessage(player, GetWorldMaster(), 25246, MESSAGE_TYPE_SYSTEM, magickedPrism, 10); - end - else - callClientFunction(player, "delegateEvent", player, Spl, "processEventELNAURE", 1); - end - - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/serpent_private_carver.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/serpent_private_carver.lua deleted file mode 100644 index 0a24f7e7..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/serpent_private_carver.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithSerpent_private_carver_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/serpent_private_holmes.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/serpent_private_holmes.lua deleted file mode 100644 index fc7c975d..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/serpent_private_holmes.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithSerpent_private_holmes_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/serpent_private_kirk.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/serpent_private_kirk.lua deleted file mode 100644 index c7b840aa..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/serpent_private_kirk.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithSerpent_private_kirk_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/serpent_private_stone.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/serpent_private_stone.lua deleted file mode 100644 index d6d2ff82..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/serpent_private_stone.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithSerpent_private_stone_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/serpent_private_tristelle.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/serpent_private_tristelle.lua deleted file mode 100644 index 267063c0..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/serpent_private_tristelle.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - Spl = GetStaticActor("Spl000"); - callClientFunction(player, "delegateEvent", player, Spl, "processEventMERLIE"); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/serpent_private_white.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/serpent_private_white.lua deleted file mode 100644 index d66e5dad..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/serpent_private_white.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithSerpent_private_white_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/serpent_sergeant_frilaix.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/serpent_sergeant_frilaix.lua deleted file mode 100644 index fadd1fdd..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/serpent_sergeant_frilaix.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - Spl = GetStaticActor("Spl000"); - callClientFunction(player, "delegateEvent", player, Spl, "processEventARISMONT"); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/spaerfedar.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/spaerfedar.lua deleted file mode 100644 index 03f2c7b9..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/spaerfedar.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithSpaerfedar_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/stanilde.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/stanilde.lua deleted file mode 100644 index 235c77cb..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/stanilde.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithStanilde_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/swaenhylt.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/swaenhylt.lua deleted file mode 100644 index 7b7caf02..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/swaenhylt.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithSwaenhylt_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/sybell.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/sybell.lua deleted file mode 100644 index 4236e455..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/sybell.lua +++ /dev/null @@ -1,54 +0,0 @@ -require ("global") -require ("quests/etc/etc3g0") - -function onSpawn(player, npc) - - if (player:HasQuest("Etc3g0") == true and player:GetQuest("Etc3g0"):GetPhase() == 0) then - if player:GetQuest("Etc3g0"):GetQuestFlag(FLAG_TALKED_SYBELL) == false then - npc:SetQuestGraphic(player, 0x2); - else - npc:SetQuestGraphic(player, 0x0); - end - else - npc:SetQuestGraphic(player, 0x0); - end - -end - - - -function onEventStarted(player, npc) - - defaultFst = GetStaticActor("DftFst"); - quest = GetStaticActor("Etc3g0"); - - if (player:HasQuest("Etc3g0") == true) then - - unknown, result = callClientFunction(player, "switchEvent", defaultFst, quest, nil, nil, 1, 1, 0x3f1); - - if (result == 1) then - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithSybell_001", nil, nil, nil); - elseif (result == 2) then - ownedQuest = player:GetQuest("Etc3g0"); - - if (ownedQuest:GetQuestFlag(FLAG_TALKED_SYBELL)) == false then - callClientFunction(player, "delegateEvent", player, quest, "processEventSybellSpeak", nil, nil, nil); - ownedQuest:SetQuestFlag(FLAG_TALKED_SYBELL, true); - ownedQuest:SaveData(); - npc:SetQuestGraphic(player, 0x0); - checkNextPhase(player); - else - callClientFunction(player, "delegateEvent", player, quest, "processEventSybellSpeakAfter", nil, nil, nil); - end - end - - else - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithSybell_001", nil, nil, nil); - end - - - player:endEvent(); -end - - - diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/tatagoi.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/tatagoi.lua deleted file mode 100644 index 4559f960..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/tatagoi.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithTatagoi_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/twyrmoht.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/twyrmoht.lua deleted file mode 100644 index 320b2bf0..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/twyrmoht.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithTwyrmoht_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/ulmhylt.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/ulmhylt.lua deleted file mode 100644 index f9c9bf11..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/ulmhylt.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithUlmhylt_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/ulric.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/ulric.lua deleted file mode 100644 index 4c439ce4..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/ulric.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithUlric_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/vnabyano.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/vnabyano.lua deleted file mode 100644 index 944257f6..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/vnabyano.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithVnabyano_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/voyce.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/voyce.lua deleted file mode 100644 index 64f832fa..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/voyce.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithVoyce_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/willelda.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/willelda.lua deleted file mode 100644 index e724f42f..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/willelda.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithWillelda_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/wulfthryth.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/wulfthryth.lua deleted file mode 100644 index 6802382e..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/wulfthryth.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithWulfthryth_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/ylessa.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/ylessa.lua deleted file mode 100644 index 62225a8d..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/ylessa.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithYlessa_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/yolaine.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/yolaine.lua deleted file mode 100644 index 908d9c69..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/yolaine.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithYolaine_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/zaesoeya.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/zaesoeya.lua deleted file mode 100644 index b6808caf..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/zaesoeya.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithZaesoeya_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/zelia.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/zelia.lua deleted file mode 100644 index 879a7d4d..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/zelia.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithZelia_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/zpahtalo.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/zpahtalo.lua deleted file mode 100644 index 6729ac90..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/zpahtalo.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithZpahtalo_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01a/PopulaceStandard/zuzupoja.lua b/Data/scripts/unique/fst0Town01a/PopulaceStandard/zuzupoja.lua deleted file mode 100644 index faef9c4c..00000000 --- a/Data/scripts/unique/fst0Town01a/PopulaceStandard/zuzupoja.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithZuzupoja_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Field01/PopulaceShopSalesman/sungyve.lua b/Data/scripts/unique/sea0Field01/PopulaceShopSalesman/sungyve.lua deleted file mode 100644 index 00d3b912..00000000 --- a/Data/scripts/unique/sea0Field01/PopulaceShopSalesman/sungyve.lua +++ /dev/null @@ -1,6 +0,0 @@ - -shopInfo = { -welcomeText = 5, -shopPack = 3008, -tutorialId = 35 -} \ No newline at end of file diff --git a/Data/scripts/unique/sea0Field01/PopulaceStandard/kiht_gamduhla.lua b/Data/scripts/unique/sea0Field01/PopulaceStandard/kiht_gamduhla.lua deleted file mode 100644 index 49c7fe84..00000000 --- a/Data/scripts/unique/sea0Field01/PopulaceStandard/kiht_gamduhla.lua +++ /dev/null @@ -1,9 +0,0 @@ -require ("global") - ---Argument is 20 or ~20. - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithKihtgamduhla_001", 0); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Field01/PopulaceStandard/ryssfloh.lua b/Data/scripts/unique/sea0Field01/PopulaceStandard/ryssfloh.lua deleted file mode 100644 index f142270a..00000000 --- a/Data/scripts/unique/sea0Field01/PopulaceStandard/ryssfloh.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithRyssfloh_001", 0); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Field02/PopulaceStandard/solelle.lua b/Data/scripts/unique/sea0Field02/PopulaceStandard/solelle.lua deleted file mode 100644 index ae7e3a8a..00000000 --- a/Data/scripts/unique/sea0Field02/PopulaceStandard/solelle.lua +++ /dev/null @@ -1,9 +0,0 @@ -require ("global") - ---Argument is 20 or ~20. - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithSolelle_001", 0); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Field04/PopulaceStandard/storm_sergeant_nolan.lua b/Data/scripts/unique/sea0Field04/PopulaceStandard/storm_sergeant_nolan.lua deleted file mode 100644 index 5f05fe35..00000000 --- a/Data/scripts/unique/sea0Field04/PopulaceStandard/storm_sergeant_nolan.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithKurtz_001"); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01/ElevatorStandard/crows_lift_lvl1.lua b/Data/scripts/unique/sea0Town01/ElevatorStandard/crows_lift_lvl1.lua deleted file mode 100644 index 4c95e783..00000000 --- a/Data/scripts/unique/sea0Town01/ElevatorStandard/crows_lift_lvl1.lua +++ /dev/null @@ -1,15 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - floorChoice = callClientFunction(player, "elevatorAskLimsa001", 0); - - if (floorChoice == 1) then - callClientFunction(player, "elevatorAskLimsa001", 1); - GetWorldManager():DoZoneChange(player, 133, nil, 0, 15, -447, 40, 220, -1.574); - elseif (floorChoice == 2) then - callClientFunction(player, "elevatorAskLimsa001", 2); - GetWorldManager():DoZoneChange(player, 133, nil, 0, 15, -458, 92, 175, -0.383); - end - - player:EndEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01/ElevatorStandard/crows_lift_lvl2.lua b/Data/scripts/unique/sea0Town01/ElevatorStandard/crows_lift_lvl2.lua deleted file mode 100644 index c30e0f2e..00000000 --- a/Data/scripts/unique/sea0Town01/ElevatorStandard/crows_lift_lvl2.lua +++ /dev/null @@ -1,15 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - floorChoice = callClientFunction(player, "elevatorAskLimsa002", 0); - - if (floorChoice == 1) then - callClientFunction(player, "elevatorAskLimsa002", 1); - GetWorldManager():DoZoneChange(player, 133, nil, 0, 15, -447, 19, 220, -1.574); - elseif (floorChoice == 2) then - callClientFunction(player, "elevatorAskLimsa002", 2); - GetWorldManager():DoZoneChange(player, 133, nil, 0, 15, -458, 92, 175, -0.383); - end - - player:EndEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01/ElevatorStandard/crows_lift_lvl3.lua b/Data/scripts/unique/sea0Town01/ElevatorStandard/crows_lift_lvl3.lua deleted file mode 100644 index c88b0d56..00000000 --- a/Data/scripts/unique/sea0Town01/ElevatorStandard/crows_lift_lvl3.lua +++ /dev/null @@ -1,15 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - floorChoice = callClientFunction(player, "elevatorAskLimsa003", 0); - - if (floorChoice == 1) then - callClientFunction(player, "elevatorAskLimsa003", 1); - GetWorldManager():DoZoneChange(player, 133, nil, 0, 15, -447, 19, 220, -1.574); - elseif (floorChoice == 2) then - callClientFunction(player, "elevatorAskLimsa003", 2); - GetWorldManager():DoZoneChange(player, 133, nil, 0, 15, -447, 40, 220, -1.574); - end - - player:EndEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PopulaceShopSalesman/jossy.lua b/Data/scripts/unique/sea0Town01a/PopulaceShopSalesman/jossy.lua deleted file mode 100644 index b0781436..00000000 --- a/Data/scripts/unique/sea0Town01a/PopulaceShopSalesman/jossy.lua +++ /dev/null @@ -1,6 +0,0 @@ - -shopInfo = { -welcomeText = 94, -shopPack = 0x67, -shopCurrancy = nil -} \ No newline at end of file diff --git a/Data/scripts/unique/wil0Field02/PopulaceStandard/pack_chocobo.lua b/Data/scripts/unique/wil0Field02/PopulaceStandard/pack_chocobo.lua deleted file mode 100644 index 2a59c3ee..00000000 --- a/Data/scripts/unique/wil0Field02/PopulaceStandard/pack_chocobo.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkCaravanChocoboUld_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Field02/PopulaceStandard/zllayan.lua b/Data/scripts/unique/wil0Field02/PopulaceStandard/zllayan.lua deleted file mode 100644 index 4ba3fb89..00000000 --- a/Data/scripts/unique/wil0Field02/PopulaceStandard/zllayan.lua +++ /dev/null @@ -1,7 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithZllayan_001", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01/ElevatorStandard/wellhead_lift_lvl1.lua b/Data/scripts/unique/wil0Town01/ElevatorStandard/wellhead_lift_lvl1.lua deleted file mode 100644 index c2c00d3f..00000000 --- a/Data/scripts/unique/wil0Town01/ElevatorStandard/wellhead_lift_lvl1.lua +++ /dev/null @@ -1,15 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - floorChoice = callClientFunction(player, "elevatorAskUldah001", 0); - - if (floorChoice == 1) then - callClientFunction(player, "elevatorAskUldah001", 1); - GetWorldManager():DoZoneChange(player, 209, nil, 0, 15, -116.78, 222, 115.7, 2.85); - elseif (floorChoice == 2) then - callClientFunction(player, "elevatorAskUldah001", 2); - GetWorldManager():DoZoneChange(player, 209, nil, 0, 15, -121.60, 269.8, 135.28, -0.268); - end - - player:EndEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01/PopulaceShopSalesman/allenaure.lua b/Data/scripts/unique/wil0Town01/PopulaceShopSalesman/allenaure.lua deleted file mode 100644 index 2c3f5267..00000000 --- a/Data/scripts/unique/wil0Town01/PopulaceShopSalesman/allenaure.lua +++ /dev/null @@ -1,5 +0,0 @@ - -shopInfo = { -welcomeText = 97, -shopPack = 3010 -} \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01/PopulaceShopSalesman/barryn.lua b/Data/scripts/unique/wil0Town01/PopulaceShopSalesman/barryn.lua deleted file mode 100644 index d6fe719e..00000000 --- a/Data/scripts/unique/wil0Town01/PopulaceShopSalesman/barryn.lua +++ /dev/null @@ -1,5 +0,0 @@ - -shopInfo = { -welcomeText = 100, -shopPack = 3013 -} \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01/PopulaceShopSalesman/doesdornn.lua b/Data/scripts/unique/wil0Town01/PopulaceShopSalesman/doesdornn.lua deleted file mode 100644 index b57525ac..00000000 --- a/Data/scripts/unique/wil0Town01/PopulaceShopSalesman/doesdornn.lua +++ /dev/null @@ -1,5 +0,0 @@ - -shopInfo = { -welcomeText = 99, -shopPack = 3012 -} \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01/PopulaceShopSalesman/elgiva.lua b/Data/scripts/unique/wil0Town01/PopulaceShopSalesman/elgiva.lua deleted file mode 100644 index 348f5993..00000000 --- a/Data/scripts/unique/wil0Town01/PopulaceShopSalesman/elgiva.lua +++ /dev/null @@ -1,5 +0,0 @@ - -shopInfo = { -welcomeText = 98, -shopPack = 3011 -} \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01/PopulaceShopSalesman/eormengild.lua b/Data/scripts/unique/wil0Town01/PopulaceShopSalesman/eormengild.lua deleted file mode 100644 index 75c649f1..00000000 --- a/Data/scripts/unique/wil0Town01/PopulaceShopSalesman/eormengild.lua +++ /dev/null @@ -1,5 +0,0 @@ - -shopInfo = { -welcomeText = 106, -shopPack = 3007 -} \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01/PopulaceShopSalesman/etgar.lua b/Data/scripts/unique/wil0Town01/PopulaceShopSalesman/etgar.lua deleted file mode 100644 index 4114df3b..00000000 --- a/Data/scripts/unique/wil0Town01/PopulaceShopSalesman/etgar.lua +++ /dev/null @@ -1,7 +0,0 @@ - -shopInfo = { -selectMode = 2, -welcomeText = 281, -shopPack = {5001, 5002, 5007, 5008}, -tutorialId = -1 -} \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01/PopulaceShopSalesman/fabrellet.lua b/Data/scripts/unique/wil0Town01/PopulaceShopSalesman/fabrellet.lua deleted file mode 100644 index df2b19f7..00000000 --- a/Data/scripts/unique/wil0Town01/PopulaceShopSalesman/fabrellet.lua +++ /dev/null @@ -1,5 +0,0 @@ - -shopInfo = { -welcomeText = 84, -shopPack = 3018 -} \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01/PopulaceShopSalesman/ganelon.lua b/Data/scripts/unique/wil0Town01/PopulaceShopSalesman/ganelon.lua deleted file mode 100644 index c70ffe08..00000000 --- a/Data/scripts/unique/wil0Town01/PopulaceShopSalesman/ganelon.lua +++ /dev/null @@ -1,7 +0,0 @@ - -shopInfo = { -selectMode = 3, -welcomeText = 281, -shopPack = {5004, 5005, 5006, 5003}, -tutorialId = -1 -} \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01/PopulaceShopSalesman/gugudi.lua b/Data/scripts/unique/wil0Town01/PopulaceShopSalesman/gugudi.lua deleted file mode 100644 index 78231206..00000000 --- a/Data/scripts/unique/wil0Town01/PopulaceShopSalesman/gugudi.lua +++ /dev/null @@ -1,5 +0,0 @@ - -shopInfo = { -welcomeText = 103, -shopPack = 3015 -} \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01/PopulaceShopSalesman/helena.lua b/Data/scripts/unique/wil0Town01/PopulaceShopSalesman/helena.lua deleted file mode 100644 index b59ac954..00000000 --- a/Data/scripts/unique/wil0Town01/PopulaceShopSalesman/helena.lua +++ /dev/null @@ -1,5 +0,0 @@ - -shopInfo = { -welcomeText = 102, -shopPack = 3016 -} \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01/PopulaceShopSalesman/johannes.lua b/Data/scripts/unique/wil0Town01/PopulaceShopSalesman/johannes.lua deleted file mode 100644 index 7b232835..00000000 --- a/Data/scripts/unique/wil0Town01/PopulaceShopSalesman/johannes.lua +++ /dev/null @@ -1,5 +0,0 @@ - -shopInfo = { -welcomeText = 104, -shopPack = 3017 -} \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01/PopulaceShopSalesman/pimelle.lua b/Data/scripts/unique/wil0Town01/PopulaceShopSalesman/pimelle.lua deleted file mode 100644 index 7745843b..00000000 --- a/Data/scripts/unique/wil0Town01/PopulaceShopSalesman/pimelle.lua +++ /dev/null @@ -1,5 +0,0 @@ - -shopInfo = { -welcomeText = 112, -shopPack = 3001 -} \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01/PopulaceShopSalesman/psonjha.lua b/Data/scripts/unique/wil0Town01/PopulaceShopSalesman/psonjha.lua deleted file mode 100644 index e1d97e29..00000000 --- a/Data/scripts/unique/wil0Town01/PopulaceShopSalesman/psonjha.lua +++ /dev/null @@ -1,5 +0,0 @@ - -shopInfo = { -welcomeText = 96, -shopPack = 3009 -} \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01/PopulaceShopSalesman/quiloud.lua b/Data/scripts/unique/wil0Town01/PopulaceShopSalesman/quiloud.lua deleted file mode 100644 index 9bf5e7e2..00000000 --- a/Data/scripts/unique/wil0Town01/PopulaceShopSalesman/quiloud.lua +++ /dev/null @@ -1,5 +0,0 @@ - -shopInfo = { -welcomeText = 105, -shopPack = 3004 -} \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01/PopulaceShopSalesman/roserette.lua b/Data/scripts/unique/wil0Town01/PopulaceShopSalesman/roserette.lua deleted file mode 100644 index f4b1155d..00000000 --- a/Data/scripts/unique/wil0Town01/PopulaceShopSalesman/roserette.lua +++ /dev/null @@ -1,5 +0,0 @@ - -shopInfo = { -welcomeText = 108, -shopPack = 3006 -} \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01/PopulaceShopSalesman/tataroga.lua b/Data/scripts/unique/wil0Town01/PopulaceShopSalesman/tataroga.lua deleted file mode 100644 index e8b4ed6f..00000000 --- a/Data/scripts/unique/wil0Town01/PopulaceShopSalesman/tataroga.lua +++ /dev/null @@ -1,5 +0,0 @@ - -shopInfo = { -welcomeText = 101, -shopPack = 3014 -} \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01/PopulaceShopSalesman/wawapo.lua b/Data/scripts/unique/wil0Town01/PopulaceShopSalesman/wawapo.lua deleted file mode 100644 index 2bc58ab8..00000000 --- a/Data/scripts/unique/wil0Town01/PopulaceShopSalesman/wawapo.lua +++ /dev/null @@ -1,5 +0,0 @@ - -shopInfo = { -welcomeText = 237, -shopPack = 3023 -} \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01/PopulaceShopSalesman/wysslorh.lua b/Data/scripts/unique/wil0Town01/PopulaceShopSalesman/wysslorh.lua deleted file mode 100644 index dbab515a..00000000 --- a/Data/scripts/unique/wil0Town01/PopulaceShopSalesman/wysslorh.lua +++ /dev/null @@ -1,5 +0,0 @@ - -shopInfo = { -welcomeText = 109, -shopPack = 3005 -} \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01a/ElevatorStandard/wellhead_lift_lvl2.lua b/Data/scripts/unique/wil0Town01a/ElevatorStandard/wellhead_lift_lvl2.lua deleted file mode 100644 index 7900baed..00000000 --- a/Data/scripts/unique/wil0Town01a/ElevatorStandard/wellhead_lift_lvl2.lua +++ /dev/null @@ -1,15 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - floorChoice = callClientFunction(player, "elevatorAskUldah002", 0); - - if (floorChoice == 1) then - callClientFunction(player, "elevatorAskUldah002", 1); - GetWorldManager():DoZoneChange(player, 175, nil, 0, 15, -116.78, 198, 115.7, -2.8911); - elseif (floorChoice == 2) then - callClientFunction(player, "elevatorAskUldah002", 2); - GetWorldManager():DoZoneChange(player, 209, nil, 0, 15, -121.60, 269.8, 135.28, -0.268); - end - - player:EndEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01a/ElevatorStandard/wellhead_lift_lvl3.lua b/Data/scripts/unique/wil0Town01a/ElevatorStandard/wellhead_lift_lvl3.lua deleted file mode 100644 index 7d575a21..00000000 --- a/Data/scripts/unique/wil0Town01a/ElevatorStandard/wellhead_lift_lvl3.lua +++ /dev/null @@ -1,15 +0,0 @@ -require ("global") - -function onEventStarted(player, npc) - floorChoice = callClientFunction(player, "elevatorAskUldah003", 0); - - if (floorChoice == 1) then - callClientFunction(player, "elevatorAskUldah003", 1); - GetWorldManager():DoZoneChange(player, 175, nil, 0, 15, -116.78, 198, 115.7, -2.8911); - elseif (floorChoice == 2) then - callClientFunction(player, "elevatorAskUldah003", 2); - GetWorldManager():DoZoneChange(player, 209, nil, 0, 15, -116.78, 222, 115.7, 2.85); - end - - player:EndEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01a/PopulaceShopSalesman/jemimi.lua b/Data/scripts/unique/wil0Town01a/PopulaceShopSalesman/jemimi.lua deleted file mode 100644 index ba2cb149..00000000 --- a/Data/scripts/unique/wil0Town01a/PopulaceShopSalesman/jemimi.lua +++ /dev/null @@ -1,6 +0,0 @@ - -shopInfo = { -welcomeText = 69, -shopPack = 3020, -tutorialId = 35 -} \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01a/PopulaceShopSalesman/norbettaux.lua b/Data/scripts/unique/wil0Town01a/PopulaceShopSalesman/norbettaux.lua deleted file mode 100644 index 50d75a8f..00000000 --- a/Data/scripts/unique/wil0Town01a/PopulaceShopSalesman/norbettaux.lua +++ /dev/null @@ -1,6 +0,0 @@ - -shopInfo = { -welcomeText = 64, -shopPack = 3021, -tutorialId = 34 -} \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01a/PopulaceShopSalesman/nortmoen.lua b/Data/scripts/unique/wil0Town01a/PopulaceShopSalesman/nortmoen.lua deleted file mode 100644 index 118e0824..00000000 --- a/Data/scripts/unique/wil0Town01a/PopulaceShopSalesman/nortmoen.lua +++ /dev/null @@ -1,6 +0,0 @@ - -shopInfo = { -welcomeText = 76, -shopPack = 3022, -tutorialId = 39 -} \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01a/PopulaceShopSalesman/pamisolaux.lua b/Data/scripts/unique/wil0Town01a/PopulaceShopSalesman/pamisolaux.lua deleted file mode 100644 index eac22408..00000000 --- a/Data/scripts/unique/wil0Town01a/PopulaceShopSalesman/pamisolaux.lua +++ /dev/null @@ -1,6 +0,0 @@ - -shopInfo = { -welcomeText = 54, -shopPack = 3019, -tutorialId = 32 -} \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01a/PopulaceShopSalesman/waeksatz.lua b/Data/scripts/unique/wil0Town01a/PopulaceShopSalesman/waeksatz.lua deleted file mode 100644 index d83094e0..00000000 --- a/Data/scripts/unique/wil0Town01a/PopulaceShopSalesman/waeksatz.lua +++ /dev/null @@ -1,5 +0,0 @@ - -shopInfo = { -welcomeText = 265, -shopPack = 3024 -} \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01a/PopulaceShopSalesman/wnhalki.lua b/Data/scripts/unique/wil0Town01a/PopulaceShopSalesman/wnhalki.lua deleted file mode 100644 index a5842c11..00000000 --- a/Data/scripts/unique/wil0Town01a/PopulaceShopSalesman/wnhalki.lua +++ /dev/null @@ -1,5 +0,0 @@ - -shopInfo = { -welcomeText = 111, -shopPack = 3003 -} \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01a/PopulaceShopSalesman/zagylswerd.lua b/Data/scripts/unique/wil0Town01a/PopulaceShopSalesman/zagylswerd.lua deleted file mode 100644 index f03d0eb1..00000000 --- a/Data/scripts/unique/wil0Town01a/PopulaceShopSalesman/zagylswerd.lua +++ /dev/null @@ -1,5 +0,0 @@ - -shopInfo = { -welcomeText = 110, -shopPack = 3002 -} \ No newline at end of file From 765cf194c51b0aa0a86e3fe6ae0c43fce737f44a Mon Sep 17 00:00:00 2001 From: Filip Maj Date: Thu, 3 Mar 2022 23:33:55 -0500 Subject: [PATCH 21/23] Removed more dead scripts. Exported missing sql files. --- .../base/chara/npc/mapobj/MapObjShipPort.lua | 9 + .../chara/npc/mapobj/MapObjTutorial.lua} | 2 +- .../chara/npc/object/OpeningStoperF0B1.lua | 4 +- .../base/chara/npc/object/OpeningTown.lua | 9 + .../npc/object/OpeningTownEventKeeper.lua | 18 ++ .../npc/object/aetheryte/AetheryteParent.lua | 14 + .../instanceraidguide/InstanceRaidGuide.lua | 17 ++ Data/scripts/commands/PlaceDrivenCommand.lua | 4 +- Data/scripts/commands/gm/testmapobj.lua | 20 +- Data/scripts/directors/OpeningDirector.lua | 32 +- Data/scripts/quests/dft/DftFst.lua | 240 ++++++++++++++- Data/scripts/quests/man/man0g0.lua | 273 +++++++++++++++++- Data/scripts/quests/man/man0g1.lua | 196 +++++++++++++ Data/scripts/quests/man/man0u0.lua | 53 ++-- Data/scripts/quests/man/man0u1.lua | 5 - .../Monster/bloodthirsty_wolf.lua | 0 .../unique/fst0Battle03/Monster/papalymo.lua | 28 -- .../unique/fst0Battle03/Monster/yda.lua | 26 -- .../openingstoper_gridania.lua | 12 - .../PopulaceStandard/papalymo.lua | 19 -- .../fst0Battle03/PopulaceStandard/yda.lua | 59 ---- .../DoorStandard/closed_gridania_gate.lua | 5 - .../PopulaceStandard/cecilia.lua | 14 - .../PopulaceStandard/farrimond.lua | 14 - .../PopulaceStandard/gridania_blocker1.lua | 14 - .../gridania_opening_exit.lua | 16 - .../PopulaceStandard/lonsygg.lua | 14 - .../PopulaceStandard/swethyna.lua | 15 - .../PopulaceStandard/tkebbe.lua | 19 -- .../PopulaceStandard/amiable_adventurer.lua | 14 - .../PopulaceStandard/beaming_adventurer.lua | 14 - .../PopulaceStandard/miounne.lua | 26 -- .../PopulaceStandard/morose_merchant.lua | 14 - .../narrow-eyed_adventurer.lua | 15 - .../PopulaceStandard/unconcerned_passerby.lua | 14 - .../PopulaceStandard/vkorolon.lua | 8 - .../well-bundled_adventurer.lua | 14 - .../wispily_whiskered_woodworker.lua | 14 - Data/scripts/unique/ocn0Battle02/zone.lua | 11 - .../unique/ocn0Cruise01/ship_route_2.lua | 5 - .../PopulaceStandard/cocksure-cockswain.lua | 13 - .../sententious_sellsword.lua | 13 - .../PopulaceStandard/solicitous_sellsword.lua | 13 - .../AetheryteParent/limsa_aetheryte.lua | 0 .../PopulaceStandard/PrivateAreaPastExit.lua | 12 - .../PopulaceStandard/gert.lua | 8 - .../PopulaceStandard/hob.lua | 18 -- .../PopulaceStandard/lanky_traveler.lua | 8 - .../PopulaceStandard/lorhzant.lua | 8 - .../muscle-bound_deckhand.lua | 8 - .../pasty-faced_adventurer.lua | 8 - .../pearly-toothed_porter.lua | 8 - .../undignified_adventurer.lua | 8 - .../PopulaceStandard/voluptuous_vixen.lua | 8 - .../well-traveled_merchant.lua | 8 - .../wil0Battle01/DoorStandard/door1.lua | 3 - .../wil0Battle01/DoorStandard/door2.lua | 3 - .../wil0Battle01/DoorStandard/door3.lua | 3 - .../MapObjOnlyShowHide/man0u0_tutrl_gate.lua | 3 - .../opening_stoper_uldah.lua | 13 - .../opening_stoper_uldah_battle.lua | 13 - .../DoorStandard/pgl200_gsm_door.lua | 3 - Data/sql/gamedata_actor_class.sql | 136 ++++----- Data/sql/server_eventnpc_mapobj.sql | 104 +++++++ Data/sql/server_eventnpc_spawn_locations.sql | 163 ++++++----- 65 files changed, 1076 insertions(+), 809 deletions(-) create mode 100644 Data/scripts/base/chara/npc/mapobj/MapObjShipPort.lua rename Data/scripts/{unique/ocn0Cruise01/ship_route_1.lua => base/chara/npc/mapobj/MapObjTutorial.lua} (50%) create mode 100644 Data/scripts/base/chara/npc/object/OpeningTown.lua create mode 100644 Data/scripts/base/chara/npc/object/OpeningTownEventKeeper.lua create mode 100644 Data/scripts/base/chara/npc/populace/instanceraidguide/InstanceRaidGuide.lua create mode 100644 Data/scripts/quests/man/man0g1.lua delete mode 100644 Data/scripts/unique/fst0Battle03/Monster/bloodthirsty_wolf.lua delete mode 100644 Data/scripts/unique/fst0Battle03/Monster/papalymo.lua delete mode 100644 Data/scripts/unique/fst0Battle03/Monster/yda.lua delete mode 100644 Data/scripts/unique/fst0Battle03/OpeningStoperF0B1/openingstoper_gridania.lua delete mode 100644 Data/scripts/unique/fst0Battle03/PopulaceStandard/papalymo.lua delete mode 100644 Data/scripts/unique/fst0Battle03/PopulaceStandard/yda.lua delete mode 100644 Data/scripts/unique/fst0Town01/PrivateArea/PrivateAreaMasterPast_1/DoorStandard/closed_gridania_gate.lua delete mode 100644 Data/scripts/unique/fst0Town01/PrivateArea/PrivateAreaMasterPast_1/PopulaceStandard/cecilia.lua delete mode 100644 Data/scripts/unique/fst0Town01/PrivateArea/PrivateAreaMasterPast_1/PopulaceStandard/farrimond.lua delete mode 100644 Data/scripts/unique/fst0Town01/PrivateArea/PrivateAreaMasterPast_1/PopulaceStandard/gridania_blocker1.lua delete mode 100644 Data/scripts/unique/fst0Town01/PrivateArea/PrivateAreaMasterPast_1/PopulaceStandard/gridania_opening_exit.lua delete mode 100644 Data/scripts/unique/fst0Town01/PrivateArea/PrivateAreaMasterPast_1/PopulaceStandard/lonsygg.lua delete mode 100644 Data/scripts/unique/fst0Town01/PrivateArea/PrivateAreaMasterPast_1/PopulaceStandard/swethyna.lua delete mode 100644 Data/scripts/unique/fst0Town01/PrivateArea/PrivateAreaMasterPast_1/PopulaceStandard/tkebbe.lua delete mode 100644 Data/scripts/unique/fst0Town01/PrivateArea/PrivateAreaMasterPast_2/PopulaceStandard/amiable_adventurer.lua delete mode 100644 Data/scripts/unique/fst0Town01/PrivateArea/PrivateAreaMasterPast_2/PopulaceStandard/beaming_adventurer.lua delete mode 100644 Data/scripts/unique/fst0Town01/PrivateArea/PrivateAreaMasterPast_2/PopulaceStandard/miounne.lua delete mode 100644 Data/scripts/unique/fst0Town01/PrivateArea/PrivateAreaMasterPast_2/PopulaceStandard/morose_merchant.lua delete mode 100644 Data/scripts/unique/fst0Town01/PrivateArea/PrivateAreaMasterPast_2/PopulaceStandard/narrow-eyed_adventurer.lua delete mode 100644 Data/scripts/unique/fst0Town01/PrivateArea/PrivateAreaMasterPast_2/PopulaceStandard/unconcerned_passerby.lua delete mode 100644 Data/scripts/unique/fst0Town01/PrivateArea/PrivateAreaMasterPast_2/PopulaceStandard/vkorolon.lua delete mode 100644 Data/scripts/unique/fst0Town01/PrivateArea/PrivateAreaMasterPast_2/PopulaceStandard/well-bundled_adventurer.lua delete mode 100644 Data/scripts/unique/fst0Town01/PrivateArea/PrivateAreaMasterPast_2/PopulaceStandard/wispily_whiskered_woodworker.lua delete mode 100644 Data/scripts/unique/ocn0Battle02/zone.lua delete mode 100644 Data/scripts/unique/ocn0Cruise01/ship_route_2.lua delete mode 100644 Data/scripts/unique/sea0Town01/PrivateArea/PrivateAreaMasterPast_2/PopulaceStandard/cocksure-cockswain.lua delete mode 100644 Data/scripts/unique/sea0Town01/PrivateArea/PrivateAreaMasterPast_2/PopulaceStandard/sententious_sellsword.lua delete mode 100644 Data/scripts/unique/sea0Town01/PrivateArea/PrivateAreaMasterPast_2/PopulaceStandard/solicitous_sellsword.lua delete mode 100644 Data/scripts/unique/sea0Town01a/AetheryteParent/limsa_aetheryte.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PrivateArea/PrivateAreaMasterPast_1/PopulaceStandard/PrivateAreaPastExit.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PrivateArea/PrivateAreaMasterPast_1/PopulaceStandard/gert.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PrivateArea/PrivateAreaMasterPast_1/PopulaceStandard/hob.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PrivateArea/PrivateAreaMasterPast_1/PopulaceStandard/lanky_traveler.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PrivateArea/PrivateAreaMasterPast_1/PopulaceStandard/lorhzant.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PrivateArea/PrivateAreaMasterPast_1/PopulaceStandard/muscle-bound_deckhand.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PrivateArea/PrivateAreaMasterPast_1/PopulaceStandard/pasty-faced_adventurer.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PrivateArea/PrivateAreaMasterPast_1/PopulaceStandard/pearly-toothed_porter.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PrivateArea/PrivateAreaMasterPast_1/PopulaceStandard/undignified_adventurer.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PrivateArea/PrivateAreaMasterPast_1/PopulaceStandard/voluptuous_vixen.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PrivateArea/PrivateAreaMasterPast_1/PopulaceStandard/well-traveled_merchant.lua delete mode 100644 Data/scripts/unique/wil0Battle01/DoorStandard/door1.lua delete mode 100644 Data/scripts/unique/wil0Battle01/DoorStandard/door2.lua delete mode 100644 Data/scripts/unique/wil0Battle01/DoorStandard/door3.lua delete mode 100644 Data/scripts/unique/wil0Battle01/MapObjOnlyShowHide/man0u0_tutrl_gate.lua delete mode 100644 Data/scripts/unique/wil0Battle01/OpeningStoperW0B1/opening_stoper_uldah.lua delete mode 100644 Data/scripts/unique/wil0Battle01/OpeningStoperW0B1/opening_stoper_uldah_battle.lua delete mode 100644 Data/scripts/unique/wil0Town01a/privatearea/PrivateAreaMasterPast_5/DoorStandard/pgl200_gsm_door.lua create mode 100644 Data/sql/server_eventnpc_mapobj.sql diff --git a/Data/scripts/base/chara/npc/mapobj/MapObjShipPort.lua b/Data/scripts/base/chara/npc/mapobj/MapObjShipPort.lua new file mode 100644 index 00000000..96b8100c --- /dev/null +++ b/Data/scripts/base/chara/npc/mapobj/MapObjShipPort.lua @@ -0,0 +1,9 @@ +require("global"); + +function init(npc) + return false, false, 0, 0; +end + +function onEventStarted(player, npc, eventType, eventName) + player:EndEvent(); +end \ No newline at end of file diff --git a/Data/scripts/unique/ocn0Cruise01/ship_route_1.lua b/Data/scripts/base/chara/npc/mapobj/MapObjTutorial.lua similarity index 50% rename from Data/scripts/unique/ocn0Cruise01/ship_route_1.lua rename to Data/scripts/base/chara/npc/mapobj/MapObjTutorial.lua index 7feb8f7c..bf78cd51 100644 --- a/Data/scripts/unique/ocn0Cruise01/ship_route_1.lua +++ b/Data/scripts/base/chara/npc/mapobj/MapObjTutorial.lua @@ -1,5 +1,5 @@ require ("global") function init(npc) - return false, false, 0, 0, 0x1415, 201; + return false, false, 0, 0, 0, 0; end \ No newline at end of file diff --git a/Data/scripts/base/chara/npc/object/OpeningStoperF0B1.lua b/Data/scripts/base/chara/npc/object/OpeningStoperF0B1.lua index 44608df4..fd03f924 100644 --- a/Data/scripts/base/chara/npc/object/OpeningStoperF0B1.lua +++ b/Data/scripts/base/chara/npc/object/OpeningStoperF0B1.lua @@ -1,3 +1,5 @@ +require("global"); + function init(npc) return false, false, 0, 0; end @@ -7,7 +9,7 @@ function onEventStarted(player, npc, triggerName) worldMaster = GetWorldMaster(); player:SendGameMessage(player, worldMaster, 34109, 0x20); elseif (triggerName == "exit") then - GetWorldManager():DoPlayerMoveInZone(player, 5); + GetWorldManager():DoPlayerMoveInZone(player, 356.09, 3.74, -701.62, -1.4); end player:EndEvent(); end \ No newline at end of file diff --git a/Data/scripts/base/chara/npc/object/OpeningTown.lua b/Data/scripts/base/chara/npc/object/OpeningTown.lua new file mode 100644 index 00000000..96b8100c --- /dev/null +++ b/Data/scripts/base/chara/npc/object/OpeningTown.lua @@ -0,0 +1,9 @@ +require("global"); + +function init(npc) + return false, false, 0, 0; +end + +function onEventStarted(player, npc, eventType, eventName) + player:EndEvent(); +end \ No newline at end of file diff --git a/Data/scripts/base/chara/npc/object/OpeningTownEventKeeper.lua b/Data/scripts/base/chara/npc/object/OpeningTownEventKeeper.lua new file mode 100644 index 00000000..d654d212 --- /dev/null +++ b/Data/scripts/base/chara/npc/object/OpeningTownEventKeeper.lua @@ -0,0 +1,18 @@ +require("global"); + +function init(npc) + return false, false, 0, 0; +end + +function onEventStarted(player, npc, eventType, eventName) + + if (eventType == ETYPE_PUSH) then + if (eventName == "caution") then + worldMaster = GetWorldMaster(); + player:SendGameMessage(player, worldMaster, 34109, 0x20); + elseif (eventName == "exit") then + GetWorldManager():DoPlayerMoveInZone(player, 5.36433, 196, 133.656, -2.84938); + end + end + player:EndEvent(); +end \ No newline at end of file diff --git a/Data/scripts/base/chara/npc/object/aetheryte/AetheryteParent.lua b/Data/scripts/base/chara/npc/object/aetheryte/AetheryteParent.lua index a73eba37..eeb30e98 100644 --- a/Data/scripts/base/chara/npc/object/aetheryte/AetheryteParent.lua +++ b/Data/scripts/base/chara/npc/object/aetheryte/AetheryteParent.lua @@ -41,6 +41,20 @@ function onEventStarted(player, aetheryte, triggerName) callClientFunction(player, "delegateEvent", player, quest, "processEvent025"); quest:StartSequence(SEQ_005); end + elseif (player:HasQuest(110006) == true) then + require ("quests/man/man0g1"); + local quest = player:GetQuest("Man0g1"); + if (quest:GetSequence() == SEQ_005) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent013"); + --quest:StartSequence(???); + end + elseif (player:HasQuest(110010) == true) then + require ("quests/man/man0u1"); + local quest = player:GetQuest("Man0u1"); + if (quest:GetSequence() == SEQ_005) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent013"); + quest:StartSequence(SEQ_010); + end end if (player:GetGuildleveDirector() ~= nil) then diff --git a/Data/scripts/base/chara/npc/populace/instanceraidguide/InstanceRaidGuide.lua b/Data/scripts/base/chara/npc/populace/instanceraidguide/InstanceRaidGuide.lua new file mode 100644 index 00000000..50801a26 --- /dev/null +++ b/Data/scripts/base/chara/npc/populace/instanceraidguide/InstanceRaidGuide.lua @@ -0,0 +1,17 @@ +--[[ + +InstanceRaidGuide Script + +Functions; + +--]] + +require ("global") + +function init(npc) + return false, false, 0, 0; +end + +function onEventStarted(player, npc, eventType, eventName) + player:EndEvent(); +end \ No newline at end of file diff --git a/Data/scripts/commands/PlaceDrivenCommand.lua b/Data/scripts/commands/PlaceDrivenCommand.lua index 1d9fe8ba..f49203f0 100644 --- a/Data/scripts/commands/PlaceDrivenCommand.lua +++ b/Data/scripts/commands/PlaceDrivenCommand.lua @@ -8,7 +8,7 @@ Notes: --]] require("global") -function onEventStarted(player, actor, triggerName, pushCommand, unk1, unk2, unk3, ownerActorId, unk4, unk5, unk6, unk7) +function onEventStarted(player, actor, eventType, eventName, pushCommand, unk1, unk2, unk3, ownerActorId, unk4, unk5, unk6, unk7) actor = player:GetActorInInstance(ownerActorId); print("TESSSSSSSSSSSSSST"); @@ -17,7 +17,7 @@ function onEventStarted(player, actor, triggerName, pushCommand, unk1, unk2, unk if (actor:GetActorClassId() == 1200052) then player:KickEventSpecial(harvestCommand, 0, "commandJudgeMode", 0, 0, 0, 0, 0x4E26, 0, nil, 0xF, actor, nil, nil, nil, nil); else - --player:kickEvent(actor, "pushCommand", false); + player:kickEvent(actor, "pushCommand", false); end else player:endEvent(); diff --git a/Data/scripts/commands/gm/testmapobj.lua b/Data/scripts/commands/gm/testmapobj.lua index d8f6f2f9..feff9672 100644 --- a/Data/scripts/commands/gm/testmapobj.lua +++ b/Data/scripts/commands/gm/testmapobj.lua @@ -6,17 +6,17 @@ properties = { description = "" } -function onTrigger(player, argc, animation, regionId, layoutId, maxLayoutId) - layoutId = tonumber(layoutId); +function onTrigger(player, argc, animation, layoutId, instanceId, maxInstanceId) + instanceId = tonumber(instanceId); - if (maxLayoutId ~= nil) then - maxLayoutId = tonumber(maxLayoutId); + if (maxInstanceId ~= nil) then + maxInstanceId = tonumber(maxInstanceId); else - maxLayoutId = layoutId; + maxInstanceId = instanceId; end actorClassId = 5900001; - while (layoutId <= maxLayoutId) do + while (instanceId <= maxInstanceId) do if (actorClassId == nil) then player:SendMessage(0x20, "", "No actor class id provided."); return; @@ -32,16 +32,16 @@ function onTrigger(player, argc, animation, regionId, layoutId, maxLayoutId) if (actorClassId ~= nil) then zone = player.CurrentArea; - actor = zone:SpawnActor(actorClassId, "mapobj", pos[1], pos[2], pos[3], tonumber(regionId), tonumber(layoutId)); + actor = zone:SpawnActor(actorClassId, "mapobj", pos[1], pos[2], pos[3], tonumber(layoutId), tonumber(instanceId)); print("test"); - wait(0.8); + wait(2); actor:PlayMapObjAnimation(player, animation); zone:DespawnActor("mapobj"); wait(0.5); - player:SendMessage(0x20, "", "Layout ID: "..layoutId); + player:SendMessage(0x20, "", "Playing animation for instance: " .. instanceId); end - layoutId=layoutId+1; + instanceId = instanceId + 1; end end; --!testmapobj 5900001 421 2810 2820 diff --git a/Data/scripts/directors/OpeningDirector.lua b/Data/scripts/directors/OpeningDirector.lua index e93fd628..131a9c84 100644 --- a/Data/scripts/directors/OpeningDirector.lua +++ b/Data/scripts/directors/OpeningDirector.lua @@ -20,34 +20,4 @@ function onEventStarted(player, actor, eventTrigger, eventName) end function main() -end - -function onTalkEvent(player, npc) - - if (player:HasQuest(110001) == true) then - man0l0Quest = player:GetQuest("man0l0"); - - if (man0l0Quest:GetQuestFlag(MAN0L0_FLAG_MINITUT_DONE1) == true and man0l0Quest:GetQuestFlag(MAN0L0_FLAG_MINITUT_DONE2) == true and man0l0Quest:GetQuestFlag(MAN0L0_FLAG_MINITUT_DONE3) == true) then - doorNpc = GetWorldManager():GetActorInWorldByUniqueId("exit_door"); - player:SetEventStatus(doorNpc, "pushDefault", true, 0x2); - doorNpc:SetQuestGraphic(player, 0x3); - end - elseif (player:HasQuest(110005) == true) then - man0g0Quest = player:GetQuest("man0g0"); - if (man0g0Quest:GetQuestFlag(MAN0L0_FLAG_STARTED_TALK_TUT) == true and man0g0Quest:GetQuestFlag(MAN0G0_FLAG_MINITUT_DONE1) == false) then - papalymo = GetWorldManager():GetActorInWorldByUniqueId("papalymo"); - papalymo:SetQuestGraphic(player, 0x2); - elseif (man0g0Quest:GetQuestFlag(MAN0L0_FLAG_STARTED_TALK_TUT) == true and man0g0Quest:GetQuestFlag(MAN0G0_FLAG_MINITUT_DONE1) == true) then - yda = GetWorldManager():GetActorInWorldByUniqueId("yda"); - yda:SetQuestGraphic(player, 0x2); - end - elseif (player:HasQuest(110009) == true) then - man0u0Quest = player:GetQuest("man0u0"); - if (man0u0Quest:GetQuestFlag(MAN0U0_FLAG_MINITUT_DONE1) == true and man0u0Quest:GetQuestFlag(MAN0U0_FLAG_MINITUT_DONE2) == true and man0u0Quest:GetQuestFlag(MAN0U0_FLAG_MINITUT_DONE3) == true) then - exitTriggerNpc = GetWorldManager():GetActorInWorldByUniqueId("exit_trigger"); - player:SetEventStatus(exitTriggerNpc, "pushDefault", true, 0x2); - exitTriggerNpc:SetQuestGraphic(player, 0x2); - end - end - -end +end \ No newline at end of file diff --git a/Data/scripts/quests/dft/DftFst.lua b/Data/scripts/quests/dft/DftFst.lua index 99d0d965..8880442a 100644 --- a/Data/scripts/quests/dft/DftFst.lua +++ b/Data/scripts/quests/dft/DftFst.lua @@ -13,23 +13,236 @@ Contains all default lines for talkable npcs in the Forest Region (aka Black Shr ]] -- [ActorClassId] = "client_function_name" -local defaultTalkFst = { - [1000821] = "defaultTalkWithNellaure_001", -- Nellaure - [1001081] = "defaultTalkWithKhumamoshroca_001", -- Khuma Moshroca - [1001103] = "defaultTalkWithMestonnaux_001", -- Mestonnaux - [1001396] = "defaultTalkWithLefwyne_001", -- Lefwyne - [1001430] = "defaultTalkWithKinnison_001", -- Kinnison - Two args (nil errors client). If either >= 0, dialog mentions you've met Kan-E-Senna. - [1001437] = "defaultTalkWithSybell_001" -- Sybell - -- [1000458] = "defaultTalkWithInn_Desk" +local defaultTalkFst = { + [1000066] = "defaultTalkWithAlixe_001", -- Alixe (Gridania: LTW Guild) + [1000067] = "defaultTalkWithDadalo_001", -- Dadalo (Gridania: LTW Guild) + [1000068] = "defaultTalkWithKain_001", -- Kain (Gridania: LTW Guild) + [1000069] = "defaultTalkWithJolline_001", -- Jolline (Gridania: LNC Guild) + [1000071] = "defaultTalkWithBertennant_001", -- Bertennant (Gridania: Blue Badger Gate) + [1000074] = "defaultTalkWithOnguen_001", -- Onguen (Gridania: BTN Guild) + [1000230] = "defaultTalkWithMiounne_001", -- Miounne (Gridania: Adv. Guild) + [1000231] = "defaultTalkWithHereward_001", -- Hereward (Gridania: LTW Guild) + [1000236] = "defaultTalkWithOpyltyl_001", -- Opyltyl (Gridania: BTN Guild) + [1000242] = "defaultTalkWithWillelda_001", -- Willelda (Gridania: LNC Guild) defaultTalkWithWillelda_002 - After signing up to the guild? + [1000243] = "defaultTalkWithBurchard_001", -- Burchard (Gridania: LNC Guild) + [1000326] = "defaultTalkWithCicely_001", -- Cicely (Gridania: BTN Guild) + [1000427] = "defaultTalkWithAnene_001", -- Anene (Gridania: Adv. Guild) defaultTalkWithAnene_002 / 003 (PGL informant) + [1000428] = "defaultTalkWithSylbyrt_001", -- Sylbyrt (Gridania: Adv. Guild) defaultTalkWithSylbyrt_002 / 003 (MRD informant) + [1000429] = "defaultTalkWithHongavunga_001", -- Honga Vunga (Gridania: Adv. Guild) defaultTalkWithHongavunga_002 / 003 (WVR informant) + [1000430] = "defaultTalkWithNoncomananco_001", -- Nonco Menanco (Gridania: Adv. Guild) arg1=1 or 21, mentions checking out DoW/M, otherwise DoH. defaultTalkWithNoncomananco_002 / 003 (GSM informant) + [1000431] = "defaultTalkWithLtandhaa_001", -- L'tandhaa (Gridania: Adv. Guild) defaultTalkWithLtandhaa_002 / 003 (ALC informant) + [1000432] = "defaultTalkWithPofufu_001", -- Pofufu (Gridania: Adv. Guild) defaultTalkWithPofufu_002 / 003 (MIN informant) + [1000433] = "defaultTalkWithDrividot_001", -- Drividot (Gridania: Adv. Guild) defaultTalkWithDrividot_002 / 003 (FSH informant) + [1000435] = "defaultTalkWithBasewin_001", -- Basewin (Gridania: Adv. Guild) defaultTalkWithBasewin_002 / 003 (BSM informant) + [1000436] = "defaultTalkWithSeikfrae_001", -- Seikfrae (Gridania: Adv. Guild) defaultTalkWithSeikfrae_002 / 003 (GLD informant) + [1000437] = "defaultTalkWithEdasshym_001", -- E'dasshym (Gridania: Adv. Guild) defaultTalkWithEdasshym_002 / 003 (THM informant) + --[1000456] = "", -- Tierney (Gridania: Adv. Guild) Guildleve NPC - Will not fire, not PplStd. + --[1000457] = "", -- Gontrant (Gridania: Adv. Guild) Guildleve NPC - Will not fire, not PplStd. + [1000458] = "defaultTalkWithInn_Desk", -- V'korolon (Gridania: Adv. Guild) - defaultTalkWithVkorolon_001 - Pre-Inn unlocked dialog + --[1000459] = "", -- Gallia (Gridania: LTW Guild) Guildmark NPC - Will not fire, not PplStd. + --[1000461] = "", -- Kipopo (Gridania: BTN Guild) Guildmark NPC - Will not fire, not PplStd. + --[1000462] = "", -- Clarembald (Gridania: LNC Guild) Guildmark NPC - Will not fire, not PplStd. + [1000463] = "defaultTalkWithNonolato_001", -- Nonolato (Gridania: ARC Guild) + --[1000464] = "", -- Cassandra (Gridania: ARC Guild) Guildmark NPC - Will not fire, not PplStd. + [1000465] = "defaultTalkWithAnaidjaa_001", -- A'naidjaa (Gridania: CRP Guild) + --[1000466] = "", -- Frances (Gridania: CRP Guild) Guildmark NPC - Will not fire, not PplStd. + [1000565] = "defaultTalkWithCeinguled_001", -- Ceinguled (Gridania: LNC Guild) + [1000566] = "defaultTalkWithFrancis_001", -- Francis (Gridania: LNC Guild) arg1=1, npc recognizes you're in the LNC guild + [1000567] = "defaultTalkWithDhemdaeg_001", -- Dhemdaeg (Gridania: LNC Guild) + [1000568] = "defaultTalkWithLuitfrid_001", -- Luitfrid (Gridania: LNC Guild) + [1000569] = "defaultTalkWithHaurtefert_001", -- Haurtefert (Gridania: LNC Guild) + [1000570] = "defaultTalkWithZpahtalo_001", -- Z'pahtalo (Gridania: LNC Guild) + [1000599] = "defaultTalkWithJmoldva_001", -- J'moldva (Gridania: LNC Guild) + [1000621] = "defaultTalkWithHabreham_001", -- Habreham (Gridania: CRP Guild) + [1000622] = "defaultTalkWithDecima_001", -- Decima (Gridania: CRP Guild) + [1000623] = "defaultTalkWithChalyotamlyo_001", -- Chalyo Tamlyo (Gridania: CRP Guild) + [1000625] = "defaultTalkWithBubuku_001", -- Bubuku (Gridania: ARC Guild) + [1000626] = "defaultTalkWithPiers_001", -- Piers (Gridania: ARC Guild) + [1000627] = "defaultTalkWithAerstsyn_001", -- Aerstsyn (Gridania: LNC Guild) + [1000629] = "defaultTalkWithEburhart_001", -- Eburhart (Gridania: BTN Guild) + [1000630] = "defaultTalkWithNoes_001", -- Noes (Gridania: Apkallus Falls) + [1000671] = "defaultTalkWithMiraudont_001", -- Miraudont (North Shroud: Camp Emerald Moss) arg1=true - Mentions Atomos + [1000681] = "defaultTalkWithNuala_001", -- Nuala (Gridania: LNC Guild) + [1000701] = "defaultTalkWithZuzupoja_001", -- Zuzupoja (Gridania: CRP Guild) + [1000821] = "defaultTalkWithNellaure_001", -- Nellaure (Gridania: CRP Guild) + [1000822] = "defaultTalkWithCaplan_001", -- Caplan (Gridania: CRP Guild) + [1000823] = "defaultTalkWithUlmhylt_001", -- Ulmhylt (Gridania: CRP Guild) + [1000829] = "defaultTalkWithOdhinek_001", -- O'dhinek (Gridania: ARC Guild) + [1000830] = "defaultTalkWithGeorjeaux_001", -- Georjeaux (Gridania: ARC Guild) defaultTalkWithGeorjeaux_002 - Dialog when you're part of the guild? + [1000831] = "defaultTalkWithAlaire_001", -- Alaire (Gridania: ARC Guild) + [1000832] = "defaultTalkWithMianne_001", -- Mianne (Gridania: ARC Guild) + [1000951] = "defaultTalkWithLonsygg_001", -- Lonsygg (Gridania: Blue Badger Gate) + [1001077] = "defaultTalkWithBeli_001", -- Beli (Gridania: LTW Guild) + [1001078] = "defaultTalkWithMaddeline_001", -- Maddeline (Gridania: LTW Guild) + [1001079] = "defaultTalkWithDyrstbrod_001", -- Dyrstbrod (Gridania: LTW Guild) + [1001080] = "defaultTalkWithTatagoi_001", -- Tatagoi (Gridania: LTW Guild) + [1001081] = "defaultTalkWithKhumamoshroca_001", -- Khuma Moshroca (Gridania: LTW Guild) + [1001082] = "defaultTalkWithLuilda_001", -- Luilda (Gridania: LTW Guild) + [1001101] = "defaultTalkWithVnabyano_001", -- V'nabyano (Gridania: BTN Guild) + [1001102] = "defaultTalkWithSandre_001", -- Sandre (Gridania: BTN Guild) + [1001103] = "defaultTalkWithMestonnaux_001", -- Mestonnaux (Gridania: BTN Guild) + [1001175] = "defaultTalkWithChloe_001", -- Chloe (Gridania: ARC Guild) + --[1001183] = "", -- Emoni (Gridania: Adv. Guild) Linkshell NPC - Will not fire, not PplStd. + --[1001184] = "", -- Gyles (Gridania: Adv. Guild) Retainer NPC - Will not fire, not PplStd. + [1001188] = "defaultTalkWithGuildleveClientG_001", -- Maisenta (Gridania) + [1001189] = "defaultTalkWithGuildleveClientG_002", -- Pukiki (Gridania) + [1001396] = "defaultTalkWithLefwyne_001", -- Lefwyne (Gridania: Shaded Bower) + [1001430] = "defaultTalkWithKinnison_001", -- Kinnison - Two args (nil errors client). If either >= 0, dialog mentions you've met Kan-E-Senna. Position inaccurate? + [1001431] = "defaultTalkWithGenna_001", -- Genna (Gridania: Mih Khetto's Amphitheatre) + [1001432] = "defaultTalkWithMathye_001", -- Mathye (Gridania: Blue Badger Gate) + [1001433] = "defaultTalkWithUlta_001", -- Ulta (Gridania: Blue Badger Gate) + [1000434] = "defaultTalkWithOdilie_001", -- Odilie (Gridania: Adv. Guild) defaultTalkWithOdilie_002 / 003 (CUL informant) + [1001436] = "defaultTalkWithOwyne_001", -- Owyne (Gridania: Aetheryte Plaza) + [1001437] = "defaultTalkWithSybell_001", -- Sybell (Gridania: Aetheryte Plaza) + [1001459] = "defaultTalkWithFlavielle_001", -- Flavielle (Gridania: Adv. Guild) defaultTalkWithFlavielle_002 / 003 (ARM informant) + [1001469] = "downTownTalk", -- Eldid (Gridania: Wards Entrance) + [1001582] = "defaultTalkWithSwaenhylt_001", -- Swaenhylt (Gridania) + [1001583] = "defaultTalkWithMarcette_001", -- Marcette (Gridania: The Knot) + [1001470] = "defaultTalkWithYlessa_001", -- Ylessa + [1001706] = "defaultTalkWithMemama_001", -- Memama (Gridania: Adv. Guild) + [1001707] = "defaultTalkWithPfarahr_001", -- Pfarahr (Gridania: Adv. Guild) + [1001708] = "defaultTalkWithBeaudonet_001", -- Beaudonet (Gridania: Adv. Guild) + [1001709] = "defaultTalkWithFryswyde_001", -- Fryswyde (Gridania: Adv. Guild) + [1001710] = "defaultTalkWithWillielmus_001", -- Willielmus (Gridania: Adv. Guild) + [1001806] = "defaultTalkEnie_001", -- Enie (Gridania: BTN Guild) + [1001951] = "defaultTalkWithAnselm_001", -- Anselm (Gridania: Adv. Guild) + --[1002090] = "", -- Serpent Private Hodder (Gridania: Adv. Guild) - Will not fire, not PplStd. + --[1002091] = "", -- Serpent Private Daurement (Gridania: Adv. Guild) - Will not fire, not PplStd. + [1002106] = "processEventELNAURE", -- Serpent Lieutenant Marette (Gridania: The Knot) - Foundation Day 2012 - Spl000 staticactor + [1002107] = "processEventARISMONT", -- Serpent Sergeant Frilaix (Gridania: The Knot) - Foundation Day 2012 - Spl000 staticactor + [1002108] = "processEventMERLIE", -- Serpent Private Tristelle (Gridania: The Knot) - Foundation Day 2012 - Spl000 staticactor + --[1060022] = "", -- Louisoix (Gridania: Apkallus Falls) - Will not fire, not PplStd. + [1500055] = "defaultTalkWithLionnellais_001", -- Lionnellais (Gridania: Adv. Guild) - Will not fire, not PplStd. Pre-airship dialog? + [1500056] = "defaultTalkWithHida_001", -- Hida (Gridania: Adv. Guild) - Will not fire, not PplStd. Pre-airship dialog? + --[1500061] = "", -- Fruhdhem (Gridania) Chocobo Taxi - Will not fire, not PplStd. + [1500127] = "tribeTalk", -- Prosperlain (Gridania) + --[1500294] = "", -- Gagaroon (Gridania: Rosewood Stalls) Black Market - Will not fire, not PplStd. + [1700001] = "defaultTalkWithPenelope_001", -- Penelope (Gridania: Adv. Guild) + [1700038] = "defaultTalkWithAUBRENARD_100", -- Aubrenard (Gridania: Shaded Bower) } +--[[ TO:DO - Map the remainder of these + +defaultTalkWithStewart_001 -- Hodder line according to old script? +defaultTalkWithPowle_001 +defaultTalkWithSansa_001 +defaultTalkWithNicoliaux_001 +defaultTalkWithAunillie_001 +defaultTalkWithElyn_001 +defaultTalkWithRyd_001 +defaultTalkWithSolieine_001 +defaultTalkWithHetzkin_001 +defaultTalkWithTelent_001 +defaultTalkWithKhujazhwan_001 +defaultTalkWithZerig_001 +defaultTalkWithYonariumnari_001 +defaultTalkWithGugula_001 +defaultTalkWithRdjongo_001 +defaultTalkWithAstrelle_001 +defaultTalkWithBiddy_001 +defaultTalkWithConcessa_001 +defaultTalkWithMaroile_001 +defaultTalkWithKinborow_001 +defaultTalkWithTnbulea_001 +defaultTalkWithFoforyo_001 +defaultTalkWithFhrudhem_001 +defaultTalkWithMitainie_001 +defaultTalkWithNicia_001 +defaultTalkWithBlandie_001 +defaultTalkWithLivith_001 +defaultTalkWithProscen_001 +defaultTalkWithTanguistl_001 +defaultTalkWithComoere_001 +defaultTalkWithLougblaet_001 +defaultTalkWithFamushidumushi_001 +defaultTalkWithDrystan_001 +defaultTalkWithEadbert_001 +defaultTalkWithWybir_001 +defaultTalkWithKeketo_001 +defaultTalkWithRadianttear_001 +defaultTalkWithMyles_001 +defaultTalkWithNathaniel_001 +defaultTalkWithEvrardoux_001 +defaultTalkWithTsehpanipahr_001 +defaultTalkWithEthelinda_001 +defaultTalkWithHedheue_001 +defaultTalkWithJajajbygo_001 arg1 arg2 +defaultTalkWithPepeli_001 arg1 +defaultTalkWithBidelia_001 +defaultTalkWithRimomo_001 +defaultTalkWithDadaneja_001 +defaultTalkWithIolaine_001 +defaultTalkWithBloisirant_001 +defaultTalkWithGylbart_001 +defaultTalkWithHonoroit_001 +defaultTalkWithGuildleveClientG_003 +defQuest1g0_Bush +defQuest1g1_Bush +defaultTalkWithChamberliaux_001 +defaultTalkWithFraemhar_001 +defaultTalkWithXbhowaqi_001 +defaultTalkWithLora_001 +defaultTalkWithWawaramu_001 +defaultTalkWithArnott_001 +defaultTalkWithLhomujuuk_001 +defaultTalkWithSholnoralno_001 +defaultTalkWithTuatkk_001 +defaultTalkWithAruhnsenna_001 +defaultTalkWithMoogle010_001 +defaultTalkWithMoogle002_001 +defaultTalkWithAilith_001 +defaultTalkWithQZamqo_001 +defaultTalkLouisoix_001 +defaultTalkWithRonanKognan_001 +defaultTalkWithRonanKognan_002 arg1 arg2 +defaultTalkWithRonanKognan_Hint_00 arg1 +defaultTalkWithRonanKognan_Hint_01 arg1 +defaultTalkWithRonanKognan_Hint_02 arg1 +defaultTalkWithRonanKognan_Hint_03 arg1 +defaultTalkWithRonanKognan_Hint_04 arg1 +defaultTalkWithVorsaile_001 arg1 +defaultTalkCaravanChocoboGri_001 +bookTalk +talkIdayCap +talkIday1 +talkIday2 +defaultTalkWithPukwapika_001 +defaultTalkWithPurumoogle_001 +defaultTalkWithPirimoogle_001 +defaultTalkWithPukumoogle_001 +defaultTalkWithJehantel_001 +defaultTalkWithJehantel_002 +defaultTalkWithPukno_001 +defaultTalkWithPukno_002 +defaultTalkWithRayao_001 +defaultTalkWithRayao_002 +defaultTalkWithMoogleA_001 +defaultTalkWithMoogleA_002 +defaultTalkWithMppgleB_001 +defaultTalkWithMppgleB_002 +defaultTalkWithStewart_001 +defaultTalkWithStewart_002 +defaultTalkWithTrisselle_001 +defaultTalkWithTrisselle_002 +defaultTalkWithInn_Desk +defaultTalkWithInn_ExitDoor +defaultTalkWithExit01 +defaultTalkWithLegendBsm_001 arg1 +defaultTalkWithMarketNpc +defaultTalkWithHamletGuardGri_001 +--]] + function onTalk(player, quest, npc, eventName) local npcId = npc:GetActorClassId(); local clientFunc = defaultTalkFst[npcId]; - if (npcId == 1001430) then -- Kinnison + if (npcId == 1000430) then -- Nonco Menanco + callClientFunction(player, "delegateEvent", player, quest, clientFunc, 21); + elseif (npcId == 1001430) then -- Kinnison callClientFunction(player, "delegateEvent", player, quest, clientFunc, -1,-1); + elseif ((npcId >= 1002106) and (npcId <= 1002108)) then -- Foundation Day 2012 NPCs + talkWithSpecial(player, npcId, clientFunc) else callClientFunction(player, "delegateEvent", player, quest, clientFunc); end @@ -39,4 +252,11 @@ end function IsQuestENPC(player, quest, npc) return defaultTalkFst[npc:GetActorClassId()] ~= nil; -end \ No newline at end of file +end + + +function talkWithSpecial(player, npcId, clientFunc) + local splQuest = GetStaticActor("Spl000"); + local magickedPrism = 0; + callClientFunction(player, "delegateEvent", player, splQuest, clientFunc, magickedPrism); +end diff --git a/Data/scripts/quests/man/man0g0.lua b/Data/scripts/quests/man/man0g0.lua index 833c8ec4..84f44ebc 100644 --- a/Data/scripts/quests/man/man0g0.lua +++ b/Data/scripts/quests/man/man0g0.lua @@ -1,3 +1,270 @@ ---Quest Flags -MAN0L0_FLAG_STARTED_TALK_TUT = 0; -MAN0G0_FLAG_MINITUT_DONE1 = 1; +require("global"); + +--[[ + +Quest Script + +Name: Sundered Skies +Code: Man0g0 +Id: 110005 +Prereq: None (Given on chara creation) +Notes: + +Using PrivateAreaMasterPast Type 1 +]] + +-- Sequence Numbers +SEQ_000 = 0; -- Intro with Yda & Papalymo +SEQ_005 = 5; -- Combat tutorial +SEQ_010 = 10; -- Gridania section + +-- Actor Class Ids +YDA = 1000009; +PAPALYMO = 1000010; + +FARRIMOND = 1000017; +CECILIA = 1000683; +SWETHYNA = 1000680; +TKEBBE = 1000876; +LONSYGG = 1000951; +PUSH_ADV_GUILD = 1099046; +BLOCKER1 = 1099047; + +-- Non-interactive NPCs +GUILD_ANENE = 1000427; +GUILD_SYLBERT = 1000428; -- No source +GUILD_HONGA_VUNGA = 1000429; +GUILD_NONCO_MENANCO = 1000430; +GUILD_LTANDHAA = 1000431; +GUILD_POFUFU = 1000432; +GUILD_ODILIE = 1000434; -- No source +GUILD_BASEWIN = 1000435; -- No source +GUILD_SEIKFRAE = 1000436; -- No source +GUILD_EDASSHYM = 1000437; +GUILD_TIERNEY = 1000456; +GUILD_GONTRANT = 1000457; +GUILD_VKOROLON = 1000458; +GUILD_EMONI = 1001183; +GUILD_GYLES = 1001184; +GUILD_PENELOPE = 1700001; -- No source + +-- Quest Markers +MRKR_LONSYGG = 11000501; -- Obsolete. Pre-1.19 location for this npc +MRKR_YDA = 11000502; +MRKR_PAPALYMO = 11000503; +MRKR_GUILD = 11000504; + +-- Quest Flags +FLAG_SEQ000_MINITUT0 = 0; -- Talked to Yda. +FLAG_SEQ000_MINITUT1 = 1; -- Talked to Papalymo. +FLAG_SEQ000_MINITUT2 = 2; -- Talked to Yda again. +FLAG_SEQ010_TKEBBE = 0; -- Talked to T'kebbe (optional) + +--[[ +processEvent000_0 +processEvent000_1 +processEvent000_2 +processEvent000_3 +processEvent000_4 +processEvent010_1 +processEvent020_1 +processEvent020_2 +processEvent020_3 +processEvent020_4 +processEvent020_5 +processEvent020_6 +processTtrNomal001withHQ -- Intro CS +processTtrNomal001 +processTtrNomal002(arg1) +processTtrNomal003(arg1) +processTtrMini001 -- Unused +processTtrMini002 -- Unused +processTtrMini003 +processTtrAfterBtl001 +processTtrBtl001(arg1) +processTtrBtlMagic001(arg1) +processTtrBtl002(arg1) +processTtrBtl003 +processTtrBlkNml001 - Aims at 1600102 Lonsygg +processTtrBlkNml002 +processTtrBtl004 +processInformDialogAsQuest +--]] + +function onStart(player, quest) + quest:StartSequence(SEQ_000); +end + +function onFinish(player, quest) +end + +function onStateChange(player, quest, sequence) + if (sequence == SEQ_000) then + -- Setup states incase we loaded in. + local data = quest:GetData(); + + local ydaCanPush = (not data:GetFlag(FLAG_SEQ000_MINITUT0)); + local ydaFlag = QFLAG_PLATE; + + if (not data:GetFlag(FLAG_SEQ000_MINITUT0)) or (data:GetFlag(FLAG_SEQ000_MINITUT1)) then + ydaFlag = QFLAG_PLATE; + else + ydaFlag = QFLAG_NONE; + end + + local papalymoFlag = ((not data:GetFlag(FLAG_SEQ000_MINITUT1)) and data:GetFlag(FLAG_SEQ000_MINITUT0) and QFLAG_PLATE or QFLAG_NONE); + + --SetENpc(classId, byte flagType=0,isTalkEnabled, isPushEnabled, isEmoteEnabled, isSpawned) + quest:SetENpc(YDA, ydaFlag, true, ydaCanPush); + quest:SetENpc(PAPALYMO, papalymoFlag); + + + elseif (sequence == SEQ_010) then + local data = quest:GetData(); + + local tkebbeTalk = (not data:GetFlag(FLAG_SEQ010_TKEBBE) and QFLAG_PLATE or QFLAG_NONE); + + quest:SetENpc(FARRIMOND); + quest:SetENpc(CECILIA); + quest:SetENpc(SWETHYNA); + quest:SetENpc(TKEBBE, tkebbeTalk); + quest:SetENpc(LONSYGG); + quest:SetENpc(BLOCKER1, QFLAG_NONE, false, true); + quest:setENpc(GUILD_ENTRANCE, QFLAG_MAP, false, true); + + + + end +end + +function onTalk(player, quest, npc) + local sequence = quest:getSequence(); + local classId = npc:GetActorClassId(); + + if (sequence == SEQ_000) then + seq000_onTalk(player, quest, npc, classId); + elseif (sequence == SEQ_010) then + seq010_onTalk(player, quest, npc, classId); + end + quest:UpdateENPCs(); +end + +function onPush(player, quest, npc) + local sequence = quest:getSequence(); + local classId = npc:GetActorClassId(); + local data = quest:GetData(); + + if (sequence == SEQ_000) then + if (classId == YDA) then + callClientFunction(player, "delegateEvent", player, quest, "processTtrNomal002"); + player:EndEvent(); + end + elseif (sequence == SEQ_010) then + if (classId == BLOCKER1) then + callClientFunction(player, "delegateEvent", player, quest, "processTtrBlkNml001"); + GetWorldManager():DoPlayerMoveInZone(player, 109.966, 7.559, -1206.117, -2.7916, 0x11) + player:EndEvent(); + elseif (classId == GUILD_ENTRANCE) then + player:ReplaceQuest(quest, "Man0g1") + return; + end + end + quest:UpdateENPCs(); +end + +function onNotice(player, quest, target) + callClientFunction(player, "delegateEvent", player, quest, "processTtrNomal001withHQ"); + + --callClientFunction(player, "delegateEvent", player, quest, "processTtrNomal001"); -- On relog pre-combat + --callClientFunction(player, "delegateEvent", player, quest, "processTtrAfterBtl001"); -- On relog post-combat + player:EndEvent(); + quest:UpdateENPCs(); +end + +function seq000_onTalk(player, quest, npc, classId) + local data = quest:GetData(); + if (classId == YDA) then + + if (not data:GetFlag(FLAG_SEQ000_MINITUT0)) then -- If Talk tutorial + callClientFunction(player, "delegateEvent", player, quest, "processTtrNomal003"); + data:SetFlag(FLAG_SEQ000_MINITUT0); -- Disable Yda's PushEvent and set up Papalymo + elseif (data:GetFlag(FLAG_SEQ000_MINITUT1)) then -- If Talked to after Papaylmo + doContentArea(player, quest, npc); -- Set up Combat Tutorial + else + callClientFunction(player, "delegateEvent", player, quest, "processEvent000_3"); + end + + elseif (classId == PAPALYMO) then + if (data:GetFlag(FLAG_SEQ000_MINITUT0)) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent000_2"); + data:SetFlag(FLAG_SEQ000_MINITUT1); + else + callClientFunction(player, "delegateEvent", player, quest, "processEvent000_2"); + end + end + + player:EndEvent(); +end + +function seq010_onTalk(player, quest, npc, classId) + local data = quest:GetData(); + + if (classId == SWETHYNA) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent020_2"); + elseif (classId == CECILIA) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent020_3"); + elseif (classId == FARRIMOND) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent020_4"); + elseif (classId == TKEBBE) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent020_5"); + data:SetFlag(FLAG_SEQ010_TKEBBE); + elseif (classId == LONSYGG) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent020_6"); + end + + player:EndEvent(); +end + +function getJournalMapMarkerList(player, quest) + local sequence = quest:getSequence(); + local possibleMarkers = {}; + local data = quest:GetData(); + + if (sequence == SEQ_000) then + + if (not data:GetFlag(FLAG_SEQ000_MINITUT0)) or (data:GetFlag(FLAG_SEQ000_MINITUT1)) then + table.insert(possibleMarkers, MRKR_YDA); + end + + if (data:GetFlag(FLAG_SEQ000_MINITUT0)) and (not data:GetFlag(FLAG_SEQ000_MINITUT1)) then + table.insert(possibleMarkers, MRKR_PAPALYMO); + end + + elseif (sequence == SEQ_010) then + table.insert(possibleMarkers, MRKR_GUILD); + end + + return unpack(possibleMarkers) +end + +function doContentArea(player, quest, npc) + quest:GetData():ClearData(); + quest:StartSequence(SEQ_005); + contentArea = player.CurrentArea:CreateContentArea(player, "/Area/PrivateArea/Content/PrivateAreaMasterSimpleContent", "man0g01", "SimpleContent30010", "Quest/QuestDirectorMan0g001"); + + if (contentArea == nil) then + return; + end + + director = contentArea:GetContentDirector(); + player:AddDirector(director); + director:StartDirector(false); + + player:KickEvent(director, "noticeEvent", true); + player:SetLoginDirector(director); + + GetWorldManager():DoZoneChangeContent(player, contentArea, 362.4087, 4, -703.8168, 1.5419, 16); + return; +end + + diff --git a/Data/scripts/quests/man/man0g1.lua b/Data/scripts/quests/man/man0g1.lua new file mode 100644 index 00000000..eeb5c0e4 --- /dev/null +++ b/Data/scripts/quests/man/man0g1.lua @@ -0,0 +1,196 @@ +require("global"); +require("tutorial"); +--[[ + +Quest Script + +Name: Souls Gone Wild +Code: Man0g1 +Id: 110006 +Prereq: Sundered Skies (Man0g0 - 110005) +Notes: + + + +]] + + +-- Sequence Numbers +SEQ_000 = 0; +SEQ_003 = 3; + + +-- Actor Class Ids +MIOUNNE = 1000230; +VKOROLON = 1000458; +WISPILY_WHISKERED_WOODWORKER = 1000562; +AMIABLE_ADVENTURER = 1001057; +MOROSE_MERCHANT = 1001058; +NARROW_EYED_ADVENTURER = 1001059; +BEAMING_ADVENTURER = 1001062; +WELL_BUNDLED_ADVENTURER = 1001060; +UNCONCERNED_PASSERBY = 1001648; +--BLOCKER = ; + +-- Quest Markers +MRKR_MIOUNNE = 11000601; + +-- Quest Items +ITEM_VELODYNA_COSMOS = 0; -- Seq_000 : 2nd journal arg. >=5 doesn't have. + + +-- Quest Flags +FLAG_SEQ000 = 0; + +function onStart(player, quest) + quest:StartSequence(SEQ_000); + + -- Immediately move to the Adventurer's Guild private area + callClientFunction(player, "delegateEvent", player, quest, "processEvent100"); + GetWorldManager():DoZoneChange(player, 155, "PrivateAreaMasterPast", 2, 15, 67.034, 4, -1205.6497, -1.074); + player:endEvent(); +end + +function onFinish(player, quest) +end + +function onStateChange(player, quest, sequence) + + if (sequence == SEQ_000) then + -- Setup states incase we loaded in. + + --SetENpc(classId, byte flagType=0,isTalkEnabled, isPushEnabled, isEmoteEnabled, isSpawned) + quest:SetENpc(MIOUNNE, QFLAG_PLATE); + -- quest:SetENpc(VKOROLON); + quest:SetENpc(WISPILY_WHISKERED_WOODWORKER); + quest:SetENpc(AMIABLE_ADVENTURER); + quest:SetENpc(MOROSE_MERCHANT); + quest:SetENpc(NARROW_EYED_ADVENTURER); + quest:SetENpc(BEAMING_ADVENTURER); + quest:SetENpc(WELL_BUNDLED_ADVENTURER); + quest:SetENpc(UNCONCERNED_PASSERBY); + + elseif (sequence == SEQ_005) then + quest:SetENpc(MIOUNNE); + end +end + +function onTalk(player, quest, npc) + local sequence = quest:getSequence(); + local classId = npc:GetActorClassId(); + + --if (sequence == SEQ_000) then + seq000_onTalk(player, quest, npc, classId); + -- elseif (sequence == SEQ_005) then + -- seq005_onTalk(player, quest, npc, classId); + -- end + quest:UpdateENPCs(); +end + +function onPush(player, quest, npc) + + local sequence = quest:getSequence(); + local classId = npc:GetActorClassId(); + player:SendMessage(0x20, "", "Sequence: "..sequence.." Class Id: "..classId); + if (sequence == SEQ_000) then + + elseif (sequence == SEQ_010) then + + end + quest:UpdateENPCs(); +end + + +function onNotice(player, quest, target) + player:EndEvent(); + player:SendMessage(0x20, "", "Test"); + callClientFunction(player, "delegateEvent", player, quest, "processEventTu_001"); + player:EndEvent(); +end + + +-- Copy-pasted from man0l1 for now, fix later +function onNpcLS(player, quest, npcLSId) + local sequence = quest:getSequence(); + + if (npcLSId == 1) then + player:SetNpcLS(1, 1); + player:SendGameMessageLocalizedDisplayName(quest, 330, 39, 1300018, nil); + showTutorialSuccessWidget(player, 9080); + wait(3); + closeTutorialWidget(player); + endTutorialMode(player); + + end +end + + + +function seq000_onTalk(player, quest, npc, classId) + + if (classId == MIOUNNE) then + + callClientFunction(player, "delegateEvent", player, quest, "processEvent100_1"); + player:EndEvent(); + quest:StartSequence(SEQ_003); + + + local director = GetWorldManager():GetArea(155):CreateDirector("AfterQuestWarpDirector", false); + director:StartDirector(true); + player:AddDirector(director); + --player:SetLoginDirector(director); + player:KickEvent(director, "noticeEvent", true); + + quest:UpdateENPCs(); + --GetWorldManager():WarpToPublicArea(player); + GetWorldManager():DoZoneChange(player, 155, nil, 0, 15, player.positionX, player.positionY, player.positionZ, player.rotation); + + elseif (classId == BEAMING_ADVENTURER) then + callClientFunction (player, "delegateEvent", player, quest, "processEvent100_6"); + elseif (classId == AMIABLE_ADVENTURER) then + callClientFunction (player, "delegateEvent", player, quest, "processEvent100_3"); + elseif (classId == MOROSE_MERCHANT) then + callClientFunction (player, "delegateEvent", player, quest, "processEvent100_2"); + elseif (classId == NARROW_EYED_ADVENTURER) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent100_7"); + elseif (classId == UNCONCERNED_PASSERBY) then + callClientFunction(player, "delegateEvent", player, quest, "processTtrBlkNml001"); --"processEvent100_9"); + elseif (classId == VKOROLON) then + callClientFunction(player, "delegateEvent", player, GetStaticActor("DftWil"), "defaultTalkWithVkorolon_001"); + elseif (classId == WELL_BUNDLED_ADVENTURER) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent100_4"); + elseif (classId == WISPILY_WHISKERED_WOODWORKER) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent100_8"); + end + + player:EndEvent(); +end + +function seq005_onTalk(player, quest, npc, classId) + if (classId == MOMODI) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent010_2"); + end + + player:EndEvent(); +end + + +function getJournalInformation(player, quest) + return 0, ITEM_VELODYNA_COSMOS, ITEM_COLISEUM_PASS; +end + + +function getJournalMapMarkerList(player, quest) + local sequence = quest:getSequence(); + local possibleMarkers = {}; + + if (sequence == SEQ_000) then + table.insert(possibleMarkers, MRKR_MIOUNNE); + elseif (sequence == SEQ_010) then + + end + + return unpack(possibleMarkers) +end + + diff --git a/Data/scripts/quests/man/man0u0.lua b/Data/scripts/quests/man/man0u0.lua index 4eab0227..a7eb9cb1 100644 --- a/Data/scripts/quests/man/man0u0.lua +++ b/Data/scripts/quests/man/man0u0.lua @@ -104,15 +104,16 @@ function onFinish(player, quest) end function onStateChange(player, quest, sequence) + local data = quest:GetData(); if (sequence == SEQ_000) then -- Setup states incase we loaded in. - local asciliaCanPush = not quest:GetFlag(FLAG_SEQ000_MINITUT0); - local asciliaFlag = quest:GetFlag(FLAG_SEQ000_MINITUT1) and QFLAG_NONE or QFLAG_PLATE; - local fretfulfarmhandFlag = quest:GetFlag(FLAG_SEQ000_MINITUT2) and QFLAG_NONE or QFLAG_PLATE; - local gildiggingmistressFlag = quest:GetFlag(FLAG_SEQ000_MINITUT3) and QFLAG_NONE or QFLAG_PLATE; + local asciliaCanPush = not data:GetFlag(FLAG_SEQ000_MINITUT0); + local asciliaFlag = data:GetFlag(FLAG_SEQ000_MINITUT1) and QFLAG_NONE or QFLAG_PLATE; + local fretfulfarmhandFlag = data:GetFlag(FLAG_SEQ000_MINITUT2) and QFLAG_NONE or QFLAG_PLATE; + local gildiggingmistressFlag = data:GetFlag(FLAG_SEQ000_MINITUT3) and QFLAG_NONE or QFLAG_PLATE; - local exitFlag = quest:GetFlags() == 0xF and QFLAG_MAP or QFLAG_NONE; + local exitFlag = data:GetFlags() == 0xF and QFLAG_MAP or QFLAG_NONE; if (asciliaCanPush) then fretfulfarmhandFlag = QFLAG_NONE; @@ -135,7 +136,7 @@ function onStateChange(player, quest, sequence) quest:SetENpc(OPENING_STOPER_ULDAH, QFLAG_NONE, false, false, true); elseif (sequence == SEQ_010) then - local yayatokiFlag = quest:GetFlag(FLAG_SEQ010_TALK0) and QFLAG_NONE or QFLAG_PLATE; + local yayatokiFlag = data:GetFlag(FLAG_SEQ010_TALK0) and QFLAG_NONE or QFLAG_PLATE; local uldahopeningexitFlag = QFLAG_MAP; quest:SetENpc(KEEN_EYED_MERCHANT); quest:SetENpc(HIGH_SPIRITED_FELLOW); @@ -163,16 +164,16 @@ function onTalk(player, quest, npc) end function onPush(player, quest, npc) - local sequence = quest:getSequence(); local classId = npc:GetActorClassId(); + local data = quest:GetData(); if (sequence == SEQ_000) then if (classId == ASCILIA) then callClientFunction(player, "delegateEvent", player, quest, "processTtrNomal002"); player:EndEvent(); elseif (classId == EXIT_TRIGGER) then - if (quest:GetFlags() == 0xF) then + if (data:GetFlags() == 0xF) then doExitTrigger(player, quest, npc); return; else @@ -208,29 +209,29 @@ function onNotice(player, quest, target) end function seq000_onTalk(player, quest, npc, classId) + local data = quest:GetData(); if (classId == ASCILIA) then - - if (not quest:GetFlag(FLAG_SEQ000_MINITUT0)) then -- If Talk tutorial + if (not data:GetFlag(FLAG_SEQ000_MINITUT0)) then -- If Talk tutorial callClientFunction(player, "delegateEvent", player, quest, "processTtrNomal003"); - quest:SetFlag(FLAG_SEQ000_MINITUT0); -- Used to disable her PushEvent / Allow for her next TalkEvent + quest:GetData():SetFlag(FLAG_SEQ000_MINITUT0); -- Used to disable her PushEvent / Allow for her next TalkEvent else callClientFunction(player, "delegateEvent", player, quest, "processTtrMini001"); - quest:SetFlag(FLAG_SEQ000_MINITUT1); -- Ascilia has now been talked to. + quest:GetData():SetFlag(FLAG_SEQ000_MINITUT1); -- Ascilia has now been talked to. end elseif (classId == FRETFUL_FARMHAND) then - if (not quest:GetFlag(FLAG_SEQ000_MINITUT2)) then + if (not data:GetFlag(FLAG_SEQ000_MINITUT2)) then callClientFunction(player, "delegateEvent", player, quest, "processTtrMini002_first"); - quest:SetFlag(FLAG_SEQ000_MINITUT2); + data:SetFlag(FLAG_SEQ000_MINITUT2); else callClientFunction(player, "delegateEvent", player, quest, "processTtrMini002"); end elseif (classId == GIL_DIGGING_MISTRESS) then - if (not quest:GetFlag(FLAG_SEQ000_MINITUT3)) then + if (not data:GetFlag(FLAG_SEQ000_MINITUT3)) then callClientFunction(player, "delegateEvent", player, quest, "processTtrMini003_first"); - quest:SetFlag(FLAG_SEQ000_MINITUT3); + data:SetFlag(FLAG_SEQ000_MINITUT3); else callClientFunction(player, "delegateEvent", player, quest, "processTtrMini003"); end @@ -257,7 +258,6 @@ function seq000_onTalk(player, quest, npc, classId) end function seq010_onTalk(player, quest, npc, classId) - if (classId == KEEN_EYED_MERCHANT) then callClientFunction(player, "delegateEvent", player, quest, "processEvent020_2"); elseif (classId == HIGH_SPIRITED_FELLOW) then @@ -273,9 +273,9 @@ function seq010_onTalk(player, quest, npc, classId) elseif (classId == FULL_LIPPED_FILLE) then callClientFunction(player, "delegateEvent", player, quest, "processEtc002"); elseif (classId == YAYATOKI) then - if (not quest:GetFlag(FLAG_SEQ010_TALK0)) then + if (not quest:GetData():GetFlag(FLAG_SEQ010_TALK0)) then callClientFunction(player, "delegateEvent", player, quest, "processEvent020_8"); - quest:SetFlag(FLAG_SEQ010_TALK0); + quest:GetData():SetFlag(FLAG_SEQ010_TALK0); else callClientFunction(player, "delegateEvent", player, quest, "processEvent020_8"); end @@ -286,17 +286,18 @@ end function getJournalMapMarkerList(player, quest) local sequence = quest:getSequence(); + local data = quest:GetData(); local possibleMarkers = {}; if (sequence == SEQ_000) then - if (quest:GetFlag(FLAG_SEQ000_MINITUT0)) then - if (not quest:GetFlag(FLAG_SEQ000_MINITUT1)) then table.insert(possibleMarkers, MRKR_ASCILIA); end - if (not quest:GetFlag(FLAG_SEQ000_MINITUT2)) then table.insert(possibleMarkers, MRKR_FRETFUL_FARMHAND); end - if (not quest:GetFlag(FLAG_SEQ000_MINITUT3)) then table.insert(possibleMarkers, MRKR_GIL_DIGGING_MISTRESS); end + if (data:GetFlag(FLAG_SEQ000_MINITUT0)) then + if (not data:GetFlag(FLAG_SEQ000_MINITUT1)) then table.insert(possibleMarkers, MRKR_ASCILIA); end + if (not data:GetFlag(FLAG_SEQ000_MINITUT2)) then table.insert(possibleMarkers, MRKR_FRETFUL_FARMHAND); end + if (not data:GetFlag(FLAG_SEQ000_MINITUT3)) then table.insert(possibleMarkers, MRKR_GIL_DIGGING_MISTRESS); end end elseif (sequence == SEQ_010) then - if (not quest:GetFlag(FLAG_SEQ010_TALK0)) then + if (not data:GetFlag(FLAG_SEQ010_TALK0)) then table.insert(possibleMarkers, MRKR_YAYATOKI) end table.insert(possibleMarkers, MRKR_ADV_GUILD); @@ -308,8 +309,8 @@ end -function doExitTrigger(player, quest, npc) - quest:ClearData(); +function doExitTrigger(player, quest, npc) + quest:GetData():ClearData(); quest:StartSequence(SEQ_005); contentArea = player.CurrentArea:CreateContentArea(player, "/Area/PrivateArea/Content/PrivateAreaMasterSimpleContent", "man0u01", "SimpleContent30079", "Quest/QuestDirectorMan0u001"); diff --git a/Data/scripts/quests/man/man0u1.lua b/Data/scripts/quests/man/man0u1.lua index 6fc8a6ad..efa2f7aa 100644 --- a/Data/scripts/quests/man/man0u1.lua +++ b/Data/scripts/quests/man/man0u1.lua @@ -59,8 +59,6 @@ Phase: --]] - - -- Sequence Numbers SEQ_000 = 0; -- Ul'dah Adventurer's Guild SEQ_005 = 5; -- Run to Camp Black Brush & Attune @@ -83,7 +81,6 @@ SEQ_100 = 100; SEQ_105 = 105; SEQ_110 = 110; - -- Actor Class Ids OVERCOMPETITIVE_ADVENTURER = 1000807; MOMODI = 1000841; @@ -93,8 +90,6 @@ GREEDY_MERCHANT = 1000937; LIONHEARTED_ADVENTURER = 1000938; SPRY_SALESMAN = 1000939; - - UPBEAT_ADVENTURER = 1000940; SEEMINGLY_CALM_ADVENTURER = 1000941; UNKNOWN1 = 0; diff --git a/Data/scripts/unique/fst0Battle03/Monster/bloodthirsty_wolf.lua b/Data/scripts/unique/fst0Battle03/Monster/bloodthirsty_wolf.lua deleted file mode 100644 index e69de29b..00000000 diff --git a/Data/scripts/unique/fst0Battle03/Monster/papalymo.lua b/Data/scripts/unique/fst0Battle03/Monster/papalymo.lua deleted file mode 100644 index 7ed63cac..00000000 --- a/Data/scripts/unique/fst0Battle03/Monster/papalymo.lua +++ /dev/null @@ -1,28 +0,0 @@ -require ("global") -require ("ally") - -function onSpawn(ally) - ally:SetMaxHP(69420) - ally:SetHP(ally:GetMaxHP()) - ally.isAutoAttackEnabled = false; - ally.neutral = false -end - -function onCombatTick(ally, target, tick, contentGroupCharas) - allyGlobal.onCombatTick(ally, target, tick, contentGroupCharas); -end - - -function onRoam(ally, contentGroupCharas) - ally.detectionType = 0xFF - ally.isMovingToSpawn = false - ally.neutral = false - ally.animationId = 0 - allyGlobal.onCombatTick(ally, nil, nil, contentGroupCharas) -end - - -function tryAggro(ally, contentGroupCharas) - allyGlobal.tryAggro(ally, contentGroupCharas) - -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Battle03/Monster/yda.lua b/Data/scripts/unique/fst0Battle03/Monster/yda.lua deleted file mode 100644 index 4462774b..00000000 --- a/Data/scripts/unique/fst0Battle03/Monster/yda.lua +++ /dev/null @@ -1,26 +0,0 @@ -require ("global") - -require ("ally") - -function onSpawn(ally) - ally:SetMaxHP(69420) - ally:SetHP(ally:GetMaxHP()) - ally.isAutoAttackEnabled = false - ally.neutral = false -end - -function onCombatTick(ally, target, tick, contentGroupCharas) - allyGlobal.onCombatTick(ally, target, tick, contentGroupCharas) -end - -function tryAggro(ally, contentGroupCharas) - allyGlobal.tryAggro(ally, contentGroupCharas) -end - -function onRoam(ally, contentGroupCharas) - ally.detectionType = 0xFF - ally.isMovingToSpawn = false - ally.neutral = false - ally.animationId = 0 - --allyGlobal.onCombatTick(ally, contentGroupCharas) -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Battle03/OpeningStoperF0B1/openingstoper_gridania.lua b/Data/scripts/unique/fst0Battle03/OpeningStoperF0B1/openingstoper_gridania.lua deleted file mode 100644 index 2d63e9f0..00000000 --- a/Data/scripts/unique/fst0Battle03/OpeningStoperF0B1/openingstoper_gridania.lua +++ /dev/null @@ -1,12 +0,0 @@ -require ("global") -require ("quests/man/man0g0") - -function onEventStarted(player, npc, triggerName) - if (triggerName == "caution") then - worldMaster = GetWorldMaster(); - player:SendGameMessage(player, worldMaster, 34109, 0x20); - elseif (triggerName == "exit") then - GetWorldManager():DoPlayerMoveInZone(player, 356.09, 3.74, -701.62, -1.4); - end - player:EndEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Battle03/PopulaceStandard/papalymo.lua b/Data/scripts/unique/fst0Battle03/PopulaceStandard/papalymo.lua deleted file mode 100644 index eed6a648..00000000 --- a/Data/scripts/unique/fst0Battle03/PopulaceStandard/papalymo.lua +++ /dev/null @@ -1,19 +0,0 @@ -require ("global") -require ("quests/man/man0g0") - -function onEventStarted(player, npc, triggerName) - man0g0Quest = player:GetQuest("Man0g0"); - - if (triggerName == "talkDefault") then - if (man0g0Quest:GetQuestFlag(MAN0G0_FLAG_MINITUT_DONE1) == false) then - callClientFunction(player, "delegateEvent", player, man0g0Quest, "processEvent000_3", nil, nil, nil); - man0g0Quest:SetQuestFlag(MAN0G0_FLAG_MINITUT_DONE1, true); - man0g0Quest:SaveData(); - npc:SetQuestGraphic(player, 0x0); - player:GetDirector("OpeningDirector"):onTalkEvent(player, npc); - else - callClientFunction(player, "delegateEvent", player, man0g0Quest, "processEvent000_2", nil, nil, nil); - end - end - player:EndEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Battle03/PopulaceStandard/yda.lua b/Data/scripts/unique/fst0Battle03/PopulaceStandard/yda.lua deleted file mode 100644 index e0e54fdf..00000000 --- a/Data/scripts/unique/fst0Battle03/PopulaceStandard/yda.lua +++ /dev/null @@ -1,59 +0,0 @@ -require ("global") -require ("quests/man/man0g0") - -function onSpawn(player, npc) - npc:SetQuestGraphic(player, 0x2); -end - -function onEventStarted(player, npc, triggerName) - man0g0Quest = player:GetQuest("Man0g0"); - print("Got Quest Man0g0"); - if (man0g0Quest ~= nil) then - - print("Man0g0Quest is not nil"); - if (triggerName == "pushDefault") then - callClientFunction(player, "delegateEvent", player, man0g0Quest, "processTtrNomal002", nil, nil, nil); - elseif (triggerName == "talkDefault") then - --Is doing talk tutorial? - if (man0g0Quest:GetQuestFlag(MAN0L0_FLAG_STARTED_TALK_TUT) == false) then - callClientFunction(player, "delegateEvent", player, man0g0Quest, "processTtrNomal003", nil, nil, nil); - player:SetEventStatus(npc, "pushDefault", false, 0x2); - npc:SetQuestGraphic(player, 0x0); - man0g0Quest:SetQuestFlag(MAN0L0_FLAG_STARTED_TALK_TUT, true); - man0g0Quest:SaveData(); - player:GetDirector("OpeningDirector"):onTalkEvent(player, npc); - --Was she talked to after papalymo? - else - print("Making content area"); - if (man0g0Quest:GetQuestFlag(MAN0G0_FLAG_MINITUT_DONE1) == true) then - - player:EndEvent(); - - contentArea = player:GetZone():CreateContentArea(player, "/Area/PrivateArea/Content/PrivateAreaMasterSimpleContent", "man0g01", "SimpleContent30010", "Quest/QuestDirectorMan0g001"); - - if (contentArea == nil) then - player:EndEvent(); - return; - end - - director = contentArea:GetContentDirector(); - --player:AddDirector(director); - director:StartDirector(false); - - player:KickEvent(director, "noticeEvent", true); - player:SetLoginDirector(director); - - print("Content area and director made"); - player:ChangeState(0); - GetWorldManager():DoZoneChangeContent(player, contentArea, 362.4087, 4, -703.8168, 1.5419, 16); - print("Zone Change"); - return; - else - callClientFunction(player, "delegateEvent", player, man0g0Quest, "processEvent000_1", nil, nil, nil); - end - end - end - end - - player:EndEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01/PrivateArea/PrivateAreaMasterPast_1/DoorStandard/closed_gridania_gate.lua b/Data/scripts/unique/fst0Town01/PrivateArea/PrivateAreaMasterPast_1/DoorStandard/closed_gridania_gate.lua deleted file mode 100644 index 2d1aa509..00000000 --- a/Data/scripts/unique/fst0Town01/PrivateArea/PrivateAreaMasterPast_1/DoorStandard/closed_gridania_gate.lua +++ /dev/null @@ -1,5 +0,0 @@ -require ("global") - -function init(npc) - return false, false, 0, 0, 0x141, 0xb79; -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01/PrivateArea/PrivateAreaMasterPast_1/PopulaceStandard/cecilia.lua b/Data/scripts/unique/fst0Town01/PrivateArea/PrivateAreaMasterPast_1/PopulaceStandard/cecilia.lua deleted file mode 100644 index 2020bef7..00000000 --- a/Data/scripts/unique/fst0Town01/PrivateArea/PrivateAreaMasterPast_1/PopulaceStandard/cecilia.lua +++ /dev/null @@ -1,14 +0,0 @@ -require ("global") - -function onEventStarted(player, npc, triggerName) - man0g1Quest = player:GetQuest("Man0g0"); - - if (man0g1Quest ~= nil) then - if (triggerName == "talkDefault") then - callClientFunction(player, "delegateEvent", player, man0g1Quest, "processEvent020_3"); - end - end - - player:EndEvent(); - -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01/PrivateArea/PrivateAreaMasterPast_1/PopulaceStandard/farrimond.lua b/Data/scripts/unique/fst0Town01/PrivateArea/PrivateAreaMasterPast_1/PopulaceStandard/farrimond.lua deleted file mode 100644 index 774bafb6..00000000 --- a/Data/scripts/unique/fst0Town01/PrivateArea/PrivateAreaMasterPast_1/PopulaceStandard/farrimond.lua +++ /dev/null @@ -1,14 +0,0 @@ -require ("global") - -function onEventStarted(player, npc, triggerName) - man0g1Quest = player:GetQuest("Man0g0"); - - if (man0g1Quest ~= nil) then - if (triggerName == "talkDefault") then - callClientFunction(player, "delegateEvent", player, man0g1Quest, "processEvent020_4"); - end - end - - player:EndEvent(); - -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01/PrivateArea/PrivateAreaMasterPast_1/PopulaceStandard/gridania_blocker1.lua b/Data/scripts/unique/fst0Town01/PrivateArea/PrivateAreaMasterPast_1/PopulaceStandard/gridania_blocker1.lua deleted file mode 100644 index bd09cea8..00000000 --- a/Data/scripts/unique/fst0Town01/PrivateArea/PrivateAreaMasterPast_1/PopulaceStandard/gridania_blocker1.lua +++ /dev/null @@ -1,14 +0,0 @@ -require ("global") - -function init(player, npc) - return false, false, 0, 0; -end - -function onEventStarted(player, npc, triggerName) - man0g0Quest = player:GetQuest("Man0g0"); - if (man0g0Quest ~= nil) then - callClientFunction(player, "delegateEvent", player, man0g0Quest, "processTtrBlkNml001", nil, nil, nil); - GetWorldManager():DoZoneChange(player, 155, "PrivateAreaMasterPast", 1, 15, 109.966, 7.559, -1206.117, -2.7916); - end - player:EndEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01/PrivateArea/PrivateAreaMasterPast_1/PopulaceStandard/gridania_opening_exit.lua b/Data/scripts/unique/fst0Town01/PrivateArea/PrivateAreaMasterPast_1/PopulaceStandard/gridania_opening_exit.lua deleted file mode 100644 index 5274c759..00000000 --- a/Data/scripts/unique/fst0Town01/PrivateArea/PrivateAreaMasterPast_1/PopulaceStandard/gridania_opening_exit.lua +++ /dev/null @@ -1,16 +0,0 @@ -require ("global") -require ("quests/man/man0g0") - -function onSpawn(player, npc) - npc:SetQuestGraphic(player, 0x3); -end - -function onEventStarted(player, npc) - man0g1Quest = GetStaticActor("Man0g1"); - callClientFunction(player, "delegateEvent", player, man0g1Quest, "processEvent100"); - player:ReplaceQuest(110005, 110006); - player:SendGameMessage(GetStaticActor("Man0g1"), 353, 0x20); - player:SendGameMessage(GetStaticActor("Man0g1"), 354, 0x20); - GetWorldManager():DoZoneChange(player, 155, "PrivateAreaMasterPast", 2, 15, 67.034, 4, -1205.6497, -1.074); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01/PrivateArea/PrivateAreaMasterPast_1/PopulaceStandard/lonsygg.lua b/Data/scripts/unique/fst0Town01/PrivateArea/PrivateAreaMasterPast_1/PopulaceStandard/lonsygg.lua deleted file mode 100644 index 2d9f2391..00000000 --- a/Data/scripts/unique/fst0Town01/PrivateArea/PrivateAreaMasterPast_1/PopulaceStandard/lonsygg.lua +++ /dev/null @@ -1,14 +0,0 @@ -require ("global") - -function onEventStarted(player, npc, triggerName) - man0g0Quest = player:GetQuest("Man0g0"); - - if (man0g0Quest ~= nil) then - if (triggerName == "talkDefault") then - callClientFunction(player, "delegateEvent", player, man0g0Quest, "processEvent020_6"); - end - end - - player:EndEvent(); - -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01/PrivateArea/PrivateAreaMasterPast_1/PopulaceStandard/swethyna.lua b/Data/scripts/unique/fst0Town01/PrivateArea/PrivateAreaMasterPast_1/PopulaceStandard/swethyna.lua deleted file mode 100644 index 079aae45..00000000 --- a/Data/scripts/unique/fst0Town01/PrivateArea/PrivateAreaMasterPast_1/PopulaceStandard/swethyna.lua +++ /dev/null @@ -1,15 +0,0 @@ -require ("global") - -function onEventStarted(player, npc, triggerName) - man0g1Quest = player:GetQuest("Man0g0"); - - if (man0g1Quest ~= nil) then - if (triggerName == "talkDefault") then - callClientFunction(player, "delegateEvent", player, man0g1Quest, "processEvent020_2"); - - end - end - - player:EndEvent(); - -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01/PrivateArea/PrivateAreaMasterPast_1/PopulaceStandard/tkebbe.lua b/Data/scripts/unique/fst0Town01/PrivateArea/PrivateAreaMasterPast_1/PopulaceStandard/tkebbe.lua deleted file mode 100644 index a5212001..00000000 --- a/Data/scripts/unique/fst0Town01/PrivateArea/PrivateAreaMasterPast_1/PopulaceStandard/tkebbe.lua +++ /dev/null @@ -1,19 +0,0 @@ -require ("global") - -function onSpawn(player, npc) - npc:SetQuestGraphic(player, 0x2); -end - -function onEventStarted(player, npc, triggerName) - man0g1Quest = player:GetQuest("Man0g0"); - - if (man0g1Quest ~= nil) then - if (triggerName == "talkDefault") then - callClientFunction(player, "delegateEvent", player, man0g1Quest, "processEvent020_5"); - npc:SetQuestGraphic(player, 0x0); - end - end - - player:EndEvent(); - -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01/PrivateArea/PrivateAreaMasterPast_2/PopulaceStandard/amiable_adventurer.lua b/Data/scripts/unique/fst0Town01/PrivateArea/PrivateAreaMasterPast_2/PopulaceStandard/amiable_adventurer.lua deleted file mode 100644 index 41ab9100..00000000 --- a/Data/scripts/unique/fst0Town01/PrivateArea/PrivateAreaMasterPast_2/PopulaceStandard/amiable_adventurer.lua +++ /dev/null @@ -1,14 +0,0 @@ -require ("global") - -function onEventStarted(player, npc, triggerName) - man0g1Quest = player:GetQuest("Man0g1"); - - if (man0g1Quest ~= nil) then - if (triggerName == "talkDefault") then - callClientFunction(player, "delegateEvent", player, man0g1Quest, "processEvent100_3"); - end - end - - player:EndEvent(); - -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01/PrivateArea/PrivateAreaMasterPast_2/PopulaceStandard/beaming_adventurer.lua b/Data/scripts/unique/fst0Town01/PrivateArea/PrivateAreaMasterPast_2/PopulaceStandard/beaming_adventurer.lua deleted file mode 100644 index 12bf087b..00000000 --- a/Data/scripts/unique/fst0Town01/PrivateArea/PrivateAreaMasterPast_2/PopulaceStandard/beaming_adventurer.lua +++ /dev/null @@ -1,14 +0,0 @@ -require ("global") - -function onEventStarted(player, npc, triggerName) - man0g1Quest = player:GetQuest("Man0g1"); - - if (man0g1Quest ~= nil) then - if (triggerName == "talkDefault") then - callClientFunction(player, "delegateEvent", player, man0g1Quest, "processEvent100_6"); - end - end - - player:EndEvent(); - -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01/PrivateArea/PrivateAreaMasterPast_2/PopulaceStandard/miounne.lua b/Data/scripts/unique/fst0Town01/PrivateArea/PrivateAreaMasterPast_2/PopulaceStandard/miounne.lua deleted file mode 100644 index 4d5e8d23..00000000 --- a/Data/scripts/unique/fst0Town01/PrivateArea/PrivateAreaMasterPast_2/PopulaceStandard/miounne.lua +++ /dev/null @@ -1,26 +0,0 @@ -require ("global") - -function onSpawn(player, npc) - npc:SetQuestGraphic(player, 0x2); -end - -function onEventStarted(player, npc, triggerName) - local man0g1Quest = player:GetQuest("Man0g1"); - local pos = player:GetPos(); - - if (man0g1Quest ~= nil) then - callClientFunction(player, "delegateEvent", player, man0g1Quest, "processEvent110"); - player:EndEvent(); - - --[[director = player:GetZone():CreateDirector("AfterQuestWarpDirector"); - player:KickEvent(director, "noticeEvent", true); - player:AddDirector(director); - player:SetLoginDirector(director); - --]] - GetWorldManager():DoZoneChange(player, 155, nil, 0, 15, pos[0], pos[1], pos[2], pos[3]); - return; - end - - player:EndEvent(); - -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01/PrivateArea/PrivateAreaMasterPast_2/PopulaceStandard/morose_merchant.lua b/Data/scripts/unique/fst0Town01/PrivateArea/PrivateAreaMasterPast_2/PopulaceStandard/morose_merchant.lua deleted file mode 100644 index b5a2a206..00000000 --- a/Data/scripts/unique/fst0Town01/PrivateArea/PrivateAreaMasterPast_2/PopulaceStandard/morose_merchant.lua +++ /dev/null @@ -1,14 +0,0 @@ -require ("global") - -function onEventStarted(player, npc, triggerName) - man0g1Quest = player:GetQuest("Man0g1"); - - if (man0g1Quest ~= nil) then - if (triggerName == "talkDefault") then - callClientFunction(player, "delegateEvent", player, man0g1Quest, "processEvent100_2"); - end - end - - player:EndEvent(); - -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01/PrivateArea/PrivateAreaMasterPast_2/PopulaceStandard/narrow-eyed_adventurer.lua b/Data/scripts/unique/fst0Town01/PrivateArea/PrivateAreaMasterPast_2/PopulaceStandard/narrow-eyed_adventurer.lua deleted file mode 100644 index bd46a003..00000000 --- a/Data/scripts/unique/fst0Town01/PrivateArea/PrivateAreaMasterPast_2/PopulaceStandard/narrow-eyed_adventurer.lua +++ /dev/null @@ -1,15 +0,0 @@ -require ("global") - -function onEventStarted(player, npc, triggerName) - man0g1Quest = player:GetQuest("Man0g1"); - - if (man0g1Quest ~= nil) then - if (triggerName == "talkDefault") then - callClientFunction(player, "delegateEvent", player, man0g1Quest, "processEvent100_7"); - - end - end - - player:EndEvent(); - -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01/PrivateArea/PrivateAreaMasterPast_2/PopulaceStandard/unconcerned_passerby.lua b/Data/scripts/unique/fst0Town01/PrivateArea/PrivateAreaMasterPast_2/PopulaceStandard/unconcerned_passerby.lua deleted file mode 100644 index 2e0184aa..00000000 --- a/Data/scripts/unique/fst0Town01/PrivateArea/PrivateAreaMasterPast_2/PopulaceStandard/unconcerned_passerby.lua +++ /dev/null @@ -1,14 +0,0 @@ -require ("global") - -function onEventStarted(player, npc, triggerName) - man0g1Quest = player:GetQuest("Man0g1"); - - if (man0g1Quest ~= nil) then - if (triggerName == "talkDefault") then - callClientFunction(player, "delegateEvent", player, man0g1Quest, "processEvent100_9"); - end - end - - player:EndEvent(); - -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01/PrivateArea/PrivateAreaMasterPast_2/PopulaceStandard/vkorolon.lua b/Data/scripts/unique/fst0Town01/PrivateArea/PrivateAreaMasterPast_2/PopulaceStandard/vkorolon.lua deleted file mode 100644 index 7d4b1bf9..00000000 --- a/Data/scripts/unique/fst0Town01/PrivateArea/PrivateAreaMasterPast_2/PopulaceStandard/vkorolon.lua +++ /dev/null @@ -1,8 +0,0 @@ -require ("global") - -function onEventStarted(player, npc, triggerName) - defaultFst = GetStaticActor("DftFst"); - callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithVkorolon_001"); - player:EndEvent(); - -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01/PrivateArea/PrivateAreaMasterPast_2/PopulaceStandard/well-bundled_adventurer.lua b/Data/scripts/unique/fst0Town01/PrivateArea/PrivateAreaMasterPast_2/PopulaceStandard/well-bundled_adventurer.lua deleted file mode 100644 index 02da345a..00000000 --- a/Data/scripts/unique/fst0Town01/PrivateArea/PrivateAreaMasterPast_2/PopulaceStandard/well-bundled_adventurer.lua +++ /dev/null @@ -1,14 +0,0 @@ -require ("global") - -function onEventStarted(player, npc, triggerName) - man0g1Quest = player:GetQuest("Man0g1"); - - if (man0g1Quest ~= nil) then - if (triggerName == "talkDefault") then - callClientFunction(player, "delegateEvent", player, man0g1Quest, "processEvent100_4"); - end - end - - player:EndEvent(); - -end \ No newline at end of file diff --git a/Data/scripts/unique/fst0Town01/PrivateArea/PrivateAreaMasterPast_2/PopulaceStandard/wispily_whiskered_woodworker.lua b/Data/scripts/unique/fst0Town01/PrivateArea/PrivateAreaMasterPast_2/PopulaceStandard/wispily_whiskered_woodworker.lua deleted file mode 100644 index aaab2b9c..00000000 --- a/Data/scripts/unique/fst0Town01/PrivateArea/PrivateAreaMasterPast_2/PopulaceStandard/wispily_whiskered_woodworker.lua +++ /dev/null @@ -1,14 +0,0 @@ -require ("global") - -function onEventStarted(player, npc, triggerName) - man0g1Quest = player:GetQuest("Man0g1"); - - if (man0g1Quest ~= nil) then - if (triggerName == "talkDefault") then - callClientFunction(player, "delegateEvent", player, man0g1Quest, "processEvent100_8"); - end - end - - player:EndEvent(); - -end \ No newline at end of file diff --git a/Data/scripts/unique/ocn0Battle02/zone.lua b/Data/scripts/unique/ocn0Battle02/zone.lua deleted file mode 100644 index 76bd36db..00000000 --- a/Data/scripts/unique/ocn0Battle02/zone.lua +++ /dev/null @@ -1,11 +0,0 @@ - - -function onZoneInit(zone) -end - -function onZoneIn(player) - -end - -function onZoneOut(zone, player) -end \ No newline at end of file diff --git a/Data/scripts/unique/ocn0Cruise01/ship_route_2.lua b/Data/scripts/unique/ocn0Cruise01/ship_route_2.lua deleted file mode 100644 index 7feb8f7c..00000000 --- a/Data/scripts/unique/ocn0Cruise01/ship_route_2.lua +++ /dev/null @@ -1,5 +0,0 @@ -require ("global") - -function init(npc) - return false, false, 0, 0, 0x1415, 201; -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01/PrivateArea/PrivateAreaMasterPast_2/PopulaceStandard/cocksure-cockswain.lua b/Data/scripts/unique/sea0Town01/PrivateArea/PrivateAreaMasterPast_2/PopulaceStandard/cocksure-cockswain.lua deleted file mode 100644 index f2dc0640..00000000 --- a/Data/scripts/unique/sea0Town01/PrivateArea/PrivateAreaMasterPast_2/PopulaceStandard/cocksure-cockswain.lua +++ /dev/null @@ -1,13 +0,0 @@ -require ("global") - -function onEventStarted(player, npc, triggerName) - man0l1Quest = player:GetQuest("Man0l1"); - - if (man0l1Quest ~= nil) then - if (triggerName == "talkDefault") then - callClientFunction(player, "delegateEvent", player, man0l1Quest, "processEtc001"); - player:EndEvent(); - end - end - -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01/PrivateArea/PrivateAreaMasterPast_2/PopulaceStandard/sententious_sellsword.lua b/Data/scripts/unique/sea0Town01/PrivateArea/PrivateAreaMasterPast_2/PopulaceStandard/sententious_sellsword.lua deleted file mode 100644 index 9113a578..00000000 --- a/Data/scripts/unique/sea0Town01/PrivateArea/PrivateAreaMasterPast_2/PopulaceStandard/sententious_sellsword.lua +++ /dev/null @@ -1,13 +0,0 @@ -require ("global") - -function onEventStarted(player, npc, triggerName) - man0l1Quest = player:GetQuest("Man0l1"); - - if (man0l1Quest ~= nil) then - if (triggerName == "talkDefault") then - callClientFunction(player, "delegateEvent", player, man0l1Quest, "processEtc003"); - player:EndEvent(); - end - end - -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01/PrivateArea/PrivateAreaMasterPast_2/PopulaceStandard/solicitous_sellsword.lua b/Data/scripts/unique/sea0Town01/PrivateArea/PrivateAreaMasterPast_2/PopulaceStandard/solicitous_sellsword.lua deleted file mode 100644 index fad948d7..00000000 --- a/Data/scripts/unique/sea0Town01/PrivateArea/PrivateAreaMasterPast_2/PopulaceStandard/solicitous_sellsword.lua +++ /dev/null @@ -1,13 +0,0 @@ -require ("global") - -function onEventStarted(player, npc, triggerName) - man0l1Quest = player:GetQuest("Man0l1"); - - if (man0l1Quest ~= nil) then - if (triggerName == "talkDefault") then - callClientFunction(player, "delegateEvent", player, man0l1Quest, "processEtc002"); - player:EndEvent(); - end - end - -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/AetheryteParent/limsa_aetheryte.lua b/Data/scripts/unique/sea0Town01a/AetheryteParent/limsa_aetheryte.lua deleted file mode 100644 index e69de29b..00000000 diff --git a/Data/scripts/unique/sea0Town01a/PrivateArea/PrivateAreaMasterPast_1/PopulaceStandard/PrivateAreaPastExit.lua b/Data/scripts/unique/sea0Town01a/PrivateArea/PrivateAreaMasterPast_1/PopulaceStandard/PrivateAreaPastExit.lua deleted file mode 100644 index d7140e37..00000000 --- a/Data/scripts/unique/sea0Town01a/PrivateArea/PrivateAreaMasterPast_1/PopulaceStandard/PrivateAreaPastExit.lua +++ /dev/null @@ -1,12 +0,0 @@ -function init(npc) - return false, false, 0, 0; -end - -function onEventStarted(player, npc, triggerName) - if (triggerName == "caution") then - worldMaster = GetWorldMaster(); - player:SendGameMessage(player, worldMaster, 34109, 0x20); - elseif (triggerName == "exit") then - end - player:EndEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PrivateArea/PrivateAreaMasterPast_1/PopulaceStandard/gert.lua b/Data/scripts/unique/sea0Town01a/PrivateArea/PrivateAreaMasterPast_1/PopulaceStandard/gert.lua deleted file mode 100644 index 49259513..00000000 --- a/Data/scripts/unique/sea0Town01a/PrivateArea/PrivateAreaMasterPast_1/PopulaceStandard/gert.lua +++ /dev/null @@ -1,8 +0,0 @@ -require ("global") -require ("quests/man/man0l0") - -function onEventStarted(player, npc) - man0l0Quest = player:GetQuest("Man0l0"); - callClientFunction(player, "delegateEvent", player, man0l0Quest, "processEvent020_10", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PrivateArea/PrivateAreaMasterPast_1/PopulaceStandard/hob.lua b/Data/scripts/unique/sea0Town01a/PrivateArea/PrivateAreaMasterPast_1/PopulaceStandard/hob.lua deleted file mode 100644 index 627443d9..00000000 --- a/Data/scripts/unique/sea0Town01a/PrivateArea/PrivateAreaMasterPast_1/PopulaceStandard/hob.lua +++ /dev/null @@ -1,18 +0,0 @@ -require ("global") -require ("quests/man/man0l0") - -function onEventStarted(player, npc) - man0l0Quest = player:GetQuest("Man0l0"); - choice = callClientFunction(player, "delegateEvent", player, man0l0Quest, "processEvent020_9", nil, nil, nil); - - if (choice == 1) then - man0l1Quest = GetStaticActor("Man0l1"); - callClientFunction(player, "delegateEvent", player, man0l1Quest, "processEvent010", nil, nil, nil); - player:ReplaceQuest(110001, 110002); - player:SendGameMessage(GetStaticActor("Man0l1"), 320, 0x20); - player:SendGameMessage(GetStaticActor("Man0l1"), 321, 0x20); - GetWorldManager():DoZoneChange(player, 133, "PrivateAreaMasterPast", 2, 15, -459.619873, 40.0005722, 196.370377, 2.010813); - end - - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PrivateArea/PrivateAreaMasterPast_1/PopulaceStandard/lanky_traveler.lua b/Data/scripts/unique/sea0Town01a/PrivateArea/PrivateAreaMasterPast_1/PopulaceStandard/lanky_traveler.lua deleted file mode 100644 index 76a89e55..00000000 --- a/Data/scripts/unique/sea0Town01a/PrivateArea/PrivateAreaMasterPast_1/PopulaceStandard/lanky_traveler.lua +++ /dev/null @@ -1,8 +0,0 @@ -require ("global") -require ("quests/man/man0l0") - -function onEventStarted(player, npc) - man0l0Quest = player:GetQuest("Man0l0"); - callClientFunction(player, "delegateEvent", player, man0l0Quest, "processEvent020_8", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PrivateArea/PrivateAreaMasterPast_1/PopulaceStandard/lorhzant.lua b/Data/scripts/unique/sea0Town01a/PrivateArea/PrivateAreaMasterPast_1/PopulaceStandard/lorhzant.lua deleted file mode 100644 index b894b11a..00000000 --- a/Data/scripts/unique/sea0Town01a/PrivateArea/PrivateAreaMasterPast_1/PopulaceStandard/lorhzant.lua +++ /dev/null @@ -1,8 +0,0 @@ -require ("global") -require ("quests/man/man0l0") - -function onEventStarted(player, npc) - man0l0Quest = player:GetQuest("Man0l0"); - callClientFunction(player, "delegateEvent", player, man0l0Quest, "processEvent020_11", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PrivateArea/PrivateAreaMasterPast_1/PopulaceStandard/muscle-bound_deckhand.lua b/Data/scripts/unique/sea0Town01a/PrivateArea/PrivateAreaMasterPast_1/PopulaceStandard/muscle-bound_deckhand.lua deleted file mode 100644 index a67adb1d..00000000 --- a/Data/scripts/unique/sea0Town01a/PrivateArea/PrivateAreaMasterPast_1/PopulaceStandard/muscle-bound_deckhand.lua +++ /dev/null @@ -1,8 +0,0 @@ -require ("global") -require ("quests/man/man0l0") - -function onEventStarted(player, npc) - man0l0Quest = player:GetQuest("Man0l0"); - callClientFunction(player, "delegateEvent", player, man0l0Quest, "processEvent020_2", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PrivateArea/PrivateAreaMasterPast_1/PopulaceStandard/pasty-faced_adventurer.lua b/Data/scripts/unique/sea0Town01a/PrivateArea/PrivateAreaMasterPast_1/PopulaceStandard/pasty-faced_adventurer.lua deleted file mode 100644 index b894b11a..00000000 --- a/Data/scripts/unique/sea0Town01a/PrivateArea/PrivateAreaMasterPast_1/PopulaceStandard/pasty-faced_adventurer.lua +++ /dev/null @@ -1,8 +0,0 @@ -require ("global") -require ("quests/man/man0l0") - -function onEventStarted(player, npc) - man0l0Quest = player:GetQuest("Man0l0"); - callClientFunction(player, "delegateEvent", player, man0l0Quest, "processEvent020_11", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PrivateArea/PrivateAreaMasterPast_1/PopulaceStandard/pearly-toothed_porter.lua b/Data/scripts/unique/sea0Town01a/PrivateArea/PrivateAreaMasterPast_1/PopulaceStandard/pearly-toothed_porter.lua deleted file mode 100644 index 4a9e15af..00000000 --- a/Data/scripts/unique/sea0Town01a/PrivateArea/PrivateAreaMasterPast_1/PopulaceStandard/pearly-toothed_porter.lua +++ /dev/null @@ -1,8 +0,0 @@ -require ("global") -require ("quests/man/man0l0") - -function onEventStarted(player, npc) - man0l0Quest = player:GetQuest("Man0l0"); - callClientFunction(player, "delegateEvent", player, man0l0Quest, "processEvent020_3", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PrivateArea/PrivateAreaMasterPast_1/PopulaceStandard/undignified_adventurer.lua b/Data/scripts/unique/sea0Town01a/PrivateArea/PrivateAreaMasterPast_1/PopulaceStandard/undignified_adventurer.lua deleted file mode 100644 index e555c579..00000000 --- a/Data/scripts/unique/sea0Town01a/PrivateArea/PrivateAreaMasterPast_1/PopulaceStandard/undignified_adventurer.lua +++ /dev/null @@ -1,8 +0,0 @@ -require ("global") -require ("quests/man/man0l0") - -function onEventStarted(player, npc) - man0l0Quest = player:GetQuest("Man0l0"); - callClientFunction(player, "delegateEvent", player, man0l0Quest, "processEvent020_5", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PrivateArea/PrivateAreaMasterPast_1/PopulaceStandard/voluptuous_vixen.lua b/Data/scripts/unique/sea0Town01a/PrivateArea/PrivateAreaMasterPast_1/PopulaceStandard/voluptuous_vixen.lua deleted file mode 100644 index 3aa84bfb..00000000 --- a/Data/scripts/unique/sea0Town01a/PrivateArea/PrivateAreaMasterPast_1/PopulaceStandard/voluptuous_vixen.lua +++ /dev/null @@ -1,8 +0,0 @@ -require ("global") -require ("quests/man/man0l0") - -function onEventStarted(player, npc) - man0l0Quest = player:GetQuest("Man0l0"); - callClientFunction(player, "delegateEvent", player, man0l0Quest, "processEvent020_6", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/sea0Town01a/PrivateArea/PrivateAreaMasterPast_1/PopulaceStandard/well-traveled_merchant.lua b/Data/scripts/unique/sea0Town01a/PrivateArea/PrivateAreaMasterPast_1/PopulaceStandard/well-traveled_merchant.lua deleted file mode 100644 index cdfcb886..00000000 --- a/Data/scripts/unique/sea0Town01a/PrivateArea/PrivateAreaMasterPast_1/PopulaceStandard/well-traveled_merchant.lua +++ /dev/null @@ -1,8 +0,0 @@ -require ("global") -require ("quests/man/man0l0") - -function onEventStarted(player, npc) - man0l0Quest = player:GetQuest("Man0l0"); - callClientFunction(player, "delegateEvent", player, man0l0Quest, "processEvent020_7", nil, nil, nil); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Battle01/DoorStandard/door1.lua b/Data/scripts/unique/wil0Battle01/DoorStandard/door1.lua deleted file mode 100644 index 0640e65f..00000000 --- a/Data/scripts/unique/wil0Battle01/DoorStandard/door1.lua +++ /dev/null @@ -1,3 +0,0 @@ -function init(npc) - return false, false, 0, 0, 0x1A5, 2829; -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Battle01/DoorStandard/door2.lua b/Data/scripts/unique/wil0Battle01/DoorStandard/door2.lua deleted file mode 100644 index c3d90089..00000000 --- a/Data/scripts/unique/wil0Battle01/DoorStandard/door2.lua +++ /dev/null @@ -1,3 +0,0 @@ -function init(npc) - return false, false, 0, 0, 0x1A5, 2825; -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Battle01/DoorStandard/door3.lua b/Data/scripts/unique/wil0Battle01/DoorStandard/door3.lua deleted file mode 100644 index c228e206..00000000 --- a/Data/scripts/unique/wil0Battle01/DoorStandard/door3.lua +++ /dev/null @@ -1,3 +0,0 @@ -function init(npc) - return false, false, 0, 0, 0x1A5, 4040; -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Battle01/MapObjOnlyShowHide/man0u0_tutrl_gate.lua b/Data/scripts/unique/wil0Battle01/MapObjOnlyShowHide/man0u0_tutrl_gate.lua deleted file mode 100644 index 97f1ad42..00000000 --- a/Data/scripts/unique/wil0Battle01/MapObjOnlyShowHide/man0u0_tutrl_gate.lua +++ /dev/null @@ -1,3 +0,0 @@ -function init(npc) - return false, false, 0, 0, 0x1A5, 4289; -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Battle01/OpeningStoperW0B1/opening_stoper_uldah.lua b/Data/scripts/unique/wil0Battle01/OpeningStoperW0B1/opening_stoper_uldah.lua deleted file mode 100644 index ab7f52a1..00000000 --- a/Data/scripts/unique/wil0Battle01/OpeningStoperW0B1/opening_stoper_uldah.lua +++ /dev/null @@ -1,13 +0,0 @@ -function init(npc) - return false, false, 0, 0; -end - -function onEventStarted(player, npc, triggerName) - if (triggerName == "caution") then - worldMaster = GetWorldMaster(); - player:SendGameMessage(player, worldMaster, 34109, 0x20); - elseif (triggerName == "exit") then - GetWorldManager():DoPlayerMoveInZone(player, 5.36433, 196, 133.656, -2.84938); - end - player:EndEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Battle01/OpeningStoperW0B1/opening_stoper_uldah_battle.lua b/Data/scripts/unique/wil0Battle01/OpeningStoperW0B1/opening_stoper_uldah_battle.lua deleted file mode 100644 index 34601794..00000000 --- a/Data/scripts/unique/wil0Battle01/OpeningStoperW0B1/opening_stoper_uldah_battle.lua +++ /dev/null @@ -1,13 +0,0 @@ -function init(npc) - return false, false, 0, 0; -end - -function onEventStarted(player, npc, triggerName) - if (triggerName == "caution") then - worldMaster = GetWorldMaster(); - player:SendGameMessage(player, worldMaster, 34109, 0x20); - elseif (triggerName == "exit") then - GetWorldManager():DoPlayerMoveInZone(player, 18); - end - player:EndEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01a/privatearea/PrivateAreaMasterPast_5/DoorStandard/pgl200_gsm_door.lua b/Data/scripts/unique/wil0Town01a/privatearea/PrivateAreaMasterPast_5/DoorStandard/pgl200_gsm_door.lua deleted file mode 100644 index cb3caf27..00000000 --- a/Data/scripts/unique/wil0Town01a/privatearea/PrivateAreaMasterPast_5/DoorStandard/pgl200_gsm_door.lua +++ /dev/null @@ -1,3 +0,0 @@ -function init(npc) - return false, false, 0, 0, 0x1A5, 0xFCB; -end \ No newline at end of file diff --git a/Data/sql/gamedata_actor_class.sql b/Data/sql/gamedata_actor_class.sql index 784ba2f4..56727073 100644 --- a/Data/sql/gamedata_actor_class.sql +++ b/Data/sql/gamedata_actor_class.sql @@ -140,7 +140,7 @@ REPLACE INTO `gamedata_actor_class` (`id`, `classPath`, `displayNameId`, `proper (1000108, '/Chara/Npc/Populace/PopulaceStandard', 4000029, 19, '{\r\n "talkEventConditions": [\r\n {\r\n "unknown1": 4,\r\n "unknown2": 0,\r\n "conditionName": "talkDefault"\r\n }\r\n ],\r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}'), (1000109, '/Chara/Npc/Populace/PopulaceStandard', 4000030, 19, '{\r\n "talkEventConditions": [\r\n {\r\n "unknown1": 4,\r\n "unknown2": 0,\r\n "conditionName": "talkDefault"\r\n }\r\n ],\r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}'), (1000110, '', 4000031, 0, NULL), - (1000111, '', 4000035, 0, NULL), + (1000111, '/Chara/Npc/Populace/PopulaceStandard', 4000035, 19, '{\r\n "talkEventConditions": [\r\n {\r\n "unknown1": 4,\r\n "unknown2": 0,\r\n "conditionName": "talkDefault"\r\n }\r\n ],\r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}'), (1000112, '', 4000032, 0, NULL), (1000113, '', 4000033, 0, NULL), (1000114, '', 4000034, 0, NULL), @@ -174,8 +174,8 @@ REPLACE INTO `gamedata_actor_class` (`id`, `classPath`, `displayNameId`, `proper (1000142, '/Chara/Npc/Populace/PopulaceStandard', 1600112, 19, '{\r\n "talkEventConditions": [\r\n {\r\n "unknown1": 4,\r\n "unknown2": 0,\r\n "conditionName": "talkDefault"\r\n }\r\n ],\r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}'), (1000143, '', 1600081, 0, NULL), (1000144, '/Chara/Npc/Populace/PopulaceStandard', 2200064, 19, '{\r\n "talkEventConditions": [\r\n {\r\n "unknown1": 4,\r\n "unknown2": 0,\r\n "conditionName": "talkDefault"\r\n }\r\n ],\r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}'), - (1000145, '', 1900029, 0, NULL), - (1000146, '', 1900029, 0, NULL), + (1000145, '/Chara/Npc/Populace/PopulaceStandard', 1900029, 19, '{\r\n "talkEventConditions": [\r\n {\r\n "unknown1": 4,\r\n "unknown2": 0,\r\n "conditionName": "talkDefault"\r\n }\r\n ],\r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}'), + (1000146, '/Chara/Npc/Populace/PopulaceStandard', 1900029, 19, '{\r\n "talkEventConditions": [\r\n {\r\n "unknown1": 4,\r\n "unknown2": 0,\r\n "conditionName": "talkDefault"\r\n }\r\n ],\r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}'), (1000147, '', 1200108, 0, NULL), (1000148, '', 1100212, 0, NULL), (1000149, '', 1900047, 0, NULL), @@ -184,8 +184,8 @@ REPLACE INTO `gamedata_actor_class` (`id`, `classPath`, `displayNameId`, `proper (1000152, '/Chara/Npc/Populace/PopulaceStandard', 1200100, 19, '{\r\n "talkEventConditions": [\r\n {\r\n "unknown1": 4,\r\n "unknown2": 0,\r\n "conditionName": "talkDefault"\r\n }\r\n ],\r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}'), (1000153, '/Chara/Npc/Populace/PopulaceStandard', 1900011, 19, '{\r\n "talkEventConditions": [\r\n {\r\n "unknown1": 4,\r\n "unknown2": 0,\r\n "conditionName": "talkDefault"\r\n }\r\n ],\r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}'), (1000154, '', 1400010, 0, NULL), - (1000155, '', 1500024, 0, NULL), - (1000156, '', 1500024, 0, NULL), + (1000155, '/Chara/Npc/Populace/PopulaceStandard', 1500024, 19, '{\r\n "talkEventConditions": [\r\n {\r\n "unknown1": 4,\r\n "unknown2": 0,\r\n "conditionName": "talkDefault"\r\n }\r\n ],\r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}'), + (1000156, '/Chara/Npc/Populace/PopulaceStandard', 1500024, 19, '{\r\n "talkEventConditions": [\r\n {\r\n "unknown1": 4,\r\n "unknown2": 0,\r\n "conditionName": "talkDefault"\r\n }\r\n ],\r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}'), (1000157, '/Chara/Npc/Populace/Shop/PopulaceGuildShop', 1900050, 19, '{\r\n "talkEventConditions": [\r\n {\r\n "unknown1": 4,\r\n "unknown2": 0,\r\n "conditionName": "talkDefault"\r\n }\r\n ],\r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}'), (1000158, '/Chara/Npc/Populace/Shop/PopulaceGuildShop', 1300054, 19, '{\r\n "talkEventConditions": [\r\n {\r\n "unknown1": 4,\r\n "unknown2": 0,\r\n "conditionName": "talkDefault"\r\n }\r\n ],\r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}'), (1000159, '/Chara/Npc/Populace/Shop/PopulaceShopSalesman', 1100144, 19, '{\r\n "talkEventConditions": [\r\n {\r\n "unknown1": 4,\r\n "unknown2": 0,\r\n "conditionName": "talkDefault"\r\n }\r\n ],\r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}'), @@ -205,7 +205,7 @@ REPLACE INTO `gamedata_actor_class` (`id`, `classPath`, `displayNameId`, `proper (1000173, '/Chara/Npc/Populace/PopulaceStandard', 1100206, 19, '{\r\n "talkEventConditions": [\r\n {\r\n "unknown1": 4,\r\n "unknown2": 0,\r\n "conditionName": "talkDefault"\r\n }\r\n ],\r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}'), (1000174, '', 4000257, 0, NULL), (1000175, '', 1500032, 0, NULL), - (1000176, '', 1400012, 0, NULL), + (1000176, '/Chara/Npc/Populace/PopulaceStandard', 1400012, 19, '{\r\n "talkEventConditions": [\r\n {\r\n "unknown1": 4,\r\n "unknown2": 0,\r\n "conditionName": "talkDefault"\r\n }\r\n ],\r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}'), (1000177, '/Chara/Npc/Populace/PopulaceStandard', 1600195, 19, '{\r\n "talkEventConditions": [\r\n {\r\n "unknown1": 4,\r\n "unknown2": 0,\r\n "conditionName": "talkDefault"\r\n }\r\n ],\r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}'), (1000178, '/Chara/Npc/Populace/PopulaceStandard', 1500031, 19, '{\r\n "talkEventConditions": [\r\n {\r\n "unknown1": 4,\r\n "unknown2": 0,\r\n "conditionName": "talkDefault"\r\n }\r\n ],\r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}'), (1000179, '/Chara/Npc/Populace/PopulaceStandard', 1900065, 19, '{\r\n "talkEventConditions": [\r\n {\r\n "unknown1": 4,\r\n "unknown2": 0,\r\n "conditionName": "talkDefault"\r\n }\r\n ],\r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}'), @@ -276,7 +276,7 @@ REPLACE INTO `gamedata_actor_class` (`id`, `classPath`, `displayNameId`, `proper (1000244, '', 1000019, 0, NULL), (1000245, '', 1500008, 0, NULL), (1000246, '', 1600250, 0, NULL), - (1000247, '', 1000028, 0, NULL), + (1000247, '/Chara/Npc/Populace/PopulaceStandard', 1000028, 19, '{\r\n "talkEventConditions": [\r\n {\r\n "unknown1": 4,\r\n "unknown2": 0,\r\n "conditionName": "talkDefault"\r\n }\r\n ],\r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}'), (1000248, '/Chara/Npc/Populace/PopulaceStandard', 1900062, 19, '{\r\n "talkEventConditions": [\r\n {\r\n "unknown1": 4,\r\n "unknown2": 0,\r\n "conditionName": "talkDefault"\r\n }\r\n ],\r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}'), (1000249, '', 1300004, 0, NULL), (1000250, '/Chara/Npc/Populace/PopulaceStandard', 1900024, 19, '{\r\n "talkEventConditions": [\r\n {\r\n "unknown1": 4,\r\n "unknown2": 0,\r\n "conditionName": "talkDefault"\r\n }\r\n ],\r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}'), @@ -373,7 +373,7 @@ REPLACE INTO `gamedata_actor_class` (`id`, `classPath`, `displayNameId`, `proper (1000341, '/Chara/Npc/Populace/PopulaceStandard', 1400014, 19, '{\r\n "talkEventConditions": [\r\n {\r\n "unknown1": 4,\r\n "unknown2": 0,\r\n "conditionName": "talkDefault"\r\n }\r\n ],\r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}'), (1000342, '/Chara/Npc/Populace/PopulaceStandard', 1900044, 19, '{\r\n "talkEventConditions": [\r\n {\r\n "unknown1": 4,\r\n "unknown2": 0,\r\n "conditionName": "talkDefault"\r\n }\r\n ],\r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}'), (1000343, '', 1000084, 0, NULL), - (1000344, '/Chara/Npc/Populace/PopulaceStandard', 1200047, 19, '{\r\n "talkEventConditions": [\r\n {\r\n "unknown1": 4,\r\n "unknown2": 0,\r\n "conditionName": "talkDefault"\r\n }\r\n ],\r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}'), + (1000344, '/Chara/Npc/Populace/PopulaceStandard', 1200047, 19, '{\r\n "talkEventConditions": [\r\n {\r\n "unknown1": 4,\r\n "unknown2": 0,\r\n "conditionName": "talkDefault"\r\n }\r\n ],\r\n "emoteEventConditions": [\r\n {\r\n "unknown1": 4,\r\n "unknown2": 0,\r\n "emoteId": 130,\r\n "conditionName": "emoteDefault1"\r\n }\r\n ],\r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}'), (1000345, '/Chara/Npc/Populace/PopulaceStandard', 1500033, 19, '{\r\n "talkEventConditions": [\r\n {\r\n "unknown1": 4,\r\n "unknown2": 0,\r\n "conditionName": "talkDefault"\r\n }\r\n ],\r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}'), (1000346, '/Chara/Npc/Populace/PopulaceStandard', 1300075, 19, '{\r\n "talkEventConditions": [\r\n {\r\n "unknown1": 4,\r\n "unknown2": 0,\r\n "conditionName": "talkDefault"\r\n }\r\n ],\r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}'), (1000347, '/Chara/Npc/Populace/PopulaceStandard', 1600006, 19, '{\r\n "talkEventConditions": [\r\n {\r\n "unknown1": 4,\r\n "unknown2": 0,\r\n "conditionName": "talkDefault"\r\n }\r\n ],\r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}'), @@ -981,9 +981,9 @@ REPLACE INTO `gamedata_actor_class` (`id`, `classPath`, `displayNameId`, `proper (1000949, '', 1200166, 0, NULL), (1000950, '/Chara/Npc/Populace/PopulaceStandard', 1300001, 19, '{\r\n "talkEventConditions": [\r\n {\r\n "unknown1": 4,\r\n "unknown2": 0,\r\n "conditionName": "talkDefault"\r\n }\r\n ],\r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}'), (1000951, '/Chara/Npc/Populace/PopulaceStandard', 1600102, 19, '{\r\n "talkEventConditions": [\r\n {\r\n "unknown1": 4,\r\n "unknown2": 0,\r\n "conditionName": "talkDefault"\r\n }\r\n ],\r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}'), - (1000952, '', 4000335, 0, NULL), - (1000953, '', 4000336, 0, NULL), - (1000954, '', 1000104, 0, NULL), + (1000952, '/Chara/Npc/Populace/PopulaceStandard', 4000335, 19, '{\r\n "talkEventConditions": [\r\n {\r\n "unknown1": 4,\r\n "unknown2": 0,\r\n "conditionName": "talkDefault"\r\n }\r\n ],\r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}'), + (1000953, '/Chara/Npc/Populace/PopulaceStandard', 4000336, 19, '{\r\n "talkEventConditions": [\r\n {\r\n "unknown1": 4,\r\n "unknown2": 0,\r\n "conditionName": "talkDefault"\r\n }\r\n ],\r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}'), + (1000954, '/Chara/Npc/Populace/PopulaceStandard', 1000104, 19, '{\r\n "talkEventConditions": [\r\n {\r\n "unknown1": 4,\r\n "unknown2": 0,\r\n "conditionName": "talkDefault"\r\n }\r\n ],\r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}'), (1000955, '/Chara/Npc/Populace/PopulaceStandard', 1400111, 19, '{\r\n "talkEventConditions": [\r\n {\r\n "unknown1": 4,\r\n "unknown2": 0,\r\n "conditionName": "talkDefault"\r\n }\r\n ],\r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}'), (1000956, '', 1300032, 0, NULL), (1000957, '', 4000509, 0, NULL), @@ -2387,7 +2387,7 @@ REPLACE INTO `gamedata_actor_class` (`id`, `classPath`, `displayNameId`, `proper (1080133, '/Chara/Npc/MapObj/Pray12Gods', 4010030, 0, NULL), (1080134, '/Chara/Npc/MapObj/Pray12Gods', 4010031, 0, NULL), (1080135, '/Chara/Npc/MapObj/Pray12Gods', 4010032, 0, NULL), - (1080136, '', 4010033, 0, NULL), + (1080136, '/Chara/Npc/MapObj/Pray12Gods', 4010033, 0, NULL), (1090001, '/Chara/Npc/Populace/PopulaceStandard', 0, 1, '{\r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ],\r\n "pushWithCircleEventConditions": [\r\n {\r\n "isEnabled": "false",\r\n "radius": "6.0",\r\n "outwards": "false",\r\n "silent": "false",\r\n "conditionName": "pushDefault"\r\n }\r\n ]\r\n}'), (1090002, '', 0, 0, NULL), (1090003, '/Chara/Npc/Populace/PopulaceStandard', 0, 1, '{\r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ],\r\n "pushWithCircleEventConditions": [\r\n {\r\n "isEnabled": "false",\r\n "radius": "6.0",\r\n "outwards": "false",\r\n "silent": "false",\r\n "conditionName": "pushDefault"\r\n }\r\n ]\r\n}'), @@ -2429,7 +2429,7 @@ REPLACE INTO `gamedata_actor_class` (`id`, `classPath`, `displayNameId`, `proper (1090039, '', 0, 0, NULL), (1090040, '', 0, 0, NULL), (1090041, '/Chara/Npc/Populace/PopulaceStandard', 0, 0, NULL), - (1090042, '/Chara/Npc/Populace/PopulaceStandard', 0, 19, '{\r\n "talkEventConditions": [\r\n {\r\n "unknown1": 4,\r\n "unknown2": 0,\r\n "conditionName": "talkDefault"\r\n }\r\n ],\r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}'), + (1090042, '/Chara/Npc/Populace/PopulaceStandard', 0, 1, '{\r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ],\r\n "pushWithCircleEventConditions": [\r\n {\r\n "isEnabled": "false",\r\n "radius": "6.0",\r\n "outwards": "false",\r\n "silent": "false",\r\n "conditionName": "pushDefault"\r\n }\r\n ]\r\n}'), (1090043, '', 0, 0, NULL), (1090044, '/Chara/Npc/Populace/PopulaceStandard', 0, 19, '{\r\n "talkEventConditions": [\r\n {\r\n "unknown1": 4,\r\n "unknown2": 0,\r\n "conditionName": "talkDefault"\r\n }\r\n ],\r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}'), (1090045, '/Chara/Npc/Populace/PopulaceStandard', 0, 0, NULL), @@ -2445,7 +2445,7 @@ REPLACE INTO `gamedata_actor_class` (`id`, `classPath`, `displayNameId`, `proper (1090055, '/Chara/Npc/Populace/PopulaceStandard', 0, 19, '{\r\n "talkEventConditions": [\r\n {\r\n "unknown1": 4,\r\n "unknown2": 0,\r\n "conditionName": "talkDefault"\r\n }\r\n ],\r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}'), (1090056, '', 0, 0, NULL), (1090057, '', 0, 0, NULL), - (1090058, '/Chara/Npc/Populace/PopulaceStandard', 0, 19, '{\r\n "talkEventConditions": [\r\n {\r\n "unknown1": 4,\r\n "unknown2": 0,\r\n "conditionName": "talkDefault"\r\n }\r\n ],\r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}'), + (1090058, '/Chara/Npc/Populace/PopulaceStandard', 0, 1, '{\r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ],\r\n "pushWithCircleEventConditions": [\r\n {\r\n "isEnabled": "false",\r\n "radius": "6.0",\r\n "outwards": "false",\r\n "silent": "false",\r\n "conditionName": "pushDefault"\r\n }\r\n ]\r\n}'), (1090059, '/Chara/Npc/Populace/PopulaceStandard', 0, 19, '{\r\n "talkEventConditions": [\r\n {\r\n "unknown1": 4,\r\n "unknown2": 0,\r\n "conditionName": "talkDefault"\r\n }\r\n ],\r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}'), (1090060, '', 0, 0, NULL), (1090061, '', 0, 0, NULL), @@ -3533,8 +3533,8 @@ REPLACE INTO `gamedata_actor_class` (`id`, `classPath`, `displayNameId`, `proper (1280125, '/Chara/Npc/Object/Aetheryte/AetheryteChild', 4010015, 3, '{\r\n "talkEventConditions": [\r\n {\r\n "unknown1": 4,\r\n "unknown2": 0,\r\n "conditionName": "talkDefault"\r\n }\r\n ],\r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 4,\r\n "unknown2": 0,\r\n "conditionName": "pushCommand"\r\n },\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ],\r\n "pushWithCircleEventConditions": [\r\n {\r\n "radius": "3.0",\r\n "outwards": "false",\r\n "silent": "true",\r\n "conditionName": "pushCommandIn"\r\n },\r\n {\r\n "radius": "3.0",\r\n "outwards": "true",\r\n "silent": "true",\r\n "conditionName": "pushCommandOut"\r\n }\r\n ]\r\n}'), (1280126, '/Chara/Npc/Object/Aetheryte/AetheryteParent', 4010014, 3, '{\r\n "talkEventConditions": [\r\n {\r\n "unknown1": 4,\r\n "unknown2": 0,\r\n "conditionName": "talkDefault"\r\n }\r\n ],\r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 4,\r\n "unknown2": 0,\r\n "conditionName": "pushCommand"\r\n },\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ],\r\n "pushWithCircleEventConditions": [\r\n {\r\n "radius": "3.0",\r\n "outwards": "false",\r\n "silent": "true",\r\n "conditionName": "pushCommandIn"\r\n },\r\n {\r\n "radius": "3.0",\r\n "outwards": "true",\r\n "silent": "true",\r\n "conditionName": "pushCommandOut"\r\n }\r\n ]\r\n}'), (1280127, '/Chara/Npc/Object/Aetheryte/AetheryteParent', 4010014, 3, '{\r\n "talkEventConditions": [\r\n {\r\n "unknown1": 4,\r\n "unknown2": 0,\r\n "conditionName": "talkDefault"\r\n }\r\n ],\r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 4,\r\n "unknown2": 0,\r\n "conditionName": "pushCommand"\r\n },\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ],\r\n "pushWithCircleEventConditions": [\r\n {\r\n "radius": "3.0",\r\n "outwards": "false",\r\n "silent": "true",\r\n "conditionName": "pushCommandIn"\r\n },\r\n {\r\n "radius": "3.0",\r\n "outwards": "true",\r\n "silent": "true",\r\n "conditionName": "pushCommandOut"\r\n }\r\n ]\r\n}'), - (1290001, '', 0, 0, NULL), - (1290002, '/Chara/Npc/Object/PrivateAreaPastExit', 0, 1, '{\r\n "talkEventConditions": [],\r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 1,\r\n "unknown2": 0,\r\n "conditionName": "noticeEvent"\r\n }\r\n ],\r\n "emoteEventConditions": [],\r\n "pushWithCircleEventConditions": [\r\n {\r\n "conditionName": "exit",\r\n "radius": 60.0,\r\n "silent": true,\r\n "outwards": false\r\n },\r\n {\r\n "conditionName": "caution",\r\n "radius": 50.0,\r\n "silent": true,\r\n "outwards": false\r\n }\r\n ]\r\n}'), + (1290001, '', 0, 1, NULL), + (1290002, '/Chara/Npc/Object/PrivateAreaPastExit', 0, 1, '{\r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 1,\r\n "unknown2": 0,\r\n "conditionName": "noticeEvent"\r\n }\r\n ],\r\n "pushWithCircleEventConditions": [\r\n {\r\n "conditionName": "exit",\r\n "radius": 40.0,\r\n "silent": true,\r\n "outwards": true\r\n },\r\n {\r\n "conditionName": "caution",\r\n "radius": 30.0,\r\n "silent": true,\r\n "outwards": true\r\n }\r\n ]\r\n}'), (1290003, '', 0, 0, NULL), (1290004, '/Chara/Npc/Object/BgKeepout', 0, 1, NULL), (1290005, '', 0, 0, NULL), @@ -3554,7 +3554,7 @@ REPLACE INTO `gamedata_actor_class` (`id`, `classPath`, `displayNameId`, `proper (1290019, '', 0, 0, NULL), (1290020, '', 0, 0, NULL), (1290021, '', 0, 0, NULL), - (1290022, '', 0, 0, NULL), + (1290022, '/Chara/Npc/Object/ElevatorStandard', 0, 1, '{\r\n "talkEventConditions": [],\r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 4,\r\n "unknown2": 0,\r\n "conditionName": "pushCommand"\r\n },\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ],\r\n "pushWithCircleEventConditions": [\r\n {\r\n "radius": "2.0",\r\n "outwards": "false",\r\n "silent": "true",\r\n "conditionName": "pushCommandIn"\r\n },\r\n {\r\n "radius": "2.0",\r\n "outwards": "true",\r\n "silent": "true",\r\n "conditionName": "pushCommandOut"\r\n }\r\n ]\r\n}'), (1290023, '/Chara/Npc/Object/ElevatorStandard', 0, 1, '{\r\n "talkEventConditions": [],\r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 4,\r\n "unknown2": 0,\r\n "conditionName": "pushCommand"\r\n },\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ],\r\n "pushWithCircleEventConditions": [\r\n {\r\n "radius": "2.0",\r\n "outwards": "false",\r\n "silent": "true",\r\n "conditionName": "pushCommandIn"\r\n },\r\n {\r\n "radius": "2.0",\r\n "outwards": "true",\r\n "silent": "true",\r\n "conditionName": "pushCommandOut"\r\n }\r\n ]\r\n}'), (1290024, '', 0, 0, NULL), (1290025, '', 0, 0, NULL), @@ -3565,7 +3565,7 @@ REPLACE INTO `gamedata_actor_class` (`id`, `classPath`, `displayNameId`, `proper (1290030, '', 0, 0, NULL), (1290031, '', 0, 0, NULL), (1290032, '', 0, 0, NULL), - (1290033, '', 0, 0, NULL), + (1290033, '/Chara/Npc/Object/BgKeepout', 0, 1, '{\r\n "talkEventConditions": [],\r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 4,\r\n "unknown2": 0,\r\n "conditionName": "pushCommand"\r\n },\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ],\r\n "pushWithCircleEventConditions": [\r\n {\r\n "radius": "3.0",\r\n "outwards": "false",\r\n "silent": "true",\r\n "conditionName": "pushCommandIn"\r\n },\r\n {\r\n "radius": "3.0",\r\n "outwards": "true",\r\n "silent": "true",\r\n "conditionName": "pushCommandOut"\r\n }\r\n ]\r\n}'), (1500001, '/Chara/Npc/Populace/PopulaceGuildlevePublisher', 1200001, 19, '{\r\n "talkEventConditions": [\r\n {\r\n "unknown1": 4,\r\n "unknown2": 0,\r\n "conditionName": "talkDefault"\r\n }\r\n ],\r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}'), (1500002, '', 1900028, 0, NULL), (1500003, '/Chara/Npc/Populace/PopulaceFlyingShip', 1600069, 19, '{\r\n "talkEventConditions": [\r\n {\r\n "unknown1": 4,\r\n "unknown2": 0,\r\n "conditionName": "talkDefault"\r\n }\r\n ],\r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}'), @@ -4192,10 +4192,10 @@ REPLACE INTO `gamedata_actor_class` (`id`, `classPath`, `displayNameId`, `proper (1700042, '', 1100422, 0, NULL), (1700043, '', 4000570, 0, NULL), (1700044, '', 4000153, 0, NULL), - (2100101, '', 3100101, 0, NULL), + (2100101, '/Chara/Npc/Monster/Winglizard/WinglizardLesserStandard', 3100101, 0, NULL), (2100102, '', 3100102, 0, NULL), - (2100103, '', 3100103, 0, NULL), - (2100104, '', 3100104, 0, NULL), + (2100103, '/Chara/Npc/Monster/Winglizard/WinglizardLesserStandard', 3100103, 0, NULL), + (2100104, '/Chara/Npc/Monster/Winglizard/WinglizardStandard', 3100104, 0, NULL), (2100105, '', 3100105, 0, NULL), (2100106, '', 3100106, 0, NULL), (2100107, '', 3100107, 0, NULL), @@ -4213,7 +4213,7 @@ REPLACE INTO `gamedata_actor_class` (`id`, `classPath`, `displayNameId`, `proper (2100119, '', 3100118, 0, NULL), (2100120, '', 3100118, 0, NULL), (2100121, '', 3100118, 0, NULL), - (2100201, '', 3100205, 0, NULL), + (2100201, '/Chara/Npc/Monster/Raptor/RaptorStandard', 3100205, 0, NULL), (2100202, '', 3100206, 0, NULL), (2100203, '', 3100207, 0, NULL), (2100204, '', 3100208, 0, NULL), @@ -4246,9 +4246,9 @@ REPLACE INTO `gamedata_actor_class` (`id`, `classPath`, `displayNameId`, `proper (2100316, '', 3100313, 0, NULL), (2100317, '', 3100313, 0, NULL), (2100401, '', 3100401, 0, NULL), - (2100402, '', 3100402, 0, NULL), + (2100402, '/Chara/Npc/Monster/Griffin/GriffinStandard', 3100402, 0, NULL), (2100403, '', 3100403, 0, NULL), - (2100404, '', 3100404, 0, NULL), + (2100404, '/Chara/Npc/Monster/Griffin/GriffinStandard', 3100404, 0, NULL), (2100405, '', 3100405, 0, NULL), (2100406, '', 3100406, 0, NULL), (2100407, '', 3100407, 0, NULL), @@ -4258,10 +4258,10 @@ REPLACE INTO `gamedata_actor_class` (`id`, `classPath`, `displayNameId`, `proper (2100411, '', 3100411, 0, NULL), (2100412, '', 3100411, 0, NULL), (2100413, '', 3100411, 0, NULL), - (2100501, '', 3100501, 0, NULL), + (2100501, '/Chara/Npc/Monster/Monkey/MonkeyLesserStandard', 3100501, 0, NULL), (2100502, '/Chara/Npc/Monster/Monkey/MonkeyLesserStandard', 3100502, 0, NULL), - (2100503, '', 3100503, 0, NULL), - (2100504, '', 3100504, 0, NULL), + (2100503, '/Chara/Npc/Monster/Monkey/MonkeyStandard', 3100503, 0, NULL), + (2100504, '/Chara/Npc/Monster/Monkey/MonkeyLesserStandard', 3100504, 0, NULL), (2100505, '', 3100505, 0, NULL), (2100506, '', 3100506, 0, NULL), (2100507, '', 3100507, 0, NULL), @@ -4273,11 +4273,11 @@ REPLACE INTO `gamedata_actor_class` (`id`, `classPath`, `displayNameId`, `proper (2100513, '', 3100513, 0, NULL), (2100514, '', 3100513, 0, NULL), (2100515, '', 3100513, 0, NULL), - (2100516, '', 3100514, 0, NULL), - (2100517, '', 3100514, 0, NULL), - (2100518, '', 3100514, 0, NULL), + (2100516, '/Chara/Npc/Monster/Monkey/MonkeyLesserStandard', 3100514, 0, NULL), + (2100517, '/Chara/Npc/Monster/Monkey/MonkeyLesserStandard', 3100514, 0, NULL), + (2100518, '/Chara/Npc/Monster/Monkey/MonkeyLesserStandard', 3100514, 0, NULL), (2100519, '', 3100515, 0, NULL), - (2100601, '', 3100601, 0, NULL), + (2100601, '/Chara/Npc/Monster/Fly/FlyStandard', 3100601, 0, NULL), (2100602, '', 3100602, 0, NULL), (2100603, '', 3100603, 0, NULL), (2100604, '', 3100604, 0, NULL), @@ -4322,7 +4322,7 @@ REPLACE INTO `gamedata_actor_class` (`id`, `classPath`, `displayNameId`, `proper (2100901, '/Chara/Npc/Monster/Cactus/CactusLesserStandard', 3100901, 0, NULL), (2100902, '/Chara/Npc/Monster/Cactus/CactusLesserStandard', 3100902, 0, NULL), (2100903, '/Chara/Npc/Monster/Cactus/CactusLesserStandard', 3100903, 0, NULL), - (2100904, '/Chara/Npc/Monster/Cactus/CactusLesserStandard', 3100904, 0, NULL), + (2100904, '/Chara/Npc/Monster/Cactus/CactusStandard', 3100904, 0, NULL), (2100905, '/Chara/Npc/Monster/Cactus/CactusNormalStandard', 3100905, 0, NULL), (2100906, '/Chara/Npc/Monster/Cactus/CactusNormalStandard', 3100906, 0, NULL), (2100907, '/Chara/Npc/Monster/Cactus/CactusNormalStandard', 3100907, 0, NULL), @@ -5705,7 +5705,7 @@ REPLACE INTO `gamedata_actor_class` (`id`, `classPath`, `displayNameId`, `proper (2201308, '', 3201308, 0, NULL), (2201309, '', 3201309, 0, NULL), (2201401, '', 3201401, 0, NULL), - (2201402, '', 3201402, 0, NULL), + (2201402, '/Chara/Npc/Monster/Hyaena/HyaenaStandard', 3201402, 0, NULL), (2201403, '', 3201403, 0, NULL), (2201404, '/Chara/Npc/Monster/Wolf/WolfStandard', 3201405, 23, '{\r\n "talkEventConditions": [],\r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ],\r\n "emoteEventConditions": [],\r\n "pushWithCircleEventConditions": []\r\n}'), (2201405, '', 3201419, 0, NULL), @@ -5727,28 +5727,28 @@ REPLACE INTO `gamedata_actor_class` (`id`, `classPath`, `displayNameId`, `proper (2201421, '', 3101403, 0, NULL), (2201422, '', 3201421, 0, NULL), (2201423, '', 3201422, 0, NULL), - (2201424, '', 3201423, 0, NULL), + (2201424, '/Chara/Npc/Monster/Wolf/WolfStandard', 3201423, 0, NULL), (2201425, '', 3201424, 0, NULL), (2201426, '', 3201425, 0, NULL), (2201427, '', 3201426, 0, NULL), (2201428, '', 3201427, 0, NULL), (2201429, '', 3201428, 0, NULL), (2201430, '', 3101424, 0, NULL), - (2201501, '', 3201501, 0, NULL), + (2201501, '/Chara/Npc/Monster/Boar/BoarStandard', 3201501, 0, NULL), (2201502, '', 3201502, 0, NULL), (2201503, '', 3201503, 0, NULL), (2201504, '', 3201504, 0, NULL), (2201505, '', 3201505, 0, NULL), (2201506, '', 3201506, 0, NULL), (2201507, '', 3201507, 0, NULL), - (2201601, '', 3201601, 0, NULL), + (2201601, '/Chara/Npc/Monster/Bomb/BombStandard', 3201601, 0, NULL), (2201602, '', 3201602, 0, NULL), (2201603, '', 3201603, 0, NULL), (2201604, '', 3201604, 0, NULL), (2201605, '', 3201605, 0, NULL), (2201606, '', 3201607, 0, NULL), (2201607, '', 3201608, 0, NULL), - (2201608, '', 3201609, 0, NULL), + (2201608, '/Chara/Npc/Monster/Bomb/BombNormalStandard', 3201609, 0, NULL), (2201609, '', 3201610, 0, NULL), (2201610, '', 3201611, 0, NULL), (2201611, '', 3201612, 0, NULL), @@ -5777,7 +5777,7 @@ REPLACE INTO `gamedata_actor_class` (`id`, `classPath`, `displayNameId`, `proper (2201903, '', 3201903, 0, NULL), (2201904, '', 3201904, 0, NULL), (2201905, '', 3201905, 0, NULL), - (2202001, '', 3202001, 0, NULL), + (2202001, '/Chara/Npc/Monster/Dodo/DodoLesserStandard', 3202001, 0, NULL), (2202002, '', 3202002, 0, NULL), (2202003, '', 3202003, 0, NULL), (2202004, '', 3202004, 0, NULL), @@ -5918,7 +5918,7 @@ REPLACE INTO `gamedata_actor_class` (`id`, `classPath`, `displayNameId`, `proper (2203906, '', 3203906, 0, NULL), (2203907, '', 3203907, 0, NULL), (2203908, '', 3203908, 0, NULL), - (2204001, '', 3204001, 0, NULL), + (2204001, '/Chara/Npc/Monster/Lemming/LemmingStandard', 3204001, 0, NULL), (2204002, '', 3204002, 0, NULL), (2204003, '', 3204003, 0, NULL), (2204004, '', 3204004, 0, NULL), @@ -5945,8 +5945,8 @@ REPLACE INTO `gamedata_actor_class` (`id`, `classPath`, `displayNameId`, `proper (2204025, '', 3204025, 0, NULL), (2204026, '', 3204026, 0, NULL), (2204027, '', 3204027, 0, NULL), - (2204101, '', 3204101, 0, NULL), - (2204102, '', 3204102, 0, NULL), + (2204101, '/Chara/Npc/Monster/Bat/BatStandard', 3204101, 0, NULL), + (2204102, '/Chara/Npc/Monster/Bat/BatNormalStandard', 3204102, 0, NULL), (2204103, '', 3204103, 0, NULL), (2204104, '', 3204104, 0, NULL), (2204105, '', 3204105, 0, NULL), @@ -5971,7 +5971,7 @@ REPLACE INTO `gamedata_actor_class` (`id`, `classPath`, `displayNameId`, `proper (2204302, '', 3204302, 0, NULL), (2204303, '', 3204303, 0, NULL), (2204304, '', 3204304, 0, NULL), - (2204305, '', 3204305, 0, NULL), + (2204305, '/Chara/Npc/Monster/Petitghost/PetitghostLesserStandard', 3204305, 0, NULL), (2204306, '', 3204306, 0, NULL), (2204307, '', 3204307, 0, NULL), (2204308, '', 3204308, 0, NULL), @@ -6091,7 +6091,7 @@ REPLACE INTO `gamedata_actor_class` (`id`, `classPath`, `displayNameId`, `proper (2205519, '', 3205519, 0, NULL), (2205520, '', 3205520, 0, NULL), (2205521, '', 3205521, 0, NULL), - (2205601, '', 3205601, 0, NULL), + (2205601, '/Chara/Npc/Monster/Chigoe/ChigoeStandard', 3205601, 0, NULL), (2205602, '', 3205602, 0, NULL), (2205603, '', 3205603, 0, NULL), (2205604, '', 3205604, 0, NULL), @@ -6105,7 +6105,7 @@ REPLACE INTO `gamedata_actor_class` (`id`, `classPath`, `displayNameId`, `proper (2205612, '', 3205611, 0, NULL), (2205613, '', 3205612, 0, NULL), (2205614, '', 3205613, 0, NULL), - (2205701, '', 3205701, 0, NULL), + (2205701, '/Chara/Npc/Monster/Mole/MoleMoleStandard', 3205701, 0, NULL), (2205702, '', 3205702, 0, NULL), (2205703, '', 3205703, 0, NULL), (2205704, '', 3205704, 0, NULL), @@ -7171,10 +7171,10 @@ REPLACE INTO `gamedata_actor_class` (`id`, `classPath`, `displayNameId`, `proper (5000089, '/Chara/Npc/MapObj/MarketStand', 0, 1, '{ \r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}\r\n'), (5000090, '/Chara/Npc/MapObj/MarketStand', 0, 1, '{ \r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}\r\n'), (5000101, '', 0, 0, NULL), - (5000106, '', 0, 0, NULL), - (5000107, '', 0, 0, NULL), - (5000108, '', 0, 0, NULL), - (5000109, '', 0, 0, NULL), + (5000106, '/Chara/Npc/MapObj/CompanyShip', 0, 1, '{ \r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}\r\n'), + (5000107, '/Chara/Npc/MapObj/CompanyShip', 0, 1, '{ \r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}\r\n'), + (5000108, '/Chara/Npc/MapObj/CompanyShip', 0, 1, '{ \r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}\r\n'), + (5000109, '/Chara/Npc/MapObj/CompanyShip', 0, 1, '{ \r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}\r\n'), (5000116, '', 0, 0, NULL), (5000117, '', 0, 0, NULL), (5000118, '', 0, 0, NULL), @@ -7185,11 +7185,11 @@ REPLACE INTO `gamedata_actor_class` (`id`, `classPath`, `displayNameId`, `proper (5900002, '/Chara/Npc/MapObj/DoorStandard', 0, 1, '{ \r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}'), (5900003, '/Chara/Npc/MapObj/DoorStandard', 0, 1, '{ \r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}'), (5900004, '/Chara/Npc/MapObj/DoorStandard', 0, 1, '{ \r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}'), - (5900005, '', 0, 0, NULL), + (5900005, '/Chara/Npc/MapObj/BarrierTree', 0, 1, '{ \r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}'), (5900006, '/Chara/Npc/MapObj/MapObjOnlyShowHide', 0, 1, '{ \r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}'), (5900007, '/Chara/Npc/MapObj/MapObjOnlyShowHide', 0, 1, '{ \r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}'), - (5900008, '', 0, 0, NULL), - (5900009, '', 0, 0, NULL), + (5900008, '/Chara/Npc/MapObj/MapObjClam', 0, 1, '{ \r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}'), + (5900009, '/Chara/Npc/MapObj/MapObjClam', 0, 1, '{ \r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}'), (5900010, '/Chara/Npc/MapObj/MapObjPortDoor', 0, 1, '{ \r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}'), (5900011, '/Chara/Npc/MapObj/MapObjShipPort', 0, 1, '{ \r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}'), (5900012, '/Chara/Npc/MapObj/MapObjPortDoor', 0, 1, '{ \r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}'), @@ -7200,25 +7200,25 @@ REPLACE INTO `gamedata_actor_class` (`id`, `classPath`, `displayNameId`, `proper (5900017, '/Chara/Npc/MapObj/MapObjTutorial', 0, 1, '{ \r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}'), (5900018, '/Chara/Npc/MapObj/MapObjTutorial', 0, 1, '{ \r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}'), (5900019, '/Chara/Npc/MapObj/MapObjTutorial', 0, 1, '{ \r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}'), - (5900020, '', 0, 0, NULL), - (5900021, '', 0, 0, NULL), - (5900022, '', 0, 0, NULL), - (5900023, '', 0, 0, NULL), - (5900024, '', 0, 0, NULL), - (5900025, '', 0, 0, NULL), - (5900026, '', 0, 0, NULL), - (5900027, '', 0, 0, NULL), - (5900028, '', 0, 0, NULL), + (5900020, '/Chara/Npc/MapObj/MapObjTutorial', 0, 1, '{ \r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}'), + (5900021, '/Chara/Npc/MapObj/MapObjTutorial', 0, 1, '{ \r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}'), + (5900022, '/Chara/Npc/MapObj/MapObjTutorial', 0, 1, '{ \r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}'), + (5900023, '/Chara/Npc/MapObj/MapObjTutorial', 0, 1, '{ \r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}'), + (5900024, '/Chara/Npc/MapObj/MapObjTutorial', 0, 1, '{ \r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}'), + (5900025, '/Chara/Npc/MapObj/MapObjTutorial', 0, 1, '{ \r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}'), + (5900026, '/Chara/Npc/MapObj/MapObjOneWayDoor', 0, 1, '{ \r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}'), + (5900027, '/Chara/Npc/MapObj/MapObjOneWayDoor', 0, 1, '{ \r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}'), + (5900028, '/Chara/Npc/MapObj/MapObjOneWayDoor', 0, 1, '{ \r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}'), (5900029, '', 0, 0, NULL), (5900030, '', 0, 0, NULL), - (5900031, '', 3209510, 0, NULL), - (5900032, '', 3209510, 0, NULL), - (5900033, '', 3209510, 0, NULL), - (5900034, '', 3209510, 0, NULL), - (5900035, '', 3209510, 0, NULL), - (5900036, '', 0, 0, NULL), - (5900037, '', 0, 0, NULL), - (5900038, '', 0, 0, NULL), + (5900031, '/Chara/Npc/MapObj/MapObjStandard', 3209510, 1, '{ \r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}'), + (5900032, '/Chara/Npc/MapObj/MapObjStandard', 3209510, 1, '{ \r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}'), + (5900033, '/Chara/Npc/MapObj/MapObjStandard', 3209510, 1, '{ \r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}'), + (5900034, '/Chara/Npc/MapObj/MapObjStandard', 3209510, 1, '{ \r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}'), + (5900035, '/Chara/Npc/MapObj/MapObjStandard', 3209510, 1, '{ \r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}'), + (5900036, '/Chara/Npc/MapObj/MapObjFireworks', 0, 1, '{ \r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}'), + (5900037, '/Chara/Npc/MapObj/MapObjFireworks', 0, 1, '{ \r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}'), + (5900038, '/Chara/Npc/MapObj/MapObjFireworks', 0, 1, '{ \r\n "noticeEventConditions": [\r\n {\r\n "unknown1": 0,\r\n "unknown2": 1,\r\n "conditionName": "noticeEvent"\r\n }\r\n ]\r\n}'), (6000001, '', 1500032, 0, NULL), (6000002, '', 1500032, 0, NULL), (6000003, '', 1500032, 0, NULL), diff --git a/Data/sql/server_eventnpc_mapobj.sql b/Data/sql/server_eventnpc_mapobj.sql new file mode 100644 index 00000000..8caa600a --- /dev/null +++ b/Data/sql/server_eventnpc_mapobj.sql @@ -0,0 +1,104 @@ +-- -------------------------------------------------------- +-- Host: 127.0.0.1 +-- Server version: 5.6.17 - MySQL Community Server (GPL) +-- Server OS: Win64 +-- HeidiSQL Version: 10.1.0.5464 +-- -------------------------------------------------------- + +/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; +/*!40101 SET NAMES utf8 */; +/*!50503 SET NAMES utf8mb4 */; +/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; +/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; + + +-- Dumping database structure for ffxiv_server +CREATE DATABASE IF NOT EXISTS `ffxiv_server` /*!40100 DEFAULT CHARACTER SET latin1 */; +USE `ffxiv_server`; + +-- Dumping structure for table ffxiv_server.server_eventnpc_mapobj +CREATE TABLE IF NOT EXISTS `server_eventnpc_mapobj` ( + `id` int(10) unsigned NOT NULL, + `layoutId` int(10) unsigned NOT NULL, + `instanceId` int(10) unsigned NOT NULL +) ENGINE=InnoDB DEFAULT CHARSET=latin1; + +-- Dumping data for table ffxiv_server.server_eventnpc_mapobj: ~65 rows (approximately) +/*!40000 ALTER TABLE `server_eventnpc_mapobj` DISABLE KEYS */; +REPLACE INTO `server_eventnpc_mapobj` (`id`, `layoutId`, `instanceId`) VALUES + (589, 321, 3294), + (590, 391, 2), + (624, 321, 2948), + (623, 321, 2947), + (564, 321, 2946), + (626, 321, 2945), + (621, 321, 2942), + (552, 321, 2941), + (625, 321, 2944), + (622, 321, 2943), + (627, 331, 5290), + (0, 5141, 201), + (0, 5141, 201), + (494, 121, 2418), + (469, 131, 7054), + (468, 131, 7049), + (496, 121, 2422), + (480, 121, 2388), + (481, 121, 2390), + (479, 121, 2386), + (482, 121, 2392), + (486, 121, 2400), + (483, 121, 2394), + (485, 121, 2398), + (484, 121, 2396), + (497, 121, 2413), + (476, 121, 2380), + (477, 121, 2382), + (475, 121, 2378), + (478, 121, 2384), + (472, 121, 2372), + (473, 121, 2374), + (471, 121, 2370), + (474, 121, 2376), + (489, 121, 2408), + (487, 121, 2402), + (488, 121, 2406), + (491, 121, 2412), + (490, 121, 2410), + (492, 121, 2413), + (493, 121, 2416), + (495, 121, 2420), + (500, 196, 456), + (0, 391, 2), + (146, 141, 4040), + (145, 141, 4125), + (144, 141, 4039), + (143, 141, 4038), + (280, 141, 4044), + (282, 141, 4126), + (283, 141, 4043), + (286, 141, 4042), + (281, 141, 4057), + (285, 141, 4059), + (284, 141, 4041), + (279, 141, 4055), + (287, 431, 3525), + (0, 491, 2), + (730, 5145, 252), + (729, 5144, 201), + (927, 5143, 326), + (926, 5142, 323), + (929, 5142, 326), + (928, 5143, 323), + (470, 131, 7056), + (2047, 421, 4043), + (871, 321, 2937), + (628, 421, 2825), + (629, 421, 2829), + (938, 421, 4040), + (2050, 421, 4289); +/*!40000 ALTER TABLE `server_eventnpc_mapobj` ENABLE KEYS */; + +/*!40101 SET SQL_MODE=IFNULL(@OLD_SQL_MODE, '') */; +/*!40014 SET FOREIGN_KEY_CHECKS=IF(@OLD_FOREIGN_KEY_CHECKS IS NULL, 1, @OLD_FOREIGN_KEY_CHECKS) */; +/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; diff --git a/Data/sql/server_eventnpc_spawn_locations.sql b/Data/sql/server_eventnpc_spawn_locations.sql index c9eb624e..e93c832f 100644 --- a/Data/sql/server_eventnpc_spawn_locations.sql +++ b/Data/sql/server_eventnpc_spawn_locations.sql @@ -32,7 +32,7 @@ CREATE TABLE IF NOT EXISTS `server_eventnpc_spawn_locations` ( PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1; --- Dumping data for table ffxiv_server.server_eventnpc_spawn_locations: ~1,058 rows (approximately) +-- Dumping data for table ffxiv_server.server_eventnpc_spawn_locations: ~1,088 rows (approximately) /*!40000 ALTER TABLE `server_eventnpc_spawn_locations` DISABLE KEYS */; REPLACE INTO `server_eventnpc_spawn_locations` (`id`, `actorClassId`, `uniqueId`, `zoneId`, `privateAreaName`, `privateAreaLevel`, `positionX`, `positionY`, `positionZ`, `rotation`, `motionPack`) VALUES (1, 2104001, 'wharf_rat', 1, '', 0, -84.628, 54.497, -3.52, 2.491, 0), @@ -280,7 +280,7 @@ REPLACE INTO `server_eventnpc_spawn_locations` (`id`, `actorClassId`, `uniqueId` (245, 1090044, '', 209, '', 0, -91.35, 196.02, 323.18, 1.97, 0), (246, 1090051, '', 209, '', 0, 38.29, 195.99, 247.09, 0, 0), (247, 1090055, '', 209, '', 0, -110.2, 224, 212.37, 0, 0), - (248, 1090058, '', 209, '', 0, -121.99, 201.5, 257.62, 0, 0), + (248, 1090058, 'trigger_gld', 209, '', 0, -121.99, 201.5, 257.62, 0, 0), (249, 1090077, '', 209, '', 0, -177.81, 192.56, 209.92, -0.47, 0), (250, 1090119, '', 209, '', 0, -216.38, 229.5, 302.07, 0, 0), (251, 1090123, '', 209, '', 0, -135.965, 201.5, 280.14, 0, 0), @@ -532,17 +532,17 @@ REPLACE INTO `server_eventnpc_spawn_locations` (`id`, `actorClassId`, `uniqueId` (498, 5900010, '', 230, '', 0, -811.176, 8.03, 234.815, 0, 0), (499, 5900012, '', 230, '', 0, -806.893, 8.03, 240.885, 0, 0), (500, 5900011, 'limsa_shipport', 230, '', 0, -846.89, 5, 240, 0, 0), - (501, 1000042, 'ascilia', 184, '', 0, -1.5, 196, 124.5, 1.8, 0), - (502, 1000186, 'warburton', 184, '', 0, -0.2, 196, 123.26, -0.8, 0), - (503, 1001644, 'stocky_stranger', 184, '', 0, 12.18, 196, 133.42, -1.26, 1017), - (504, 1000840, 'rururaji', 184, '', 0, 9.07, 196, 126.69, -1.26, 1017), - (505, 1001490, 'big-bellied_barker', 184, '', 0, -19.7, 196, 79.93, -0.38, 1009), - (506, 1001491, 'fretful_farmhand', 184, '', 0, 3.4, 196, 115.5, 2.7, 1021), - (507, 1001492, 'debauched_demoness', 184, '', 0, 0.8, 196, 103.18, -1.13, 1015), - (508, 1001493, 'dapper_dan', 184, '', 0, -33.57, 196, 82.42, 1.63, 1013), - (509, 1001494, 'loutish_lad', 184, '', 0, -9.13, 196, 114.84, 2.33, 1031), - (510, 1001495, 'gil-digging_mistress', 184, '', 0, -19.11, 196, 95.09, 2.13, 1037), - (511, 1001496, 'twittering_tomboy', 184, '', 0, -32.37, 196, 80.75, -0.74, 1101), + (501, 1000042, 'man0u0_ascilia', 184, '', 0, -1.5, 196, 124.5, 1.8, 0), + (502, 1000186, 'man0u0_warburton', 184, '', 0, -0.2, 196, 123.26, -0.8, 0), + (503, 1001644, 'man0u0_stocky_stranger', 184, '', 0, 12.18, 196, 133.42, -1.26, 1017), + (504, 1000840, 'man0u0_rururaji', 184, '', 0, 9.07, 196, 126.69, -1.26, 1017), + (505, 1001490, 'man0u0_big-bellied_barker', 184, '', 0, -19.7, 196, 79.93, -0.38, 1009), + (506, 1001491, 'man0u0_fretful_farmhand', 184, '', 0, 3.4, 196, 115.5, 2.7, 1021), + (507, 1001492, 'man0u0_debauched_demoness', 184, '', 0, 0.8, 196, 103.18, -1.13, 1015), + (508, 1001493, 'man0u0_dapper_dan', 184, '', 0, -33.57, 196, 82.42, 1.63, 1013), + (509, 1001494, 'man0u0_loutish_lad', 184, '', 0, -9.13, 196, 114.84, 2.33, 1031), + (510, 1001495, 'man0u0_gil-digging_mistress', 184, '', 0, -19.11, 196, 95.09, 2.13, 1037), + (511, 1001496, 'man0u0_twittering_tomboy', 184, '', 0, -32.37, 196, 80.75, -0.74, 1101), (512, 1280127, '', 0, '', 0, -400, 19, 338, 0, 0), (513, 1090372, 'exit_trigger', 184, '', 0, -13, 194.91, 76.75, 0, 0), (514, 1000438, 'well-traveled_merchant', 193, '', 0, -0.71, 10.35, -40.51, 0.3, 1035), @@ -658,8 +658,8 @@ REPLACE INTO `server_eventnpc_spawn_locations` (`id`, `actorClassId`, `uniqueId` (625, 5900001, 'guild_lnc', 206, '', 0, 172, 28, -1576, 0, 0), (626, 5900001, 'guild_arc', 206, '', 0, 227, 12, -1264, 0, 0), (627, 5900001, 'guild_cnj', 206, '', 0, -325, 8, -1669, 0, 0), - (628, 5900004, 'door1', 184, '', 0, -14, 196, 112, 0, 0), - (629, 5900004, 'door2', 184, '', 0, 12, 196, 184, 0, 0), + (628, 5900004, 'man0u0_door1_closed', 184, '', 0, -14, 196, 112, 0, 0), + (629, 5900004, 'man0u0_door2_closed', 184, '', 0, 12, 196, 184, 0, 0), (630, 5900011, 'uldah_mapshipport_2', 209, '', 0, -127, 271, 157, 0, 0), (631, 1000466, 'frances', 206, '', 0, 11.85, 8.75, -1266.45, 1.48, 1041), (632, 1200288, 'miniaeth_adv', 155, '', 0, 98.77, 3.59, -1213.67, 2.47, 0), @@ -856,47 +856,47 @@ REPLACE INTO `server_eventnpc_spawn_locations` (`id`, `actorClassId`, `uniqueId` (827, 1280126, '', 0, '', 0, 484, 19, 672, 0, 0), (828, 1280127, '', 0, '', 0, -400, 19, 338, 0, 0), (832, 1090373, 'opening_stoper_uldah', 184, '', 0, 27.42, 192, 126.94, 0.33, 0), - (835, 1000444, 'undignified_adventurer', 230, 'PrivateAreaMasterPast', 1, -832.36, 6, 209.44, -0.35, 1041), - (836, 1000438, 'well-traveled_merchant', 230, 'PrivateAreaMasterPast', 1, -831.73, 6, 196.77, 0.86, 1035), - (837, 1000447, 'voluptuous_vixen', 230, 'PrivateAreaMasterPast', 1, -863.34, 4, 236.13, 0.93, 1016), - (838, 1000450, 'lanky_traveler', 230, 'PrivateAreaMasterPast', 1, -855.68, 3.1, 258.51, -1.56, 1015), - (839, 1000151, 'hob', 230, 'PrivateAreaMasterPast', 1, -834.77, 6, 241.55, -2.79, 1041), - (840, 1000260, 'pearly-toothed_porter', 230, 'PrivateAreaMasterPast', 1, -823.86, 6, 198.95, 0.13, 1070), - (841, 1000264, 'pasty-faced_adventurer', 230, 'PrivateAreaMasterPast', 1, -829.72, 6, 260.6, -1.07, 1058), - (842, 1000261, 'muscle-bound_deckhand', 230, 'PrivateAreaMasterPast', 1, -823.75, 6, 200.27, -2.7, 1033), - (843, 1500004, 'gert', 230, 'PrivateAreaMasterPast', 1, -809.15, 8, 230.88, 0.4, 1016), - (844, 1500005, 'lorhzant', 230, 'PrivateAreaMasterPast', 1, -809.19, 8, 244.86, -2.78, 1017), + (835, 1000444, 'man0l0_undignified_adventurer', 230, 'PrivateAreaMasterPast', 1, -832.36, 6, 209.44, -0.35, 1041), + (836, 1000438, 'man0l0_well-traveled_merchant', 230, 'PrivateAreaMasterPast', 1, -831.73, 6, 196.77, 0.86, 1035), + (837, 1000447, 'man0l0_voluptuous_vixen', 230, 'PrivateAreaMasterPast', 1, -863.34, 4, 236.13, 0.93, 1016), + (838, 1000450, 'man0l0_lanky_traveler', 230, 'PrivateAreaMasterPast', 1, -855.68, 3.1, 258.51, -1.56, 1015), + (839, 1000151, 'man0l0_hob', 230, 'PrivateAreaMasterPast', 1, -834.77, 6, 241.55, -2.79, 1041), + (840, 1000260, 'man0l0_pearly-toothed_porter', 230, 'PrivateAreaMasterPast', 1, -823.86, 6, 198.95, 0.13, 1070), + (841, 1000264, 'man0l0_pasty-faced_adventurer', 230, 'PrivateAreaMasterPast', 1, -829.72, 6, 260.6, -1.07, 1058), + (842, 1000261, 'man0l0_muscle-bound_deckhand', 230, 'PrivateAreaMasterPast', 1, -823.75, 6, 200.27, -2.7, 1033), + (843, 1500004, 'man0l0_gert', 230, 'PrivateAreaMasterPast', 1, -809.15, 8, 230.88, 0.4, 1016), + (844, 1500005, 'man0l0_lorhzant', 230, 'PrivateAreaMasterPast', 1, -809.19, 8, 244.86, -2.78, 1017), (845, 1000137, 'man0l1_baderon', 133, 'PrivateAreaMasterPast', 2, -430.844, 40.2116, 186.773, -1.30039, 1060), - (846, 1290002, 'privatearea_exit', 230, 'PrivateAreaMasterPast', 1, -838.1, 6, 231.94, 0, 0), - (847, 1000099, 'skittish_adventurer', 133, 'PrivateAreaMasterPast', 2, -442.743, 39.5, 185.32, -1.69155, 1002), - (848, 1000098, 'onyx-haired_adventurer', 133, 'PrivateAreaMasterPast', 2, -446.004, 39.5, 184.858, 1.482, 1002), - (849, 1000076, 'duplicitous_trader', 133, 'PrivateAreaMasterPast', 2, -442.31, 39.5, 193.317, 0.581998, 1019), - (850, 1000075, 'crapulous_adventurer', 133, 'PrivateAreaMasterPast', 2, -450.865, 39.5, 194.59, 1.538, 1019), - (851, 1000100, 'relaxing_adventurer', 133, 'PrivateAreaMasterPast', 2, -449.132, 39.5, 196.246, 3.108, 1003), - (852, 1000167, 'mytesyn', 133, 'PrivateAreaMasterPast', 2, -435.2, 40, 207.07, -1.9, 0), - (853, 1000077, 'debonair_pirate', 133, 'PrivateAreaMasterPast', 2, -452.427, 39.5, 202.873, 2.25598, 1003), - (854, 1000001, 'yshtola', 133, 'PrivateAreaMasterPast', 2, -463.547, 40, 183.262, -1.3983, 0), - (855, 1001643, 'cocksure-cockswain', 133, 'PrivateAreaMasterPast', 2, -445.719, 40, 221.513, -1.59477, 0), - (856, 1001649, 'sententious_sellsword', 133, 'PrivateAreaMasterPast', 2, -473.359, 40, 207.664, 2.742, 0), - (857, 1001650, 'solicitous_sellsword', 133, 'PrivateAreaMasterPast', 2, -445.765, 43, 167.759, -1.59122, 0), - (858, 1000951, 'lonsygg', 155, 'PrivateAreaMasterPast', 1, 107.96, 9.4, -1211.89, 0.3243, 1031), - (859, 1000876, 'tkebbe', 155, 'PrivateAreaMasterPast', 1, 175.76, -1.25, -1151.11, -2.67, 1015), - (860, 1000017, 'farrimond', 155, 'PrivateAreaMasterPast', 1, 181.82, -1, -1154.03, -1.57, 1017), - (861, 1000680, 'swethyna', 155, 'PrivateAreaMasterPast', 1, 163.58, -1.44, -1153.96, 2.23, 1015), - (862, 1000683, 'cecilia', 155, 'PrivateAreaMasterPast', 1, 161.5, -1.48, -1156.34, 1.44, 1016), - (863, 1000230, 'miounne', 155, 'PrivateAreaMasterPast', 2, 57.42, 4, -1196.69, 1.67, 1060), - (864, 1001062, 'beaming_adventurer', 155, 'PrivateAreaMasterPast', 2, 67.4, 4, -1208.22, -2.63, 1005), - (865, 1001057, 'amiable_adventurer', 155, 'PrivateAreaMasterPast', 2, 64.89, 4, -1209.33, 1.74, 1002), - (866, 1001060, 'well-bundled_adventurer', 155, 'PrivateAreaMasterPast', 2, 71.83, 4, -1200.14, -0.88, 1005), - (867, 1001059, 'narrow-eyed_adventurer', 155, 'PrivateAreaMasterPast', 2, 69.62, 4, -1199.51, 1.29, 1005), - (868, 1001058, 'morose_merchant', 155, 'PrivateAreaMasterPast', 2, 66.26, 4, -1199.79, -2.71, 1005), - (869, 1000562, 'wispily_whiskered_woodworker', 155, 'PrivateAreaMasterPast', 2, 64.41, 4, -1199.61, 1.71, 0), - (870, 1000458, 'vkorolon', 155, 'PrivateAreaMasterPast', 2, 55.82, 4, -1212.23, 1.91, 0), - (871, 5900004, 'closed_gridania_gate', 155, 'PrivateAreaMasterPast', 1, 185, -1, -1154, 0, 0), + (846, 1290002, 'man0l0_privatearea_exit', 230, 'PrivateAreaMasterPast', 1, -838.1, 6, 231.94, 0, 0), + (847, 1000099, 'man0l1_skittish_adventurer', 133, 'PrivateAreaMasterPast', 2, -442.743, 39.5, 185.32, -1.69155, 1002), + (848, 1000098, 'man0l1_onyx-haired_adventurer', 133, 'PrivateAreaMasterPast', 2, -446.004, 39.5, 184.858, 1.482, 1002), + (849, 1000076, 'man0l1_duplicitous_trader', 133, 'PrivateAreaMasterPast', 2, -442.31, 39.5, 193.317, 0.581998, 1019), + (850, 1000075, 'man0l1_crapulous_adventurer', 133, 'PrivateAreaMasterPast', 2, -450.865, 39.5, 194.59, 1.538, 1019), + (851, 1000100, 'man0l1_relaxing_adventurer', 133, 'PrivateAreaMasterPast', 2, -449.132, 39.5, 196.246, 3.108, 1003), + (852, 1000167, 'man0l1_mytesyn', 133, 'PrivateAreaMasterPast', 2, -435.2, 40, 207.07, -1.9, 0), + (853, 1000077, 'man0l1_debonair_pirate', 133, 'PrivateAreaMasterPast', 2, -452.427, 39.5, 202.873, 2.25598, 1003), + (854, 1000001, 'man0l1_yshtola', 133, 'PrivateAreaMasterPast', 2, -463.547, 40, 183.262, -1.3983, 0), + (855, 1001643, 'man0l1_cocksure-cockswain', 133, 'PrivateAreaMasterPast', 2, -445.719, 40, 221.513, -1.59477, 0), + (856, 1001649, 'man0l1_sententious_sellsword', 133, 'PrivateAreaMasterPast', 2, -473.359, 40, 207.664, 2.742, 0), + (857, 1001650, 'man0l1_solicitous_sellsword', 133, 'PrivateAreaMasterPast', 2, -445.765, 43, 167.759, -1.59122, 0), + (858, 1000951, 'man0g0_lonsygg', 155, 'PrivateAreaMasterPast', 1, 107.96, 9.4, -1211.89, 0.3243, 1031), + (859, 1000876, 'man0g0_tkebbe', 155, 'PrivateAreaMasterPast', 1, 175.76, -1.25, -1151.11, -2.67, 1015), + (860, 1000017, 'man0g0_farrimond', 155, 'PrivateAreaMasterPast', 1, 181.82, -1, -1154.03, -1.57, 1017), + (861, 1000680, 'man0g0_swethyna', 155, 'PrivateAreaMasterPast', 1, 163.58, -1.44, -1153.96, 2.23, 1015), + (862, 1000683, 'man0g0_cecilia', 155, 'PrivateAreaMasterPast', 1, 161.5, -1.48, -1156.34, 1.44, 1016), + (863, 1000230, 'man0g1_miounne', 155, 'PrivateAreaMasterPast', 2, 57.42, 4, -1196.69, 1.67, 1060), + (864, 1001062, 'man0g1_beaming_adventurer', 155, 'PrivateAreaMasterPast', 2, 67.4, 4, -1208.22, -2.63, 1005), + (865, 1001057, 'man0g1_amiable_adventurer', 155, 'PrivateAreaMasterPast', 2, 64.89, 4, -1209.33, 1.74, 1002), + (866, 1001060, 'man0g1_well-bundled_adventurer', 155, 'PrivateAreaMasterPast', 2, 71.83, 4, -1200.14, -0.88, 1005), + (867, 1001059, 'man0g1_narrow-eyed_adventurer', 155, 'PrivateAreaMasterPast', 2, 69.62, 4, -1199.51, 1.29, 1005), + (868, 1001058, 'man0g1_morose_merchant', 155, 'PrivateAreaMasterPast', 2, 66.26, 4, -1199.79, -2.71, 1005), + (869, 1000562, 'man0g1_wispily_whiskered_woodwor', 155, 'PrivateAreaMasterPast', 2, 64.41, 4, -1199.61, 1.71, 0), + (870, 1000458, 'man0g1_vkorolon', 155, 'PrivateAreaMasterPast', 2, 55.82, 4, -1212.23, 1.91, 0), + (871, 5900004, 'man0g0_closed_gridania_gate', 155, 'PrivateAreaMasterPast', 1, 185, -1, -1154, 0, 0), (872, 1099047, 'gridania_blocker1', 155, 'PrivateAreaMasterPast', 1, 105.945, 10.851, -1217.8, 0, 0), (874, 1001430, 'kinnison', 206, '', 0, -194, 23, -1610, 0.9, 0), - (875, 1099046, 'gridania_opening_exit', 155, 'PrivateAreaMasterPast', 1, 72.19, 4, -1207.91, 1.17, 0), - (876, 1001648, 'unconcerned_passerby', 155, 'PrivateAreaMasterPast', 2, 77.577, 3.953, -1210.66, -0.518, 0), + (875, 1099046, 'man0g0_gridania_opening_exit', 155, 'PrivateAreaMasterPast', 1, 72.19, 4, -1207.91, 1.17, 0), + (876, 1001648, 'man0g1_unconcerned_passerby', 155, 'PrivateAreaMasterPast', 2, 77.577, 3.953, -1210.66, -0.518, 0), (882, 1500007, 'didiwai', 128, '', 0, 23.98, 46.05, -42.96, 0.6, 1041), (883, 1000613, 'nahctahr', 128, '', 0, 22.57, 45.5, -23.08, 1.5, 1041), (884, 1000359, 'ryssfloh', 128, '', 0, 58.78, 46.1, -12.45, 0.6, 1056), @@ -953,7 +953,7 @@ REPLACE INTO `server_eventnpc_spawn_locations` (`id`, `actorClassId`, `uniqueId` (935, 1060027, 'yoshi_p', 130, '', 0, 1117.76, 52.143, -445.258, 2.173, 0), (936, 5900004, 'door1', 175, 'PrivateAreaMasterPast', 3, 14, 196, 174, 0, 0), (937, 5900004, 'door2', 175, 'PrivateAreaMasterPast', 3, 12, 196, 184, 0, 0), - (938, 5900004, 'door3', 184, '', 0, -44, 196, 68, 0, 0), + (938, 5900004, 'man0u0_door3_closed', 184, '', 0, -44, 196, 68, 0, 0), (939, 1001042, 'high-spirited_fellow', 175, 'PrivateAreaMasterPast', 3, -36.23, 196, 80, 1.8, 0), (940, 1001044, 'disreputable_midlander', 175, 'PrivateAreaMasterPast', 3, -23.92, 196, 76.73, -0.15, 0), (941, 1000840, 'rururaji', 175, 'PrivateAreaMasterPast', 3, -13.509, 196, 86.927, -1.521, 1017), @@ -1040,17 +1040,17 @@ REPLACE INTO `server_eventnpc_spawn_locations` (`id`, `actorClassId`, `uniqueId` (1022, 1500254, 'ignemortel', 135, '', 0, -293.673, 77.449, -2257.91, -3.075, 0), (1023, 1500017, 'iron_lake_battlewarden', 135, '', 0, -284.793, 77.866, -2277.5, -0.685, 0), (1024, 1001697, 'storm_sergeant_nolan', 135, '', 0, -298.5, 77.56, -2271.47, 0.851, 0), - (1025, 1000869, 'adventurer1', 230, 'PrivateAreaMasterPast', 3, -602.241, 43, -62.3205, 0.75078, 1022), - (1026, 1000870, 'adventurer2', 230, 'PrivateAreaMasterPast', 3, -602.516, 43, -61.557, 1.206, 1022), - (1027, 1000871, 'adventurer3', 230, 'PrivateAreaMasterPast', 3, -612.158, 43, -60.8377, -2.89358, 1022), - (1028, 1000142, 'mannskoen', 230, 'PrivateAreaMasterPast', 3, -626.34, 43.631, -63.504, 1.07, 1015), - (1029, 1000107, 'overeager_barracuda', 230, 'PrivateAreaMasterPast', 3, -605.868, 43, -75.147, -0.715, 0), - (1030, 1000108, 'sophisticated_barracuda', 230, 'PrivateAreaMasterPast', 3, -619.348, 43.631, -77.254, 0.965, 1015), - (1031, 1000161, 'totoruto', 230, 'PrivateAreaMasterPast', 3, -603.41, 43, -70.45, -1.21, 1026), - (1032, 1000109, 'smirking_barracuda', 230, 'PrivateAreaMasterPast', 3, -612.586, 43, -78.737, -0.175, 1002), - (1033, 1000096, 'nervous_barracuda', 230, 'PrivateAreaMasterPast', 3, -617.429, 43, -54.065, 2.953, 1003), - (1034, 1000097, 'intimidating_barracuda', 230, 'PrivateAreaMasterPast', 3, -623.407, 43, -56.981, 2.415, 1003), - (1035, 1090003, 'push_man0l1_exit_echo', 230, 'PrivateAreaMasterPast', 3, -598.37, 42.1, -50.28, 0.61, 0), + (1025, 1000869, 'man0l1_adventurer1', 230, 'PrivateAreaMasterPast', 3, -602.241, 43, -62.3205, 0.75078, 1022), + (1026, 1000870, 'man0l1_adventurer2', 230, 'PrivateAreaMasterPast', 3, -602.516, 43, -61.557, 1.206, 1022), + (1027, 1000871, 'man0l1_adventurer3', 230, 'PrivateAreaMasterPast', 3, -612.158, 43, -60.8377, -2.89358, 1022), + (1028, 1000142, 'man0l1_mannskoen', 230, 'PrivateAreaMasterPast', 3, -626.34, 43.631, -63.504, 1.07, 1015), + (1029, 1000107, 'man0l1_overeager_barracuda', 230, 'PrivateAreaMasterPast', 3, -605.868, 43, -75.147, -0.715, 0), + (1030, 1000108, 'man0l1_sophisticated_barracuda', 230, 'PrivateAreaMasterPast', 3, -619.348, 43.631, -77.254, 0.965, 1015), + (1031, 1000161, 'man0l1_totoruto', 230, 'PrivateAreaMasterPast', 3, -603.41, 43, -70.45, -1.21, 1026), + (1032, 1000109, 'man0l1_smirking_barracuda', 230, 'PrivateAreaMasterPast', 3, -612.586, 43, -78.737, -0.175, 1002), + (1033, 1000096, 'man0l1_nervous_barracuda', 230, 'PrivateAreaMasterPast', 3, -617.429, 43, -54.065, 2.953, 1003), + (1034, 1000097, 'man0l1_intimidating_barracuda', 230, 'PrivateAreaMasterPast', 3, -623.407, 43, -56.981, 2.415, 1003), + (1035, 1090003, 'man0l1_push_exit_echo', 230, 'PrivateAreaMasterPast', 3, -598.37, 42.1, -50.28, 0.61, 0), (1036, 1001446, 'fiachre', 172, '', 0, -2172.72, 14.307, -432.938, -0.695, 0), (1037, 1001447, 'taylor', 172, '', 0, -2195.31, 14.361, -417.438, 3.13, 0), (1038, 1001448, 'walhbert', 172, '', 0, -2204.59, 14, -430.846, 1.8, 0), @@ -1092,7 +1092,38 @@ REPLACE INTO `server_eventnpc_spawn_locations` (`id`, `actorClassId`, `uniqueId` (1074, 1001119, 'man0u0_crowd_lalafell_f', 184, '', 0, 16.1, 192, 50.97, -1, 0), (1075, 1001120, 'man0u0_crowd_miqote', 184, '', 0, -1.42, 192, 58.93, 2.49, 0), (1076, 1001121, 'man0u0_crowd_roegadyn', 184, '', 0, -3.57, 192, 59.41, 1.88, 0), - (2016, 5900006, 'man0u0_tutrl_gate', 184, '', 0, 12, 196, 130, 0, 0); + (2016, 5900006, 'man0u0_tutrl_gate', 184, '', 0, 12, 196, 130, 0, 0), + (2017, 1000145, 'man0l1_hnaanza', 230, 'PrivateAreaMasterPast', 4, -506.842, 42.49, 432.026, 1.078, 0), + (2018, 1000111, 'man0l1_tattooed_pirate', 230, 'PrivateAreaMasterPast', 4, -479, 41.505, 433.188, 0, 0), + (2020, 1000144, 'man0l1_bodenolf', 230, 'PrivateAreaMasterPast', 4, -500.06, 42.8, 416.06, 1.19, 1016), + (2021, 1000163, 'man0l1_joellaut', 230, 'PrivateAreaMasterPast', 4, -479, 41.505, 433.188, 0, 0), + (2022, 1000176, 'man0l1_mimidoa', 230, 'PrivateAreaMasterPast', 4, -483.67, 44.5, 404.51, 0.793, 1015), + (2023, 1000247, 'man0l1_werner', 230, 'PrivateAreaMasterPast', 4, -479, 41.505, 433.188, 0, 0), + (2024, 1000267, 'man0l1_hihine', 230, 'PrivateAreaMasterPast', 4, -479, 41.505, 433.188, 0, 0), + (2025, 1000268, 'man0l1_trinne', 230, 'PrivateAreaMasterPast', 4, -479, 41.505, 433.188, 0, 0), + (2026, 1000135, 'man0l1_iofa', 230, 'PrivateAreaMasterPast', 4, -490.59, 42.8, 420.71, -1.74, 1016), + (2027, 1000061, 'man0l1_mzimzizi', 230, 'PrivateAreaMasterPast', 4, -489.4, 42.95, 415.4, -2.28, 2016), + (2028, 1000060, 'man0l1_pfynhaemr', 230, 'PrivateAreaMasterPast', 4, -492.26, 42.8, 414.65, 1.4, 2015), + (2029, 1000062, 'man0l1_carrilaut', 230, 'PrivateAreaMasterPast', 4, -486.69, 42.8, 411.36, -0.78, 2017), + (2031, 5900001, 'man0l1_bsm_west_door', 230, 'PrivateAreaMasterPast', 4, -498, 43, 424, 0, 0), + (2032, 5900001, 'man0l1_bsm_east_door', 230, 'PrivateAreaMasterPast', 4, -477, 45, 403, 0, 0), + (2033, 1090058, 'man0l1_trigger_armbsm', 230, 'PrivateAreaMasterPast', 4, 0, 0, 0, 0, 0), + (2034, 1290002, 'man0l1_privatearea_exit', 230, 'PrivateAreaMasterPast', 4, 0, 0, 0, 0, 0), + (2035, 1000950, 'pgl200_elecotte', 209, 'PrivateAreaMasterPast', 5, -131.49, 201.6, 256.97, 0.37, 1017), + (2036, 1000635, 'pgl200_hnaufrid', 209, 'PrivateAreaMasterPast', 5, -129.71, 201.6, 256.29, 0.63, 1015), + (2037, 1600040, 'pgl200_pamisolaux', 209, 'PrivateAreaMasterPast', 5, -128.58, 201.6, 255.11, 0.95, 1041), + (2038, 1001056, 'pgl200_holbubu', 209, 'PrivateAreaMasterPast', 5, -117.87, 200.2, 263.67, 2.09, 0), + (2039, 1001022, 'pgl200_sungi_kelungi', 209, 'PrivateAreaMasterPast', 5, -113.9, 200.2, 262.21, -1.58, 1041), + (2040, 1001055, 'pgl200_bouchard', 209, 'PrivateAreaMasterPast', 5, -128.08, 200.2, 274.56, 2.8, 1016), + (2041, 1000994, 'pgl200_lefchild', 209, 'PrivateAreaMasterPast', 5, -127.24, 200.2, 267.51, 1.54, 1017), + (2042, 1000638, 'pgl200_hawazi_zowazi', 209, 'PrivateAreaMasterPast', 5, -119.086, 200.7, 268.745, 2.618, 2038), + (2043, 1000639, 'pgl200_isabella', 209, 'PrivateAreaMasterPast', 5, -119.486, 200.2, 273.871, 0.524, 2039), + (2044, 1000954, 'pgl200_esperaunce', 209, 'PrivateAreaMasterPast', 5, -124.351, 200.2, 268.694, 0.296, 0), + (2045, 1000953, 'pgl200_beauteous_beauty', 209, 'PrivateAreaMasterPast', 5, -124.549, 200.2, 269.3, 0.746, 0), + (2046, 1000952, 'pgl200_sultry_strumpet', 209, 'PrivateAreaMasterPast', 5, -123.53, 200.2, 268.689, 0.728, 0), + (2047, 5900001, 'pgl200_gsm_door', 209, 'PrivateAreaMasterPast', 5, -121, 202, 255, 0, 0), + (2049, 1290002, 'pgl200_privatearea_exit', 209, 'PrivateAreaMasterPast', 5, -128, 201.5, 262.31, 0, 0), + (2050, 5900021, 'man0u0_tutorial_mapobj1', 184, '', 0, 12.614, 196, 130.838, 0, 0); /*!40000 ALTER TABLE `server_eventnpc_spawn_locations` ENABLE KEYS */; /*!40101 SET SQL_MODE=IFNULL(@OLD_SQL_MODE, '') */; From 281756021764f29746cd751ff89275b5f9d15aa0 Mon Sep 17 00:00:00 2001 From: Filip Maj Date: Fri, 4 Mar 2022 02:20:56 -0500 Subject: [PATCH 22/23] Got the emote sequence for Treasures of the Main working. Got the duty started but there are issues on zoning. --- .../directors/Quest/QuestDirectorMan0l101.lua | 18 +- Data/scripts/quests/man/man0l1.lua | 165 +++++++++++++++--- Map Server/Lua/LuaEngine.cs | 2 + 3 files changed, 151 insertions(+), 34 deletions(-) diff --git a/Data/scripts/directors/Quest/QuestDirectorMan0l101.lua b/Data/scripts/directors/Quest/QuestDirectorMan0l101.lua index 4a7bb414..39233748 100644 --- a/Data/scripts/directors/Quest/QuestDirectorMan0l101.lua +++ b/Data/scripts/directors/Quest/QuestDirectorMan0l101.lua @@ -7,31 +7,23 @@ end function onCreateContentArea(players, director, contentArea, contentGroup) - sisipu = contentArea:SpawnActor(2290007, "sisipu", -8, 16.35, 6, 0.5); - - mob1 = contentArea:SpawnActor(2205403, "mob1", -3.02+3, 17.35, 14.24, -2.81); - mob2 = contentArea:SpawnActor(2205403, "mob2", -3.02, 17.35, 14.24, -2.81); - mob3 = contentArea:SpawnActor(2205403, "mob3", -3.02-3, 17.35, 14.24, -2.81); + sisipu = contentArea:SpawnActor(2290007, "sisipu", -49, 36.43, 162, 2.2); for _, player in pairs(players) do contentGroup:AddMember(player); end; contentGroup:AddMember(director); - contentGroup:AddMember(yshtola); - contentGroup:AddMember(stahlmann); - contentGroup:AddMember(mob1); - contentGroup:AddMember(mob2); - contentGroup:AddMember(mob3); + contentGroup:AddMember(sisipu); end function onEventStarted(player, director, triggerName) - local man0l1Quest = player:GetQuest("Man0l1"); - - callClientFunction(player, "delegateEvent", player, man0l1Quest, "processEvent604"); player:EndEvent(); end + +function main() +end \ No newline at end of file diff --git a/Data/scripts/quests/man/man0l1.lua b/Data/scripts/quests/man/man0l1.lua index 21c43169..be7298c9 100644 --- a/Data/scripts/quests/man/man0l1.lua +++ b/Data/scripts/quests/man/man0l1.lua @@ -72,7 +72,7 @@ ECHO_EXIT_TRIGGER = 1090003; -- FSH Guild NNMULIKA = 1000153; SISIPU = 1000155; -ZEPHYR_TRIGGER = 1900001; +ZEPHYR_TRIGGER = 1090004; -- Echo in the Bsm Guild TATTOOED_PIRATE = 1000111; @@ -91,6 +91,7 @@ ECHO_EXIT_TRIGGER2 = 1090001; -- Quest Data CNTR_SEQ7_CUL = 1; CNTR_SEQ7_MRD = 2; +CNTR_SEQ40_FSH = 3; function onStart(player, quest) quest:StartSequence(SEQ_000); @@ -162,9 +163,13 @@ function onStateChange(player, quest, sequence) end elseif (sequence == SEQ_035) then quest:SetENpc(NNMULIKA, QFLAG_PLATE); + elseif (sequence == SEQ_040) then + quest:SetENpc(SISIPU, QFLAG_PLATE, true, false, true); + quest:SetENpc(NNMULIKA); elseif (sequence == SEQ_048) then quest:SetENpc(BADERON); - quest:SetENpc(ZEPHYR_TRIGGER); + quest:SetENpc(ZEPHYR_TRIGGER, QFLAG_MAP, false, true); + quest:SetENpc(NNMULIKA); elseif (sequence == SEQ_075) then quest:SetENpc(BODENOLF, QFLAG_PLATE); elseif (sequence == SEQ_080) then @@ -218,25 +223,52 @@ function onTalk(player, quest, npc) seq007_onTalk(player, quest, npc, classId); elseif (sequence == SEQ_035) then if (classId == NNMULIKA) then - callClientFunction(player, "delegateEvent", player, quest, "processEvent602"); - callClientFunction(player, "delegateEvent", player, quest, "processEvent602_2"); - callClientFunction(player, "delegateEvent", player, quest, "processEvent602_3"); - callClientFunction(player, "delegateEvent", player, quest, "processEvent604"); - --quest:StartSequence(SEQ_040); + callClientFunction(player, "delegateEvent", player, quest, "processEvent600"); + quest:StartSequence(SEQ_040); player:EndEvent(); + GetWorldManager():WarpToPrivateArea(player, "PrivateAreaMasterPast", 5); end elseif (sequence == SEQ_040) then - + if (classId == SISIPU) then + local emoteTestStep = quest:GetData():GetCounter(CNTR_SEQ40_FSH); + if (emoteTestStep == 0 or emoteTestStep == 1) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent601_1"); + player:SendGameMessage(GetWorldMaster(), 25083, MESSAGE_TYPE_SYSTEM, 1); + if (emoteTestStep == 0) then + quest:GetData():IncCounter(CNTR_SEQ40_FSH); + end + elseif (emoteTestStep == 2) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent601_2"); + player:SendGameMessage(GetWorldMaster(), 25083, MESSAGE_TYPE_SYSTEM, 1); + elseif (emoteTestStep == 3) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent601_3"); + player:SendGameMessage(GetWorldMaster(), 25083, MESSAGE_TYPE_SYSTEM, 1); + elseif (emoteTestStep == 4) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent601_4"); + player:SendGameMessage(GetWorldMaster(), 25083, MESSAGE_TYPE_SYSTEM, 1); + elseif (emoteTestStep == 5) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent601_5"); + player:SendGameMessage(GetWorldMaster(), 25083, MESSAGE_TYPE_SYSTEM, 1); + elseif (emoteTestStep == 6) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent601_6"); + player:SendGameMessage(GetWorldMaster(), 25083, MESSAGE_TYPE_SYSTEM, 1); + end + elseif (classId == NNMULIKA) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent600_2"); + end + player:EndEvent(); elseif (sequence == SEQ_048) then if (classId == BADERON) then - callClientFunction(player, "delegateEvent", player, quest, "processEvent602_3"); - player:EndEvent(); + callClientFunction(player, "delegateEvent", player, quest, "processEvent602_3"); + elseif (classId == NNMULIKA) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent602_2"); elseif (classId == ZEPHYR_TRIGGER) then local startDuty = callClientFunction(player, "delegateEvent", player, quest, "processEvent602_3"); if (startDuty) then end player:EndEvent(); end + player:EndEvent(); elseif (sequence == SEQ_075) then if (classId == BODENOLF) then callClientFunction(player, "delegateEvent", player, quest, "processEvent630"); @@ -423,6 +455,7 @@ function onPush(player, quest, npc) startMan0l1Content(player, quest); return; end + player:EndEvent(); end elseif (sequence == SEQ_085) then if (classId == ECHO_EXIT_TRIGGER2) then @@ -434,12 +467,104 @@ function onPush(player, quest, npc) end end -function onEmote(player, quest, npc, emoteId) +function onEmote(player, quest, npc, eventName) + local data = quest:GetData(); local sequence = quest:getSequence(); + local classId = npc:GetActorClassId(); + + -- Play the emote + if (eventName == "emoteDefault1") then -- Bow + player:DoEmote(npc.Id, 5, 21041); + elseif (eventName == "emoteDefault2") then -- Clap + player:DoEmote(npc.Id, 7, 21061); + elseif (eventName == "emoteDefault3") then -- Congratulate + player:DoEmote(npc.Id, 29, 21281); + elseif (eventName == "emoteDefault4") then -- Poke + player:DoEmote(npc.Id, 28, 21271); + elseif (eventName == "emoteDefault5") then -- Joy + player:DoEmote(npc.Id, 18, 21171); + elseif (eventName == "emoteDefault6") then -- Wave + player:DoEmote(npc.Id, 16, 21151); + end + wait(2.5); + -- Handle the result if (sequence == SEQ_040) then + if (classId == SISIPU) then + local emoteTestStep = data:GetCounter(CNTR_SEQ40_FSH); + -- Bow + if (emoteTestStep == 1) then + if (eventName == "emoteDefault1") then + callClientFunction(player, "delegateEvent", player, quest, "processEvent601_7"); + callClientFunction(player, "delegateEvent", player, quest, "processEvent601_2"); + player:SendGameMessage(GetWorldMaster(), 25083, MESSAGE_TYPE_SYSTEM, 1); + data:IncCounter(CNTR_SEQ40_FSH); + else + callClientFunction(player, "delegateEvent", player, quest, "processEvent601_8"); + callClientFunction(player, "delegateEvent", player, quest, "processEvent601_1"); + end + -- Clap + elseif (emoteTestStep == 2) then + if (eventName == "emoteDefault2") then + callClientFunction(player, "delegateEvent", player, quest, "processEvent601_7"); + callClientFunction(player, "delegateEvent", player, quest, "processEvent601_3"); + player:SendGameMessage(GetWorldMaster(), 25083, MESSAGE_TYPE_SYSTEM, 1); + data:IncCounter(CNTR_SEQ40_FSH); + else + callClientFunction(player, "delegateEvent", player, quest, "processEvent601_8"); + callClientFunction(player, "delegateEvent", player, quest, "processEvent601_2"); + end + -- Congratulate + elseif (emoteTestStep == 3) then + if (eventName == "emoteDefault3") then + callClientFunction(player, "delegateEvent", player, quest, "processEvent601_7"); + callClientFunction(player, "delegateEvent", player, quest, "processEvent601_4"); + player:SendGameMessage(GetWorldMaster(), 25083, MESSAGE_TYPE_SYSTEM, 1); + data:IncCounter(CNTR_SEQ40_FSH); + else + callClientFunction(player, "delegateEvent", player, quest, "processEvent601_8"); + callClientFunction(player, "delegateEvent", player, quest, "processEvent601_3"); + player:SendGameMessage(GetWorldMaster(), 25083, MESSAGE_TYPE_SYSTEM, 1); + end + -- Poke + elseif (emoteTestStep == 4) then + if (eventName == "emoteDefault4") then + callClientFunction(player, "delegateEvent", player, quest, "processEvent601_7"); + callClientFunction(player, "delegateEvent", player, quest, "processEvent601_5"); + player:SendGameMessage(GetWorldMaster(), 25083, MESSAGE_TYPE_SYSTEM, 1); + data:IncCounter(CNTR_SEQ40_FSH); + else + callClientFunction(player, "delegateEvent", player, quest, "processEvent601_8"); + callClientFunction(player, "delegateEvent", player, quest, "processEvent601_4"); + end + -- Joy + elseif (emoteTestStep == 5) then + if (eventName == "emoteDefault5") then + callClientFunction(player, "delegateEvent", player, quest, "processEvent601_7"); + callClientFunction(player, "delegateEvent", player, quest, "processEvent601_6"); + player:SendGameMessage(GetWorldMaster(), 25083, MESSAGE_TYPE_SYSTEM, 1); + data:IncCounter(CNTR_SEQ40_FSH); + else + callClientFunction(player, "delegateEvent", player, quest, "processEvent601_8"); + callClientFunction(player, "delegateEvent", player, quest, "processEvent601_5"); + end + -- Wave + elseif (emoteTestStep == 6) then + if (eventName == "emoteDefault6") then + callClientFunction(player, "delegateEvent", player, quest, "processEvent602"); + player:EndEvent(); + GetWorldManager():WarpToPublicArea(player); + quest:StartSequence(SEQ_048); + return; + else + callClientFunction(player, "delegateEvent", player, quest, "processEvent601_8"); + callClientFunction(player, "delegateEvent", player, quest, "processEvent601_6"); + end + end + end end + player:EndEvent(); quest:UpdateENPCs(); end @@ -472,22 +597,20 @@ function onNpcLS(player, quest, npcLSId) end function startMan0l1Content(player, quest) - quest:StartSequence(SEQ_050); + quest:StartSequence(SEQ_050); + callClientFunction(player, "delegateEvent", player, quest, "processEvent604"); + player:EndEvent(); local contentArea = player.CurrentArea:CreateContentArea(player, "/Area/PrivateArea/Content/PrivateAreaMasterSimpleContent", "Man0l101", "SimpleContent30002", "Quest/QuestDirectorMan0l101"); - + if (contentArea == nil) then return; end - local director = contentArea:GetContentDirector(); - - player:AddDirector(director); - director:StartDirector(false); - player:KickEvent(director, "noticeEvent", true); - player:SetLoginDirector(director); - - GetWorldManager():DoZoneChangeContent(player, contentArea, -5, 16.35, 6, 0.5, 16); + local director = contentArea:GetContentDirector(); + player:AddDirector(director); + director:StartDirector(true); + GetWorldManager():DoZoneChangeContent(player, contentArea, -63.25, 33.15, 164.51, 0.8, 16); end function getJournalInformation(player, quest) diff --git a/Map Server/Lua/LuaEngine.cs b/Map Server/Lua/LuaEngine.cs index dc106826..a3311530 100644 --- a/Map Server/Lua/LuaEngine.cs +++ b/Map Server/Lua/LuaEngine.cs @@ -41,6 +41,7 @@ using Meteor.Map.Actors.Chara; using Meteor.Map.DataObjects.chara; using Meteor.Map.actors.chara; using Meteor.Map.Actors.QuestNS; +using Meteor.Map.actors.group; namespace Meteor.Map.lua { @@ -78,6 +79,7 @@ namespace Meteor.Map.lua UserData.RegisterType(); UserData.RegisterType(); UserData.RegisterType(); + UserData.RegisterType(); UserData.RegisterType(); UserData.RegisterType(); UserData.RegisterType(); From bf20993e580c4e90a6a38782957069b04802aa6e Mon Sep 17 00:00:00 2001 From: Filip Maj Date: Fri, 4 Mar 2022 20:33:02 -0500 Subject: [PATCH 23/23] Finished sequences 55, 60, 65 for Treasures of the Main. --- Data/scripts/quests/man/man0l1.lua | 98 ++++++++++++++++++++++++------ 1 file changed, 79 insertions(+), 19 deletions(-) diff --git a/Data/scripts/quests/man/man0l1.lua b/Data/scripts/quests/man/man0l1.lua index be7298c9..4e43fb27 100644 --- a/Data/scripts/quests/man/man0l1.lua +++ b/Data/scripts/quests/man/man0l1.lua @@ -69,11 +69,18 @@ ADVENTURER2 = 1000870; ADVENTURER3 = 1000871; ECHO_EXIT_TRIGGER = 1090003; --- FSH Guild +-- Fsh Guild NNMULIKA = 1000153; -SISIPU = 1000155; +SISIPU_EMOTE = 1000155; ZEPHYR_TRIGGER = 1090004; +-- Sequence 055, 060, 065 +SISIPU = 1000156; +WINDWORN_CORPSE = 1000091; +GLASSYEYED_CORPSE = 1000092; +FEARSTRICKEN_CORPSE = 1000378; +FSH_TRIGGER = 1090006; + -- Echo in the Bsm Guild TATTOOED_PIRATE = 1000111; IOFA = 1000135; @@ -164,12 +171,24 @@ function onStateChange(player, quest, sequence) elseif (sequence == SEQ_035) then quest:SetENpc(NNMULIKA, QFLAG_PLATE); elseif (sequence == SEQ_040) then - quest:SetENpc(SISIPU, QFLAG_PLATE, true, false, true); + quest:SetENpc(SISIPU_EMOTE, QFLAG_PLATE, true, false, true); quest:SetENpc(NNMULIKA); elseif (sequence == SEQ_048) then quest:SetENpc(BADERON); quest:SetENpc(ZEPHYR_TRIGGER, QFLAG_MAP, false, true); quest:SetENpc(NNMULIKA); + elseif (sequence == SEQ_055) then + quest:SetENpc(WINDWORN_CORPSE, QFLAG_PLATE); + quest:SetENpc(GLASSYEYED_CORPSE); + quest:SetENpc(FEARSTRICKEN_CORPSE); + quest:SetENpc(SISIPU); + elseif (sequence == SEQ_060) then + quest:SetENpc(SISIPU, QFLAG_PLATE); + quest:SetENpc(WINDWORN_CORPSE); + quest:SetENpc(GLASSYEYED_CORPSE); + quest:SetENpc(FEARSTRICKEN_CORPSE); + elseif (sequence == SEQ_065) then + quest:SetENpc(FSH_TRIGGER, QFLAG_MAP, false, true); elseif (sequence == SEQ_075) then quest:SetENpc(BODENOLF, QFLAG_PLATE); elseif (sequence == SEQ_080) then @@ -229,7 +248,7 @@ function onTalk(player, quest, npc) GetWorldManager():WarpToPrivateArea(player, "PrivateAreaMasterPast", 5); end elseif (sequence == SEQ_040) then - if (classId == SISIPU) then + if (classId == SISIPU_EMOTE) then local emoteTestStep = quest:GetData():GetCounter(CNTR_SEQ40_FSH); if (emoteTestStep == 0 or emoteTestStep == 1) then callClientFunction(player, "delegateEvent", player, quest, "processEvent601_1"); @@ -261,14 +280,38 @@ function onTalk(player, quest, npc) if (classId == BADERON) then callClientFunction(player, "delegateEvent", player, quest, "processEvent602_3"); elseif (classId == NNMULIKA) then - callClientFunction(player, "delegateEvent", player, quest, "processEvent602_2"); - elseif (classId == ZEPHYR_TRIGGER) then - local startDuty = callClientFunction(player, "delegateEvent", player, quest, "processEvent602_3"); - if (startDuty) then - end - player:EndEvent(); + callClientFunction(player, "delegateEvent", player, quest, "processEvent602_2"); end player:EndEvent(); + elseif (sequence == SEQ_055 or sequence == SEQ_060) then + if (classId == SISIPU) then + if (sequence == SEQ_060) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent615"); + quest:StartSequence(SEQ_065); + player:EndEvent(); + GetWorldManager():WarpToPublicArea(player, -42.0, 37.678, 155.694, -1.25); + return; + else + callClientFunction(player, "delegateEvent", player, quest, "processEvent605_2"); + end + elseif (classId == WINDWORN_CORPSE) then + if (sequence == SEQ_055) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent610"); + quest:StartSequence(SEQ_060); + else + callClientFunction(player, "delegateEvent", player, quest, "processEvent610_2"); + end + elseif (classId == FEARSTRICKEN_CORPSE) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent610_2"); + elseif (classId == GLASSYEYED_CORPSE) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent610_2"); + end + player:EndEvent(); + elseif (sequence == SEQ_070) then + if (classId == BADERON) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent615_2"); + end + player:EndEvent(); elseif (sequence == SEQ_075) then if (classId == BODENOLF) then callClientFunction(player, "delegateEvent", player, quest, "processEvent630"); @@ -303,9 +346,6 @@ function onTalk(player, quest, npc) quest:UpdateENPCs(); end - --- !warp 133 -459.619873 40.0005722 196.370377 PrivateAreaMasterPast 2 - function seq000_onTalk(player, quest, npc, classId) if (classId == CRAPULOUS_ADVENTURER) then callClientFunction(player, "delegateEvent", player, quest, "processEvent010_2"); @@ -452,11 +492,25 @@ function onPush(player, quest, npc) if (classId == ZEPHYR_TRIGGER) then local result = callClientFunction(player, "delegateEvent", player, quest, "contentsJoinAskInBasaClass"); if (result == 1) then - startMan0l1Content(player, quest); + -- DO ESCORT DUTY HERE + -- startMan0l1Content(player, quest); + -- For now just skip the sequence + quest:StartSequence(SEQ_050); + callClientFunction(player, "delegateEvent", player, quest, "processEvent605"); + player:EndEvent(); + quest:StartSequence(SEQ_055); + GetWorldManager():DoZoneChange(player, 128, "PrivateAreaMasterPast", 2, 15, 137.44, 60.33, 1322.0, -1.60); return; end player:EndEvent(); end + elseif (sequence == SEQ_065) then + if (classId == FSH_TRIGGER) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent620"); + -- Give 3000 gil + player:EndEvent(); + quest:StartSequence(SEQ_075); + end elseif (sequence == SEQ_085) then if (classId == ECHO_EXIT_TRIGGER2) then callClientFunction(player, "delegateEvent", player, quest, "processEvent635"); @@ -490,7 +544,7 @@ function onEmote(player, quest, npc, eventName) -- Handle the result if (sequence == SEQ_040) then - if (classId == SISIPU) then + if (classId == SISIPU_EMOTE) then local emoteTestStep = data:GetCounter(CNTR_SEQ40_FSH); -- Bow if (emoteTestStep == 1) then @@ -582,9 +636,8 @@ function onNpcLS(player, quest, npcLSId) local sequence = quest:getSequence(); if (npcLSId == 1) then - player:SetNpcLS(1, 1); - - if (sequence == SEQ_003) then + player:SetNpcLS(1, 1); + if (sequence == SEQ_003) then player:SendGameMessageLocalizedDisplayName(quest, 298, 39, 1000015, nil); endTutorialMode(player); elseif (sequence == SEQ_007) then @@ -592,6 +645,14 @@ function onNpcLS(player, quest, npcLSId) player:SendGameMessageLocalizedDisplayName(quest, 81, 39, 1000015, nil); player:SendGameMessageLocalizedDisplayName(quest, 82, 39, 1000015, nil); quest:StartSequence(SEQ_035); + elseif (sequence == SEQ_070) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent625"); + player:EndEvent(); + quest:StartSequence(SEQ_075); + elseif (sequence == SEQ_090) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent637"); + player:EndEvent(); + quest:StartSequence(SEQ_092); end end end @@ -617,7 +678,6 @@ function getJournalInformation(player, quest) return 0, quest:GetData():GetCounter(CNTR_SEQ7_CUL) * 5, quest:GetData():GetCounter(CNTR_SEQ7_MRD) * 5; end - function getJournalMapMarkerList(player, quest) local sequence = quest:getSequence();