From b6c9825b2d871e0bef632f027509f9762a24f1aa Mon Sep 17 00:00:00 2001 From: CuriousJorge Date: Sun, 13 Feb 2022 13:18:20 -0500 Subject: [PATCH] - Man0u0 about as polished as one can get the Talking sections for now, minus some very specific retail quirks that need replicating at some point (all revolving around the starting 15 seconds of the forced tutorial) - Man0u1 barely started. Just enough there to get the player out of the PrivateArea and into the public zone. - All of the old Populace uniqueId scripts for both quests nuked into high orbit. - DftSea: Master list of function names and argument counts added to the list. Will be whittling away at this over the coming week. - GM Warp: For whatever reason using "" to compare against a nil wasn't working anymore. Set it to nil instead. --- Data/scripts/commands/gm/warp.lua | 3 +- Data/scripts/quests/dft/DftSea.lua | 264 ++++++++++++++++++ Data/scripts/quests/man/man0u0.lua | 154 +++++----- Data/scripts/quests/man/man0u1.lua | 3 +- .../MapObjOnlyShowHide/Man0u0_trtl_gate.lua | 3 - .../MapObjOnlyShowHide/man0u0_tutrl_gate.lua | 3 + .../PopulaceChocoboLender/rururaji.lua | 8 - .../wil0Battle01/PopulaceStandard/ascilia.lua | 52 ---- .../PopulaceStandard/big-bellied_barker.lua | 8 - .../PopulaceStandard/dapper_dan.lua | 8 - .../PopulaceStandard/debauched_demoness.lua | 8 - .../PopulaceStandard/exit_trigger.lua | 46 --- .../PopulaceStandard/fretful_farmhand.lua | 31 -- .../PopulaceStandard/gil-digging_mistress.lua | 31 -- .../PopulaceStandard/loutish_lad.lua | 8 - .../PopulaceStandard/rururaji.lua | 8 - .../PopulaceStandard/stocky_stranger.lua | 8 - .../PopulaceStandard/twittering_tomboy.lua | 8 - .../PopulaceStandard/warburton.lua | 8 - .../PopulaceStandard/blocker1.lua | 13 - .../PopulaceStandard/blocker2.lua | 14 - .../disreputable_midlander.lua | 8 - .../PopulaceStandard/full-lipped_fille.lua | 8 - .../PopulaceStandard/high-spirited_fellow.lua | 8 - .../PopulaceStandard/keen-eyed_merchant.lua | 8 - .../PopulaceStandard/large-lunged_laborer.lua | 8 - .../PopulaceStandard/long-legged_lady.lua | 8 - .../PopulaceStandard/mumpish_miqote.lua | 8 - .../PopulaceStandard/rururaji.lua | 8 - .../tooth-grinding_traveler.lua | 8 - .../PopulaceStandard/uldah_opening_exit.lua | 16 -- .../PopulaceStandard/yayatoki.lua | 13 - .../PopulaceStandard/momodi.lua | 26 -- 33 files changed, 360 insertions(+), 456 deletions(-) delete mode 100644 Data/scripts/unique/wil0Battle01/MapObjOnlyShowHide/Man0u0_trtl_gate.lua create mode 100644 Data/scripts/unique/wil0Battle01/MapObjOnlyShowHide/man0u0_tutrl_gate.lua delete mode 100644 Data/scripts/unique/wil0Battle01/PopulaceChocoboLender/rururaji.lua delete mode 100644 Data/scripts/unique/wil0Battle01/PopulaceStandard/ascilia.lua delete mode 100644 Data/scripts/unique/wil0Battle01/PopulaceStandard/big-bellied_barker.lua delete mode 100644 Data/scripts/unique/wil0Battle01/PopulaceStandard/dapper_dan.lua delete mode 100644 Data/scripts/unique/wil0Battle01/PopulaceStandard/debauched_demoness.lua delete mode 100644 Data/scripts/unique/wil0Battle01/PopulaceStandard/exit_trigger.lua delete mode 100644 Data/scripts/unique/wil0Battle01/PopulaceStandard/fretful_farmhand.lua delete mode 100644 Data/scripts/unique/wil0Battle01/PopulaceStandard/gil-digging_mistress.lua delete mode 100644 Data/scripts/unique/wil0Battle01/PopulaceStandard/loutish_lad.lua delete mode 100644 Data/scripts/unique/wil0Battle01/PopulaceStandard/rururaji.lua delete mode 100644 Data/scripts/unique/wil0Battle01/PopulaceStandard/stocky_stranger.lua delete mode 100644 Data/scripts/unique/wil0Battle01/PopulaceStandard/twittering_tomboy.lua delete mode 100644 Data/scripts/unique/wil0Battle01/PopulaceStandard/warburton.lua delete mode 100644 Data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/blocker1.lua delete mode 100644 Data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/blocker2.lua delete mode 100644 Data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/disreputable_midlander.lua delete mode 100644 Data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/full-lipped_fille.lua delete mode 100644 Data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/high-spirited_fellow.lua delete mode 100644 Data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/keen-eyed_merchant.lua delete mode 100644 Data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/large-lunged_laborer.lua delete mode 100644 Data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/long-legged_lady.lua delete mode 100644 Data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/mumpish_miqote.lua delete mode 100644 Data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/rururaji.lua delete mode 100644 Data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/tooth-grinding_traveler.lua delete mode 100644 Data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/uldah_opening_exit.lua delete mode 100644 Data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/yayatoki.lua delete mode 100644 Data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_4/PopulaceStandard/momodi.lua diff --git a/Data/scripts/commands/gm/warp.lua b/Data/scripts/commands/gm/warp.lua index c6e85e88..b919af83 100644 --- a/Data/scripts/commands/gm/warp.lua +++ b/Data/scripts/commands/gm/warp.lua @@ -55,7 +55,8 @@ function onTrigger(player, argc, p1, p2, p3, p4, privateArea, privateAreaType, n local x = tonumber(applyPositionOffset(p2, player_x)) or player_x; local y = tonumber(applyPositionOffset(p3, player_y)) or player_y; local z = tonumber(applyPositionOffset(p4, player_z)) or player_z; - if privateArea == "" then privateArea = nil end; + if privateArea == nil then privateArea = nil end; + if privateAreaType == nila then privateAreaType = 0 end; player:SendMessage(messageID, sender, string.format("setting coordinates X:%d Y:%d Z:%d to new zone (%d) private area:%s", x, y, z, zone, privateArea or "unspecified")); worldManager:DoZoneChange(player, zone, privateArea, tonumber(privateAreaType), 0x02, x, y, z, 0.00); end diff --git a/Data/scripts/quests/dft/DftSea.lua b/Data/scripts/quests/dft/DftSea.lua index 26d435c6..8fc40105 100644 --- a/Data/scripts/quests/dft/DftSea.lua +++ b/Data/scripts/quests/dft/DftSea.lua @@ -13,6 +13,270 @@ Contains all default lines for talkable npcs in the Sea Region (aka La Noscea). -- [ActorClassId] = "client_function_name" local defaultTalkSea = { [1234] = "defaultTalkWithLefchild_001" -- Lefchild + +--[[ + +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) +--]] + + + } function onTalk(player, quest, npc, eventName) diff --git a/Data/scripts/quests/man/man0u0.lua b/Data/scripts/quests/man/man0u0.lua index 15bb4720..a8f8e70c 100644 --- a/Data/scripts/quests/man/man0u0.lua +++ b/Data/scripts/quests/man/man0u0.lua @@ -4,13 +4,17 @@ require("global"); Quest Script -Name: Flowers for All +Name: Flowers for All Code: Man0u0 Id: 110009 Prereq: None (Given on chara creation) Notes: RURURAJI scripting handled via PopulaceChocoboLender.lua -TO-DO: Sequence 000 - Crowd NPCs. +TO-DO: Sequence 000 - Crowd NPCs. Sequence 010 - Adv. Guild NPCs + + +https://www.youtube.com/watch?v=XXGrSFrfYo4 + ]] -- Sequence Numbers @@ -36,7 +40,7 @@ OPENING_STOPER_ULDAH = 1090373; KEEN_EYED_MERCHANT = 1000401; --- MUMPISH_MIQOTE = 1000992; -- Unused on this client version +--MUMPISH_MIQOTE = 1000992; -- Unused on this client version. Calls processEvent020_6 HIGH_SPIRITED_FELLOW = 1001042; DISREPUTABLE_MIDLANDER = 1001044; LONG_LEGGED_LADY = 1001112; @@ -45,11 +49,33 @@ TOOTH_GRINDING_TRAVELER = 1001646; FULL_LIPPED_FILLE = 1001647; YAYATOKI = 1500129; -BLOCKER1 = 1090372; -BLOCKER2 = 1090372; +BLOCKER = 1090372; ULDAH_OPENING_EXIT = 1099046; ---1001114-1001140: Untargetable standby actors for sequence 000: Add the correct ones at some point +-- Non-interactive NPCs +CROWD_HYUR_M = 1001114; +CROWD_HYUR_F = 1001115; +CROWD_ELEZEN_M = 1001116; +CROWD_ELEZEN_F = 1001117; +CROWD_LALAFELL_M = 1001118; +CROWD_LALAFELL_F = 1001119; +CROWD_MIQOTE = 1001120; +CROWD_ROEGADYN = 1001121; +GUILD_KIORA = 1000780; +GUILD_OPONDHAO = 1000781; +GUILD_BERTRAM = 1000782; +GUILD_MINERVA = 1000783; +GUILD_ZOENGTERBIN = 1000784; +GUILD_STYRMOEYA = 1000785; +GUILD_YHAH_AMARIYO = 1000786; +GUILD_HILDIE = 1000787; +GUILD_LETTICE = 1000788; +GUILD_TYON = 1000789; +GUILD_OTOPA_POTTOPA = 1000864; +GUILD_THAISIE = 1000865; +GUILD_SESEBARU = 1001182; +GUILD_TOTONAWA = 1001371; +GUILD_EUSTACE = 1001372; -- Quest Markers @@ -70,7 +96,7 @@ FLAG_SEQ000_MINITUT3 = 3; -- TalkEvent GIL_DIGGING_MISTRESS FLAG_SEQ010_TALK0 = 0; -- TalkEvent YAYATOKI -function onStart(player, quest) +function onStart(player, quest) quest:StartSequence(SEQ_000); end @@ -82,17 +108,17 @@ function onSequence(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 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 exitFlag = quest:GetFlags() == 0xF and QFLAG_MAP or QFLAG_NONE; + local gildiggingmistressFlag = quest:GetFlag(FLAG_SEQ000_MINITUT3) and QFLAG_NONE or QFLAG_PLATE; + + local exitFlag = quest:GetFlags() == 0xF and QFLAG_MAP or QFLAG_NONE; if (asciliaCanPush) then fretfulfarmhandFlag = QFLAG_NONE; gildiggingmistressFlag = QFLAG_NONE; - end - + end + --AddENpc(classId, byte flagType=0,isTalkEnabled, isPushEnabled, isEmoteEnabled, isSpawned) quest:AddENpc(ASCILIA, asciliaFlag, true, asciliaCanPush); quest:AddENpc(WARBURTON); @@ -108,9 +134,9 @@ function onSequence(player, quest, sequence) quest:AddENpc(EXIT_TRIGGER, exitFlag, false, true); quest:AddENpc(OPENING_STOPER_ULDAH, QFLAG_NONE, false, false, true); - elseif (sequence == SEQ_010) then + elseif (sequence == SEQ_010) then local yayatokiFlag = quest:GetFlag(FLAG_SEQ010_TALK0) and QFLAG_NONE or QFLAG_PLATE; - local uldahopeningexitFlag = not quest:GetFlag(FLAG_SEQ010_TALK0) and QFLAG_NONE or QFLAG_MAP; + local uldahopeningexitFlag = QFLAG_MAP; quest:AddENpc(KEEN_EYED_MERCHANT); quest:AddENpc(HIGH_SPIRITED_FELLOW); quest:AddENpc(DISREPUTABLE_MIDLANDER); @@ -119,8 +145,7 @@ function onSequence(player, quest, sequence) quest:AddENpc(TOOTH_GRINDING_TRAVELER); quest:AddENpc(FULL_LIPPED_FILLE); quest:AddENpc(YAYATOKI, yayatokiFlag); - quest:AddENpc(BLOCKER1, QFLAG_NONE, false, true); - -- quest:AddENpc(BLOCKER2, QFLAG_NONE, false, true); + quest:AddENpc(BLOCKER, QFLAG_NONE, false, true); quest:AddENpc(ULDAH_OPENING_EXIT, uldahopeningexitFlag, false, true); end end @@ -128,39 +153,39 @@ 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); + seq010_onTalk(player, quest, npc, classId); end - quest:UpdateENPCs(); + quest:UpdateENPCs(); end function onPush(player, quest, npc) local sequence = quest:getSequence(); - local classId = npc:GetActorClassId(); + local classId = npc:GetActorClassId(); if (sequence == SEQ_000) then if (classId == ASCILIA) then - callClientFunction(player, "delegateEvent", player, quest, "processTtrNomal002"); + callClientFunction(player, "delegateEvent", player, quest, "processTtrNomal002"); player:EndEvent(); elseif (classId == EXIT_TRIGGER) then if (quest:GetFlags() == 0xF) then doExitTrigger(player, quest, npc); return; else - callClientFunction(player, "delegateEvent", player, quest, "processTtrBlkNml001"); + callClientFunction(player, "delegateEvent", player, quest, "processTtrBlkNml001"); GetWorldManager():DoPlayerMoveInZone(player, -22, 196, 87, 2.4, 0x11) player:EndEvent(); end end elseif (sequence == SEQ_010) then - if (classId == BLOCKER1) then - + if (classId == BLOCKER) then + posz = player:GetPos()[3]; - + if (posz >= 71 and posz <= 95) then callClientFunction(player, "delegateEvent", player, quest, "processTtrBlkNml002"); GetWorldManager():DoPlayerMoveInZone(player, -22.81, 196, 87.82, 2.98, 0x11); @@ -168,48 +193,48 @@ function onPush(player, quest, npc) callClientFunction(player, "delegateEvent", player, quest, "processTtrBlkNml003"); GetWorldManager():DoPlayerMoveInZone(player, -0.3, 196, 116, -2.7, 0x11); end - elseif (classId == ULDAH_OPENING_EXIT) then + elseif (classId == ULDAH_OPENING_EXIT) then player:ReplaceQuest(quest, "Man0u1") return; end end - quest:UpdateENPCs(); + quest:UpdateENPCs(); end function onNotice(player, quest, target) - callClientFunction(player, "delegateEvent", player, quest, "processTtrNomal001withHQ"); + callClientFunction(player, "delegateEvent", player, quest, "processTtrNomal001withHQ"); player:EndEvent(); - quest:UpdateENPCs(); + quest:UpdateENPCs(); end function seq000_onTalk(player, quest, npc, classId) - + if (classId == ASCILIA) then - - if (not quest: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 - else - callClientFunction(player, "delegateEvent", player, quest, "processTtrMini001"); + + if (not quest: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 + else + callClientFunction(player, "delegateEvent", player, quest, "processTtrMini001"); quest:SetFlag(FLAG_SEQ000_MINITUT1); -- Ascilia has now been talked to. end elseif (classId == FRETFUL_FARMHAND) then if (not quest:GetFlag(FLAG_SEQ000_MINITUT2)) then - callClientFunction(player, "delegateEvent", player, quest, "processTtrMini002_first"); - quest:SetFlag(FLAG_SEQ000_MINITUT2); - else - callClientFunction(player, "delegateEvent", player, quest, "processTtrMini002"); - end + callClientFunction(player, "delegateEvent", player, quest, "processTtrMini002_first"); + quest: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 - callClientFunction(player, "delegateEvent", player, quest, "processTtrMini003_first"); - quest:SetFlag(FLAG_SEQ000_MINITUT3); - else - callClientFunction(player, "delegateEvent", player, quest, "processTtrMini003"); - end - + callClientFunction(player, "delegateEvent", player, quest, "processTtrMini003_first"); + quest:SetFlag(FLAG_SEQ000_MINITUT3); + else + callClientFunction(player, "delegateEvent", player, quest, "processTtrMini003"); + end + elseif (classId == WARBURTON) then callClientFunction(player, "delegateEvent", player, quest, "processEvent000_3"); elseif (classId == RURURAJI) then @@ -231,10 +256,10 @@ function seq000_onTalk(player, quest, npc, classId) player:EndEvent(); end -function seq010_onTalk(player, quest, npc, classId) +function seq010_onTalk(player, quest, npc, classId) if (classId == KEEN_EYED_MERCHANT) then - callClientFunction(player, "delegateEvent", player, quest, "processEvent020_2"); + callClientFunction(player, "delegateEvent", player, quest, "processEvent020_2"); elseif (classId == HIGH_SPIRITED_FELLOW) then callClientFunction(player, "delegateEvent", player, quest, "processEvent020_3"); elseif (classId == DISREPUTABLE_MIDLANDER) then @@ -262,22 +287,21 @@ end function getJournalMapMarkerList(player, quest) local sequence = quest:getSequence(); local possibleMarkers = {}; - + if (sequence == SEQ_000) then - if (quest:GetFlag(FLAG_SEQ000_MINITUT0)) 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 end - + elseif (sequence == SEQ_010) then - if (not quest:GetFlag(FLAG_SEQ010_TALK0)) then + if (not quest:GetFlag(FLAG_SEQ010_TALK0)) then table.insert(possibleMarkers, MRKR_YAYATOKI) - else - table.insert(possibleMarkers, MRKR_ADV_GUILD); end + table.insert(possibleMarkers, MRKR_ADV_GUILD); end - + return unpack(possibleMarkers) end @@ -288,19 +312,19 @@ function doExitTrigger(player, quest, npc) quest:ClearData(); quest:StartSequence(SEQ_005); contentArea = player.CurrentArea:CreateContentArea(player, "/Area/PrivateArea/Content/PrivateAreaMasterSimpleContent", "man0u01", "SimpleContent30079", "Quest/QuestDirectorMan0u001"); - + if (contentArea == nil) then return; end - - director = contentArea:GetContentDirector(); - player:AddDirector(director); + + director = contentArea:GetContentDirector(); + player:AddDirector(director); director:StartDirector(false); - + player:KickEvent(director, "noticeEvent", true); - player:SetLoginDirector(director); - - GetWorldManager():DoZoneChangeContent(player, contentArea, -24.34, 192, 34.22, 0.78, 16); + player:SetLoginDirector(director); + + GetWorldManager():DoZoneChangeContent(player, contentArea, -24.34, 192, 34.22, 0.78, 16); return; end diff --git a/Data/scripts/quests/man/man0u1.lua b/Data/scripts/quests/man/man0u1.lua index d582aa7a..1de8bf9d 100644 --- a/Data/scripts/quests/man/man0u1.lua +++ b/Data/scripts/quests/man/man0u1.lua @@ -98,7 +98,7 @@ SPRY_SALESMAN = 1000939; UPBEAT_ADVENTURER = 1000940; SEEMINGLY_CALM_ADVENTURER = 1000941; UNKNOWN1 = 0; -UNKNOWN2 = 0 +UNKNOWN2 = 0; THANCRED = 1000948; -- 1000010 @@ -119,6 +119,7 @@ function onStart(player, quest) -- Immediately move to the Adventurer's Guild private area callClientFunction(player, "delegateEvent", player, quest, "processEventMomodiStart"); + GetWorldManager():DoZoneChange(player, 175, "PrivateAreaMasterPast", 4, 15, -75.242, 195.009, 74.572, -0.046); player:SendGameMessage(quest, 329, 0x20); player:SendGameMessage(quest, 330, 0x20); end diff --git a/Data/scripts/unique/wil0Battle01/MapObjOnlyShowHide/Man0u0_trtl_gate.lua b/Data/scripts/unique/wil0Battle01/MapObjOnlyShowHide/Man0u0_trtl_gate.lua deleted file mode 100644 index 56e69c09..00000000 --- a/Data/scripts/unique/wil0Battle01/MapObjOnlyShowHide/Man0u0_trtl_gate.lua +++ /dev/null @@ -1,3 +0,0 @@ -function init(npc) - return false, false, 0, 0, 0x1A5, 4287; -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Battle01/MapObjOnlyShowHide/man0u0_tutrl_gate.lua b/Data/scripts/unique/wil0Battle01/MapObjOnlyShowHide/man0u0_tutrl_gate.lua new file mode 100644 index 00000000..97f1ad42 --- /dev/null +++ b/Data/scripts/unique/wil0Battle01/MapObjOnlyShowHide/man0u0_tutrl_gate.lua @@ -0,0 +1,3 @@ +function init(npc) + return false, false, 0, 0, 0x1A5, 4289; +end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Battle01/PopulaceChocoboLender/rururaji.lua b/Data/scripts/unique/wil0Battle01/PopulaceChocoboLender/rururaji.lua deleted file mode 100644 index 903ca699..00000000 --- a/Data/scripts/unique/wil0Battle01/PopulaceChocoboLender/rururaji.lua +++ /dev/null @@ -1,8 +0,0 @@ -require ("global") -require ("quests/man/man0u0") - -function onEventStarted(player, npc, triggerName) - man0u0Quest = GetStaticActor("Man0u0"); - callClientFunction(player, "delegateEvent", player, man0u0Quest, "processEvent000_13", nil, nil, nil); - player:EndEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Battle01/PopulaceStandard/ascilia.lua b/Data/scripts/unique/wil0Battle01/PopulaceStandard/ascilia.lua deleted file mode 100644 index 4491c814..00000000 --- a/Data/scripts/unique/wil0Battle01/PopulaceStandard/ascilia.lua +++ /dev/null @@ -1,52 +0,0 @@ -require ("global") -require ("quests/man/man0u0") - -function onSpawn(player, npc) - npc:SetQuestGraphic(player, 0x2); -end - -function onEventStarted(player, npc, triggerName) - man0u0Quest = player:GetQuest("Man0u0"); - - if (man0u0Quest ~= nil) then - if (man0u0Quest:GetQuestFlag(MAN0U0_FLAG_MINITUT_DONE1) == false) then - npc:SetQuestGraphic(player, 0x2); - end - - if (man0u0Quest:GetQuestFlag(MAN0U0_FLAG_TUTORIAL3_DONE) == true) then - player:SetEventStatus(npc, "pushDefault", false, 0x2); - end - end - - if (man0u0Quest ~= nil) then - if (triggerName == "pushDefault") then - callClientFunction(player, "delegateEvent", player, man0u0Quest, "processTtrNomal002", nil, nil, nil); - elseif (triggerName == "talkDefault") then - --Is doing talk tutorial? - if (man0u0Quest:GetQuestFlag(MAN0U0_FLAG_TUTORIAL3_DONE) == false) then - player:SetEventStatus(npc, "pushDefault", false, 0x2); - callClientFunction(player, "delegateEvent", player, man0u0Quest, "processTtrNomal003", nil, nil, nil); - man0u0Quest:SetQuestFlag(MAN0U0_FLAG_TUTORIAL3_DONE, true); - npc:SetQuestGraphic(player, 0x2); - man0u0Quest:SaveData(); - - player:GetDirector("OpeningDirector"):onTalkEvent(player, npc); - --Was he talked to for the mini tutorial? - else - callClientFunction(player, "delegateEvent", player, man0u0Quest, "processTtrMini001", nil, nil, nil); - if (man0u0Quest:GetQuestFlag(MAN0U0_FLAG_MINITUT_DONE1) == false) then - npc:SetQuestGraphic(player, 0x0); - man0u0Quest:SetQuestFlag(MAN0U0_FLAG_MINITUT_DONE1, true); - man0u0Quest:SaveData(); - end - - end - - player:GetDirector("OpeningDirector"):onTalkEvent(player, npc); - else - player:EndEvent(); - end - end - - player:EndEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Battle01/PopulaceStandard/big-bellied_barker.lua b/Data/scripts/unique/wil0Battle01/PopulaceStandard/big-bellied_barker.lua deleted file mode 100644 index a179ee3e..00000000 --- a/Data/scripts/unique/wil0Battle01/PopulaceStandard/big-bellied_barker.lua +++ /dev/null @@ -1,8 +0,0 @@ -require ("global") -require ("quests/man/man0u0") - -function onEventStarted(player, npc, triggerName) - man0u0Quest = GetStaticActor("Man0u0"); - callClientFunction(player, "delegateEvent", player, man0u0Quest, "processEvent000_6", nil, nil, nil); - player:EndEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Battle01/PopulaceStandard/dapper_dan.lua b/Data/scripts/unique/wil0Battle01/PopulaceStandard/dapper_dan.lua deleted file mode 100644 index 8d61d910..00000000 --- a/Data/scripts/unique/wil0Battle01/PopulaceStandard/dapper_dan.lua +++ /dev/null @@ -1,8 +0,0 @@ -require ("global") -require ("quests/man/man0u0") - -function onEventStarted(player, npc, triggerName) - man0u0Quest = GetStaticActor("Man0u0"); - callClientFunction(player, "delegateEvent", player, man0u0Quest, "processEvent000_9", nil, nil, nil); - player:EndEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Battle01/PopulaceStandard/debauched_demoness.lua b/Data/scripts/unique/wil0Battle01/PopulaceStandard/debauched_demoness.lua deleted file mode 100644 index 0f6c595a..00000000 --- a/Data/scripts/unique/wil0Battle01/PopulaceStandard/debauched_demoness.lua +++ /dev/null @@ -1,8 +0,0 @@ -require ("global") -require ("quests/man/man0u0") - -function onEventStarted(player, npc, triggerName) - man0u0Quest = GetStaticActor("Man0u0"); - callClientFunction(player, "delegateEvent", player, man0u0Quest, "processEvent000_8", nil, nil, nil); - player:EndEvent(); -end diff --git a/Data/scripts/unique/wil0Battle01/PopulaceStandard/exit_trigger.lua b/Data/scripts/unique/wil0Battle01/PopulaceStandard/exit_trigger.lua deleted file mode 100644 index 1118f89d..00000000 --- a/Data/scripts/unique/wil0Battle01/PopulaceStandard/exit_trigger.lua +++ /dev/null @@ -1,46 +0,0 @@ -require ("global") -require ("quests/man/man0u0") - -function onSpawn(player, npc) - - man0u0Quest = player:GetQuest("Man0u0"); - - if (man0u0Quest ~= nil) then - player:SetEventStatus(npc, "pushDefault", true, 0x2); - if (man0u0Quest ~= nil and man0u0Quest:GetQuestFlag(MAN0U0_FLAG_MINITUT_DONE1) == true and man0U0Quest:GetQuestFlag(MAN0U0_FLAG_MINITUT_DONE2) == true and man0u0Quest:GetQuestFlag(MAN0U0_FLAG_MINITUT_DONE3) == true) then - npc:SetQuestGraphic(player, 0x3); - else - npc:SetQuestGraphic(player, 0x0); - end - end - -end - -function onEventStarted(player, npc, triggerName) - man0u0Quest = GetStaticActor("Man0u0"); - - if (man0u0Quest:GetQuestFlag(MAN0U0_FLAG_MINITUT_DONE1) ~= true) then - print "AAAA" - end - - if (man0u0Quest ~= nil and man0u0Quest:GetQuestFlag(MAN0U0_FLAG_MINITUT_DONE1) == true and man0u0Quest:GetQuestFlag(MAN0U0_FLAG_MINITUT_DONE2) == true and man0u0Quest:GetQuestFlag(MAN0U0_FLAG_MINITUT_DONE3) == true) then - player:EndEvent(); - - contentArea = player:GetZone():CreateContentArea(player, "/Area/PrivateArea/Content/PrivateAreaMasterSimpleContent", "man0u01", "SimpleContent30079", "Quest/QuestDirectorMan0u001"); - - if (contentArea == nil) then - player:EndEvent(); - return; - end - - director = contentArea:GetContentDirector(); - player:AddDirector(director); - director:StartDirector(false); - - player:KickEvent(director, "noticeEvent", true); - player:SetLoginDirector(director); - - GetWorldManager():DoZoneChangeContent(player, contentArea, -24.34, 192, 34.22, 0.78, 16); - end - -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Battle01/PopulaceStandard/fretful_farmhand.lua b/Data/scripts/unique/wil0Battle01/PopulaceStandard/fretful_farmhand.lua deleted file mode 100644 index 30ce2c1b..00000000 --- a/Data/scripts/unique/wil0Battle01/PopulaceStandard/fretful_farmhand.lua +++ /dev/null @@ -1,31 +0,0 @@ -require ("global") -require ("quests/man/man0u0") - -function onSpawn(player, npc) - man0u0Quest = player:GetQuest("Man0u0"); - - if (man0u0Quest ~= nil) then - if (man0u0Quest:GetQuestFlag(MAN0U0_FLAG_MINITUT_DONE1) == false) then - npc:SetQuestGraphic(player, 0x2); - end - end -end - -function onEventStarted(player, npc, triggerName) - man0u0Quest = player:GetQuest("Man0u0"); - - if (man0u0Quest ~= nil) then - if (triggerName == "talkDefault") then - if (man0u0Quest:GetQuestFlag(MAN0U0_FLAG_MINITUT_DONE2) == false) then - callClientFunction(player, "delegateEvent", player, man0u0Quest, "processTtrMini002_first", nil, nil, nil); - npc:SetQuestGraphic(player, 0x0); - man0u0Quest:SetQuestFlag(MAN0U0_FLAG_MINITUT_DONE2, true); - man0u0Quest:SaveData(); - player:GetDirector("OpeningDirector"):onTalkEvent(player, npc); - else - callClientFunction(player, "delegateEvent", player, man0u0Quest, "processTtrMini002", nil, nil, nil); - end - end - end - player:EndEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Battle01/PopulaceStandard/gil-digging_mistress.lua b/Data/scripts/unique/wil0Battle01/PopulaceStandard/gil-digging_mistress.lua deleted file mode 100644 index 1f0afb17..00000000 --- a/Data/scripts/unique/wil0Battle01/PopulaceStandard/gil-digging_mistress.lua +++ /dev/null @@ -1,31 +0,0 @@ -require ("global") -require ("quests/man/man0u0") - -function onSpawn(player, npc) - man0u0Quest = player:GetQuest("Man0u0"); - - if (man0u0Quest ~= nil) then - if (man0u0Quest:GetQuestFlag(MAN0U0_FLAG_MINITUT_DONE3) == false) then - npc:SetQuestGraphic(player, 0x2); - end - end -end - -function onEventStarted(player, npc, triggerName) - man0u0Quest = player:GetQuest("Man0u0"); - - if (man0u0Quest ~= nil) then - if (triggerName == "talkDefault") then - if (man0u0Quest:GetQuestFlag(MAN0U0_FLAG_MINITUT_DONE3) == false) then - callClientFunction(player, "delegateEvent", player, man0u0Quest, "processTtrMini003_first", nil, nil, nil); - npc:SetQuestGraphic(player, 0x0); - man0u0Quest:SetQuestFlag(MAN0U0_FLAG_MINITUT_DONE3, true); - man0u0Quest:SaveData(); - player:GetDirector("OpeningDirector"):onTalkEvent(player, npc); - else - callClientFunction(player, "delegateEvent", player, man0u0Quest, "processTtrMini003", nil, nil, nil); - end - end - end - player:EndEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Battle01/PopulaceStandard/loutish_lad.lua b/Data/scripts/unique/wil0Battle01/PopulaceStandard/loutish_lad.lua deleted file mode 100644 index bf687f2b..00000000 --- a/Data/scripts/unique/wil0Battle01/PopulaceStandard/loutish_lad.lua +++ /dev/null @@ -1,8 +0,0 @@ -require ("global") -require ("quests/man/man0u0") - -function onEventStarted(player, npc, triggerName) - man0u0Quest = GetStaticActor("Man0u0"); - callClientFunction(player, "delegateEvent", player, man0u0Quest, "processEvent000_10", nil, nil, nil); - player:EndEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Battle01/PopulaceStandard/rururaji.lua b/Data/scripts/unique/wil0Battle01/PopulaceStandard/rururaji.lua deleted file mode 100644 index 903ca699..00000000 --- a/Data/scripts/unique/wil0Battle01/PopulaceStandard/rururaji.lua +++ /dev/null @@ -1,8 +0,0 @@ -require ("global") -require ("quests/man/man0u0") - -function onEventStarted(player, npc, triggerName) - man0u0Quest = GetStaticActor("Man0u0"); - callClientFunction(player, "delegateEvent", player, man0u0Quest, "processEvent000_13", nil, nil, nil); - player:EndEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Battle01/PopulaceStandard/stocky_stranger.lua b/Data/scripts/unique/wil0Battle01/PopulaceStandard/stocky_stranger.lua deleted file mode 100644 index f8182940..00000000 --- a/Data/scripts/unique/wil0Battle01/PopulaceStandard/stocky_stranger.lua +++ /dev/null @@ -1,8 +0,0 @@ -require ("global") -require ("quests/man/man0u0") - -function onEventStarted(player, npc, triggerName) - man0u0Quest = GetStaticActor("Man0u0"); - callClientFunction(player, "delegateEvent", player, man0u0Quest, "processEvent000_6_2", nil, nil, nil); - player:EndEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Battle01/PopulaceStandard/twittering_tomboy.lua b/Data/scripts/unique/wil0Battle01/PopulaceStandard/twittering_tomboy.lua deleted file mode 100644 index b768cebe..00000000 --- a/Data/scripts/unique/wil0Battle01/PopulaceStandard/twittering_tomboy.lua +++ /dev/null @@ -1,8 +0,0 @@ -require ("global") -require ("quests/man/man0u0") - -function onEventStarted(player, npc, triggerName) - man0u0Quest = GetStaticActor("Man0u0"); - callClientFunction(player, "delegateEvent", player, man0u0Quest, "processEvent000_12", nil, nil, nil); - player:EndEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Battle01/PopulaceStandard/warburton.lua b/Data/scripts/unique/wil0Battle01/PopulaceStandard/warburton.lua deleted file mode 100644 index 4dfcc5a4..00000000 --- a/Data/scripts/unique/wil0Battle01/PopulaceStandard/warburton.lua +++ /dev/null @@ -1,8 +0,0 @@ -require ("global") -require ("quests/man/man0u0") - -function onEventStarted(player, npc, triggerName) - man0u0Quest = GetStaticActor("Man0u0"); - callClientFunction(player, "delegateEvent", player, man0u0Quest, "processEvent000_3", nil, nil, nil); - player:EndEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/blocker1.lua b/Data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/blocker1.lua deleted file mode 100644 index 729f1ce1..00000000 --- a/Data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/blocker1.lua +++ /dev/null @@ -1,13 +0,0 @@ -require ("global") -require ("quests/man/man0u0") - -function onEventStarted(player, npc, triggerName) - man0u0Quest = GetStaticActor("Man0u0"); - - if (man0u0Quest ~= nil) then - callClientFunction(player, "delegateEvent", player, man0u0Quest, "processTtrBlkNml002", nil, nil, nil); - GetWorldManager():DoZoneChange(player, 175, "PrivateAreaMasterPast", 3, 15, -22.81, 196, 87.82, 2.98); - end - - player:EndEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/blocker2.lua b/Data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/blocker2.lua deleted file mode 100644 index 40598fb4..00000000 --- a/Data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/blocker2.lua +++ /dev/null @@ -1,14 +0,0 @@ -require ("global") -require ("quests/man/man0u0") - -function onEventStarted(player, npc, triggerName) - man0u0Quest = GetStaticActor("Man0u0"); - - if (man0u0Quest ~= nil) then - callClientFunction(player, "delegateEvent", player, man0u0Quest, "processTtrBlkNml003", nil, nil, nil); - GetWorldManager():DoZoneChange(player, 175, "PrivateAreaMasterPast", 3, 15, -22.81, 196, 87.82, 2.98); - end - - player:EndEvent(); - -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/disreputable_midlander.lua b/Data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/disreputable_midlander.lua deleted file mode 100644 index 3c895bb5..00000000 --- a/Data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/disreputable_midlander.lua +++ /dev/null @@ -1,8 +0,0 @@ -require ("global") -require ("quests/man/man0u0") - -function onEventStarted(player, npc, triggerName) - man0u0Quest = GetStaticActor("Man0u0"); - callClientFunction(player, "delegateEvent", player, man0u0Quest, "processEvent020_4"); - player:EndEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/full-lipped_fille.lua b/Data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/full-lipped_fille.lua deleted file mode 100644 index 7858c31a..00000000 --- a/Data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/full-lipped_fille.lua +++ /dev/null @@ -1,8 +0,0 @@ -require ("global") -require ("quests/man/man0u0") - -function onEventStarted(player, npc, triggerName) - man0u0Quest = GetStaticActor("Man0u0"); - callClientFunction(player, "delegateEvent", player, man0u0Quest, "processEtc002"); - player:EndEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/high-spirited_fellow.lua b/Data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/high-spirited_fellow.lua deleted file mode 100644 index a6182b5f..00000000 --- a/Data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/high-spirited_fellow.lua +++ /dev/null @@ -1,8 +0,0 @@ -require ("global") -require ("quests/man/man0u0") - -function onEventStarted(player, npc, triggerName) - man0u0Quest = GetStaticActor("Man0u0"); - callClientFunction(player, "delegateEvent", player, man0u0Quest, "processEvent020_3"); - player:EndEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/keen-eyed_merchant.lua b/Data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/keen-eyed_merchant.lua deleted file mode 100644 index c0fd4106..00000000 --- a/Data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/keen-eyed_merchant.lua +++ /dev/null @@ -1,8 +0,0 @@ -require ("global") -require ("quests/man/man0u0") - -function onEventStarted(player, npc, triggerName) - man0u0Quest = GetStaticActor("Man0u0"); - callClientFunction(player, "delegateEvent", player, man0u0Quest, "processEvent020_2"); - player:EndEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/large-lunged_laborer.lua b/Data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/large-lunged_laborer.lua deleted file mode 100644 index 8a6c0029..00000000 --- a/Data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/large-lunged_laborer.lua +++ /dev/null @@ -1,8 +0,0 @@ -require ("global") -require ("quests/man/man0u0") - -function onEventStarted(player, npc, triggerName) - man0u0Quest = GetStaticActor("Man0u0"); - callClientFunction(player, "delegateEvent", player, man0u0Quest, "processEtc003"); - player:EndEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/long-legged_lady.lua b/Data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/long-legged_lady.lua deleted file mode 100644 index 9335baad..00000000 --- a/Data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/long-legged_lady.lua +++ /dev/null @@ -1,8 +0,0 @@ -require ("global") -require ("quests/man/man0u0") - -function onEventStarted(player, npc, triggerName) - man0u0Quest = GetStaticActor("Man0u0"); - callClientFunction(player, "delegateEvent", player, man0u0Quest, "processEvent000_14"); - player:EndEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/mumpish_miqote.lua b/Data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/mumpish_miqote.lua deleted file mode 100644 index b4512aaa..00000000 --- a/Data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/mumpish_miqote.lua +++ /dev/null @@ -1,8 +0,0 @@ -require ("global") -require ("quests/man/man0u0") - -function onEventStarted(player, npc, triggerName) - man0u0Quest = GetStaticActor("Man0u0"); - callClientFunction(player, "delegateEvent", player, man0u0Quest, "processEvent020_6"); - player:EndEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/rururaji.lua b/Data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/rururaji.lua deleted file mode 100644 index 397e1461..00000000 --- a/Data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/rururaji.lua +++ /dev/null @@ -1,8 +0,0 @@ -require ("global") -require ("quests/man/man0u0") - -function onEventStarted(player, npc, triggerName) - man0u0Quest = GetStaticActor("Man0u0"); - callClientFunction(player, "delegateEvent", player, man0u0Quest, "processEvent020_7"); - player:EndEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/tooth-grinding_traveler.lua b/Data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/tooth-grinding_traveler.lua deleted file mode 100644 index 18a3d88f..00000000 --- a/Data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/tooth-grinding_traveler.lua +++ /dev/null @@ -1,8 +0,0 @@ -require ("global") -require ("quests/man/man0u0") - -function onEventStarted(player, npc, triggerName) - man0u0Quest = GetStaticActor("Man0u0"); - callClientFunction(player, "delegateEvent", player, man0u0Quest, "processEtc001"); - player:EndEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/uldah_opening_exit.lua b/Data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/uldah_opening_exit.lua deleted file mode 100644 index 2aef1669..00000000 --- a/Data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/uldah_opening_exit.lua +++ /dev/null @@ -1,16 +0,0 @@ -require ("global") -require ("quests/man/man0u0") - -function onSpawn(player, npc) - npc:SetQuestGraphic(player, 0x3); -end - -function onEventStarted(player, npc) - man0u1Quest = GetStaticActor("Man0u1"); - callClientFunction(player, "delegateEvent", player, man0u1Quest, "processEventMomodiStart"); - player:ReplaceQuest(110009, 110010); - player:SendGameMessage(GetStaticActor("Man0u1"), 329, 0x20); - player:SendGameMessage(GetStaticActor("Man0u1"), 330, 0x20); - GetWorldManager():DoZoneChange(player, 175, "PrivateAreaMasterPast", 4, 15, -75.242, 195.009, 74.572, -0.046); - player:endEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/yayatoki.lua b/Data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/yayatoki.lua deleted file mode 100644 index 1f2fc5a1..00000000 --- a/Data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/yayatoki.lua +++ /dev/null @@ -1,13 +0,0 @@ -require ("global") -require ("quests/man/man0u0") - -function onSpawn(player, npc) - npc:SetQuestGraphic(player, 0x2); -end - -function onEventStarted(player, npc, triggerName) - man0u0Quest = GetStaticActor("Man0u0"); - callClientFunction(player, "delegateEvent", player, man0u0Quest, "processEvent020_8"); - npc:SetQuestGraphic(player, 0x0); - player:EndEvent(); -end \ No newline at end of file diff --git a/Data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_4/PopulaceStandard/momodi.lua b/Data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_4/PopulaceStandard/momodi.lua deleted file mode 100644 index 03cdfed4..00000000 --- a/Data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_4/PopulaceStandard/momodi.lua +++ /dev/null @@ -1,26 +0,0 @@ -require ("global") - -function onSpawn(player, npc) - npc:SetQuestGraphic(player, 0x2); -end - -function onEventStarted(player, npc, triggerName) - local man0u1Quest = player:GetQuest("Man0u1"); - local pos = player:GetPos(); - - if (man0u1Quest ~= nil) then - callClientFunction(player, "delegateEvent", player, man0u1Quest, "processEvent010"); - player:EndEvent(); - - --[[director = player:GetZone():CreateDirector("AfterQuestWarpDirector"); - player:KickEvent(director, "noticeEvent", true); - player:AddDirector(director); - player:SetLoginDirector(director); - --]] - GetWorldManager():DoZoneChange(player, 175, nil, 0, 15, pos[0], pos[1], pos[2], pos[3]); - return; - end - - player:EndEvent(); - -end \ No newline at end of file