From dc1458c52dcfcdcc2966d761864f9cbf3a99c2c1 Mon Sep 17 00:00:00 2001 From: CuriousJorge Date: Thu, 17 Feb 2022 02:49:59 -0500 Subject: [PATCH 01/17] - Player.lua - Fixed typo on ClearData() for Ul'dah intro - DftSea - 96% finished - DftWil - minor comment addition - EmoteStandardCommand - Added the new event params so the script functions again - Mass deletion of all PplStd & PplShopSalesman for La Noscea NPCs. No longer needed --- .../scripts/commands/EmoteStandardCommand.lua | 2 +- Data/scripts/player.lua | 4 +- Data/scripts/quests/dft/DftSea.lua | 531 +++++++++--------- Data/scripts/quests/dft/DftWil.lua | 4 +- .../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 - .../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 - .../AetheryteParent/limsa_aetheryte.lua | 0 .../PopulaceShopSalesman/jossy.lua | 6 - .../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 - 171 files changed, 271 insertions(+), 1449 deletions(-) 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/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/AetheryteParent/limsa_aetheryte.lua delete mode 100644 Data/scripts/unique/sea0Town01a/PopulaceShopSalesman/jossy.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 diff --git a/Data/scripts/commands/EmoteStandardCommand.lua b/Data/scripts/commands/EmoteStandardCommand.lua index 7e23b356..16ec9280 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, eventName, emoteId, showText, arg2, arg3, targetId) if (targetId == nil) then targetId = 0; diff --git a/Data/scripts/player.lua b/Data/scripts/player.lua index bec9f61b..c87490b2 100644 --- a/Data/scripts/player.lua +++ b/Data/scripts/player.lua @@ -13,7 +13,7 @@ function onBeginLogin(player) --player:AddQuest(110005); player:SetHomePoint(1280061); elseif (initialTown == 3 and player:HasQuest(110009) == false) then - --player:AddQuest(110009); + player:AddQuest(110009); player:SetHomePoint(1280031); end @@ -56,7 +56,7 @@ function onBeginLogin(player) player.positionY = 196.0; player.positionZ = 133.6561; player.rotation = -2.849384; - player:GetQuest(110009):ClearClearData(); + player:GetQuest(110009):ClearData(); end end diff --git a/Data/scripts/quests/dft/DftSea.lua b/Data/scripts/quests/dft/DftSea.lua index 8fc40105..1e3a64ec 100644 --- a/Data/scripts/quests/dft/DftSea.lua +++ b/Data/scripts/quests/dft/DftSea.lua @@ -1,3 +1,4 @@ +require ("global") --[[ Quest Script @@ -12,279 +13,279 @@ Contains all default lines for talkable npcs in the Sea Region (aka La Noscea). -- [ActorClassId] = "client_function_name" local defaultTalkSea = { - [1234] = "defaultTalkWithLefchild_001" -- Lefchild + + -- <<>> ---[[ + [1000003] = "defaultTalkWithWaekbyrt_001", -- Waekbyrt (Limsa Lower Decks: MRD Guild) defaultTalkWithWaekbyrt_002 (post-MRD dialog?) + [1000004] = "defaultTalkWithNunuba_001", -- Nunuba (Limsa Lower Decks: MRD Guild) + [1000045] = "defaultTalkWithFabodji_001", -- F'abodji (Limsa Lower Decks) + [1000049] = "defaultTalkWithJainelette_001", -- Jainelette (Limsa Lower Decks: MRD Guild) + [1000050] = "defaultTalkWithRobairlain_001", -- Robairlain (Limsa Lower Decks) + [1000051] = "defaultTalkWithBrictt_001", -- Brictt (Limsa Lower Decks: MRD Guild) + [1000052] = "defaultTalkWithLiautroix_001", -- Liautroix (Limsa Lower Decks: MRD Guild) + [1000053] = "defaultTalkWithSlaiboli_001", -- S'laiboli (Limsa Upper Decks: MSK Guild) + [1000054] = "defaultTalkWithSyhrdaeg_001", -- Syhrdaeg (Limsa Upper Decks: MSK Guild) + [1000056] = "defaultTalkWithLaniaitte_001", -- Laniaitte (Limsa Lower Decks: ACN Guild) + [1000057] = "defaultTalkWithZonggo_001", -- Z'onggo (Limsa Lower Decks: FSH Guild) + [1000060] = "defaultTalkWithPfynhaemr_001", -- Pfynhaemr (Limsa Upper Decks: BSM/ARM Guild) + [1000061] = "defaultTalkWithMzimzizi_001", -- M'zimzizi (Limsa Upper Decks: BSM/ARM Guild) + [1000062] = "defaultTalkWithCarrilaut_001", -- Carrilaut (Limsa Upper Decks: BSM/ARM Guild) + [1000063] = "defaultTalkWithGerulf_001", -- Gerulf (Limsa Upper Decks: CUL Guild) + [1000064] = "defaultTalkWithAentfoet_001", -- Aentfoet (Limsa Upper Decks: CUL Guild) + [1000065] = "defaultTalkWithFrailoise_001", -- Frailoise (Limsa Upper Decks: CUL Guild) + -- [1000078] = "defaultTalkWithAshakkal_001", -- A'shakkal (Limsa Upper Decks: Adv. Guild) - Will not fire, not PplStd. Also blank strings. + [1000090] = "defaultTalkWithNeale_001", -- Neale (Limsa Lower Decks: MRD Guild) + [1000125] = "defaultTalkWithChaunollet_001", -- Chaunollet (Limsa Upper Decks: MSK Guild) + [1000129] = "defaultTalkWithRaragun_001", -- Raragun (Limsa Upper Decks: MSK Guild) + [1000130] = "defaultTalkWithMynadaeg_001", -- Mynadaeg (Limsa Upper Decks: MSK Guild) + [1000131] = "defaultTalkWithTefhmoshroca_001", -- Tefh Moshroca (Limsa Upper Decks: MSK Guild) + [1000132] = "defaultTalkWithGinnade_001", -- Ginnade (Limsa Upper Decks: MSK Guild) + [1000133] = "defaultTalkWithArthurioux_001", -- Arthurioux (Limsa Upper Decks: MSK Guild) + [1000134] = "defaultTalkWithMartiallais_001", -- Martiallais (Limsa Upper Decks: BSM/ARM Guild) + [1000135] = "defaultTalkWithIofa_001", -- Iofa (Limsa Upper Decks: BSM/ARM Guild) + [1000136] = "defaultTalkWithNanapiri_001", -- Nanapiri (Limsa Lower Decks: MRD Guild) + [1000137] = "defaultTalkWithBaderon_001", -- Baderon (Limsa Upper Decks: Adv. Guild) + [1000138] = "defaultTalkWithCharlys_001", -- Charlys (Limsa Upper Decks: CUL Guild) + [1000144] = "defaultTalkWithBodenolf_001", -- Bodenolf (Limsa Upper Decks: BSM/ARM Guild) defaultTalkWithBodenolf_002 (post-BSM dialog?) + [1000150] = "defaultTalkWithP_tahjha_001", -- P'tahjha (Limsa Lower Decks: ACN Guild) + [1000151] = "defaultTalkWithRubh_hob_001", -- Hob (Limsa Lower Decks: Ferry Docks) + [1000152] = "defaultTalkWithIsaudorel_001", -- Isaudorel (Limsa Upper Decks: MSK Guild) + [1000153] = "defaultTalkWithNnmulika_001", -- N'nmulika (Limsa Upper Decks: CUL Guild) + [1000157] = "defaultTalkWithSraemha_001", -- S'raemha (Limsa Upper Decks: MRD Guild) - Will not fire, not PplStd. + [1000158] = "defaultTalkWithNoline_001", -- Noline (Limsa Upper Decks: CUL Guild) - Will not fire, not PplStd. + [1000159] = "defaultTalkWithJossy_001", -- Jossy (Limsa Upper Decks: CUL Guild) - Will not fire, not PplStd. + [1000160] = "defaultTalkWithHaldberk_001", -- Haldberk (Limsa Lower Decks: ACN Guild) + [1000161] = "defaultTalkWithTotoruto_001", -- Totoruto (Limsa Upper Decks: MSK Guild) + [1000162] = "defaultTalkWithQhaschalahko_001", -- Qhas Chalahko (Limsa Upper Decks: BSM/ARM Guild) - Will not fire, not PplStd + [1000163] = "defaultTalkWithJoellaut_001", -- Joellaut (Limsa Upper Decks: BSM/ARM Guild) - Will not fire, not PplStd + [1000164] = "defaultTalkWithFaucillien_001", -- Faucillien (Limsa Upper Decks: FSH Guild) - Will not fire, not PplStd + [1000165] = "defaultTalkWithLouviaune_001", -- Louviaune (Limsa Upper Decks: FSH Guild) - Will not fire, not PplStd + [1000166] = "defaultTalkWithUrsulie_001", -- Ursulie (Limsa Upper Decks: Adv. Guild) - Will not fire, not PplStd. Retainer NPC + [1000167] = "defaultTalkWithInn_Desk", -- Mytesyn (Limsa Upper Decks: Adv. Guild) defaultTalkWithMytesyn_001 (Pre-Inn dialog.) + [1000168] = "defaultTalkWithPrudentia_001", -- Prudentia (Limsa Upper Decks: CUL Guild) + [1000169] = "defaultTalkWithPulmia_001", -- Pulmia (Limsa Upper Decks: CUL Guild) + [1000170] = "defaultTalkWithRsushmo_001", -- R'sushmo (Limsa Upper Decks: CUL Guild) + [1000171] = "defaultTalkWithKikichua_001", -- Kikichua (Limsa Upper Decks: CUL Guild) + [1000172] = "defaultTalkWithHobriaut_001", -- Hobriaut (Limsa Upper Decks: CUL Guild) + [1000173] = "defaultTalkWithMaisie_001", -- Maisie (Limsa Lower Decks: FSH Guild) + [1000177] = "defaultTalkWithSyngsmyd_001", -- Syngsmyd (Limsa Upper Decks: BSM/ARM Guild) + [1000178] = "defaultTalkWithLilina_001", -- Lilina (Limsa Lower Decks: ACN Guild) + [1000179] = "defaultTalkWithRubh_epocan_001", -- Rubh Epocan (Limsa Lower Decks: ACN Guild) + [1000180] = "defaultTalkWithAstrid_001", -- Astrid (Limsa Lower Decks: FSH Guild) + [1000181] = "defaultTalkWithXavalien_001", -- Xavalien (Limsa Lower Decks: FSH Guild) + [1000190] = "defaultTalkWithBayard_001", -- Bayard (Limsa Lower Decks: MRD Guild) + [1000191] = "defaultTalkWithTriaine_001", -- Triaine (Limsa Lower Decks: MRD Guild) + [1000192] = "defaultTalkWithWyrakhamazom_001", -- Wyra Khamazom (Limsa Lower Decks: MRD Guild) + [1000193] = "defaultTalkWithDhemsunn_001", -- Dhemsunn (Limsa Lower Decks: MRD Guild) + [1000194] = "defaultTalkWithOsitha_001", -- Ositha (Limsa Lower Decks: MRD Guild) + [1000195] = "defaultTalkWithElilwaen_001", -- Elilwaen (Limsa Lower Decks: ACN Guild) + [1000196] = "defaultTalkWithDodoroba_001", -- Dodoroba (Limsa Lower Decks: ACN Guild) + [1000197] = "defaultTalkWithIvan_001", -- Ivan (Limsa Lower Decks: ACN Guild) + [1000198] = "defaultTalkWithThosinbaen_001", -- Thosinbaen (Limsa Lower Decks: ACN Guild) + [1000199] = "defaultTalkWithClifton_001", -- Clifton (Limsa Lower Decks: FSH Guild) + [1000200] = "defaultTalkWithUndsatz_001", -- Undsatz (Limsa Lower Decks: FSH Guild) + [1000201] = "defaultTalkWithRerenasu_001", -- Rerenasu (Limsa Lower Decks) + [1000202] = "defaultTalkWithDacajinjahl_001", -- Daca Jinjahl (Limsa Lower Decks: FSH Guild) + [1000203] = "defaultTalkWithBloemerl_001", -- Bloemerl (Limsa Lower Decks: FSH Guild) + [1000217] = "defaultTalkWithChichiroon_001", -- Chichiroon (Limsa Lower Decks: MRD Guild) + [1000219] = "defaultTalkWithBuburoon_001", -- Buburoon (Limsa Lower Decks: MRD Guild) + [1000220] = "defaultTalkWithJojoroon_001", -- Jojoroon (Limsa Lower Decks: MRD Guild) + [1000221] = "defaultTalkWithMimiroon_001", -- Mimiroon (Limsa Lower Decks: MRD Guild) + [1000225] = "defaultTalkWithZehrymm_001", -- Zehrymm (Limsa Upper Decks) + [1000226] = "defaultTalkWithFzhumii_001", -- F'zhumii (Limsa Lower Decks: Bulwark Hall) + [1000227] = "defaultTalkWithArnegis_001", -- Arnegis (Limsa Lower Decks) + [1000248] = "defaultTalkWithNheujawantal_001", -- Nheu Jawantal (Limsa Upper Decks: MSK Guild) + [1000250] = "defaultTalkWithH_lahono_001", -- H'lahono (Limsa Upper Decks: CUL Guild) + [1000252] = "defaultTalkWithWyrstmann_001", -- Wyrstmann (Limsa Upper Decks: CUL Guild) + [1000253] = "defaultTalkWithTraveler030_001", -- Tittering Traveler (Limsa Upper Decks: CUL Guild) + [1000254] = "defaultTalkWithTraveler031_001", -- Suspicious-looking Traveler (Limsa Upper Decks: CUL Guild) + [1000255] = "defaultTalkWithTraveler032_001", -- Enraptured Traveler (Limsa Upper Decks: CUL Guild) + [1000256] = "defaultTalkWithYouty001_001", -- Fickle Beggar (Limsa Upper Decks: CUL Guild) + [1000257] = "defaultTalkWithMerchant002_001", -- Satiated Shopkeep (Limsa Upper Decks: CUL Guild) + [1000258] = "defaultTalkWithPirate030_001", -- Pissed Pirate (Limsa Upper Decks: CUL Guild) + [1000259] = "defaultTalkWithLady002_001", -- Overweening Woman (Limsa Upper Decks: CUL Guild) + [1000260] = "defaultTalkWithPorter001_001", -- Pearly-toothed Porter(Limsa Lower Decks: Ferry Docks) + [1000261] = "defaultTalkWithSailor031_001", -- Muscle-bound Deckhand(Limsa Lower Decks: Ferry Docks) + [1000262] = "defaultTalkWithLady001_001", -- Glowing Goodwife (Limsa Lower Decks: ACN Guild) + [1000264] = "defaultTalkWithAdventurer030_001", -- Pasty-faced Adventurer (Limsa Lower Decks: Ferry Docks) + [1000265] = "defaultTalkWithSosoze_001", -- Sosoze (Limsa Upper Decks: BSM/ARM Guild) + [1000266] = "defaultTalkWithColson_001", -- Colson (Limsa Upper Decks: BSM/ARM Guild) + [1000267] = "defaultTalkWithHihine_001", -- Hihine (Limsa Upper Decks: BSM/ARM Guild) + [1000268] = "defaultTalkWithTrinne_001", -- Trinne (Limsa Upper Decks: BSM/ARM Guild) + [1000269] = "defaultTalkWithKokoto_001", -- Kokoto (Limsa Upper Decks: Adv. Guild) defaultTalkWithKokoto_002 / 003 (GLD informant) + [1000270] = "defaultTalkWithGigirya_001", -- Gigirya (Limsa Upper Decks: Adv. Guild) defaultTalkWithGigirya_002 / 003 (THM informant) + [1000271] = "defaultTalkWithMaunie_001", -- Maunie (Limsa Upper Decks: Adv. Guild) defaultTalkWithMaunie_002 / 003 (PGL informant) + [1000272] = "defaultTalkWithTirauland_001", -- Tirauland (Limsa Upper Decks: Adv. Guild) 001 (on non-LNC DoW/M) 010 (on DoH) 002 / 003 (LNC informant) + [1000273] = "defaultTalkWithEstrilda_001", -- Estrilda (Limsa Upper Decks: Adv. Guild) defaultTalkWithEstrilda_002 / 003 (ARC informant) + [1000274] = "defaultTalkWithGregory_001", -- Gregory (Limsa Upper Decks: Adv. Guild) defaultTalkWithGregory_002 / 003 (CNJ informant) + [1000275] = "defaultTalkWithChantine_001", -- Chantine (Limsa Upper Decks: Adv. Guild) defaultTalkWithChantine_002 / 003 (WVR informant) + [1000276] = "defaultTalkWithNanaka_001", -- Nanaka (Limsa Upper Decks: Adv. Guild) defaultTalkWithNanaka_002 / 003 (GSM informant) + [1000277] = "defaultTalkWithKakamehi_001", -- Kakamehi (Limsa Upper Decks: Adv. Guild) defaultTalkWithKakamehi_002 / 003 (ALC informant) + [1000278] = "defaultTalkWithStephannot_001", -- Stephannot (Limsa Upper Decks: Adv. Guild) defaultTalkWithStephannot_002 / 003 (MIN informant) + [1000279] = "defaultTalkWithJosias_001", -- Josias (Limsa Upper Decks: Adv. Guild) defaultTalkWithJosias_002 / 003 (CRP informant) + [1000280] = "defaultTalkWithFrithuric_001", -- Frithuric (Limsa Upper Decks: Adv. Guild) defaultTalkWithFrithuric_002 / 003 (LTW informant) + [1000281] = "defaultTalkWithLauda_001", -- Lauda (Limsa Upper Decks: Adv. Guild) defaultTalkWithLauda_002 / 003 (BTN informant) + [1000282] = "defaultTalkWithAdventurer031_001", -- Drowsy-eyed Adventurer (Limsa Lower Decks: Ferry Docks) + [1000283] = "defaultTalkWithAdventurer032_001", -- Unconscious Adventurer (Limsa Lower Decks: MRD Guild) + [1000284] = "defaultTalkWithPirate031_001", -- Positively Pungeant Pirate (Limsa Lower Decks: ACN Guild) + [1000286] = "defaultTalkWithKob031_001", -- Sure-voiced Barracude Knight (Limsa Lower Decks: MRD Guild) + [1000330] = "defaultTalkWithCeadda_001", -- Ceadda (Limsa Lower Decks: Ferry Docks) + [1000331] = "defaultTalkWithDympna_001", -- Dympna (Limsa Upper Decks: Thundersquall Thundersticks) + [1000332] = "defaultTalkWithAhldskyff_001", -- Ahldskyf (Limsa Lower Decks: Ferry Docks) + [1000333] = "defaultTalkWithSkarnwaen_001", -- Skarnwaen (Limsa Lower Decks) + [1000334] = "defaultTalkWithShoshoma_001", -- Shoshoma (Limsa Lower Decks) + [1000335] = "defaultTalkWithBmallpa_001", -- B'mallpa (Limsa Upper Decks) + [1000337] = "defaultTalkWithMaetistym_001", -- Maetistym (Limsa Lower Decks) + [1000338] = "defaultTalkWithSathzant_001", -- Sathzant (Limsa Upper Decks) + [1000339] = "defaultTalkWithGnibnpha_001", -- G'nibnpha (Limsa Upper Decks) + [1000340] = "defaultTalkWithRbaharra_001", -- R'baharra (Limsa Lower Decks: Ferry Docks) + [1000341] = "defaultTalkWithTatasako_001", -- Tatasako (Limsa Lower Decks) + [1000342] = "defaultTalkWithJghonako_001", -- J'ghonako (Limsa Upper Decks) + [1000344] = "defaultTalkWithFerdillaix_001", -- Ferdillaix (Limsa Upper Decks) + [1000345] = "defaultTalkWithFufuna_001", -- Fufuna (Limsa Upper Decks: The Hyaline) + [1000346] = "defaultTalkWithAudaine_001", -- Audaine (Limsa Lower Decks: East Hawkers' Alley) + [1000347] = "defaultTalkWithAergwynt_001", -- Aergwynt (Limsa Lower Decks) + [1000348] = "defaultTalkWithOrtolf_001", -- Ortolf (Limsa Lower Decks) + [1000349] = "defaultTalkWithSundhimal_001", -- Sundhimal (Limsa Upper Decks: Aetheryte Plaza) + [1000350] = "defaultTalkWithEugennoix_001", -- Eugennoix (Limsa Upper Decks: Aetheryte Plaza) + [1000351] = "defaultTalkWithZanthael_001", -- Zanthael (Limsa Lower Decks: Bulwark Hall) + [1000359] = "defaultTalkWithRyssfloh_001", -- Ryssflog (Lower La Noscea: Camp Bearded Rock) If Arg1 = 20 (SpecialEventWork correlation?), extra dialog about dire beasts + [1000360] = "defaultTalkWithKihtgamduhla_001", -- Kiht Gamduhla (Lower La Noscea: Camp Bearded Rock) If Arg1 = 20 (SpecialEventWork correlation?), extra dialog about Atomos + [1000362] = "defaultTalkWithSolelle_001", -- Solelle (Western La Noscea: Camp Skull Valley) + [1000363] = "defaultTalkWithNorman_001", -- <<>> - Norman - Entry Denier Guard (Upper La Noscea: U'Ghamaro Mines entrance) Est. 97.103, 64.368, -2702.809 - Guarded the zone when it wasn't playable in older version + [1000364] = "defaultTalkWithBaenskylt_001", -- <<>> - Baenskylt - Entry Denier Guard (Eastern La Noscea) - Might have guarded dun05? (!warp 410 44 -847) + [1000365] = "defaultTalkWithGautzelin_001", -- Gautzelin (Limsa Upper Decks: BSM/ARM Guild) + [1000366] = "defaultTalkWithAimiliens_001", -- <<>> - Aimiliens - Entry Denier Guard (Western La Noscea) - Guards dun02 (Est. X:-1886.068 Y:22.445 Z:-849.989) + [1000367] = "defaultTalkWithFongho_001", -- <<>> - F'ongho - (Lower La Noscea) - Hangs at Shposhae's entrance. Arg1=False adds dialog about you finding Shposhae. + [1000468] = "defaultTalkWithVhynho_001", -- V'hynho (Limsa Upper Decks: MSK Guild) + [1000469] = "defaultTalkWithZuzule_001", -- Zuzule (Limsa Upper Decks: MSK Guild) + [1000470] = "defaultTalkWithFuzakanzak_001", -- Fuzak Anzak (Limsa Upper Decks: MSK Guild) + [1000471] = "defaultTalkWithBnhapla_001", -- B'nhapla (Limsa Upper Decks: MSK Guild) + [1000472] = "defaultTalkWithMerlzirn_001", -- Merlzirn (Limsa Upper Decks: MSK Guild) defaultTalkWithMerlzirn_002 (only plays the first msg of 001) + [1000473] = "defaultTalkWithNinianne_001", -- Ninianne (Limsa Upper Decks: MSK Guild) + [1000474] = "defaultTalkWithKehdamujuuk_001", -- Kehda Mujuuk (Limsa Lower Decks: ACN Guild) + [1000475] = "defaultTalkWithWhahtoa_001", -- W'hahtoa (Limsa Lower Decks: MRD Guild) + [1000476] = "defaultTalkWithGnanghal_001", -- G'nanghal (Limsa Lower Decks: MRD Guild) + -- [1000613] = "defaultTalkWithNahctahr_001", -- Nahctahr (Lower La Noscea: Camp Bearded Rock) - Blank dialog. Will not fire, not PplStd. + -- [1000614] = "defaultTalkWithKokomui_001", -- Kokomui (Eastern La Noscea: Camp Bloodshore) - Blank dialog. Will not fire, not PplStd. + -- [1000615] = "defaultTalkWithEptolmi_001", -- E'ptolmi (Western La Noscea: Camp Skull Valley) - Blank dialog. Will not fire, not PplStd. + -- [1000616] = "defaultTalkWithZabinie_001", -- Zabinie (Western La Noscea: Camp Bald Knoll) - Blank dialog. Will not fire, not PplStd. + [1000620] = "defaultTalkWithDeladomadalado_001",-- Delado Madalado (Limsa Lower Decks: ACN Guild) + [1000662] = "defaultTalkWithSkoefmynd_001", -- Skoefmynd (Limsa Lower Decks: FSH Guild) + [1001063] = "defaultTalkWithMharelak_001", -- Mharelak (Limsa Lower Decks: MRD Guild) + [1001064] = "defaultTalkWithHasthwab_001", -- Hasthwab (Limsa Lower Decks: MRD Guild) + [1001065] = "defaultTalkWithIghiimoui_001", -- Ighii Moui (Limsa Lower Decks: MRD Guild) + [1001185] = "defaultTalkWithDavyd_001", -- Leveridge (Limsa Lower Decks) + [1001186] = "defaultTalkWithNnagali_001", -- H'rhanbolo (Limsa Lower Decks) + [1001187] = "defaultTalkWithKakalan_001", -- Bango Zango (Limsa Upper Decks) + [1001298] = "defaultTalkWithBubusha_001", -- Bubusha (Western La Noscea: Aleport) + [1001299] = "defaultTalkWithOadebh_001", -- O'adebh (Western La Noscea: Aleport) + [1001300] = "defaultTalkWithMyndeidin_001", -- Myndeidin (Western La Noscea: Aleport) + [1001301] = "defaultTalkWithFupepe_001", -- Fupepe (Western La Noscea: Aleport) + [1001302] = "defaultTalkWithModestmouse_001", -- Immodest Mouse (Western La Noscea: Aleport) + [1001303] = "defaultTalkWithDuchesnelt_001", -- Duchesnelt (Western La Noscea: Aleport) + [1001304] = "defaultTalkWithSkribskoef_001", -- Skribskoef (Western La Noscea: Aleport) + [1001305] = "defaultTalkWithYalabali_001", -- Y'alabali (Western La Noscea: Aleport) + [1001306] = "defaultTalkWithSyzfrusk_001", -- <<>> - Syzfrusk (Eastern La Noscea: Wineport) + [1001307] = "defaultTalkWithInairoh_001", -- <<>> - I'nairoh (Eastern La Noscea: Wineport) + [1001308] = "defaultTalkWithMagaswyn_001", -- <<>> - Magaswyn (Eastern La Noscea: Wineport) + [1001309] = "defaultTalkWithSenahchalahko_001", -- <<>> - Senah Chalahko (Eastern La Noscea: Wineport) + [1001310] = "defaultTalkWithWaldibert_001", -- <<>> - Waldibert (Eastern La Noscea: Wineport) + [1001311] = "defaultTalkWithEbandala_001", -- <<>> - E'bandala (Eastern La Noscea: Wineport) + [1001312] = "defaultTalkWithGuidingstar_001", -- <<>> - Guiding Star (Eastern La Noscea: Wineport) + [1001313] = "defaultTalkWithHundredeyes_001", -- <<>> - Hundred Eyes (Eastern La Noscea: Wineport) + [1001473] = "downTownTalk", -- Thata Khamazom (Limsa Upper Decks) defaultTalkWithThatakhamazom_001 - Old function? + [1001474] = "defaultTalkWithRoostingcrow_001", -- Roosting Crow (Limsa Upper Decks) + [1001508] = "defaultTalkWithMareillie_001", -- Mareillie (Limsa Lower Decks) + [1001509] = "defaultTalkWithSyntberk_001", -- Syntberk (Limsa Lower Decks) + [1001510] = "defaultTalkWithAngryriver_001", -- Angry River (Limsa Lower Decks: ACN Guild) + [1001511] = "defaultTalkWithBibiraka_001", -- Bibiraka (Limsa Lower Decks) + [1001567] = "defaultTalkWithImania_001", -- Imania (Limsa Upper Decks) + [1001573] = "defaultTalkWithSweetnix_001", -- Sweetnix Rosycheeks (Limsa Lower Decks) + [1001603] = "defaultTalkWithLolojo_001", -- <<>> Lolojo (Eastern La Noscea: Red Rooster Stead) + [1001604] = "defaultTalkWithQmolosi_001", -- <<>> Q'molosi (Western La Noscea: Halfstone) + [1001605] = "defaultTalkWithBran_001", -- <<>> Bran (Western La Noscea: Halfstone) + [1001606] = "defaultTalkWithTutumoko_001", -- <<>> Tutumoko (Eastern La Noscea: Red Rooster Stead) + [1001607] = "defaultTalkWithBrianna_001", -- <<>> Brianna (Eastern La Noscea: Red Rooster Stead) + [1001608] = "defaultTalkWithFaine_001", -- <<>> Faine (Western La Noscea: Halfstone) + [1001609] = "defaultTalkWithAerghaemr_001", -- <<>> Aerghaemr (Western La Noscea: Halfstone) + [1001616] = "talkIdayCap", -- <<>> Storm Lieutenant Hardil (Limsa: Foundation Day 2011) - OLD EVENT NPC: Replaced by 2012 version + [1001617] = "talkIday1", -- <<>> Storm Sergeant Allond (Limsa: Foundation Day 2011) - OLD EVENT NPC: Replaced by 2012 version + [1001618] = "talkIday2", -- <<>> Storm Private Dracht (Limsa: Foundation Day 2011) - OLD EVENT NPC: Replaced by 2012 version + [1001629] = "defaultTalkWithWalcher_001", -- <<>> - Walcher (Eastern La Noscea: Wineport) + [1001697] = "defaultTalkWithKurtz_001", -- <<>> - Storm Sergeant Nolan (Upper La Noscea: Camp Iron Lake) + [1001700] = "defaultTalkWithAjinZukajin_001", -- <<>> Ajin Zukajin (Limsa: Airship Landing) + [1001701] = "defaultTalkWithRaplulu_001", -- <<>> Raplulu (Limsa: Airship Landing) + [1001702] = "defaultTalkWithZentsa_001", -- <<>> G'zentsa (Limsa: Airship Landing) + [1001703] = "defaultTalkWithAldyet_001", -- <<>> Aldyet (Limsa: Airship Landing) + [1001704] = "defaultTalkWithMurlskylt_001", -- <<>> Murlskylt (Limsa: Airship Landing) + [1001705] = "defaultTalkWith_Aenore001", -- <<>> Aenore (Limsa: Airship Landing) + [1001764] = "defaultTalkWithBaenryss_001", -- <<>> Baenryss (Lower La Noscea) - Hangs at the Shposhae entrance + [1001765] = "defaultTalkWithChachapi_001", -- <<>> Chachapi (Lower La Noscea) - Hangs at the Shposhae entrance + [1001766] = "defaultTalkWithForchetaix_001", -- <<>> Forchetaix (Lower La Noscea) - Hangs at the Shposhae entrance + [1001805] = "defaultTalkWithSizhaepocan_001", -- <<>> - Sizha Epocan (Eastern La Noscea: Wineport) + [1001833] = "defaultTalkWithAlain_001", -- <<>> - Storm Sergeant Brooks (Upper La Noscea) + [1500001] = "defaultTalkWithPiralnaut_001", -- Piralnaut (Limsa Upper Decks: Adv. Guild) - Will not fire, not PplStd. + [1500003] = "defaultTalkWithFaezbroes_001", -- <<>> - Faezbroes (Limsa: Airship Landing) - Will not fire, not PplStd. + [1500004] = "defaultTalkWithGert_001", -- Gert (Limsa Lower Decks: Ferry Docks) + [1500005] = "defaultTalkWithLorhzant_001", -- Lorhzant (Limsa Lower Decks: Ferry Docks) + [1500006] = "defaultTalkWithIsleen_001", -- Isleen (Limsa Lower Decks: Bulwark Hall) Pre-Chocobo rental dialog. Obsolete + [1500125] = "tribeTalk", -- Merewina (Limsa Lower Decks) + [1700037] = "defaultTalkWithANSGOR_100", -- Ansgor (Limsa Lower Decks) <> +} -defaultTalkStartMan(A0_1, A1_2, A2_3) -defaultTalkOiSAM(A0_4, A1_5, A2_6) -defaultTalkMLinhbo(A0_7, A1_8, A2_9) -defaultTalkWithMytesyn_001(A0_10, A1_11, A2_12) -defaultTalkWithUrsulie_001(A0_13, A1_14, A2_15) -defaultTalkWithAshakkal_001(A0_16, A1_17, A2_18) -defaultTalkWithPiralnaut_001(A0_19, A1_20, A2_21) -defaultTalkWithBaderon_001(A0_22, A1_23, A2_24) -defaultTalkWithCharlys_001(A0_25, A1_26, A2_27) -defaultTalkWithNoline_001(A0_28, A1_29, A2_30) -defaultTalkWithJossy_001(A0_31, A1_32, A2_33) -defaultTalkWithPrudentia_001(A0_34, A1_35, A2_36) -defaultTalkWithPulmia_001(A0_37, A1_38, A2_39) -defaultTalkWithAentfoet_001(A0_40, A1_41, A2_42) -defaultTalkWithKikichua_001(A0_43, A1_44, A2_45) -defaultTalkWithGerulf_001(A0_46, A1_47, A2_48) -defaultTalkWithHobriaut_001(A0_49, A1_50, A2_51) -defaultTalkWithRsushmo_001(A0_52, A1_53, A2_54) -defaultTalkWithFrailoise_001(A0_55, A1_56, A2_57) -defaultTalkWithIsaudorel_001(A0_58, A1_59, A2_60) -defaultTalkWithTotoruto_001(A0_61, A1_62, A2_63) -defaultTalkWithChaunollet_001(A0_64, A1_65, A2_66) -defaultTalkWithRaragun_001(A0_67, A1_68, A2_69) -defaultTalkWithMynadaeg_001(A0_70, A1_71, A2_72) -defaultTalkWithTefhmoshroca_001(A0_73, A1_74, A2_75) -defaultTalkWithGinnade_001(A0_76, A1_77, A2_78) -defaultTalkWithArthurioux_001(A0_79, A1_80, A2_81) -defaultTalkWithBodenolf_001(A0_82, A1_83, A2_84) -defaultTalkWithBodenolf_002(A0_85, A1_86, A2_87) -defaultTalkWithQhaschalahko_001(A0_88, A1_89, A2_90) -defaultTalkWithJoellaut_001(A0_91, A1_92, A2_93) -defaultTalkWithIofa_001(A0_94, A1_95, A2_96) -defaultTalkWithSyngsmyd_001(A0_97, A1_98, A2_99) -defaultTalkWithMartiallais_001(A0_100, A1_101, A2_102) -defaultTalkWithFaucillien_001(A0_103, A1_104, A2_105) -defaultTalkWithNnmulika_001(A0_106, A1_107, A2_108) -defaultTalkWithLouviaune_001(A0_109, A1_110, A2_111) -defaultTalkWithClifton_001(A0_112, A1_113, A2_114) -defaultTalkWithUndsatz_001(A0_115, A1_116, A2_117) -defaultTalkWithRerenasu_001(A0_118, A1_119, A2_120) -defaultTalkWithDacajinjahl_001(A0_121, A1_122, A2_123) -defaultTalkWithBloemerl_001(A0_124, A1_125, A2_126) -defaultTalkWithXavalien_001(A0_127, A1_128, A2_129) -defaultTalkWithAstrid_001(A0_130, A1_131, A2_132) -defaultTalkWithWaekbyrt_001(A0_133, A1_134, A2_135) -defaultTalkWithWaekbyrt_002(A0_136, A1_137, A2_138) -defaultTalkWithNunuba_001(A0_139, A1_140, A2_141) -defaultTalkWithSraemha_001(A0_142, A1_143, A2_144) -defaultTalkWithOsitha_001(A0_145, A1_146, A2_147) -defaultTalkWithNeale_001(A0_148, A1_149, A2_150) -defaultTalkWithBayard_001(A0_151, A1_152, A2_153) -defaultTalkWithTriaine_001(A0_154, A1_155, A2_156) -defaultTalkWithWyrakhamazom_001(A0_157, A1_158, A2_159) -defaultTalkWithDhemsunn_001(A0_160, A1_161, A2_162) -defaultTalkWithNanapiri_001(A0_163, A1_164, A2_165) -defaultTalkWithMharelak_001(A0_166, A1_167, A2_168) -defaultTalkWithHasthwab_001(A0_169, A1_170, A2_171) -defaultTalkWithIghiimoui_001(A0_172, A1_173, A2_174) -defaultTalkWithMimiroon_001(A0_175, A1_176, A2_177) -defaultTalkWithJojoroon_001(A0_178, A1_179, A2_180) -defaultTalkWithChichiroon_001(A0_181, A1_182, A2_183) -defaultTalkWithBuburoon_001(A0_184, A1_185, A2_186) -defaultTalkWithHaldberk_001(A0_187, A1_188, A2_189) -defaultTalkWithP_tahjha_001(A0_190, A1_191, A2_192) -defaultTalkWithElilwaen_001(A0_193, A1_194, A2_195) -defaultTalkWithDodoroba_001(A0_196, A1_197, A2_198) -defaultTalkWithIvan_001(A0_199, A1_200, A2_201) -defaultTalkWithLilina_001(A0_202, A1_203, A2_204) -defaultTalkWithThosinbaen_001(A0_205, A1_206, A2_207) -defaultTalkWithRubh_epocan_001(A0_208, A1_209, A2_210) -defaultTalkWithRubh_hob_001(A0_211, A1_212, A2_213) -defaultTalkWithMaunie_001(A0_214, A1_215, A2_216) -defaultTalkWithMaunie_002(A0_217, A1_218, A2_219) -defaultTalkWithMaunie_003(A0_220, A1_221, A2_222) -defaultTalkWithGigirya_001(A0_223, A1_224, A2_225) -defaultTalkWithGigirya_002(A0_226, A1_227, A2_228) -defaultTalkWithGigirya_003(A0_229, A1_230, A2_231) -defaultTalkWithKokoto_001(A0_232, A1_233, A2_234) -defaultTalkWithKokoto_002(A0_235, A1_236, A2_237) -defaultTalkWithKokoto_003(A0_238, A1_239, A2_240) -defaultTalkWithTirauland_001(A0_241, A1_242, A2_243) -defaultTalkWithTirauland_010(A0_244, A1_245, A2_246) -defaultTalkWithTirauland_002(A0_247, A1_248, A2_249) -defaultTalkWithTirauland_003(A0_250, A1_251, A2_252) -defaultTalkWithEstrilda_001(A0_253, A1_254, A2_255) -defaultTalkWithEstrilda_002(A0_256, A1_257, A2_258) -defaultTalkWithEstrilda_003(A0_259, A1_260, A2_261) -defaultTalkWithGregory_001(A0_262, A1_263, A2_264) -defaultTalkWithGregory_002(A0_265, A1_266, A2_267) -defaultTalkWithGregory_003(A0_268, A1_269, A2_270) -defaultTalkWithChantine_001(A0_271, A1_272, A2_273) -defaultTalkWithChantine_002(A0_274, A1_275, A2_276) -defaultTalkWithChantine_003(A0_277, A1_278, A2_279) -defaultTalkWithNanaka_001(A0_280, A1_281, A2_282) -defaultTalkWithNanaka_002(A0_283, A1_284, A2_285) -defaultTalkWithNanaka_003(A0_286, A1_287, A2_288) -defaultTalkWithKakamehi_001(A0_289, A1_290, A2_291) -defaultTalkWithKakamehi_002(A0_292, A1_293, A2_294) -defaultTalkWithKakamehi_003(A0_295, A1_296, A2_297) -defaultTalkWithStephannot_001(A0_298, A1_299, A2_300) -defaultTalkWithStephannot_002(A0_301, A1_302, A2_303) -defaultTalkWithStephannot_003(A0_304, A1_305, A2_306) -defaultTalkWithJosias_001(A0_307, A1_308, A2_309) -defaultTalkWithJosias_002(A0_310, A1_311, A2_312) -defaultTalkWithJosias_003(A0_313, A1_314, A2_315) -defaultTalkWithFrithuric_001(A0_316, A1_317, A2_318) -defaultTalkWithFrithuric_002(A0_319, A1_320, A2_321) -defaultTalkWithFrithuric_003(A0_322, A1_323, A2_324) -defaultTalkWithLauda_001(A0_325, A1_326, A2_327) -defaultTalkWithLauda_002(A0_328, A1_329, A2_330) -defaultTalkWithLauda_003(A0_331, A1_332, A2_333) -defaultTalkWithH_lahono_001(A0_334, A1_335, A2_336) -defaultTalkWithWyrstmann_001(A0_337, A1_338, A2_339) -defaultTalkWithTraveler030_001(A0_340, A1_341, A2_342) -defaultTalkWithTraveler031_001(A0_343, A1_344, A2_345) -defaultTalkWithTraveler032_001(A0_346, A1_347, A2_348) -defaultTalkWithYouty001_001(A0_349, A1_350, A2_351) -defaultTalkWithMerchant002_001(A0_352, A1_353, A2_354) -defaultTalkWithPirate030_001(A0_355, A1_356, A2_357) -defaultTalkWithLady002_001(A0_358, A1_359, A2_360) -defaultTalkWithSlaiboli_001(A0_361, A1_362, A2_363) -defaultTalkWithSyhrdaeg_001(A0_364, A1_365, A2_366) -defaultTalkWithPfynhaemr_001(A0_367, A1_368, A2_369) -defaultTalkWithMzimzizi_001(A0_370, A1_371, A2_372) -defaultTalkWithCarrilaut_001(A0_373, A1_374, A2_375) -defaultTalkWithGautzelin_001(A0_376, A1_377, A2_378) -defaultTalkWithZonggo_001(A0_379, A1_380, A2_381) -defaultTalkWithAdventurer032_001(A0_382, A1_383, A2_384) -defaultTalkWithKob031_001(A0_385, A1_386, A2_387) -defaultTalkWithJainelette_001(A0_388, A1_389, A2_390) -defaultTalkWithBrictt_001(A0_391, A1_392, A2_393) -defaultTalkWithLiautroix_001(A0_394, A1_395, A2_396) -defaultTalkWithLaniaitte_001(A0_397, A1_398, A2_399) -defaultTalkWithNyaalamo_001(A0_400, A1_401, A2_402) -defaultTalkWithFaezbroes_001(A0_403, A1_404, A2_405) -defaultTalkWithIsleen_001(A0_406, A1_407, A2_408) -defaultTalkWithSundhimal_001(A0_409, A1_410, A2_411) -defaultTalkWithEugennoix_001(A0_412, A1_413, A2_414) -defaultTalkWithRyssfloh_001(A0_415, A1_416, A2_417, A3_418) -defaultTalkWithKihtgamduhla_001(A0_419, A1_420, A2_421, A3_422) -defaultTalkWithFabodji_001(A0_423, A1_424, A2_425) -defaultTalkWithRobairlain_001(A0_426, A1_427, A2_428) -defaultTalkWithNorman_001(A0_429, A1_430, A2_431) -defaultTalkWithBaenskylt_001(A0_432, A1_433, A2_434) -defaultTalkWithAimiliens_001(A0_435, A1_436, A2_437) -defaultTalkWithFongho_001(A0_438, A1_439, A2_440, A3_441) -defaultTalkWithBaenryss_001(A0_442, A1_443, A2_444) -defaultTalkWithChachapi_001(A0_445, A1_446, A2_447) -defaultTalkWithForchetaix_001(A0_448, A1_449, A2_450) -defaultTalkWithSosoze_001(A0_451, A1_452, A2_453) -defaultTalkWithColson_001(A0_454, A1_455, A2_456) -defaultTalkWithHihine_001(A0_457, A1_458, A2_459) -defaultTalkWithTrinne_001(A0_460, A1_461, A2_462) -defaultTalkWithSailor031_001(A0_463, A1_464, A2_465) -defaultTalkWithPorter001_001(A0_466, A1_467, A2_468) -defaultTalkWithAdventurer030_001(A0_469, A1_470, A2_471) -defaultTalkWithPirate031_001(A0_472, A1_473, A2_474) -defaultTalkWithLady001_001(A0_475, A1_476, A2_477) -defaultTalkWithAdventurer031_001(A0_478, A1_479, A2_480) -defaultTalkWithSolelle_001(A0_481, A1_482, A2_483) -defaultTalkWithZanthael_001(A0_484, A1_485, A2_486) -defaultTalkWithJghonako_001(A0_487, A1_488, A2_489) -defaultTalkWithAhldskyff_001(A0_490, A1_491, A2_492) -defaultTalkWithSkarnwaen_001(A0_493, A1_494, A2_495) -defaultTalkWithGnibnpha_001(A0_496, A1_497, A2_498) -defaultTalkWithAudaine_001(A0_499, A1_500, A2_501) -defaultTalkWithCeadda_001(A0_502, A1_503, A2_504) -defaultTalkWithZehrymm_001(A0_505, A1_506, A2_507) -defaultTalkWithTatasako_001(A0_508, A1_509, A2_510) -defaultTalkWithDympna_001(A0_511, A1_512, A2_513) -defaultTalkWithBmallpa_001(A0_514, A1_515, A2_516) -defaultTalkWithFerdillaix_001(A0_517, A1_518, A2_519) -defaultTalkWithFufuna_001(A0_520, A1_521, A2_522) -defaultTalkWithDavyd_001(A0_523, A1_524, A2_525) -defaultTalkWithOrtolf_001(A0_526, A1_527, A2_528) -defaultTalkWithMaetistym_001(A0_529, A1_530, A2_531) -defaultTalkWithFzhumii_001(A0_532, A1_533, A2_534) -defaultTalkWithShoshoma_001(A0_535, A1_536, A2_537) -defaultTalkWithArnegis_001(A0_538, A1_539, A2_540) -defaultTalkWithRbaharra_001(A0_541, A1_542, A2_543) -defaultTalkWithAergwynt_001(A0_544, A1_545, A2_546) -defaultTalkWithKakalan_001(A0_547, A1_548, A2_549) -defaultTalkWithSathzant_001(A0_550, A1_551, A2_552) -defaultTalkWithNnagali_001(A0_553, A1_554, A2_555) -defaultTalkWithVhynho_001(A0_556, A1_557, A2_558) -defaultTalkWithZuzule_001(A0_559, A1_560, A2_561) -defaultTalkWithFuzakanzak_001(A0_562, A1_563, A2_564) -defaultTalkWithBnhapla_001(A0_565, A1_566, A2_567) -defaultTalkWithMerlzirn_001(A0_568, A1_569, A2_570) -defaultTalkWithMerlzirn_002(A0_571, A1_572, A2_573) -defaultTalkWithNinianne_001(A0_574, A1_575, A2_576) -defaultTalkWithNheujawantal_001(A0_577, A1_578, A2_579) -defaultTalkWithMaisie_001(A0_580, A1_581, A2_582) -defaultTalkWithWhahtoa_001(A0_583, A1_584, A2_585) -defaultTalkWithGnanghal_001(A0_586, A1_587, A2_588) -defaultTalkWithKehdamujuuk_001(A0_589, A1_590, A2_591) -defaultTalkWithGert_001(A0_592, A1_593, A2_594) -defaultTalkWithLorhzant_001(A0_595, A1_596, A2_597) -defaultTalkWithNahctahr_001(A0_598, A1_599, A2_600) -defaultTalkWithKokomui_001(A0_601, A1_602, A2_603) -defaultTalkWithEptolmi_001(A0_604, A1_605, A2_606) -defaultTalkWithZabinie_001(A0_607, A1_608, A2_609) -defaultTalkWithDeladomadalado_001(A0_610, A1_611, A2_612) -defaultTalkWithSkoefmynd_001(A0_613, A1_614, A2_615) -defaultTalkWithBubusha_001(A0_616, A1_617, A2_618) -defaultTalkWithFupepe_001(A0_619, A1_620, A2_621) -defaultTalkWithOadebh_001(A0_622, A1_623, A2_624) -defaultTalkWithMyndeidin_001(A0_625, A1_626, A2_627) -defaultTalkWithModestmouse_001(A0_628, A1_629, A2_630) -defaultTalkWithDuchesnelt_001(A0_631, A1_632, A2_633) -defaultTalkWithSkribskoef_001(A0_634, A1_635, A2_636) -defaultTalkWithYalabali_001(A0_637, A1_638, A2_639) -defaultTalkWithSyzfrusk_001(A0_640, A1_641, A2_642) -defaultTalkWithInairoh_001(A0_643, A1_644, A2_645) -defaultTalkWithMagaswyn_001(A0_646, A1_647, A2_648) -defaultTalkWithSenahchalahko_001(A0_649, A1_650, A2_651) -defaultTalkWithWaldibert_001(A0_652, A1_653, A2_654) -defaultTalkWithEbandala_001(A0_655, A1_656, A2_657) -defaultTalkWithGuidingstar_001(A0_658, A1_659, A2_660) -defaultTalkWithHundredeyes_001(A0_661, A1_662, A2_663) -defaultTalkWithSizhaepocan_001(A0_664, A1_665, A2_666) -defaultTalkWithMareillie_001(A0_667, A1_668, A2_669) -defaultTalkWithAngryriver_001(A0_670, A1_671, A2_672) -defaultTalkWithSyntberk_001(A0_673, A1_674, A2_675) -defaultTalkWithBibiraka_001(A0_676, A1_677, A2_678) -defaultTalkWithThatakhamazom_001(A0_679, A1_680, A2_681) -defaultTalkWithRoostingcrow_001(A0_682, A1_683, A2_684) -defaultTalkWithZentsa_001(A0_685, A1_686, A2_687) -defaultTalkWithAldyet_001(A0_688, A1_689, A2_690) -defaultTalkWithAjinZukajin_001(A0_691, A1_692, A2_693) -defaultTalkWithRaplulu_001(A0_694, A1_695, A2_696) -defaultTalkWithMurlskylt_001(A0_697, A1_698, A2_699) -defaultTalkWith_Aenore001(A0_700, A1_701, A2_702) -defaultTalkWithANSGOR_100(A0_703, A1_704, A2_705) -defaultTalkWithImania_001(A0_706, A1_707, A2_708) -defaultTalkWithSweetnix_001(A0_709, A1_710, A2_711) -defaultTalkWithLolojo_001(A0_712, A1_713, A2_714) -defaultTalkWithQmolosi_001(A0_715, A1_716, A2_717) -defaultTalkWithBran_001(A0_718, A1_719, A2_720) -defaultTalkWithTutumoko_001(A0_721, A1_722, A2_723) -defaultTalkWithBrianna_001(A0_724, A1_725, A2_726) -defaultTalkWithFaine_001(A0_727, A1_728, A2_729) -defaultTalkWithAerghaemr_001(A0_730, A1_731, A2_732) -defaultTalkWithWalcher_001(A0_733, A1_734, A2_735) -defaultTalkWithKurtz_001(A0_736, A1_737, A2_738) -defaultTalkWithAlain_001(A0_739, A1_740, A2_741) -defaultTalkCaravanChocoboLim_001(A0_742, A1_743, A2_744) -downTownTalk(A0_745, A1_746, A2_747, A3_748, A4_749, A5_750) -tribeTalk(A0_752, A1_753, A2_754) -talkIdayCap(A0_755, A1_756, A2_757) -talkIday1(A0_758, A1_759, A2_760) -talkIday2(A0_761, A1_762, A2_763) -defaultTalkWithInn_Desk(A0_764, A1_765, A2_766) -defaultTalkWithInn_ExitDoor(A0_767, A1_768, A2_769) -defaultTalkWithExit01(A0_770, A1_771, A2_772) -defaultTalkWithMarketNpc(A0_773, A1_774, A2_775) -defaultTalkWithHamletGuardLim_001(A0_776, A1_777, A2_778) + +--[[ Need sourcing + + [1001619] -- <<>> Storm Sergeant Solklinsyn (Limsa: Foundation Day 2011) - Cryer: Uses a different script + + defaultTalkStartMan -- Empty. startCliantTalkTurn & ends. Likely debug. + defaultTalkOiSAM -- Empty. Likely debug. + defaultTalkMLinhbo -- Empty. Likely debug. + + defaultTalkWithNyaalamo_001 -- N'yaalamo?: Airship NPC? + "All airships will remain in port until further notice. We apologize for the inconvenience." + Google giving me NOTHING. Mismatched NPC name? Obsolete/Removed NPC? Need to find a vid of the Limsa airship room. + + defaultTalkCaravanChocoboLim_001 + defaultTalkWithInn_ExitDoor(A0_767, A1_768, A2_769) + defaultTalkWithExit01(A0_770, A1_771, A2_772) + defaultTalkWithMarketNpc(A0_773, A1_774, A2_775) + defaultTalkWithHamletGuardLim_001(A0_776, A1_777, A2_778) --]] - -} - + function onTalk(player, quest, npc, eventName) - local clientFunc = defaultTalkSea[npc.GetActorClassId()]; - callClientFunction(player, "delegateEvent", player, quest, clientFunc); - player:EndEvent(); + + local npcId = npc:GetActorClassId(); + local clientFunc = defaultTalkSea[npcId]; + + if (npcId == 1000167) then -- Mytesyn - Inn NPC + defaultTalkWithInn(player, quest, clientFunc); + else + callClientFunction(player, "delegateEvent", player, quest, clientFunc); + end + + player:EndEvent(); end function IsQuestENPC(player, quest, npc) return defaultTalkSea[npc.GetActorClassId()] ~= nil; +end + + +function defaultTalkWithInn(player, quest, clientFunc) + local choice = callClientFunction(player, "delegateEvent", player, quest, clientFunc); + + 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(3); + 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 end \ No newline at end of file diff --git a/Data/scripts/quests/dft/DftWil.lua b/Data/scripts/quests/dft/DftWil.lua index 3375c7d1..f4f900df 100644 --- a/Data/scripts/quests/dft/DftWil.lua +++ b/Data/scripts/quests/dft/DftWil.lua @@ -98,8 +98,8 @@ local defaultTalkWil = { [1001143] = "defaultTalkWithTotono_001", -- Totono [1001144] = "defaultTalkWithFyrilsunn_001", -- Fyrilsunn [1001145] = "defaultTalkWithSinette_001", -- Sinette - [1001146] = "defaultTalkWithZirnbyrt_001", -- <<>> - Zirnbyrt - Entry Denier Guard (East Thanalan: X:1831.565 Y:248.576 Z:448.872 Educated guess from wiki picture. Guards unused dun01) - [1001147] = "defaultTalkWithVhasotayuun_001", -- <<>> - Vhaso Tayuun - (Entry Denier? No wiki info) + [1001146] = "defaultTalkWithZirnbyrt_001", -- <<>> - Zirnbyrt - Entry Denier (East Thanalan: X:1831.565 Y:248.576 Z:448.872 Educated guess from wiki picture. Guards unused dun01) + [1001147] = "defaultTalkWithVhasotayuun_001", -- <<>> - Vhaso Tayuun - Entry Denier (East Thanalan: X:1818.940 Y:244.810 Z:-76.766 rough guess from vid. Guards unused dun03) [1001148] = "defaultTalkWithPulbeiyalbei_001", -- <<>> - Pulbei Yalbei - (Entry Denier? No wiki info) [1001149] = "defaultTalkWithGembert_001", -- <<>> - Gembert - Entry Denier Guard (South Thanalan: X:1707.143 Y:238.150 Z:1617.570 Rough estimate. Guards unused dun06) [1001165] = "defaultTalkWithMumukiya_001", -- Mumukiya 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/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/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/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/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 From 7e5ca6e013c8ea258f62721f3fc30bd122d027d1 Mon Sep 17 00:00:00 2001 From: CuriousJorge Date: Thu, 17 Feb 2022 20:03:15 -0500 Subject: [PATCH 02/17] Added Foundation Day 2012 actors to DftWil for now just so they can talk. Added a Chocobo to it also that we already had spawned, unsure if authentic or not, added a comment reflecting that. Cleaned up more orphaned scripts from Wil region. --- Data/scripts/quests/dft/DftWil.lua | 30 +++++++++++-------- .../PopulaceStandard/pack_chocobo.lua | 7 ----- .../wil0Field02/PopulaceStandard/zllayan.lua | 7 ----- .../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 ---- .../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 ----- .../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 ---- 83 files changed, 18 insertions(+), 550 deletions(-) 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/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/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 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/quests/dft/DftWil.lua b/Data/scripts/quests/dft/DftWil.lua index f4f900df..ebfd1ea2 100644 --- a/Data/scripts/quests/dft/DftWil.lua +++ b/Data/scripts/quests/dft/DftWil.lua @@ -14,7 +14,6 @@ Contains all default lines for talkable npcs in the Wilderness Region (aka Thana -- [ActorClassId] = "client_function_name" local defaultTalkWil = { - [1000046] = "defaultTalkWithGogofu_001", -- Gogofu [1000047] = "defaultTalkWithHahayo_001", -- Hahayo [1000070] = "defaultTalkWithKukumuko_001", -- Kukumuko @@ -200,9 +199,9 @@ local defaultTalkWil = { [1001600] = "defaultTalkWithBertouaint_001", -- <<>> - Bertouaint (Eastern Thanalan: Mythril Pit T-8) [1001601] = "defaultTalkWithAldebrand_001", -- <<>> - Aldebrand (Eastern Thanalan: Mythril Pit T-8) [1001602] = "defaultTalkWithPyhajawantal_001", -- <<>> - Pyha Jawantal (Eastern Thanalan: Mythril Pit T-8) - [1001624] = "talkIdayCap", -- <<>> - Flame Lieutenant Somber Meadow (Foundation Day 2011 Dialog) - OLD EVENT NPC: Replaced by 2012 version - [1001625] = "talkIday1", -- <<>> - Flame Sergeant Mimio Mio (Foundation Day 2011 Dialog) - OLD EVENT NPC: Replaced by 2012 version - [1001626] = "talkIday2", -- <<>> - Flame Private Sisimuza Tetemuza (Foundation Day 2011 Dialog) - OLD EVENT NPC: Replaced by 2012 version + --[1001624] = "talkIdayCap", -- <<>> - Flame Lieutenant Somber Meadow (Foundation Day 2011 Dialog) - OLD EVENT NPC: Replaced by 2012 version + --[1001625] = "talkIday1", -- <<>> - Flame Sergeant Mimio Mio (Foundation Day 2011 Dialog) - OLD EVENT NPC: Replaced by 2012 version + --[1001626] = "talkIday2", -- <<>> - Flame Private Sisimuza Tetemuza (Foundation Day 2011 Dialog) - OLD EVENT NPC: Replaced by 2012 version [1001630] = "defaultTalkWithChocobo_001", -- <<>> - Chocobo (Western Thanalan: The Coffer & Coffin) - Stands beside Haipo Eipo [1001685] = "defaultTalkWithAdalbert_001", -- <<>> - Flame Sergeant Cotter (Ul'dah: Merchant Strip: -0.92 196.100 126.32) - Double check caps. [1001699] = "defaultTalkWithJandonaut_001", -- <<>> - Flame Sergeant Fouillel (Southern Thanalan: Camp Broken Water: 1704 296.001 999) @@ -230,6 +229,9 @@ local defaultTalkWil = { [1001953] = "defaultTalkWithBerndan_001", -- Berndan [1002047] = "defaultTalkWithInn_Desk_2", -- Kopuru Fupuru - Inn NPC. - defaultTalkWithKopuruFupuru_001 (pre-Inn unlock?) [1002101] = "defaultTalkWithDuraltharal_001", -- Dural Tharal + [1002110] = "processEventSOMBER", -- Flame Lieutenant Somber Meadow (Foundation Day 2012 Dialog) Spl000 staticactor + [1002111] = "processEventMIMIO", -- Flame Sergeant Mimio Mio (Foundation Day 2012 Dialog) Spl000 staticactor + [1002112] = "processEventSISIMUZA", -- Flame Private Sisimuza Tetemuza (Foundation Day 2012 Dialog) Spl000 staticactor [1002116] = "defaultTalkWithHAVAK_ALVAK_001", -- <<>> - Havak Alvak (Ul'dah: Milvaneth Sacrarium) [1060028] = "defaultTalkWithCURIOUS_001", -- <<>> - Curious Gorge (Western Thanalan: -1116.040039, 53.2, 285.48999)? - defaultTalkWithCURIOUS_002 [1060029] = "defaultTalkWithSarra_001", -- <<>> - Sarra (Location unknown) defaultTalkWithSarra_002 / 003 @@ -246,10 +248,9 @@ local defaultTalkWil = { [1500110] = "defaultTalkWithSamigamduhla_001", -- <<>> - Sami Gamduhla (Western Thanalan Ferry Docks) [1500126] = "tribeTalk", -- Vavaki [1500129] = "defaultTalkWithYayatoki_001", -- Yayatoki + [1500230] = "defaultTalkCaravanChocoboUld_001", -- Pack Chocobo (needs verifying) [1700039] = "defaultTalkWithBATERICH_100", -- Baterich - [1000001] = "defaultTalkWithHamletGuardUld_001" -- TEST TEST TEST - --[1090549] = "defaultTalkWithInn_ExitDoor" -- Ul'dah Inn Exit Door pushEvent - "Leave your room?" --[1200336] = "defaultTalkWithInn_ExitDoor" -- Ul'dah Inn Exit Door talkEvent - "Leave your room?" @@ -260,16 +261,11 @@ local defaultTalkWil = { [???] = "defaultTalkWithHamletGuardUld_001" -- --]] - -- [1002110] = "processEventSOMBER", arg1, -- Flame Lieutenant Somber Meadow (Foundation Day 2012 Dialog) Spl000 staticactor - -- [1002111] = "processEventMIMIO" -- Flame Sergeant Mimio Mio (Foundation Day 2012 Dialog) Spl000 staticactor - -- [1002112] = "processEventSISIMUZA" -- Flame Private Sisimuza Tetemuza (Foundation Day 2012 Dialog) Spl000 staticactor } - - function onTalk(player, quest, npc, eventName) local npcId = npc:GetActorClassId(); @@ -277,6 +273,8 @@ function onTalk(player, quest, npc, eventName) if (npcId == 1002047) then -- Kopuru Fupuru - Inn NPC defaultTalkWithInn(player, quest, clientFunc); + elseif ((npcId >= 1002110) and (npcId <= 1002112)) then + talkWithSpecial(player, npcId, clientFunc) else callClientFunction(player, "delegateEvent", player, quest, clientFunc); end @@ -284,13 +282,13 @@ function onTalk(player, quest, npc, eventName) player:EndEvent(); end + function IsQuestENPC(player, quest, npc) return defaultTalkWil[npc:GetActorClassId()] ~= nil; end - function defaultTalkWithInn(player, quest, clientFunc) local choice = callClientFunction(player, "delegateEvent", player, quest, clientFunc); @@ -304,4 +302,12 @@ function defaultTalkWithInn(player, quest, clientFunc) player:SendGameMessage(GetWorldMaster(), 51140, 0x20); --This inn is already your Secondary Homepoint end end +end + + + +function talkWithSpecial(player, npcId, clientFunc) + local splQuest = GetStaticActor("Spl000"); + local magickedPrism = 0; + callClientFunction(player, "delegateEvent", player, splQuest, clientFunc, magickedPrism); end \ 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/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/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 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 89287844f738ed8cad7b29c89860d5e9cff8851f Mon Sep 17 00:00:00 2001 From: CuriousJorge Date: Sun, 20 Feb 2022 15:06:17 -0500 Subject: [PATCH 03/17] Player.lua - Added fallback for second half of the man0u0 tutorial to get an onNotice kicked, so it can eventually handle it and resume gameplay from a disconnect. --- Data/scripts/player.lua | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Data/scripts/player.lua b/Data/scripts/player.lua index c87490b2..430577d7 100644 --- a/Data/scripts/player.lua +++ b/Data/scripts/player.lua @@ -57,6 +57,14 @@ function onBeginLogin(player) player.positionZ = 133.6561; player.rotation = -2.849384; player:GetQuest(110009):ClearData(); + + elseif (player:HasQuest(110009) == true and player.CurrentArea.ZoneId == 175) then + director = player.CurrentArea:CreateDirector("OpeningDirector", false); + player:AddDirector(director); + director:StartDirector(true); + player:SetLoginDirector(director); + player:KickEvent(director, "noticeEvent", true); + end end From 696d355ae9ac8414e8119507ac928071dc52e4d1 Mon Sep 17 00:00:00 2001 From: CuriousJorge Date: Sun, 20 Feb 2022 21:32:43 -0500 Subject: [PATCH 04/17] Commit work on DftFst before merging in some fixes unrelated issues. --- Data/scripts/global.lua | 1 + Data/scripts/quests/dft/DftFst.lua | 221 +++++++++++++++++- Data/scripts/quests/dft/DftSea.lua | 2 - Data/scripts/quests/dft/DftWil.lua | 2 +- Data/scripts/quests/etc/etc3g0.lua | 3 +- .../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 - 13 files changed, 222 insertions(+), 63 deletions(-) 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 diff --git a/Data/scripts/global.lua b/Data/scripts/global.lua index cb977c3d..92e9a4e4 100644 --- a/Data/scripts/global.lua +++ b/Data/scripts/global.lua @@ -163,6 +163,7 @@ ENPC_PROP_CAN_NOTICE = 4; QFLAG_NONE = 0; QFLAG_PLATE = 2; QFLAG_MAP = 3; +QFLAG_REWARD = 4; -- MUSIC MUSIC_IMMEDIATE = 1; diff --git a/Data/scripts/quests/dft/DftFst.lua b/Data/scripts/quests/dft/DftFst.lua index 99d0d965..84e1f7d1 100644 --- a/Data/scripts/quests/dft/DftFst.lua +++ b/Data/scripts/quests/dft/DftFst.lua @@ -13,14 +13,228 @@ Contains all default lines for talkable npcs in the Forest Region (aka Black Shr ]] -- [ActorClassId] = "client_function_name" -local defaultTalkFst = { - [1000821] = "defaultTalkWithNellaure_001", -- Nellaure +local defaultTalkFst = { + [1000071] = "defaultTalkWithBertennant_001", -- Bertennant (Gridania: Blue Badger Gate) + [1000427] = "defaultTalkWithAnene_001", -- Anene (Gridania: Adv. Guild) defaultTalkWithAnene_002 / 003 (PGL 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) + [1000437] = "defaultTalkWithEdasshym_001", -- E'dasshym (Gridania: Adv. Guild) defaultTalkWithEdasshym_002 / 003 (THM informant) + [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 + [1001437] = "defaultTalkWithSybell_001", -- Sybell + [1001708] = "defaultTalkWithBeaudonet_001", -- Beaudonet (Gridania: Adv. Guild) + [1001951] = "defaultTalkWithAnselm_001", -- Anselm (Gridania: Adv. Guild) + + --[1600092] = "", -- Aeduin - Will not fire since it isn't PplStd. + -- [1000458] = "defaultTalkWithInn_Desk" + +--[[ + +defaultTalkWithVkorolon_001(A0_1, A1_2, A2_3) +defaultTalkWithPenelope_001(A0_4, A1_5, A2_6) +defaultTalkWithMiounne_001(A0_7, A1_8, A2_9) +defaultTalkWithSylbyrt_001(A0_19, A1_20, A2_21) +defaultTalkWithSylbyrt_002(A0_22, A1_23, A2_24) +defaultTalkWithSylbyrt_003(A0_25, A1_26, A2_27) +defaultTalkWithHongavunga_001(A0_28, A1_29, A2_30) +defaultTalkWithHongavunga_002(A0_31, A1_32, A2_33) +defaultTalkWithHongavunga_003(A0_34, A1_35, A2_36) +defaultTalkWithNoncomananco_001(A0_37, A1_38, A2_39, A3_40) +defaultTalkWithNoncomananco_002(A0_41, A1_42, A2_43) +defaultTalkWithNoncomananco_003(A0_44, A1_45, A2_46) +defaultTalkWithSeikfrae_001(A0_47, A1_48, A2_49) +defaultTalkWithSeikfrae_002(A0_50, A1_51, A2_52) +defaultTalkWithSeikfrae_003(A0_53, A1_54, A2_55) +defaultTalkWithLtandhaa_001(A0_74, A1_75, A2_76) +defaultTalkWithLtandhaa_002(A0_77, A1_78, A2_79) +defaultTalkWithLtandhaa_003(A0_80, A1_81, A2_82) +defaultTalkWithPofufu_001(A0_83, A1_84, A2_85) +defaultTalkWithPofufu_002(A0_86, A1_87, A2_88) +defaultTalkWithPofufu_003(A0_89, A1_90, A2_91) +defaultTalkWithOdilie_001(A0_101, A1_102, A2_103) +defaultTalkWithOdilie_002(A0_104, A1_105, A2_106) +defaultTalkWithOdilie_003(A0_107, A1_108, A2_109) +defaultTalkWithFlavielle_001(A0_110, A1_111, A2_112) +defaultTalkWithFlavielle_002(A0_113, A1_114, A2_115) +defaultTalkWithFlavielle_003(A0_116, A1_117, A2_118) +defaultTalkWithHereward_001(A0_119, A1_120, A2_121) +defaultTalkWithBeli_001(A0_122, A1_123, A2_124) +defaultTalkWithMaddeline_001(A0_125, A1_126, A2_127) +defaultTalkWithDyrstbrod_001(A0_128, A1_129, A2_130) +defaultTalkWithTatagoi_001(A0_131, A1_132, A2_133) +defaultTalkWithLuilda_001(A0_137, A1_138, A2_139) +defaultTalkWithAlixe_001(A0_140, A1_141, A2_142) +defaultTalkWithDadalo_001(A0_143, A1_144, A2_145) +defaultTalkWithKain_001(A0_146, A1_147, A2_148) +defaultTalkWithAnaidjaa_001(A0_149, A1_150, A2_151) +defaultTalkWithZuzupoja_001(A0_152, A1_153, A2_154) +defaultTalkWithCaplan_001(A0_158, A1_159, A2_160) +defaultTalkWithUlmhylt_001(A0_161, A1_162, A2_163) +defaultTalkWithHabreham_001(A0_164, A1_165, A2_166) +defaultTalkWithDecima_001(A0_167, A1_168, A2_169) +defaultTalkWithChalyotamlyo_001(A0_170, A1_171, A2_172) +defaultTalkWithPowle_001(A0_173, A1_174, A2_175) +defaultTalkWithSansa_001(A0_176, A1_177, A2_178) +defaultTalkWithNicoliaux_001(A0_179, A1_180, A2_181) +defaultTalkWithAunillie_001(A0_182, A1_183, A2_184) +defaultTalkWithElyn_001(A0_185, A1_186, A2_187) +defaultTalkWithRyd_001(A0_188, A1_189, A2_190) +defaultTalkWithWillelda_001(A0_191, A1_192, A2_193) +defaultTalkWithWillelda_002(A0_194, A1_195, A2_196) +defaultTalkWithBurchard_001(A0_197, A1_198, A2_199) +defaultTalkWithCeinguled_001(A0_200, A1_201, A2_202) +defaultTalkWithFrancis_001(A0_203, A1_204, A2_205, A3_206) +defaultTalkWithDhemdaeg_001(A0_207, A1_208, A2_209) +defaultTalkWithLuitfrid_001(A0_210, A1_211, A2_212) +defaultTalkWithHaurtefert_001(A0_213, A1_214, A2_215) +defaultTalkWithZpahtalo_001(A0_216, A1_217, A2_218) +defaultTalkWithJmoldva_001(A0_219, A1_220, A2_221) +defaultTalkWithNuala_001(A0_222, A1_223, A2_224) +defaultTalkWithJolline_001(A0_225, A1_226, A2_227) +defaultTalkWithAerstsyn_001(A0_228, A1_229, A2_230) +defaultTalkWithNonolato_001(A0_231, A1_232, A2_233) +defaultTalkWithOdhinek_001(A0_234, A1_235, A2_236) +defaultTalkWithGeorjeaux_001(A0_237, A1_238, A2_239) +defaultTalkWithGeorjeaux_002(A0_240, A1_241, A2_242) +defaultTalkWithAlaire_001(A0_243, A1_244, A2_245) +defaultTalkWithChloe_001(A0_246, A1_247, A2_248) +defaultTalkWithMianne_001(A0_249, A1_250, A2_251) +defaultTalkWithBubuku_001(A0_252, A1_253, A2_254) +defaultTalkWithPiers_001(A0_255, A1_256, A2_257) +defaultTalkWithSolieine_001(A0_258, A1_259, A2_260) +defaultTalkWithHetzkin_001(A0_261, A1_262, A2_263) +defaultTalkWithTelent_001(A0_264, A1_265, A2_266) +defaultTalkWithKhujazhwan_001(A0_267, A1_268, A2_269) +defaultTalkWithZerig_001(A0_270, A1_271, A2_272) +defaultTalkWithYonariumnari_001(A0_273, A1_274, A2_275) +defaultTalkWithGugula_001(A0_276, A1_277, A2_278) +defaultTalkWithRdjongo_001(A0_279, A1_280, A2_281) +defaultTalkWithAstrelle_001(A0_282, A1_283, A2_284) +defaultTalkWithBiddy_001(A0_285, A1_286, A2_287) +defaultTalkWithConcessa_001(A0_288, A1_289, A2_290) +defaultTalkWithMaroile_001(A0_291, A1_292, A2_293) +defaultTalkWithKinborow_001(A0_294, A1_295, A2_296) +defaultTalkWithTnbulea_001(A0_297, A1_298, A2_299) +defaultTalkWithFoforyo_001(A0_300, A1_301, A2_302) +defaultTalkWithOpyltyl_001(A0_303, A1_304, A2_305) +defaultTalkWithCicely_001(A0_306, A1_307, A2_308) +defaultTalkWithVnabyano_001(A0_309, A1_310, A2_311) +defaultTalkWithSandre_001(A0_312, A1_313, A2_314) +defaultTalkWithEburhart_001(A0_318, A1_319, A2_320) +defaultTalkWithOnguen_001(A0_321, A1_322, A2_323) +defaultTalkEnie_001(A0_324, A1_325, A2_326) +defaultTalkWithLionnellais_001(A0_327, A1_328, A2_329) +defaultTalkWithHida_001(A0_330, A1_331, A2_332) +defaultTalkWithNoes_001(A0_333, A1_334, A2_335) +defaultTalkWithFhrudhem_001(A0_336, A1_337, A2_338) +defaultTalkWithUlta_001(A0_342, A1_343, A2_344) +defaultTalkWithMathye_001(A0_345, A1_346, A2_347) +defaultTalkWithMitainie_001(A0_348, A1_349, A2_350) +defaultTalkWithNicia_001(A0_351, A1_352, A2_353) +defaultTalkWithBlandie_001(A0_354, A1_355, A2_356) +defaultTalkWithGenna_001(A0_362, A1_363, A2_364) +defaultTalkWithOwyne_001(A0_365, A1_366, A2_367) +defaultTalkWithLivith_001(A0_371, A1_372, A2_373) +defaultTalkWithProscen_001(A0_374, A1_375, A2_376) +defaultTalkWithTanguistl_001(A0_377, A1_378, A2_379) +defaultTalkWithComoere_001(A0_380, A1_381, A2_382) +defaultTalkWithLougblaet_001(A0_383, A1_384, A2_385) +defaultTalkWithFamushidumushi_001(A0_386, A1_387, A2_388) +defaultTalkWithDrystan_001(A0_389, A1_390, A2_391) +defaultTalkWithEadbert_001(A0_392, A1_393, A2_394) +defaultTalkWithWybir_001(A0_395, A1_396, A2_397) +defaultTalkWithKeketo_001(A0_398, A1_399, A2_400) +defaultTalkWithRadianttear_001(A0_401, A1_402, A2_403) +defaultTalkWithMyles_001(A0_404, A1_405, A2_406) +defaultTalkWithNathaniel_001(A0_407, A1_408, A2_409) +defaultTalkWithEvrardoux_001(A0_410, A1_411, A2_412) +defaultTalkWithTsehpanipahr_001(A0_413, A1_414, A2_415) +defaultTalkWithEthelinda_001(A0_416, A1_417, A2_418) +defaultTalkWithHedheue_001(A0_419, A1_420, A2_421) +defaultTalkWithJajajbygo_001(A0_422, A1_423, A2_424, A3_425, A4_426) +defaultTalkWithPepeli_001(A0_427, A1_428, A2_429, A3_430) +defaultTalkWithBidelia_001(A0_431, A1_432, A2_433) +defaultTalkWithMiraudont_001(A0_434, A1_435, A2_436, A3_437) +defaultTalkWithRimomo_001(A0_438, A1_439, A2_440) +defaultTalkWithDadaneja_001(A0_441, A1_442, A2_443) +defaultTalkWithIolaine_001(A0_444, A1_445, A2_446) +defaultTalkWithBloisirant_001(A0_447, A1_448, A2_449) +defaultTalkWithGylbart_001(A0_450, A1_451, A2_452) +defaultTalkWithHonoroit_001(A0_453, A1_454, A2_455) +defaultTalkWithYlessa_001(A0_456, A1_457, A2_458) +defaultTalkWithLonsygg_001(A0_459, A1_460, A2_461) +defaultTalkWithSwaenhylt_001(A0_465, A1_466, A2_467) +defaultTalkWithMarcette_001(A0_468, A1_469, A2_470) +defaultTalkWithGuildleveClientG_001(A0_471, A1_472, A2_473) +defaultTalkWithGuildleveClientG_002(A0_474, A1_475, A2_476) +defaultTalkWithGuildleveClientG_003(A0_477, A1_478, A2_479) +defaultTalkWithAUBRENARD_100(A0_480, A1_481, A2_482) +defQuest1g0_Bush(A0_483, A1_484, A2_485) +defQuest1g1_Bush(A0_486, A1_487, A2_488) +defaultTalkWithChamberliaux_001(A0_489, A1_490, A2_491) +defaultTalkWithFraemhar_001(A0_492, A1_493, A2_494) +defaultTalkWithXbhowaqi_001(A0_495, A1_496, A2_497) +defaultTalkWithLora_001(A0_498, A1_499, A2_500) +defaultTalkWithWawaramu_001(A0_501, A1_502, A2_503) +defaultTalkWithArnott_001(A0_504, A1_505, A2_506) +defaultTalkWithLhomujuuk_001(A0_507, A1_508, A2_509) +defaultTalkWithSholnoralno_001(A0_510, A1_511, A2_512) +defaultTalkWithTuatkk_001(A0_513, A1_514, A2_515) +defaultTalkWithAruhnsenna_001(A0_516, A1_517, A2_518) +defaultTalkWithMoogle010_001(A0_519, A1_520, A2_521) +defaultTalkWithMoogle002_001(A0_522, A1_523, A2_524) +defaultTalkWithAilith_001(A0_525, A1_526, A2_527) +defaultTalkWithMemama_001(A0_528, A1_529, A2_530) +defaultTalkWithPfarahr_001(A0_531, A1_532, A2_533) + +defaultTalkWithFryswyde_001(A0_537, A1_538, A2_539) +defaultTalkWithWillielmus_001(A0_540, A1_541, A2_542) +defaultTalkWithQZamqo_001(A0_543, A1_544, A2_545) +defaultTalkLouisoix_001(A0_546, A1_547, A2_548) +defaultTalkWithRonanKognan_001(A0_549, A1_550, A2_551) +defaultTalkWithRonanKognan_002(A0_552, A1_553, A2_554, A3_555, A4_556) +defaultTalkWithRonanKognan_Hint_00(A0_558, A1_559, A2_560, A3_561) +defaultTalkWithRonanKognan_Hint_01(A0_562, A1_563, A2_564, A3_565) +defaultTalkWithRonanKognan_Hint_02(A0_566, A1_567, A2_568, A3_569) +defaultTalkWithRonanKognan_Hint_03(A0_570, A1_571, A2_572, A3_573) +defaultTalkWithRonanKognan_Hint_04(A0_574, A1_575, A2_576, A3_577) +defaultTalkWithVorsaile_001(A0_578, A1_579, A2_580, A3_581) +defaultTalkCaravanChocoboGri_001(A0_582, A1_583, A2_584) +downTownTalk(A0_585, A1_586, A2_587, A3_588, A4_589, A5_590) +tribeTalk(A0_592, A1_593, A2_594) +bookTalk(A0_595, A1_596, A2_597) +talkIdayCap(A0_598, A1_599, A2_600) +talkIday1(A0_601, A1_602, A2_603) +talkIday2(A0_604, A1_605, A2_606) +defaultTalkWithPukwapika_001(A0_607, A1_608, A2_609) +defaultTalkWithPurumoogle_001(A0_610, A1_611, A2_612) +defaultTalkWithPirimoogle_001(A0_613, A1_614, A2_615) +defaultTalkWithPukumoogle_001(A0_616, A1_617, A2_618) +defaultTalkWithJehantel_001(A0_619, A1_620, A2_621) +defaultTalkWithJehantel_002(A0_622, A1_623, A2_624) +defaultTalkWithPukno_001(A0_625, A1_626, A2_627) +defaultTalkWithPukno_002(A0_628, A1_629, A2_630) +defaultTalkWithRayao_001(A0_631, A1_632, A2_633) +defaultTalkWithRayao_002(A0_634, A1_635, A2_636) +defaultTalkWithMoogleA_001(A0_637, A1_638, A2_639) +defaultTalkWithMoogleA_002(A0_640, A1_641, A2_642) +defaultTalkWithMppgleB_001(A0_643, A1_644, A2_645) +defaultTalkWithMppgleB_002(A0_646, A1_647, A2_648) +defaultTalkWithStewart_001(A0_652, A1_653, A2_654) +defaultTalkWithStewart_002(A0_655, A1_656, A2_657) +defaultTalkWithTrisselle_001(A0_658, A1_659, A2_660) +defaultTalkWithTrisselle_002(A0_661, A1_662, A2_663) +defaultTalkWithInn_Desk(A0_664, A1_665, A2_666) +defaultTalkWithInn_ExitDoor(A0_667, A1_668, A2_669) +defaultTalkWithExit01(A0_670, A1_671, A2_672) +defaultTalkWithLegendBsm_001(A0_673, A1_674, A2_675, A3_676) +defaultTalkWithMarketNpc(A0_678, A1_679, A2_680) +defaultTalkWithHamletGuardGri_001(A0_681, A1_682, A2_683) +--]] } function onTalk(player, quest, npc, eventName) @@ -31,6 +245,7 @@ function onTalk(player, quest, npc, eventName) if (npcId == 1001430) then -- Kinnison callClientFunction(player, "delegateEvent", player, quest, clientFunc, -1,-1); else + callClientFunction(player, "delegateEvent", player, quest, clientFunc); end diff --git a/Data/scripts/quests/dft/DftSea.lua b/Data/scripts/quests/dft/DftSea.lua index 1e3a64ec..d9956caf 100644 --- a/Data/scripts/quests/dft/DftSea.lua +++ b/Data/scripts/quests/dft/DftSea.lua @@ -13,8 +13,6 @@ Contains all default lines for talkable npcs in the Sea Region (aka La Noscea). -- [ActorClassId] = "client_function_name" local defaultTalkSea = { - - -- <<>> [1000003] = "defaultTalkWithWaekbyrt_001", -- Waekbyrt (Limsa Lower Decks: MRD Guild) defaultTalkWithWaekbyrt_002 (post-MRD dialog?) [1000004] = "defaultTalkWithNunuba_001", -- Nunuba (Limsa Lower Decks: MRD Guild) diff --git a/Data/scripts/quests/dft/DftWil.lua b/Data/scripts/quests/dft/DftWil.lua index ebfd1ea2..bc0ee3b6 100644 --- a/Data/scripts/quests/dft/DftWil.lua +++ b/Data/scripts/quests/dft/DftWil.lua @@ -242,7 +242,7 @@ local defaultTalkWil = { [1060037] = "defaultTalkWithHateli_001", -- <<>> - Dozol Meloc (Western Thanalan: -1513.660034, 10.617, -235.220001) defaultTalkWithHateli_002 / 003 / 004 / 005 / 006 / 007 [1060038] = "defaultTalkWithDaza_001", -- <<>> - 269th Order Mendicant Da Za (Western Thanalan: Somewhere in the cave around -1567, 25, -170) - defaultTalkWithDaza_002 / 003 / 004 / 005 / 006 / 007 [1060042] = "defaultTalkWithJenlyns_001", -- Jenlyns - defaultTalkWithJenlyns_002 (PLD-unlocked specific dialog?) - [1200120] = "bookTalk", -- Dusty Tomes - - Will not fire since it isn't PplStd. Identical dialog regardless. + [1200120] = "bookTalk", -- Dusty Tomes - Will not fire since it isn't PplStd. Identical dialog regardless. [1500059] = "defaultTalkWithLdhakya_001", -- <<>> - L'dhakya (Western Thanalan Ferry Docks) [1500109] = "defaultTalkWithSylviel_001", -- <<>> - Sylviel (Western Thanalan Ferry Docks) [1500110] = "defaultTalkWithSamigamduhla_001", -- <<>> - Sami Gamduhla (Western Thanalan Ferry Docks) diff --git a/Data/scripts/quests/etc/etc3g0.lua b/Data/scripts/quests/etc/etc3g0.lua index e8d333ae..ce3ea520 100644 --- a/Data/scripts/quests/etc/etc3g0.lua +++ b/Data/scripts/quests/etc/etc3g0.lua @@ -62,7 +62,7 @@ function onStateChange(player, quest, sequence) quest:SetENpc(MESTONNAUX, (not data:GetFlag(FLAG_TALKED_MESTONNAUX) and QFLAG_PLATE or QFLAG_NONE)); quest:SetENpc(LEFWYNE, (not data:GetFlag(FLAG_TALKED_LEFWYNE) and QFLAG_PLATE or QFLAG_NONE)); elseif (sequence == SEQ_001) then - quest:SetENpc(KINNISON, QFLAG_PLATE); + quest:SetENpc(KINNISON, QFLAG_REWARD); end end @@ -167,6 +167,7 @@ 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_TALKED_SYBELL)) then table.insert(possibleMarkers, MRKR_SYBELL); end 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 From d06152be0712855501511fdcc28be09bb97add39 Mon Sep 17 00:00:00 2001 From: CuriousJorge Date: Sun, 20 Feb 2022 22:54:31 -0500 Subject: [PATCH 05/17] Commiting more work before merging in another branch. - DftFst - More actors added - Trl0g1/Trl0l1 - Removed a stray ] causing the script to not function. --- Data/scripts/quests/dft/DftFst.lua | 9 ++++----- Data/scripts/quests/trl1/Trl0g1.lua | 2 +- Data/scripts/quests/trl1/Trl0l1.lua | 2 +- .../scripts/unique/fst0Town01/PopulaceStandard/emoni.lua | 7 ------- .../unique/fst0Town01/PopulaceStandard/flavielle.lua | 7 ------- 5 files changed, 6 insertions(+), 21 deletions(-) delete mode 100644 Data/scripts/unique/fst0Town01/PopulaceStandard/emoni.lua delete mode 100644 Data/scripts/unique/fst0Town01/PopulaceStandard/flavielle.lua diff --git a/Data/scripts/quests/dft/DftFst.lua b/Data/scripts/quests/dft/DftFst.lua index 84e1f7d1..a817ef97 100644 --- a/Data/scripts/quests/dft/DftFst.lua +++ b/Data/scripts/quests/dft/DftFst.lua @@ -15,6 +15,7 @@ Contains all default lines for talkable npcs in the Forest Region (aka Black Shr -- [ActorClassId] = "client_function_name" local defaultTalkFst = { [1000071] = "defaultTalkWithBertennant_001", -- Bertennant (Gridania: Blue Badger Gate) + [1000230] = "defaultTalkWithMiounne_001", -- Miounne (Gridania: Adv. Guild) [1000427] = "defaultTalkWithAnene_001", -- Anene (Gridania: Adv. Guild) defaultTalkWithAnene_002 / 003 (PGL 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) @@ -22,10 +23,13 @@ local defaultTalkFst = { [1000821] = "defaultTalkWithNellaure_001", -- Nellaure [1001081] = "defaultTalkWithKhumamoshroca_001", -- Khuma Moshroca [1001103] = "defaultTalkWithMestonnaux_001", -- Mestonnaux + --[1001183] = "", -- Emoni (Gridania: Adv. Guild) - Will not fire, not PplStd. [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 + [1001459] = "defaultTalkWithFlavielle_001", -- Flavielle (Gridania: Adv. Guild) defaultTalkWithFlavielle_002 / 003 (ARM informant) [1001708] = "defaultTalkWithBeaudonet_001", -- Beaudonet (Gridania: Adv. Guild) + [1001709] = "defaultTalkWithFryswyde_001", -- Fryswyde (Gridania: Adv. Guild) [1001951] = "defaultTalkWithAnselm_001", -- Anselm (Gridania: Adv. Guild) --[1600092] = "", -- Aeduin - Will not fire since it isn't PplStd. @@ -36,7 +40,6 @@ local defaultTalkFst = { defaultTalkWithVkorolon_001(A0_1, A1_2, A2_3) defaultTalkWithPenelope_001(A0_4, A1_5, A2_6) -defaultTalkWithMiounne_001(A0_7, A1_8, A2_9) defaultTalkWithSylbyrt_001(A0_19, A1_20, A2_21) defaultTalkWithSylbyrt_002(A0_22, A1_23, A2_24) defaultTalkWithSylbyrt_003(A0_25, A1_26, A2_27) @@ -58,9 +61,6 @@ defaultTalkWithPofufu_003(A0_89, A1_90, A2_91) defaultTalkWithOdilie_001(A0_101, A1_102, A2_103) defaultTalkWithOdilie_002(A0_104, A1_105, A2_106) defaultTalkWithOdilie_003(A0_107, A1_108, A2_109) -defaultTalkWithFlavielle_001(A0_110, A1_111, A2_112) -defaultTalkWithFlavielle_002(A0_113, A1_114, A2_115) -defaultTalkWithFlavielle_003(A0_116, A1_117, A2_118) defaultTalkWithHereward_001(A0_119, A1_120, A2_121) defaultTalkWithBeli_001(A0_122, A1_123, A2_124) defaultTalkWithMaddeline_001(A0_125, A1_126, A2_127) @@ -191,7 +191,6 @@ defaultTalkWithAilith_001(A0_525, A1_526, A2_527) defaultTalkWithMemama_001(A0_528, A1_529, A2_530) defaultTalkWithPfarahr_001(A0_531, A1_532, A2_533) -defaultTalkWithFryswyde_001(A0_537, A1_538, A2_539) defaultTalkWithWillielmus_001(A0_540, A1_541, A2_542) defaultTalkWithQZamqo_001(A0_543, A1_544, A2_545) defaultTalkLouisoix_001(A0_546, A1_547, A2_548) diff --git a/Data/scripts/quests/trl1/Trl0g1.lua b/Data/scripts/quests/trl1/Trl0g1.lua index e07ec868..ce05f3b9 100644 --- a/Data/scripts/quests/trl1/Trl0g1.lua +++ b/Data/scripts/quests/trl1/Trl0g1.lua @@ -25,5 +25,5 @@ function onTalk(player, quest, npc, eventName) end function IsQuestENPC(player, quest, npc) - return npc:GetActorClassId()] == 1000230; + return npc:GetActorClassId() == 1000230; end \ No newline at end of file diff --git a/Data/scripts/quests/trl1/Trl0l1.lua b/Data/scripts/quests/trl1/Trl0l1.lua index 6e8ac0f5..d6c14a59 100644 --- a/Data/scripts/quests/trl1/Trl0l1.lua +++ b/Data/scripts/quests/trl1/Trl0l1.lua @@ -25,5 +25,5 @@ function onTalk(player, quest, npc, eventName) end function IsQuestENPC(player, quest, npc) - return npc:GetActorClassId()] == 1000137; + return npc:GetActorClassId() == 1000137; 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 From 8c70d0ddb6a6417b90dc26a6a8ad70abdc0e9b2a Mon Sep 17 00:00:00 2001 From: CuriousJorge Date: Sun, 20 Feb 2022 23:32:47 -0500 Subject: [PATCH 06/17] - man0u0 : Updated script to work with the recent changes in how quest data is requested. --- Data/scripts/quests/man/man0u0.lua | 55 ++++++++++++++++-------------- 1 file changed, 30 insertions(+), 25 deletions(-) diff --git a/Data/scripts/quests/man/man0u0.lua b/Data/scripts/quests/man/man0u0.lua index 4eab0227..098d766f 100644 --- a/Data/scripts/quests/man/man0u0.lua +++ b/Data/scripts/quests/man/man0u0.lua @@ -107,12 +107,14 @@ function onStateChange(player, quest, sequence) 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 data = quest:GetData(); + + 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 +137,8 @@ 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 data = quest:GetData(); + 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); @@ -166,13 +169,13 @@ 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 +211,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 + data: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. + data: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 +260,7 @@ function seq000_onTalk(player, quest, npc, classId) end function seq010_onTalk(player, quest, npc, classId) - + local data = quest:GetData(); if (classId == KEEN_EYED_MERCHANT) then callClientFunction(player, "delegateEvent", player, quest, "processEvent020_2"); elseif (classId == HIGH_SPIRITED_FELLOW) then @@ -273,9 +276,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 data:GetFlag(FLAG_SEQ010_TALK0)) then callClientFunction(player, "delegateEvent", player, quest, "processEvent020_8"); - quest:SetFlag(FLAG_SEQ010_TALK0); + data:SetFlag(FLAG_SEQ010_TALK0); else callClientFunction(player, "delegateEvent", player, quest, "processEvent020_8"); end @@ -287,16 +290,18 @@ end function getJournalMapMarkerList(player, quest) local sequence = quest:getSequence(); local possibleMarkers = {}; + local data = quest:GetData(); 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); @@ -309,7 +314,7 @@ end function doExitTrigger(player, quest, npc) - quest:ClearData(); + quest:GetData():ClearData(); quest:StartSequence(SEQ_005); contentArea = player.CurrentArea:CreateContentArea(player, "/Area/PrivateArea/Content/PrivateAreaMasterSimpleContent", "man0u01", "SimpleContent30079", "Quest/QuestDirectorMan0u001"); From 682ddd9caec78c9bc34cdd5b20d8ff5af50ce1c7 Mon Sep 17 00:00:00 2001 From: CuriousJorge Date: Wed, 23 Feb 2022 20:52:25 -0500 Subject: [PATCH 07/17] - Fixed !anim targeting the incorrect actor. - Etc5u0 scripted start to finish. Ul'dah Inn quest. - DftWil - Added quest checks to the Inn NPCs. - DfFst - Commiting what's been done thus far. fst0Town01 zone nearly done. Still have 100 something fst0Town01a & field npcs to add. - Removed some fst0Town01 uniqueId scripts --- Data/scripts/commands/gm/anim.lua | 140 ++++++++++++++++-- Data/scripts/quests/dft/DftFst.lua | 76 +++++----- Data/scripts/quests/dft/DftWil.lua | 20 ++- Data/scripts/quests/etc/etc5u0.lua | 98 ++++++++++++ .../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 - .../PopulaceStandard/serpent_private_hill.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 - 32 files changed, 284 insertions(+), 345 deletions(-) create mode 100644 Data/scripts/quests/etc/etc5u0.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_hill.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 diff --git a/Data/scripts/commands/gm/anim.lua b/Data/scripts/commands/gm/anim.lua index 85fd2673..bf33a593 100644 --- a/Data/scripts/commands/gm/anim.lua +++ b/Data/scripts/commands/gm/anim.lua @@ -2,21 +2,36 @@ require("global"); properties = { permissions = 0, - parameters = "ddd", + parameters = "dddd", description = [[ Sets anim id for current target !anim | +!anim ]], } -function onTrigger(player, argc, aType, a1, a2) - npc = player;--GetWorldManager():GetActorInWorldByUniqueId("test"); +function onTrigger(player, argc, aType, a1, a2, uID) + --if uID == nil then uID = "test"; end + local npc = GetWorldManager():GetActorInWorld(player.currentTarget) or nil; + --npc = GetWorldManager():GetActorInWorldByUniqueId(uID); - aType = tonumber(aType); - a1 = tonumber(a1); - a2 = tonumber(a2); + --[[ if argc == 1 then + -- aType = tonumber(aType, 16) or 0; + if aType > 4294967295 then + + player:SendMessage(0x20, "[anim] ", "Error: Value too large"); + return; + else + player:PlayAnimation(aType); + end + else--]] + + aType = tonumber(aType) or 0; + a1 = tonumber(a1) or 0; + a2 = tonumber(a2) or 1; + a1 = bit32.band(a1, 0xFFF); a2 = bit32.band(a2, 0xFFF); @@ -24,7 +39,114 @@ function onTrigger(player, argc, aType, a1, a2) animId = bit32.bor(bit32.lshift(a2, 12), a1); animId = bit32.bor(bit32.lshift(aType, 24), animId); - - print("AHHH"); - player:PlayAnimation(0x10005000); + print(animId); + + --[[ + if npc == nil then + player:PlayAnimation(animId); + else + npc:PlayAnimation(animId); + end + --]] + local actor = player.CurrentArea.FindActorInArea(player.currentTarget) or nil; + + if player and actor then + + + a1 = bit32.band(a1, 0xFFF); + a2 = bit32.band(a2, 0xFFF); + aType = bit32.band(aType, 0xFF); + + animId = bit32.bor(bit32.lshift(a2, 12), a1); + animId = bit32.bor(bit32.lshift(aType, 24), animId); + -- player:SendMessage(0x20, "[anim] ", tostring(animId)); + actor:PlayAnimation(animId); + local output = string.format("%x", animId) + player:SendMessage(0x20, "[anim] ", "0x"..tostring(output).. " Target:"..tostring(actor)); + + + end; + + + end; + + +--[[ Categories: +1 MGK: 01 - Magic +2 SYS: 02 - System noises +3 ETC: 03 - ?? - Item sound? +4 LIB: 04 - Posing animations +5-9 ITM: 05-09 - Items +10 KAO: 0A - KAO = Face emotes? +11-12 GLI1/2/3: 0B/0C - Leve card things +13 CBI: 0D - Two small effects +14 ABL: 0E - Cooldown buffs +15 POP: 0F - Warp effects +16 CFT: 10 - Crafting? +17 BTL: 11 - More Crafting? +18 WSC: 12 - Weapon Skills Arg1 - Weapon Skill Arg2 - Player Animation +19 WSS: 13 - Mob animations +20 PIC: 14 - Gathering weapons? +21 LIU: 15 - Player Hand Emotes +22 LIN: 16 - Doesn't exist? +23 LIF: 17 - Doesn't exist? +24 LIL: 18 - Mouth +25 ATK: 19 - Autoattacks + +33 = ? +34 = Crash + +120 = ??? + +CATEGORY +Shift 18 bits right +CMP 0xB + +ANIMATION?????? +Shift 0xC bits right +AND 0x0FFF + +PARTICLE EFFECT +AND 0x0FFF +This number is in the subfolder (wsc, abi, etc) + + +That 12 is: + +CMP 7C +CMP 6f +CMP 70 +CMP 71 + +7C000062 +ec000000 +00FFFFFF + +BTL: +ETC: +GL2: +KAO: + +MGK: 01 +SYS: 02 +LIB: 046 +ITM: 05-09 +GL?: 0B +GL1: 0C +CBI: 0D +ABL: 0E +POP: 0F +CFT: 10 +PIC: 14 +WSC: 12 + +19: Auto Attack? +6F: Casting +71: Seems to deal with signaling monster parts +7C: Sheath/Unsheath +7F: Cast failed + +--]] + + diff --git a/Data/scripts/quests/dft/DftFst.lua b/Data/scripts/quests/dft/DftFst.lua index a817ef97..e8e95857 100644 --- a/Data/scripts/quests/dft/DftFst.lua +++ b/Data/scripts/quests/dft/DftFst.lua @@ -17,50 +17,57 @@ local defaultTalkFst = { [1000071] = "defaultTalkWithBertennant_001", -- Bertennant (Gridania: Blue Badger Gate) [1000230] = "defaultTalkWithMiounne_001", -- Miounne (Gridania: Adv. 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 [1000821] = "defaultTalkWithNellaure_001", -- Nellaure + [1000951] = "defaultTalkWithLonsygg_001", -- Lonsygg (Gridania: Blue Badger Gate) [1001081] = "defaultTalkWithKhumamoshroca_001", -- Khuma Moshroca [1001103] = "defaultTalkWithMestonnaux_001", -- Mestonnaux - --[1001183] = "", -- Emoni (Gridania: Adv. Guild) - Will not fire, not PplStd. + --[1001183] = "", -- Emoni (Gridania: Adv. Guild) Linkshell NPC - Will not fire, not PplStd. + --[1001184] = "", -- Gyles (Gridania: Adv. Guild) Retainer NPC - Will not fire, not PplStd. [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 + [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) + [1001437] = "defaultTalkWithSybell_001", -- Sybell [1001459] = "defaultTalkWithFlavielle_001", -- Flavielle (Gridania: Adv. Guild) defaultTalkWithFlavielle_002 / 003 (ARM informant) + [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) [1001951] = "defaultTalkWithAnselm_001", -- Anselm (Gridania: Adv. Guild) + [1002091] = + [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? + --[1500334] = "", -- Serpent Private Hill (Gridania: Adv. Guild) Company Warp NPC - Will not fire, not PplStd. + --[1500393] = "", -- Torsefers (Gridania: Adv. Guild) Wards NPC - Will not fire, not PplStd. + --[1600092] = "", -- Aeduin (Gridania: Adv. Guild) Shop - Will not fire, not PplStd. + --[1600100] = "", -- Zagylhaemr (Gridania: Adv. Guild) Shop - Will not fire, not PplStd. + --[1600119] = "", -- Naih Khamazom (Gridania: Adv. Guild) Shop - Will not fire, not PplStd. + [1700001] = "defaultTalkWithPenelope_001", -- Penelope (Gridania: Adv. Guild) + [1000001] = "defaultTalkWithLionnellais_001", - --[1600092] = "", -- Aeduin - Will not fire since it isn't PplStd. -- [1000458] = "defaultTalkWithInn_Desk" --[[ -defaultTalkWithVkorolon_001(A0_1, A1_2, A2_3) -defaultTalkWithPenelope_001(A0_4, A1_5, A2_6) -defaultTalkWithSylbyrt_001(A0_19, A1_20, A2_21) -defaultTalkWithSylbyrt_002(A0_22, A1_23, A2_24) -defaultTalkWithSylbyrt_003(A0_25, A1_26, A2_27) -defaultTalkWithHongavunga_001(A0_28, A1_29, A2_30) -defaultTalkWithHongavunga_002(A0_31, A1_32, A2_33) -defaultTalkWithHongavunga_003(A0_34, A1_35, A2_36) -defaultTalkWithNoncomananco_001(A0_37, A1_38, A2_39, A3_40) -defaultTalkWithNoncomananco_002(A0_41, A1_42, A2_43) -defaultTalkWithNoncomananco_003(A0_44, A1_45, A2_46) -defaultTalkWithSeikfrae_001(A0_47, A1_48, A2_49) -defaultTalkWithSeikfrae_002(A0_50, A1_51, A2_52) -defaultTalkWithSeikfrae_003(A0_53, A1_54, A2_55) -defaultTalkWithLtandhaa_001(A0_74, A1_75, A2_76) -defaultTalkWithLtandhaa_002(A0_77, A1_78, A2_79) -defaultTalkWithLtandhaa_003(A0_80, A1_81, A2_82) -defaultTalkWithPofufu_001(A0_83, A1_84, A2_85) -defaultTalkWithPofufu_002(A0_86, A1_87, A2_88) -defaultTalkWithPofufu_003(A0_89, A1_90, A2_91) -defaultTalkWithOdilie_001(A0_101, A1_102, A2_103) -defaultTalkWithOdilie_002(A0_104, A1_105, A2_106) -defaultTalkWithOdilie_003(A0_107, A1_108, A2_109) +-- defaultTalkWithStewart_001 -- Hodder line? + + defaultTalkWithHereward_001(A0_119, A1_120, A2_121) defaultTalkWithBeli_001(A0_122, A1_123, A2_124) defaultTalkWithMaddeline_001(A0_125, A1_126, A2_127) @@ -127,12 +134,11 @@ defaultTalkWithSandre_001(A0_312, A1_313, A2_314) defaultTalkWithEburhart_001(A0_318, A1_319, A2_320) defaultTalkWithOnguen_001(A0_321, A1_322, A2_323) defaultTalkEnie_001(A0_324, A1_325, A2_326) -defaultTalkWithLionnellais_001(A0_327, A1_328, A2_329) -defaultTalkWithHida_001(A0_330, A1_331, A2_332) + defaultTalkWithNoes_001(A0_333, A1_334, A2_335) defaultTalkWithFhrudhem_001(A0_336, A1_337, A2_338) -defaultTalkWithUlta_001(A0_342, A1_343, A2_344) -defaultTalkWithMathye_001(A0_345, A1_346, A2_347) + + defaultTalkWithMitainie_001(A0_348, A1_349, A2_350) defaultTalkWithNicia_001(A0_351, A1_352, A2_353) defaultTalkWithBlandie_001(A0_354, A1_355, A2_356) @@ -166,7 +172,7 @@ defaultTalkWithBloisirant_001(A0_447, A1_448, A2_449) defaultTalkWithGylbart_001(A0_450, A1_451, A2_452) defaultTalkWithHonoroit_001(A0_453, A1_454, A2_455) defaultTalkWithYlessa_001(A0_456, A1_457, A2_458) -defaultTalkWithLonsygg_001(A0_459, A1_460, A2_461) + defaultTalkWithSwaenhylt_001(A0_465, A1_466, A2_467) defaultTalkWithMarcette_001(A0_468, A1_469, A2_470) defaultTalkWithGuildleveClientG_001(A0_471, A1_472, A2_473) @@ -188,10 +194,7 @@ defaultTalkWithAruhnsenna_001(A0_516, A1_517, A2_518) defaultTalkWithMoogle010_001(A0_519, A1_520, A2_521) defaultTalkWithMoogle002_001(A0_522, A1_523, A2_524) defaultTalkWithAilith_001(A0_525, A1_526, A2_527) -defaultTalkWithMemama_001(A0_528, A1_529, A2_530) -defaultTalkWithPfarahr_001(A0_531, A1_532, A2_533) -defaultTalkWithWillielmus_001(A0_540, A1_541, A2_542) defaultTalkWithQZamqo_001(A0_543, A1_544, A2_545) defaultTalkLouisoix_001(A0_546, A1_547, A2_548) defaultTalkWithRonanKognan_001(A0_549, A1_550, A2_551) @@ -241,10 +244,11 @@ 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); else - callClientFunction(player, "delegateEvent", player, quest, clientFunc); end diff --git a/Data/scripts/quests/dft/DftWil.lua b/Data/scripts/quests/dft/DftWil.lua index bc0ee3b6..413fdf32 100644 --- a/Data/scripts/quests/dft/DftWil.lua +++ b/Data/scripts/quests/dft/DftWil.lua @@ -65,7 +65,7 @@ local defaultTalkWil = { [1000861] = "defaultTalkWithLinette_001", -- Linette [1000862] = "defaultTalkWithGagaruna_001", -- Gagaruna [1000863] = "defaultTalkWithLulutsu_001", -- Lulutsu - [1000864] = "defaultTalkWithInn_Desk", -- Otopa Pottopa - defaultTalkWithOtopapottopa_001 (pre-Inn unlock?) + [1000864] = "defaultTalkWithOtopapottopa_001", -- Otopa Pottopa - defaultTalkWithInn_Desk - used when Inn unlocked [1000865] = "defaultTalkWithThaisie_001", -- Thaisie - Mentions retainers, but will not fire since she's not PplStd. [1000887] = "defaultTalkWithZssapa_001", -- <<>> - Z'ssapa (Central Thanalan: Black Brush: 92.779999 183.837 -1030.310059) alt actor ID: 1001217 (used in a quest presumably, different outfit from wiki image) [1000915] = "defaultTalkWithCahernaut_001", -- Cahernaut @@ -227,7 +227,7 @@ local defaultTalkWil = { [1001925] = "defaultTalkWithHortwann_001", -- <<>> - Flame Private Hanskalsyn - (North Thanalan: Camp Bluefog) [1001932] = "defaultTalkWithSIBOLD_001", -- Sibold [1001953] = "defaultTalkWithBerndan_001", -- Berndan - [1002047] = "defaultTalkWithInn_Desk_2", -- Kopuru Fupuru - Inn NPC. - defaultTalkWithKopuruFupuru_001 (pre-Inn unlock?) + [1002047] = "defaultTalkWithKopuruFupuru_001", -- Kopuru Fupuru - Inn NPC - defaultTalkWithInn_Desk_2 used when Inn unlocked [1002101] = "defaultTalkWithDuraltharal_001", -- Dural Tharal [1002110] = "processEventSOMBER", -- Flame Lieutenant Somber Meadow (Foundation Day 2012 Dialog) Spl000 staticactor [1002111] = "processEventMIMIO", -- Flame Sergeant Mimio Mio (Foundation Day 2012 Dialog) Spl000 staticactor @@ -271,9 +271,19 @@ function onTalk(player, quest, npc, eventName) local npcId = npc:GetActorClassId(); local clientFunc = defaultTalkWil[npcId]; - if (npcId == 1002047) then -- Kopuru Fupuru - Inn NPC - defaultTalkWithInn(player, quest, clientFunc); - elseif ((npcId >= 1002110) and (npcId <= 1002112)) then + if (npcId == 1000864) then -- Kopuru Fupuru (Adv. Guild Inn NPC) + if (player:IsQuestCompleted(110848)) then -- "Ring of Deceit" completed. + defaultTalkWithInn(player, quest, "defaultTalkWithInn_Desk"); + else + callClientFunction(player, "delegateEvent", player, quest, clientFunc); + end + elseif (npcId == 1002047) then -- Kopuru Fupuru (Rear-Entrance Inn NPC) + if (player:IsQuestCompleted(110848)) then -- "Ring of Deceit" completed. + defaultTalkWithInn(player, quest, "defaultTalkWithInn_Desk_2"); + else + callClientFunction(player, "delegateEvent", player, quest, clientFunc); + end + elseif ((npcId >= 1002110) and (npcId <= 1002112)) then -- Foundation Day 2012 NPCs talkWithSpecial(player, npcId, clientFunc) else callClientFunction(player, "delegateEvent", player, quest, clientFunc); diff --git a/Data/scripts/quests/etc/etc5u0.lua b/Data/scripts/quests/etc/etc5u0.lua new file mode 100644 index 00000000..f4e5b108 --- /dev/null +++ b/Data/scripts/quests/etc/etc5u0.lua @@ -0,0 +1,98 @@ +require("global"); + +--[[ + +Quest Script + +Name: Ring of Deceit +Code: Etc5u0 +Id: 110848 +Prereq: Level 1 on any class. Second MSQ completed. (110002 Man0l1 / 110006 Man0g1 / 110010 Man0u1) +Notes: Unlocks Ul'dah Inn exit from the rear entrance. Rewards 200 EXP + +]] + +-- Sequence Numbers +SEQ_000 = 0; -- Talk to Judithe +SEQ_001 = 1; -- Return to Otopa Pottopa + +-- Actor Class Ids +OTOPA_POTTOPA = 1000864; +JUDITHE = 1001443; + +-- Quest Markers +MRKR_JUDITHE = 11092001; +MRKR_OTOPA_POTTOPA = 11092002; + + + +function onStart(player, quest) + quest:StartSequence(SEQ_000); +end + +function onFinish(player, quest) +end + + +function onStateChange(player, quest, sequence) + if (sequence == 65535) then + quest:SetENpc(OTOPA_POTTOPA, QFLAG_PLATE); + elseif (sequence == SEQ_000) then + quest:SetENpc(OTOPA_POTTOPA); + quest:SetENpc(JUDITHE, QFLAG_PLATE); + elseif (sequence == SEQ_001) then + quest:SetENpc(OTOPA_POTTOPA, QFLAG_REWARD); + quest:SetENpc(JUDITHE); + end +end + +function onTalk(player, quest, npc) + local sequence = quest:getSequence(); + local classId = npc:GetActorClassId(); + + if (sequence == 65535) then + if (classId == OTOPA_POTTOPA) then + local questAccepted = callClientFunction(player, "delegateEvent", player, quest, "processEventOTOPAPOTTOPAStart"); + + if (questAccepted == 1) then + player:AcceptQuest(quest); + end + end + elseif (sequence == SEQ_000) then + if (classId == OTOPA_POTTOPA) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent_000_1"); + elseif (classId == JUDITHE) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent_010"); + attentionMessage(player, 25225, 110848); -- objectives complete! + quest:StartSequence(SEQ_001); + end + elseif (sequence == SEQ_001) then + if (classId == JUDITHE) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent_010_1"); + elseif (classId == OTOPA_POTTOPA) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent_020"); + callClientFunction(player, "delegateEvent", player, quest, "sqrwa", 200, 1, 1); -- 200 exp rewarded + player:CompleteQuest(quest); + end + end + player:EndEvent() + quest:UpdateENPCs(); +end + + +function getJournalInformation(player, quest) +end + + +function getJournalMapMarkerList(player, quest) + local sequence = quest:getSequence(); + local possibleMarkers = {}; + + if (sequence == SEQ_000) then + table.insert(possibleMarkers, MRKR_JUDITHE); + elseif (sequence == SEQ_001) then + table.insert(possibleMarkers, MRKR_OTOPA_POTTOPA); + end + + return unpack(possibleMarkers) +end 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_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/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 From a87244d13b1c4d22e4a2d738bfcee7caabc00b08 Mon Sep 17 00:00:00 2001 From: CuriousJorge Date: Thu, 24 Feb 2022 22:24:08 -0500 Subject: [PATCH 08/17] - man0g0 - Majority of the work ported from the old quest system. Still polish to be had and fringe cases to deal with (especially relogging) - man0g1 - Initial privateArea mostly scripted. - SimpleContent30010 - Fixed Yda/Papalymo Id being backwards, added Active states to match retail - QuestDirectorMan0g001- Updated to play itself out (this is a mess to wrap my head around). Mostly sorta kinda working on both DoW & DoM tutorials. End cutscene on DoW not firing currently, will fix later. --- Data/scripts/content/SimpleContent30010.lua | 87 ++--- .../directors/Quest/QuestDirectorMan0g001.lua | 171 +++++----- Data/scripts/quests/dft/DftFst.lua | 2 +- Data/scripts/quests/man/man0g0.lua | 315 +++++++++++++++++- Data/scripts/quests/man/man0g1.lua | 171 ++++++++++ 5 files changed, 582 insertions(+), 164 deletions(-) create mode 100644 Data/scripts/quests/man/man0g1.lua diff --git a/Data/scripts/content/SimpleContent30010.lua b/Data/scripts/content/SimpleContent30010.lua index 12cfc50b..6265f2bb 100644 --- a/Data/scripts/content/SimpleContent30010.lua +++ b/Data/scripts/content/SimpleContent30010.lua @@ -1,79 +1,34 @@ -require ("global") -require ("modifiers") function onCreate(starterPlayer, contentArea, director) - --papalymo = contentArea:SpawnActor(2290005, "papalymo", 365.89, 4.0943, -706.72, -0.718); - --yda = contentArea:SpawnActor(2290006, "yda", 365.266, 4.122, -700.73, 1.5659); - --mob1 = contentArea:SpawnActor(2201407, "mob1", 374.427, 4.4, -698.711, -1.942); - --mob2 = contentArea:SpawnActor(2201407, "mob2", 375.377, 4.4, -700.247, -1.992); - --mob3 = contentArea:SpawnActor(2201407, "mob3", 375.125, 4.4, -703.591, -1.54); - yda = GetWorldManager().SpawnBattleNpcById(6, contentArea); - papalymo = GetWorldManager().SpawnBattleNpcById(7, contentArea); - --yda:ChangeState(2); - mob1 = GetWorldManager().SpawnBattleNpcById(3, contentArea); - mob2 = GetWorldManager().SpawnBattleNpcById(4, contentArea); - mob3 = GetWorldManager().SpawnBattleNpcById(5, contentArea); - starterPlayer.currentParty:AddMember(papalymo.Id); - starterPlayer.currentParty:AddMember(yda.Id); - starterPlayer:SetMod(modifiersGlobal.MinimumHpLock, 1); - - - openingStoper = contentArea:SpawnActor(1090384, "openingstoper", 356.09, 3.74, -701.62, -1.41); - - director:AddMember(starterPlayer); + papalymo = contentArea:SpawnActor(2290005, "papalymo", 365.89, 4.0943, -706.72, -0.718); + yda = contentArea:SpawnActor(2290006, "yda", 365.266, 4.122, -700.73, 1.5659); + + mob1 = contentArea:SpawnActor(2201407, "mob1", 374.427, 4.4, -698.711, -1.942); + mob2 = contentArea:SpawnActor(2201407, "mob2", 375.377, 4.4, -700.247, -1.992); + mob3 = contentArea:SpawnActor(2201407, "mob3", 375.125, 4.4, -703.591, -1.54); + + openingStoper = contentArea:SpawnActor(1090384, "openingstoper", 356.09, 3.74, -701.62, -1.41); + + yda:ChangeState(2); + mob1:ChangeState(2); + mob2:ChangeState(2); + mob3:ChangeState(2); + + + + + director:AddMember(starterPlayer); director:AddMember(director); - director:AddMember(papalymo); - director:AddMember(yda); + director:AddMember(yda); + director:AddMember(papalymo); director:AddMember(mob1); director:AddMember(mob2); director:AddMember(mob3); - - --director:StartContentGroup(); - + director:StartContentGroup(); end function onDestroy() end -function onUpdate(tick, area) - if area then - local players = area:GetPlayers() - local mobs = area:GetMonsters() - local allies = area:GetAllies() - local resumeChecks = true - for player in players do - if player then - local exitLoop = false - - if allies then - for i = 0, #allies - 1 do - if allies[i] then - if not allies[i]:IsEngaged() then - if player:IsEngaged() and player.target then - - allies[i].neutral = false - allies[i].isAutoAttackEnabled = true - allies[i]:SetMod(modifiersGlobal.Speed, 8) - allyGlobal.EngageTarget(allies[i], player.target) - exitLoop = true - break - -- todo: support scripted paths - elseif allies[i]:GetSpeed() > 0 then - end - end - end - end - end - if exitLoop then - resumeChecks = false - break - end - end - end - if not resumeChecks then - return - end - end -end \ No newline at end of file diff --git a/Data/scripts/directors/Quest/QuestDirectorMan0g001.lua b/Data/scripts/directors/Quest/QuestDirectorMan0g001.lua index 79f765cb..17493af9 100644 --- a/Data/scripts/directors/Quest/QuestDirectorMan0g001.lua +++ b/Data/scripts/directors/Quest/QuestDirectorMan0g001.lua @@ -1,9 +1,8 @@ require ("global") require ("tutorial") -require ("modifiers") require ("quests/man/man0g0") ---processTtrBtl001: Active Mode Tutorial +--processTtrBtl001: Active Mode Tutorial - DoW only --processTtrBtl002: Targetting Tutorial (After active mode done) function init() @@ -11,90 +10,106 @@ function init() end function onCreateContentArea(players, director, contentArea, contentGroup) - director:StartContentGroup(); + + papalymo = contentArea:SpawnActor(2290005, "papalymo", 365.89, 4.0943, -706.72, -0.718); + yda = contentArea:SpawnActor(2290006, "yda", 365.266, 4.122, -700.73, 1.5659); + + mob1 = contentArea:SpawnActor(2201407, "mob1", 374.427, 4.4, -698.711, -1.942); + mob2 = contentArea:SpawnActor(2201407, "mob2", 375.377, 4.4, -700.247, -1.992); + mob3 = contentArea:SpawnActor(2201407, "mob3", 375.125, 4.4, -703.591, -1.54); + + openingStoper = contentArea:SpawnActor(1090384, "openingstoper", 356.09, 3.74, -701.62, -1.41); + + for _, player in pairs(players) do + contentGroup:AddMember(player); + end; + + + + contentGroup:AddMember(director); + contentGroup:AddMember(yda); + contentGroup:AddMember(papalymo); + contentGroup:AddMember(mob1); + contentGroup:AddMember(mob2); + contentGroup:AddMember(mob3); + end function onEventStarted(player, actor, triggerName) + man0g0Quest = player:GetQuest("Man0g0"); - player:SetMod(modifiersGlobal.MinimumHpLock, 1); - player:SendMessage(0x20, "", "Starting"); startTutorialMode(player); - callClientFunction(player, "delegateEvent", player, man0g0Quest, "processTtrBtl001", nil, nil, nil); - player:EndEvent(); - player:SendMessage(0x20, "", "Waiting for player active"); - waitForSignal("playerActive"); - player:SendMessage(0x20, "", "player active"); - wait(1); --If this isn't here, the scripts bugs out. TODO: Find a better alternative. - kickEventContinue(player, actor, "noticeEvent", "noticeEvent"); - callClientFunction(player, "delegateEvent", player, man0g0Quest, "processTtrBtl002", nil, nil, nil); - player:SendMessage(0x20, "", "processTtrBtl002 called"); - player:EndEvent(); + --Combat portion of tutorial if player:IsDiscipleOfWar() then - player:SendMessage(0x20, "", "Is DoW"); - waitForSignal("playerAttack"); + + callClientFunction(player, "delegateEvent", player, man0g0Quest, "processTtrBtl001"); + player:EndEvent(); + waitForSignal("playerActive"); + wait(1); --If this isn't here, the scripts bugs out. TODO: Find a better alternative. + kickEventContinue(player, actor, "noticeEvent", "noticeEvent"); + + callClientFunction(player, "delegateEvent", player, man0g0Quest, "processTtrBtl002", nil, nil, nil); + player:EndEvent(); + + --waitForSignal("playerAttack"); closeTutorialWidget(player); showTutorialSuccessWidget(player, 9055); --Open TutorialSuccessWidget for attacking enemy openTutorialWidget(player, CONTROLLER_KEYBOARD, TUTORIAL_TP); - waitForSignal("tpOver1000"); - player:SetMod(modifiersGlobal.MinimumTpLock, 1000); + + wait(3); closeTutorialWidget(player); openTutorialWidget(player, CONTROLLER_KEYBOARD, TUTORIAL_WEAPONSKILLS); - waitForSignal("weaponskillUsed"); - player:SetMod(modifiersGlobal.MinimumTpLock, 0); + --waitForSignal("weaponskillUsed"); + wait(3); + --player:SetMod(modifiersGlobal.MinimumTpLock, 0); closeTutorialWidget(player); showTutorialSuccessWidget(player, 9065); --Open TutorialSuccessWidget for weapon skill + elseif player:IsDiscipleOfMagic() then - player:SendMessage(0x20, "", "Is DoM"); - openTutorialWidget(player, CONTROLLER_KEYBOARD, TUTORIAL_CASTING); - waitForSignal("spellUsed"); - closeTutorialWidget(player); + + callClientFunction(player, "delegateEvent", player, man0g0Quest, "processTtrBtlMagic001"); + player:EndEvent(); + wait(1); + kickEventContinue(player, actor, "noticeEvent", "noticeEvent"); + closeTutorialWidget(player); + player:SendMessage(0x20, "", "Sending success"); + showTutorialSuccessWidget(player, 9050); --Open TutorialSuccessWidget for magic skill + wait(1) + openTutorialWidget(player, CONTROLLER_KEYBOARD, TUTORIAL_DEFEATENEMY); + wait(3); + closeTutorialWidget(player); + + + --waitForSignal("spellUsed"); 9050 + elseif player:IsDiscipleOfHand() then - waitForSignal("abilityUsed"); + --waitForSignal("abilityUsed"); elseif player:IsDiscipleOfLand() then - waitForSignal("abilityUsed"); + --waitForSignal("abilityUsed"); end - player:SendMessage(0x20, "", "Waiting for mobkill1"); - waitForSignal("mobkill"); --Should be wait for mobkill - player:SendMessage(0x20, "", "Waiting for mobkill2"); - waitForSignal("mobkill"); - player:SendMessage(0x20, "", "Waiting for mobkill3"); - waitForSignal("mobkill"); + wait(3); worldMaster = GetWorldMaster(); - player:SetMod(modifiersGlobal.MinimumHpLock, 0); - player:SendMessage(0x20, "", "Sending data packet 'attention'"); player:SendDataPacket("attention", worldMaster, "", 51073, 2); - wait(5); - player:SendMessage(0x20, "", "Disengaging"); - player:Disengage(0x0000); - wait(5); - player:SendMessage(0x20, "", "NextPhase(10)"); - man0g0Quest:NextPhase(10); - wait(5); - player:SendMessage(0x20, "", "ProcessEvent020_1"); - callClientFunction(player, "delegateEvent", player, man0g0Quest, "processEvent020_1", nil, nil, nil); - - wait(5); - - player:SendMessage(0x20, "", "Changing music"); + wait(7); player:ChangeMusic(7); - wait(5); + player:ChangeState(0); + + --kickEventContinue(player, actor, "noticeEvent", "noticeEvent"); + callClientFunction(player, "delegateEvent", player, man0g0Quest, "processEvent020_1"); + + man0g0Quest:StartSequence(10); - player:SendMessage(0x20, "", "Kick notice event"); - kickEventContinue(player, actor, "noticeEvent", "noticeEvent"); - wait(5); - - player:SendMessage(0x20, "", "ContentFinished"); - player.CurrentArea:ContentFinished(); - wait(5); - player:SendMessage(0x20, "", "Remove from party"); - player:RemoveFromCurrentPartyAndCleanup(); - --player:EndEvent(); - --GetWorldManager():DoZoneChange(player, 155, "PrivateAreaMasterPast", 1, 15, 175.38, -1.21, -1156.51, -2.1); - --[[ + player:EndEvent(); + player.CurrentArea:ContentFinished(); + GetWorldManager():DoZoneChange(player, 155, "PrivateAreaMasterPast", 1, 15, 175.38, -1.21, -1156.51, -2.1); + player:EndEvent(); +end + +--[[ IF DoW: OpenWidget (TP) IF TP REACHED: @@ -105,36 +120,4 @@ function onEventStarted(player, actor, triggerName) CloseWidget ELSE MAGIC: OpenWidget (DEFEAT ENEMY) - ]] - - player:EndEvent(); - - wait(5); - player:SendMessage(0x20, "", "Zone change"); - GetWorldManager():DoZoneChange(player, 155, "PrivateAreaMasterPast", 1, 15, 175.38, -1.21, -1156.51, -2.1); - -end - -function onUpdate(deltaTime, area) -end - -function onTalkEvent(player, npc) - -end - -function onPushEvent(player, npc) -end - -function onCommandEvent(player, command) - -end - -function onEventUpdate(player, npc) -end - -function onCommand(player, command) -end - -function main(director, contentGroup) - onCreateContentArea(director:GetPlayerMembers(), director, director.CurrentArea, contentGroup); -end; \ No newline at end of file + --]] \ No newline at end of file diff --git a/Data/scripts/quests/dft/DftFst.lua b/Data/scripts/quests/dft/DftFst.lua index e8e95857..8a7f178e 100644 --- a/Data/scripts/quests/dft/DftFst.lua +++ b/Data/scripts/quests/dft/DftFst.lua @@ -49,7 +49,7 @@ local defaultTalkFst = { [1001709] = "defaultTalkWithFryswyde_001", -- Fryswyde (Gridania: Adv. Guild) [1001710] = "defaultTalkWithWillielmus_001", -- Willielmus (Gridania: Adv. Guild) [1001951] = "defaultTalkWithAnselm_001", -- Anselm (Gridania: Adv. Guild) - [1002091] = + [1002091] = "", [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? --[1500334] = "", -- Serpent Private Hill (Gridania: Adv. Guild) Company Warp NPC - Will not fire, not PplStd. diff --git a/Data/scripts/quests/man/man0g0.lua b/Data/scripts/quests/man/man0g0.lua index 833c8ec4..fd80f4c2 100644 --- a/Data/scripts/quests/man/man0g0.lua +++ b/Data/scripts/quests/man/man0g0.lua @@ -1,3 +1,312 @@ ---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: + + +]] + +--[[ + SEQS + [@IF($E4($E8(1),0),　 + [@SHEET(xtx/journalxtxFst,177,1)] + ,)] + [@IF($E4($E8(1),5),　 + [@SHEET(xtx/journalxtxFst,178,1)] + ,)] + [@IF($E4($E8(1),10),　 + [@SHEET(xtx/journalxtxFst,179,1)] + ,)] + + + qItem + [@IF($E0($E8(1),10), + [@SHEET(xtx/itemName,11000088,5)][@CR] + ,)] +--]] + + + +-- 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; +GUILD_ENTRANCE = 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 + + + + +-- PrivateAreaMasterPast 1 + +-- 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..315b3185 --- /dev/null +++ b/Data/scripts/quests/man/man0g1.lua @@ -0,0 +1,171 @@ +require("global"); + +--[[ + +Quest Script + +Name: Souls Gone Wild +Code: Man0g1 +Id: 110006 +Prereq: Sundered Skies (Man0g0 - 110005) +Notes: + + + +]] + + +-- Sequence Numbers +SEQ_000 = 0; + + +-- 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; -- I don't think this was used? + +-- 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) + callClientFunction(player, "delegateEvent", player, quest, "processEvent000_1"); -- Describes what an Instance is + player:EndEvent(); + quest:UpdateENPCs(); +end + + + +function seq000_onTalk(player, quest, npc, classId) + + if (classId == MOMODI) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent010"); + player:EndEvent(); + quest:StartSequence(SEQ_005); + GetWorldManager():DoZoneChange(player, 175, nil, 0, 15, player.positionX, player.positionY, player.positionZ, player.rotation); + return; + 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, quest, "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"); + elseif (classId == MIOUNNE) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent110"); + player:EndEvent(); + quest:StartSequence(SEQ_005); + GetWorldManager():DoZoneChange(player, 155, nil, 0, 15, player.positionX, player.positionY, player.positionZ, player.rotation); + 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 + + From 023527efa31604a9c2eacdfbefb1b9b9146f4ae9 Mon Sep 17 00:00:00 2001 From: CuriousJorge Date: Sat, 26 Feb 2022 23:15:20 -0500 Subject: [PATCH 09/17] Further work on DefaultTalks - DftFst - Every uniqueId script covered from the previous system. Still a lot of functions to still map and actors to pose & position for them. - AfterQuestWarpDirector - Added Man0g1 as a check. - Nuked PopulaceStandard uId scripts for Forest region since unneeded now. --- .../directors/AfterQuestWarpDirector.lua | 3 + Data/scripts/quests/dft/DftFst.lua | 388 +++++++++--------- .../PopulaceStandard/miraudont.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 - 112 files changed, 198 insertions(+), 1264 deletions(-) delete mode 100644 Data/scripts/unique/fst0Field03/PopulaceStandard/miraudont.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 diff --git a/Data/scripts/directors/AfterQuestWarpDirector.lua b/Data/scripts/directors/AfterQuestWarpDirector.lua index 923f0650..e90f1e5e 100644 --- a/Data/scripts/directors/AfterQuestWarpDirector.lua +++ b/Data/scripts/directors/AfterQuestWarpDirector.lua @@ -8,6 +8,9 @@ function onEventStarted(player, director, eventType, eventName) if (player:HasQuest(110002) == true) then quest = player:GetQuest("Man0l1"); quest:OnNotice(player); + elseif (player:HasQuest(110006) == true) then + quest = player:GetQuest("Man0g1"); + quest:OnNotice(player); end end diff --git a/Data/scripts/quests/dft/DftFst.lua b/Data/scripts/quests/dft/DftFst.lua index 8a7f178e..8880442a 100644 --- a/Data/scripts/quests/dft/DftFst.lua +++ b/Data/scripts/quests/dft/DftFst.lua @@ -14,8 +14,18 @@ Contains all default lines for talkable npcs in the Forest Region (aka Black Shr -- [ActorClassId] = "client_function_name" 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) @@ -29,215 +39,198 @@ local defaultTalkFst = { --[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 - [1000821] = "defaultTalkWithNellaure_001", -- Nellaure + --[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) - [1001081] = "defaultTalkWithKhumamoshroca_001", -- Khuma Moshroca - [1001103] = "defaultTalkWithMestonnaux_001", -- Mestonnaux + [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. - [1001396] = "defaultTalkWithLefwyne_001", -- Lefwyne - - [1001430] = "defaultTalkWithKinnison_001", -- Kinnison - Two args (nil errors client). If either >= 0, dialog mentions you've met Kan-E-Senna. + [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) - [1001437] = "defaultTalkWithSybell_001", -- Sybell + [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) - [1002091] = "", + --[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? - --[1500334] = "", -- Serpent Private Hill (Gridania: Adv. Guild) Company Warp NPC - Will not fire, not PplStd. - --[1500393] = "", -- Torsefers (Gridania: Adv. Guild) Wards NPC - Will not fire, not PplStd. - --[1600092] = "", -- Aeduin (Gridania: Adv. Guild) Shop - Will not fire, not PplStd. - --[1600100] = "", -- Zagylhaemr (Gridania: Adv. Guild) Shop - Will not fire, not PplStd. - --[1600119] = "", -- Naih Khamazom (Gridania: Adv. Guild) Shop - Will not fire, not PplStd. + --[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) - [1000001] = "defaultTalkWithLionnellais_001", - - - -- [1000458] = "defaultTalkWithInn_Desk" - ---[[ - --- defaultTalkWithStewart_001 -- Hodder line? - - -defaultTalkWithHereward_001(A0_119, A1_120, A2_121) -defaultTalkWithBeli_001(A0_122, A1_123, A2_124) -defaultTalkWithMaddeline_001(A0_125, A1_126, A2_127) -defaultTalkWithDyrstbrod_001(A0_128, A1_129, A2_130) -defaultTalkWithTatagoi_001(A0_131, A1_132, A2_133) -defaultTalkWithLuilda_001(A0_137, A1_138, A2_139) -defaultTalkWithAlixe_001(A0_140, A1_141, A2_142) -defaultTalkWithDadalo_001(A0_143, A1_144, A2_145) -defaultTalkWithKain_001(A0_146, A1_147, A2_148) -defaultTalkWithAnaidjaa_001(A0_149, A1_150, A2_151) -defaultTalkWithZuzupoja_001(A0_152, A1_153, A2_154) -defaultTalkWithCaplan_001(A0_158, A1_159, A2_160) -defaultTalkWithUlmhylt_001(A0_161, A1_162, A2_163) -defaultTalkWithHabreham_001(A0_164, A1_165, A2_166) -defaultTalkWithDecima_001(A0_167, A1_168, A2_169) -defaultTalkWithChalyotamlyo_001(A0_170, A1_171, A2_172) -defaultTalkWithPowle_001(A0_173, A1_174, A2_175) -defaultTalkWithSansa_001(A0_176, A1_177, A2_178) -defaultTalkWithNicoliaux_001(A0_179, A1_180, A2_181) -defaultTalkWithAunillie_001(A0_182, A1_183, A2_184) -defaultTalkWithElyn_001(A0_185, A1_186, A2_187) -defaultTalkWithRyd_001(A0_188, A1_189, A2_190) -defaultTalkWithWillelda_001(A0_191, A1_192, A2_193) -defaultTalkWithWillelda_002(A0_194, A1_195, A2_196) -defaultTalkWithBurchard_001(A0_197, A1_198, A2_199) -defaultTalkWithCeinguled_001(A0_200, A1_201, A2_202) -defaultTalkWithFrancis_001(A0_203, A1_204, A2_205, A3_206) -defaultTalkWithDhemdaeg_001(A0_207, A1_208, A2_209) -defaultTalkWithLuitfrid_001(A0_210, A1_211, A2_212) -defaultTalkWithHaurtefert_001(A0_213, A1_214, A2_215) -defaultTalkWithZpahtalo_001(A0_216, A1_217, A2_218) -defaultTalkWithJmoldva_001(A0_219, A1_220, A2_221) -defaultTalkWithNuala_001(A0_222, A1_223, A2_224) -defaultTalkWithJolline_001(A0_225, A1_226, A2_227) -defaultTalkWithAerstsyn_001(A0_228, A1_229, A2_230) -defaultTalkWithNonolato_001(A0_231, A1_232, A2_233) -defaultTalkWithOdhinek_001(A0_234, A1_235, A2_236) -defaultTalkWithGeorjeaux_001(A0_237, A1_238, A2_239) -defaultTalkWithGeorjeaux_002(A0_240, A1_241, A2_242) -defaultTalkWithAlaire_001(A0_243, A1_244, A2_245) -defaultTalkWithChloe_001(A0_246, A1_247, A2_248) -defaultTalkWithMianne_001(A0_249, A1_250, A2_251) -defaultTalkWithBubuku_001(A0_252, A1_253, A2_254) -defaultTalkWithPiers_001(A0_255, A1_256, A2_257) -defaultTalkWithSolieine_001(A0_258, A1_259, A2_260) -defaultTalkWithHetzkin_001(A0_261, A1_262, A2_263) -defaultTalkWithTelent_001(A0_264, A1_265, A2_266) -defaultTalkWithKhujazhwan_001(A0_267, A1_268, A2_269) -defaultTalkWithZerig_001(A0_270, A1_271, A2_272) -defaultTalkWithYonariumnari_001(A0_273, A1_274, A2_275) -defaultTalkWithGugula_001(A0_276, A1_277, A2_278) -defaultTalkWithRdjongo_001(A0_279, A1_280, A2_281) -defaultTalkWithAstrelle_001(A0_282, A1_283, A2_284) -defaultTalkWithBiddy_001(A0_285, A1_286, A2_287) -defaultTalkWithConcessa_001(A0_288, A1_289, A2_290) -defaultTalkWithMaroile_001(A0_291, A1_292, A2_293) -defaultTalkWithKinborow_001(A0_294, A1_295, A2_296) -defaultTalkWithTnbulea_001(A0_297, A1_298, A2_299) -defaultTalkWithFoforyo_001(A0_300, A1_301, A2_302) -defaultTalkWithOpyltyl_001(A0_303, A1_304, A2_305) -defaultTalkWithCicely_001(A0_306, A1_307, A2_308) -defaultTalkWithVnabyano_001(A0_309, A1_310, A2_311) -defaultTalkWithSandre_001(A0_312, A1_313, A2_314) -defaultTalkWithEburhart_001(A0_318, A1_319, A2_320) -defaultTalkWithOnguen_001(A0_321, A1_322, A2_323) -defaultTalkEnie_001(A0_324, A1_325, A2_326) - -defaultTalkWithNoes_001(A0_333, A1_334, A2_335) -defaultTalkWithFhrudhem_001(A0_336, A1_337, A2_338) - - -defaultTalkWithMitainie_001(A0_348, A1_349, A2_350) -defaultTalkWithNicia_001(A0_351, A1_352, A2_353) -defaultTalkWithBlandie_001(A0_354, A1_355, A2_356) -defaultTalkWithGenna_001(A0_362, A1_363, A2_364) -defaultTalkWithOwyne_001(A0_365, A1_366, A2_367) -defaultTalkWithLivith_001(A0_371, A1_372, A2_373) -defaultTalkWithProscen_001(A0_374, A1_375, A2_376) -defaultTalkWithTanguistl_001(A0_377, A1_378, A2_379) -defaultTalkWithComoere_001(A0_380, A1_381, A2_382) -defaultTalkWithLougblaet_001(A0_383, A1_384, A2_385) -defaultTalkWithFamushidumushi_001(A0_386, A1_387, A2_388) -defaultTalkWithDrystan_001(A0_389, A1_390, A2_391) -defaultTalkWithEadbert_001(A0_392, A1_393, A2_394) -defaultTalkWithWybir_001(A0_395, A1_396, A2_397) -defaultTalkWithKeketo_001(A0_398, A1_399, A2_400) -defaultTalkWithRadianttear_001(A0_401, A1_402, A2_403) -defaultTalkWithMyles_001(A0_404, A1_405, A2_406) -defaultTalkWithNathaniel_001(A0_407, A1_408, A2_409) -defaultTalkWithEvrardoux_001(A0_410, A1_411, A2_412) -defaultTalkWithTsehpanipahr_001(A0_413, A1_414, A2_415) -defaultTalkWithEthelinda_001(A0_416, A1_417, A2_418) -defaultTalkWithHedheue_001(A0_419, A1_420, A2_421) -defaultTalkWithJajajbygo_001(A0_422, A1_423, A2_424, A3_425, A4_426) -defaultTalkWithPepeli_001(A0_427, A1_428, A2_429, A3_430) -defaultTalkWithBidelia_001(A0_431, A1_432, A2_433) -defaultTalkWithMiraudont_001(A0_434, A1_435, A2_436, A3_437) -defaultTalkWithRimomo_001(A0_438, A1_439, A2_440) -defaultTalkWithDadaneja_001(A0_441, A1_442, A2_443) -defaultTalkWithIolaine_001(A0_444, A1_445, A2_446) -defaultTalkWithBloisirant_001(A0_447, A1_448, A2_449) -defaultTalkWithGylbart_001(A0_450, A1_451, A2_452) -defaultTalkWithHonoroit_001(A0_453, A1_454, A2_455) -defaultTalkWithYlessa_001(A0_456, A1_457, A2_458) - -defaultTalkWithSwaenhylt_001(A0_465, A1_466, A2_467) -defaultTalkWithMarcette_001(A0_468, A1_469, A2_470) -defaultTalkWithGuildleveClientG_001(A0_471, A1_472, A2_473) -defaultTalkWithGuildleveClientG_002(A0_474, A1_475, A2_476) -defaultTalkWithGuildleveClientG_003(A0_477, A1_478, A2_479) -defaultTalkWithAUBRENARD_100(A0_480, A1_481, A2_482) -defQuest1g0_Bush(A0_483, A1_484, A2_485) -defQuest1g1_Bush(A0_486, A1_487, A2_488) -defaultTalkWithChamberliaux_001(A0_489, A1_490, A2_491) -defaultTalkWithFraemhar_001(A0_492, A1_493, A2_494) -defaultTalkWithXbhowaqi_001(A0_495, A1_496, A2_497) -defaultTalkWithLora_001(A0_498, A1_499, A2_500) -defaultTalkWithWawaramu_001(A0_501, A1_502, A2_503) -defaultTalkWithArnott_001(A0_504, A1_505, A2_506) -defaultTalkWithLhomujuuk_001(A0_507, A1_508, A2_509) -defaultTalkWithSholnoralno_001(A0_510, A1_511, A2_512) -defaultTalkWithTuatkk_001(A0_513, A1_514, A2_515) -defaultTalkWithAruhnsenna_001(A0_516, A1_517, A2_518) -defaultTalkWithMoogle010_001(A0_519, A1_520, A2_521) -defaultTalkWithMoogle002_001(A0_522, A1_523, A2_524) -defaultTalkWithAilith_001(A0_525, A1_526, A2_527) - -defaultTalkWithQZamqo_001(A0_543, A1_544, A2_545) -defaultTalkLouisoix_001(A0_546, A1_547, A2_548) -defaultTalkWithRonanKognan_001(A0_549, A1_550, A2_551) -defaultTalkWithRonanKognan_002(A0_552, A1_553, A2_554, A3_555, A4_556) -defaultTalkWithRonanKognan_Hint_00(A0_558, A1_559, A2_560, A3_561) -defaultTalkWithRonanKognan_Hint_01(A0_562, A1_563, A2_564, A3_565) -defaultTalkWithRonanKognan_Hint_02(A0_566, A1_567, A2_568, A3_569) -defaultTalkWithRonanKognan_Hint_03(A0_570, A1_571, A2_572, A3_573) -defaultTalkWithRonanKognan_Hint_04(A0_574, A1_575, A2_576, A3_577) -defaultTalkWithVorsaile_001(A0_578, A1_579, A2_580, A3_581) -defaultTalkCaravanChocoboGri_001(A0_582, A1_583, A2_584) -downTownTalk(A0_585, A1_586, A2_587, A3_588, A4_589, A5_590) -tribeTalk(A0_592, A1_593, A2_594) -bookTalk(A0_595, A1_596, A2_597) -talkIdayCap(A0_598, A1_599, A2_600) -talkIday1(A0_601, A1_602, A2_603) -talkIday2(A0_604, A1_605, A2_606) -defaultTalkWithPukwapika_001(A0_607, A1_608, A2_609) -defaultTalkWithPurumoogle_001(A0_610, A1_611, A2_612) -defaultTalkWithPirimoogle_001(A0_613, A1_614, A2_615) -defaultTalkWithPukumoogle_001(A0_616, A1_617, A2_618) -defaultTalkWithJehantel_001(A0_619, A1_620, A2_621) -defaultTalkWithJehantel_002(A0_622, A1_623, A2_624) -defaultTalkWithPukno_001(A0_625, A1_626, A2_627) -defaultTalkWithPukno_002(A0_628, A1_629, A2_630) -defaultTalkWithRayao_001(A0_631, A1_632, A2_633) -defaultTalkWithRayao_002(A0_634, A1_635, A2_636) -defaultTalkWithMoogleA_001(A0_637, A1_638, A2_639) -defaultTalkWithMoogleA_002(A0_640, A1_641, A2_642) -defaultTalkWithMppgleB_001(A0_643, A1_644, A2_645) -defaultTalkWithMppgleB_002(A0_646, A1_647, A2_648) -defaultTalkWithStewart_001(A0_652, A1_653, A2_654) -defaultTalkWithStewart_002(A0_655, A1_656, A2_657) -defaultTalkWithTrisselle_001(A0_658, A1_659, A2_660) -defaultTalkWithTrisselle_002(A0_661, A1_662, A2_663) -defaultTalkWithInn_Desk(A0_664, A1_665, A2_666) -defaultTalkWithInn_ExitDoor(A0_667, A1_668, A2_669) -defaultTalkWithExit01(A0_670, A1_671, A2_672) -defaultTalkWithLegendBsm_001(A0_673, A1_674, A2_675, A3_676) -defaultTalkWithMarketNpc(A0_678, A1_679, A2_680) -defaultTalkWithHamletGuardGri_001(A0_681, A1_682, A2_683) ---]] + [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) @@ -248,6 +241,8 @@ function onTalk(player, quest, npc, eventName) 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 @@ -257,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/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/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 From 08557f41fb8ef8d14db121ca410667d67b881fe1 Mon Sep 17 00:00:00 2001 From: CuriousJorge Date: Fri, 4 Mar 2022 23:12:28 -0500 Subject: [PATCH 10/17] Minor fixes - InstanceRaid Guide : Added DefaultTalk handling for the npcs we have currently. Included a couple commented-out client functions for two of the raids. - EmoteSitCommand : Added eventType to the function so sitting on environment objects works again. - Man0u0 : SourceTree added hunk-change garbage during a conflict resolving during the last merge. I just replaced it with the raw of that commit so it matches what it should have been. - DftFst : Added the Gridania InstanceRaidGuide NPCs to the list for documentation sake, even though it'd never be called from that script with how things are currently set up. --- .../instanceraidguide/InstanceRaidGuide.lua | 41 ++++++++++++++++- Data/scripts/commands/EmoteSitCommand.lua | 2 +- Data/scripts/quests/dft/DftFst.lua | 14 +++--- Data/scripts/quests/man/man0u0.lua | 44 ------------------- 4 files changed, 46 insertions(+), 55 deletions(-) diff --git a/Data/scripts/base/chara/npc/populace/instanceraidguide/InstanceRaidGuide.lua b/Data/scripts/base/chara/npc/populace/instanceraidguide/InstanceRaidGuide.lua index 50801a26..b9238ec7 100644 --- a/Data/scripts/base/chara/npc/populace/instanceraidguide/InstanceRaidGuide.lua +++ b/Data/scripts/base/chara/npc/populace/instanceraidguide/InstanceRaidGuide.lua @@ -3,15 +3,54 @@ InstanceRaidGuide Script Functions; +askEnterInstanceRaid(arg1) -- Opens a widget asking to enter the given Raid id. --]] require ("global") function init(npc) - return false, false, 0, 0; + + if ((npc == 1002090) or (npc == 1002091)) then + -- This won't work due to how init() works, but old scripts had it, keeping it here for now + return false, false, 0, 0, 491, 2; + else + return false, false, 0, 0; + end end function onEventStarted(player, npc, eventType, eventName) + + npcId = npc:GetActorClassId() + + if (npcId == 1002090) then -- Serpent Private Hodder (Stewart) : Gcl107 + + callClientFunction(player, "delegateEvent", player, GetStaticActor("DftFst"), "defaultTalkWithStewart_001"); -- "defaultTalkWithStewart_002" -- Post-Raid dialog? + + --[[ + choice = callClientFunction(player, "delegateEvent", player, GetStaticActor("Gcl107"), "processEventStewart", 15); + + if (choice == 1) then + callClientFunction(player, "askEnterInstanceRaid", 15); -- Rivenroad + end + --]] + elseif (npcId == 1002091) then -- Serpent Private Dauremant (Trisselle) : Sum6w0 + + callClientFunction(player, "delegateEvent", player, GetStaticActor("DftFst"), "defaultTalkWithTrisselle_001"); -- "defaultTalkWithTrisselle_002" -- No idea for context. + + --[[ + choice = callClientFunction(player, "delegateEvent", player, GetStaticActor("Sum6w0"), "processEventTrisselle", 16) + + if (choice == 1) then + callClientFunction(player, "askEnterInstanceRaid", 16); -- Rivenroad (Hard) + end + --]] + elseif (npcId == 1060022) then -- Louisoix + callClientFunction(player, "delegateEvent", player, GetStaticActor("DftFst"), "defaultTalkLouisoix_001"); + end + + + + player:EndEvent(); end \ No newline at end of file diff --git a/Data/scripts/commands/EmoteSitCommand.lua b/Data/scripts/commands/EmoteSitCommand.lua index 5f58c4c0..e767998d 100644 --- a/Data/scripts/commands/EmoteSitCommand.lua +++ b/Data/scripts/commands/EmoteSitCommand.lua @@ -4,7 +4,7 @@ EmoteSitCommand Script --]] -function onEventStarted(player, actor, triggerName, emoteId) +function onEventStarted(player, actor, eventType, triggerName, emoteId) if (player:GetState() == 0) then if (emoteId == 0x2712) then diff --git a/Data/scripts/quests/dft/DftFst.lua b/Data/scripts/quests/dft/DftFst.lua index 8880442a..a16dccbf 100644 --- a/Data/scripts/quests/dft/DftFst.lua +++ b/Data/scripts/quests/dft/DftFst.lua @@ -106,12 +106,12 @@ local defaultTalkFst = { [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. + --[1002090] = "defaultTalkWithStewart_001", -- Serpent Private Hodder (Gridania: Adv. Guild) defaultTalkWithStewart_002 (Post-Raid dialog?) - Will not fire, not PplStd. + --[1002091] = "defaultTalkWithTrisselle_001", -- Serpent Private Daurement (Gridania: Adv. Guild) defaultTalkWithTrisselle_002 (No idea for context) - 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. + --[1060022] = "defaultTalkLouisoix_001", -- 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. @@ -122,7 +122,7 @@ local defaultTalkFst = { } --[[ TO:DO - Map the remainder of these -defaultTalkWithStewart_001 -- Hodder line according to old script? + defaultTalkWithPowle_001 defaultTalkWithSansa_001 defaultTalkWithNicoliaux_001 @@ -191,7 +191,7 @@ defaultTalkWithMoogle010_001 defaultTalkWithMoogle002_001 defaultTalkWithAilith_001 defaultTalkWithQZamqo_001 -defaultTalkLouisoix_001 + defaultTalkWithRonanKognan_001 defaultTalkWithRonanKognan_002 arg1 arg2 defaultTalkWithRonanKognan_Hint_00 arg1 @@ -219,10 +219,6 @@ defaultTalkWithMoogleA_001 defaultTalkWithMoogleA_002 defaultTalkWithMppgleB_001 defaultTalkWithMppgleB_002 -defaultTalkWithStewart_001 -defaultTalkWithStewart_002 -defaultTalkWithTrisselle_001 -defaultTalkWithTrisselle_002 defaultTalkWithInn_Desk defaultTalkWithInn_ExitDoor defaultTalkWithExit01 diff --git a/Data/scripts/quests/man/man0u0.lua b/Data/scripts/quests/man/man0u0.lua index acc687c2..a7eb9cb1 100644 --- a/Data/scripts/quests/man/man0u0.lua +++ b/Data/scripts/quests/man/man0u0.lua @@ -108,11 +108,6 @@ function onStateChange(player, quest, sequence) if (sequence == SEQ_000) then -- Setup states incase we loaded in. -<<<<<<< HEAD - local data = quest:GetData(); - -======= ->>>>>>> origin/ioncannon/quest_system 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; @@ -141,10 +136,6 @@ function onStateChange(player, quest, sequence) quest:SetENpc(OPENING_STOPER_ULDAH, QFLAG_NONE, false, false, true); elseif (sequence == SEQ_010) then -<<<<<<< HEAD - local data = quest:GetData(); -======= ->>>>>>> origin/ioncannon/quest_system local yayatokiFlag = data:GetFlag(FLAG_SEQ010_TALK0) and QFLAG_NONE or QFLAG_PLATE; local uldahopeningexitFlag = QFLAG_MAP; quest:SetENpc(KEEN_EYED_MERCHANT); @@ -175,12 +166,8 @@ end function onPush(player, quest, npc) local sequence = quest:getSequence(); local classId = npc:GetActorClassId(); -<<<<<<< HEAD - local data = quest:GetData(); -======= local data = quest:GetData(); ->>>>>>> origin/ioncannon/quest_system if (sequence == SEQ_000) then if (classId == ASCILIA) then callClientFunction(player, "delegateEvent", player, quest, "processTtrNomal002"); @@ -222,17 +209,6 @@ function onNotice(player, quest, target) end function seq000_onTalk(player, quest, npc, classId) -<<<<<<< HEAD - local data = quest:GetData(); - if (classId == ASCILIA) then - - if (not data:GetFlag(FLAG_SEQ000_MINITUT0)) then -- If Talk tutorial - callClientFunction(player, "delegateEvent", player, quest, "processTtrNomal003"); - data:SetFlag(FLAG_SEQ000_MINITUT0); -- Used to disable her PushEvent / Allow for her next TalkEvent - else - callClientFunction(player, "delegateEvent", player, quest, "processTtrMini001"); - data:SetFlag(FLAG_SEQ000_MINITUT1); -- Ascilia has now been talked to. -======= local data = quest:GetData(); if (classId == ASCILIA) then @@ -242,7 +218,6 @@ function seq000_onTalk(player, quest, npc, classId) else callClientFunction(player, "delegateEvent", player, quest, "processTtrMini001"); quest:GetData():SetFlag(FLAG_SEQ000_MINITUT1); -- Ascilia has now been talked to. ->>>>>>> origin/ioncannon/quest_system end elseif (classId == FRETFUL_FARMHAND) then @@ -283,10 +258,6 @@ function seq000_onTalk(player, quest, npc, classId) end function seq010_onTalk(player, quest, npc, classId) -<<<<<<< HEAD - local data = quest:GetData(); -======= ->>>>>>> origin/ioncannon/quest_system if (classId == KEEN_EYED_MERCHANT) then callClientFunction(player, "delegateEvent", player, quest, "processEvent020_2"); elseif (classId == HIGH_SPIRITED_FELLOW) then @@ -302,15 +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 -<<<<<<< HEAD - if (not data:GetFlag(FLAG_SEQ010_TALK0)) then - callClientFunction(player, "delegateEvent", player, quest, "processEvent020_8"); - data:SetFlag(FLAG_SEQ010_TALK0); -======= if (not quest:GetData():GetFlag(FLAG_SEQ010_TALK0)) then callClientFunction(player, "delegateEvent", player, quest, "processEvent020_8"); quest:GetData():SetFlag(FLAG_SEQ010_TALK0); ->>>>>>> origin/ioncannon/quest_system else callClientFunction(player, "delegateEvent", player, quest, "processEvent020_8"); end @@ -323,13 +288,8 @@ function getJournalMapMarkerList(player, quest) local sequence = quest:getSequence(); local data = quest:GetData(); local possibleMarkers = {}; - local data = quest:GetData(); if (sequence == SEQ_000) then -<<<<<<< HEAD - -======= ->>>>>>> origin/ioncannon/quest_system 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 @@ -349,11 +309,7 @@ end -<<<<<<< HEAD -function doExitTrigger(player, quest, npc) -======= function doExitTrigger(player, quest, npc) ->>>>>>> origin/ioncannon/quest_system quest:GetData():ClearData(); quest:StartSequence(SEQ_005); contentArea = player.CurrentArea:CreateContentArea(player, "/Area/PrivateArea/Content/PrivateAreaMasterSimpleContent", "man0u01", "SimpleContent30079", "Quest/QuestDirectorMan0u001"); From 01ec313ffb90add31dc8c5cd7644fab523ab9067 Mon Sep 17 00:00:00 2001 From: CuriousJorge Date: Wed, 9 Mar 2022 22:23:10 -0500 Subject: [PATCH 11/17] DftFst.lua - about as documented as I can get it for now. Will finalize some NPC argument checks next time. quest.lua - Script refactored. Moved as much as possible out of the main function to tidy it up. Folded in a complete-quest function from another script. Only works with quest id numbers for now. String support (eg. Man0u0) to come in another commit. ObjectInnDoor.lua - Fixed it to handle events again with the current system. --- .../base/chara/npc/object/ObjectInnDoor.lua | 2 +- Data/scripts/commands/gm/quest.lua | 341 ++++++++++-------- Data/scripts/quests/dft/DftFst.lua | 276 +++++++------- 3 files changed, 343 insertions(+), 276 deletions(-) diff --git a/Data/scripts/base/chara/npc/object/ObjectInnDoor.lua b/Data/scripts/base/chara/npc/object/ObjectInnDoor.lua index 24b7161b..e3c82af4 100644 --- a/Data/scripts/base/chara/npc/object/ObjectInnDoor.lua +++ b/Data/scripts/base/chara/npc/object/ObjectInnDoor.lua @@ -4,7 +4,7 @@ function init(npc) return false, false, 0, 0; end -function onEventStarted(player, npc, triggerName) +function onEventStarted(player, npc, eventType, eventName) defaultFst = GetStaticActor("DftFst"); choice = callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithInn_ExitDoor", nil, nil, nil); diff --git a/Data/scripts/commands/gm/quest.lua b/Data/scripts/commands/gm/quest.lua index eab846ef..569bf821 100644 --- a/Data/scripts/commands/gm/quest.lua +++ b/Data/scripts/commands/gm/quest.lua @@ -5,166 +5,207 @@ properties = { parameters = "ssss", description = [[ -Add/Remove Quests, modify and . -!quest add/remove | -!quest phase | -!quest flag true/false | +Add/Remove/Complete Quests, modify and . +!quest <#> | +!quest <#> | +!quest <#> true/false | ]], } -function onTrigger(player, argc, command, var1, var2, var3) +function onTrigger(player, argc, quest, command, var1, var2) local messageID = MESSAGE_TYPE_SYSTEM_ERROR; local sender = "[quest] "; local message = "Error"; + local questId = tonumber(quest); - print(tostring(argc)); - if player then - if argc == 2 then - if command == "add" or command == "give" or command == "+" then - if tonumber(var1) then - if player:HasQuest(tonumber(var1)) == false then - player:AddQuest(tonumber(var1)); - message = ("adding quest "..var1); - else - message = ("already have quest "..var1); - end - else - if player:HasQuest(var1) == false then - player:AddQuest(var1); - message = ("adding quest "..var1); - else - message = ("already have quest "..var1); - end - end - - elseif command == "remove" or command == "delete" or command == "-" then - if tonumber(var1) and player:HasQuest(tonumber(var1)) == true then - player:RemoveQuest(tonumber(var1)); - message = ("removing quest "..var1); - else - if player:HasQuest(var1) == true then - q2 = GetStaticActor(var1); - - if q2 ~= nil then - q3 = q2.Id; - message = ("removing quest "..var1); - printf(q3); - q4 = bit32.band(q3, 0xA0F00000); - printf(q4); - - player:RemoveQuest(quest.Name); - end - else - message = ("remove error: either incorrect ID or quest "..var1.." isn't active on character"); - end - end - elseif command == "info" then - if tonumber(var1) then - if player:HasQuest(tonumber(var1)) then - quest = player:GetQuest(tonumber(var1)); - - local flagStr = ""; - for i=0,31,1 do - if (quest:GetData():GetFlag(i)) then - flagStr = flagStr .. "O"; - else - flagStr = flagStr .. "X"; - end - if (i == 15) then - flagStr = flagStr .. "\n"; - end - end - - local data = quest:GetData(); - - message = string.format("\nInfo for quest %s [%d]\n", quest.Name, quest:GetQuestId()); - message = message .. string.format("Current Sequence: %d\n", quest:getSequence()); - message = message .. string.format("Flags: \n%s\n", flagStr) - message = message .. string.format("Counters: %d,%d,%d,%d", data:getCounter(0), data:getCounter(1), data:getCounter(2), data:getCounter(3)); - else - message = ("Quest not active: "..var1); - end - else - message = ("error: invalid parameters used"); - end + if (type(questId) == "number") then + if (questId < 110001 or questId > 110001 + 2048) and player then + player:SendMessage(messageID, sender, "Invalid questId entered"); + player:SendMessage(messageID, sender, argc); + return; + else + if (command == "add" or command == "give" or command == "+") then + message = addQuest(player, questId); + elseif (command == "remove" or command == "delete" or command == "-") then + message = removeQuest(player, questId); + elseif (command == "complete" or command == "completed" or command == "finish") then + message = setQuestCompletion(player, argc, questId, var1); + elseif (command == "info") then + message = getQuestInfo(player, questId); + elseif (command == "seq" or command == "sequence") then + message = setQuestSequence(player, questId, tonumber(var1)); + elseif (command == "flag") then + message = setQuestFlag(player, questId, var1, var2); + elseif (command == "counter" or command == "count") then + message = setQuestCounter(player, questId, var1, var2); else - message = ("error: command "..command.." not recognized"); - end - elseif argc == 3 then - if command == "seq" or command == "sequence" then - if (tonumber(var1) and tonumber(var2)) ~= nil then - if player:HasQuest(tonumber(var1)) == true then - player:GetQuest(tonumber(var1)):StartSequence(tonumber(var2)); - message = ("changing sequence of quest "..var1.." to "..var2); - else - message = ("sequence error: either incorrect ID or quest "..var1.." isn't active on character"); - end - else - message = ("error: invalid parameters used"); - end - else - message = ("error: command "..command.." not recognized"); - end; - - elseif argc == 4 then - if command == "flag" then - if tonumber(var1) and (tonumber(var2) >= 0 and tonumber(var2) <= 32) then - questvar = tonumber(var1); - flagvar = (tonumber(var2)); - boolvar = 0; - - if var3 == "true" or var3 == "1" or var3 == "on" or var3 == "O" then - boolvar = true; - elseif var3 == "false" or var3 == "0" or var3 == "off" or var3 == "X" then - boolvar = false; - elseif var3 == "flip" or var3 == "toggle" then - if player:HasQuest(questvar) == true then - boolvar = not player:GetQuest(questvar):GetData():GetFlag(flagvar); - end - else - message = ("error: flag: boolean not recognized"); - print(sender..message); - return; - end - - var4 = player:GetQuest(questvar):GetData():GetFlag(flagvar); - - if var4 ~= boolvar then - if (boolvar == true) then - player:GetQuest(questvar):GetData():SetFlag(flagvar); - else - player:GetQuest(questvar):GetData():ClearFlag(flagvar); - end - player:GetQuest(questvar):UpdateENPCs(); - player:GetQuest(questvar):GetData():Save(); - if boolvar == true then - message = ("changing flag "..tonumber(var2).." to true on quest "..questvar); - else - message = ("changing flag "..tonumber(var2).." to false on quest "..questvar); - end - else - message = ("error: flag "..flagvar.." is already set to that state on quest "..questvar); - end - else - message = ("error: command "..command.." not recognized"); - end - elseif command == "counter" then - if tonumber(var1) and (tonumber(var2) >= 0 and tonumber(var2) <= 4) then - questvar = tonumber(var1); - index = (tonumber(var2)); - - player:GetQuest(questvar):GetData():SetCounter(index, tonumber(var3)); - player:GetQuest(questvar):UpdateENPCs(); - player:GetQuest(questvar):GetData():Save(); - message = ("changing counter "..tonumber(var2).." to "..var3); - else - message = ("error: command "..command.." not recognized"); - end - end + message = ("Error: Command "..command.." not recognized"); + end end + else + message = ("Error: Quest id must be a valid number.") end player:SendMessage(messageID, sender, message); - print(sender..message); -end \ No newline at end of file +end + + + +function addQuest(player, questId) + if (not (player:HasQuest(questId))) then + player:AddQuest(questId); + return string.format("Adding quest "..player:GetQuest(questId).name.." ["..questId.."]"); + else + return string.format("Already have quest "..player:GetQuest(questId).name.." ["..questId.."]"); + end +end + +function removeQuest(player, questId) + if (player:HasQuest(questId)) then + local questName = player:GetQuest(questId).name; + player:RemoveQuest(questId); + return string.format("Removing quest "..questName.." ["..questId.."]"); + else + return string.format("Error: Either incorrect ID or quest "..questId.." isn't active on character."); + end +end + +function setQuestCompletion(player, argc, questId, flag) + + if (argc == 2) then -- No flag entered -> Return state of the quest's completion. + return string.format("Quest %d completion is set to: %s", questId, tostring(player:IsQuestCompleted(questId))); + else + local boolFlag = false; + + if (flag == "true" or flag == "1" or flag == "on" or flag == "O") then + boolFlag = true; + elseif (flag == "false" or flag == "0" or flag == "off" or flag == "X") then + boolFlag = false; + elseif flag == "flip" or flag == "toggle" then + boolFlag = not player:IsQuestCompleted(questId); + else -- A catch for bad inputs + return string.format("Error: Invalid flag entered"); + end + + player:SetQuestComplete(questId, boolFlag); + return string.format("Quest %d completion set to: %s", questId, tostring(player:IsQuestCompleted(questId))); + + end +end + +function setQuestSequence(player, questId, sequence) + if (type(sequence) == "number") then + if (player:HasQuest(questId)) then + local seq = math.floor(tonumber(sequence)); + if (seq >= 0 and seq <= 65535) then + player:GetQuest(questId):StartSequence(seq); + return string.format("Changing sequence of quest "..player:GetQuest(questId).name.." ["..questId.."] to "..seq); + else + return string.format("Error: Sequence value must be within 0-65535."); + end + else + return string.format("Sequence error: either incorrect ID or quest "..questId.." isn't active on character"); + end + else + return string.format("Error: Sequence value must be a valid number."); + end +end + +function setQuestFlag(player, questId, flagNum, flagCmd) + local questvar = questId; + local flagvar = tonumber(flagNum); + local boolvar = 0; + + if (player:HasQuest(questvar)) then + if (flagvar >= 0 and flagvar <= 31) then + + if flagCmd == "true" or flagCmd == "1" or flagCmd == "on" or flagCmd == "O" then + boolvar = true; + elseif flagCmd == "false" or flagCmd == "0" or flagCmd == "off" or flagCmd == "X" then + boolvar = false; + elseif flagCmd == "flip" or flagCmd == "toggle" then + boolvar = not player:GetQuest(questvar):GetData():GetFlag(flagvar); + else + return "Error: Flag: Boolean not recognized." + end + + currentFlagState = player:GetQuest(questvar):GetData():GetFlag(flagvar); + + if (currentFlagState ~= boolvar) then + + if (boolvar == true) then + player:GetQuest(questvar):GetData():SetFlag(flagvar); + else + player:GetQuest(questvar):GetData():ClearFlag(flagvar); + end + player:GetQuest(questvar):UpdateENPCs(); + player:GetQuest(questvar):GetData():Save(); + if boolvar == true then + return string.format("Changing flag "..tonumber(flagNum).." to true on quest "..questvar); + else + return string.format("Changing flag "..tonumber(flagNum).." to false on quest "..questvar); + end + else + return string.format("Error: Flag "..flagvar.." is already set to that state on quest "..questvar); + end + else + return string.format("Error: Flag "..flagNum.." is not within the valid range of 0-31."); + end + else + return string.format("Error: Either incorrect ID or quest "..tostring(questId).." isn't active on character."); + end + +end + +function setQuestCounter(player, questId, counterSlot, counterValue) + local cSlot = tonumber(counterSlot) or nil; + local cVal = tonumber(counterValue) or nil; + + if (cSlot ~= nil and cSlot >= 0 and cSlot <= 3) then + if (cVal ~= nil and cVal >= 0 and cVal <= 255) then + player:GetQuest(questId):GetData():SetCounter(cSlot, cVal); + player:GetQuest(questId):UpdateENPCs(); + player:GetQuest(questId):GetData():Save(); + + return string.format("Changing counter "..cSlot.." to "..cVal); + else + return string.format("Error: Invalid counter value. Must be between 0-255."); + end + else + return string.format("Error: Invalid counter index. Must be between 0-3."); + end +end + + +function getQuestInfo(player, questId) + if player:HasQuest(questId) then + quest = player:GetQuest(questId); + + local msg = ""; + local flagStr = ""; + + for i=0,31,1 do + if (quest:GetData():GetFlag(i)) then + flagStr = flagStr .. "O"; + else + flagStr = flagStr .. "X"; + end + if (i == 15) then + flagStr = flagStr .. "\n"; + end + end + + local data = quest:GetData(); + + msg = string.format("Info for quest %s [%d]\n", quest.Name, quest:GetQuestId()); + msg = msg .. string.format("Flags \\\\ Current Sequence: %d\n", quest:getSequence()); + msg = msg .. string.format("%s\n", flagStr) + msg = msg .. string.format("Counters: %d,%d,%d,%d", data:getCounter(0), data:getCounter(1), data:getCounter(2), data:getCounter(3)); + return msg; + else + return string.format("Quest not active: "..questId); + end +end + + diff --git a/Data/scripts/quests/dft/DftFst.lua b/Data/scripts/quests/dft/DftFst.lua index a16dccbf..429128ca 100644 --- a/Data/scripts/quests/dft/DftFst.lua +++ b/Data/scripts/quests/dft/DftFst.lua @@ -4,9 +4,9 @@ require ("global") Quest Script -Name: Small Talk -Code: DftFst -Id: 110542 +Name: Small Talk +Code: DftFst +Id: 110542 Contains all default lines for talkable npcs in the Forest Region (aka Black Shroud). * NOTE: This quest is active for all players at all times. @@ -19,13 +19,21 @@ local defaultTalkFst = { [1000068] = "defaultTalkWithKain_001", -- Kain (Gridania: LTW Guild) [1000069] = "defaultTalkWithJolline_001", -- Jolline (Gridania: LNC Guild) [1000071] = "defaultTalkWithBertennant_001", -- Bertennant (Gridania: Blue Badger Gate) + [1000072] = "defaultTalkWithMitainie_001", -- <<>> Mitainie (Gridania: White Wolf Gate) [1000074] = "defaultTalkWithOnguen_001", -- Onguen (Gridania: BTN Guild) [1000230] = "defaultTalkWithMiounne_001", -- Miounne (Gridania: Adv. Guild) [1000231] = "defaultTalkWithHereward_001", -- Hereward (Gridania: LTW Guild) + [1000234] = "defaultTalkWithSolieine_001", -- <<>> Soileine [function typo] (Gridania: CNJ Guild) Has Parley actor id: 1700030 [1000236] = "defaultTalkWithOpyltyl_001", -- Opyltyl (Gridania: BTN Guild) + [1000238] = "defaultTalkWithPowle_001", -- <<>> Powle (Gridania: Acorn Orchard) - Has many actorclass IDs, this is the first one. + [1000239] = "defaultTalkWithSansa_001", -- <<>> Sansa (Gridania: Acorn Orchard) [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) + [1000409] = "defaultTalkWithNicoliaux_001", -- <<>> Nicoliaux (Gridania: Acorn Orchard) [has multiple map markers, one might be regular idle location?] + [1000410] = "defaultTalkWithAunillie_001", -- <<>> Aunillie (Gridania: Acorn Orchard) + [1000411] = "defaultTalkWithElyn_001", -- <<>> Elyn (Gridania: Acorn Orchard) + [1000412] = "defaultTalkWithRyd_001", -- <<>> Ryd (Gridania: Acorn Orchard) [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) @@ -33,19 +41,21 @@ local defaultTalkFst = { [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) + [1000434] = "defaultTalkWithOdilie_001", -- Odilie (Gridania: Adv. Guild) defaultTalkWithOdilie_002 / 003 (CUL 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. + [1000458] = "defaultTalkWithVkorolon_001", -- V'korolon (Gridania: Adv. Guild) - Inn NPC. defaultTalkWithInn_Desk used when Inn unlocked + --[1000460] = "defaultTalkWithHetzkin_001", -- Hetzkin (Gridania: CNJ 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. + [1000504] = "defaultTalkWithTelent_001", -- <<>> Telent (Gridania: CNJ Guild) - Has map marker, but whole-numbered. + [1000509] = "defaultTalkWithKinborow_001", -- <<>> Kinborow (Gridania: CNJ Guild) + [1000510] = "defaultTalkWithZerig_001", -- <<>> Zerig (Gridania: CNJ Guild) - Has map marker, but whole-numbered. + [1000511] = "defaultTalkWithConcessa_001", -- <<>> Concessa (Gridania: CNJ Guild) + [1000512] = "defaultTalkWithMaroile_001", -- <<>> Maroile (Gridania: CNJ Guild) + [1000513] = "defaultTalkWithGugula_001", -- <<>> Gugula (Gridania: CNJ Guild) + [1000556] = "defaultTalkWithWybir_001", -- <<>> Wybir (South Shroud: Quarrymill) [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) @@ -61,168 +71,138 @@ local defaultTalkFst = { [1000627] = "defaultTalkWithAerstsyn_001", -- Aerstsyn (Gridania: LNC Guild) [1000629] = "defaultTalkWithEburhart_001", -- Eburhart (Gridania: BTN Guild) [1000630] = "defaultTalkWithNoes_001", -- Noes (Gridania: Apkallus Falls) + [1000669] = "defaultTalkWithJajajbygo_001", -- <<>> Jajajbygo (Central Shroud: Camp Benchbranch) If Arg1 = 20 (SpecialEventWork correlation?), extra dialog about Atomos + [1000670] = "defaultTalkWithPepeli_001", -- <<>> Pepeli (Central Shroud: Camp Benchbranch) If Arg1 = 20 (SpecialEventWork correlation?), extra dialog about 7U Era starting [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) + [1000737] = "defaultTalkWithBiddy_001", -- <<>> Biddy (Gridania: CNJ Guild) - Has map marker, but whole-numbered. + [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) + [1000837] = "defaultTalkWithRdjongo_001", -- <<>> R'djongo (Gridania: Stillglade Fane) + [1000839] = "defaultTalkWithKhujazhwan_001", -- <<>> Khuja Zhwan (Gridania: Stillglade Fane) [1000951] = "defaultTalkWithLonsygg_001", -- Lonsygg (Gridania: Blue Badger Gate) + [1000978] = "defaultTalkWithGylbart_001", -- <<>> Gylbart (South Shroud: Quarrymill) + [1001071] = "defaultTalkWithTnbulea_001", -- <<>> T'nbulea (Gridania: CNJ Guild) + [1001072] = "defaultTalkWithFoforyo_001", -- <<>> Foforyo (Gridania: CNJ Guild) [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) + [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) + [1001103] = "defaultTalkWithMestonnaux_001", -- Mestonnaux (Gridania: BTN Guild) + [1001150] = "defaultTalkWithBloisirant_001", -- <<>> Bloisirant (South Shroud: Silent Arbor) Instance queue NPC for Toto-Rak - Will not fire, not PplStd. + [1001151] = "defaultTalkWithBidelia_001", -- <<>> Bidelia - Entry Denier Guard? + [1001152] = "defaultTalkWithDadaneja_001", -- <<>> Dadaneja - Entry Denier Guard (West Shroud) - Guards fst_f0_dun06 + [1001153] = "defaultTalkWithRimomo_001", -- <<>> Rimomo - Entry Denier Guard (North Shroud: 25,7) - Guards fst_f0_dun05 [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? + [1001190] = "defaultTalkWithGuildleveClientG_003", -- <<>> Eugenaire (Gridania: White Wolf Gate) + [1001294] = "defaultTalkWithIolaine_001", -- <<>> Iolaine - Entry Denier Guard (West Shroud) - Also guards fst_f0_dun06 + [1001338] = "defaultTalkWithLivith_001", -- <<>> Livith (North Shroud: Hyrstmill) + [1001339] = "defaultTalkWithProscen_001", -- <<>> Proscen (North Shroud: Hyrstmill) + [1001340] = "defaultTalkWithTanguistl_001", -- <<>> Tanguistl (North Shroud: Hyrstmill) + [1001341] = "defaultTalkWithComoere_001", -- <<>> Comoere (North Shroud: Hyrstmill) [dialog doesn't match wiki, but matching dialog isn't called in any function] + [1001342] = "defaultTalkWithLougblaet_001", -- <<>> Lougblaet (North Shroud: Hyrstmill) + [1001343] = "defaultTalkWithFamushidumushi_001", -- <<>> Famushi Dumushi (North Shroud: Hyrstmill) + [1001344] = "defaultTalkWithDrystan_001", -- <<>> Drystan (North Shroud: Hyrstmill) + [1001345] = "defaultTalkWithEadbert_001", -- <<>> Eadbert (North Shroud: Hyrstmill) + [1001346] = "defaultTalkWithKeketo_001", -- <<>> Keketo (South Shroud: Quarrymill) + [1001347] = "defaultTalkWithRadianttear_001", -- <<>> Radiant Tear (South Shroud: Quarrymill) + [1001348] = "defaultTalkWithMyles_001", -- <<>> Myles (South Shroud: Quarrymill) + [1001349] = "defaultTalkWithNathaniel_001", -- <<>> Nathaniel (South Shroud: Quarrymill) + [1001350] = "defaultTalkWithEvrardoux_001", -- <<>> Evrardoux (South Shroud: Quarrymill) + [1001351] = "defaultTalkWithTsehpanipahr_001", -- <<>> Tseh Panipahr (South Shroud: Quarrymill) + [1001352] = "defaultTalkWithEthelinda_001", -- <<>> Ethelinda (South Shroud: Quarrymill) + [1001353] = "defaultTalkWithHedheue_001", -- <<>> Hedheue (South Shroud: Quarrymill) + [1001396] = "defaultTalkWithLefwyne_001", -- Lefwyne (Gridania: Shaded Bower) + [1001430] = "defaultTalkWithKinnison_001", -- Kinnison (Gridania: Stillglade Fane) Two args (nil errors client). If either >= 0, mentions you've met Kan-E-Senna (joined a GC). 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) + [1001434] = "defaultTalkWithNicia_001", -- <<>> Nicia (Gridania: White Wolf Gate) + [1001435] = "defaultTalkWithBlandie_001", -- <<>> Blandie (Gridania: White Wolf Gate) [1001436] = "defaultTalkWithOwyne_001", -- Owyne (Gridania: Aetheryte Plaza) - [1001437] = "defaultTalkWithSybell_001", -- Sybell (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) + [1001470] = "defaultTalkWithYlessa_001", -- Ylessa + [1001570] = "defaultTalkWithRayao_001", -- <<>> Raya-O-Senna (North Shroud: Emerald Moss) WHM Job NPC, defaultTalkWithRayao_002 + [1001571] = "defaultTalkWithAruhnsenna_001", -- <<>> A-Ruhn-Senna (Inside Toto-Rak instance) [1001582] = "defaultTalkWithSwaenhylt_001", -- Swaenhylt (Gridania) [1001583] = "defaultTalkWithMarcette_001", -- Marcette (Gridania: The Knot) - [1001470] = "defaultTalkWithYlessa_001", -- Ylessa + [1001610] = "defaultTalkWithChamberliaux_001", -- <<>> Chamberliaux (South Shroud: Buscarron's Fold) + [1001611] = "defaultTalkWithFraemhar_001", -- <<>> Fraemhar (East Shroud: Hawthorne Hut) + [1001612] = "defaultTalkWithLora_001", -- <<>> Lora (East Shroud: Hawthorne Hut) + [1001613] = "defaultTalkWithXbhowaqi_001", -- <<>> X'bhowaqi (South Shroud: Buscarron's Fold) + [1001614] = "defaultTalkWithWawaramu_001", -- <<>> Wawaramu (South Shroud: Buscarron's Fold) + [1001615] = "defaultTalkWithArnott_001", -- <<>> Arnott (East Shroud: Hawthorne Hut) + [1001620] = "talkIdayCap", -- <<>> Serpent Lieutenant Marette (Gridania: The Knot) - Foundation Day 2011 - OLD EVENT NPC: Replaced by 2012 version + [1001621] = "talkIday1", -- <<>> Serpent Sergeant Frilaix (Gridania: The Knot) - Foundation Day 2011 - OLD EVENT NPC: Replaced by 2012 version + [1001622] = "talkIday2", -- <<>> Serpent Private Tristelle (Gridania: The Knot) - Foundation Day 2011 - OLD EVENT NPC: Replaced by 2012 version + [1001628] = "defaultTalkWithAilith_001", -- <<>> Ailith (South Shroud: Quarrymill) + [1001636] = "defaultTalkWithLhomujuuk_001", -- <<>> Lho Mujuuk (South Shroud: Silent Arbor) - Hangs outside Toto-Rak entrance + [1001637] = "defaultTalkWithSholnoralno_001", -- <<>> Sholno Ralno (South Shroud: Silent Arbor) - Hangs outside Toto-Rak entrance + [1001638] = "defaultTalkWithTuatkk_001", -- <<>> Tuatkk (South Shroud: Silent Arbor) - Hangs outside Toto-Rak entrance + [1001642] = "defaultTalkWithRonanKognan_001", -- <<>> Ronan Kognan (Gridania: 5,5) - Has a variety of functions, listed under onTalk() [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) + [1001711] = "defaultTalkWithQZamqo_001", -- <<>> Q'zamqo (Gridania: Airship Landing) [1001806] = "defaultTalkEnie_001", -- Enie (Gridania: BTN Guild) + [1001835] = "defaultTalkWithVorsaile_001", -- <<>> Serpent Commander Heuloix (North Shroud: Emerald Moss) + [1001836] = "defaultTalkWithPukwapika_001", -- <<>> Pukwa Pika (West Shroud: Turning Leaf) - Involved in "A Feast of Fools", Thornmarch fight + [1001837] = "defaultTalkWithPurumoogle_001", -- <<>> Frightened Moogle (West Shroud: Turning Leaf) - Hangs out beside Pukwa Pika + [1001838] = "defaultTalkWithPirimoogle_001", -- <<>> Fretful Moogle (West Shroud: Turning Leaf) - Hangs out beside Pukwa Pika + [1001936] = "defaultTalkWithPukno_001", -- <<>> Pukno Poki - defaultTalkWithPukno_002 - Used after unlocking BRD? + [1001937] = "defaultTalkWithMoogleA_001", -- <<>> Pukni Pakk (North Shroud: Emerald Moss) - Hangs with WHM Job NPC - defaultTalkWithMoogleA_002 - Post-WHM dialog? + [1001938] = "defaultTalkWithMppgleB_001", -- <<>> Kupcha Kupa (North Shroud: Emerald Moss) - Hangs with WHM Job NPC - defaultTalkWithMppgleB_002 - Post-WHM dialog? [1001951] = "defaultTalkWithAnselm_001", -- Anselm (Gridania: Adv. Guild) + [1001957] = "defaultTalkWithPukumoogle_001", -- <<>> Plush Moogle (West Shroud: Crimson Bark) --[1002090] = "defaultTalkWithStewart_001", -- Serpent Private Hodder (Gridania: Adv. Guild) defaultTalkWithStewart_002 (Post-Raid dialog?) - Will not fire, not PplStd. --[1002091] = "defaultTalkWithTrisselle_001", -- Serpent Private Daurement (Gridania: Adv. Guild) defaultTalkWithTrisselle_002 (No idea for context) - 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 + [1060039] = "defaultTalkWithJehantel_001", -- <<>> Jehantel (South Shroud: Tranquil Paths) BRD Job NPC - defaultTalkWithJehantel_002 + [1060043] = "defaultTalkWithLegendBsm_001", -- <<>> Gerolt (East Shroud: Hawthorne Hut) - Arg1 controls which line of dialog he plays, otherwise nothing shows --[1060022] = "defaultTalkLouisoix_001", -- Louisoix (Gridania: Apkallus Falls) - Will not fire, not PplStd. + [1200121] = "bookTalk", -- <<>> Dusty Tomes (Gridania: CNJ Guild) - Will not fire since it isn't PplStd. Identical dialog regardless. [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. + [1500060] = "defaultTalkWithHonoroit_001", -- <<>> Honoroit (Central Shroud) - Hangs around (-200, 5, -810), has an untargetable chocobo carriage behind + --[1500061] = "defaultTalkWithFhrudhem_001", -- Fruhdhem [function typo] (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) + [1700038] = "defaultTalkWithAUBRENARD_100" -- Aubrenard (Gridania: Shaded Bower) + } --[[ TO:DO - Map the remainder of these +defaultTalkWithAstrelle_001 -- "Astrelle" actor/name exists (1000736), but function calls blank dialog. Unused? Perhaps Quest-only actor? +defQuest1g0_Bush -- Empty function, unused? Perhaps Quest-only actor? +defQuest1g1_Bush -- Empty function, unused? Perhaps Quest-only actor? + + +defaultTalkWithYonariumnari_001 -- "Yonari Umnari" actor/name exists (1000838), but cannot find existence of the npc or dialog on the internet. +defaultTalkWithMoogle010_001 -- No idea what moogles these are tied too. +defaultTalkWithMoogle002_001 -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 -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 -defaultTalkWithInn_Desk defaultTalkWithInn_ExitDoor defaultTalkWithExit01 -defaultTalkWithLegendBsm_001 arg1 defaultTalkWithMarketNpc defaultTalkWithHamletGuardGri_001 --]] @@ -231,26 +211,72 @@ defaultTalkWithHamletGuardGri_001 function onTalk(player, quest, npc, eventName) local npcId = npc:GetActorClassId(); - local clientFunc = defaultTalkFst[npcId]; + local clientFunc = defaultTalkFst[npcId]; if (npcId == 1000430) then -- Nonco Menanco callClientFunction(player, "delegateEvent", player, quest, clientFunc, 21); + elseif (npcId == 1000458) then -- V'korolon (Inn NPC) + if (player:IsQuestCompleted(110828)) then -- "Waste Not Want Not" completed. + defaultTalkWithInn(player, quest, "defaultTalkWithInn_Desk"); + else + callClientFunction(player, "delegateEvent", player, quest, clientFunc); + end + elseif (npcId == 1000669) then -- Jajajbygo + callClientFunction(player, "delegateEvent", player, quest, clientFunc, 20); + elseif (npcId == 1000670) then -- Pepeli + callClientFunction(player, "delegateEvent", player, quest, clientFunc, 20); elseif (npcId == 1001430) then -- Kinnison callClientFunction(player, "delegateEvent", player, quest, clientFunc, -1,-1); + elseif (npcId == 1001642) then -- Ronan Kognan + callClientFunction(player, "delegateEvent", player, quest, clientFunc) -- Called if no deaspected crystals on player? + --[[ + defaultTalkWithRonanKognan_002(bool1, bool2) -- Called if any deaspected crystals on player? bool1=Has enough deaspected for buying helmet bool2=already has helmet dialog + defaultTalkWithRonanKognan_Hint_00 -- Lore dialog likely called in order as you make transactions with the npc? + defaultTalkWithRonanKognan_Hint_01 + defaultTalkWithRonanKognan_Hint_02 + defaultTalkWithRonanKognan_Hint_03 + defaultTalkWithRonanKognan_Hint_04 + --]] + elseif (npcId == 1001936) then -- Pukno Poki + callClientFunction(player, "delegateEvent", player, quest, clientFunc); --defaultTalkWithPukno_002 -- Used after unlocking BRD? + elseif (npcId == 1060039) then -- Jehantel + callClientFunction(player, "delegateEvent", player, quest, clientFunc); --defaultTalkWithJehantel_002 -- Post-BRD unlock? + elseif (npcId == 1060043) then -- Gerolt + callClientFunction(player, "delegateEvent", player, quest, clientFunc, 1); elseif ((npcId >= 1002106) and (npcId <= 1002108)) then -- Foundation Day 2012 NPCs talkWithSpecial(player, npcId, clientFunc) else - callClientFunction(player, "delegateEvent", player, quest, clientFunc); + callClientFunction(player, "delegateEvent", player, quest, clientFunc); end - player:EndEvent(); + player:EndEvent(); end function IsQuestENPC(player, quest, npc) - return defaultTalkFst[npc:GetActorClassId()] ~= nil; + return defaultTalkFst[npc:GetActorClassId()] ~= nil; end + +function defaultTalkWithInn(player, quest, clientFunc) + local choice = callClientFunction(player, "delegateEvent", player, quest, clientFunc); + + 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 +end + + + + + function talkWithSpecial(player, npcId, clientFunc) local splQuest = GetStaticActor("Spl000"); local magickedPrism = 0; From b34f214e672a40087093b1ea0d2dd933f77c4550 Mon Sep 17 00:00:00 2001 From: CuriousJorge Date: Sun, 13 Mar 2022 17:45:10 -0400 Subject: [PATCH 12/17] Quests + Minor fixes MarketEntrance - Adjusted events parameter so it works again Warp - Added shortcut for switching between a given town's zones so I can stop having to look up the right zone id Weather - Added shortcut for weather ids to +8000 to the value if the're within a certain range. DftSea - Inn NPC check etc5u0 - Used a constant in place of a value, updated a constant's name. etc5l0 - Fully scripted. etc5u1 - Mostly scripted. Requires Dream handling and privArea + NPC placement. etc5g1 - Mostly scripted. Requires Dream handling and privArea + NPC placement. --- .../base/chara/npc/object/MarketEntrance.lua | 4 +- Data/scripts/commands/gm/warp.lua | 21 ++ Data/scripts/commands/gm/weather.lua | 6 + Data/scripts/quests/dft/DftSea.lua | 8 +- Data/scripts/quests/etc/etc5g1.lua | 182 ++++++++++++++++++ Data/scripts/quests/etc/etc5l0.lua | 104 ++++++++++ Data/scripts/quests/etc/etc5u0.lua | 8 +- Data/scripts/quests/etc/etc5u1.lua | 164 ++++++++++++++++ 8 files changed, 489 insertions(+), 8 deletions(-) create mode 100644 Data/scripts/quests/etc/etc5g1.lua create mode 100644 Data/scripts/quests/etc/etc5l0.lua create mode 100644 Data/scripts/quests/etc/etc5u1.lua diff --git a/Data/scripts/base/chara/npc/object/MarketEntrance.lua b/Data/scripts/base/chara/npc/object/MarketEntrance.lua index e157a777..0f4bb6b3 100644 --- a/Data/scripts/base/chara/npc/object/MarketEntrance.lua +++ b/Data/scripts/base/chara/npc/object/MarketEntrance.lua @@ -84,7 +84,7 @@ city = { -function onEventStarted(player, npc, triggerName) +function onEventStarted(player, npc, eventType, eventName) local npcCity = city[npc:GetActorClassId()] or 1; local wardPlaceName = CITY_INFO[npcCity][1]; -- Market Wards category name. Identical in all languages except Japanese @@ -98,7 +98,7 @@ function onEventStarted(player, npc, triggerName) local worldMaster = GetWorldMaster(); local pos = player:GetPos(); - local currZone = pos[4]; + local currZone = pos[5]; if (currZone == 133 or currZone == 230 or currZone == 155 or currZone == 206 or currZone == 175 or currZone == 209) then exitPlaceName = 0; -- If in city, hide city menu option diff --git a/Data/scripts/commands/gm/warp.lua b/Data/scripts/commands/gm/warp.lua index 4ebe9af6..dd22653d 100644 --- a/Data/scripts/commands/gm/warp.lua +++ b/Data/scripts/commands/gm/warp.lua @@ -62,6 +62,27 @@ function onTrigger(player, argc, p1, p2, p3, p4, privateArea, privateAreaType, n worldManager:DoZoneChange(player, zone, privateArea, tonumber(privateAreaType), 0x02, x, y, z, 0.00); end + elseif (argc == 1) then -- Switch city zone + + local commands = { ["SWITCH"] = 1, ["S"] = 1, ["FLIP"] = 1, ["F"] = 1, ["TOWN"] = 1}; + + if (commands[string.upper(p1)]) then + local zones = { + [133] = {133, 230}, + [155] = {155, 206}, + [175] = {175, 209}, + [206] = {206, 155}, + [209] = {209, 175}, + [230] = {230, 133} + } + + if (player_zone == zones[player_zone][1]) then + worldManager:DoZoneChange(player, zones[player_zone][2], "", 0, 0x02, player_x, player_y, player_z, player_rot); + player:SendMessage(messageID, sender, string.format("setting coordinates X:%d Y:%d Z:%d to new zone (%d) private area:%s", player_x, player_y, player_z, zones[player_zone][2], privateArea or "unspecified")); + end + else + player:SendMessage(messageID, sender, "Unknown parameters! Usage: "..properties.description); + end else player:SendMessage(messageID, sender, "Unknown parameters! Usage: "..properties.description); end; diff --git a/Data/scripts/commands/gm/weather.lua b/Data/scripts/commands/gm/weather.lua index 5bfae4da..adbfd16d 100644 --- a/Data/scripts/commands/gm/weather.lua +++ b/Data/scripts/commands/gm/weather.lua @@ -21,6 +21,12 @@ function onTrigger(player, argc, weather, updateTime, zonewide) weather = tonumber(weather) or 0; updateTime = tonumber(updateTime) or 0; zonewide = tonumber(zonewide) or 0; + + if (weather > 0 and weather < 82) then + weather = weather + 8000; + end + + message = string.format("changed weather to %u ", weather); if zonewide ~= 0 then diff --git a/Data/scripts/quests/dft/DftSea.lua b/Data/scripts/quests/dft/DftSea.lua index d9956caf..80acbd19 100644 --- a/Data/scripts/quests/dft/DftSea.lua +++ b/Data/scripts/quests/dft/DftSea.lua @@ -59,7 +59,7 @@ local defaultTalkSea = { [1000164] = "defaultTalkWithFaucillien_001", -- Faucillien (Limsa Upper Decks: FSH Guild) - Will not fire, not PplStd [1000165] = "defaultTalkWithLouviaune_001", -- Louviaune (Limsa Upper Decks: FSH Guild) - Will not fire, not PplStd [1000166] = "defaultTalkWithUrsulie_001", -- Ursulie (Limsa Upper Decks: Adv. Guild) - Will not fire, not PplStd. Retainer NPC - [1000167] = "defaultTalkWithInn_Desk", -- Mytesyn (Limsa Upper Decks: Adv. Guild) defaultTalkWithMytesyn_001 (Pre-Inn dialog.) + [1000167] = "defaultTalkWithMytesyn_001", -- Mytesyn (Limsa Upper Decks: Adv. Guild) defaultTalkWithInn_Desk - used when Inn unlocked [1000168] = "defaultTalkWithPrudentia_001", -- Prudentia (Limsa Upper Decks: CUL Guild) [1000169] = "defaultTalkWithPulmia_001", -- Pulmia (Limsa Upper Decks: CUL Guild) [1000170] = "defaultTalkWithRsushmo_001", -- R'sushmo (Limsa Upper Decks: CUL Guild) @@ -260,7 +260,11 @@ function onTalk(player, quest, npc, eventName) local clientFunc = defaultTalkSea[npcId]; if (npcId == 1000167) then -- Mytesyn - Inn NPC - defaultTalkWithInn(player, quest, clientFunc); + if (player:IsQuestCompleted(110838)) then -- "The Ink Thief" completed. + defaultTalkWithInn(player, quest, "defaultTalkWithInn_Desk"); + else + callClientFunction(player, "delegateEvent", player, quest, clientFunc); + end else callClientFunction(player, "delegateEvent", player, quest, clientFunc); end diff --git a/Data/scripts/quests/etc/etc5g1.lua b/Data/scripts/quests/etc/etc5g1.lua new file mode 100644 index 00000000..5980b84e --- /dev/null +++ b/Data/scripts/quests/etc/etc5g1.lua @@ -0,0 +1,182 @@ +require("global"); + +--[[ + +Quest Script + +Name: In Plain Sight +Code: Etc5g1 +Id: 110829 +Prereq: Level 15. Etc5u1 (The Usual Suspect) completed. +Notes: + +]] + +-- Sequence Numbers +SEQ_000 = 0; +SEQ_010 = 10; + +-- Actor Class Ids +OTOPA_POTTOPA = 1000864; +VKOROLON = 1000458; +NICOLIAUX = 1000409; +POWLE = 1000238; +AUNILLIE = 1000410; +GAUWYN_THE_GANNET = 1002065; +HILDIBRAND = 1002067; +NASHU_MHAKARACCA = 1001996; +PRIVATE_AREA_ENTRANCE = 0; +PRIVATE_AREA_EXIT = 0; + +-- DefaultTalk NPCs? +SANSA = 1000239; +ELYN = 1000411; +RYD = 1000412; + +-- Quest Markers +MRKR_ACORN_ORCHARD = 11082101; +MRKR_NICOLIAUX = 11082102; +MRKR_VKOROLON = 11082103; + + +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(OTOPA_POTTOPA, QFLAG_NORM); -- TO-DO: Check player inventory for quest-specific item before flagging? + quest:SetENpc(VKOROLON, QFLAG_NORM); -- Always shows despite interaction + end + + if (sequence == SEQ_000) then + quest:SetENpc(VKOROLON); + quest:SetENpc(NICOLIAUX, QFLAG_NORM); + quest:SetENpc(POWLE); + quest:SetENpc(AUNILLIE); + quest:SetENpc(GAUWYN_THE_GANNET); + quest:SetENpc(HILDIBRAND); + quest:SetENpc(NASHU_MHAKARACCA); + quest:SetENPC(PRIVATE_AREA_ENTRANCE, QFLAG_MAP, false, true) + quest:SetENpc(PRIVATE_AREA_EXIT, QFLAG_NONE, false, true); + + elseif (sequence == SEQ_010) then + quest:SetENpc(VKOROLON, QFLAG_REWARD); + quest:SetENpc(NICOLIAUX); + quest:SetENpc(POWLE); + quest:SetENpc(AUNILLIE); + quest:SetENpc(GAUWYN_THE_GANNET); + quest:SetENpc(HILDIBRAND); + quest:SetENpc(NASHU_MHAKARACCA); + quest:SetENpc(PRIVATE_AREA_EXIT, QFLAG_NONE, false, true); + end +end + +function onTalk(player, quest, npc) + local sequence = quest:getSequence(); + local classId = npc:GetActorClassId(); + + if (sequence == SEQ_ACCEPT) then + if (classId == OTOPA_POTTOPA) then + callClientFunction(player, "delegateEvent", player, quest, "processEventOTOPAPOTTOPAStart"); + giveWantedItem(player); + elseif (classId == VKOROLON) then + -- This retail accurate. No dialog functions called. + player:SendGameMessage(player, GetWorldMaster(), 51148, MESSAGE_TYPE_SYSTEM, 10011243, 2075); + end + + elseif (sequence == SEQ_000) then + if (classId == VKOROLON) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent_000_1"); -- This is a guess. + elseif (classId == NICOLIAUX) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent_010") + attentionMessage(player, 25225, quest.GetQuestId()); -- objectives complete! + quest:UpdateENPCs(); -- Band-aid for a QFLAG_NORM issue + quest:StartSequence(SEQ_010); + elseif (classId == GAUWYN_THE_GANNET) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent_010_2"); + elseif (classId == HILDIBRAND) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent_010_3"); + elseif (classId == NASHU_MHAKARACCA) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent_010_4"); + elseif (classId == AUNILLIE) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent_010_5"); -- This is a guess. + elseif (classId == POWLE) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent_010_6"); -- This is a guess. + + end + elseif (sequence == SEQ_010) then + if (classId == VKOROLON) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent_020"); + callClientFunction(player, "delegateEvent", player, quest, "sqrwa", 500, 1, 1); + player:CompleteQuest(quest); + player:SendGameMessage(player, GetWorldMaster(), 51148, MESSAGE_TYPE_SYSTEM, 10011243, 1070); -- Log out in The Mizzenmast Inn w/ item. + elseif (classId == NICOLIAUX) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent_010_1") -- This is a guess. + elseif (classId == GAUWYN_THE_GANNET) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent_010_2"); + elseif (classId == HILDIBRAND) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent_010_3"); + elseif (classId == NASHU_MHAKARACCA) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent_010_4"); + elseif (classId == AUNILLIE) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent_010_5"); -- This is a guess. + elseif (classId == POWLE) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent_010_6"); -- This is a guess. + end + end + + player:EndEvent() + quest:UpdateENPCs(); +end + + +function onPush(player, quest, npc) + local npcClassId = npc.GetActorClassId(); + + player:EndEvent(); + if (npcClassId == PRIVATE_AREA_ENTRANCE) then + GetWorldManager():WarpToPrivateArea(player, "PrivateAreaMasterPast", 9999); + elseif (npcClassId == PRIVATE_AREA_EXIT) then + GetWorldManager():WarpToPublicArea(player); + end +end + + + +function getJournalInformation(player, quest) +end + + +function getJournalMapMarkerList(player, quest) + local sequence = quest:getSequence(); + + if (sequence == SEQ_000) then + return MRKR_ACORN_ORCHARD; -- TO-DO: Check for private area and use MRKR_NICOLIAUX in place of this + elseif (sequence == SEQ_010) then + return MRKR_VKOROLON; + end +end + + +function giveWantedItem(player) + + local invCheck = player:getItemPackage(INVENTORY_NORMAL):addItem(ITEM_WANTED_GAUWYN, 1, 1); + + if (invCheck == INV_ERROR_FULL) then + -- Your inventory is full. + player:SendGameMessage(player, GetWorldMaster(), 60022, MESSAGE_TYPE_SYSTEM_ERROR); + elseif (invCheck == INV_ERROR_ALREADY_HAS_UNIQUE) then + -- You cannot have more than one in your possession at any given time. + player:SendGameMessage(player, GetWorldMaster(), 40279, MESSAGE_TYPE_SYSTEM_ERROR, ITEM_WANTED_GAUWYN, 1); + elseif (invCheck == INV_ERROR_SYSTEM_ERROR) then + player:SendMessage(MESSAGE_TYPE_SYSTEM, "", "[DEBUG] Server Error on adding item."); + elseif (invCheck == INV_ERROR_SUCCESS) then + player:SendGameMessage(player, GetWorldMaster(), 25246, MESSAGE_TYPE_SYSTEM_ERROR, ITEM_WANTED_GAUWYN, 1); + player:SendGameMessage(player, GetWorldMaster(), 51148, MESSAGE_TYPE_SYSTEM, 10011243, 3071); -- Log out in The Hourglass w/ item. + end +end \ No newline at end of file diff --git a/Data/scripts/quests/etc/etc5l0.lua b/Data/scripts/quests/etc/etc5l0.lua new file mode 100644 index 00000000..a5042f5d --- /dev/null +++ b/Data/scripts/quests/etc/etc5l0.lua @@ -0,0 +1,104 @@ +require("global"); + +--[[ + +Quest Script + +Name: The Ink Thief +Code: Etc5l0 +Id: 110838 +Prereq: Level 1 on any class. Second MSQ completed. (110002 Man0l1 / 110006 Man0g1 / 110010 Man0u1) +Notes: + +]] + +-- Sequence Numbers +SEQ_000 = 0; -- Talk to Sweetnix. +SEQ_001 = 1; -- Return to Mytesyn. + +-- Actor Class Ids +MYTESYN = 1000167; +SWEETNIX = 1001573; + +-- Quest Item +ITEM_INKWELL = 11000223; + +-- Quest Markers +MRKR_SWEETNIX = 11072001; +MRKR_MYTESYN = 11072002; + + +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(MYTESYN, QFLAG_NORM); + end + + if (sequence == SEQ_000) then + quest:SetENpc(MYTESYN); + quest:SetENpc(SWEETNIX, QFLAG_NORM); + elseif (sequence == SEQ_001) then + quest:SetENpc(MYTESYN, QFLAG_REWARD); + quest:SetENpc(SWEETNIX); + end +end + +function onTalk(player, quest, npc) + local sequence = quest:getSequence(); + local npcClassId = npc:GetActorClassId(); + + if (sequence == SEQ_ACCEPT) then + local questAccepted = callClientFunction(player, "delegateEvent", player, quest, "processEventMYTESYNStart"); + if (questAccepted == 1) then + player:AcceptQuest(quest); + end + player:EndEvent(); + return; + elseif (sequence == SEQ_000) then + if (npcClassId == MYTESYN) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent_000_1"); + elseif (npcClassId == SWEETNIX) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent_010"); + attentionMessage(player, 25246, ITEM_INKWELL, 1); + attentionMessage(player, 25225, quest:GetQuestId()); + quest:StartSequence(SEQ_001); + end + + elseif (sequence == SEQ_001) then + if (npcClassId == MYTESYN) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent_020"); + callClientFunction(player, "delegateEvent", player, quest, "sqrwa", 200,1 ,1) + player:CompleteQuest(quest); + elseif (npcClassId == SWEETNIX) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent_010_1"); + end + end + player:EndEvent() + quest:UpdateENPCs(); +end + +function getJournalInformation(player, quest) + local sequence = quest:getSequence(); + if (sequence == SEQ_001) then + return ITEM_INKWELL; + end +end + +function getJournalMapMarkerList(player, quest) + local sequence = quest:getSequence(); + + if (sequence == SEQ_000) then + return MRKR_SWEETNIX; + elseif (sequence == SEQ_001) then + return MRKR_MYTESYN; + end +end + + + diff --git a/Data/scripts/quests/etc/etc5u0.lua b/Data/scripts/quests/etc/etc5u0.lua index f4e5b108..60433e57 100644 --- a/Data/scripts/quests/etc/etc5u0.lua +++ b/Data/scripts/quests/etc/etc5u0.lua @@ -35,11 +35,11 @@ end function onStateChange(player, quest, sequence) - if (sequence == 65535) then - quest:SetENpc(OTOPA_POTTOPA, QFLAG_PLATE); + if (sequence == SEQ_ACCEPT) then + quest:SetENpc(OTOPA_POTTOPA, QFLAG_NORM); elseif (sequence == SEQ_000) then quest:SetENpc(OTOPA_POTTOPA); - quest:SetENpc(JUDITHE, QFLAG_PLATE); + quest:SetENpc(JUDITHE, QFLAG_NORM); elseif (sequence == SEQ_001) then quest:SetENpc(OTOPA_POTTOPA, QFLAG_REWARD); quest:SetENpc(JUDITHE); @@ -50,7 +50,7 @@ function onTalk(player, quest, npc) local sequence = quest:getSequence(); local classId = npc:GetActorClassId(); - if (sequence == 65535) then + if (sequence == SEQ_ACCEPT) then if (classId == OTOPA_POTTOPA) then local questAccepted = callClientFunction(player, "delegateEvent", player, quest, "processEventOTOPAPOTTOPAStart"); diff --git a/Data/scripts/quests/etc/etc5u1.lua b/Data/scripts/quests/etc/etc5u1.lua new file mode 100644 index 00000000..9e21becd --- /dev/null +++ b/Data/scripts/quests/etc/etc5u1.lua @@ -0,0 +1,164 @@ +require("global"); + +--[[ + +Quest Script + +Name: The Usual Suspect +Code: Etc5u1 +Id: 110849 +Prereq: Level 15. [110828 Etc5g0 / 110838 Etc5l0 / 110848 Etc5u0] +Notes: Rewards 500 exp + +]] + +-- Sequence Numbers +SEQ_000 = 0; +SEQ_010 = 10; + +-- Actor Class Ids +OTOPA_POTTOPA = 1000864; +GAUWYN_THE_GANNET = 1002065; +HILDIBRAND = 1001995; +NASHU_MHAKARACCA = 1001996; +PRIVATE_AREA_ENTRANCE = 0; +PRIVATE_AREA_EXIT = 0; + +-- DefaultTalk NPCs? +UBOKHN = 1000668; +VANNES = 1001464; +XDHILOGO = 1001466; +DARIUSTEL = 1001467; +GUENCEN = 1001468; + +-- Quest Items +ITEM_WANTED_GAUWYN = 10011243; + +-- Quest Markers +MRKR_COLISEUM = 11092101; +MRKR_GAUWYN = 11092102; +MRKR_OTOPA_POTTOPA = 11092103; + + + +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(OTOPA_POTTOPA, QFLAG_NORM); -- TO-DO: Check player inventory for quest-specific item before flagging? + end + + if (sequence == SEQ_000) then + quest:SetENpc(OTOPA_POTTOPA); + quest:SetENpc(GAUWYN_THE_GANNET, QFLAG_NORM); + quest:SetENpc(HILDIBRAND); + quest:SetENpc(NASHU_MHAKARACCA); + quest:SetENPC(PRIVATE_AREA_ENTRANCE, QFLAG_MAP, false, true) + quest:SetENpc(PRIVATE_AREA_EXIT, QFLAG_NONE, false, true); + elseif (sequence == SEQ_010) then + quest:SetENpc(OTOPA_POTTOPA, QFLAG_REWARD); + quest:SetENpc(GAUWYN_THE_GANNET); + quest:SetENpc(HILDIBRAND); + quest:SetENpc(NASHU_MHAKARACCA); + quest:SetENpc(PRIVATE_AREA_EXIT, QFLAG_NONE, false, true); + end +end + +function onTalk(player, quest, npc) + local sequence = quest:getSequence(); + local classId = npc:GetActorClassId(); + + if (sequence == SEQ_ACCEPT) then + if (classId == OTOPA_POTTOPA) then + -- TO-DO: Add inventory check here? + callClientFunction(player, "delegateEvent", player, quest, "processEventOTOPAPOTTOPAStart"); + giveWantedItem(player); + --processEventOTOPAPOTTOPAStart_2 + end + + elseif (sequence == SEQ_000) then + if (classId == OTOPA_POTTOPA) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent_000_1"); + elseif (classId == GAUWYN_THE_GANNET) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent_010"); + attentionMessage(player, 25225, quest.GetQuestId()); -- objectives complete! + quest:UpdateENPCs(); -- Band-aid for a QFLAG_NORM issue + quest:StartSequence(SEQ_010); + elseif (classId == HILDIBRAND) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent_010_1"); + elseif (classId == NASHU_MHAKARACCA) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent_010_2"); + end + + elseif (sequence == SEQ_010) then + if (classId == HILDIBRAND) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent_010_1"); + elseif (classId == NASHU_MHAKARACCA) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent_010_2"); + elseif (classId == GAUWYN_THE_GANNET) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent_010_3"); + elseif (classId == OTOPA_POTTOPA) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent_020"); + callClientFunction(player, "delegateEvent", player, quest, "sqrwa", 500, 1, 1); + player:CompleteQuest(quest); + player:SendGameMessage(player, GetWorldMaster(), 51148, MESSAGE_TYPE_SYSTEM, 10011243, 2075); -- Log out in The Roost w/ item. + end + end + + player:EndEvent() + quest:UpdateENPCs(); +end + + +function onPush(player, quest, npc) + local npcClassId = npc.GetActorClassId(); + + player:EndEvent(); + if (npcClassId == PRIVATE_AREA_ENTRANCE) then + -- TO-DO: Needs spawn coordinates + Private Area arranged + GetWorldManager():WarpToPrivateArea(player, "PrivateAreaMasterPast", 9999); + elseif (npcClassId == PRIVATE_AREA_EXIT) then + GetWorldManager():WarpToPublicArea(player); + end +end + + + +function getJournalInformation(player, quest) +end + + +function getJournalMapMarkerList(player, quest) + local sequence = quest:getSequence(); + + if (sequence == SEQ_000) then + return MRKR_COLISEUM -- TO-DO: Add a check for that specific private area and have it return MRKR_GAUWYN? + elseif (sequence == SEQ_010) then + return MRKR_OTOPA_POTTOPA + end +end + + +function giveWantedItem(player) + + local invCheck = player:getItemPackage(INVENTORY_NORMAL):addItem(ITEM_WANTED_GAUWYN, 1, 1); + + if (invCheck == INV_ERROR_FULL) then + -- Your inventory is full. + player:SendGameMessage(player, GetWorldMaster(), 60022, MESSAGE_TYPE_SYSTEM_ERROR); + elseif (invCheck == INV_ERROR_ALREADY_HAS_UNIQUE) then + -- You cannot have more than one in your possession at any given time. + player:SendGameMessage(player, GetWorldMaster(), 40279, MESSAGE_TYPE_SYSTEM_ERROR, ITEM_WANTED_GAUWYN, 1); + elseif (invCheck == INV_ERROR_SYSTEM_ERROR) then + player:SendMessage(MESSAGE_TYPE_SYSTEM, "", "[DEBUG] Server Error on adding item."); + elseif (invCheck == INV_ERROR_SUCCESS) then + player:SendGameMessage(player, GetWorldMaster(), 25246, MESSAGE_TYPE_SYSTEM_ERROR, ITEM_WANTED_GAUWYN, 1); + player:SendGameMessage(player, GetWorldMaster(), 51148, MESSAGE_TYPE_SYSTEM, 10011243, 3071); -- Log out in The Hourglass w/ item. + end +end \ No newline at end of file From b08827568c871eb14fea0b356f55cd76965f8e5d Mon Sep 17 00:00:00 2001 From: CuriousJorge Date: Sun, 13 Mar 2022 18:26:20 -0400 Subject: [PATCH 13/17] Chocobo stuff: PopulaceChocoboLender - Made rental time 10 minutes again (as retail had it). Added Vesper Bay NPC's rental location as close as I could get it from a blurry source. ChocoboRideCommand - Fixed the method used to pull a zone's music so the script doesn't fail. --- .../base/chara/npc/populace/PopulaceChocoboLender.lua | 5 +++-- Data/scripts/commands/ChocoboRideCommand.lua | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Data/scripts/base/chara/npc/populace/PopulaceChocoboLender.lua b/Data/scripts/base/chara/npc/populace/PopulaceChocoboLender.lua index a4000a36..0ac4f0a9 100644 --- a/Data/scripts/base/chara/npc/populace/PopulaceChocoboLender.lua +++ b/Data/scripts/base/chara/npc/populace/PopulaceChocoboLender.lua @@ -41,7 +41,8 @@ local startAppearances = { local cityExits = { [1500006] = {133, -6.032, 46.356, 132.572, 3.034}, [1500061] = {150, 333.271, 5.889, -943.275, 0.794}, - [1000840] = {170, -26.088, 181.846, -79.438, 2.579} + [1000840] = {170, -26.088, 181.846, -79.438, 2.579}, + [1500059] = {172, -2133.028, 15.476, -421.471, 1.5} }; function init(npc) @@ -110,7 +111,7 @@ function onEventStarted(player, npc, triggerName) elseif(menuChoice == 3) then -- Change Barding callClientFunction(player, "eventTalkStepBreak", player); elseif(menuChoice == 5) then -- Rent Bird - mountChocobo(player, true, 1); + mountChocobo(player, true, 10); GetWorldManager():DoZoneChange(player, cityExits[classId][1], nil, 0, SPAWN_CHOCOBO_RENTAL, cityExits[classId][2], cityExits[classId][3], cityExits[classId][4], cityExits[classId][5]); else callClientFunction(player, "eventTalkStepBreak", player); diff --git a/Data/scripts/commands/ChocoboRideCommand.lua b/Data/scripts/commands/ChocoboRideCommand.lua index 24f56ffd..01c2fba3 100644 --- a/Data/scripts/commands/ChocoboRideCommand.lua +++ b/Data/scripts/commands/ChocoboRideCommand.lua @@ -26,7 +26,7 @@ function onEventStarted(player, actor, eventType, eventName, isGoobbue) player:ChangeSpeed(0.0, 3.6, 9.0, 9.0); player:ChangeState(15); else - player:ChangeMusic(player:GetZone().bgmDay, MUSIC_FADEIN); + player:ChangeMusic(player.currentArea.bgmDay, MUSIC_FADEIN); worldMaster = GetWorldMaster(); From 74713f3dd6acb9e70c52fa110db8b149f735a6e4 Mon Sep 17 00:00:00 2001 From: CuriousJorge Date: Sun, 13 Mar 2022 20:35:29 -0400 Subject: [PATCH 14/17] Misc GM command fixes + ChangeJobCommand.lua Anim - Cleaned up some. It had old code sitting in it for whatever reason despite not affecting anything. Setstate, Warpplayer & Yolo - Fixed them up so they function again ChangeJobCommand - Just the script filled out to handle the equipping/dequipping of job stones, but it can cause issues, particularly with how the server handles a 'job' vs. a class, along with checking against skill compatibility. --- Data/scripts/commands/ChangeJobCommand.lua | 88 +++++++++++++++++++++- Data/scripts/commands/gm/anim.lua | 77 +++---------------- Data/scripts/commands/gm/setstate.lua | 8 +- Data/scripts/commands/gm/warpplayer.lua | 4 +- Data/scripts/commands/gm/yolo.lua | 12 +-- 5 files changed, 109 insertions(+), 80 deletions(-) diff --git a/Data/scripts/commands/ChangeJobCommand.lua b/Data/scripts/commands/ChangeJobCommand.lua index 930d8aa7..5cef1127 100644 --- a/Data/scripts/commands/ChangeJobCommand.lua +++ b/Data/scripts/commands/ChangeJobCommand.lua @@ -1,6 +1,90 @@ -function onEventStarted(player, caller, eventType, eventName, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8) +require("global"); +--[[ - player:SetCurrentJob(17); +ChangeJobCommand Script +Called when the player equips/unequips a job stone or uses the /job command. + +--]] + + +local classToJob = { -- [classId] = {jobId, jobAnim, jobKeyItem} + [2] = {15, 0x4000028, 2000202}, -- PGL -> MNK + [3] = {16, 0x4000029, 2000201}, -- GLD -> PLD + [4] = {17, 0x4000027, 2000203}, -- MRD -> WAR + [7] = {18, 0x400002D, 2000205}, -- ARC -> BRD + [8] = {19, 0x400002C, 2000204}, -- LNC -> DRG + [22] = {26, 0x400002B, 2000207}, -- THM -> BLM + [23] = {27, 0x400002A, 2000206}, -- CNJ -> WHM +} + +local jobToClass = { -- [jobId] = classId + [15] = 2, -- MNK -> PGL + [16] = 3, -- PLD -> GLD + [17] = 4, -- WAR -> MRD + [18] = 7, -- BRD -> ARC + [19] = 8, -- DRG -> LNC + [26] = 22, -- BLM -> THM + [27] = 23 -- WHM -> CNJ +} + + +function onEventStarted(player, command, eventType, eventName, jobState) + + local currentClass = player:GetCurrentClassOrJob(); + local jobCheck = isJob(currentClass); + local hasKeyItem = false; + + if (jobCheck == false) then + hasKeyItem = player:GetItemPackage(INVENTORY_KEYITEMS):HasItem(classToJob[currentClass][3]); + end + + if (jobCheck ~= nil) then -- Valid Class/Job ids only + if (jobState == 0) then -- Toggle current class/job state + if ((jobCheck == false) and (hasKeyItem == true)) then + setPlayerJob(player, classToJob[currentClass][1], classToJob[currentClass][2]); + elseif (jobCheck == true) then + setPlayerClass(player, jobToClass[currentClass]) + end + + elseif (jobState == 1 and (jobCheck == false) and (hasKeyItem == true)) then -- Equipping Job stone + setPlayerJob(player, classToJob[currentClass][1], classToJob[currentClass][2]); + elseif (jobState == 2 and (jobCheck == true)) then -- Removing Job stone + setPlayerClass(player, jobToClass[currentClass]); + end + end + player:EndEvent(); +end + + +function setPlayerClass(player, id) + player:SetCurrentJob(0); + player:PrepareClassChange(id); + player:DoClassChange(id); + player:PlayAnimation(0x4001030); + player:SendGameMessage(player, GetWorldMaster(), 30103, 0x20, 0, 0, player, id); +end + +function setPlayerJob(player, id, anim) + player:SetCurrentJob(id); + player:PrepareClassChange(id); + player:DoClassChange(jobToClass[id]); + player:PlayAnimation(anim); + player:SendGameMessage(player, GetWorldMaster(), 30103, 0x20, 0, 0, player, id); +end + +function isJob(id) + local validId = { + [2] = 0, [3] = 0, [4] = 0, [7] = 0, [8] = 0, [22] = 0, [23] = 0, + [15] = 1, [16] = 1, [17] = 1, [18] = 1, [19] = 1, [26] = 1, [27] = 1 + } + + if (validId[id] == 0) then + return false; + elseif (validId[id] == 1) then + return true; + else + return nil; + end end \ No newline at end of file diff --git a/Data/scripts/commands/gm/anim.lua b/Data/scripts/commands/gm/anim.lua index bf33a593..d0b092e7 100644 --- a/Data/scripts/commands/gm/anim.lua +++ b/Data/scripts/commands/gm/anim.lua @@ -12,64 +12,23 @@ Sets anim id for current target } -function onTrigger(player, argc, aType, a1, a2, uID) - --if uID == nil then uID = "test"; end - local npc = GetWorldManager():GetActorInWorld(player.currentTarget) or nil; - --npc = GetWorldManager():GetActorInWorldByUniqueId(uID); - - --[[ if argc == 1 then - -- aType = tonumber(aType, 16) or 0; - if aType > 4294967295 then - - player:SendMessage(0x20, "[anim] ", "Error: Value too large"); - return; - else - player:PlayAnimation(aType); - end - else--]] - - aType = tonumber(aType) or 0; - a1 = tonumber(a1) or 0; - a2 = tonumber(a2) or 1; - - - a1 = bit32.band(a1, 0xFFF); - a2 = bit32.band(a2, 0xFFF); - aType = bit32.band(aType, 0xFF); - - animId = bit32.bor(bit32.lshift(a2, 12), a1); - animId = bit32.bor(bit32.lshift(aType, 24), animId); - print(animId); - - --[[ - if npc == nil then - player:PlayAnimation(animId); - else - npc:PlayAnimation(animId); - end - --]] +function onTrigger(player, argc, aType, a1, a2) + local actor = player.CurrentArea.FindActorInArea(player.currentTarget) or nil; - if player and actor then - - + if (player and actor) then a1 = bit32.band(a1, 0xFFF); a2 = bit32.band(a2, 0xFFF); aType = bit32.band(aType, 0xFF); animId = bit32.bor(bit32.lshift(a2, 12), a1); animId = bit32.bor(bit32.lshift(aType, 24), animId); - -- player:SendMessage(0x20, "[anim] ", tostring(animId)); + -- player:SendMessage(0x20, "[anim] ", tostring(animId)); actor:PlayAnimation(animId); - local output = string.format("%x", animId) + local output = string.format("%x", animId) player:SendMessage(0x20, "[anim] ", "0x"..tostring(output).. " Target:"..tostring(actor)); - - - end; - - - -end; + end +end --[[ Categories: @@ -96,9 +55,11 @@ end; 33 = ? 34 = Crash - 120 = ??? + +Notes: +------ CATEGORY Shift 18 bits right CMP 0xB @@ -123,24 +84,6 @@ CMP 71 ec000000 00FFFFFF -BTL: -ETC: -GL2: -KAO: - -MGK: 01 -SYS: 02 -LIB: 046 -ITM: 05-09 -GL?: 0B -GL1: 0C -CBI: 0D -ABL: 0E -POP: 0F -CFT: 10 -PIC: 14 -WSC: 12 - 19: Auto Attack? 6F: Casting 71: Seems to deal with signaling monster parts diff --git a/Data/scripts/commands/gm/setstate.lua b/Data/scripts/commands/gm/setstate.lua index cfff2cb0..c6e1b091 100644 --- a/Data/scripts/commands/gm/setstate.lua +++ b/Data/scripts/commands/gm/setstate.lua @@ -15,10 +15,12 @@ function onTrigger(player, argc, state) local sender = "[setstate] "; local s = tonumber(state); - local actor = GetWorldManager():GetActorInWorld(player.currentTarget) or nil; + local actor = player.CurrentArea:FindActorInArea(player.currentTarget) or nil; if player and actor then actor:ChangeState(s); - wait(0.8); - player:SendMessage(0x20, "", "state: "..s); + wait(0.8); + player:SendMessage(0x20, "", "state: "..s); + else + player:SendMessage(0x20, "", "Error: No target selected."); end; end; \ No newline at end of file diff --git a/Data/scripts/commands/gm/warpplayer.lua b/Data/scripts/commands/gm/warpplayer.lua index 297c9250..76970dd0 100644 --- a/Data/scripts/commands/gm/warpplayer.lua +++ b/Data/scripts/commands/gm/warpplayer.lua @@ -38,7 +38,7 @@ function onTrigger(player, argc, name, lastName, name2, lastName2) return; else local pos = p1:GetPos(); - worldManager:DoZoneChange(player, pos[4], nil, 0, 0x02, pos[0], pos[1], pos[2], pos[3]); + worldManager:DoZoneChange(player, pos[5], nil, 0, 0x02, pos[1], pos[2], pos[3], pos[4]); player:SendMessage(messageID, sender, string.format("Moving to %s %s 's coordinates.", name, lastName)); end; elseif argc == 4 then; @@ -50,7 +50,7 @@ function onTrigger(player, argc, name, lastName, name2, lastName2) local pos = p1:GetPos(); local pos2 = p2:GetPos(); - worldManager:DoZoneChange(p1, pos2[4], nil, 0, 0x02, pos2[0], pos2[1], pos2[2], pos2[3]); + worldManager:DoZoneChange(p1, pos2[5], nil, 0, 0x02, pos2[1], pos2[2], pos2[3], pos2[4]); player:SendMessage(messageID, sender, string.format("Moving %s %s to %s %s 's coordinates.", name, lastName, name2, lastName2)); p1:SendMessage(messageID, sender, string.format("You are being moved to %s %s 's coordinates.", name2, lastName2)); end; diff --git a/Data/scripts/commands/gm/yolo.lua b/Data/scripts/commands/gm/yolo.lua index 24f9b2a4..98471443 100644 --- a/Data/scripts/commands/gm/yolo.lua +++ b/Data/scripts/commands/gm/yolo.lua @@ -144,11 +144,11 @@ function onTrigger(player, argc, width, height, blockCount) end; local pos = player:GetPos(); - local x = tonumber(pos[0]); - local y = tonumber(pos[1]); - local z = tonumber(pos[2]); - local rot = tonumber(pos[3]); - local zone = pos[4]; + local x = tonumber(pos[1]); + local y = tonumber(pos[2]); + local z = tonumber(pos[3]); + local rot = tonumber(pos[4]); + local zone = pos[5]; local w = tonumber(width) or 0; local h = tonumber(height) or 0; @@ -160,7 +160,7 @@ function onTrigger(player, argc, width, height, blockCount) for i = 0, w do for j = 0, h do local actor = player.CurrentArea.SpawnActor(2104001, 'ass', x + (i * 1), y, z + (j * 1), rot, 0, 0, true); - --actor.ChangeNpcAppearance(2200905); + actor.ChangeNpcAppearance(2200905); actor.SetMaxHP(500); actor.SetHP(500); actor.SetMod(modifiersGlobal.CanBlock, 1); From 4494b30285b9ade2a5cf6a3aa74c648402c98e23 Mon Sep 17 00:00:00 2001 From: CuriousJorge Date: Wed, 16 Mar 2022 18:52:02 -0400 Subject: [PATCH 15/17] Quest fixes Etc5u1 & Etc5g1 - Added handling for the Ul'dah Inn NPC to re-issue an item as needed, otherwise play his other dialog. Music - Made it play current zone's music if no id present. --- Data/scripts/commands/gm/music.lua | 6 +-- Data/scripts/quests/etc/etc5g1.lua | 85 +++++++++--------------------- Data/scripts/quests/etc/etc5u1.lua | 40 ++++++++------ 3 files changed, 54 insertions(+), 77 deletions(-) diff --git a/Data/scripts/commands/gm/music.lua b/Data/scripts/commands/gm/music.lua index 0a761b14..e2445f75 100644 --- a/Data/scripts/commands/gm/music.lua +++ b/Data/scripts/commands/gm/music.lua @@ -3,15 +3,15 @@ properties = { parameters = "ss", description = [[ -Plays music to player. +Plays music to player, otherwise resets to the zone's music. +!music !music !music ]], } function onTrigger(player, argc, music, transition) - music = tonumber(music) or 0; + music = tonumber(music) or player.currentArea.bgmDay or 0; transition = tonumber(transition) or nil; - player:SendMessage(0x20, "", tostring(argc).." "..tostring(music).." "..tostring(transition)); player:ChangeMusic(music, transition); end; \ No newline at end of file diff --git a/Data/scripts/quests/etc/etc5g1.lua b/Data/scripts/quests/etc/etc5g1.lua index 5980b84e..dcfa21c1 100644 --- a/Data/scripts/quests/etc/etc5g1.lua +++ b/Data/scripts/quests/etc/etc5g1.lua @@ -33,6 +33,9 @@ SANSA = 1000239; ELYN = 1000411; RYD = 1000412; +-- Quest Items +ITEM_WANTED_GAUWYN = 10011243; + -- Quest Markers MRKR_ACORN_ORCHARD = 11082101; MRKR_NICOLIAUX = 11082102; @@ -49,30 +52,21 @@ end function onStateChange(player, quest, sequence) if (sequence == SEQ_ACCEPT) then - quest:SetENpc(OTOPA_POTTOPA, QFLAG_NORM); -- TO-DO: Check player inventory for quest-specific item before flagging? + local hasQuestItem = player:GetItemPackage(INVENTORY_NORMAL):HasItem(ITEM_WANTED_GAUWYN); + local otopaFlag = 0; + + if (hasQuestItem == false) then + otopaFlag = 2; + end + quest:SetENpc(OTOPA_POTTOPA, otopaFlag); quest:SetENpc(VKOROLON, QFLAG_NORM); -- Always shows despite interaction end if (sequence == SEQ_000) then - quest:SetENpc(VKOROLON); - quest:SetENpc(NICOLIAUX, QFLAG_NORM); - quest:SetENpc(POWLE); - quest:SetENpc(AUNILLIE); - quest:SetENpc(GAUWYN_THE_GANNET); - quest:SetENpc(HILDIBRAND); - quest:SetENpc(NASHU_MHAKARACCA); - quest:SetENPC(PRIVATE_AREA_ENTRANCE, QFLAG_MAP, false, true) - quest:SetENpc(PRIVATE_AREA_EXIT, QFLAG_NONE, false, true); + elseif (sequence == SEQ_010) then - quest:SetENpc(VKOROLON, QFLAG_REWARD); - quest:SetENpc(NICOLIAUX); - quest:SetENpc(POWLE); - quest:SetENpc(AUNILLIE); - quest:SetENpc(GAUWYN_THE_GANNET); - quest:SetENpc(HILDIBRAND); - quest:SetENpc(NASHU_MHAKARACCA); - quest:SetENpc(PRIVATE_AREA_EXIT, QFLAG_NONE, false, true); + end end @@ -82,52 +76,26 @@ function onTalk(player, quest, npc) if (sequence == SEQ_ACCEPT) then if (classId == OTOPA_POTTOPA) then - callClientFunction(player, "delegateEvent", player, quest, "processEventOTOPAPOTTOPAStart"); - giveWantedItem(player); + local hasQuestItem = player:GetItemPackage(INVENTORY_NORMAL):HasItem(ITEM_WANTED_GAUWYN); + + if (not hasQuestItem) then + callClientFunction(player, "delegateEvent", player, quest, "processEventOTOPAPOTTOPAStart"); + giveWantedItem(player); + npc:SetQuestGraphic(player, QFLAG_NONE); + else + callClientFunction(player, "delegateEvent", player, quest, "processEventOTOPAPOTTOPAStart_2"); + end + player:SendGameMessage(player, GetWorldMaster(), 51148, MESSAGE_TYPE_SYSTEM, 10011243, 2075); -- Log out in The Roost w/ item. + elseif (classId == VKOROLON) then -- This retail accurate. No dialog functions called. player:SendGameMessage(player, GetWorldMaster(), 51148, MESSAGE_TYPE_SYSTEM, 10011243, 2075); end elseif (sequence == SEQ_000) then - if (classId == VKOROLON) then - callClientFunction(player, "delegateEvent", player, quest, "processEvent_000_1"); -- This is a guess. - elseif (classId == NICOLIAUX) then - callClientFunction(player, "delegateEvent", player, quest, "processEvent_010") - attentionMessage(player, 25225, quest.GetQuestId()); -- objectives complete! - quest:UpdateENPCs(); -- Band-aid for a QFLAG_NORM issue - quest:StartSequence(SEQ_010); - elseif (classId == GAUWYN_THE_GANNET) then - callClientFunction(player, "delegateEvent", player, quest, "processEvent_010_2"); - elseif (classId == HILDIBRAND) then - callClientFunction(player, "delegateEvent", player, quest, "processEvent_010_3"); - elseif (classId == NASHU_MHAKARACCA) then - callClientFunction(player, "delegateEvent", player, quest, "processEvent_010_4"); - elseif (classId == AUNILLIE) then - callClientFunction(player, "delegateEvent", player, quest, "processEvent_010_5"); -- This is a guess. - elseif (classId == POWLE) then - callClientFunction(player, "delegateEvent", player, quest, "processEvent_010_6"); -- This is a guess. - - end + elseif (sequence == SEQ_010) then - if (classId == VKOROLON) then - callClientFunction(player, "delegateEvent", player, quest, "processEvent_020"); - callClientFunction(player, "delegateEvent", player, quest, "sqrwa", 500, 1, 1); - player:CompleteQuest(quest); - player:SendGameMessage(player, GetWorldMaster(), 51148, MESSAGE_TYPE_SYSTEM, 10011243, 1070); -- Log out in The Mizzenmast Inn w/ item. - elseif (classId == NICOLIAUX) then - callClientFunction(player, "delegateEvent", player, quest, "processEvent_010_1") -- This is a guess. - elseif (classId == GAUWYN_THE_GANNET) then - callClientFunction(player, "delegateEvent", player, quest, "processEvent_010_2"); - elseif (classId == HILDIBRAND) then - callClientFunction(player, "delegateEvent", player, quest, "processEvent_010_3"); - elseif (classId == NASHU_MHAKARACCA) then - callClientFunction(player, "delegateEvent", player, quest, "processEvent_010_4"); - elseif (classId == AUNILLIE) then - callClientFunction(player, "delegateEvent", player, quest, "processEvent_010_5"); -- This is a guess. - elseif (classId == POWLE) then - callClientFunction(player, "delegateEvent", player, quest, "processEvent_010_6"); -- This is a guess. - end + end player:EndEvent() @@ -140,7 +108,7 @@ function onPush(player, quest, npc) player:EndEvent(); if (npcClassId == PRIVATE_AREA_ENTRANCE) then - GetWorldManager():WarpToPrivateArea(player, "PrivateAreaMasterPast", 9999); + GetWorldManager():WarpToPrivateArea(player, "PrivateAreaMasterPast", 9999); -- Temp elseif (npcClassId == PRIVATE_AREA_EXIT) then GetWorldManager():WarpToPublicArea(player); end @@ -177,6 +145,5 @@ function giveWantedItem(player) player:SendMessage(MESSAGE_TYPE_SYSTEM, "", "[DEBUG] Server Error on adding item."); elseif (invCheck == INV_ERROR_SUCCESS) then player:SendGameMessage(player, GetWorldMaster(), 25246, MESSAGE_TYPE_SYSTEM_ERROR, ITEM_WANTED_GAUWYN, 1); - player:SendGameMessage(player, GetWorldMaster(), 51148, MESSAGE_TYPE_SYSTEM, 10011243, 3071); -- Log out in The Hourglass w/ item. end end \ No newline at end of file diff --git a/Data/scripts/quests/etc/etc5u1.lua b/Data/scripts/quests/etc/etc5u1.lua index 9e21becd..3d4e0174 100644 --- a/Data/scripts/quests/etc/etc5u1.lua +++ b/Data/scripts/quests/etc/etc5u1.lua @@ -21,8 +21,8 @@ OTOPA_POTTOPA = 1000864; GAUWYN_THE_GANNET = 1002065; HILDIBRAND = 1001995; NASHU_MHAKARACCA = 1001996; -PRIVATE_AREA_ENTRANCE = 0; -PRIVATE_AREA_EXIT = 0; +PRIVATE_AREA_ENTRANCE = 1090085; +PRIVATE_AREA_EXIT = 1290002; -- DefaultTalk NPCs? UBOKHN = 1000668; @@ -51,7 +51,13 @@ end function onStateChange(player, quest, sequence) if (sequence == SEQ_ACCEPT) then - quest:SetENpc(OTOPA_POTTOPA, QFLAG_NORM); -- TO-DO: Check player inventory for quest-specific item before flagging? + local hasQuestItem = player:GetItemPackage(INVENTORY_NORMAL):HasItem(ITEM_WANTED_GAUWYN); + local otopaFlag = 0; + + if (hasQuestItem == false) then + otopaFlag = 2; + end + quest:SetENpc(OTOPA_POTTOPA, otopaFlag); end if (sequence == SEQ_000) then @@ -59,14 +65,14 @@ function onStateChange(player, quest, sequence) quest:SetENpc(GAUWYN_THE_GANNET, QFLAG_NORM); quest:SetENpc(HILDIBRAND); quest:SetENpc(NASHU_MHAKARACCA); - quest:SetENPC(PRIVATE_AREA_ENTRANCE, QFLAG_MAP, false, true) - quest:SetENpc(PRIVATE_AREA_EXIT, QFLAG_NONE, false, true); + + --flagType, isTalkEnabled, isPushEnabled, isEmoteEnabled, isSpawned + quest:SetENpc(PRIVATE_AREA_ENTRANCE, QFLAG_MAP, false, true, false, true); elseif (sequence == SEQ_010) then quest:SetENpc(OTOPA_POTTOPA, QFLAG_REWARD); quest:SetENpc(GAUWYN_THE_GANNET); quest:SetENpc(HILDIBRAND); quest:SetENpc(NASHU_MHAKARACCA); - quest:SetENpc(PRIVATE_AREA_EXIT, QFLAG_NONE, false, true); end end @@ -76,10 +82,17 @@ function onTalk(player, quest, npc) if (sequence == SEQ_ACCEPT) then if (classId == OTOPA_POTTOPA) then - -- TO-DO: Add inventory check here? - callClientFunction(player, "delegateEvent", player, quest, "processEventOTOPAPOTTOPAStart"); - giveWantedItem(player); - --processEventOTOPAPOTTOPAStart_2 + local hasQuestItem = player:GetItemPackage(INVENTORY_NORMAL):HasItem(ITEM_WANTED_GAUWYN); + + if (not hasQuestItem) then + callClientFunction(player, "delegateEvent", player, quest, "processEventOTOPAPOTTOPAStart"); + giveWantedItem(player); + npc:SetQuestGraphic(player, QFLAG_NONE); + else + callClientFunction(player, "delegateEvent", player, quest, "processEventOTOPAPOTTOPAStart_2"); + end + + player:SendGameMessage(player, GetWorldMaster(), 51148, MESSAGE_TYPE_SYSTEM, 10011243, 3071); end elseif (sequence == SEQ_000) then @@ -121,10 +134,8 @@ function onPush(player, quest, npc) player:EndEvent(); if (npcClassId == PRIVATE_AREA_ENTRANCE) then - -- TO-DO: Needs spawn coordinates + Private Area arranged - GetWorldManager():WarpToPrivateArea(player, "PrivateAreaMasterPast", 9999); - elseif (npcClassId == PRIVATE_AREA_EXIT) then - GetWorldManager():WarpToPublicArea(player); + --TO-DO: Fill in the # below for the privateArea when it's made + --GetWorldManager():WarpToPrivateArea(player, "PrivateAreaMasterPast", #, -206.712, 195.148, 151.064, 1.821); end end @@ -159,6 +170,5 @@ function giveWantedItem(player) player:SendMessage(MESSAGE_TYPE_SYSTEM, "", "[DEBUG] Server Error on adding item."); elseif (invCheck == INV_ERROR_SUCCESS) then player:SendGameMessage(player, GetWorldMaster(), 25246, MESSAGE_TYPE_SYSTEM_ERROR, ITEM_WANTED_GAUWYN, 1); - player:SendGameMessage(player, GetWorldMaster(), 51148, MESSAGE_TYPE_SYSTEM, 10011243, 3071); -- Log out in The Hourglass w/ item. end end \ No newline at end of file From d50bfef2e555d060615fc95b689bbb4ef2b1677c Mon Sep 17 00:00:00 2001 From: CuriousJorge Date: Sun, 3 Apr 2022 00:57:24 -0400 Subject: [PATCH 16/17] Minor script revision + new quest warp.lua - Switched to warp type 0x16 for flipping between city zones. Zero gameplay interruption with this type. etc5u1 - Added in a spawn location for privateArea etc5g1 - Scripted, aside from the means of accepting the quest which requires special handling to trigger the intro CS for it. --- Data/scripts/commands/gm/warp.lua | 2 +- Data/scripts/quests/etc/etc5g1.lua | 72 +++++++++++++++++++++++------- Data/scripts/quests/etc/etc5u1.lua | 2 +- 3 files changed, 59 insertions(+), 17 deletions(-) diff --git a/Data/scripts/commands/gm/warp.lua b/Data/scripts/commands/gm/warp.lua index dd22653d..eb421800 100644 --- a/Data/scripts/commands/gm/warp.lua +++ b/Data/scripts/commands/gm/warp.lua @@ -77,7 +77,7 @@ function onTrigger(player, argc, p1, p2, p3, p4, privateArea, privateAreaType, n } if (player_zone == zones[player_zone][1]) then - worldManager:DoZoneChange(player, zones[player_zone][2], "", 0, 0x02, player_x, player_y, player_z, player_rot); + worldManager:DoZoneChange(player, zones[player_zone][2], "", 0, 0x16, player_x, player_y, player_z, player_rot); player:SendMessage(messageID, sender, string.format("setting coordinates X:%d Y:%d Z:%d to new zone (%d) private area:%s", player_x, player_y, player_z, zones[player_zone][2], privateArea or "unspecified")); end else diff --git a/Data/scripts/quests/etc/etc5g1.lua b/Data/scripts/quests/etc/etc5g1.lua index dcfa21c1..c15432ec 100644 --- a/Data/scripts/quests/etc/etc5g1.lua +++ b/Data/scripts/quests/etc/etc5g1.lua @@ -19,14 +19,14 @@ SEQ_010 = 10; -- Actor Class Ids OTOPA_POTTOPA = 1000864; VKOROLON = 1000458; -NICOLIAUX = 1000409; +NICOLIAUX = 1002071; -- 1000409: Can't use his public area id, otherwise a ! shows on him there also POWLE = 1000238; AUNILLIE = 1000410; GAUWYN_THE_GANNET = 1002065; HILDIBRAND = 1002067; NASHU_MHAKARACCA = 1001996; -PRIVATE_AREA_ENTRANCE = 0; -PRIVATE_AREA_EXIT = 0; +PRIVATE_AREA_ENTRANCE = 1090086; -- Check that this ID is free to use before merge +PRIVATE_AREA_EXIT = 1290002; -- DefaultTalk NPCs? SANSA = 1000239; @@ -60,13 +60,25 @@ function onStateChange(player, quest, sequence) end quest:SetENpc(OTOPA_POTTOPA, otopaFlag); quest:SetENpc(VKOROLON, QFLAG_NORM); -- Always shows despite interaction - end - - if (sequence == SEQ_000) then - + elseif (sequence == SEQ_000) then + quest:SetENpc(VKOROLON); + quest:SetENpc(NICOLIAUX, QFLAG_NORM); + quest:SetENpc(POWLE); + quest:SetENpc(AUNILLIE); + quest:SetENpc(GAUWYN_THE_GANNET); + quest:SetENpc(HILDIBRAND); + quest:SetENpc(NASHU_MHAKARACCA); + quest:SetENpc(PRIVATE_AREA_ENTRANCE, QFLAG_MAP, false, true, false, true); + elseif (sequence == SEQ_010) then - + quest:SetENpc(VKOROLON, QFLAG_REWARD); + quest:SetENpc(NICOLIAUX); + quest:SetENpc(POWLE); + quest:SetENpc(AUNILLIE); + quest:SetENpc(GAUWYN_THE_GANNET); + quest:SetENpc(HILDIBRAND); + quest:SetENpc(NASHU_MHAKARACCA); end end @@ -88,14 +100,42 @@ function onTalk(player, quest, npc) player:SendGameMessage(player, GetWorldMaster(), 51148, MESSAGE_TYPE_SYSTEM, 10011243, 2075); -- Log out in The Roost w/ item. elseif (classId == VKOROLON) then - -- This retail accurate. No dialog functions called. + -- This is retail accurate. No dialog functions called. player:SendGameMessage(player, GetWorldMaster(), 51148, MESSAGE_TYPE_SYSTEM, 10011243, 2075); end - elseif (sequence == SEQ_000) then - - elseif (sequence == SEQ_010) then + elseif (sequence >= SEQ_000) then + if (classId == VKOROLON) then + if (sequence == SEQ_010) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent_020"); + callClientFunction(player, "delegateEvent", player, quest, "sqrwa", 500, 1, 1); + player:CompleteQuest(quest); + -- Log out in Mizzenmast Inn w/ item. + player:SendGameMessage(player, GetWorldMaster(), 51148, MESSAGE_TYPE_SYSTEM, 10011243, 1070); + else + callClientFunction(player, "delegateEvent", player, quest, "processEvent_000_1"); -- Educated guess + end + elseif (classId == NICOLIAUX) then + if (sequence == SEQ_010) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent_010_1"); -- Educated guess + else + callClientFunction(player, "delegateEvent", player, quest, "processEvent_010"); + attentionMessage(player, 25225, quest.GetQuestId()); -- objectives complete! + quest:UpdateENPCs(); -- Band-aid for a QFLAG_NORM issue + quest:StartSequence(SEQ_010); + end + elseif (classId == POWLE) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent_010_5"); + elseif (classId == AUNILLIE) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent_010_6"); + elseif (classId == GAUWYN_THE_GANNET) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent_010_2"); + elseif (classId == HILDIBRAND) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent_010_3"); + elseif (classId == NASHU_MHAKARACCA) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent_010_4"); + end end player:EndEvent() @@ -103,19 +143,21 @@ function onTalk(player, quest, npc) end + function onPush(player, quest, npc) local npcClassId = npc.GetActorClassId(); player:EndEvent(); if (npcClassId == PRIVATE_AREA_ENTRANCE) then - GetWorldManager():WarpToPrivateArea(player, "PrivateAreaMasterPast", 9999); -- Temp - elseif (npcClassId == PRIVATE_AREA_EXIT) then - GetWorldManager():WarpToPublicArea(player); + GetWorldManager():WarpToPrivateArea(player, "PrivateAreaMasterPast", 5, -33.709, 7.810, -1272.337, -0.810); end end + + + function getJournalInformation(player, quest) end diff --git a/Data/scripts/quests/etc/etc5u1.lua b/Data/scripts/quests/etc/etc5u1.lua index 3d4e0174..23e3b4fa 100644 --- a/Data/scripts/quests/etc/etc5u1.lua +++ b/Data/scripts/quests/etc/etc5u1.lua @@ -135,7 +135,7 @@ function onPush(player, quest, npc) player:EndEvent(); if (npcClassId == PRIVATE_AREA_ENTRANCE) then --TO-DO: Fill in the # below for the privateArea when it's made - --GetWorldManager():WarpToPrivateArea(player, "PrivateAreaMasterPast", #, -206.712, 195.148, 151.064, 1.821); + GetWorldManager():WarpToPrivateArea(player, "PrivateAreaMasterPast", 5, -206.712, 195.148, 151.064, 1.821); end end From a7b1b79461bccef6909787dc335cd036acfbe098 Mon Sep 17 00:00:00 2001 From: CuriousJorge Date: Wed, 13 Apr 2022 11:45:49 -0400 Subject: [PATCH 17/17] Hildibrand series of quests all in. Requires inn dream handling and some retail accuracy double-checking to finish it off. Misc script fixes also. =============================== Nudgenpc.lua - Added a command variation Testmapobj.lua - Added !help documentation DftWil.lua - Corrected an npc name/function Player.cs - Changed Dalamud packet to default to 7, not 0. Fixes the moon not displaying in a specific Hildibrand cutscene Etc5g0.lua - Made quest accepting retail-accurate with how it displayed messages/ended the TalkEvent Etc5g1.lua - Added Bed !. Kinda kludged in atm since it's a pre-accepted quest state. Etc5u1.lua - Same as above Etc5l1.lua - Quest "Private Eyes" scripted. Etc5l2.lua - Quest "Mysteries of the Red Moon" scripted Etc5l3.lua - Quest "Prophecy Inspection" scripted --- Data/scripts/commands/gm/nudgenpc.lua | 3 +- Data/scripts/commands/gm/testmapobj.lua | 7 +- Data/scripts/quests/dft/DftWil.lua | 4 +- Data/scripts/quests/etc/etc5g0.lua | 6 +- Data/scripts/quests/etc/etc5g1.lua | 9 +- Data/scripts/quests/etc/etc5l1.lua | 166 +++++++++++++++ Data/scripts/quests/etc/etc5l2.lua | 140 +++++++++++++ Data/scripts/quests/etc/etc5l3.lua | 253 +++++++++++++++++++++++ Data/scripts/quests/etc/etc5u1.lua | 8 +- Map Server/Actors/Chara/Player/Player.cs | 2 +- 10 files changed, 583 insertions(+), 15 deletions(-) create mode 100644 Data/scripts/quests/etc/etc5l1.lua create mode 100644 Data/scripts/quests/etc/etc5l2.lua create mode 100644 Data/scripts/quests/etc/etc5l3.lua diff --git a/Data/scripts/commands/gm/nudgenpc.lua b/Data/scripts/commands/gm/nudgenpc.lua index e1719e5f..6a033b76 100644 --- a/Data/scripts/commands/gm/nudgenpc.lua +++ b/Data/scripts/commands/gm/nudgenpc.lua @@ -38,7 +38,8 @@ horizontal = { rotation = { ["ROTATE"] = 3, ["ORIENTATION"] = 3, -["O"] = 3 +["O"] = 3, +["ROT"] = 3 } function onTrigger(player, argc, arg1, arg2) diff --git a/Data/scripts/commands/gm/testmapobj.lua b/Data/scripts/commands/gm/testmapobj.lua index feff9672..36d7b157 100644 --- a/Data/scripts/commands/gm/testmapobj.lua +++ b/Data/scripts/commands/gm/testmapobj.lua @@ -3,7 +3,12 @@ require("global"); properties = { permissions = 0, parameters = "sssss", - description = "" + description = +[[ + +Tests a layout/region id w/ an animation string +!testmapobj +]], } function onTrigger(player, argc, animation, layoutId, instanceId, maxInstanceId) diff --git a/Data/scripts/quests/dft/DftWil.lua b/Data/scripts/quests/dft/DftWil.lua index 413fdf32..9eb2fcdd 100644 --- a/Data/scripts/quests/dft/DftWil.lua +++ b/Data/scripts/quests/dft/DftWil.lua @@ -271,9 +271,9 @@ function onTalk(player, quest, npc, eventName) local npcId = npc:GetActorClassId(); local clientFunc = defaultTalkWil[npcId]; - if (npcId == 1000864) then -- Kopuru Fupuru (Adv. Guild Inn NPC) + if (npcId == 1000864) then -- Otopa Pottopa (Adv. Guild Inn NPC) if (player:IsQuestCompleted(110848)) then -- "Ring of Deceit" completed. - defaultTalkWithInn(player, quest, "defaultTalkWithInn_Desk"); + callClientFunction(player, "delegateEvent", player, quest, "defaultTalkWithInn_Desk"); else callClientFunction(player, "delegateEvent", player, quest, clientFunc); end diff --git a/Data/scripts/quests/etc/etc5g0.lua b/Data/scripts/quests/etc/etc5g0.lua index 5ab4d179..6a289705 100644 --- a/Data/scripts/quests/etc/etc5g0.lua +++ b/Data/scripts/quests/etc/etc5g0.lua @@ -28,8 +28,6 @@ MRKR_PFARAHR = 11082001; MRKR_VKOROLON = 11082002; function onStart(player, quest) - quest:StartSequence(SEQ_000); - player:SendGameMessage(GetWorldMaster(), 25246, MESSAGE_TYPE_SYSTEM, ITEM_WELL_WORN_BAG, 1); end function onFinish(player, quest) @@ -57,6 +55,10 @@ function onTalk(player, quest, npc) local questAccepted = callClientFunction(player, "delegateEvent", player, quest, "processEventVKOROLONStart"); if (questAccepted == 1) then player:AcceptQuest(quest); + quest:StartSequence(SEQ_000); + wait(2); + attentionMessage(player, 25246, ITEM_WELL_WORN_BAG, 1); + end player:EndEvent(); return; diff --git a/Data/scripts/quests/etc/etc5g1.lua b/Data/scripts/quests/etc/etc5g1.lua index c15432ec..c22af275 100644 --- a/Data/scripts/quests/etc/etc5g1.lua +++ b/Data/scripts/quests/etc/etc5g1.lua @@ -19,6 +19,7 @@ SEQ_010 = 10; -- Actor Class Ids OTOPA_POTTOPA = 1000864; VKOROLON = 1000458; +THE_ROOST_BED = 1200379; NICOLIAUX = 1002071; -- 1000409: Can't use his public area id, otherwise a ! shows on him there also POWLE = 1000238; AUNILLIE = 1000410; @@ -51,14 +52,14 @@ end function onStateChange(player, quest, sequence) + if (sequence == SEQ_ACCEPT) then local hasQuestItem = player:GetItemPackage(INVENTORY_NORMAL):HasItem(ITEM_WANTED_GAUWYN); - local otopaFlag = 0; - + if (hasQuestItem == false) then - otopaFlag = 2; + quest:SetENpc(OTOPA_POTTOPA, QFLAG_NORM); end - quest:SetENpc(OTOPA_POTTOPA, otopaFlag); + quest:SetENpc(THE_ROOST_BED, 5); quest:SetENpc(VKOROLON, QFLAG_NORM); -- Always shows despite interaction elseif (sequence == SEQ_000) then diff --git a/Data/scripts/quests/etc/etc5l1.lua b/Data/scripts/quests/etc/etc5l1.lua new file mode 100644 index 00000000..207a119c --- /dev/null +++ b/Data/scripts/quests/etc/etc5l1.lua @@ -0,0 +1,166 @@ +require("global"); + +--[[ + +Quest Script + +Name: Private Eyes +Code: Etc5l1 +Id: 110839 +Prereq: Level 15. Man5g1 (In Plain Sight) complete. [110829] +Notes: + +]] + +-- Sequence Numbers +SEQ_000 = 0; -- Talk to Bertrand +SEQ_010 = 10; -- Head to the meeting point. + +-- Actor Class Ids +OTOPA_POTTOPA = 1000864; +MYTESYN = 1000167; +MIZZENMAST_BED = 1200378; +BERTRAND = 1001903; -- 1060004 also a valid ID, but doesn't look like the NPC appeared anywhere else? +ABRAHAM = 1002066; +PRIVATE_AREA_ENTRANCE = 1090087; -- Check that this ID is free to use before merge +PRIVATE_AREA_EXIT = 1290002; +CUTSCENE_PUSH_TRIGGER = 1090088; -- Check that this ID is free to use before merge + +-- Prop Actor Ids (for documentation sake) +BRONZE_CHEST = 1080056; -- bgObj 20923 w/ body 1024 +GLASS_DRINK = 1080057; -- bgObj 20901 w/ body 26624 +RECTANGULAR_BOX = 1080058; -- bgObj 20951 w/ body 1024 + +-- Quest Items +ITEM_WANTED_GAUWYN = 10011243; + +-- Quest Markers +MRKR_CAVE = 11072101; +MRKR_BERTRAND = 11072102; +MRKR_CUTSCENE = 11072103; + + + +function onStart(player, quest) + quest:StartSequence(SEQ_000); +end + +function onFinish(player, quest) +end + + +function onStateChange(player, quest, sequence) + + if (sequence == SEQ_ACCEPT) then + local hasQuestItem = player:GetItemPackage(INVENTORY_NORMAL):HasItem(ITEM_WANTED_GAUWYN); + local otopaFlag = 0; + + if (hasQuestItem == false) then + otopaFlag = 2; + end + quest:SetENpc(OTOPA_POTTOPA, otopaFlag); + quest:SetENpc(MYTESYN, QFLAG_NORM); -- Assuming this functions the same as it did in Etc5g1 + quest:SetENpc(MIZZENMAST_BED, 5); + + elseif (sequence == SEQ_000) then + quest:SetENpc(MYTESYN); + quest:SetENpc(PRIVATE_AREA_ENTRANCE, QFLAG_MAP, false, true, false, true); + quest:SetENpc(BERTRAND, QFLAG_NORM); + quest:SetENpc(ABRAHAM); + elseif (sequence == SEQ_010) then + quest:SetENpc(CUTSCENE_PUSH_TRIGGER, QFLAG_MAP,false, true, false, true); + end +end + +function onTalk(player, quest, npc) + local sequence = quest:getSequence(); + local classId = npc:GetActorClassId(); + + if (sequence == SEQ_ACCEPT) then + -- Am assuming this all functions the same as it did in Etc5g1 + if (classId == OTOPA_POTTOPA) then + local hasQuestItem = player:GetItemPackage(INVENTORY_NORMAL):HasItem(ITEM_WANTED_GAUWYN); + + if (not hasQuestItem) then + callClientFunction(player, "delegateEvent", player, quest, "processEventOTOPAPOTTOPAStart"); + giveWantedItem(player); + npc:SetQuestGraphic(player, QFLAG_NONE); + else + callClientFunction(player, "delegateEvent", player, quest, "processEventOTOPAPOTTOPAStart_2"); + end + player:SendGameMessage(player, GetWorldMaster(), 51148, MESSAGE_TYPE_SYSTEM, 10011243, 1070); -- Log out in Mizzenmast Inn w/ item. + elseif (classId == MYTESYN) then + player:SendGameMessage(player, GetWorldMaster(), 51148, MESSAGE_TYPE_SYSTEM, 10011243, 1070); + end + + elseif (sequence == SEQ_000) then + if (classId == MYTESYN) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent_000_1"); + elseif (classId == BERTRAND) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent_010"); + quest:UpdateENPCs(); -- Band-aid for a QFLAG_NORM issue + quest:StartSequence(SEQ_010); + GetWorldManager():WarpToPublicArea(player); + elseif (classId == ABRAHAM) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent_010_1"); + end + end + + player:EndEvent() + quest:UpdateENPCs(); +end + + + +function onPush(player, quest, npc) + local classId = npc.GetActorClassId(); + + + if (classId == PRIVATE_AREA_ENTRANCE) then + choice = callClientFunction(player, "delegateEvent", player, quest, "instanceAreaJoinAskInBasaClass"); + if (choice == 1) then + GetWorldManager():WarpToPrivateArea(player, "PrivateAreaMasterPast", 5, -220.948, 16.603, -92.863, -2.090); + end + + elseif (classId == CUTSCENE_PUSH_TRIGGER) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent_020"); + callClientFunction(player, "delegateEvent", player, quest, "sqrwa", 500, 1, 1); + player:CompleteQuest(quest); + end + player:EndEvent(); +end + + + +function getJournalInformation(player, quest) +end + + +function getJournalMapMarkerList(player, quest) + local sequence = quest:getSequence(); + + if (sequence == SEQ_000) then + return MRKR_CAVE; + -- TO-DO: Check for private area and use MRKR_BERTRAND in place of this + elseif (sequence == SEQ_010) then + return MRKR_CUTSCENE; + end +end + + +function giveWantedItem(player) + + local invCheck = player:getItemPackage(INVENTORY_NORMAL):addItem(ITEM_WANTED_GAUWYN, 1, 1); + + if (invCheck == INV_ERROR_FULL) then + -- Your inventory is full. + player:SendGameMessage(player, GetWorldMaster(), 60022, MESSAGE_TYPE_SYSTEM_ERROR); + elseif (invCheck == INV_ERROR_ALREADY_HAS_UNIQUE) then + -- You cannot have more than one in your possession at any given time. + player:SendGameMessage(player, GetWorldMaster(), 40279, MESSAGE_TYPE_SYSTEM_ERROR, ITEM_WANTED_GAUWYN, 1); + elseif (invCheck == INV_ERROR_SYSTEM_ERROR) then + player:SendMessage(MESSAGE_TYPE_SYSTEM, "", "[DEBUG] Server Error on adding item."); + elseif (invCheck == INV_ERROR_SUCCESS) then + player:SendGameMessage(player, GetWorldMaster(), 25246, MESSAGE_TYPE_SYSTEM_ERROR, ITEM_WANTED_GAUWYN, 1); + end +end \ No newline at end of file diff --git a/Data/scripts/quests/etc/etc5l2.lua b/Data/scripts/quests/etc/etc5l2.lua new file mode 100644 index 00000000..9a645c32 --- /dev/null +++ b/Data/scripts/quests/etc/etc5l2.lua @@ -0,0 +1,140 @@ +require("global"); + +--[[ + +Quest Script + +Name: Mysteries of the Red Moon +Code: Etc5l2 +Id: 110840 +Prereq: Level 20. Man5l1 (Private Eyes) complete. [110839] +Notes: + +]] + +-- Sequence Numbers +SEQ_000 = 0; -- Investigate the room. +SEQ_005 = 5; -- Head to the Arrzaneth Ossuary + +-- Actor Class Ids +KOPURU_FUPURU = 1002047; +BOOK = 1200412; +INN_EXIT = 1090089; +CUTSCENE_PUSH_TRIGGER = 1090253; -- Already had from capture + +-- Quest Markers +MRKR_KOPURU_FUPURU = 11072201; +MRKR_BOOK = 11072202; +MRKR_CUTSCENE = 11072203; + +-- Quest Item +ITEM_HIDLIBRAND_DOSSIER = 10011252; + +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(KOPURU_FUPURU, QFLAG_NORM); + elseif (sequence == SEQ_000) then + quest:SetENpc(KOPURU_FUPURU, QFLAG_NORM); + quest:SetENpc(BOOK, QFLAG_NORM); + quest:SetENpc(INN_EXIT, QFLAG_MAP, false, true, false, true); + elseif (sequence == SEQ_005) then + quest:SetENpc(BOOK); + quest:SetENpc(KOPURU_FUPURU); + quest:SetENpc(INN_EXIT, QFLAG_MAP, false, true, false, true); + quest:SetENpc(CUTSCENE_PUSH_TRIGGER, QFLAG_MAP,false, true, false, true); + end +end + +function onTalk(player, quest, npc) + local sequence = quest:getSequence(); + local classId = npc:GetActorClassId(); + + -- Offer the quest + if (classId == KOPURU_FUPURU and sequence == SEQ_ACCEPT) then + local questAccepted = callClientFunction(player, "delegateEvent", player, quest, "processEventStart"); + if (questAccepted == 1) then + player:AcceptQuest(quest); + end + player:EndEvent(); + return; + -- Quest Progress + elseif (sequence == SEQ_000) then + if (classId == KOPURU_FUPURU) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent000_KOPURU"); + GetWorldManager():DoZoneChange(player, 181, "PrivateAreaMasterPast", 5, 15, 0,0,0, player.rotation); + elseif (classId == BOOK) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent000"); + quest:UpdateENPCs(); -- Band-aid for a QFLAG_NORM issue + quest:StartSequence(SEQ_005); + end + elseif (sequence == SEQ_005) then + if (classId == KOPURU_FUPURU) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent000_KOPURU"); + GetWorldManager():DoZoneChange(player, 181, "PrivateAreaMasterPast", 5, 15, 0,0,0, player.rotation); + elseif (classId == BOOK) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent000_BOOK"); + end + end + + player:EndEvent() + quest:UpdateENPCs(); +end + + + +function onPush(player, quest, npc) + local classId = npc.GetActorClassId(); + + + if (classId == INN_EXIT) then + choice = callClientFunction(player, "delegateEvent", player, quest, "processEventExit"); + if (choice == 1) then + player:EndEvent(); + GetWorldManager():DoZoneChange(player, 209, "", 0, 15, -104.296, 203, 162.257, -0.4); + end + -- Quest Complete + elseif (classId == CUTSCENE_PUSH_TRIGGER) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent005_NQ"); + --TO-DO: Get the scaled EXP for this sqrwa figured out + callClientFunction(player, "delegateEvent", player, quest, "sqrwa", 1000, 1, 1, 9); + + player:SendGameMessage(player, GetWorldMaster(), 51149, MESSAGE_TYPE_SYSTEM, ITEM_HIDLIBRAND_DOSSIER); + local itemCheck = giveWantedItem(player); + if (itemCheck == true) then + player:CompleteQuest(quest); + end + end + player:EndEvent(); +end + + +function getJournalMapMarkerList(player, quest) + local sequence = quest:getSequence(); + + if (sequence == SEQ_000) then + return MRKR_KOPURU_FUPURU; + -- TO-DO: Check for private area and use MRKR_BOOK in place of this + elseif (sequence == SEQ_005) then + return MRKR_CUTSCENE; + end +end + + +function giveWantedItem(player) + + local invCheck = player:getItemPackage(INVENTORY_NORMAL):addItem(ITEM_HIDLIBRAND_DOSSIER, 1, 1); + + if (invCheck == INV_ERROR_SUCCESS) then + player:SendGameMessage(player, GetWorldMaster(), 25246, MESSAGE_TYPE_SYSTEM_ERROR, ITEM_HIDLIBRAND_DOSSIER, 1); + return true; + end +end \ No newline at end of file diff --git a/Data/scripts/quests/etc/etc5l3.lua b/Data/scripts/quests/etc/etc5l3.lua new file mode 100644 index 00000000..5b97c0b1 --- /dev/null +++ b/Data/scripts/quests/etc/etc5l3.lua @@ -0,0 +1,253 @@ +require("global"); + +--[[ + +Quest Script + +Name: Prophecy Inspection +Code: Etc5l3 +Id: 110841 +Prereq: Level 20. Man5l2 (Mysteries of the Red Moon) complete. [110840] +Notes: + +]] + +-- Sequence Numbers +SEQ_000 = 0; -- Head to the Coffer & Coffin +SEQ_005 = 5; -- Help out Alret +SEQ_010 = 10; -- Talk to Alret + +-- Actor Class Ids +KOPURU_FUPURU = 1002047; +VKOROLON = 1000458; +MYTESYN = 1000167; +COFFER_AND_COFFIN_PUSH = 1090090; +BED_LIMSA = 1200378; +BED_GRIDANIA = 1200379; +BED_ULDAH = 1200380; + +HILDIBRAND = 1001995; +NASHU_MHAKARACCA = 1001996; +ALRET = 1002114; +BOMB_BANE_1 = 1080090; +BOMB_BANE_2 = 1080091; +BOMB_BANE_3 = 1080092; +BOMB_BANE_4 = 1080093; +BOMB_BANE_5 = 1080094; + +-- Quest Markers +MRKR_COFFIN = 11072204; +MRKR_BANE_1 = 11072205; +MRKR_BANE_2 = 11072206; +MRKR_BANE_3 = 11072207; +MRKR_BANE_4 = 11072208; +MRKR_BANE_5 = 11072209; +MRKR_ALRET = 11072210; + +-- Quest Flags +FLAG_SEQ005_BANE_1 = 0; +FLAG_SEQ005_BANE_2 = 1; +FLAG_SEQ005_BANE_3 = 2; +FLAG_SEQ005_BANE_4 = 3; +FLAG_SEQ005_BANE_5 = 4; + +-- Quest Counter +COUNTER_BANE = 0; + +-- Quest Item +ITEM_HIDLIBRAND_DOSSIER = 10011252; +ITEM_BOMB_BANE = 11000230; + + + +function onStart(player, quest) + quest:StartSequence(SEQ_000); +end + +function onFinish(player, quest) +end + + +function onStateChange(player, quest, sequence) + local data = quest:GetData(); + + -- Quest not accepted: Set up actors to let you retrieve the item & initiate the log-in check at the Inn + if (sequence == SEQ_ACCEPT) then + quest:SetENpc(KOPURU_FUPURU, QFLAG_NORM); + quest:SetENpc(VKOROLON, QFLAG_NORM); + quest:SetENpc(MYTESYN, QFLAG_NORM); + quest:SetENpc(BED_ULDAH, 5); + quest:SetENpc(BED_GRIDANIA, 5); + quest:SetENpc(BED_LIMSA, 5); + -- Quest started + elseif (sequence == SEQ_000) then + quest:SetENpc(COFFER_AND_COFFIN_PUSH, QFLAG_MAP, false, true, false, true); + elseif (sequence == SEQ_005) then + local bane1Flag = data:GetFlag(FLAG_SEQ005_BANE_1) and QFLAG_NONE or QFLAG_PLATE; + local bane2Flag = data:GetFlag(FLAG_SEQ005_BANE_2) and QFLAG_NONE or QFLAG_PLATE; + local bane3Flag = data:GetFlag(FLAG_SEQ005_BANE_3) and QFLAG_NONE or QFLAG_PLATE; + local bane4Flag = data:GetFlag(FLAG_SEQ005_BANE_4) and QFLAG_NONE or QFLAG_PLATE; + local bane5Flag = data:GetFlag(FLAG_SEQ005_BANE_5) and QFLAG_NONE or QFLAG_PLATE; + + quest:SetENpc(COFFER_AND_COFFIN_PUSH, QFLAG_MAP, false, true, false, true); + quest:SetENpc(HILDIBRAND); + quest:SetENpc(NASHU_MHAKARACCA); + quest:SetENpc(ALRET); + quest:SetENpc(BOMB_BANE_1, bane1Flag); + quest:SetENpc(BOMB_BANE_2, bane2Flag); + quest:SetENpc(BOMB_BANE_3, bane3Flag); + quest:SetENpc(BOMB_BANE_4, bane4Flag); + quest:SetENpc(BOMB_BANE_5, bane5Flag); + -- Quest finished + elseif (sequence == SEQ_010) then + quest:SetENpc(HILDIBRAND); + quest:SetENpc(NASHU_MHAKARACCA); + quest:SetENpc(ALRET, QFLAG_REWARD); + end +end + +function onTalk(player, quest, npc) + local sequence = quest:getSequence(); + local classId = npc:GetActorClassId(); + + if (sequence == SEQ_ACCEPT) then + if (classId == KOPURU_FUPURU) then + callClientFunction(player, "delegateEvent", player, quest, "processEventKOPURUStart"); + elseif (classId == VKOROLON) then + callClientFunction(player, "delegateEvent", player, quest, "processEventKOROLONStart"); + elseif (classId == MYTESYN) then + callClientFunction(player, "delegateEvent", player, quest, "processEventMYTESYNStart"); + end + giveDossierItem(player); + player:SendGameMessage(player, GetWorldMaster(), 51149, MESSAGE_TYPE_SYSTEM, ITEM_HIDLIBRAND_DOSSIER); + + elseif (sequence == SEQ_005) then + local data = quest:GetData(); + local incCounter = false; + + if (classId == HILDIBRAND) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent_005_1"); + elseif (classId == NASHU_MHAKARACCA) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent_005_2"); + elseif (classId == ALRET) then + if (sequence == SEQ_005) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent_005_3"); + end + elseif (classId == BOMB_BANE_1) then + if not (data:GetFlag(FLAG_SEQ005_BANE_1)) then + incCounter = true; + data:SetFlag(FLAG_SEQ005_BANE_1); + end + elseif (classId == BOMB_BANE_2) then + if not (data:GetFlag(FLAG_SEQ005_BANE_2)) then + incCounter = true; + data:SetFlag(FLAG_SEQ005_BANE_2); + end + elseif (classId == BOMB_BANE_3) then + if not (data:GetFlag(FLAG_SEQ005_BANE_3)) then + incCounter = true; + data:SetFlag(FLAG_SEQ005_BANE_3); + end + elseif (classId == BOMB_BANE_4) then + if not (data:GetFlag(FLAG_SEQ005_BANE_4)) then + incCounter = true; + data:SetFlag(FLAG_SEQ005_BANE_4); + end + elseif (classId == BOMB_BANE_5) then + if not (data:GetFlag(FLAG_SEQ005_BANE_5)) then + incCounter = true; + data:SetFlag(FLAG_SEQ005_BANE_5); + end + end + + if (incCounter == true) then + counterAmount = data:IncCounter(COUNTER_BANE); + callClientFunction(player, "delegateEvent", player, quest, "processEvent_005_4", counterAmount, 5); + wait(1); + + if (counterAmount >= 5) then + attentionMessage(player, 25225, quest:GetQuestId()); -- "Seeing the Seers" objectives complete! + quest:GetData():ClearData(); + quest:UpdateENPCs(); -- Band-aid for a QFLAG_PLATE issue + quest:StartSequence(SEQ_010); + end + end + + elseif (sequence == SEQ_010) then + if (classId == HILDIBRAND) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent_005_1"); + elseif (classId == NASHU_MHAKARACCA) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent_005_2"); + elseif (classId == ALRET) then -- Finish the quest + callClientFunction(player, "delegateEvent", player, quest, "processEvent_020"); + --TO-DO: Get the scaled EXP for this sqrwa figured out + --TO-DO: Also confirm reward was issued before flagging quest as complete + callClientFunction(player, "delegateEvent", player, quest, "sqrwa", 1000, 1, 1, 9); + GetWorldManager():WarpToPublicArea(player); + player:CompleteQuest(quest); + end + end + + player:EndEvent() + quest:UpdateENPCs(); +end + + + +function onPush(player, quest, npc) + local sequence = quest:getSequence(); + local classId = npc.GetActorClassId(); + + if (classId == COFFER_AND_COFFIN_PUSH) then + if (sequence == SEQ_000) then + callClientFunction(player, "delegateEvent", player, quest, "processEvent_005"); + player:EndEvent(); + attentionMessage(player, 25246, ITEM_BOMB_BANE, 1); + quest:StartSequence(SEQ_005); + end + + GetWorldManager():WarpToPrivateArea(player, "PrivateAreaMasterPast", 5, -1732.891, 56.119, -307.285, -2.785); + actor = player.CurrentArea:FindActorInZoneByUniqueID("etc5l3_nashu"); + actor:ChangeState(ACTORSTATE_SITTING_ONFLOOR); -- Band-aid to get her sitting. + end + player:EndEvent(); +end + +function getJournalInformation(player, quest) + -- Bugged on the client's end and never shows? + return 0, ITEM_BOMB_BANE; +end + + +function getJournalMapMarkerList(player, quest) + local sequence = quest:getSequence(); + local data = quest:GetData(); + local possibleMarkers = {}; + + if (sequence == SEQ_000) then + return MRKR_COFFIN; + + elseif (sequence == SEQ_005) then + local data = quest:GetData(); + if (not data:GetFlag(FLAG_SEQ005_BANE_1)) then table.insert(possibleMarkers, MRKR_BANE_1); end + if (not data:GetFlag(FLAG_SEQ005_BANE_2)) then table.insert(possibleMarkers, MRKR_BANE_2); end + if (not data:GetFlag(FLAG_SEQ005_BANE_3)) then table.insert(possibleMarkers, MRKR_BANE_3); end + if (not data:GetFlag(FLAG_SEQ005_BANE_4)) then table.insert(possibleMarkers, MRKR_BANE_4); end + if (not data:GetFlag(FLAG_SEQ005_BANE_5)) then table.insert(possibleMarkers, MRKR_BANE_5); end + return unpack(possibleMarkers) + + elseif (sequence == SEQ_010) then + return MRKR_ALRET; + end +end + + +function giveDossierItem(player) + + local invCheck = player:getItemPackage(INVENTORY_NORMAL):addItem(ITEM_HIDLIBRAND_DOSSIER, 1, 1); + + if (invCheck == INV_ERROR_SUCCESS) then + player:SendGameMessage(player, GetWorldMaster(), 25246, MESSAGE_TYPE_SYSTEM_ERROR, ITEM_HIDLIBRAND_DOSSIER, 1); + return true; + end +end \ No newline at end of file diff --git a/Data/scripts/quests/etc/etc5u1.lua b/Data/scripts/quests/etc/etc5u1.lua index 23e3b4fa..d89bb28d 100644 --- a/Data/scripts/quests/etc/etc5u1.lua +++ b/Data/scripts/quests/etc/etc5u1.lua @@ -18,6 +18,7 @@ SEQ_010 = 10; -- Actor Class Ids OTOPA_POTTOPA = 1000864; +HOURGLASS_BED = 1200380; GAUWYN_THE_GANNET = 1002065; HILDIBRAND = 1001995; NASHU_MHAKARACCA = 1001996; @@ -52,12 +53,11 @@ end function onStateChange(player, quest, sequence) if (sequence == SEQ_ACCEPT) then local hasQuestItem = player:GetItemPackage(INVENTORY_NORMAL):HasItem(ITEM_WANTED_GAUWYN); - local otopaFlag = 0; - + if (hasQuestItem == false) then - otopaFlag = 2; + quest:SetENpc(OTOPA_POTTOPA, QFLAG_NORM); end - quest:SetENpc(OTOPA_POTTOPA, otopaFlag); + quest:SetENpc(HOURGLASS_BED, 5); end if (sequence == SEQ_000) then diff --git a/Map Server/Actors/Chara/Player/Player.cs b/Map Server/Actors/Chara/Player/Player.cs index b0359bd4..7f6681c9 100644 --- a/Map Server/Actors/Chara/Player/Player.cs +++ b/Map Server/Actors/Chara/Player/Player.cs @@ -591,7 +591,7 @@ namespace Meteor.Map.Actors public void SendZoneInPackets(WorldManager world, ushort spawnType) { QueuePacket(SetActorIsZoningPacket.BuildPacket(Id, false)); - QueuePacket(SetDalamudPacket.BuildPacket(Id, 0)); + QueuePacket(SetDalamudPacket.BuildPacket(Id, 7)); //Music Packets if (currentMainState == SetActorStatePacket.MAIN_STATE_MOUNTED)