From b3756be46451facdf77ec557e4d4e428a0247ff7 Mon Sep 17 00:00:00 2001 From: claywar Date: Sat, 7 Sep 2024 06:15:19 -0400 Subject: [PATCH 1/3] [chore] Annotate Mission scripts with TMission type --- .../acp/01_A_Crystalline_Prophecy.lua | 1 + .../missions/amk/01_A_Moogle_Kupo_dEtat.lua | 1 + .../02_Drenched_It_Began_with_a_Raindrop.lua | 1 + .../amk/03_Hasten_In_a_Jam_in_Jeuno.lua | 1 + .../04_Welcome_To_My_Decrepit_Domicile.lua | 1 + ...05_Curses_A_Horrifically_Harrowing_Hex.lua | 1 + .../amk/06_An_Errand_The_Professors_Price.lua | 1 + .../07_Shock_Arrant_Abuse_of_Authority.lua | 1 + .../08_Lender_Beware_Read_the_Fine_Print.lua | 1 + .../amk/09_Rescue_A_Moogles_Labor_of_Love.lua | 1 + .../10_Roar_A_Cat_Burglar_Bares_Her_Fangs.lua | 1 + .../amk/11_Relief_A_Triumphant_Return.lua | 1 + .../12_Joy_Summoned_to_a_Fabulous_Fete.lua | 1 + .../13_A_Challenge_You_Could_Be_a_Winner.lua | 1 + .../amk/14_Smash_A_Malevolent_Menace.lua | 1 + .../missions/asa/01_A_Shantotto_Ascension.lua | 1 + scripts/missions/asa/02_Burgeoning_Dread.lua | 1 + .../asa/03_That_Which_Curdles_Blood.lua | 1 + .../asa/04_Sugar-Coated_Directive.lua | 1 + .../missions/asa/05_Enemy_Of_The_Empire_I.lua | 1 + .../missions/bastok/1_1_The_Zeruhn_Report.lua | 1 + .../bastok/1_2_A_Geological_Survey.lua | 1 + scripts/missions/bastok/1_3_Fetichism.lua | 1 + .../missions/bastok/2_1_The_Crystal_Line.lua | 1 + scripts/missions/bastok/2_2_Wading_Beasts.lua | 1 + .../missions/bastok/2_3_0_The_Emissary.lua | 1 + .../bastok/2_3_1_The_Emissary_Sandoria.lua | 1 + .../bastok/2_3_2_The_Emissary_Windurst.lua | 1 + .../bastok/2_3_3_The_Emissary_Sandoria2.lua | 1 + .../bastok/2_3_4_The_Emissary_Windurst2.lua | 1 + .../bastok/3_1_The_Four_Musketeers.lua | 1 + .../bastok/3_2_To_the_Forsaken_Mines.lua | 1 + scripts/missions/bastok/3_3_Jeuno.lua | 1 + scripts/missions/bastok/4_1_Magicite.lua | 1 + .../missions/bastok/5_1_Darkness_Rising.lua | 1 + .../bastok/5_2_Xarcabard_Land_of_Truths.lua | 1 + .../bastok/6_1_Return_of_the_Talekeeper.lua | 1 + .../missions/bastok/6_2_The_Pirates_Cove.lua | 1 + .../missions/bastok/7_1_The_Final_Image.lua | 1 + scripts/missions/bastok/7_2_On_My_Way.lua | 1 + .../bastok/8_1_The_Chains_That_Bind_Us.lua | 1 + .../bastok/8_2_Enter_the_Talekeeper.lua | 1 + .../bastok/9_1_The_Salt_of_the_Earth.lua | 1 + .../bastok/9_2_Where_Two_Paths_Converge.lua | 1 + .../missions/cop/1_1_The_Rites_of_Life.lua | 1 + scripts/missions/cop/1_2_Below_the_Arks.lua | 1 + .../missions/cop/1_3_The_Mothercrystals.lua | 1 + .../missions/cop/2_1_An_Invitation_West.lua | 1 + scripts/missions/cop/2_2_The_Lost_City.lua | 1 + scripts/missions/cop/2_3_Distant_Beliefs.lua | 1 + .../missions/cop/2_4_An_Eternal_Melody.lua | 1 + scripts/missions/cop/2_5_Ancient_Vows.lua | 1 + .../cop/3_1_The_Call_of_the_Wyrmking.lua | 1 + .../cop/3_2_A_Vessel_Without_a_Captain.lua | 1 + scripts/missions/cop/3_3_The_Road_Forks.lua | 1 + .../missions/cop/3_4_Tending_Aged_Wounds.lua | 1 + scripts/missions/cop/3_5_Darkness_Named.lua | 1 + scripts/missions/cop/4_1_Sheltering_Doubt.lua | 1 + scripts/missions/cop/4_2_The_Savage.lua | 1 + .../cop/4_3_The_Secrets_of_Worship.lua | 1 + .../missions/cop/4_4_Slanderous_Utterings.lua | 1 + .../cop/5_1_The_Enduring_Tumult_of_War.lua | 1 + .../missions/cop/5_2_Desires_of_Emptiness.lua | 1 + scripts/missions/cop/5_3_Three_Paths.lua | 1 + .../cop/6_1_For_Whom_the_Verse_is_Sung.lua | 1 + .../missions/cop/6_2_A_Place_to_Return.lua | 1 + .../cop/6_3_More_Questions_than_Answers.lua | 1 + scripts/missions/cop/6_4_One_to_be_Feared.lua | 1 + scripts/missions/cop/7_1_Chains_and_Bonds.lua | 1 + .../cop/7_2_Flames_in_the_Darkness.lua | 1 + .../cop/7_3_Fire_in_the_Eyes_of_Men.lua | 1 + .../cop/7_4_Calm_Before_the_Storm.lua | 1 + .../missions/cop/7_5_The_Warriors_Path.lua | 1 + .../missions/cop/8_1_Garden_of_Antiquity.lua | 1 + scripts/missions/cop/8_2_A_Fate_Decided.lua | 1 + scripts/missions/cop/8_3_When_Angels_Fall.lua | 1 + scripts/missions/cop/8_4_Dawn.lua | 1 + scripts/missions/rotz/01_The_New_Frontier.lua | 1 + scripts/missions/rotz/02_Welcome_to_Norg.lua | 1 + .../missions/rotz/03_Kazhams_Chieftainess.lua | 1 + .../rotz/04_The_Temple_of_Uggalepih.lua | 1 + .../missions/rotz/05_Headstone_Pilgrimage.lua | 1 + .../rotz/06_Through_the_Quicksand_Caves.lua | 1 + .../rotz/07_The_Chamber_of_Oracles.lua | 1 + .../rotz/08_Return_to_Delkfutts_Tower.lua | 1 + scripts/missions/rotz/09_RoMaeve.lua | 1 + .../rotz/10_The_Temple_of_Desolation.lua | 1 + .../missions/rotz/11_The_Hall_of_the_Gods.lua | 1 + .../rotz/12_The_Mithra_and_the_Crystal.lua | 1 + .../missions/rotz/13_The_Gate_of_the_Gods.lua | 1 + scripts/missions/rotz/14_Ark_Angels.lua | 1 + .../missions/rotz/15_The_Sealed_Shrine.lua | 1 + .../missions/rotz/16_The_Celestial_Nexus.lua | 1 + scripts/missions/rotz/17_Awakening.lua | 1 + .../rov/1_01_Rhapsodies_of_Vanadiel.lua | 1 + scripts/missions/rov/1_02_Resonance.lua | 1 + .../rov/1_03_Emissary_from_the_Seas.lua | 1 + scripts/missions/rov/1_04_Set_Free.lua | 1 + scripts/missions/rov/1_05_The_Beginning.lua | 1 + .../missions/rov/1_06_Flames_of_Prayer.lua | 1 + .../missions/rov/1_07_The_Path_Untraveled.lua | 1 + scripts/missions/rov/1_08_At_Heavens_Door.lua | 1 + scripts/missions/rov/1_09_The_Lions_Roar.lua | 1 + .../missions/rov/1_10_Eddies_of_Despair_I.lua | 1 + .../missions/rov/1_11_A_Land_After_Time.lua | 1 + scripts/missions/rov/1_12_Fates_Call.lua | 1 + .../missions/rov/1_13_What_Lies_Beyond.lua | 1 + .../missions/rov/1_14_The_Ties_that_Bind.lua | 1 + scripts/missions/rov/1_15_Impurity.lua | 1 + scripts/missions/rov/1_16_The_Lost_Avatar.lua | 1 + scripts/missions/rov/1_17_Volto_Oscuro.lua | 1 + scripts/missions/rov/1_18_Ring_My_Bell.lua | 1 + scripts/missions/rov/2_01_Spirits_Awoken.lua | 1 + scripts/missions/rov/2_02_Crashing_Waves.lua | 1 + scripts/missions/rov/2_03_Call_to_Serve.lua | 1 + scripts/missions/rov/2_04_Numbering_Days.lua | 1 + .../missions/rov/2_05_Inescapable_Binds.lua | 1 + scripts/missions/rov/2_06_Desert_Winds.lua | 1 + scripts/missions/rov/2_07_Ever_Forward.lua | 1 + scripts/missions/rov/2_09_Aphmaus_Light.lua | 1 + scripts/missions/rov/2_10_Reunited.lua | 1 + scripts/missions/rov/2_11_Take_Wing.lua | 1 + scripts/missions/rov/2_12_Prime_Number.lua | 1 + scripts/missions/rov/2_13_From_the_Ruins.lua | 1 + scripts/missions/rov/2_14_Cauterize.lua | 1 + .../rov/2_15_Uncertain_Destinations.lua | 1 + scripts/missions/rov/2_16_Ganged_Up_On.lua | 1 + scripts/missions/rov/2_17_Sacrifice.lua | 1 + scripts/missions/rov/2_18_Somber_Dreams.lua | 1 + .../rov/2_19_Of_Light_and_Darkness.lua | 1 + .../missions/rov/2_20_Temporary_Farewells.lua | 1 + scripts/missions/rov/2_21_Brushing_Up.lua | 1 + scripts/missions/rov/2_22_Keep_On_Giving.lua | 1 + scripts/missions/rov/2_23_Past_Imperfect.lua | 1 + .../missions/rov/2_24_The_Cursed_Temple.lua | 1 + .../rov/2_25_Wisdom_of_Our_Forefathers.lua | 1 + .../sandoria/1_1_Smash_the_Orcish_Scouts.lua | 1 + scripts/missions/sandoria/1_2_Bat_Hunt.lua | 1 + .../sandoria/1_3_Save_the_Children.lua | 1 + .../sandoria/2_1_The_Rescue_Drill.lua | 1 + .../sandoria/2_2_The_Davoi_Report.lua | 1 + .../sandoria/2_3_0_Journey_Abroad.lua | 1 + .../sandoria/2_3_1_Journey_to_Bastok.lua | 1 + .../sandoria/2_3_2_Journey_to_Windurst.lua | 1 + .../sandoria/2_3_3_Journey_to_Bastok2.lua | 1 + .../sandoria/2_3_4_Journey_to_Windurst2.lua | 1 + .../sandoria/3_1_Infiltrate_Davoi.lua | 1 + .../sandoria/3_2_The_Crystal_Spring.lua | 1 + .../sandoria/3_3_Appointment_to_Jeuno.lua | 1 + scripts/missions/sandoria/4_1_Magicite.lua | 1 + .../sandoria/5_1_The_Ruins_of_FeiYin.lua | 1 + .../missions/sandoria/5_2_The_Shadow_Lord.lua | 1 + .../sandoria/6_1_Leautes_Last_Wishes.lua | 1 + .../sandoria/6_2_Ranperres_Final_Rest.lua | 1 + .../sandoria/7_1_Prestige_of_the_Papsque.lua | 1 + .../sandoria/7_2_The_Secret_Weapon.lua | 1 + .../missions/sandoria/8_1_Coming_of_Age.lua | 1 + .../missions/sandoria/8_2_Lightbringer.lua | 1 + .../sandoria/9_1_Breaking_Barriers.lua | 1 + .../sandoria/9_2_The_Heir_to_the_Light.lua | 1 + .../missions/soa/1_1_Rumors_from_the_West.lua | 1 + scripts/missions/soa/1_2_The_Geomagnetron.lua | 1 + .../missions/soa/1_3_Onward_to_Adoulin.lua | 1 + .../1_4_Heartwings_and_the_Kindhearted.lua | 1 + .../missions/soa/1_5_Pioneer_Registration.lua | 1 + .../missions/soa/1_6_Life_on_the_Frontier.lua | 1 + .../missions/soa/1_7_Meeting_of_the_Minds.lua | 1 + .../soa/1_8_Arciela_Appears_Again.lua | 1 + .../missions/soa/2_1_0_Budding_Prospects.lua | 1 + .../2_1_1_The_Light_Shining_in_Your_Eyes.lua | 1 + scripts/missions/soa/2_1_2_The_Heirloom.lua | 1 + .../missions/soa/2_2_0_An_Aimless_Journey.lua | 1 + scripts/missions/soa/2_2_1_Ortharsyne.lua | 1 + .../soa/2_2_2_In_the_Presence_of_Royalty.lua | 1 + .../missions/soa/2_3_The_Twin_World_Trees.lua | 1 + .../missions/soa/2_4_0_Honor_and_Audacity.lua | 1 + .../soa/2_4_1_The_Watergarden_Coliseum.lua | 1 + .../soa/2_5_0_Friction_and_Fissures.lua | 1 + .../2_5_1_The_Celennia_Memorial_Library.lua | 1 + .../soa/2_5_2_For_Whom_Do_We_Toil.lua | 1 + .../missions/soa/2_6_0_Aiming_for_Ygnas.lua | 1 + .../soa/2_6_1_Calamity_in_the_Kitchen.lua | 1 + .../missions/soa/2_6_2_Arcielas_Promise.lua | 1 + .../missions/soa/2_7_0_Predators_and_Prey.lua | 1 + .../missions/soa/2_7_1_Behind_the_Sluices.lua | 1 + .../soa/2_7_2_The_Leafkin_Monarch.lua | 1 + scripts/missions/soa/2_7_3_Yggdrasil.lua | 1 + .../soa/3_1_0_Return_of_the_Exorcist.lua | 1 + .../missions/soa/3_1_1_The_Merciless_One.lua | 1 + .../soa/3_1_2_A_Curse_from_the_Past.lua | 1 + scripts/missions/soa/3_1_3_The_Purgation.lua | 1 + scripts/missions/soa/3_1_4_The_Key.lua | 1 + .../soa/3_2_0_The_Princesss_Dilemma.lua | 1 + .../missions/soa/3_2_1_Dark_Clouds_Ahead.lua | 1 + .../soa/3_2_2_The_Smallest_of_Favors.lua | 1 + .../soa/3_3_0_Summoned_by_Spirits.lua | 1 + scripts/missions/soa/3_3_1_Evil_Entities.lua | 1 + .../missions/soa/3_3_2_Adoulin_Calling.lua | 1 + .../soa/3_3_3_The_Disappearance_of_Nyline.lua | 1 + .../soa/3_3_4_Shared_Consciousness.lua | 1 + scripts/missions/soa/3_3_5_Clear_Skies.lua | 1 + .../missions/soa/3_4_0_The_Man_in_Black.lua | 1 + scripts/missions/soa/3_4_1_To_the_Victor.lua | 1 + .../soa/3_4_2_An_Extraordinary_Gentleman.lua | 1 + .../soa/3_4_3_The_Orders_Treasures.lua | 1 + .../missions/soa/3_4_4_Augusts_Heirloom.lua | 1 + .../soa/3_5_0_Beauty_and_the_Beast.lua | 1 + .../soa/3_5_1_Wildcat_with_a_Gold_Pelt.lua | 1 + .../soa/3_5_2_In_Search_of_Arciela.lua | 1 + .../missions/soa/3_5_3_Looking_for_Leads.lua | 1 + .../missions/soa/3_6_0_Drifting_Northwest.lua | 1 + .../3_6_1_Kumhau_the_Flashfrost_Naakual.lua | 1 + scripts/missions/soa/3_6_2_Soul_Siphon.lua | 1 + scripts/missions/soa/3_6_3_Stonewalled.lua | 1 + scripts/missions/soa/3_6_4_Salvation.lua | 1 + .../missions/soa/3_6_5_Glimmer_of_Portent.lua | 1 + scripts/missions/soa/4_1_0_Into_the_Fire.lua | 1 + .../soa/4_1_1_Melvien_de_Malecroix.lua | 1 + .../soa/4_1_2_Courier_Catastrophe.lua | 1 + .../missions/soa/4_1_3_Done_and_Delivered.lua | 1 + .../soa/4_1_4_Ministerial_Whispers.lua | 1 + .../4_1_5_A_Day_in_the_Life_of_a_Pioneer.lua | 1 + .../missions/soa/4_2_0_Lighting_the_Way.lua | 1 + scripts/missions/soa/4_2_1_Sajjaka.lua | 1 + scripts/missions/soa/4_2_2_Studying_Up.lua | 1 + scripts/missions/soa/4_2_3_A_Vow_of_Truth.lua | 1 + scripts/missions/soa/4_2_4_Darrcuiln.lua | 1 + scripts/missions/soa/4_3_0_The_Gates.lua | 1 + scripts/missions/soa/4_3_1_Morimar.lua | 1 + .../missions/soa/4_3_2_A_New_Force_Arises.lua | 1 + .../missions/soa/4_3_3_The_Sacred_Sapling.lua | 1 + scripts/missions/soa/4_3_4_Tree_Grafting.lua | 1 + .../missions/soa/4_3_5_A_Shrouded_Canopy.lua | 1 + scripts/missions/soa/4_3_6_Leafallia.lua | 1 + .../missions/soa/4_3_7_Rosulatias_Promise.lua | 1 + scripts/missions/soa/4_3_8_The_Lightsland.lua | 1 + .../soa/4_3_9_The_Light_of_Dawn_Comes.lua | 1 + .../soa/4_4_0_Cries_from_the_Deep.lua | 1 + scripts/missions/soa/4_4_1_Seeds_of_Doubt.lua | 1 + .../soa/4_4_2_The_Tomatoes_of_Wrath.lua | 1 + .../missions/soa/4_4_3_A_Grave_Mistake.lua | 1 + .../soa/4_4_4_An_Emergency_Convocation.lua | 1 + .../soa/4_5_0_Balamor_the_Deathborne_Xol.lua | 1 + scripts/missions/soa/4_5_1_Anagnorisis.lua | 1 + scripts/missions/soa/4_5_2_Just_the_Thing.lua | 1 + .../soa/4_5_3_Sugarcoated_Salvation.lua | 1 + .../missions/soa/4_5_4_Arcielas_Resolve.lua | 1 + scripts/missions/soa/4_6_0_Balamors_Ruse.lua | 1 + scripts/missions/soa/4_6_1_The_Charlatan.lua | 1 + .../missions/soa/4_6_2_Royal_Blessings.lua | 1 + .../missions/soa/5_1_0_Arboreal_Rumors.lua | 1 + .../missions/soa/5_1_1_Arcielas_Missive.lua | 1 + scripts/missions/soa/5_1_2_Heroes_Unite.lua | 1 + .../soa/5_1_3_A_Portent_Most_Ominous.lua | 1 + .../missions/soa/5_2_0_Yggdrasil_Beckons.lua | 1 + .../soa/5_2_1_Returning_to_the_Trees.lua | 1 + .../soa/5_2_2_The_Key_to_the_Turris.lua | 1 + .../missions/soa/5_3_0_Teodors_Summons.lua | 1 + .../soa/5_3_1_The_Seventh_Guardian.lua | 1 + scripts/missions/soa/5_3_2_Watery_Grave.lua | 1 + .../missions/soa/5_3_3_Blood_for_Blood.lua | 1 + scripts/missions/soa/5_4_0_Reckoning.lua | 1 + scripts/missions/soa/5_4_1_Abomination.lua | 1 + scripts/missions/soa/5_5_0_Undying_Light.lua | 1 + .../missions/soa/5_5_1_The_Light_Within.lua | 1 + .../toau/01_Land_of_Sacred_Serpents.lua | 1 + .../missions/toau/02_Immortal_Sentries.lua | 1 + .../missions/toau/03_President_Salaheem.lua | 1 + scripts/missions/toau/04_Knight_of_Gold.lua | 1 + .../toau/05_Confessions_of_Royalty.lua | 1 + scripts/missions/toau/06_Easterly_Winds.lua | 1 + scripts/missions/toau/07_Westerly_Winds.lua | 1 + scripts/missions/toau/08_A_Mercenary_Life.lua | 1 + .../missions/toau/09_Undersea_Scouting.lua | 1 + scripts/missions/toau/10_Astral_Waves.lua | 1 + scripts/missions/toau/11_Imperial_Schemes.lua | 1 + scripts/missions/toau/12_Royal_Puppeteer.lua | 1 + scripts/missions/toau/13_Lost_Kingdom.lua | 1 + .../missions/toau/14_The_Dolphin_Crest.lua | 1 + scripts/missions/toau/15_The_Black_Coffin.lua | 1 + .../missions/toau/16_Ghosts_of_the_Past.lua | 1 + .../missions/toau/17_Guests_of_the_Empire.lua | 1 + scripts/missions/toau/18_Passing_Glory.lua | 1 + .../missions/toau/19_Sweets_for_the_Soul.lua | 1 + scripts/missions/toau/20_Teahouse_Tumult.lua | 1 + scripts/missions/toau/21_Finders_Keepers.lua | 1 + .../missions/toau/22_Shield_of_Diplomacy.lua | 1 + scripts/missions/toau/23_Social_Graces.lua | 1 + scripts/missions/toau/24_Foiled_Ambition.lua | 1 + scripts/missions/toau/25_Playing_the_Part.lua | 1 + .../missions/toau/26_Seal_of_the_Serpent.lua | 1 + .../missions/toau/27_Misplaced_Nobility.lua | 1 + .../missions/toau/28_Bastion_of_Knowledge.lua | 1 + scripts/missions/toau/29_Puppet_in_Peril.lua | 1 + .../toau/30_Prevalence_of_Pirates.lua | 1 + .../missions/toau/31_Shades_of_Vengeance.lua | 1 + scripts/missions/toau/32_In_the_Blood.lua | 1 + scripts/missions/toau/33_Sentinels_Honor.lua | 1 + .../missions/toau/34_Testing_the_Waters.lua | 1 + .../missions/toau/35_Legacy_of_the_Lost.lua | 1 + .../missions/toau/36_Gaze_of_the_Saboteur.lua | 1 + scripts/missions/toau/37_Path_of_Blood.lua | 1 + scripts/missions/toau/38_Stirrings_of_War.lua | 1 + scripts/missions/toau/39_Allied_Rumblings.lua | 1 + .../missions/toau/40_Unraveling_Reason.lua | 1 + .../missions/toau/41_Light_of_Judgement.lua | 1 + scripts/missions/toau/42_Path_of_Darkness.lua | 1 + .../missions/toau/43_Fangs_of_the_Lion.lua | 1 + scripts/missions/toau/44_Nashmeiras_Plea.lua | 1 + scripts/missions/toau/45_Ragnarok.lua | 1 + .../1_1_The_Horutoto_Ruins_Experiment.lua | 1 + .../windurst/1_2_The_Heart_of_the_Matter.lua | 1 + .../windurst/1_3_The_Price_of_Peace.lua | 1 + .../missions/windurst/2_1_Lost_for_Words.lua | 1 + .../missions/windurst/2_2_A_Testing_Time.lua | 1 + .../windurst/2_3_0_The_Three_Kingdoms.lua | 1 + .../2_3_1_The_Three_Kingdoms_Sandoria.lua | 1 + .../2_3_2_The_Three_Kingdoms_Bastok.lua | 1 + .../2_3_3_The_Three_Kingdoms_Sandoria2.lua | 1 + .../2_3_4_The_Three_Kingdoms_Bastok2.lua | 1 + .../windurst/3_1_To_Each_His_Own_Right.lua | 1 + .../windurst/3_2_Written_in_the_Stars.lua | 1 + .../missions/windurst/3_3_A_New_Journey.lua | 1 + scripts/missions/windurst/4_1_Magicite.lua | 1 + .../missions/windurst/5_1_The_Final_Seal.lua | 1 + .../windurst/5_2_The_Shadow_Awaits.lua | 1 + .../windurst/6_1_Full_Moon_Fountain.lua | 1 + .../windurst/6_2_Saintly_Invitation.lua | 1 + .../windurst/7_1_The_Sixth_Ministry.lua | 1 + .../windurst/7_2_Awakening_of_the_Gods.lua | 1 + scripts/missions/windurst/8_1_Vain.lua | 1 + .../windurst/8_2_The_Jester_Whod_be_King.lua | 1 + .../windurst/9_1_Doll_of_the_Dead.lua | 1 + .../missions/windurst/9_2_Moon_Reading.lua | 1 + scripts/missions/wotg/01_Cavernous_Maws.lua | 1 + .../wotg/02_Back_to_the_Beginning.lua | 1 + scripts/missions/wotg/03_Cait_Sith.lua | 1 + .../wotg/04_The_Queen_of_the_Dance.lua | 1 + .../wotg/05_While_the_Cat_is_Away.lua | 1 + .../wotg/06_A_Timeswept_Butterfly.lua | 1 + .../missions/wotg/07_Purple_The_New_Black.lua | 1 + .../wotg/08_In_the_Name_of_the_Father.lua | 1 + .../missions/wotg/09_Dancers_in_Distress.lua | 1 + .../missions/wotg/10_Daughter_of_a_Knight.lua | 1 + .../missions/wotg/11_A_Spoonful_of_Sugar.lua | 1 + scripts/missions/wotg/12_Affairs_of_State.lua | 1 + .../missions/wotg/13_Borne_by_the_Wind.lua | 1 + .../wotg/14_A_Nation_on_the_Brink.lua | 1 + .../missions/wotg/15_Crossroads_of_Time.lua | 1 + .../missions/wotg/16_Sandswept_Memories.lua | 1 + .../missions/wotg/17_Northland_Exposure.lua | 1 + .../missions/wotg/18_Traitor_in_the_Midst.lua | 1 + .../wotg/19_Betrayal_at_Beaucedine.lua | 1 + scripts/missions/wotg/20_On_Thin_Ice.lua | 1 + scripts/missions/wotg/21_Proof_of_Valor.lua | 1 + .../missions/wotg/22_A_Sanguinary_Prelude.lua | 1 + .../missions/wotg/23_Dungeons_and_Dancers.lua | 1 + .../missions/wotg/24_Distorter_of_Time.lua | 1 + .../wotg/25_The_Will_of_the_World.lua | 1 + scripts/missions/wotg/26_Fate_in_Haze.lua | 1 + .../missions/wotg/27_The_Scent_of_Battle.lua | 1 + scripts/missions/wotg/28_Another_World.lua | 1 + scripts/missions/wotg/29_A_Hawk_in_Repose.lua | 1 + .../wotg/30_The_Battle_of_Xarcabard.lua | 1 + .../missions/wotg/31_Prelude_to_a_Storm.lua | 1 + scripts/missions/wotg/32_Storms_Crescendo.lua | 1 + .../missions/wotg/33_Into_the_Beasts_Maw.lua | 1 + .../missions/wotg/34_The_Hunter_Ensnared.lua | 1 + .../missions/wotg/35_Flight_of_the_Lion.lua | 1 + scripts/missions/wotg/36_Fall_of_the_Hawk.lua | 1 + .../missions/wotg/37_Darkness_Descends.lua | 1 + scripts/missions/wotg/38_Adieu_Lilisette.lua | 1 + .../missions/wotg/39_By_the_Fading_Light.lua | 1 + .../missions/wotg/40_Edge_of_Existence.lua | 1 + scripts/missions/wotg/41_Her_Memories.lua | 1 + scripts/missions/wotg/42_Forget_Me_Not.lua | 1 + scripts/missions/wotg/43_Pillar_of_Hope.lua | 1 + scripts/missions/wotg/44_Glimmer_of_Life.lua | 1 + scripts/missions/wotg/45_Time_Slips_Away.lua | 1 + .../missions/wotg/46_When_Wills_Collide.lua | 1 + scripts/missions/wotg/47_Whispers_of_Dawn.lua | 1 + .../missions/wotg/48_A_Dreamy_Interlude.lua | 1 + .../missions/wotg/49_Cait_in_the_Woods.lua | 1 + scripts/missions/wotg/50_Fork_in_the_Road.lua | 1 + .../missions/wotg/51_Maiden_of_the_Dusk.lua | 34 +++++++++---------- .../missions/wotg/52_Where_It_All_Began.lua | 1 + scripts/missions/wotg/53_Token_of_Troth.lua | 1 + scripts/missions/wotg/54_Lest_We_Forget.lua | 1 + 388 files changed, 403 insertions(+), 18 deletions(-) diff --git a/scripts/missions/acp/01_A_Crystalline_Prophecy.lua b/scripts/missions/acp/01_A_Crystalline_Prophecy.lua index dc8550da2df..ff0c7f5d554 100644 --- a/scripts/missions/acp/01_A_Crystalline_Prophecy.lua +++ b/scripts/missions/acp/01_A_Crystalline_Prophecy.lua @@ -5,6 +5,7 @@ -- !addmission 9 0 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.ACP, xi.mission.id.acp.A_CRYSTALLINE_PROPHECY) mission.reward = diff --git a/scripts/missions/amk/01_A_Moogle_Kupo_dEtat.lua b/scripts/missions/amk/01_A_Moogle_Kupo_dEtat.lua index a181dd19259..68b48f6e182 100644 --- a/scripts/missions/amk/01_A_Moogle_Kupo_dEtat.lua +++ b/scripts/missions/amk/01_A_Moogle_Kupo_dEtat.lua @@ -4,6 +4,7 @@ -- !addmission 10 0 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.AMK, xi.mission.id.amk.A_MOOGLE_KUPO_DETAT) mission.reward = diff --git a/scripts/missions/amk/02_Drenched_It_Began_with_a_Raindrop.lua b/scripts/missions/amk/02_Drenched_It_Began_with_a_Raindrop.lua index e5af560af76..7dad50b2fee 100644 --- a/scripts/missions/amk/02_Drenched_It_Began_with_a_Raindrop.lua +++ b/scripts/missions/amk/02_Drenched_It_Began_with_a_Raindrop.lua @@ -7,6 +7,7 @@ -- YAGUDO_CAULK : !additem 2759 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.AMK, xi.mission.id.amk.DRENCHED_IT_BEGAN_WITH_A_RAINDROP) mission.reward = diff --git a/scripts/missions/amk/03_Hasten_In_a_Jam_in_Jeuno.lua b/scripts/missions/amk/03_Hasten_In_a_Jam_in_Jeuno.lua index 6b40c2b95dd..643dd8944f6 100644 --- a/scripts/missions/amk/03_Hasten_In_a_Jam_in_Jeuno.lua +++ b/scripts/missions/amk/03_Hasten_In_a_Jam_in_Jeuno.lua @@ -5,6 +5,7 @@ -- Inconspicuous Door : !pos -15 1.300 68 244 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.AMK, xi.mission.id.amk.HASTEN_IN_A_JAM_IN_JEUNO) mission.reward = diff --git a/scripts/missions/amk/04_Welcome_To_My_Decrepit_Domicile.lua b/scripts/missions/amk/04_Welcome_To_My_Decrepit_Domicile.lua index 338cf4107e7..d4a73437b96 100644 --- a/scripts/missions/amk/04_Welcome_To_My_Decrepit_Domicile.lua +++ b/scripts/missions/amk/04_Welcome_To_My_Decrepit_Domicile.lua @@ -12,6 +12,7 @@ -- Like in: scripts\quests\adoulin\Flavors_of_Our_Lives.lua ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.AMK, xi.mission.id.amk.WELCOME_TO_MY_DECREPIT_DOMICILE) mission.reward = diff --git a/scripts/missions/amk/05_Curses_A_Horrifically_Harrowing_Hex.lua b/scripts/missions/amk/05_Curses_A_Horrifically_Harrowing_Hex.lua index d28152e0fa0..c5a3ebcdf46 100644 --- a/scripts/missions/amk/05_Curses_A_Horrifically_Harrowing_Hex.lua +++ b/scripts/missions/amk/05_Curses_A_Horrifically_Harrowing_Hex.lua @@ -5,6 +5,7 @@ -- Shantotto : !pos 122 -2 112 239 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.AMK, xi.mission.id.amk.CURSES_A_HORRIFICALLY_HARROWING_HEX) mission.reward = diff --git a/scripts/missions/amk/06_An_Errand_The_Professors_Price.lua b/scripts/missions/amk/06_An_Errand_The_Professors_Price.lua index ccee676201e..b3eccec037d 100644 --- a/scripts/missions/amk/06_An_Errand_The_Professors_Price.lua +++ b/scripts/missions/amk/06_An_Errand_The_Professors_Price.lua @@ -13,6 +13,7 @@ local horutotoID = zones[xi.zone.OUTER_HORUTOTO_RUINS] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.AMK, xi.mission.id.amk.AN_ERRAND_THE_PROFESSORS_PRICE) mission.reward = diff --git a/scripts/missions/amk/07_Shock_Arrant_Abuse_of_Authority.lua b/scripts/missions/amk/07_Shock_Arrant_Abuse_of_Authority.lua index 626c3834dae..1f294638635 100644 --- a/scripts/missions/amk/07_Shock_Arrant_Abuse_of_Authority.lua +++ b/scripts/missions/amk/07_Shock_Arrant_Abuse_of_Authority.lua @@ -7,6 +7,7 @@ -- MOLDY_WORM_EATEN_CHEST : !addkeyitem 1144 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.AMK, xi.mission.id.amk.SHOCK_ARRANT_ABUSE_OF_AUTHORITY) mission.reward = diff --git a/scripts/missions/amk/08_Lender_Beware_Read_the_Fine_Print.lua b/scripts/missions/amk/08_Lender_Beware_Read_the_Fine_Print.lua index 9e903cc77de..df983cd3792 100644 --- a/scripts/missions/amk/08_Lender_Beware_Read_the_Fine_Print.lua +++ b/scripts/missions/amk/08_Lender_Beware_Read_the_Fine_Print.lua @@ -7,6 +7,7 @@ -- Inconspicuous Door : !pos -15 1.300 68 244 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.AMK, xi.mission.id.amk.LENDER_BEWARE_READ_THE_FINE_PRINT) mission.reward = diff --git a/scripts/missions/amk/09_Rescue_A_Moogles_Labor_of_Love.lua b/scripts/missions/amk/09_Rescue_A_Moogles_Labor_of_Love.lua index 9f62a8583ca..d8284b9a0cd 100644 --- a/scripts/missions/amk/09_Rescue_A_Moogles_Labor_of_Love.lua +++ b/scripts/missions/amk/09_Rescue_A_Moogles_Labor_of_Love.lua @@ -18,6 +18,7 @@ local ID = zones[xi.zone.QUICKSAND_CAVES] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.AMK, xi.mission.id.amk.RESCUE_A_MOOGLES_LABOR_OF_LOVE) mission.reward = diff --git a/scripts/missions/amk/10_Roar_A_Cat_Burglar_Bares_Her_Fangs.lua b/scripts/missions/amk/10_Roar_A_Cat_Burglar_Bares_Her_Fangs.lua index 385928bb3b3..f645a9ba5ff 100644 --- a/scripts/missions/amk/10_Roar_A_Cat_Burglar_Bares_Her_Fangs.lua +++ b/scripts/missions/amk/10_Roar_A_Cat_Burglar_Bares_Her_Fangs.lua @@ -4,6 +4,7 @@ -- !addmission 10 9 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.AMK, xi.mission.id.amk.ROAR_A_CAT_BURGLAR_BARES_HER_FANGS) mission.reward = diff --git a/scripts/missions/amk/11_Relief_A_Triumphant_Return.lua b/scripts/missions/amk/11_Relief_A_Triumphant_Return.lua index 04f8eaa5c3f..821440f2cfc 100644 --- a/scripts/missions/amk/11_Relief_A_Triumphant_Return.lua +++ b/scripts/missions/amk/11_Relief_A_Triumphant_Return.lua @@ -5,6 +5,7 @@ -- Inconspicuous Door : !pos -15 1.300 68 244 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.AMK, xi.mission.id.amk.RELIEF_A_TRIUMPHANT_RETURN) mission.reward = diff --git a/scripts/missions/amk/12_Joy_Summoned_to_a_Fabulous_Fete.lua b/scripts/missions/amk/12_Joy_Summoned_to_a_Fabulous_Fete.lua index 52a20fc852d..32561a3ba7b 100644 --- a/scripts/missions/amk/12_Joy_Summoned_to_a_Fabulous_Fete.lua +++ b/scripts/missions/amk/12_Joy_Summoned_to_a_Fabulous_Fete.lua @@ -4,6 +4,7 @@ -- !addmission 10 11 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.AMK, xi.mission.id.amk.JOY_SUMMONED_TO_A_FABULOUS_FETE) mission.reward = diff --git a/scripts/missions/amk/13_A_Challenge_You_Could_Be_a_Winner.lua b/scripts/missions/amk/13_A_Challenge_You_Could_Be_a_Winner.lua index 16352e2e508..c4e7406d35d 100644 --- a/scripts/missions/amk/13_A_Challenge_You_Could_Be_a_Winner.lua +++ b/scripts/missions/amk/13_A_Challenge_You_Could_Be_a_Winner.lua @@ -25,6 +25,7 @@ -- Craggy Pillar 4 : !pos -236 -52 103 162 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.AMK, xi.mission.id.amk.A_CHALLENGE_YOU_COULD_BE_A_WINNER) mission.reward = diff --git a/scripts/missions/amk/14_Smash_A_Malevolent_Menace.lua b/scripts/missions/amk/14_Smash_A_Malevolent_Menace.lua index 81ec3ea6b49..fba69b03f80 100644 --- a/scripts/missions/amk/14_Smash_A_Malevolent_Menace.lua +++ b/scripts/missions/amk/14_Smash_A_Malevolent_Menace.lua @@ -4,6 +4,7 @@ -- !addmission 10 13 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.AMK, xi.mission.id.amk.SMASH_A_MALEVOLENT_MENACE) mission.reward = diff --git a/scripts/missions/asa/01_A_Shantotto_Ascension.lua b/scripts/missions/asa/01_A_Shantotto_Ascension.lua index 0e18645abb2..7ae21bbf070 100644 --- a/scripts/missions/asa/01_A_Shantotto_Ascension.lua +++ b/scripts/missions/asa/01_A_Shantotto_Ascension.lua @@ -5,6 +5,7 @@ -- !addmission 11 0 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.ASA, xi.mission.id.asa.A_SHANTOTTO_ASCENSION) mission.reward = diff --git a/scripts/missions/asa/02_Burgeoning_Dread.lua b/scripts/missions/asa/02_Burgeoning_Dread.lua index 1f0523573f3..ef5aa54ed04 100644 --- a/scripts/missions/asa/02_Burgeoning_Dread.lua +++ b/scripts/missions/asa/02_Burgeoning_Dread.lua @@ -5,6 +5,7 @@ -- !addmission 11 1 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.ASA, xi.mission.id.asa.BURGEONING_DREAD) mission.reward = diff --git a/scripts/missions/asa/03_That_Which_Curdles_Blood.lua b/scripts/missions/asa/03_That_Which_Curdles_Blood.lua index ed6d996322d..8b9c84d9437 100644 --- a/scripts/missions/asa/03_That_Which_Curdles_Blood.lua +++ b/scripts/missions/asa/03_That_Which_Curdles_Blood.lua @@ -9,6 +9,7 @@ -- Trodden Snow : !pos -19.7 -17.3 104.4 126 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.ASA, xi.mission.id.asa.THAT_WHICH_CURDLES_BLOOD) mission.reward = diff --git a/scripts/missions/asa/04_Sugar-Coated_Directive.lua b/scripts/missions/asa/04_Sugar-Coated_Directive.lua index ac748672865..b239d14ce1a 100644 --- a/scripts/missions/asa/04_Sugar-Coated_Directive.lua +++ b/scripts/missions/asa/04_Sugar-Coated_Directive.lua @@ -13,6 +13,7 @@ local tidesID = zones[xi.zone.CLOISTER_OF_TIDES] local tremorsID = zones[xi.zone.CLOISTER_OF_TREMORS] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.ASA, xi.mission.id.asa.SUGAR_COATED_DIRECTIVE) mission.reward = diff --git a/scripts/missions/asa/05_Enemy_Of_The_Empire_I.lua b/scripts/missions/asa/05_Enemy_Of_The_Empire_I.lua index efb3d8033bd..c5c0d2e8bed 100644 --- a/scripts/missions/asa/05_Enemy_Of_The_Empire_I.lua +++ b/scripts/missions/asa/05_Enemy_Of_The_Empire_I.lua @@ -8,6 +8,7 @@ local norgID = zones[xi.zone.NORG] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.ASA, xi.mission.id.asa.ENEMY_OF_THE_EMPIRE_I) mission.reward = diff --git a/scripts/missions/bastok/1_1_The_Zeruhn_Report.lua b/scripts/missions/bastok/1_1_The_Zeruhn_Report.lua index b96520d51d5..0fe9d776530 100644 --- a/scripts/missions/bastok/1_1_The_Zeruhn_Report.lua +++ b/scripts/missions/bastok/1_1_The_Zeruhn_Report.lua @@ -17,6 +17,7 @@ local portBastokID = zones[xi.zone.PORT_BASTOK] local zeruhnID = zones[xi.zone.ZERUHN_MINES] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.BASTOK, xi.mission.id.bastok.THE_ZERUHN_REPORT) local handleAcceptMission = function(player, csid, option, npc) diff --git a/scripts/missions/bastok/1_2_A_Geological_Survey.lua b/scripts/missions/bastok/1_2_A_Geological_Survey.lua index 947e9f85fbc..9f52c6b1212 100644 --- a/scripts/missions/bastok/1_2_A_Geological_Survey.lua +++ b/scripts/missions/bastok/1_2_A_Geological_Survey.lua @@ -15,6 +15,7 @@ local metalworksID = zones[xi.zone.METALWORKS] local portBastokID = zones[xi.zone.PORT_BASTOK] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.BASTOK, xi.mission.id.bastok.GEOLOGICAL_SURVEY) local handleAcceptMission = function(player, csid, option, npc) diff --git a/scripts/missions/bastok/1_3_Fetichism.lua b/scripts/missions/bastok/1_3_Fetichism.lua index e8a173ec603..c6001e9d23a 100644 --- a/scripts/missions/bastok/1_3_Fetichism.lua +++ b/scripts/missions/bastok/1_3_Fetichism.lua @@ -14,6 +14,7 @@ local metalworksID = zones[xi.zone.METALWORKS] local portBastokID = zones[xi.zone.PORT_BASTOK] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.BASTOK, xi.mission.id.bastok.FETICHISM) -- npcUtil.completeMission will only award rank if less than player's current rank in diff --git a/scripts/missions/bastok/2_1_The_Crystal_Line.lua b/scripts/missions/bastok/2_1_The_Crystal_Line.lua index 63ca952d6d5..ec3afae8e0e 100644 --- a/scripts/missions/bastok/2_1_The_Crystal_Line.lua +++ b/scripts/missions/bastok/2_1_The_Crystal_Line.lua @@ -17,6 +17,7 @@ local metalworksID = zones[xi.zone.METALWORKS] local portBastokID = zones[xi.zone.PORT_BASTOK] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.BASTOK, xi.mission.id.bastok.THE_CRYSTAL_LINE) mission.reward = diff --git a/scripts/missions/bastok/2_2_Wading_Beasts.lua b/scripts/missions/bastok/2_2_Wading_Beasts.lua index cd2c2479540..5e8e5bfa624 100644 --- a/scripts/missions/bastok/2_2_Wading_Beasts.lua +++ b/scripts/missions/bastok/2_2_Wading_Beasts.lua @@ -15,6 +15,7 @@ local metalworksID = zones[xi.zone.METALWORKS] local portBastokID = zones[xi.zone.PORT_BASTOK] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.BASTOK, xi.mission.id.bastok.WADING_BEASTS) mission.reward = diff --git a/scripts/missions/bastok/2_3_0_The_Emissary.lua b/scripts/missions/bastok/2_3_0_The_Emissary.lua index 6b05a459a5a..e194fe5fb7b 100644 --- a/scripts/missions/bastok/2_3_0_The_Emissary.lua +++ b/scripts/missions/bastok/2_3_0_The_Emissary.lua @@ -18,6 +18,7 @@ local metalworksID = zones[xi.zone.METALWORKS] local portBastokID = zones[xi.zone.PORT_BASTOK] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.BASTOK, xi.mission.id.bastok.THE_EMISSARY) mission.reward = diff --git a/scripts/missions/bastok/2_3_1_The_Emissary_Sandoria.lua b/scripts/missions/bastok/2_3_1_The_Emissary_Sandoria.lua index d11bc941d7a..ff22ed877dc 100644 --- a/scripts/missions/bastok/2_3_1_The_Emissary_Sandoria.lua +++ b/scripts/missions/bastok/2_3_1_The_Emissary_Sandoria.lua @@ -11,6 +11,7 @@ local chateauID = zones[xi.zone.CHATEAU_DORAGUILLE] local northernSandoriaID = zones[xi.zone.NORTHERN_SAN_DORIA] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.BASTOK, xi.mission.id.bastok.THE_EMISSARY_SANDORIA) mission.reward = {} diff --git a/scripts/missions/bastok/2_3_2_The_Emissary_Windurst.lua b/scripts/missions/bastok/2_3_2_The_Emissary_Windurst.lua index fb02c997fdd..5752b463e1d 100644 --- a/scripts/missions/bastok/2_3_2_The_Emissary_Windurst.lua +++ b/scripts/missions/bastok/2_3_2_The_Emissary_Windurst.lua @@ -10,6 +10,7 @@ local northSandoriaID = zones[xi.zone.NORTHERN_SAN_DORIA] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.BASTOK, xi.mission.id.bastok.THE_EMISSARY_WINDURST) mission.reward = {} diff --git a/scripts/missions/bastok/2_3_3_The_Emissary_Sandoria2.lua b/scripts/missions/bastok/2_3_3_The_Emissary_Sandoria2.lua index 131025d02de..f5467534fe2 100644 --- a/scripts/missions/bastok/2_3_3_The_Emissary_Sandoria2.lua +++ b/scripts/missions/bastok/2_3_3_The_Emissary_Sandoria2.lua @@ -11,6 +11,7 @@ local chateauID = zones[xi.zone.CHATEAU_DORAGUILLE] local northSandoriaID = zones[xi.zone.NORTHERN_SAN_DORIA] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.BASTOK, xi.mission.id.bastok.THE_EMISSARY_SANDORIA2) mission.reward = {} diff --git a/scripts/missions/bastok/2_3_4_The_Emissary_Windurst2.lua b/scripts/missions/bastok/2_3_4_The_Emissary_Windurst2.lua index 4cef18326a2..9843cfa2519 100644 --- a/scripts/missions/bastok/2_3_4_The_Emissary_Windurst2.lua +++ b/scripts/missions/bastok/2_3_4_The_Emissary_Windurst2.lua @@ -9,6 +9,7 @@ local portWindurstID = zones[xi.zone.PORT_WINDURST] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.BASTOK, xi.mission.id.bastok.THE_EMISSARY_WINDURST2) mission.reward = {} diff --git a/scripts/missions/bastok/3_1_The_Four_Musketeers.lua b/scripts/missions/bastok/3_1_The_Four_Musketeers.lua index ee306aa951b..160165bdee4 100644 --- a/scripts/missions/bastok/3_1_The_Four_Musketeers.lua +++ b/scripts/missions/bastok/3_1_The_Four_Musketeers.lua @@ -10,6 +10,7 @@ -- Iron Eater : !pos 92.936 -19.532 1.814 237 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.BASTOK, xi.mission.id.bastok.THE_FOUR_MUSKETEERS) mission.reward = diff --git a/scripts/missions/bastok/3_2_To_the_Forsaken_Mines.lua b/scripts/missions/bastok/3_2_To_the_Forsaken_Mines.lua index f36deaea7eb..15e761bb7a8 100644 --- a/scripts/missions/bastok/3_2_To_the_Forsaken_Mines.lua +++ b/scripts/missions/bastok/3_2_To_the_Forsaken_Mines.lua @@ -13,6 +13,7 @@ local gusgenID = zones[xi.zone.GUSGEN_MINES] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.BASTOK, xi.mission.id.bastok.TO_THE_FORSAKEN_MINES) mission.reward = diff --git a/scripts/missions/bastok/3_3_Jeuno.lua b/scripts/missions/bastok/3_3_Jeuno.lua index f4443fbfc14..ed4bb205080 100644 --- a/scripts/missions/bastok/3_3_Jeuno.lua +++ b/scripts/missions/bastok/3_3_Jeuno.lua @@ -14,6 +14,7 @@ local lowerDelkfuttID = zones[xi.zone.LOWER_DELKFUTTS_TOWER] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.BASTOK, xi.mission.id.bastok.JEUNO) mission.reward = diff --git a/scripts/missions/bastok/4_1_Magicite.lua b/scripts/missions/bastok/4_1_Magicite.lua index 72e21553034..2d3a26197d6 100644 --- a/scripts/missions/bastok/4_1_Magicite.lua +++ b/scripts/missions/bastok/4_1_Magicite.lua @@ -16,6 +16,7 @@ local ruludeID = zones[xi.zone.RULUDE_GARDENS] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.BASTOK, xi.mission.id.bastok.MAGICITE) local function magiciteCounter(player) diff --git a/scripts/missions/bastok/5_1_Darkness_Rising.lua b/scripts/missions/bastok/5_1_Darkness_Rising.lua index 18d87bc59d1..3b43d76492c 100644 --- a/scripts/missions/bastok/5_1_Darkness_Rising.lua +++ b/scripts/missions/bastok/5_1_Darkness_Rising.lua @@ -10,6 +10,7 @@ -- Naji : !pos 64 -14 -4 237 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.BASTOK, xi.mission.id.bastok.DARKNESS_RISING) mission.reward = diff --git a/scripts/missions/bastok/5_2_Xarcabard_Land_of_Truths.lua b/scripts/missions/bastok/5_2_Xarcabard_Land_of_Truths.lua index 21ed17870bd..b8198d9596a 100644 --- a/scripts/missions/bastok/5_2_Xarcabard_Land_of_Truths.lua +++ b/scripts/missions/bastok/5_2_Xarcabard_Land_of_Truths.lua @@ -16,6 +16,7 @@ local metalworksID = zones[xi.zone.METALWORKS] local portBastokID = zones[xi.zone.PORT_BASTOK] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.BASTOK, xi.mission.id.bastok.XARCABARD_LAND_OF_TRUTHS) mission.reward = diff --git a/scripts/missions/bastok/6_1_Return_of_the_Talekeeper.lua b/scripts/missions/bastok/6_1_Return_of_the_Talekeeper.lua index 07bca9d47f2..f3115b81608 100644 --- a/scripts/missions/bastok/6_1_Return_of_the_Talekeeper.lua +++ b/scripts/missions/bastok/6_1_Return_of_the_Talekeeper.lua @@ -19,6 +19,7 @@ local portBastokID = zones[xi.zone.PORT_BASTOK] local westernAltepaID = zones[xi.zone.WESTERN_ALTEPA_DESERT] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.BASTOK, xi.mission.id.bastok.RETURN_OF_THE_TALEKEEPER) mission.reward = diff --git a/scripts/missions/bastok/6_2_The_Pirates_Cove.lua b/scripts/missions/bastok/6_2_The_Pirates_Cove.lua index 6064c0df4ac..cad90f1eae4 100644 --- a/scripts/missions/bastok/6_2_The_Pirates_Cove.lua +++ b/scripts/missions/bastok/6_2_The_Pirates_Cove.lua @@ -18,6 +18,7 @@ local metalworksID = zones[xi.zone.METALWORKS] local portBastokID = zones[xi.zone.PORT_BASTOK] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.BASTOK, xi.mission.id.bastok.THE_PIRATES_COVE) mission.reward = diff --git a/scripts/missions/bastok/7_1_The_Final_Image.lua b/scripts/missions/bastok/7_1_The_Final_Image.lua index 26c58dc8b21..71cebd96222 100644 --- a/scripts/missions/bastok/7_1_The_Final_Image.lua +++ b/scripts/missions/bastok/7_1_The_Final_Image.lua @@ -17,6 +17,7 @@ local portBastokID = zones[xi.zone.PORT_BASTOK] local romaeveID = zones[xi.zone.ROMAEVE] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.BASTOK, xi.mission.id.bastok.THE_FINAL_IMAGE) mission.reward = diff --git a/scripts/missions/bastok/7_2_On_My_Way.lua b/scripts/missions/bastok/7_2_On_My_Way.lua index 8d1ab680283..91782d8b490 100644 --- a/scripts/missions/bastok/7_2_On_My_Way.lua +++ b/scripts/missions/bastok/7_2_On_My_Way.lua @@ -17,6 +17,7 @@ local metalworksID = zones[xi.zone.METALWORKS] local portBastokID = zones[xi.zone.PORT_BASTOK] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.BASTOK, xi.mission.id.bastok.ON_MY_WAY) mission.reward = diff --git a/scripts/missions/bastok/8_1_The_Chains_That_Bind_Us.lua b/scripts/missions/bastok/8_1_The_Chains_That_Bind_Us.lua index aa769e82389..b9b7e4cbc09 100644 --- a/scripts/missions/bastok/8_1_The_Chains_That_Bind_Us.lua +++ b/scripts/missions/bastok/8_1_The_Chains_That_Bind_Us.lua @@ -18,6 +18,7 @@ local portBastokID = zones[xi.zone.PORT_BASTOK] local quicksandID = zones[xi.zone.QUICKSAND_CAVES] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.BASTOK, xi.mission.id.bastok.THE_CHAINS_THAT_BIND_US) mission.reward = diff --git a/scripts/missions/bastok/8_2_Enter_the_Talekeeper.lua b/scripts/missions/bastok/8_2_Enter_the_Talekeeper.lua index 8cf9c4e4557..bed96607036 100644 --- a/scripts/missions/bastok/8_2_Enter_the_Talekeeper.lua +++ b/scripts/missions/bastok/8_2_Enter_the_Talekeeper.lua @@ -18,6 +18,7 @@ local portBastokID = zones[xi.zone.PORT_BASTOK] local kuftalID = zones[xi.zone.KUFTAL_TUNNEL] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.BASTOK, xi.mission.id.bastok.ENTER_THE_TALEKEEPER) mission.reward = diff --git a/scripts/missions/bastok/9_1_The_Salt_of_the_Earth.lua b/scripts/missions/bastok/9_1_The_Salt_of_the_Earth.lua index a3ef5218ff0..419c1459427 100644 --- a/scripts/missions/bastok/9_1_The_Salt_of_the_Earth.lua +++ b/scripts/missions/bastok/9_1_The_Salt_of_the_Earth.lua @@ -18,6 +18,7 @@ local metalworksID = zones[xi.zone.METALWORKS] local portBastokID = zones[xi.zone.PORT_BASTOK] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.BASTOK, xi.mission.id.bastok.THE_SALT_OF_THE_EARTH) mission.reward = diff --git a/scripts/missions/bastok/9_2_Where_Two_Paths_Converge.lua b/scripts/missions/bastok/9_2_Where_Two_Paths_Converge.lua index 029a146200a..8f4f8616ed6 100644 --- a/scripts/missions/bastok/9_2_Where_Two_Paths_Converge.lua +++ b/scripts/missions/bastok/9_2_Where_Two_Paths_Converge.lua @@ -15,6 +15,7 @@ local metalworksID = zones[xi.zone.METALWORKS] local portBastokID = zones[xi.zone.PORT_BASTOK] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.BASTOK, xi.mission.id.bastok.WHERE_TWO_PATHS_CONVERGE) mission.reward = diff --git a/scripts/missions/cop/1_1_The_Rites_of_Life.lua b/scripts/missions/cop/1_1_The_Rites_of_Life.lua index e82754a7bce..892583aa739 100644 --- a/scripts/missions/cop/1_1_The_Rites_of_Life.lua +++ b/scripts/missions/cop/1_1_The_Rites_of_Life.lua @@ -9,6 +9,7 @@ -- 3. Talk to Monberaux: !pos -43 0 -1 244 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.COP, xi.mission.id.cop.THE_RITES_OF_LIFE) mission.reward = diff --git a/scripts/missions/cop/1_2_Below_the_Arks.lua b/scripts/missions/cop/1_2_Below_the_Arks.lua index e234bb6b075..9c128e408e0 100644 --- a/scripts/missions/cop/1_2_Below_the_Arks.lua +++ b/scripts/missions/cop/1_2_Below_the_Arks.lua @@ -11,6 +11,7 @@ require('scripts/missions/cop/helpers') ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.COP, xi.mission.id.cop.BELOW_THE_ARKS) mission.reward = diff --git a/scripts/missions/cop/1_3_The_Mothercrystals.lua b/scripts/missions/cop/1_3_The_Mothercrystals.lua index 218b41492dc..0ac5cfc084b 100644 --- a/scripts/missions/cop/1_3_The_Mothercrystals.lua +++ b/scripts/missions/cop/1_3_The_Mothercrystals.lua @@ -10,6 +10,7 @@ require('scripts/missions/cop/helpers') ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.COP, xi.mission.id.cop.THE_MOTHERCRYSTALS) mission.reward = diff --git a/scripts/missions/cop/2_1_An_Invitation_West.lua b/scripts/missions/cop/2_1_An_Invitation_West.lua index 0a1e34867ab..e020f28d56f 100644 --- a/scripts/missions/cop/2_1_An_Invitation_West.lua +++ b/scripts/missions/cop/2_1_An_Invitation_West.lua @@ -7,6 +7,7 @@ local lufaiseID = zones[xi.zone.LUFAISE_MEADOWS] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.COP, xi.mission.id.cop.AN_INVITATION_WEST) mission.reward = diff --git a/scripts/missions/cop/2_2_The_Lost_City.lua b/scripts/missions/cop/2_2_The_Lost_City.lua index ac5f8cf9c75..60a4fa724f8 100644 --- a/scripts/missions/cop/2_2_The_Lost_City.lua +++ b/scripts/missions/cop/2_2_The_Lost_City.lua @@ -7,6 +7,7 @@ -- Sewer Entrance : !pos 28 -12 44 26 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.COP, xi.mission.id.cop.THE_LOST_CITY) mission.reward = diff --git a/scripts/missions/cop/2_3_Distant_Beliefs.lua b/scripts/missions/cop/2_3_Distant_Beliefs.lua index e84907939ab..055875cf0c4 100644 --- a/scripts/missions/cop/2_3_Distant_Beliefs.lua +++ b/scripts/missions/cop/2_3_Distant_Beliefs.lua @@ -9,6 +9,7 @@ -- Justinius : !pos 76 -34 68 26 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.COP, xi.mission.id.cop.DISTANT_BELIEFS) mission.reward = diff --git a/scripts/missions/cop/2_4_An_Eternal_Melody.lua b/scripts/missions/cop/2_4_An_Eternal_Melody.lua index 48fc9ed52fc..f3f3c0c7403 100644 --- a/scripts/missions/cop/2_4_An_Eternal_Melody.lua +++ b/scripts/missions/cop/2_4_An_Eternal_Melody.lua @@ -8,6 +8,7 @@ -- Dilapidated Gate : !pos 260 9 -435 25 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.COP, xi.mission.id.cop.AN_ETERNAL_MELODY) mission.reward = diff --git a/scripts/missions/cop/2_5_Ancient_Vows.lua b/scripts/missions/cop/2_5_Ancient_Vows.lua index f520536ab14..432e11f22c2 100644 --- a/scripts/missions/cop/2_5_Ancient_Vows.lua +++ b/scripts/missions/cop/2_5_Ancient_Vows.lua @@ -6,6 +6,7 @@ -- Dilapidated Gate : !pos -259 -30 276 25 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.COP, xi.mission.id.cop.ANCIENT_VOWS) mission.reward = diff --git a/scripts/missions/cop/3_1_The_Call_of_the_Wyrmking.lua b/scripts/missions/cop/3_1_The_Call_of_the_Wyrmking.lua index d5dd1ba42a7..e4e8456f8fd 100644 --- a/scripts/missions/cop/3_1_The_Call_of_the_Wyrmking.lua +++ b/scripts/missions/cop/3_1_The_Call_of_the_Wyrmking.lua @@ -7,6 +7,7 @@ -- Cid : !pos -12 -12 1 237 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.COP, xi.mission.id.cop.THE_CALL_OF_THE_WYRMKING) mission.reward = diff --git a/scripts/missions/cop/3_2_A_Vessel_Without_a_Captain.lua b/scripts/missions/cop/3_2_A_Vessel_Without_a_Captain.lua index 88ad4d483ef..fc443ef1ef0 100644 --- a/scripts/missions/cop/3_2_A_Vessel_Without_a_Captain.lua +++ b/scripts/missions/cop/3_2_A_Vessel_Without_a_Captain.lua @@ -7,6 +7,7 @@ -- Ru'Lude Homepoint 1 : !pos -6 3 0.001 243 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.COP, xi.mission.id.cop.A_VESSEL_WITHOUT_A_CAPTAIN) mission.reward = diff --git a/scripts/missions/cop/3_3_The_Road_Forks.lua b/scripts/missions/cop/3_3_The_Road_Forks.lua index 4dd5f7bd2ab..3f10145a7e2 100644 --- a/scripts/missions/cop/3_3_The_Road_Forks.lua +++ b/scripts/missions/cop/3_3_The_Road_Forks.lua @@ -30,6 +30,7 @@ local attohwaChasmID = zones[xi.zone.ATTOHWA_CHASM] local carpentersLandingID = zones[xi.zone.CARPENTERS_LANDING] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.COP, xi.mission.id.cop.THE_ROAD_FORKS) mission.reward = diff --git a/scripts/missions/cop/3_4_Tending_Aged_Wounds.lua b/scripts/missions/cop/3_4_Tending_Aged_Wounds.lua index 156d0ab4732..d45dbc19cbb 100644 --- a/scripts/missions/cop/3_4_Tending_Aged_Wounds.lua +++ b/scripts/missions/cop/3_4_Tending_Aged_Wounds.lua @@ -7,6 +7,7 @@ -- Door: Neptune's Spire : !pos 35 0 -15 245 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.COP, xi.mission.id.cop.TENDING_AGED_WOUNDS) mission.reward = diff --git a/scripts/missions/cop/3_5_Darkness_Named.lua b/scripts/missions/cop/3_5_Darkness_Named.lua index 485c052aa6b..da3e36355ef 100644 --- a/scripts/missions/cop/3_5_Darkness_Named.lua +++ b/scripts/missions/cop/3_5_Darkness_Named.lua @@ -9,6 +9,7 @@ local upperJeunoID = zones[xi.zone.UPPER_JEUNO] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.COP, xi.mission.id.cop.DARKNESS_NAMED) mission.reward = diff --git a/scripts/missions/cop/4_1_Sheltering_Doubt.lua b/scripts/missions/cop/4_1_Sheltering_Doubt.lua index 514db4d84ab..08ccee4993e 100644 --- a/scripts/missions/cop/4_1_Sheltering_Doubt.lua +++ b/scripts/missions/cop/4_1_Sheltering_Doubt.lua @@ -8,6 +8,7 @@ -- Dilapidated Gate : !pos 260 9 -435 25 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.COP, xi.mission.id.cop.SHELTERING_DOUBT) mission.reward = diff --git a/scripts/missions/cop/4_2_The_Savage.lua b/scripts/missions/cop/4_2_The_Savage.lua index 56a852a5136..265e3d39153 100644 --- a/scripts/missions/cop/4_2_The_Savage.lua +++ b/scripts/missions/cop/4_2_The_Savage.lua @@ -7,6 +7,7 @@ -- Justinius : !pos 76 -34 68 26 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.COP, xi.mission.id.cop.THE_SAVAGE) mission.reward = diff --git a/scripts/missions/cop/4_3_The_Secrets_of_Worship.lua b/scripts/missions/cop/4_3_The_Secrets_of_Worship.lua index f3f0f124158..31698ae2092 100644 --- a/scripts/missions/cop/4_3_The_Secrets_of_Worship.lua +++ b/scripts/missions/cop/4_3_The_Secrets_of_Worship.lua @@ -12,6 +12,7 @@ local sacrariumID = zones[xi.zone.SACRARIUM] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.COP, xi.mission.id.cop.THE_SECRETS_OF_WORSHIP) local profQmOnTrigger = function(player, npc) diff --git a/scripts/missions/cop/4_4_Slanderous_Utterings.lua b/scripts/missions/cop/4_4_Slanderous_Utterings.lua index 92fe2642b0b..479130d50d3 100644 --- a/scripts/missions/cop/4_4_Slanderous_Utterings.lua +++ b/scripts/missions/cop/4_4_Slanderous_Utterings.lua @@ -5,6 +5,7 @@ -- !addmission 6 438 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.COP, xi.mission.id.cop.SLANDEROUS_UTTERINGS) mission.reward = diff --git a/scripts/missions/cop/5_1_The_Enduring_Tumult_of_War.lua b/scripts/missions/cop/5_1_The_Enduring_Tumult_of_War.lua index 2e5fa8ce090..cc7eb7b9ae7 100644 --- a/scripts/missions/cop/5_1_The_Enduring_Tumult_of_War.lua +++ b/scripts/missions/cop/5_1_The_Enduring_Tumult_of_War.lua @@ -13,6 +13,7 @@ local promyvionVahzlID = zones[xi.zone.PROMYVION_VAHZL] local psoXjaID = zones[xi.zone.PSOXJA] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.COP, xi.mission.id.cop.THE_ENDURING_TUMULT_OF_WAR) mission.reward = diff --git a/scripts/missions/cop/5_2_Desires_of_Emptiness.lua b/scripts/missions/cop/5_2_Desires_of_Emptiness.lua index 3bbacb57bae..15a0ec3eb99 100644 --- a/scripts/missions/cop/5_2_Desires_of_Emptiness.lua +++ b/scripts/missions/cop/5_2_Desires_of_Emptiness.lua @@ -12,6 +12,7 @@ local promyvionVahzlID = zones[xi.zone.PROMYVION_VAHZL] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.COP, xi.mission.id.cop.DESIRES_OF_EMPTINESS) mission.reward = diff --git a/scripts/missions/cop/5_3_Three_Paths.lua b/scripts/missions/cop/5_3_Three_Paths.lua index d19f2f40f54..d575c9d3b0b 100644 --- a/scripts/missions/cop/5_3_Three_Paths.lua +++ b/scripts/missions/cop/5_3_Three_Paths.lua @@ -31,6 +31,7 @@ local lowerDelkfuttsID = zones[xi.zone.LOWER_DELKFUTTS_TOWER] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.COP, xi.mission.id.cop.THREE_PATHS) mission.reward = diff --git a/scripts/missions/cop/6_1_For_Whom_the_Verse_is_Sung.lua b/scripts/missions/cop/6_1_For_Whom_the_Verse_is_Sung.lua index 1db3d374828..6ebea1961b5 100644 --- a/scripts/missions/cop/6_1_For_Whom_the_Verse_is_Sung.lua +++ b/scripts/missions/cop/6_1_For_Whom_the_Verse_is_Sung.lua @@ -7,6 +7,7 @@ -- Marble Bridge : !pos -96.6 -0.2 92.3 244 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.COP, xi.mission.id.cop.FOR_WHOM_THE_VERSE_IS_SUNG) mission.reward = diff --git a/scripts/missions/cop/6_2_A_Place_to_Return.lua b/scripts/missions/cop/6_2_A_Place_to_Return.lua index b9a5d722fdc..1159c2d0769 100644 --- a/scripts/missions/cop/6_2_A_Place_to_Return.lua +++ b/scripts/missions/cop/6_2_A_Place_to_Return.lua @@ -9,6 +9,7 @@ local misareauxID = zones[xi.zone.MISAREAUX_COAST] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.COP, xi.mission.id.cop.A_PLACE_TO_RETURN) mission.reward = diff --git a/scripts/missions/cop/6_3_More_Questions_than_Answers.lua b/scripts/missions/cop/6_3_More_Questions_than_Answers.lua index 9bff00d647a..49d317fdced 100644 --- a/scripts/missions/cop/6_3_More_Questions_than_Answers.lua +++ b/scripts/missions/cop/6_3_More_Questions_than_Answers.lua @@ -7,6 +7,7 @@ -- Mathilde : !pos 12.578 -8.287 -7.576 248 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.COP, xi.mission.id.cop.MORE_QUESTIONS_THAN_ANSWERS) mission.reward = diff --git a/scripts/missions/cop/6_4_One_to_be_Feared.lua b/scripts/missions/cop/6_4_One_to_be_Feared.lua index 5994fc542e9..874cfb23a6b 100644 --- a/scripts/missions/cop/6_4_One_to_be_Feared.lua +++ b/scripts/missions/cop/6_4_One_to_be_Feared.lua @@ -7,6 +7,7 @@ -- Iron Gate : !pos 612 132 774 32 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.COP, xi.mission.id.cop.ONE_TO_BE_FEARED) mission.reward = diff --git a/scripts/missions/cop/7_1_Chains_and_Bonds.lua b/scripts/missions/cop/7_1_Chains_and_Bonds.lua index 1b9a2b1370c..c6ef4217c7b 100644 --- a/scripts/missions/cop/7_1_Chains_and_Bonds.lua +++ b/scripts/missions/cop/7_1_Chains_and_Bonds.lua @@ -7,6 +7,7 @@ -- Sewer Entrance : !pos 28 -12 44 26 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.COP, xi.mission.id.cop.CHAINS_AND_BONDS) mission.reward = diff --git a/scripts/missions/cop/7_2_Flames_in_the_Darkness.lua b/scripts/missions/cop/7_2_Flames_in_the_Darkness.lua index c9e33856c69..35f41dfe81f 100644 --- a/scripts/missions/cop/7_2_Flames_in_the_Darkness.lua +++ b/scripts/missions/cop/7_2_Flames_in_the_Darkness.lua @@ -7,6 +7,7 @@ -- Sueleen : !pos 612 132 774 32 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.COP, xi.mission.id.cop.FLAMES_IN_THE_DARKNESS) mission.reward = diff --git a/scripts/missions/cop/7_3_Fire_in_the_Eyes_of_Men.lua b/scripts/missions/cop/7_3_Fire_in_the_Eyes_of_Men.lua index 3e0a7043ed7..4ba9a65543f 100644 --- a/scripts/missions/cop/7_3_Fire_in_the_Eyes_of_Men.lua +++ b/scripts/missions/cop/7_3_Fire_in_the_Eyes_of_Men.lua @@ -6,6 +6,7 @@ -- Cid : !pos -12 -12 1 237 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.COP, xi.mission.id.cop.FIRE_IN_THE_EYES_OF_MEN) mission.reward = diff --git a/scripts/missions/cop/7_4_Calm_Before_the_Storm.lua b/scripts/missions/cop/7_4_Calm_Before_the_Storm.lua index ccd4af84a19..f140f0a880d 100644 --- a/scripts/missions/cop/7_4_Calm_Before_the_Storm.lua +++ b/scripts/missions/cop/7_4_Calm_Before_the_Storm.lua @@ -14,6 +14,7 @@ local bibikiBayID = zones[xi.zone.BIBIKI_BAY] local misareauxID = zones[xi.zone.MISAREAUX_COAST] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.COP, xi.mission.id.cop.CALM_BEFORE_THE_STORM) mission.reward = diff --git a/scripts/missions/cop/7_5_The_Warriors_Path.lua b/scripts/missions/cop/7_5_The_Warriors_Path.lua index 3e2e037bb18..f823b897b67 100644 --- a/scripts/missions/cop/7_5_The_Warriors_Path.lua +++ b/scripts/missions/cop/7_5_The_Warriors_Path.lua @@ -8,6 +8,7 @@ local altaieuID = zones[xi.zone.ALTAIEU] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.COP, xi.mission.id.cop.THE_WARRIORS_PATH) mission.reward = diff --git a/scripts/missions/cop/8_1_Garden_of_Antiquity.lua b/scripts/missions/cop/8_1_Garden_of_Antiquity.lua index affd3ad1be9..3533f61aef5 100644 --- a/scripts/missions/cop/8_1_Garden_of_Antiquity.lua +++ b/scripts/missions/cop/8_1_Garden_of_Antiquity.lua @@ -13,6 +13,7 @@ local altaieuID = zones[xi.zone.ALTAIEU] local huxoiID = zones[xi.zone.GRAND_PALACE_OF_HUXZOI] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.COP, xi.mission.id.cop.GARDEN_OF_ANTIQUITY) mission.reward = diff --git a/scripts/missions/cop/8_2_A_Fate_Decided.lua b/scripts/missions/cop/8_2_A_Fate_Decided.lua index 1307c4cb5fc..042edd38574 100644 --- a/scripts/missions/cop/8_2_A_Fate_Decided.lua +++ b/scripts/missions/cop/8_2_A_Fate_Decided.lua @@ -8,6 +8,7 @@ local huxoiID = zones[xi.zone.GRAND_PALACE_OF_HUXZOI] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.COP, xi.mission.id.cop.A_FATE_DECIDED) mission.reward = diff --git a/scripts/missions/cop/8_3_When_Angels_Fall.lua b/scripts/missions/cop/8_3_When_Angels_Fall.lua index b3c4080f285..4ca6abb4751 100644 --- a/scripts/missions/cop/8_3_When_Angels_Fall.lua +++ b/scripts/missions/cop/8_3_When_Angels_Fall.lua @@ -14,6 +14,7 @@ local altaieuID = zones[xi.zone.ALTAIEU] local ruhmetID = zones[xi.zone.THE_GARDEN_OF_RUHMET] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.COP, xi.mission.id.cop.WHEN_ANGELS_FALL) mission.reward = diff --git a/scripts/missions/cop/8_4_Dawn.lua b/scripts/missions/cop/8_4_Dawn.lua index 548d76b12f7..b6ed1a289db 100644 --- a/scripts/missions/cop/8_4_Dawn.lua +++ b/scripts/missions/cop/8_4_Dawn.lua @@ -12,6 +12,7 @@ -- TODO: Add additional section to complete mission that aligns with Apocalypse Nigh ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.COP, xi.mission.id.cop.DAWN) mission.reward = diff --git a/scripts/missions/rotz/01_The_New_Frontier.lua b/scripts/missions/rotz/01_The_New_Frontier.lua index 2d4fd6752f3..35a82d098b8 100644 --- a/scripts/missions/rotz/01_The_New_Frontier.lua +++ b/scripts/missions/rotz/01_The_New_Frontier.lua @@ -8,6 +8,7 @@ -- Norg : !zone 252 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.ZILART, xi.mission.id.zilart.THE_NEW_FRONTIER) mission.reward = diff --git a/scripts/missions/rotz/02_Welcome_to_Norg.lua b/scripts/missions/rotz/02_Welcome_to_Norg.lua index 0b05768c147..64a77644bf2 100644 --- a/scripts/missions/rotz/02_Welcome_to_Norg.lua +++ b/scripts/missions/rotz/02_Welcome_to_Norg.lua @@ -6,6 +6,7 @@ -- _700 (Oaken Door) : !pos 97 -7 -12 252 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.ZILART, xi.mission.id.zilart.WELCOME_TNORG) mission.reward = diff --git a/scripts/missions/rotz/03_Kazhams_Chieftainess.lua b/scripts/missions/rotz/03_Kazhams_Chieftainess.lua index 525918f6d23..6434bcd1463 100644 --- a/scripts/missions/rotz/03_Kazhams_Chieftainess.lua +++ b/scripts/missions/rotz/03_Kazhams_Chieftainess.lua @@ -7,6 +7,7 @@ -- Jakoh Wahcondalo : !pos 101 -16 -115 250 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.ZILART, xi.mission.id.zilart.KAZHAMS_CHIEFTAINESS) mission.reward = diff --git a/scripts/missions/rotz/04_The_Temple_of_Uggalepih.lua b/scripts/missions/rotz/04_The_Temple_of_Uggalepih.lua index 6a384d07a67..28ac37038d9 100644 --- a/scripts/missions/rotz/04_The_Temple_of_Uggalepih.lua +++ b/scripts/missions/rotz/04_The_Temple_of_Uggalepih.lua @@ -8,6 +8,7 @@ -- Mahogany Door (BCNM) : !pos 299 0.1 349 163 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.ZILART, xi.mission.id.zilart.THE_TEMPLE_OF_UGGALEPIH) mission.reward = diff --git a/scripts/missions/rotz/05_Headstone_Pilgrimage.lua b/scripts/missions/rotz/05_Headstone_Pilgrimage.lua index e3afa284c64..a42e6f36379 100644 --- a/scripts/missions/rotz/05_Headstone_Pilgrimage.lua +++ b/scripts/missions/rotz/05_Headstone_Pilgrimage.lua @@ -23,6 +23,7 @@ local yuhtungaJungleID = zones[xi.zone.YUHTUNGA_JUNGLE] local sanctuaryOfZitahID = zones[xi.zone.THE_SANCTUARY_OF_ZITAH] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.ZILART, xi.mission.id.zilart.HEADSTONE_PILGRIMAGE) mission.reward = diff --git a/scripts/missions/rotz/06_Through_the_Quicksand_Caves.lua b/scripts/missions/rotz/06_Through_the_Quicksand_Caves.lua index 186123a0fcf..63e1dc388f1 100644 --- a/scripts/missions/rotz/06_Through_the_Quicksand_Caves.lua +++ b/scripts/missions/rotz/06_Through_the_Quicksand_Caves.lua @@ -6,6 +6,7 @@ -- Shimmering Circle : !pos -220 0 12 168 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.ZILART, xi.mission.id.zilart.THROUGH_THE_QUICKSAND_CAVES) mission.reward = diff --git a/scripts/missions/rotz/07_The_Chamber_of_Oracles.lua b/scripts/missions/rotz/07_The_Chamber_of_Oracles.lua index 6c8961c4cd8..0b3c2efc674 100644 --- a/scripts/missions/rotz/07_The_Chamber_of_Oracles.lua +++ b/scripts/missions/rotz/07_The_Chamber_of_Oracles.lua @@ -8,6 +8,7 @@ local oraclesID = zones[xi.zone.CHAMBER_OF_ORACLES] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.ZILART, xi.mission.id.zilart.THE_CHAMBER_OF_ORACLES) mission.reward = diff --git a/scripts/missions/rotz/08_Return_to_Delkfutts_Tower.lua b/scripts/missions/rotz/08_Return_to_Delkfutts_Tower.lua index fd464aa4cc6..ad6ae13a43d 100644 --- a/scripts/missions/rotz/08_Return_to_Delkfutts_Tower.lua +++ b/scripts/missions/rotz/08_Return_to_Delkfutts_Tower.lua @@ -10,6 +10,7 @@ -- Qe'Lov Gate (BCNM) : !pos -520 -4 17 179 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.ZILART, xi.mission.id.zilart.RETURN_TO_DELKFUTTS_TOWER) mission.reward = diff --git a/scripts/missions/rotz/09_RoMaeve.lua b/scripts/missions/rotz/09_RoMaeve.lua index ca08983c720..25a877e64a3 100644 --- a/scripts/missions/rotz/09_RoMaeve.lua +++ b/scripts/missions/rotz/09_RoMaeve.lua @@ -7,6 +7,7 @@ -- Aldo : !pos 20 3 -58 245 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.ZILART, xi.mission.id.zilart.ROMAEVE) mission.reward = diff --git a/scripts/missions/rotz/10_The_Temple_of_Desolation.lua b/scripts/missions/rotz/10_The_Temple_of_Desolation.lua index 5636bcb67ff..627e1398955 100644 --- a/scripts/missions/rotz/10_The_Temple_of_Desolation.lua +++ b/scripts/missions/rotz/10_The_Temple_of_Desolation.lua @@ -7,6 +7,7 @@ -- _6z0 : !pos 0 -12 48 251 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.ZILART, xi.mission.id.zilart.THE_TEMPLE_OF_DESOLATION) mission.reward = diff --git a/scripts/missions/rotz/11_The_Hall_of_the_Gods.lua b/scripts/missions/rotz/11_The_Hall_of_the_Gods.lua index 4d231e755e8..af4b91cb67d 100644 --- a/scripts/missions/rotz/11_The_Hall_of_the_Gods.lua +++ b/scripts/missions/rotz/11_The_Hall_of_the_Gods.lua @@ -8,6 +8,7 @@ local hallID = zones[xi.zone.HALL_OF_THE_GODS] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.ZILART, xi.mission.id.zilart.THE_HALL_OF_THE_GODS) mission.reward = diff --git a/scripts/missions/rotz/12_The_Mithra_and_the_Crystal.lua b/scripts/missions/rotz/12_The_Mithra_and_the_Crystal.lua index 91459173cd5..bba7d433a07 100644 --- a/scripts/missions/rotz/12_The_Mithra_and_the_Crystal.lua +++ b/scripts/missions/rotz/12_The_Mithra_and_the_Crystal.lua @@ -11,6 +11,7 @@ local quicksandCavesID = zones[xi.zone.QUICKSAND_CAVES] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.ZILART, xi.mission.id.zilart.THE_MITHRA_AND_THE_CRYSTAL) mission.reward = diff --git a/scripts/missions/rotz/13_The_Gate_of_the_Gods.lua b/scripts/missions/rotz/13_The_Gate_of_the_Gods.lua index 8252f7c7907..1abe04e3b0a 100644 --- a/scripts/missions/rotz/13_The_Gate_of_the_Gods.lua +++ b/scripts/missions/rotz/13_The_Gate_of_the_Gods.lua @@ -7,6 +7,7 @@ -- RuAun_Gardens : !zone 130 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.ZILART, xi.mission.id.zilart.THE_GATE_OF_THE_GODS) mission.reward = diff --git a/scripts/missions/rotz/14_Ark_Angels.lua b/scripts/missions/rotz/14_Ark_Angels.lua index 5a9c87065ce..22270f9f5bc 100644 --- a/scripts/missions/rotz/14_Ark_Angels.lua +++ b/scripts/missions/rotz/14_Ark_Angels.lua @@ -13,6 +13,7 @@ -- qm1_5 : !pos 555.998 -38.205 520.627 180 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.ZILART, xi.mission.id.zilart.ARK_ANGELS) -- Table index based on Battlefield ID - Offset, this ordering is different diff --git a/scripts/missions/rotz/15_The_Sealed_Shrine.lua b/scripts/missions/rotz/15_The_Sealed_Shrine.lua index 6e60eb0f764..5f9655adf8d 100644 --- a/scripts/missions/rotz/15_The_Sealed_Shrine.lua +++ b/scripts/missions/rotz/15_The_Sealed_Shrine.lua @@ -8,6 +8,7 @@ -- Ru'Avitau Main Entrance : !pos -0.2171 -45.013 -119.7575 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.ZILART, xi.mission.id.zilart.THE_SEALED_SHRINE) mission.reward = diff --git a/scripts/missions/rotz/16_The_Celestial_Nexus.lua b/scripts/missions/rotz/16_The_Celestial_Nexus.lua index 45bc95d8690..7b198cd4e1f 100644 --- a/scripts/missions/rotz/16_The_Celestial_Nexus.lua +++ b/scripts/missions/rotz/16_The_Celestial_Nexus.lua @@ -7,6 +7,7 @@ -- _515 (BCNM Entry) : !pos -665.2291 -5.8232 -32.4834 181 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.ZILART, xi.mission.id.zilart.THE_CELESTIAL_NEXUS) mission.reward = diff --git a/scripts/missions/rotz/17_Awakening.lua b/scripts/missions/rotz/17_Awakening.lua index 7dd051dbdd2..2e0c6fadf89 100644 --- a/scripts/missions/rotz/17_Awakening.lua +++ b/scripts/missions/rotz/17_Awakening.lua @@ -8,6 +8,7 @@ -- Norg : !zone 252 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.ZILART, xi.mission.id.zilart.AWAKENING) mission.reward = diff --git a/scripts/missions/rov/1_01_Rhapsodies_of_Vanadiel.lua b/scripts/missions/rov/1_01_Rhapsodies_of_Vanadiel.lua index d8b570b843a..74d3ed79d9a 100644 --- a/scripts/missions/rov/1_01_Rhapsodies_of_Vanadiel.lua +++ b/scripts/missions/rov/1_01_Rhapsodies_of_Vanadiel.lua @@ -6,6 +6,7 @@ -- !addmission 13 0 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.ROV, xi.mission.id.rov.RHAPSODIES_OF_VANADIEL) mission.reward = diff --git a/scripts/missions/rov/1_02_Resonance.lua b/scripts/missions/rov/1_02_Resonance.lua index 3cb8b46d954..c7f3c787867 100644 --- a/scripts/missions/rov/1_02_Resonance.lua +++ b/scripts/missions/rov/1_02_Resonance.lua @@ -5,6 +5,7 @@ -- !addmission 13 2 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.ROV, xi.mission.id.rov.RESONACE) mission.reward = diff --git a/scripts/missions/rov/1_03_Emissary_from_the_Seas.lua b/scripts/missions/rov/1_03_Emissary_from_the_Seas.lua index 88a2349b149..a8dc536ca60 100644 --- a/scripts/missions/rov/1_03_Emissary_from_the_Seas.lua +++ b/scripts/missions/rov/1_03_Emissary_from_the_Seas.lua @@ -7,6 +7,7 @@ -- Numi Adaligo : !pos -80.3 -24 34.8 249 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.ROV, xi.mission.id.rov.EMISSARY_FROM_THE_SEAS) mission.reward = diff --git a/scripts/missions/rov/1_04_Set_Free.lua b/scripts/missions/rov/1_04_Set_Free.lua index 7e862607a62..604197fae06 100644 --- a/scripts/missions/rov/1_04_Set_Free.lua +++ b/scripts/missions/rov/1_04_Set_Free.lua @@ -7,6 +7,7 @@ -- Ekokoko : !pos -78 -24 28 249 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.ROV, xi.mission.id.rov.SET_FREE) mission.reward = diff --git a/scripts/missions/rov/1_05_The_Beginning.lua b/scripts/missions/rov/1_05_The_Beginning.lua index c4829847bb6..9dce0b76589 100644 --- a/scripts/missions/rov/1_05_The_Beginning.lua +++ b/scripts/missions/rov/1_05_The_Beginning.lua @@ -12,6 +12,7 @@ local norgID = zones[xi.zone.NORG] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.ROV, xi.mission.id.rov.THE_BEGINNING) mission.reward = diff --git a/scripts/missions/rov/1_06_Flames_of_Prayer.lua b/scripts/missions/rov/1_06_Flames_of_Prayer.lua index c31b2073be7..7ce82224452 100644 --- a/scripts/missions/rov/1_06_Flames_of_Prayer.lua +++ b/scripts/missions/rov/1_06_Flames_of_Prayer.lua @@ -6,6 +6,7 @@ -- Oaken Door : !pos 97 -7 -12 252 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.ROV, xi.mission.id.rov.FLAMES_OF_PRAYER) mission.reward = diff --git a/scripts/missions/rov/1_07_The_Path_Untraveled.lua b/scripts/missions/rov/1_07_The_Path_Untraveled.lua index cef7461e38c..9c0a50e982c 100644 --- a/scripts/missions/rov/1_07_The_Path_Untraveled.lua +++ b/scripts/missions/rov/1_07_The_Path_Untraveled.lua @@ -11,6 +11,7 @@ local norgID = zones[xi.zone.NORG] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.ROV, xi.mission.id.rov.THE_PATH_UNTRAVELED) mission.reward = diff --git a/scripts/missions/rov/1_08_At_Heavens_Door.lua b/scripts/missions/rov/1_08_At_Heavens_Door.lua index b4b4e309a16..29d2f0350b6 100644 --- a/scripts/missions/rov/1_08_At_Heavens_Door.lua +++ b/scripts/missions/rov/1_08_At_Heavens_Door.lua @@ -8,6 +8,7 @@ local norgID = zones[xi.zone.NORG] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.ROV, xi.mission.id.rov.AT_THE_HEAVENS_DOOR) mission.reward = diff --git a/scripts/missions/rov/1_09_The_Lions_Roar.lua b/scripts/missions/rov/1_09_The_Lions_Roar.lua index 5f913be0306..b23d409f5df 100644 --- a/scripts/missions/rov/1_09_The_Lions_Roar.lua +++ b/scripts/missions/rov/1_09_The_Lions_Roar.lua @@ -8,6 +8,7 @@ local qufimID = zones[xi.zone.QUFIM_ISLAND] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.ROV, xi.mission.id.rov.THE_LIONS_ROAR) mission.reward = diff --git a/scripts/missions/rov/1_10_Eddies_of_Despair_I.lua b/scripts/missions/rov/1_10_Eddies_of_Despair_I.lua index fb15bc4112a..48ed0a1fc47 100644 --- a/scripts/missions/rov/1_10_Eddies_of_Despair_I.lua +++ b/scripts/missions/rov/1_10_Eddies_of_Despair_I.lua @@ -6,6 +6,7 @@ -- Undulating Confluence : !pos -204.531 -20.027 75.318 126 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.ROV, xi.mission.id.rov.EDDIES_OF_DESPAIR_I) mission.reward = diff --git a/scripts/missions/rov/1_11_A_Land_After_Time.lua b/scripts/missions/rov/1_11_A_Land_After_Time.lua index 65d157649ab..3472b458751 100644 --- a/scripts/missions/rov/1_11_A_Land_After_Time.lua +++ b/scripts/missions/rov/1_11_A_Land_After_Time.lua @@ -8,6 +8,7 @@ -- Shattered Telepoint (Tahrongi) : !pos 179 35 255 117 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.ROV, xi.mission.id.rov.A_LAND_AFTER_TIME) mission.reward = diff --git a/scripts/missions/rov/1_12_Fates_Call.lua b/scripts/missions/rov/1_12_Fates_Call.lua index 9b7d76cb26a..c040aa112a5 100644 --- a/scripts/missions/rov/1_12_Fates_Call.lua +++ b/scripts/missions/rov/1_12_Fates_Call.lua @@ -5,6 +5,7 @@ -- !addmission 13 28 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.ROV, xi.mission.id.rov.FATES_CALL) mission.reward = diff --git a/scripts/missions/rov/1_13_What_Lies_Beyond.lua b/scripts/missions/rov/1_13_What_Lies_Beyond.lua index 5b0cf4980be..8fa4cd72640 100644 --- a/scripts/missions/rov/1_13_What_Lies_Beyond.lua +++ b/scripts/missions/rov/1_13_What_Lies_Beyond.lua @@ -6,6 +6,7 @@ -- Oaken Door : !pos 97 -7 -12 252 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.ROV, xi.mission.id.rov.WHAT_LIES_BEYOND) mission.reward = diff --git a/scripts/missions/rov/1_14_The_Ties_that_Bind.lua b/scripts/missions/rov/1_14_The_Ties_that_Bind.lua index ef934dcd6b4..7765d4a4b2f 100644 --- a/scripts/missions/rov/1_14_The_Ties_that_Bind.lua +++ b/scripts/missions/rov/1_14_The_Ties_that_Bind.lua @@ -6,6 +6,7 @@ -- qm7 : !pos 110.909 -0.095 -6.851 176 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.ROV, xi.mission.id.rov.THE_TIES_THAT_BIND) mission.reward = diff --git a/scripts/missions/rov/1_15_Impurity.lua b/scripts/missions/rov/1_15_Impurity.lua index 78d4a687cdb..6072a9ff003 100644 --- a/scripts/missions/rov/1_15_Impurity.lua +++ b/scripts/missions/rov/1_15_Impurity.lua @@ -6,6 +6,7 @@ -- qm11 : !pos -409.553 17.356 -380.626 123 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.ROV, xi.mission.id.rov.IMPURITY) mission.reward = diff --git a/scripts/missions/rov/1_16_The_Lost_Avatar.lua b/scripts/missions/rov/1_16_The_Lost_Avatar.lua index 2bfc43c0f15..c8b1defe65b 100644 --- a/scripts/missions/rov/1_16_The_Lost_Avatar.lua +++ b/scripts/missions/rov/1_16_The_Lost_Avatar.lua @@ -8,6 +8,7 @@ local yuhtungaID = zones[xi.zone.YUHTUNGA_JUNGLE] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.ROV, xi.mission.id.rov.THE_LOST_AVATAR) mission.reward = diff --git a/scripts/missions/rov/1_17_Volto_Oscuro.lua b/scripts/missions/rov/1_17_Volto_Oscuro.lua index bdedc136974..af9de24cfa0 100644 --- a/scripts/missions/rov/1_17_Volto_Oscuro.lua +++ b/scripts/missions/rov/1_17_Volto_Oscuro.lua @@ -6,6 +6,7 @@ -- Oaken Door : !pos 97 -7 -12 252 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.ROV, xi.mission.id.rov.VOLTO_OSCURO) mission.reward = diff --git a/scripts/missions/rov/1_18_Ring_My_Bell.lua b/scripts/missions/rov/1_18_Ring_My_Bell.lua index 6e0b8c2048b..9f0ae7083bc 100644 --- a/scripts/missions/rov/1_18_Ring_My_Bell.lua +++ b/scripts/missions/rov/1_18_Ring_My_Bell.lua @@ -6,6 +6,7 @@ -- Oaken Door : !pos 97 -7 -12 252 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.ROV, xi.mission.id.rov.RING_MY_BELL) mission.reward = diff --git a/scripts/missions/rov/2_01_Spirits_Awoken.lua b/scripts/missions/rov/2_01_Spirits_Awoken.lua index a908a657467..ae7de92e72e 100644 --- a/scripts/missions/rov/2_01_Spirits_Awoken.lua +++ b/scripts/missions/rov/2_01_Spirits_Awoken.lua @@ -5,6 +5,7 @@ -- !addmission 13 44 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.ROV, xi.mission.id.rov.SPIRITS_AWOKEN) mission.reward = diff --git a/scripts/missions/rov/2_02_Crashing_Waves.lua b/scripts/missions/rov/2_02_Crashing_Waves.lua index a39944df2d3..7dca891ab0e 100644 --- a/scripts/missions/rov/2_02_Crashing_Waves.lua +++ b/scripts/missions/rov/2_02_Crashing_Waves.lua @@ -8,6 +8,7 @@ local ruludeID = zones[xi.zone.RULUDE_GARDENS] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.ROV, xi.mission.id.rov.CRASHING_WAVES) mission.reward = diff --git a/scripts/missions/rov/2_03_Call_to_Serve.lua b/scripts/missions/rov/2_03_Call_to_Serve.lua index 9204d6b6c45..461367c14e6 100644 --- a/scripts/missions/rov/2_03_Call_to_Serve.lua +++ b/scripts/missions/rov/2_03_Call_to_Serve.lua @@ -7,6 +7,7 @@ local portJeunoID = zones[xi.zone.PORT_JEUNO] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.ROV, xi.mission.id.rov.CALL_TO_SERVE) mission.reward = diff --git a/scripts/missions/rov/2_04_Numbering_Days.lua b/scripts/missions/rov/2_04_Numbering_Days.lua index b200fb87112..be55825e824 100644 --- a/scripts/missions/rov/2_04_Numbering_Days.lua +++ b/scripts/missions/rov/2_04_Numbering_Days.lua @@ -6,6 +6,7 @@ -- Marble Bridge Eatery (Door) : !pos -96.6 -0.2 92.3 244 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.ROV, xi.mission.id.rov.NUMBERING_DAYS) mission.reward = diff --git a/scripts/missions/rov/2_05_Inescapable_Binds.lua b/scripts/missions/rov/2_05_Inescapable_Binds.lua index 32d3475bb1f..b609d1578db 100644 --- a/scripts/missions/rov/2_05_Inescapable_Binds.lua +++ b/scripts/missions/rov/2_05_Inescapable_Binds.lua @@ -5,6 +5,7 @@ -- !addmission 13 52 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.ROV, xi.mission.id.rov.INESCAPABLE_BINDS) mission.reward = diff --git a/scripts/missions/rov/2_06_Desert_Winds.lua b/scripts/missions/rov/2_06_Desert_Winds.lua index 53e65b20d49..cf838adfef3 100644 --- a/scripts/missions/rov/2_06_Desert_Winds.lua +++ b/scripts/missions/rov/2_06_Desert_Winds.lua @@ -5,6 +5,7 @@ -- !addmission 13 54 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.ROV, xi.mission.id.rov.DESERT_WINDS) mission.reward = diff --git a/scripts/missions/rov/2_07_Ever_Forward.lua b/scripts/missions/rov/2_07_Ever_Forward.lua index a0d435b7a0a..c86a1f9fe52 100644 --- a/scripts/missions/rov/2_07_Ever_Forward.lua +++ b/scripts/missions/rov/2_07_Ever_Forward.lua @@ -7,6 +7,7 @@ local whitegateID = zones[xi.zone.AHT_URHGAN_WHITEGATE] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.ROV, xi.mission.id.rov.EVER_FORWARD) mission.reward = diff --git a/scripts/missions/rov/2_09_Aphmaus_Light.lua b/scripts/missions/rov/2_09_Aphmaus_Light.lua index 07c6dbd0ffe..b7a3ea598c0 100644 --- a/scripts/missions/rov/2_09_Aphmaus_Light.lua +++ b/scripts/missions/rov/2_09_Aphmaus_Light.lua @@ -7,6 +7,7 @@ local whitegateID = zones[xi.zone.AHT_URHGAN_WHITEGATE] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.ROV, xi.mission.id.rov.APHMAUS_LIGHT) mission.reward = diff --git a/scripts/missions/rov/2_10_Reunited.lua b/scripts/missions/rov/2_10_Reunited.lua index 7c7f40b9cbb..6403e065cb1 100644 --- a/scripts/missions/rov/2_10_Reunited.lua +++ b/scripts/missions/rov/2_10_Reunited.lua @@ -5,6 +5,7 @@ -- !addmission 13 64 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.ROV, xi.mission.id.rov.REUNITED) mission.reward = diff --git a/scripts/missions/rov/2_11_Take_Wing.lua b/scripts/missions/rov/2_11_Take_Wing.lua index 38ff93e0b00..eb62898ae1a 100644 --- a/scripts/missions/rov/2_11_Take_Wing.lua +++ b/scripts/missions/rov/2_11_Take_Wing.lua @@ -5,6 +5,7 @@ -- !addmission 13 66 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.ROV, xi.mission.id.rov.TAKE_WING) mission.reward = diff --git a/scripts/missions/rov/2_12_Prime_Number.lua b/scripts/missions/rov/2_12_Prime_Number.lua index ca09334c2c8..fc8a975ddef 100644 --- a/scripts/missions/rov/2_12_Prime_Number.lua +++ b/scripts/missions/rov/2_12_Prime_Number.lua @@ -5,6 +5,7 @@ -- !addmission 13 68 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.ROV, xi.mission.id.rov.PRIME_NUMBER) mission.reward = diff --git a/scripts/missions/rov/2_13_From_the_Ruins.lua b/scripts/missions/rov/2_13_From_the_Ruins.lua index a2e43515a36..4550f7a805f 100644 --- a/scripts/missions/rov/2_13_From_the_Ruins.lua +++ b/scripts/missions/rov/2_13_From_the_Ruins.lua @@ -5,6 +5,7 @@ -- !addmission 13 62 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.ROV, xi.mission.id.rov.FROM_THE_RUINS) mission.reward = diff --git a/scripts/missions/rov/2_14_Cauterize.lua b/scripts/missions/rov/2_14_Cauterize.lua index 6c3a0d5e311..7d73404c853 100644 --- a/scripts/missions/rov/2_14_Cauterize.lua +++ b/scripts/missions/rov/2_14_Cauterize.lua @@ -12,6 +12,7 @@ -- Sauromugue Champaign [S] : !pos 369 8 -227 98 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.ROV, xi.mission.id.rov.CAUTERIZE) mission.reward = diff --git a/scripts/missions/rov/2_15_Uncertain_Destinations.lua b/scripts/missions/rov/2_15_Uncertain_Destinations.lua index ac8009ab9a9..bbbc6e15fda 100644 --- a/scripts/missions/rov/2_15_Uncertain_Destinations.lua +++ b/scripts/missions/rov/2_15_Uncertain_Destinations.lua @@ -5,6 +5,7 @@ -- !addmission 13 78 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.ROV, xi.mission.id.rov.UNCERTAIN_DESTINATIONS) mission.reward = diff --git a/scripts/missions/rov/2_16_Ganged_Up_On.lua b/scripts/missions/rov/2_16_Ganged_Up_On.lua index d464d221258..faae6104c00 100644 --- a/scripts/missions/rov/2_16_Ganged_Up_On.lua +++ b/scripts/missions/rov/2_16_Ganged_Up_On.lua @@ -7,6 +7,7 @@ local pastSandoriaID = zones[xi.zone.SOUTHERN_SAN_DORIA_S] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.ROV, xi.mission.id.rov.GANGED_UP_ON) mission.reward = diff --git a/scripts/missions/rov/2_17_Sacrifice.lua b/scripts/missions/rov/2_17_Sacrifice.lua index 2c1b80b9a22..caa7df4a882 100644 --- a/scripts/missions/rov/2_17_Sacrifice.lua +++ b/scripts/missions/rov/2_17_Sacrifice.lua @@ -8,6 +8,7 @@ local walkOfEchoesID = zones[xi.zone.WALK_OF_ECHOES] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.ROV, xi.mission.id.rov.SACRIFICE) mission.reward = diff --git a/scripts/missions/rov/2_18_Somber_Dreams.lua b/scripts/missions/rov/2_18_Somber_Dreams.lua index f5560d4dc2c..fc4b93c09f1 100644 --- a/scripts/missions/rov/2_18_Somber_Dreams.lua +++ b/scripts/missions/rov/2_18_Somber_Dreams.lua @@ -8,6 +8,7 @@ local graubergID = zones[xi.zone.GRAUBERG_S] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.ROV, xi.mission.id.rov.SOMBER_DREAMS) mission.reward = diff --git a/scripts/missions/rov/2_19_Of_Light_and_Darkness.lua b/scripts/missions/rov/2_19_Of_Light_and_Darkness.lua index 8d0c94ddb56..d1cdd83ce3c 100644 --- a/scripts/missions/rov/2_19_Of_Light_and_Darkness.lua +++ b/scripts/missions/rov/2_19_Of_Light_and_Darkness.lua @@ -6,6 +6,7 @@ -- Oaken Door : !pos 97 -7 -12 252 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.ROV, xi.mission.id.rov.OF_LIGHT_AND_DARKNESS) mission.reward = diff --git a/scripts/missions/rov/2_20_Temporary_Farewells.lua b/scripts/missions/rov/2_20_Temporary_Farewells.lua index e48f556ce0e..2a346305c03 100644 --- a/scripts/missions/rov/2_20_Temporary_Farewells.lua +++ b/scripts/missions/rov/2_20_Temporary_Farewells.lua @@ -6,6 +6,7 @@ -- qm_rov2_20 : !pos -44.741 -23.753 568.504 25 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.ROV, xi.mission.id.rov.TEMPORARY_FAREWELLS) mission.reward = diff --git a/scripts/missions/rov/2_21_Brushing_Up.lua b/scripts/missions/rov/2_21_Brushing_Up.lua index 3f9f4247763..349e6c1db90 100644 --- a/scripts/missions/rov/2_21_Brushing_Up.lua +++ b/scripts/missions/rov/2_21_Brushing_Up.lua @@ -6,6 +6,7 @@ -- qm_rov2_20 : !pos -44.741 -23.753 568.504 25 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.ROV, xi.mission.id.rov.BRUSHING_UP) mission.reward = diff --git a/scripts/missions/rov/2_22_Keep_On_Giving.lua b/scripts/missions/rov/2_22_Keep_On_Giving.lua index c43abeba3d5..97931cbbb05 100644 --- a/scripts/missions/rov/2_22_Keep_On_Giving.lua +++ b/scripts/missions/rov/2_22_Keep_On_Giving.lua @@ -6,6 +6,7 @@ -- qm_rov2_20 : !pos -44.741 -23.753 568.504 25 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.ROV, xi.mission.id.rov.KEEP_ON_GIVING) mission.reward = diff --git a/scripts/missions/rov/2_23_Past_Imperfect.lua b/scripts/missions/rov/2_23_Past_Imperfect.lua index 21c4cafbb19..79e71425da3 100644 --- a/scripts/missions/rov/2_23_Past_Imperfect.lua +++ b/scripts/missions/rov/2_23_Past_Imperfect.lua @@ -8,6 +8,7 @@ local norgID = zones[xi.zone.NORG] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.ROV, xi.mission.id.rov.PAST_IMPERFECT) mission.reward = diff --git a/scripts/missions/rov/2_24_The_Cursed_Temple.lua b/scripts/missions/rov/2_24_The_Cursed_Temple.lua index 3cc109931b6..8f0ff574f4c 100644 --- a/scripts/missions/rov/2_24_The_Cursed_Temple.lua +++ b/scripts/missions/rov/2_24_The_Cursed_Temple.lua @@ -8,6 +8,7 @@ local uggalepihID = zones[xi.zone.TEMPLE_OF_UGGALEPIH] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.ROV, xi.mission.id.rov.THE_CURSED_TEMPLE) mission.reward = diff --git a/scripts/missions/rov/2_25_Wisdom_of_Our_Forefathers.lua b/scripts/missions/rov/2_25_Wisdom_of_Our_Forefathers.lua index a87f8e7dea1..b25a6fda41c 100644 --- a/scripts/missions/rov/2_25_Wisdom_of_Our_Forefathers.lua +++ b/scripts/missions/rov/2_25_Wisdom_of_Our_Forefathers.lua @@ -6,6 +6,7 @@ -- Granite Door (_4fx) : !pos 340 -1.899 331.656 159 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.ROV, xi.mission.id.rov.WISDOM_OF_OUR_FOREFATHERS) mission.reward = diff --git a/scripts/missions/sandoria/1_1_Smash_the_Orcish_Scouts.lua b/scripts/missions/sandoria/1_1_Smash_the_Orcish_Scouts.lua index ad25754fcd3..e573ae52e04 100644 --- a/scripts/missions/sandoria/1_1_Smash_the_Orcish_Scouts.lua +++ b/scripts/missions/sandoria/1_1_Smash_the_Orcish_Scouts.lua @@ -14,6 +14,7 @@ local southernSandoriaID = zones[xi.zone.SOUTHERN_SAN_DORIA] local northernSandoriaID = zones[xi.zone.NORTHERN_SAN_DORIA] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SANDORIA, xi.mission.id.sandoria.SMASH_THE_ORCISH_SCOUTS) mission.reward = diff --git a/scripts/missions/sandoria/1_2_Bat_Hunt.lua b/scripts/missions/sandoria/1_2_Bat_Hunt.lua index 67f25f61fdb..b6b09345ec8 100644 --- a/scripts/missions/sandoria/1_2_Bat_Hunt.lua +++ b/scripts/missions/sandoria/1_2_Bat_Hunt.lua @@ -13,6 +13,7 @@ -- Bat Fang : ItemID 891 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SANDORIA, xi.mission.id.sandoria.BAT_HUNT) mission.reward = diff --git a/scripts/missions/sandoria/1_3_Save_the_Children.lua b/scripts/missions/sandoria/1_3_Save_the_Children.lua index d2772380dfd..e52c5ea65e4 100644 --- a/scripts/missions/sandoria/1_3_Save_the_Children.lua +++ b/scripts/missions/sandoria/1_3_Save_the_Children.lua @@ -14,6 +14,7 @@ local southernSandoriaID = zones[xi.zone.SOUTHERN_SAN_DORIA] local northernSandoriaID = zones[xi.zone.NORTHERN_SAN_DORIA] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SANDORIA, xi.mission.id.sandoria.SAVE_THE_CHILDREN) mission.reward = diff --git a/scripts/missions/sandoria/2_1_The_Rescue_Drill.lua b/scripts/missions/sandoria/2_1_The_Rescue_Drill.lua index 5a787c000b6..3e2c6ae2d7a 100644 --- a/scripts/missions/sandoria/2_1_The_Rescue_Drill.lua +++ b/scripts/missions/sandoria/2_1_The_Rescue_Drill.lua @@ -22,6 +22,7 @@ local southernSandoriaID = zones[xi.zone.SOUTHERN_SAN_DORIA] local northernSandoriaID = zones[xi.zone.NORTHERN_SAN_DORIA] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SANDORIA, xi.mission.id.sandoria.THE_RESCUE_DRILL) mission.reward = diff --git a/scripts/missions/sandoria/2_2_The_Davoi_Report.lua b/scripts/missions/sandoria/2_2_The_Davoi_Report.lua index 102b3e8ab08..3eaa09ea1db 100644 --- a/scripts/missions/sandoria/2_2_The_Davoi_Report.lua +++ b/scripts/missions/sandoria/2_2_The_Davoi_Report.lua @@ -15,6 +15,7 @@ local southernSandoriaID = zones[xi.zone.SOUTHERN_SAN_DORIA] local northernSandoriaID = zones[xi.zone.NORTHERN_SAN_DORIA] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SANDORIA, xi.mission.id.sandoria.THE_DAVOI_REPORT) mission.reward = diff --git a/scripts/missions/sandoria/2_3_0_Journey_Abroad.lua b/scripts/missions/sandoria/2_3_0_Journey_Abroad.lua index 0e31473c689..81f35256a47 100644 --- a/scripts/missions/sandoria/2_3_0_Journey_Abroad.lua +++ b/scripts/missions/sandoria/2_3_0_Journey_Abroad.lua @@ -14,6 +14,7 @@ local southernSandoriaID = zones[xi.zone.SOUTHERN_SAN_DORIA] local northernSandoriaID = zones[xi.zone.NORTHERN_SAN_DORIA] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SANDORIA, xi.mission.id.sandoria.JOURNEY_ABROAD) mission.reward = diff --git a/scripts/missions/sandoria/2_3_1_Journey_to_Bastok.lua b/scripts/missions/sandoria/2_3_1_Journey_to_Bastok.lua index c2f492e82ea..23d0213a43f 100644 --- a/scripts/missions/sandoria/2_3_1_Journey_to_Bastok.lua +++ b/scripts/missions/sandoria/2_3_1_Journey_to_Bastok.lua @@ -8,6 +8,7 @@ -- Savae E Paleade : !pos 23.724 -17.39 -43.360 237 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SANDORIA, xi.mission.id.sandoria.JOURNEY_TO_BASTOK) mission.reward = {} diff --git a/scripts/missions/sandoria/2_3_2_Journey_to_Windurst.lua b/scripts/missions/sandoria/2_3_2_Journey_to_Windurst.lua index eeadf70d84b..c633f55eb66 100644 --- a/scripts/missions/sandoria/2_3_2_Journey_to_Windurst.lua +++ b/scripts/missions/sandoria/2_3_2_Journey_to_Windurst.lua @@ -10,6 +10,7 @@ local giddeusID = zones[xi.zone.GIDDEUS] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SANDORIA, xi.mission.id.sandoria.JOURNEY_TO_WINDURST) mission.reward = {} diff --git a/scripts/missions/sandoria/2_3_3_Journey_to_Bastok2.lua b/scripts/missions/sandoria/2_3_3_Journey_to_Bastok2.lua index 5d2d55b14c3..23f3a202842 100644 --- a/scripts/missions/sandoria/2_3_3_Journey_to_Bastok2.lua +++ b/scripts/missions/sandoria/2_3_3_Journey_to_Bastok2.lua @@ -8,6 +8,7 @@ -- Savae E Paleade : !pos 23.724 -17.39 -43.360 237 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SANDORIA, xi.mission.id.sandoria.JOURNEY_TO_BASTOK2) mission.reward = {} diff --git a/scripts/missions/sandoria/2_3_4_Journey_to_Windurst2.lua b/scripts/missions/sandoria/2_3_4_Journey_to_Windurst2.lua index 9714b456788..5d349920087 100644 --- a/scripts/missions/sandoria/2_3_4_Journey_to_Windurst2.lua +++ b/scripts/missions/sandoria/2_3_4_Journey_to_Windurst2.lua @@ -7,6 +7,7 @@ -- Mourices : !pos -50.646 -0.501 -27.642 241 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SANDORIA, xi.mission.id.sandoria.JOURNEY_TO_WINDURST2) mission.reward = {} diff --git a/scripts/missions/sandoria/3_1_Infiltrate_Davoi.lua b/scripts/missions/sandoria/3_1_Infiltrate_Davoi.lua index 3129e58f95a..5b94cf64347 100644 --- a/scripts/missions/sandoria/3_1_Infiltrate_Davoi.lua +++ b/scripts/missions/sandoria/3_1_Infiltrate_Davoi.lua @@ -17,6 +17,7 @@ local southernSandoriaID = zones[xi.zone.SOUTHERN_SAN_DORIA] local northernSandoriaID = zones[xi.zone.NORTHERN_SAN_DORIA] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SANDORIA, xi.mission.id.sandoria.INFILTRATE_DAVOI) mission.reward = diff --git a/scripts/missions/sandoria/3_2_The_Crystal_Spring.lua b/scripts/missions/sandoria/3_2_The_Crystal_Spring.lua index 8f14c1f8859..c174890f61e 100644 --- a/scripts/missions/sandoria/3_2_The_Crystal_Spring.lua +++ b/scripts/missions/sandoria/3_2_The_Crystal_Spring.lua @@ -11,6 +11,7 @@ local southernSandoriaID = zones[xi.zone.SOUTHERN_SAN_DORIA] local northernSandoriaID = zones[xi.zone.NORTHERN_SAN_DORIA] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SANDORIA, xi.mission.id.sandoria.THE_CRYSTAL_SPRING) mission.reward = diff --git a/scripts/missions/sandoria/3_3_Appointment_to_Jeuno.lua b/scripts/missions/sandoria/3_3_Appointment_to_Jeuno.lua index 40ddd90e45a..010d139e4f5 100644 --- a/scripts/missions/sandoria/3_3_Appointment_to_Jeuno.lua +++ b/scripts/missions/sandoria/3_3_Appointment_to_Jeuno.lua @@ -16,6 +16,7 @@ local northernSandoriaID = zones[xi.zone.NORTHERN_SAN_DORIA] local lowerDelkfuttID = zones[xi.zone.LOWER_DELKFUTTS_TOWER] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SANDORIA, xi.mission.id.sandoria.APPOINTMENT_TO_JEUNO) mission.reward = diff --git a/scripts/missions/sandoria/4_1_Magicite.lua b/scripts/missions/sandoria/4_1_Magicite.lua index f9a914bdcc2..ad8f84a463c 100644 --- a/scripts/missions/sandoria/4_1_Magicite.lua +++ b/scripts/missions/sandoria/4_1_Magicite.lua @@ -14,6 +14,7 @@ -- Magicite (Aurastone) : !pos 11 25 -81 148 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SANDORIA, xi.mission.id.sandoria.MAGICITE) local function magiciteCounter(player) diff --git a/scripts/missions/sandoria/5_1_The_Ruins_of_FeiYin.lua b/scripts/missions/sandoria/5_1_The_Ruins_of_FeiYin.lua index d504524f867..6c4fec430db 100644 --- a/scripts/missions/sandoria/5_1_The_Ruins_of_FeiYin.lua +++ b/scripts/missions/sandoria/5_1_The_Ruins_of_FeiYin.lua @@ -14,6 +14,7 @@ local chateauID = zones[xi.zone.CHATEAU_DORAGUILLE] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SANDORIA, xi.mission.id.sandoria.THE_RUINS_OF_FEI_YIN) mission.reward = diff --git a/scripts/missions/sandoria/5_2_The_Shadow_Lord.lua b/scripts/missions/sandoria/5_2_The_Shadow_Lord.lua index b55e8d6962f..e863b2fd2a5 100644 --- a/scripts/missions/sandoria/5_2_The_Shadow_Lord.lua +++ b/scripts/missions/sandoria/5_2_The_Shadow_Lord.lua @@ -13,6 +13,7 @@ local chateauID = zones[xi.zone.CHATEAU_DORAGUILLE] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SANDORIA, xi.mission.id.sandoria.THE_SHADOW_LORD) mission.reward = diff --git a/scripts/missions/sandoria/6_1_Leautes_Last_Wishes.lua b/scripts/missions/sandoria/6_1_Leautes_Last_Wishes.lua index bb91aa02dc4..4b9a5ad768b 100644 --- a/scripts/missions/sandoria/6_1_Leautes_Last_Wishes.lua +++ b/scripts/missions/sandoria/6_1_Leautes_Last_Wishes.lua @@ -14,6 +14,7 @@ local westernAltepaID = zones[xi.zone.WESTERN_ALTEPA_DESERT] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SANDORIA, xi.mission.id.sandoria.LEAUTES_LAST_WISHES) mission.reward = diff --git a/scripts/missions/sandoria/6_2_Ranperres_Final_Rest.lua b/scripts/missions/sandoria/6_2_Ranperres_Final_Rest.lua index 2c794bae1b0..81ca8f0e65b 100644 --- a/scripts/missions/sandoria/6_2_Ranperres_Final_Rest.lua +++ b/scripts/missions/sandoria/6_2_Ranperres_Final_Rest.lua @@ -14,6 +14,7 @@ local krtID = zones[xi.zone.KING_RANPERRES_TOMB] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SANDORIA, xi.mission.id.sandoria.RANPERRES_FINAL_REST) local ranparresRestTable = diff --git a/scripts/missions/sandoria/7_1_Prestige_of_the_Papsque.lua b/scripts/missions/sandoria/7_1_Prestige_of_the_Papsque.lua index 0b8ca9022d4..2997f59e992 100644 --- a/scripts/missions/sandoria/7_1_Prestige_of_the_Papsque.lua +++ b/scripts/missions/sandoria/7_1_Prestige_of_the_Papsque.lua @@ -12,6 +12,7 @@ local westRonfaureID = zones[xi.zone.WEST_RONFAURE] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SANDORIA, xi.mission.id.sandoria.PRESTIGE_OF_THE_PAPSQUE) mission.reward = diff --git a/scripts/missions/sandoria/7_2_The_Secret_Weapon.lua b/scripts/missions/sandoria/7_2_The_Secret_Weapon.lua index 1341b965f80..cd5dded9da6 100644 --- a/scripts/missions/sandoria/7_2_The_Secret_Weapon.lua +++ b/scripts/missions/sandoria/7_2_The_Secret_Weapon.lua @@ -8,6 +8,7 @@ -- Endracion : !pos -110 1 -34 230 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SANDORIA, xi.mission.id.sandoria.THE_SECRET_WEAPON) mission.reward = diff --git a/scripts/missions/sandoria/8_1_Coming_of_Age.lua b/scripts/missions/sandoria/8_1_Coming_of_Age.lua index b7f94605afb..60134249f4b 100644 --- a/scripts/missions/sandoria/8_1_Coming_of_Age.lua +++ b/scripts/missions/sandoria/8_1_Coming_of_Age.lua @@ -14,6 +14,7 @@ local southernSandoriaID = zones[xi.zone.SOUTHERN_SAN_DORIA] local northernSandoriaID = zones[xi.zone.NORTHERN_SAN_DORIA] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SANDORIA, xi.mission.id.sandoria.COMING_OF_AGE) mission.reward = diff --git a/scripts/missions/sandoria/8_2_Lightbringer.lua b/scripts/missions/sandoria/8_2_Lightbringer.lua index 9624e008210..f72d2420e4c 100644 --- a/scripts/missions/sandoria/8_2_Lightbringer.lua +++ b/scripts/missions/sandoria/8_2_Lightbringer.lua @@ -20,6 +20,7 @@ local chateauID = zones[xi.zone.CHATEAU_DORAGUILLE] local uggalepihID = zones[xi.zone.TEMPLE_OF_UGGALEPIH] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SANDORIA, xi.mission.id.sandoria.LIGHTBRINGER) mission.reward = diff --git a/scripts/missions/sandoria/9_1_Breaking_Barriers.lua b/scripts/missions/sandoria/9_1_Breaking_Barriers.lua index 820aebafca6..9e73d5ba179 100644 --- a/scripts/missions/sandoria/9_1_Breaking_Barriers.lua +++ b/scripts/missions/sandoria/9_1_Breaking_Barriers.lua @@ -14,6 +14,7 @@ local batalliaID = zones[xi.zone.BATALLIA_DOWNS] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SANDORIA, xi.mission.id.sandoria.BREAKING_BARRIERS) mission.reward = diff --git a/scripts/missions/sandoria/9_2_The_Heir_to_the_Light.lua b/scripts/missions/sandoria/9_2_The_Heir_to_the_Light.lua index 7d0d31776f3..9d667cddf14 100644 --- a/scripts/missions/sandoria/9_2_The_Heir_to_the_Light.lua +++ b/scripts/missions/sandoria/9_2_The_Heir_to_the_Light.lua @@ -12,6 +12,7 @@ local chateauID = zones[xi.zone.CHATEAU_DORAGUILLE] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SANDORIA, xi.mission.id.sandoria.THE_HEIR_TO_THE_LIGHT) mission.reward = diff --git a/scripts/missions/soa/1_1_Rumors_from_the_West.lua b/scripts/missions/soa/1_1_Rumors_from_the_West.lua index e4e579bf66f..ab0cf3c8932 100644 --- a/scripts/missions/soa/1_1_Rumors_from_the_West.lua +++ b/scripts/missions/soa/1_1_Rumors_from_the_West.lua @@ -7,6 +7,7 @@ -- Darcia : !pos -36 -1 -15 245 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.RUMORS_FROM_THE_WEST) mission.reward = diff --git a/scripts/missions/soa/1_2_The_Geomagnetron.lua b/scripts/missions/soa/1_2_The_Geomagnetron.lua index 473f335a029..6914183079c 100644 --- a/scripts/missions/soa/1_2_The_Geomagnetron.lua +++ b/scripts/missions/soa/1_2_The_Geomagnetron.lua @@ -6,6 +6,7 @@ -- Darcia : !pos -36 -1 -15 245 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.THE_GEOMAGNETRON) mission.reward = diff --git a/scripts/missions/soa/1_3_Onward_to_Adoulin.lua b/scripts/missions/soa/1_3_Onward_to_Adoulin.lua index b06ba29a5d9..dfeec4f0253 100644 --- a/scripts/missions/soa/1_3_Onward_to_Adoulin.lua +++ b/scripts/missions/soa/1_3_Onward_to_Adoulin.lua @@ -6,6 +6,7 @@ -- Waypoint : !pos -34.922 0.000 -30.966 245 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.ONWARD_TO_ADOULIN) mission.reward = diff --git a/scripts/missions/soa/1_4_Heartwings_and_the_Kindhearted.lua b/scripts/missions/soa/1_4_Heartwings_and_the_Kindhearted.lua index 77f05c1cf77..063174ba916 100644 --- a/scripts/missions/soa/1_4_Heartwings_and_the_Kindhearted.lua +++ b/scripts/missions/soa/1_4_Heartwings_and_the_Kindhearted.lua @@ -6,6 +6,7 @@ -- WESTERN_ADOULIN : !zone 256 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.HEARTWINGS_AND_THE_KINDHEARTED) mission.reward = diff --git a/scripts/missions/soa/1_5_Pioneer_Registration.lua b/scripts/missions/soa/1_5_Pioneer_Registration.lua index 6b2726d6c0e..4fe6226ad2b 100644 --- a/scripts/missions/soa/1_5_Pioneer_Registration.lua +++ b/scripts/missions/soa/1_5_Pioneer_Registration.lua @@ -6,6 +6,7 @@ -- Brenton : !pos -86.036 3.349 18.121 256 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.PIONEER_REGISTRATION) mission.reward = diff --git a/scripts/missions/soa/1_6_Life_on_the_Frontier.lua b/scripts/missions/soa/1_6_Life_on_the_Frontier.lua index 48fb0419ce7..e6386f0276c 100644 --- a/scripts/missions/soa/1_6_Life_on_the_Frontier.lua +++ b/scripts/missions/soa/1_6_Life_on_the_Frontier.lua @@ -8,6 +8,7 @@ require('scripts/missions/soa/helpers') ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.LIFE_ON_THE_FRONTIER) mission.reward = diff --git a/scripts/missions/soa/1_7_Meeting_of_the_Minds.lua b/scripts/missions/soa/1_7_Meeting_of_the_Minds.lua index 98d6ea8dbb7..0950acff4d4 100644 --- a/scripts/missions/soa/1_7_Meeting_of_the_Minds.lua +++ b/scripts/missions/soa/1_7_Meeting_of_the_Minds.lua @@ -6,6 +6,7 @@ -- Ploh Trishbahk : !pos 100.580 -40.150 -63.830 257 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.MEETING_OF_THE_MINDS) mission.reward = diff --git a/scripts/missions/soa/1_8_Arciela_Appears_Again.lua b/scripts/missions/soa/1_8_Arciela_Appears_Again.lua index fb0cbad73c3..1abfa9c98f8 100644 --- a/scripts/missions/soa/1_8_Arciela_Appears_Again.lua +++ b/scripts/missions/soa/1_8_Arciela_Appears_Again.lua @@ -8,6 +8,7 @@ require('scripts/missions/soa/helpers') ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.ARCIELA_APPEARS_AGAIN) mission.reward = diff --git a/scripts/missions/soa/2_1_0_Budding_Prospects.lua b/scripts/missions/soa/2_1_0_Budding_Prospects.lua index 7f960cfdf7f..c6fd09bd352 100644 --- a/scripts/missions/soa/2_1_0_Budding_Prospects.lua +++ b/scripts/missions/soa/2_1_0_Budding_Prospects.lua @@ -6,6 +6,7 @@ -- Masad : !pos -28.182 -0.650 -91.991 256 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.BUDDING_PROSPECTS) mission.reward = diff --git a/scripts/missions/soa/2_1_1_The_Light_Shining_in_Your_Eyes.lua b/scripts/missions/soa/2_1_1_The_Light_Shining_in_Your_Eyes.lua index 0994f4e2105..cd6554f40a9 100644 --- a/scripts/missions/soa/2_1_1_The_Light_Shining_in_Your_Eyes.lua +++ b/scripts/missions/soa/2_1_1_The_Light_Shining_in_Your_Eyes.lua @@ -6,6 +6,7 @@ -- Levil : !pos -87.204 3.350 12.655 256 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.THE_LIGHT_SHINING_IN_YOUR_EYES) mission.reward = diff --git a/scripts/missions/soa/2_1_2_The_Heirloom.lua b/scripts/missions/soa/2_1_2_The_Heirloom.lua index 62da01f859e..9d7308368e5 100644 --- a/scripts/missions/soa/2_1_2_The_Heirloom.lua +++ b/scripts/missions/soa/2_1_2_The_Heirloom.lua @@ -6,6 +6,7 @@ -- Ploh Trishbahk (trigger area) : !pos 100.580 -40.150 -63.830 257 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.THE_HEIRLOOM) mission.reward = diff --git a/scripts/missions/soa/2_2_0_An_Aimless_Journey.lua b/scripts/missions/soa/2_2_0_An_Aimless_Journey.lua index 5afe86b7cf9..ab30b279606 100644 --- a/scripts/missions/soa/2_2_0_An_Aimless_Journey.lua +++ b/scripts/missions/soa/2_2_0_An_Aimless_Journey.lua @@ -6,6 +6,7 @@ -- Ergon Locus : !pos -140.000 10.000 60.000 270 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.AN_AIMLESS_JOURNEY) mission.reward = diff --git a/scripts/missions/soa/2_2_1_Ortharsyne.lua b/scripts/missions/soa/2_2_1_Ortharsyne.lua index cf8bbcc1455..a08040e1595 100644 --- a/scripts/missions/soa/2_2_1_Ortharsyne.lua +++ b/scripts/missions/soa/2_2_1_Ortharsyne.lua @@ -6,6 +6,7 @@ -- YORCIA_WEALD : !zone 264 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.ORTHARSYNE) mission.reward = diff --git a/scripts/missions/soa/2_2_2_In_the_Presence_of_Royalty.lua b/scripts/missions/soa/2_2_2_In_the_Presence_of_Royalty.lua index be49e1443f7..0e31fdbe2f7 100644 --- a/scripts/missions/soa/2_2_2_In_the_Presence_of_Royalty.lua +++ b/scripts/missions/soa/2_2_2_In_the_Presence_of_Royalty.lua @@ -7,6 +7,7 @@ -- Pellucid_Afflusion : !pos -175.100 1.700 387.700 263 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.IN_THE_PRESENCE_OF_ROYALTY) mission.reward = diff --git a/scripts/missions/soa/2_3_The_Twin_World_Trees.lua b/scripts/missions/soa/2_3_The_Twin_World_Trees.lua index 993196694d9..0dafa7afd75 100644 --- a/scripts/missions/soa/2_3_The_Twin_World_Trees.lua +++ b/scripts/missions/soa/2_3_The_Twin_World_Trees.lua @@ -6,6 +6,7 @@ -- Oscairn : !pos -80.214 -0.150 30.717 257 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.THE_TWIN_WORLD_TREES) mission.reward = diff --git a/scripts/missions/soa/2_4_0_Honor_and_Audacity.lua b/scripts/missions/soa/2_4_0_Honor_and_Audacity.lua index 94d7e010b88..3975daa76cd 100644 --- a/scripts/missions/soa/2_4_0_Honor_and_Audacity.lua +++ b/scripts/missions/soa/2_4_0_Honor_and_Audacity.lua @@ -6,6 +6,7 @@ -- RALA_WATERWAYS : !zone 258 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.HONOR_AND_AUDACITY) mission.reward = diff --git a/scripts/missions/soa/2_4_1_The_Watergarden_Coliseum.lua b/scripts/missions/soa/2_4_1_The_Watergarden_Coliseum.lua index ae33177648c..732b62f020d 100644 --- a/scripts/missions/soa/2_4_1_The_Watergarden_Coliseum.lua +++ b/scripts/missions/soa/2_4_1_The_Watergarden_Coliseum.lua @@ -6,6 +6,7 @@ -- Yeggha_Dolashi : !pos 260 -5.768 60 258 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.THE_WATERGARDEN_COLISEUM) mission.reward = diff --git a/scripts/missions/soa/2_5_0_Friction_and_Fissures.lua b/scripts/missions/soa/2_5_0_Friction_and_Fissures.lua index 391e2b6afc5..c2573b85831 100644 --- a/scripts/missions/soa/2_5_0_Friction_and_Fissures.lua +++ b/scripts/missions/soa/2_5_0_Friction_and_Fissures.lua @@ -6,6 +6,7 @@ -- Levil : !pos -87.204 3.350 12.655 256 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.FRICTION_AND_FISSURES) mission.reward = diff --git a/scripts/missions/soa/2_5_1_The_Celennia_Memorial_Library.lua b/scripts/missions/soa/2_5_1_The_Celennia_Memorial_Library.lua index 0b192bdacb5..f6e7a1c2a27 100644 --- a/scripts/missions/soa/2_5_1_The_Celennia_Memorial_Library.lua +++ b/scripts/missions/soa/2_5_1_The_Celennia_Memorial_Library.lua @@ -8,6 +8,7 @@ -- Levil : !pos -87.204 3.350 12.655 256 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.THE_CELENNIA_MEMORIAL_LIBRARY) mission.reward = diff --git a/scripts/missions/soa/2_5_2_For_Whom_Do_We_Toil.lua b/scripts/missions/soa/2_5_2_For_Whom_Do_We_Toil.lua index 9bbd24967b7..9912e6218e0 100644 --- a/scripts/missions/soa/2_5_2_For_Whom_Do_We_Toil.lua +++ b/scripts/missions/soa/2_5_2_For_Whom_Do_We_Toil.lua @@ -6,6 +6,7 @@ -- Sluice_Gate_6 : !pos -561.522 -7.500 60.002 258 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.FOR_WHOM_DO_WE_TOIL) mission.reward = diff --git a/scripts/missions/soa/2_6_0_Aiming_for_Ygnas.lua b/scripts/missions/soa/2_6_0_Aiming_for_Ygnas.lua index 8618e48197b..18cf7795410 100644 --- a/scripts/missions/soa/2_6_0_Aiming_for_Ygnas.lua +++ b/scripts/missions/soa/2_6_0_Aiming_for_Ygnas.lua @@ -6,6 +6,7 @@ -- Ploh Trishbahk : !pos 100.580 -40.150 -63.830 257 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.AIMING_FOR_YGNAS) mission.reward = diff --git a/scripts/missions/soa/2_6_1_Calamity_in_the_Kitchen.lua b/scripts/missions/soa/2_6_1_Calamity_in_the_Kitchen.lua index e26de161f8c..57e3a02a0aa 100644 --- a/scripts/missions/soa/2_6_1_Calamity_in_the_Kitchen.lua +++ b/scripts/missions/soa/2_6_1_Calamity_in_the_Kitchen.lua @@ -6,6 +6,7 @@ -- Chalvava : !pos -318.000 -1.000 -318.000 258 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.CALAMITY_IN_THE_KITCHEN) mission.reward = diff --git a/scripts/missions/soa/2_6_2_Arcielas_Promise.lua b/scripts/missions/soa/2_6_2_Arcielas_Promise.lua index 163fc47b241..5056b0c8287 100644 --- a/scripts/missions/soa/2_6_2_Arcielas_Promise.lua +++ b/scripts/missions/soa/2_6_2_Arcielas_Promise.lua @@ -6,6 +6,7 @@ -- Ploh Trishbahk : !pos 100.580 -40.150 -63.830 257 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.ARCIELAS_PROMISE) mission.reward = diff --git a/scripts/missions/soa/2_7_0_Predators_and_Prey.lua b/scripts/missions/soa/2_7_0_Predators_and_Prey.lua index 50740499d72..b61cd8be87c 100644 --- a/scripts/missions/soa/2_7_0_Predators_and_Prey.lua +++ b/scripts/missions/soa/2_7_0_Predators_and_Prey.lua @@ -6,6 +6,7 @@ -- Sluice_Gate_6 : !pos -561.522 -7.500 60.002 258 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.PREDATOR_AND_PREY) mission.reward = diff --git a/scripts/missions/soa/2_7_1_Behind_the_Sluices.lua b/scripts/missions/soa/2_7_1_Behind_the_Sluices.lua index d407a907d87..fe579f118e1 100644 --- a/scripts/missions/soa/2_7_1_Behind_the_Sluices.lua +++ b/scripts/missions/soa/2_7_1_Behind_the_Sluices.lua @@ -11,6 +11,7 @@ local ralaID = zones[xi.zone.RALA_WATERWAYS] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.BEHIND_THE_SLUICES) mission.reward = diff --git a/scripts/missions/soa/2_7_2_The_Leafkin_Monarch.lua b/scripts/missions/soa/2_7_2_The_Leafkin_Monarch.lua index e796d96b2c9..52219342a5c 100644 --- a/scripts/missions/soa/2_7_2_The_Leafkin_Monarch.lua +++ b/scripts/missions/soa/2_7_2_The_Leafkin_Monarch.lua @@ -6,6 +6,7 @@ -- Ploh Trishbahk (trigger area) : !pos 100.580 -40.150 -63.830 257 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.THE_LEAFKIN_MONARCH) mission.reward = diff --git a/scripts/missions/soa/2_7_3_Yggdrasil.lua b/scripts/missions/soa/2_7_3_Yggdrasil.lua index 2fcc72c1880..bdc668b03b6 100644 --- a/scripts/missions/soa/2_7_3_Yggdrasil.lua +++ b/scripts/missions/soa/2_7_3_Yggdrasil.lua @@ -8,6 +8,7 @@ require('scripts/missions/soa/helpers') ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.YGGDRASIL) mission.reward = diff --git a/scripts/missions/soa/3_1_0_Return_of_the_Exorcist.lua b/scripts/missions/soa/3_1_0_Return_of_the_Exorcist.lua index d65d9f6739a..683077a01f7 100644 --- a/scripts/missions/soa/3_1_0_Return_of_the_Exorcist.lua +++ b/scripts/missions/soa/3_1_0_Return_of_the_Exorcist.lua @@ -6,6 +6,7 @@ -- Levil : !pos -87.204 3.350 12.655 256 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.RETURN_OF_THE_EXORCIST) mission.reward = diff --git a/scripts/missions/soa/3_1_1_The_Merciless_One.lua b/scripts/missions/soa/3_1_1_The_Merciless_One.lua index bba87a71448..1906df9776e 100644 --- a/scripts/missions/soa/3_1_1_The_Merciless_One.lua +++ b/scripts/missions/soa/3_1_1_The_Merciless_One.lua @@ -6,6 +6,7 @@ -- Levil : !pos -87.204 3.350 12.655 256 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.THE_MERCILESS_ONE) mission.reward = diff --git a/scripts/missions/soa/3_1_2_A_Curse_from_the_Past.lua b/scripts/missions/soa/3_1_2_A_Curse_from_the_Past.lua index ec167b287f7..5969cb1bcb0 100644 --- a/scripts/missions/soa/3_1_2_A_Curse_from_the_Past.lua +++ b/scripts/missions/soa/3_1_2_A_Curse_from_the_Past.lua @@ -9,6 +9,7 @@ -- Erminold : !pos 50.949 -40 -90.942 257 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.A_CURSE_FROM_THE_PAST) mission.reward = diff --git a/scripts/missions/soa/3_1_3_The_Purgation.lua b/scripts/missions/soa/3_1_3_The_Purgation.lua index 70a61feb4a2..ba42d57a385 100644 --- a/scripts/missions/soa/3_1_3_The_Purgation.lua +++ b/scripts/missions/soa/3_1_3_The_Purgation.lua @@ -6,6 +6,7 @@ -- Erminold : !pos 50.949 -40 -90.942 257 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.THE_PURGATION) mission.reward = diff --git a/scripts/missions/soa/3_1_4_The_Key.lua b/scripts/missions/soa/3_1_4_The_Key.lua index cb7ec0f5ac4..1bfc9fba467 100644 --- a/scripts/missions/soa/3_1_4_The_Key.lua +++ b/scripts/missions/soa/3_1_4_The_Key.lua @@ -6,6 +6,7 @@ -- Levil : !pos -87.204 3.350 12.655 256 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.THE_KEY) mission.reward = diff --git a/scripts/missions/soa/3_2_0_The_Princesss_Dilemma.lua b/scripts/missions/soa/3_2_0_The_Princesss_Dilemma.lua index 916634d1a45..4f138982620 100644 --- a/scripts/missions/soa/3_2_0_The_Princesss_Dilemma.lua +++ b/scripts/missions/soa/3_2_0_The_Princesss_Dilemma.lua @@ -6,6 +6,7 @@ -- Levil : !pos -87.204 3.350 12.655 256 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.THE_PRINCESSS_DILEMMA) mission.reward = diff --git a/scripts/missions/soa/3_2_1_Dark_Clouds_Ahead.lua b/scripts/missions/soa/3_2_1_Dark_Clouds_Ahead.lua index a91a6f7bec1..abdff6988d1 100644 --- a/scripts/missions/soa/3_2_1_Dark_Clouds_Ahead.lua +++ b/scripts/missions/soa/3_2_1_Dark_Clouds_Ahead.lua @@ -6,6 +6,7 @@ -- Levil : !pos -87.204 3.350 12.655 256 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.DARK_CLOUDS_AHEAD) mission.reward = diff --git a/scripts/missions/soa/3_2_2_The_Smallest_of_Favors.lua b/scripts/missions/soa/3_2_2_The_Smallest_of_Favors.lua index a23a76fa9e3..5b17173b9c3 100644 --- a/scripts/missions/soa/3_2_2_The_Smallest_of_Favors.lua +++ b/scripts/missions/soa/3_2_2_The_Smallest_of_Favors.lua @@ -6,6 +6,7 @@ -- Levil : !pos -87.204 3.350 12.655 256 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.THE_SMALLEST_OF_FAVORS) mission.reward = diff --git a/scripts/missions/soa/3_3_0_Summoned_by_Spirits.lua b/scripts/missions/soa/3_3_0_Summoned_by_Spirits.lua index f76828bbfd6..7d3156fe7f5 100644 --- a/scripts/missions/soa/3_3_0_Summoned_by_Spirits.lua +++ b/scripts/missions/soa/3_3_0_Summoned_by_Spirits.lua @@ -6,6 +6,7 @@ -- Levil : !pos -87.204 3.350 12.655 256 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.SUMMONED_BY_SPIRITS) mission.reward = diff --git a/scripts/missions/soa/3_3_1_Evil_Entities.lua b/scripts/missions/soa/3_3_1_Evil_Entities.lua index 30395890bd4..7099b40781b 100644 --- a/scripts/missions/soa/3_3_1_Evil_Entities.lua +++ b/scripts/missions/soa/3_3_1_Evil_Entities.lua @@ -6,6 +6,7 @@ -- Levil : !pos -87.204 3.350 12.655 256 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.EVIL_ENTITIES) mission.reward = diff --git a/scripts/missions/soa/3_3_2_Adoulin_Calling.lua b/scripts/missions/soa/3_3_2_Adoulin_Calling.lua index 070719d7a62..dd76238b2a6 100644 --- a/scripts/missions/soa/3_3_2_Adoulin_Calling.lua +++ b/scripts/missions/soa/3_3_2_Adoulin_Calling.lua @@ -7,6 +7,7 @@ -- Boarding House : !pos -41.693 -0.15 -38.29 257 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.ADOULIN_CALLING) mission.reward = diff --git a/scripts/missions/soa/3_3_3_The_Disappearance_of_Nyline.lua b/scripts/missions/soa/3_3_3_The_Disappearance_of_Nyline.lua index a34f886d0dd..9cb4a47964e 100644 --- a/scripts/missions/soa/3_3_3_The_Disappearance_of_Nyline.lua +++ b/scripts/missions/soa/3_3_3_The_Disappearance_of_Nyline.lua @@ -7,6 +7,7 @@ -- Boarding House : !pos -41.693 -0.15 -38.29 257 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.THE_DISAPPEARANCE_OF_NYLINE) mission.reward = diff --git a/scripts/missions/soa/3_3_4_Shared_Consciousness.lua b/scripts/missions/soa/3_3_4_Shared_Consciousness.lua index b99bc67de81..b04a8054c18 100644 --- a/scripts/missions/soa/3_3_4_Shared_Consciousness.lua +++ b/scripts/missions/soa/3_3_4_Shared_Consciousness.lua @@ -7,6 +7,7 @@ -- Boarding House : !pos -41.693 -0.15 -38.29 257 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.SHARED_CONSCIOUSNESS) mission.reward = diff --git a/scripts/missions/soa/3_3_5_Clear_Skies.lua b/scripts/missions/soa/3_3_5_Clear_Skies.lua index eac9247e6f0..6b592a1356a 100644 --- a/scripts/missions/soa/3_3_5_Clear_Skies.lua +++ b/scripts/missions/soa/3_3_5_Clear_Skies.lua @@ -6,6 +6,7 @@ -- Levil : !pos -87.204 3.350 12.655 256 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.CLEAR_SKIES) mission.reward = diff --git a/scripts/missions/soa/3_4_0_The_Man_in_Black.lua b/scripts/missions/soa/3_4_0_The_Man_in_Black.lua index 76c2f3ef80d..5ff6d211393 100644 --- a/scripts/missions/soa/3_4_0_The_Man_in_Black.lua +++ b/scripts/missions/soa/3_4_0_The_Man_in_Black.lua @@ -8,6 +8,7 @@ require('scripts/missions/soa/helpers') ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.THE_MAN_IN_BLACK) mission.reward = diff --git a/scripts/missions/soa/3_4_1_To_the_Victor.lua b/scripts/missions/soa/3_4_1_To_the_Victor.lua index cd4ce947588..9bb251d7f7f 100644 --- a/scripts/missions/soa/3_4_1_To_the_Victor.lua +++ b/scripts/missions/soa/3_4_1_To_the_Victor.lua @@ -8,6 +8,7 @@ require('scripts/missions/soa/helpers') ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.TO_THE_VICTOR) mission.reward = diff --git a/scripts/missions/soa/3_4_2_An_Extraordinary_Gentleman.lua b/scripts/missions/soa/3_4_2_An_Extraordinary_Gentleman.lua index ba7ce623b67..5ae985211ee 100644 --- a/scripts/missions/soa/3_4_2_An_Extraordinary_Gentleman.lua +++ b/scripts/missions/soa/3_4_2_An_Extraordinary_Gentleman.lua @@ -8,6 +8,7 @@ require('scripts/missions/soa/helpers') ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.AN_EXTRAORDINARY_GENTLEMAN) mission.reward = diff --git a/scripts/missions/soa/3_4_3_The_Orders_Treasures.lua b/scripts/missions/soa/3_4_3_The_Orders_Treasures.lua index 45a61c64ed2..e9fc744efed 100644 --- a/scripts/missions/soa/3_4_3_The_Orders_Treasures.lua +++ b/scripts/missions/soa/3_4_3_The_Orders_Treasures.lua @@ -6,6 +6,7 @@ -- Levil : !pos -87.204 3.350 12.655 256 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.THE_ORDERS_TREASURES) mission.reward = diff --git a/scripts/missions/soa/3_4_4_Augusts_Heirloom.lua b/scripts/missions/soa/3_4_4_Augusts_Heirloom.lua index d89644dd40d..4d9484e2c8e 100644 --- a/scripts/missions/soa/3_4_4_Augusts_Heirloom.lua +++ b/scripts/missions/soa/3_4_4_Augusts_Heirloom.lua @@ -6,6 +6,7 @@ -- Ploh Trishbahk : !pos 100.580 -40.150 -63.830 257 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.AUGUSTS_HEIRLOOM) mission.reward = diff --git a/scripts/missions/soa/3_5_0_Beauty_and_the_Beast.lua b/scripts/missions/soa/3_5_0_Beauty_and_the_Beast.lua index 37a80b60c0f..9638ff2a8c6 100644 --- a/scripts/missions/soa/3_5_0_Beauty_and_the_Beast.lua +++ b/scripts/missions/soa/3_5_0_Beauty_and_the_Beast.lua @@ -6,6 +6,7 @@ -- Ploh Trishbahk : !pos 100.580 -40.150 -63.830 257 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.BEAUTY_AND_THE_BEAST) mission.reward = diff --git a/scripts/missions/soa/3_5_1_Wildcat_with_a_Gold_Pelt.lua b/scripts/missions/soa/3_5_1_Wildcat_with_a_Gold_Pelt.lua index 214990da288..ce8413d5030 100644 --- a/scripts/missions/soa/3_5_1_Wildcat_with_a_Gold_Pelt.lua +++ b/scripts/missions/soa/3_5_1_Wildcat_with_a_Gold_Pelt.lua @@ -5,6 +5,7 @@ -- !addmission 12 58 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.WILDCAT_WITH_A_GOLD_PELT) mission.reward = diff --git a/scripts/missions/soa/3_5_2_In_Search_of_Arciela.lua b/scripts/missions/soa/3_5_2_In_Search_of_Arciela.lua index 9a4ad15b7dd..c02c4411e67 100644 --- a/scripts/missions/soa/3_5_2_In_Search_of_Arciela.lua +++ b/scripts/missions/soa/3_5_2_In_Search_of_Arciela.lua @@ -5,6 +5,7 @@ -- !addmission 12 59 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.IN_SEARCH_OF_ARCIELA) mission.reward = diff --git a/scripts/missions/soa/3_5_3_Looking_for_Leads.lua b/scripts/missions/soa/3_5_3_Looking_for_Leads.lua index 02d0bf6cdc7..7227190b73b 100644 --- a/scripts/missions/soa/3_5_3_Looking_for_Leads.lua +++ b/scripts/missions/soa/3_5_3_Looking_for_Leads.lua @@ -5,6 +5,7 @@ -- !addmission 12 61 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.LOOKING_FOR_LEADS) mission.reward = diff --git a/scripts/missions/soa/3_6_0_Drifting_Northwest.lua b/scripts/missions/soa/3_6_0_Drifting_Northwest.lua index 0dde38c25d0..8ea2ff7bf33 100644 --- a/scripts/missions/soa/3_6_0_Drifting_Northwest.lua +++ b/scripts/missions/soa/3_6_0_Drifting_Northwest.lua @@ -7,6 +7,7 @@ local kamihrID = zones[xi.zone.KAMIHR_DRIFTS] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.DRIFTING_NORTHWEST) mission.reward = diff --git a/scripts/missions/soa/3_6_1_Kumhau_the_Flashfrost_Naakual.lua b/scripts/missions/soa/3_6_1_Kumhau_the_Flashfrost_Naakual.lua index 25d2838fa9e..d76b9d7cf6a 100644 --- a/scripts/missions/soa/3_6_1_Kumhau_the_Flashfrost_Naakual.lua +++ b/scripts/missions/soa/3_6_1_Kumhau_the_Flashfrost_Naakual.lua @@ -6,6 +6,7 @@ -- Crawling Cave : !pos -349.302 40.339 -379.79 267 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.KUMHAU_THE_FLASHFROST_NAAKUAL) mission.reward = diff --git a/scripts/missions/soa/3_6_2_Soul_Siphon.lua b/scripts/missions/soa/3_6_2_Soul_Siphon.lua index 966a29fcbfa..6c9f316f969 100644 --- a/scripts/missions/soa/3_6_2_Soul_Siphon.lua +++ b/scripts/missions/soa/3_6_2_Soul_Siphon.lua @@ -6,6 +6,7 @@ -- Hollowed Pathway : !pos 215.371 39.025 -446.368 267 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.SOUL_SIPHON) mission.reward = diff --git a/scripts/missions/soa/3_6_3_Stonewalled.lua b/scripts/missions/soa/3_6_3_Stonewalled.lua index c3624b8c064..2020307d4a8 100644 --- a/scripts/missions/soa/3_6_3_Stonewalled.lua +++ b/scripts/missions/soa/3_6_3_Stonewalled.lua @@ -6,6 +6,7 @@ -- Hollowed Pathway : !pos 215.371 39.025 -446.368 267 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.STONEWALLED) mission.reward = diff --git a/scripts/missions/soa/3_6_4_Salvation.lua b/scripts/missions/soa/3_6_4_Salvation.lua index 589781e86b4..859f74a276f 100644 --- a/scripts/missions/soa/3_6_4_Salvation.lua +++ b/scripts/missions/soa/3_6_4_Salvation.lua @@ -8,6 +8,7 @@ local kamihrID = zones[xi.zone.KAMIHR_DRIFTS] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.SALVATION) mission.reward = diff --git a/scripts/missions/soa/3_6_5_Glimmer_of_Portent.lua b/scripts/missions/soa/3_6_5_Glimmer_of_Portent.lua index fd8a29c3b56..92e9aaa0309 100644 --- a/scripts/missions/soa/3_6_5_Glimmer_of_Portent.lua +++ b/scripts/missions/soa/3_6_5_Glimmer_of_Portent.lua @@ -6,6 +6,7 @@ -- Levil : !pos -87.204 3.350 12.655 256 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.GLIMMER_OF_PORTENT) mission.reward = diff --git a/scripts/missions/soa/4_1_0_Into_the_Fire.lua b/scripts/missions/soa/4_1_0_Into_the_Fire.lua index 3320a272c2e..be33ae48646 100644 --- a/scripts/missions/soa/4_1_0_Into_the_Fire.lua +++ b/scripts/missions/soa/4_1_0_Into_the_Fire.lua @@ -7,6 +7,7 @@ -- Kipligg : !pos -32 0 22 256 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.INTO_THE_FIRE) mission.reward = diff --git a/scripts/missions/soa/4_1_1_Melvien_de_Malecroix.lua b/scripts/missions/soa/4_1_1_Melvien_de_Malecroix.lua index c8f2420ebe9..c4314cb892d 100644 --- a/scripts/missions/soa/4_1_1_Melvien_de_Malecroix.lua +++ b/scripts/missions/soa/4_1_1_Melvien_de_Malecroix.lua @@ -8,6 +8,7 @@ -- Port Storage : !pos 85.578 30.5 180.639 256 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.MELVIEN_DE_MALECROIX) mission.reward = diff --git a/scripts/missions/soa/4_1_2_Courier_Catastrophe.lua b/scripts/missions/soa/4_1_2_Courier_Catastrophe.lua index be922e27e41..2645395a4a7 100644 --- a/scripts/missions/soa/4_1_2_Courier_Catastrophe.lua +++ b/scripts/missions/soa/4_1_2_Courier_Catastrophe.lua @@ -10,6 +10,7 @@ local westernAdoulinID = zones[xi.zone.WESTERN_ADOULIN] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.COURIER_CATASTROPHE) mission.reward = diff --git a/scripts/missions/soa/4_1_3_Done_and_Delivered.lua b/scripts/missions/soa/4_1_3_Done_and_Delivered.lua index 81ccf3b6ec8..03c791d437b 100644 --- a/scripts/missions/soa/4_1_3_Done_and_Delivered.lua +++ b/scripts/missions/soa/4_1_3_Done_and_Delivered.lua @@ -6,6 +6,7 @@ -- Kipligg : !pos -32 0 22 256 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.DONE_AND_DELIVERED) mission.reward = diff --git a/scripts/missions/soa/4_1_4_Ministerial_Whispers.lua b/scripts/missions/soa/4_1_4_Ministerial_Whispers.lua index 89a7f9f4cc8..c39b1834ea0 100644 --- a/scripts/missions/soa/4_1_4_Ministerial_Whispers.lua +++ b/scripts/missions/soa/4_1_4_Ministerial_Whispers.lua @@ -7,6 +7,7 @@ -- Kipligg : !pos -32 0 22 256 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.MINISTERIAL_WHISPERS) mission.reward = diff --git a/scripts/missions/soa/4_1_5_A_Day_in_the_Life_of_a_Pioneer.lua b/scripts/missions/soa/4_1_5_A_Day_in_the_Life_of_a_Pioneer.lua index 0d8cd357e78..a29889885c9 100644 --- a/scripts/missions/soa/4_1_5_A_Day_in_the_Life_of_a_Pioneer.lua +++ b/scripts/missions/soa/4_1_5_A_Day_in_the_Life_of_a_Pioneer.lua @@ -6,6 +6,7 @@ -- Levil : !pos -87.204 3.350 12.655 256 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.A_DAY_IN_THE_LIFE_OF_A_PIONEER) mission.reward = diff --git a/scripts/missions/soa/4_2_0_Lighting_the_Way.lua b/scripts/missions/soa/4_2_0_Lighting_the_Way.lua index e3353ece10e..0f0e9bdc110 100644 --- a/scripts/missions/soa/4_2_0_Lighting_the_Way.lua +++ b/scripts/missions/soa/4_2_0_Lighting_the_Way.lua @@ -7,6 +7,7 @@ -- Alpine Trail : !pos -13.479 -1.047 488.863 267 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.LIGHTING_THE_WAY) mission.reward = diff --git a/scripts/missions/soa/4_2_1_Sajjaka.lua b/scripts/missions/soa/4_2_1_Sajjaka.lua index c689a340d9c..8a1a3886a78 100644 --- a/scripts/missions/soa/4_2_1_Sajjaka.lua +++ b/scripts/missions/soa/4_2_1_Sajjaka.lua @@ -6,6 +6,7 @@ -- Levil : !pos -87.204 3.350 12.655 256 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.SAJJAKA) mission.reward = diff --git a/scripts/missions/soa/4_2_2_Studying_Up.lua b/scripts/missions/soa/4_2_2_Studying_Up.lua index 5c2afb98eb1..64ff9691d1b 100644 --- a/scripts/missions/soa/4_2_2_Studying_Up.lua +++ b/scripts/missions/soa/4_2_2_Studying_Up.lua @@ -7,6 +7,7 @@ -- Alpine Trail : !pos -13.479 -1.047 488.863 267 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.STUDYING_UP) mission.reward = diff --git a/scripts/missions/soa/4_2_3_A_Vow_of_Truth.lua b/scripts/missions/soa/4_2_3_A_Vow_of_Truth.lua index cd38c3ccfaa..2a8434b6519 100644 --- a/scripts/missions/soa/4_2_3_A_Vow_of_Truth.lua +++ b/scripts/missions/soa/4_2_3_A_Vow_of_Truth.lua @@ -6,6 +6,7 @@ -- Levil : !pos -87.204 3.350 12.655 256 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.A_VOW_OF_TRUTH) mission.reward = diff --git a/scripts/missions/soa/4_2_4_Darrcuiln.lua b/scripts/missions/soa/4_2_4_Darrcuiln.lua index f034946f2fb..4698da7eb77 100644 --- a/scripts/missions/soa/4_2_4_Darrcuiln.lua +++ b/scripts/missions/soa/4_2_4_Darrcuiln.lua @@ -7,6 +7,7 @@ -- Darkened Crevice : !pos 185.752 27.311 240.72 273 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.DARRCUILN) mission.reward = diff --git a/scripts/missions/soa/4_3_0_The_Gates.lua b/scripts/missions/soa/4_3_0_The_Gates.lua index 3a173926c81..a44062eb969 100644 --- a/scripts/missions/soa/4_3_0_The_Gates.lua +++ b/scripts/missions/soa/4_3_0_The_Gates.lua @@ -7,6 +7,7 @@ -- Darkened Crevice : !pos 185.752 27.311 240.72 273 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.THE_GATES) mission.reward = diff --git a/scripts/missions/soa/4_3_1_Morimar.lua b/scripts/missions/soa/4_3_1_Morimar.lua index 7ae5519ce8a..48fcd7b1d81 100644 --- a/scripts/missions/soa/4_3_1_Morimar.lua +++ b/scripts/missions/soa/4_3_1_Morimar.lua @@ -7,6 +7,7 @@ -- Alpine Trail : !pos -13.479 -1.047 488.863 267 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.MORIMAR) mission.reward = diff --git a/scripts/missions/soa/4_3_2_A_New_Force_Arises.lua b/scripts/missions/soa/4_3_2_A_New_Force_Arises.lua index 1bdac2be586..b2b613edf1c 100644 --- a/scripts/missions/soa/4_3_2_A_New_Force_Arises.lua +++ b/scripts/missions/soa/4_3_2_A_New_Force_Arises.lua @@ -13,6 +13,7 @@ local kamihrID = zones[xi.zone.MOUNT_KAMIHR] local outerRaKaznarID = zones[xi.zone.OUTER_RAKAZNAR] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.A_NEW_FORCE_ARISES) mission.reward = diff --git a/scripts/missions/soa/4_3_3_The_Sacred_Sapling.lua b/scripts/missions/soa/4_3_3_The_Sacred_Sapling.lua index d288787df49..613720f9224 100644 --- a/scripts/missions/soa/4_3_3_The_Sacred_Sapling.lua +++ b/scripts/missions/soa/4_3_3_The_Sacred_Sapling.lua @@ -7,6 +7,7 @@ -- Ploh Trishbahk : !pos 100.580 -40.150 -63.830 257 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.THE_SACRED_SAPLING) mission.reward = diff --git a/scripts/missions/soa/4_3_4_Tree_Grafting.lua b/scripts/missions/soa/4_3_4_Tree_Grafting.lua index fcc140fa7c3..8182cb17888 100644 --- a/scripts/missions/soa/4_3_4_Tree_Grafting.lua +++ b/scripts/missions/soa/4_3_4_Tree_Grafting.lua @@ -6,6 +6,7 @@ -- Levil : !pos -87.204 3.350 12.655 256 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.TREE_GRAFTING) mission.reward = diff --git a/scripts/missions/soa/4_3_5_A_Shrouded_Canopy.lua b/scripts/missions/soa/4_3_5_A_Shrouded_Canopy.lua index e2f254542f6..b1c53ffd717 100644 --- a/scripts/missions/soa/4_3_5_A_Shrouded_Canopy.lua +++ b/scripts/missions/soa/4_3_5_A_Shrouded_Canopy.lua @@ -6,6 +6,7 @@ -- Levil : !pos -87.204 3.350 12.655 256 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.A_SHROUDED_CANOPY) mission.reward = diff --git a/scripts/missions/soa/4_3_6_Leafallia.lua b/scripts/missions/soa/4_3_6_Leafallia.lua index 0f7ce20fe78..b5f7d366915 100644 --- a/scripts/missions/soa/4_3_6_Leafallia.lua +++ b/scripts/missions/soa/4_3_6_Leafallia.lua @@ -7,6 +7,7 @@ -- Aged Stump : !pos -27.233 -2 33.508 281 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.LEAFALLIA) mission.reward = diff --git a/scripts/missions/soa/4_3_7_Rosulatias_Promise.lua b/scripts/missions/soa/4_3_7_Rosulatias_Promise.lua index 5f2bf1a4d38..f89a9a8a39a 100644 --- a/scripts/missions/soa/4_3_7_Rosulatias_Promise.lua +++ b/scripts/missions/soa/4_3_7_Rosulatias_Promise.lua @@ -9,6 +9,7 @@ local leafalliaID = zones[xi.zone.LEAFALLIA] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.ROSULATIAS_PROMISE) mission.reward = diff --git a/scripts/missions/soa/4_3_8_The_Lightsland.lua b/scripts/missions/soa/4_3_8_The_Lightsland.lua index 198ba4a7284..10ec8c49e08 100644 --- a/scripts/missions/soa/4_3_8_The_Lightsland.lua +++ b/scripts/missions/soa/4_3_8_The_Lightsland.lua @@ -7,6 +7,7 @@ -- Ploh Trishbahk : !pos 100.580 -40.150 -63.830 257 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.THE_LIGHTSLAND) mission.reward = diff --git a/scripts/missions/soa/4_3_9_The_Light_of_Dawn_Comes.lua b/scripts/missions/soa/4_3_9_The_Light_of_Dawn_Comes.lua index ccf692c21be..406fc76146a 100644 --- a/scripts/missions/soa/4_3_9_The_Light_of_Dawn_Comes.lua +++ b/scripts/missions/soa/4_3_9_The_Light_of_Dawn_Comes.lua @@ -6,6 +6,7 @@ -- Levil : !pos -87.204 3.350 12.655 256 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.THE_LIGHT_OF_DAWN_COMES) mission.reward = diff --git a/scripts/missions/soa/4_4_0_Cries_from_the_Deep.lua b/scripts/missions/soa/4_4_0_Cries_from_the_Deep.lua index eae5b15b699..99adf89b5ae 100644 --- a/scripts/missions/soa/4_4_0_Cries_from_the_Deep.lua +++ b/scripts/missions/soa/4_4_0_Cries_from_the_Deep.lua @@ -6,6 +6,7 @@ -- Levil : !pos -87.204 3.350 12.655 256 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.CRIES_FROM_THE_DEEP) mission.reward = diff --git a/scripts/missions/soa/4_4_1_Seeds_of_Doubt.lua b/scripts/missions/soa/4_4_1_Seeds_of_Doubt.lua index f1d5a7e058b..ef582b4ed09 100644 --- a/scripts/missions/soa/4_4_1_Seeds_of_Doubt.lua +++ b/scripts/missions/soa/4_4_1_Seeds_of_Doubt.lua @@ -8,6 +8,7 @@ -- Chalvava : !pos -318.000 -1.000 -318.000 258 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.SEEDS_OF_DOUBT) mission.reward = diff --git a/scripts/missions/soa/4_4_2_The_Tomatoes_of_Wrath.lua b/scripts/missions/soa/4_4_2_The_Tomatoes_of_Wrath.lua index 0148f7af072..a5ac451e8f3 100644 --- a/scripts/missions/soa/4_4_2_The_Tomatoes_of_Wrath.lua +++ b/scripts/missions/soa/4_4_2_The_Tomatoes_of_Wrath.lua @@ -8,6 +8,7 @@ -- Chalvava : !pos -318.000 -1.000 -318.000 258 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.THE_TOMATOES_OF_WRATH) mission.reward = diff --git a/scripts/missions/soa/4_4_3_A_Grave_Mistake.lua b/scripts/missions/soa/4_4_3_A_Grave_Mistake.lua index 88b91dbf5ff..79d557623e1 100644 --- a/scripts/missions/soa/4_4_3_A_Grave_Mistake.lua +++ b/scripts/missions/soa/4_4_3_A_Grave_Mistake.lua @@ -13,6 +13,7 @@ local easternAdoulinID = zones[xi.zone.EASTERN_ADOULIN] local ralaID = zones[xi.zone.RALA_WATERWAYS] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.A_GRAVE_MISTAKE) mission.reward = diff --git a/scripts/missions/soa/4_4_4_An_Emergency_Convocation.lua b/scripts/missions/soa/4_4_4_An_Emergency_Convocation.lua index 5a588263fe1..1e2a5894330 100644 --- a/scripts/missions/soa/4_4_4_An_Emergency_Convocation.lua +++ b/scripts/missions/soa/4_4_4_An_Emergency_Convocation.lua @@ -7,6 +7,7 @@ -- Ploh Trishbahk : !pos 100.580 -40.150 -63.830 257 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.AN_EMERGENCY_CONVOCATION) mission.reward = diff --git a/scripts/missions/soa/4_5_0_Balamor_the_Deathborne_Xol.lua b/scripts/missions/soa/4_5_0_Balamor_the_Deathborne_Xol.lua index 21cb2fb62a3..7b5a88dc9f5 100644 --- a/scripts/missions/soa/4_5_0_Balamor_the_Deathborne_Xol.lua +++ b/scripts/missions/soa/4_5_0_Balamor_the_Deathborne_Xol.lua @@ -7,6 +7,7 @@ -- Ploh Trishbahk : !pos 100.580 -40.150 -63.830 257 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.BALAMOR_THE_DEATHBORNE_XOL) mission.reward = diff --git a/scripts/missions/soa/4_5_1_Anagnorisis.lua b/scripts/missions/soa/4_5_1_Anagnorisis.lua index 09e38033abc..e881eec722d 100644 --- a/scripts/missions/soa/4_5_1_Anagnorisis.lua +++ b/scripts/missions/soa/4_5_1_Anagnorisis.lua @@ -7,6 +7,7 @@ -- Ploh Trishbahk : !pos 100.580 -40.150 -63.830 257 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.ANAGNORISIS) mission.reward = diff --git a/scripts/missions/soa/4_5_2_Just_the_Thing.lua b/scripts/missions/soa/4_5_2_Just_the_Thing.lua index 31d3eeb6871..a4fcda065ad 100644 --- a/scripts/missions/soa/4_5_2_Just_the_Thing.lua +++ b/scripts/missions/soa/4_5_2_Just_the_Thing.lua @@ -7,6 +7,7 @@ -- Andreine : !pos -91.944 -2.14 -91.538 284 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.JUST_THE_THING) mission.reward = diff --git a/scripts/missions/soa/4_5_3_Sugarcoated_Salvation.lua b/scripts/missions/soa/4_5_3_Sugarcoated_Salvation.lua index 1730efb8ff5..3e9786d9830 100644 --- a/scripts/missions/soa/4_5_3_Sugarcoated_Salvation.lua +++ b/scripts/missions/soa/4_5_3_Sugarcoated_Salvation.lua @@ -10,6 +10,7 @@ local easternAdoulinID = zones[xi.zone.EASTERN_ADOULIN] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.SUGARCOATED_SALVATION) mission.reward = diff --git a/scripts/missions/soa/4_5_4_Arcielas_Resolve.lua b/scripts/missions/soa/4_5_4_Arcielas_Resolve.lua index 3bf78a9b28e..e87ba892a6d 100644 --- a/scripts/missions/soa/4_5_4_Arcielas_Resolve.lua +++ b/scripts/missions/soa/4_5_4_Arcielas_Resolve.lua @@ -8,6 +8,7 @@ -- Royal Sepulcher : !pos 319 -7.5 -300 258 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.ARCIELAS_RESOLVE) mission.reward = diff --git a/scripts/missions/soa/4_6_0_Balamors_Ruse.lua b/scripts/missions/soa/4_6_0_Balamors_Ruse.lua index 6006b8df011..457e50327dd 100644 --- a/scripts/missions/soa/4_6_0_Balamors_Ruse.lua +++ b/scripts/missions/soa/4_6_0_Balamors_Ruse.lua @@ -6,6 +6,7 @@ -- Levil : !pos -87.204 3.350 12.655 256 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.BALAMORS_RUSE) mission.reward = diff --git a/scripts/missions/soa/4_6_1_The_Charlatan.lua b/scripts/missions/soa/4_6_1_The_Charlatan.lua index 0659c037b87..f95a577638a 100644 --- a/scripts/missions/soa/4_6_1_The_Charlatan.lua +++ b/scripts/missions/soa/4_6_1_The_Charlatan.lua @@ -7,6 +7,7 @@ -- Ploh Trishbahk : !pos 100.580 -40.150 -63.830 257 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.THE_CHARLATAN) mission.reward = diff --git a/scripts/missions/soa/4_6_2_Royal_Blessings.lua b/scripts/missions/soa/4_6_2_Royal_Blessings.lua index 7ca667fceff..bf606bb420b 100644 --- a/scripts/missions/soa/4_6_2_Royal_Blessings.lua +++ b/scripts/missions/soa/4_6_2_Royal_Blessings.lua @@ -6,6 +6,7 @@ -- Levil : !pos -87.204 3.350 12.655 256 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.ROYAL_BLESSINGS) mission.reward = diff --git a/scripts/missions/soa/5_1_0_Arboreal_Rumors.lua b/scripts/missions/soa/5_1_0_Arboreal_Rumors.lua index 41ebee78b20..5e005bfdc7e 100644 --- a/scripts/missions/soa/5_1_0_Arboreal_Rumors.lua +++ b/scripts/missions/soa/5_1_0_Arboreal_Rumors.lua @@ -7,6 +7,7 @@ -- Ploh Trishbahk : !pos 100.580 -40.150 -63.830 257 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.ARBOREAL_RUMORS) mission.reward = diff --git a/scripts/missions/soa/5_1_1_Arcielas_Missive.lua b/scripts/missions/soa/5_1_1_Arcielas_Missive.lua index 7b07687431b..ab8afd79a6d 100644 --- a/scripts/missions/soa/5_1_1_Arcielas_Missive.lua +++ b/scripts/missions/soa/5_1_1_Arcielas_Missive.lua @@ -10,6 +10,7 @@ local westernAdoulinID = zones[xi.zone.WESTERN_ADOULIN] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.ARCIELAS_MISSIVE) mission.reward = diff --git a/scripts/missions/soa/5_1_2_Heroes_Unite.lua b/scripts/missions/soa/5_1_2_Heroes_Unite.lua index 87e397f1c3f..1ec40fffc39 100644 --- a/scripts/missions/soa/5_1_2_Heroes_Unite.lua +++ b/scripts/missions/soa/5_1_2_Heroes_Unite.lua @@ -7,6 +7,7 @@ -- Alpine Trail : !pos -13.479 -1.047 488.863 267 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.HEROES_UNITE) mission.reward = diff --git a/scripts/missions/soa/5_1_3_A_Portent_Most_Ominous.lua b/scripts/missions/soa/5_1_3_A_Portent_Most_Ominous.lua index 51f1fa80cda..c1ff72cf1dd 100644 --- a/scripts/missions/soa/5_1_3_A_Portent_Most_Ominous.lua +++ b/scripts/missions/soa/5_1_3_A_Portent_Most_Ominous.lua @@ -7,6 +7,7 @@ -- Aged Stump : !pos -27.233 -2 33.508 281 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.A_PORTENT_MOST_OMINOUS) mission.reward = diff --git a/scripts/missions/soa/5_2_0_Yggdrasil_Beckons.lua b/scripts/missions/soa/5_2_0_Yggdrasil_Beckons.lua index 15ee87f8d15..14a7cbf3901 100644 --- a/scripts/missions/soa/5_2_0_Yggdrasil_Beckons.lua +++ b/scripts/missions/soa/5_2_0_Yggdrasil_Beckons.lua @@ -6,6 +6,7 @@ -- Levil : !pos -87.204 3.350 12.655 256 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.YGGDRASIL_BECKONS) mission.reward = diff --git a/scripts/missions/soa/5_2_1_Returning_to_the_Trees.lua b/scripts/missions/soa/5_2_1_Returning_to_the_Trees.lua index 4a79130be56..3d0f24c554c 100644 --- a/scripts/missions/soa/5_2_1_Returning_to_the_Trees.lua +++ b/scripts/missions/soa/5_2_1_Returning_to_the_Trees.lua @@ -6,6 +6,7 @@ -- Levil : !pos -87.204 3.350 12.655 256 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.RETURNING_TO_THE_TREES) mission.reward = diff --git a/scripts/missions/soa/5_2_2_The_Key_to_the_Turris.lua b/scripts/missions/soa/5_2_2_The_Key_to_the_Turris.lua index 94faac706f4..da1aea3a1a0 100644 --- a/scripts/missions/soa/5_2_2_The_Key_to_the_Turris.lua +++ b/scripts/missions/soa/5_2_2_The_Key_to_the_Turris.lua @@ -6,6 +6,7 @@ -- Levil : !pos -87.204 3.350 12.655 256 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.THE_KEY_TO_THE_TURRIS) mission.reward = diff --git a/scripts/missions/soa/5_3_0_Teodors_Summons.lua b/scripts/missions/soa/5_3_0_Teodors_Summons.lua index 29a778e5d0f..60eae73d617 100644 --- a/scripts/missions/soa/5_3_0_Teodors_Summons.lua +++ b/scripts/missions/soa/5_3_0_Teodors_Summons.lua @@ -7,6 +7,7 @@ -- Alpine Trail : !pos -13.479 -1.047 488.863 267 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.TEODORS_SUMMONS) mission.reward = diff --git a/scripts/missions/soa/5_3_1_The_Seventh_Guardian.lua b/scripts/missions/soa/5_3_1_The_Seventh_Guardian.lua index 4b827b590c4..2eef25fa382 100644 --- a/scripts/missions/soa/5_3_1_The_Seventh_Guardian.lua +++ b/scripts/missions/soa/5_3_1_The_Seventh_Guardian.lua @@ -7,6 +7,7 @@ -- Yeggha_Dolashi : !pos 260 -5.768 60 258 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.THE_SEVENTH_GUARDIAN) mission.reward = diff --git a/scripts/missions/soa/5_3_2_Watery_Grave.lua b/scripts/missions/soa/5_3_2_Watery_Grave.lua index 8e28bbb5803..f80e65933b4 100644 --- a/scripts/missions/soa/5_3_2_Watery_Grave.lua +++ b/scripts/missions/soa/5_3_2_Watery_Grave.lua @@ -7,6 +7,7 @@ local ralaID = zones[xi.zone.RALA_WATERWAYS] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.WATERY_GRAVE) mission.reward = diff --git a/scripts/missions/soa/5_3_3_Blood_for_Blood.lua b/scripts/missions/soa/5_3_3_Blood_for_Blood.lua index 0bf017e9667..5ca4229e306 100644 --- a/scripts/missions/soa/5_3_3_Blood_for_Blood.lua +++ b/scripts/missions/soa/5_3_3_Blood_for_Blood.lua @@ -6,6 +6,7 @@ -- Ominous Postern : !pos 118 37.5 20 277 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.BLOOD_FOR_BLOOD) mission.reward = diff --git a/scripts/missions/soa/5_4_0_Reckoning.lua b/scripts/missions/soa/5_4_0_Reckoning.lua index 558fe86f8e6..ecb2409700e 100644 --- a/scripts/missions/soa/5_4_0_Reckoning.lua +++ b/scripts/missions/soa/5_4_0_Reckoning.lua @@ -6,6 +6,7 @@ -- Ominous Postern : !pos 118 37.5 20 277 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.RECKONING) mission.reward = diff --git a/scripts/missions/soa/5_4_1_Abomination.lua b/scripts/missions/soa/5_4_1_Abomination.lua index 98276598c95..bdc88f4c5dc 100644 --- a/scripts/missions/soa/5_4_1_Abomination.lua +++ b/scripts/missions/soa/5_4_1_Abomination.lua @@ -6,6 +6,7 @@ -- Ominous Postern : !pos 118 37.5 20 277 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.ABOMINATION) mission.reward = diff --git a/scripts/missions/soa/5_5_0_Undying_Light.lua b/scripts/missions/soa/5_5_0_Undying_Light.lua index 78ab7db143c..90054540b0c 100644 --- a/scripts/missions/soa/5_5_0_Undying_Light.lua +++ b/scripts/missions/soa/5_5_0_Undying_Light.lua @@ -6,6 +6,7 @@ -- Ploh Trishbahk : !pos 100.580 -40.150 -63.830 257 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.UNDYING_LIGHT) mission.reward = diff --git a/scripts/missions/soa/5_5_1_The_Light_Within.lua b/scripts/missions/soa/5_5_1_The_Light_Within.lua index ceec0a00b1b..ba9d17bfe77 100644 --- a/scripts/missions/soa/5_5_1_The_Light_Within.lua +++ b/scripts/missions/soa/5_5_1_The_Light_Within.lua @@ -8,6 +8,7 @@ local ceizakID = zones[xi.zone.CEIZAK_BATTLEGROUNDS] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.SOA, xi.mission.id.soa.THE_LIGHT_WITHIN) mission.reward = {} diff --git a/scripts/missions/toau/01_Land_of_Sacred_Serpents.lua b/scripts/missions/toau/01_Land_of_Sacred_Serpents.lua index a65a3dc840a..e9e93a39563 100644 --- a/scripts/missions/toau/01_Land_of_Sacred_Serpents.lua +++ b/scripts/missions/toau/01_Land_of_Sacred_Serpents.lua @@ -6,6 +6,7 @@ -- !addmission 4 0 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.TOAU, xi.mission.id.toau.LAND_OF_SACRED_SERPENTS) mission.reward = diff --git a/scripts/missions/toau/02_Immortal_Sentries.lua b/scripts/missions/toau/02_Immortal_Sentries.lua index 3bd8cc5c68e..cf7039bdc6e 100644 --- a/scripts/missions/toau/02_Immortal_Sentries.lua +++ b/scripts/missions/toau/02_Immortal_Sentries.lua @@ -17,6 +17,7 @@ local caedarvaID = zones[xi.zone.CAEDARVA_MIRE] local zhayolmID = zones[xi.zone.MOUNT_ZHAYOLM] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.TOAU, xi.mission.id.toau.IMMORTAL_SENTRIES) local function handlePackage(player) diff --git a/scripts/missions/toau/03_President_Salaheem.lua b/scripts/missions/toau/03_President_Salaheem.lua index 97885c74986..4d6a9ed056f 100644 --- a/scripts/missions/toau/03_President_Salaheem.lua +++ b/scripts/missions/toau/03_President_Salaheem.lua @@ -6,6 +6,7 @@ -- Naja Salaheem : !pos 22.700 -8.804 -45.591 50 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.TOAU, xi.mission.id.toau.PRESIDENT_SALAHEEM) mission.reward = diff --git a/scripts/missions/toau/04_Knight_of_Gold.lua b/scripts/missions/toau/04_Knight_of_Gold.lua index a65e19db1b7..3240a5735a6 100644 --- a/scripts/missions/toau/04_Knight_of_Gold.lua +++ b/scripts/missions/toau/04_Knight_of_Gold.lua @@ -6,6 +6,7 @@ -- Cacaroon : !pos -72.026 0.000 -82.337 50 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.TOAU, xi.mission.id.toau.KNIGHT_OF_GOLD) mission.reward = diff --git a/scripts/missions/toau/05_Confessions_of_Royalty.lua b/scripts/missions/toau/05_Confessions_of_Royalty.lua index 271b4a31e46..67e65d15ac5 100644 --- a/scripts/missions/toau/05_Confessions_of_Royalty.lua +++ b/scripts/missions/toau/05_Confessions_of_Royalty.lua @@ -6,6 +6,7 @@ -- Halver : !pos 2 0.1 0.1 233 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.TOAU, xi.mission.id.toau.CONFESSIONS_OF_ROYALTY) mission.reward = diff --git a/scripts/missions/toau/06_Easterly_Winds.lua b/scripts/missions/toau/06_Easterly_Winds.lua index df69eafbfa1..7aab374690d 100644 --- a/scripts/missions/toau/06_Easterly_Winds.lua +++ b/scripts/missions/toau/06_Easterly_Winds.lua @@ -6,6 +6,7 @@ -- Halver : !pos 2 0.1 0.1 233 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.TOAU, xi.mission.id.toau.EASTERLY_WINDS) mission.reward = diff --git a/scripts/missions/toau/07_Westerly_Winds.lua b/scripts/missions/toau/07_Westerly_Winds.lua index 98cd45e2d80..439470a54d3 100644 --- a/scripts/missions/toau/07_Westerly_Winds.lua +++ b/scripts/missions/toau/07_Westerly_Winds.lua @@ -6,6 +6,7 @@ -- Naja Salaheem : !pos 22.700 -8.804 -45.591 50 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.TOAU, xi.mission.id.toau.WESTERLY_WINDS) mission.reward = diff --git a/scripts/missions/toau/08_A_Mercenary_Life.lua b/scripts/missions/toau/08_A_Mercenary_Life.lua index cef43402b82..7b1518dd416 100644 --- a/scripts/missions/toau/08_A_Mercenary_Life.lua +++ b/scripts/missions/toau/08_A_Mercenary_Life.lua @@ -5,6 +5,7 @@ -- !addmission 4 7 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.TOAU, xi.mission.id.toau.A_MERCENARY_LIFE) mission.reward = diff --git a/scripts/missions/toau/09_Undersea_Scouting.lua b/scripts/missions/toau/09_Undersea_Scouting.lua index 7045c9239ed..b171bb849d2 100644 --- a/scripts/missions/toau/09_Undersea_Scouting.lua +++ b/scripts/missions/toau/09_Undersea_Scouting.lua @@ -6,6 +6,7 @@ -- Naja Salaheem : !pos 22.700 -8.804 -45.591 50 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.TOAU, xi.mission.id.toau.UNDERSEA_SCOUTING) mission.reward = diff --git a/scripts/missions/toau/10_Astral_Waves.lua b/scripts/missions/toau/10_Astral_Waves.lua index b796e244310..163218b2356 100644 --- a/scripts/missions/toau/10_Astral_Waves.lua +++ b/scripts/missions/toau/10_Astral_Waves.lua @@ -6,6 +6,7 @@ -- Naja Salaheem : !pos 22.700 -8.804 -45.591 50 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.TOAU, xi.mission.id.toau.ASTRAL_WAVES) mission.reward = diff --git a/scripts/missions/toau/11_Imperial_Schemes.lua b/scripts/missions/toau/11_Imperial_Schemes.lua index 89d91c2807f..f73017a8122 100644 --- a/scripts/missions/toau/11_Imperial_Schemes.lua +++ b/scripts/missions/toau/11_Imperial_Schemes.lua @@ -6,6 +6,7 @@ -- Naja Salaheem : !pos 22.700 -8.804 -45.591 50 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.TOAU, xi.mission.id.toau.IMPERIAL_SCHEMES) mission.reward = diff --git a/scripts/missions/toau/12_Royal_Puppeteer.lua b/scripts/missions/toau/12_Royal_Puppeteer.lua index 34f34146a56..893c9faba9d 100644 --- a/scripts/missions/toau/12_Royal_Puppeteer.lua +++ b/scripts/missions/toau/12_Royal_Puppeteer.lua @@ -7,6 +7,7 @@ -- Pyopyoroon : !pos 22.112 0 24.682 53 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.TOAU, xi.mission.id.toau.ROYAL_PUPPETEER) mission.reward = diff --git a/scripts/missions/toau/13_Lost_Kingdom.lua b/scripts/missions/toau/13_Lost_Kingdom.lua index 6db618e64ff..ada69442350 100644 --- a/scripts/missions/toau/13_Lost_Kingdom.lua +++ b/scripts/missions/toau/13_Lost_Kingdom.lua @@ -9,6 +9,7 @@ local caedarvaID = zones[xi.zone.CAEDARVA_MIRE] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.TOAU, xi.mission.id.toau.LOST_KINGDOM) mission.reward = diff --git a/scripts/missions/toau/14_The_Dolphin_Crest.lua b/scripts/missions/toau/14_The_Dolphin_Crest.lua index 0d0eff63a5e..39064a0b976 100644 --- a/scripts/missions/toau/14_The_Dolphin_Crest.lua +++ b/scripts/missions/toau/14_The_Dolphin_Crest.lua @@ -6,6 +6,7 @@ -- Naja Salaheem : !pos 22.700 -8.804 -45.591 50 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.TOAU, xi.mission.id.toau.THE_DOLPHIN_CREST) mission.reward = diff --git a/scripts/missions/toau/15_The_Black_Coffin.lua b/scripts/missions/toau/15_The_Black_Coffin.lua index 83cf1778935..6bcff188896 100644 --- a/scripts/missions/toau/15_The_Black_Coffin.lua +++ b/scripts/missions/toau/15_The_Black_Coffin.lua @@ -6,6 +6,7 @@ -- Naja Salaheem : !pos 22.700 -8.804 -45.591 50 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.TOAU, xi.mission.id.toau.THE_BLACK_COFFIN) mission.reward = diff --git a/scripts/missions/toau/16_Ghosts_of_the_Past.lua b/scripts/missions/toau/16_Ghosts_of_the_Past.lua index 070a3ab946f..2b12618dc3c 100644 --- a/scripts/missions/toau/16_Ghosts_of_the_Past.lua +++ b/scripts/missions/toau/16_Ghosts_of_the_Past.lua @@ -8,6 +8,7 @@ local whitegateShared = require('scripts/zones/Aht_Urhgan_Whitegate/Shared') ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.TOAU, xi.mission.id.toau.GHOSTS_OF_THE_PAST) mission.reward = diff --git a/scripts/missions/toau/17_Guests_of_the_Empire.lua b/scripts/missions/toau/17_Guests_of_the_Empire.lua index e6d2dcce2e2..14cf4b63eac 100644 --- a/scripts/missions/toau/17_Guests_of_the_Empire.lua +++ b/scripts/missions/toau/17_Guests_of_the_Empire.lua @@ -9,6 +9,7 @@ local whitegateShared = require('scripts/zones/Aht_Urhgan_Whitegate/Shared') ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.TOAU, xi.mission.id.toau.GUESTS_OF_THE_EMPIRE) mission.reward = diff --git a/scripts/missions/toau/18_Passing_Glory.lua b/scripts/missions/toau/18_Passing_Glory.lua index b0cdae79d1c..644dc0446e4 100644 --- a/scripts/missions/toau/18_Passing_Glory.lua +++ b/scripts/missions/toau/18_Passing_Glory.lua @@ -6,6 +6,7 @@ -- Naja Salaheem : !pos 22.700 -8.804 -45.591 50 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.TOAU, xi.mission.id.toau.PASSING_GLORY) mission.reward = diff --git a/scripts/missions/toau/19_Sweets_for_the_Soul.lua b/scripts/missions/toau/19_Sweets_for_the_Soul.lua index ca6c96fd39d..0316c46eeeb 100644 --- a/scripts/missions/toau/19_Sweets_for_the_Soul.lua +++ b/scripts/missions/toau/19_Sweets_for_the_Soul.lua @@ -5,6 +5,7 @@ -- !addmission 4 18 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.TOAU, xi.mission.id.toau.SWEETS_FOR_THE_SOUL) mission.reward = diff --git a/scripts/missions/toau/20_Teahouse_Tumult.lua b/scripts/missions/toau/20_Teahouse_Tumult.lua index b8b3c86da31..5eed84168c6 100644 --- a/scripts/missions/toau/20_Teahouse_Tumult.lua +++ b/scripts/missions/toau/20_Teahouse_Tumult.lua @@ -6,6 +6,7 @@ -- blank_toau20 : !pos -298 36 -38 68 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.TOAU, xi.mission.id.toau.TEAHOUSE_TUMULT) mission.reward = diff --git a/scripts/missions/toau/21_Finders_Keepers.lua b/scripts/missions/toau/21_Finders_Keepers.lua index 119286e6351..6355c02d42b 100644 --- a/scripts/missions/toau/21_Finders_Keepers.lua +++ b/scripts/missions/toau/21_Finders_Keepers.lua @@ -6,6 +6,7 @@ -- Naja Salaheem : !pos 22.700 -8.804 -45.591 50 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.TOAU, xi.mission.id.toau.FINDERS_KEEPERS) mission.reward = diff --git a/scripts/missions/toau/22_Shield_of_Diplomacy.lua b/scripts/missions/toau/22_Shield_of_Diplomacy.lua index 15b0203308a..8cd4801a72a 100644 --- a/scripts/missions/toau/22_Shield_of_Diplomacy.lua +++ b/scripts/missions/toau/22_Shield_of_Diplomacy.lua @@ -6,6 +6,7 @@ -- Decorative Bronze Gate : !pos -601 10 -100 64 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.TOAU, xi.mission.id.toau.SHIELD_OF_DIPLOMACY) mission.reward = diff --git a/scripts/missions/toau/23_Social_Graces.lua b/scripts/missions/toau/23_Social_Graces.lua index 1fc31618aac..4732a628c1c 100644 --- a/scripts/missions/toau/23_Social_Graces.lua +++ b/scripts/missions/toau/23_Social_Graces.lua @@ -5,6 +5,7 @@ -- !addmission 4 22 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.TOAU, xi.mission.id.toau.SOCIAL_GRACES) mission.reward = diff --git a/scripts/missions/toau/24_Foiled_Ambition.lua b/scripts/missions/toau/24_Foiled_Ambition.lua index 8c898404683..47125134abd 100644 --- a/scripts/missions/toau/24_Foiled_Ambition.lua +++ b/scripts/missions/toau/24_Foiled_Ambition.lua @@ -5,6 +5,7 @@ -- !addmission 4 23 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.TOAU, xi.mission.id.toau.FOILED_AMBITION) mission.reward = diff --git a/scripts/missions/toau/25_Playing_the_Part.lua b/scripts/missions/toau/25_Playing_the_Part.lua index d15d029d23b..28cb9b6c0e2 100644 --- a/scripts/missions/toau/25_Playing_the_Part.lua +++ b/scripts/missions/toau/25_Playing_the_Part.lua @@ -6,6 +6,7 @@ -- Naja Salaheem : !pos 22.700 -8.804 -45.591 50 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.TOAU, xi.mission.id.toau.PLAYING_THE_PART) mission.reward = diff --git a/scripts/missions/toau/26_Seal_of_the_Serpent.lua b/scripts/missions/toau/26_Seal_of_the_Serpent.lua index 720074fbe28..a86ebbb7051 100644 --- a/scripts/missions/toau/26_Seal_of_the_Serpent.lua +++ b/scripts/missions/toau/26_Seal_of_the_Serpent.lua @@ -6,6 +6,7 @@ -- Imperial Whitegate : !pos 152 -2 0 50 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.TOAU, xi.mission.id.toau.SEAL_OF_THE_SERPENT) mission.reward = diff --git a/scripts/missions/toau/27_Misplaced_Nobility.lua b/scripts/missions/toau/27_Misplaced_Nobility.lua index 55ed44a849b..ae531cab0cd 100644 --- a/scripts/missions/toau/27_Misplaced_Nobility.lua +++ b/scripts/missions/toau/27_Misplaced_Nobility.lua @@ -6,6 +6,7 @@ -- blank_toau20 : !pos -298 36 -38 68 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.TOAU, xi.mission.id.toau.MISPLACED_NOBILITY) mission.reward = diff --git a/scripts/missions/toau/28_Bastion_of_Knowledge.lua b/scripts/missions/toau/28_Bastion_of_Knowledge.lua index da7b0fb9299..45642e311ff 100644 --- a/scripts/missions/toau/28_Bastion_of_Knowledge.lua +++ b/scripts/missions/toau/28_Bastion_of_Knowledge.lua @@ -5,6 +5,7 @@ -- !addmission 4 27 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.TOAU, xi.mission.id.toau.BASTION_OF_KNOWLEDGE) mission.reward = diff --git a/scripts/missions/toau/29_Puppet_in_Peril.lua b/scripts/missions/toau/29_Puppet_in_Peril.lua index cf6f94e68d2..4bd9847e896 100644 --- a/scripts/missions/toau/29_Puppet_in_Peril.lua +++ b/scripts/missions/toau/29_Puppet_in_Peril.lua @@ -6,6 +6,7 @@ -- Ornamental Door : !pos 299 0 -199 67 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.TOAU, xi.mission.id.toau.PUPPET_IN_PERIL) mission.reward = diff --git a/scripts/missions/toau/30_Prevalence_of_Pirates.lua b/scripts/missions/toau/30_Prevalence_of_Pirates.lua index 4fa1a0b761f..b41594167f2 100644 --- a/scripts/missions/toau/30_Prevalence_of_Pirates.lua +++ b/scripts/missions/toau/30_Prevalence_of_Pirates.lua @@ -5,6 +5,7 @@ -- !addmission 4 29 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.TOAU, xi.mission.id.toau.PREVALENCE_OF_PIRATES) mission.reward = diff --git a/scripts/missions/toau/31_Shades_of_Vengeance.lua b/scripts/missions/toau/31_Shades_of_Vengeance.lua index c5ff3ab9a1a..1769958d34e 100644 --- a/scripts/missions/toau/31_Shades_of_Vengeance.lua +++ b/scripts/missions/toau/31_Shades_of_Vengeance.lua @@ -6,6 +6,7 @@ -- Nashib : !pos -274.334 -9.287 -64.255 79 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.TOAU, xi.mission.id.toau.SHADES_OF_VENGEANCE) mission.reward = diff --git a/scripts/missions/toau/32_In_the_Blood.lua b/scripts/missions/toau/32_In_the_Blood.lua index 895201fed3a..50196a16661 100644 --- a/scripts/missions/toau/32_In_the_Blood.lua +++ b/scripts/missions/toau/32_In_the_Blood.lua @@ -6,6 +6,7 @@ -- Naja Salaheem : !pos 22.700 -8.804 -45.591 50 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.TOAU, xi.mission.id.toau.IN_THE_BLOOD) mission.reward = diff --git a/scripts/missions/toau/33_Sentinels_Honor.lua b/scripts/missions/toau/33_Sentinels_Honor.lua index 534ed147427..d478fef0dc2 100644 --- a/scripts/missions/toau/33_Sentinels_Honor.lua +++ b/scripts/missions/toau/33_Sentinels_Honor.lua @@ -6,6 +6,7 @@ -- Naja Salaheem : !pos 22.700 -8.804 -45.591 50 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.TOAU, xi.mission.id.toau.SENTINELS_HONOR) mission.reward = diff --git a/scripts/missions/toau/34_Testing_the_Waters.lua b/scripts/missions/toau/34_Testing_the_Waters.lua index 6ef4c8691c7..4ef8e912512 100644 --- a/scripts/missions/toau/34_Testing_the_Waters.lua +++ b/scripts/missions/toau/34_Testing_the_Waters.lua @@ -5,6 +5,7 @@ -- !addmission 4 33 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.TOAU, xi.mission.id.toau.TESTING_THE_WATERS) mission.reward = diff --git a/scripts/missions/toau/35_Legacy_of_the_Lost.lua b/scripts/missions/toau/35_Legacy_of_the_Lost.lua index 3fbf74acd2f..26dea4403fe 100644 --- a/scripts/missions/toau/35_Legacy_of_the_Lost.lua +++ b/scripts/missions/toau/35_Legacy_of_the_Lost.lua @@ -5,6 +5,7 @@ -- !addmission 4 34 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.TOAU, xi.mission.id.toau.LEGACY_OF_THE_LOST) mission.reward = diff --git a/scripts/missions/toau/36_Gaze_of_the_Saboteur.lua b/scripts/missions/toau/36_Gaze_of_the_Saboteur.lua index 720bb29bf98..1b5467259a1 100644 --- a/scripts/missions/toau/36_Gaze_of_the_Saboteur.lua +++ b/scripts/missions/toau/36_Gaze_of_the_Saboteur.lua @@ -6,6 +6,7 @@ -- Entry Gate : !pos 486 -227.6 -20 78 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.TOAU, xi.mission.id.toau.GAZE_OF_THE_SABOTEUR) mission.reward = diff --git a/scripts/missions/toau/37_Path_of_Blood.lua b/scripts/missions/toau/37_Path_of_Blood.lua index 371ec1bb311..76313197a98 100644 --- a/scripts/missions/toau/37_Path_of_Blood.lua +++ b/scripts/missions/toau/37_Path_of_Blood.lua @@ -5,6 +5,7 @@ -- !addmission 4 36 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.TOAU, xi.mission.id.toau.PATH_OF_BLOOD) mission.reward = diff --git a/scripts/missions/toau/38_Stirrings_of_War.lua b/scripts/missions/toau/38_Stirrings_of_War.lua index 3fbb2c5410a..90904c7a14d 100644 --- a/scripts/missions/toau/38_Stirrings_of_War.lua +++ b/scripts/missions/toau/38_Stirrings_of_War.lua @@ -5,6 +5,7 @@ -- !addmission 4 37 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.TOAU, xi.mission.id.toau.STIRRINGS_OF_WAR) mission.reward = diff --git a/scripts/missions/toau/39_Allied_Rumblings.lua b/scripts/missions/toau/39_Allied_Rumblings.lua index aa33547f237..8d81198ae82 100644 --- a/scripts/missions/toau/39_Allied_Rumblings.lua +++ b/scripts/missions/toau/39_Allied_Rumblings.lua @@ -5,6 +5,7 @@ -- !addmission 4 38 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.TOAU, xi.mission.id.toau.ALLIED_RUMBLINGS) mission.reward = diff --git a/scripts/missions/toau/40_Unraveling_Reason.lua b/scripts/missions/toau/40_Unraveling_Reason.lua index 9f5291956c4..0ebac755c06 100644 --- a/scripts/missions/toau/40_Unraveling_Reason.lua +++ b/scripts/missions/toau/40_Unraveling_Reason.lua @@ -6,6 +6,7 @@ -- Pherimociel : !pos -31.627 1.002 67.956 243 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.TOAU, xi.mission.id.toau.UNRAVELING_REASON) mission.reward = diff --git a/scripts/missions/toau/41_Light_of_Judgement.lua b/scripts/missions/toau/41_Light_of_Judgement.lua index d032e731246..94814267351 100644 --- a/scripts/missions/toau/41_Light_of_Judgement.lua +++ b/scripts/missions/toau/41_Light_of_Judgement.lua @@ -6,6 +6,7 @@ -- Rodin-Comidin : !pos 17.205 -5.999 51.161 50 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.TOAU, xi.mission.id.toau.LIGHT_OF_JUDGMENT) mission.reward = diff --git a/scripts/missions/toau/42_Path_of_Darkness.lua b/scripts/missions/toau/42_Path_of_Darkness.lua index 85dca5c7dba..56827a596e0 100644 --- a/scripts/missions/toau/42_Path_of_Darkness.lua +++ b/scripts/missions/toau/42_Path_of_Darkness.lua @@ -8,6 +8,7 @@ -- _1e1 (Door) : !pos 23 -6 -63 50 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.TOAU, xi.mission.id.toau.PATH_OF_DARKNESS) mission.reward = diff --git a/scripts/missions/toau/43_Fangs_of_the_Lion.lua b/scripts/missions/toau/43_Fangs_of_the_Lion.lua index 85146bbf57d..96e30532547 100644 --- a/scripts/missions/toau/43_Fangs_of_the_Lion.lua +++ b/scripts/missions/toau/43_Fangs_of_the_Lion.lua @@ -5,6 +5,7 @@ -- !addmission 4 42 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.TOAU, xi.mission.id.toau.FANGS_OF_THE_LION) mission.reward = diff --git a/scripts/missions/toau/44_Nashmeiras_Plea.lua b/scripts/missions/toau/44_Nashmeiras_Plea.lua index b30ee3257be..5c130bd4ca9 100644 --- a/scripts/missions/toau/44_Nashmeiras_Plea.lua +++ b/scripts/missions/toau/44_Nashmeiras_Plea.lua @@ -7,6 +7,7 @@ -- blank_lamp : !pos 206.55 -1.5 20.05 72 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.TOAU, xi.mission.id.toau.NASHMEIRAS_PLEA) mission.reward = diff --git a/scripts/missions/toau/45_Ragnarok.lua b/scripts/missions/toau/45_Ragnarok.lua index 42ec08b07f9..816db346d28 100644 --- a/scripts/missions/toau/45_Ragnarok.lua +++ b/scripts/missions/toau/45_Ragnarok.lua @@ -5,6 +5,7 @@ -- !addmission 4 44 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.TOAU, xi.mission.id.toau.RAGNAROK) mission.reward = diff --git a/scripts/missions/windurst/1_1_The_Horutoto_Ruins_Experiment.lua b/scripts/missions/windurst/1_1_The_Horutoto_Ruins_Experiment.lua index 5ff2c72c876..c3df6a87b11 100644 --- a/scripts/missions/windurst/1_1_The_Horutoto_Ruins_Experiment.lua +++ b/scripts/missions/windurst/1_1_The_Horutoto_Ruins_Experiment.lua @@ -21,6 +21,7 @@ local innerHorutotoRuinsID = zones[xi.zone.INNER_HORUTOTO_RUINS] local eastSarutabarutaID = zones[xi.zone.EAST_SARUTABARUTA] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WINDURST, xi.mission.id.windurst.THE_HORUTOTO_RUINS_EXPERIMENT) -- A unique title is awarded from accepting the mission at each gate guard diff --git a/scripts/missions/windurst/1_2_The_Heart_of_the_Matter.lua b/scripts/missions/windurst/1_2_The_Heart_of_the_Matter.lua index f2913a202bb..7616b6cfaae 100644 --- a/scripts/missions/windurst/1_2_The_Heart_of_the_Matter.lua +++ b/scripts/missions/windurst/1_2_The_Heart_of_the_Matter.lua @@ -16,6 +16,7 @@ local eastSarutabarutaID = zones[xi.zone.EAST_SARUTABARUTA] local outerHorutotoRuinsID = zones[xi.zone.OUTER_HORUTOTO_RUINS] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WINDURST, xi.mission.id.windurst.THE_HEART_OF_THE_MATTER) local msgBase = outerHorutotoRuinsID.text.ORB_ALREADY_PLACED diff --git a/scripts/missions/windurst/1_3_The_Price_of_Peace.lua b/scripts/missions/windurst/1_3_The_Price_of_Peace.lua index 13622ca3374..cf83fb1e73d 100644 --- a/scripts/missions/windurst/1_3_The_Price_of_Peace.lua +++ b/scripts/missions/windurst/1_3_The_Price_of_Peace.lua @@ -15,6 +15,7 @@ local giddeusID = zones[xi.zone.GIDDEUS] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WINDURST, xi.mission.id.windurst.THE_PRICE_OF_PEACE) mission.reward = diff --git a/scripts/missions/windurst/2_1_Lost_for_Words.lua b/scripts/missions/windurst/2_1_Lost_for_Words.lua index d0734c3684e..631af66ea89 100644 --- a/scripts/missions/windurst/2_1_Lost_for_Words.lua +++ b/scripts/missions/windurst/2_1_Lost_for_Words.lua @@ -16,6 +16,7 @@ local mazeID = zones[xi.zone.MAZE_OF_SHAKHRAMI] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WINDURST, xi.mission.id.windurst.LOST_FOR_WORDS) mission.reward = diff --git a/scripts/missions/windurst/2_2_A_Testing_Time.lua b/scripts/missions/windurst/2_2_A_Testing_Time.lua index eb08e4ed75e..593f9a01aa8 100644 --- a/scripts/missions/windurst/2_2_A_Testing_Time.lua +++ b/scripts/missions/windurst/2_2_A_Testing_Time.lua @@ -12,6 +12,7 @@ -- Moreno-Toeno - !pos 169 -1.25 159 238 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WINDURST, xi.mission.id.windurst.A_TESTING_TIME) mission.reward = diff --git a/scripts/missions/windurst/2_3_0_The_Three_Kingdoms.lua b/scripts/missions/windurst/2_3_0_The_Three_Kingdoms.lua index c0cacbf4f08..ea9c667700a 100644 --- a/scripts/missions/windurst/2_3_0_The_Three_Kingdoms.lua +++ b/scripts/missions/windurst/2_3_0_The_Three_Kingdoms.lua @@ -15,6 +15,7 @@ local northernSandoriaID = zones[xi.zone.NORTHERN_SAN_DORIA] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WINDURST, xi.mission.id.windurst.THE_THREE_KINGDOMS) mission.reward = diff --git a/scripts/missions/windurst/2_3_1_The_Three_Kingdoms_Sandoria.lua b/scripts/missions/windurst/2_3_1_The_Three_Kingdoms_Sandoria.lua index 674c739238a..5f713969d25 100644 --- a/scripts/missions/windurst/2_3_1_The_Three_Kingdoms_Sandoria.lua +++ b/scripts/missions/windurst/2_3_1_The_Three_Kingdoms_Sandoria.lua @@ -11,6 +11,7 @@ local chateauID = zones[xi.zone.CHATEAU_DORAGUILLE] local northernSandoriaID = zones[xi.zone.NORTHERN_SAN_DORIA] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WINDURST, xi.mission.id.windurst.THE_THREE_KINGDOMS_SANDORIA) mission.reward = {} diff --git a/scripts/missions/windurst/2_3_2_The_Three_Kingdoms_Bastok.lua b/scripts/missions/windurst/2_3_2_The_Three_Kingdoms_Bastok.lua index 567ee2e378e..cc6e5651073 100644 --- a/scripts/missions/windurst/2_3_2_The_Three_Kingdoms_Bastok.lua +++ b/scripts/missions/windurst/2_3_2_The_Three_Kingdoms_Bastok.lua @@ -8,6 +8,7 @@ -- Patt-Pott : !pos 23 -17 42 237 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WINDURST, xi.mission.id.windurst.THE_THREE_KINGDOMS_BASTOK) mission.reward = {} diff --git a/scripts/missions/windurst/2_3_3_The_Three_Kingdoms_Sandoria2.lua b/scripts/missions/windurst/2_3_3_The_Three_Kingdoms_Sandoria2.lua index 82d3f1360cb..ec4cc498726 100644 --- a/scripts/missions/windurst/2_3_3_The_Three_Kingdoms_Sandoria2.lua +++ b/scripts/missions/windurst/2_3_3_The_Three_Kingdoms_Sandoria2.lua @@ -10,6 +10,7 @@ local chateauID = zones[xi.zone.CHATEAU_DORAGUILLE] local northernSandoriaID = zones[xi.zone.NORTHERN_SAN_DORIA] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WINDURST, xi.mission.id.windurst.THE_THREE_KINGDOMS_SANDORIA2) mission.reward = {} diff --git a/scripts/missions/windurst/2_3_4_The_Three_Kingdoms_Bastok2.lua b/scripts/missions/windurst/2_3_4_The_Three_Kingdoms_Bastok2.lua index 18a1c029b05..a23b809e1f2 100644 --- a/scripts/missions/windurst/2_3_4_The_Three_Kingdoms_Bastok2.lua +++ b/scripts/missions/windurst/2_3_4_The_Three_Kingdoms_Bastok2.lua @@ -8,6 +8,7 @@ -- Patt-Pott : !pos 23 -17 42 237 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WINDURST, xi.mission.id.windurst.THE_THREE_KINGDOMS_BASTOK2) mission.reward = {} diff --git a/scripts/missions/windurst/3_1_To_Each_His_Own_Right.lua b/scripts/missions/windurst/3_1_To_Each_His_Own_Right.lua index 10df0579cad..946ee4cbee4 100644 --- a/scripts/missions/windurst/3_1_To_Each_His_Own_Right.lua +++ b/scripts/missions/windurst/3_1_To_Each_His_Own_Right.lua @@ -13,6 +13,7 @@ -- Trap Door : !pos 22.310 -1.087 -14.320 151 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WINDURST, xi.mission.id.windurst.TO_EACH_HIS_OWN_RIGHT) mission.reward = diff --git a/scripts/missions/windurst/3_2_Written_in_the_Stars.lua b/scripts/missions/windurst/3_2_Written_in_the_Stars.lua index abc2673d562..735ac93877a 100644 --- a/scripts/missions/windurst/3_2_Written_in_the_Stars.lua +++ b/scripts/missions/windurst/3_2_Written_in_the_Stars.lua @@ -11,6 +11,7 @@ -- Gate of Light : !pos -331 0 139 192 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WINDURST, xi.mission.id.windurst.WRITTEN_IN_THE_STARS) mission.reward = diff --git a/scripts/missions/windurst/3_3_A_New_Journey.lua b/scripts/missions/windurst/3_3_A_New_Journey.lua index 015591440cc..50a2a02334c 100644 --- a/scripts/missions/windurst/3_3_A_New_Journey.lua +++ b/scripts/missions/windurst/3_3_A_New_Journey.lua @@ -15,6 +15,7 @@ local lowerDelkfuttID = zones[xi.zone.LOWER_DELKFUTTS_TOWER] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WINDURST, xi.mission.id.windurst.A_NEW_JOURNEY) mission.reward = diff --git a/scripts/missions/windurst/4_1_Magicite.lua b/scripts/missions/windurst/4_1_Magicite.lua index 59cb3c4812f..184bd962f71 100644 --- a/scripts/missions/windurst/4_1_Magicite.lua +++ b/scripts/missions/windurst/4_1_Magicite.lua @@ -14,6 +14,7 @@ -- Magicite (Aurastone) : !pos 11 25 -81 148 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WINDURST, xi.mission.id.windurst.MAGICITE) local function magiciteCounter(player) diff --git a/scripts/missions/windurst/5_1_The_Final_Seal.lua b/scripts/missions/windurst/5_1_The_Final_Seal.lua index ded5a63bd42..f9bc24e169b 100644 --- a/scripts/missions/windurst/5_1_The_Final_Seal.lua +++ b/scripts/missions/windurst/5_1_The_Final_Seal.lua @@ -10,6 +10,7 @@ -- Vestal Chamber (_6q2) : !pos 0.1 -49 37 242 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WINDURST, xi.mission.id.windurst.THE_FINAL_SEAL) mission.reward = diff --git a/scripts/missions/windurst/5_2_The_Shadow_Awaits.lua b/scripts/missions/windurst/5_2_The_Shadow_Awaits.lua index fd7a10f8888..903ce20e1c5 100644 --- a/scripts/missions/windurst/5_2_The_Shadow_Awaits.lua +++ b/scripts/missions/windurst/5_2_The_Shadow_Awaits.lua @@ -12,6 +12,7 @@ -- Thone Room Door : !pos -111 -6 0 165 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WINDURST, xi.mission.id.windurst.THE_SHADOW_AWAITS) mission.reward = diff --git a/scripts/missions/windurst/6_1_Full_Moon_Fountain.lua b/scripts/missions/windurst/6_1_Full_Moon_Fountain.lua index 3b3d141494e..3cbfc696b8a 100644 --- a/scripts/missions/windurst/6_1_Full_Moon_Fountain.lua +++ b/scripts/missions/windurst/6_1_Full_Moon_Fountain.lua @@ -13,6 +13,7 @@ local outerHorutotoID = zones[xi.zone.OUTER_HORUTOTO_RUINS] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WINDURST, xi.mission.id.windurst.FULL_MOON_FOUNTAIN) mission.reward = diff --git a/scripts/missions/windurst/6_2_Saintly_Invitation.lua b/scripts/missions/windurst/6_2_Saintly_Invitation.lua index 6fa72094a36..18c0de9d584 100644 --- a/scripts/missions/windurst/6_2_Saintly_Invitation.lua +++ b/scripts/missions/windurst/6_2_Saintly_Invitation.lua @@ -11,6 +11,7 @@ -- Kaa Toru the Just : !pos -100.188 -62.125 145.422 151 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WINDURST, xi.mission.id.windurst.SAINTLY_INVITATION) mission.reward = diff --git a/scripts/missions/windurst/7_1_The_Sixth_Ministry.lua b/scripts/missions/windurst/7_1_The_Sixth_Ministry.lua index b70a8327df5..321b99996b0 100644 --- a/scripts/missions/windurst/7_1_The_Sixth_Ministry.lua +++ b/scripts/missions/windurst/7_1_The_Sixth_Ministry.lua @@ -13,6 +13,7 @@ local toraimaraiID = zones[xi.zone.TORAIMARAI_CANAL] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WINDURST, xi.mission.id.windurst.THE_SIXTH_MINISTRY) mission.reward = diff --git a/scripts/missions/windurst/7_2_Awakening_of_the_Gods.lua b/scripts/missions/windurst/7_2_Awakening_of_the_Gods.lua index d41d53d52b0..cfb7913335e 100644 --- a/scripts/missions/windurst/7_2_Awakening_of_the_Gods.lua +++ b/scripts/missions/windurst/7_2_Awakening_of_the_Gods.lua @@ -15,6 +15,7 @@ -- Granite Door : !pos 340 0.1 329 159 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WINDURST, xi.mission.id.windurst.AWAKENING_OF_THE_GODS) mission.reward = diff --git a/scripts/missions/windurst/8_1_Vain.lua b/scripts/missions/windurst/8_1_Vain.lua index 01a198be7e3..d8e90458e25 100644 --- a/scripts/missions/windurst/8_1_Vain.lua +++ b/scripts/missions/windurst/8_1_Vain.lua @@ -12,6 +12,7 @@ -- Sedal-Godjal : !pos 185 -3 -116 149 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WINDURST, xi.mission.id.windurst.VAIN) mission.reward = diff --git a/scripts/missions/windurst/8_2_The_Jester_Whod_be_King.lua b/scripts/missions/windurst/8_2_The_Jester_Whod_be_King.lua index 63723b4dbca..1b348efd39e 100644 --- a/scripts/missions/windurst/8_2_The_Jester_Whod_be_King.lua +++ b/scripts/missions/windurst/8_2_The_Jester_Whod_be_King.lua @@ -19,6 +19,7 @@ local outerHorutotoID = zones[xi.zone.OUTER_HORUTOTO_RUINS] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WINDURST, xi.mission.id.windurst.THE_JESTER_WHOD_BE_KING) mission.reward = diff --git a/scripts/missions/windurst/9_1_Doll_of_the_Dead.lua b/scripts/missions/windurst/9_1_Doll_of_the_Dead.lua index f25468313c6..adb472d96e3 100644 --- a/scripts/missions/windurst/9_1_Doll_of_the_Dead.lua +++ b/scripts/missions/windurst/9_1_Doll_of_the_Dead.lua @@ -15,6 +15,7 @@ local boyahdaTreeID = zones[xi.zone.THE_BOYAHDA_TREE] local windurstWoodsID = zones[xi.zone.WINDURST_WOODS] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WINDURST, xi.mission.id.windurst.DOLL_OF_THE_DEAD) mission.reward = diff --git a/scripts/missions/windurst/9_2_Moon_Reading.lua b/scripts/missions/windurst/9_2_Moon_Reading.lua index 24f8017794e..95d6e06dfd3 100644 --- a/scripts/missions/windurst/9_2_Moon_Reading.lua +++ b/scripts/missions/windurst/9_2_Moon_Reading.lua @@ -14,6 +14,7 @@ local heavensTowerID = zones[xi.zone.HEAVENS_TOWER] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WINDURST, xi.mission.id.windurst.MOON_READING) mission.reward = diff --git a/scripts/missions/wotg/01_Cavernous_Maws.lua b/scripts/missions/wotg/01_Cavernous_Maws.lua index 40f5d50bc29..fbe39b13eb3 100644 --- a/scripts/missions/wotg/01_Cavernous_Maws.lua +++ b/scripts/missions/wotg/01_Cavernous_Maws.lua @@ -9,6 +9,7 @@ -- Sauromugue Champaign : !pos 369 8 -227 120 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WOTG, xi.mission.id.wotg.CAVERNOUS_MAWS) mission.reward = diff --git a/scripts/missions/wotg/02_Back_to_the_Beginning.lua b/scripts/missions/wotg/02_Back_to_the_Beginning.lua index 335af2c3d02..0c2ec1412ee 100644 --- a/scripts/missions/wotg/02_Back_to_the_Beginning.lua +++ b/scripts/missions/wotg/02_Back_to_the_Beginning.lua @@ -15,6 +15,7 @@ -- Sauromugue Champaign [S] : !pos 369 8 -227 98 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WOTG, xi.mission.id.wotg.BACK_TO_THE_BEGINNING) mission.reward = diff --git a/scripts/missions/wotg/03_Cait_Sith.lua b/scripts/missions/wotg/03_Cait_Sith.lua index 454c0aa3337..cecee6180e6 100644 --- a/scripts/missions/wotg/03_Cait_Sith.lua +++ b/scripts/missions/wotg/03_Cait_Sith.lua @@ -12,6 +12,7 @@ require('scripts/missions/wotg/helpers') ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WOTG, xi.mission.id.wotg.CAIT_SITH) mission.reward = diff --git a/scripts/missions/wotg/04_The_Queen_of_the_Dance.lua b/scripts/missions/wotg/04_The_Queen_of_the_Dance.lua index 094e130f190..c66b1a551bf 100644 --- a/scripts/missions/wotg/04_The_Queen_of_the_Dance.lua +++ b/scripts/missions/wotg/04_The_Queen_of_the_Dance.lua @@ -9,6 +9,7 @@ require('scripts/missions/wotg/helpers') ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WOTG, xi.mission.id.wotg.THE_QUEEN_OF_THE_DANCE) mission.reward = diff --git a/scripts/missions/wotg/05_While_the_Cat_is_Away.lua b/scripts/missions/wotg/05_While_the_Cat_is_Away.lua index f53ef9fad7d..6bc390bc3a2 100644 --- a/scripts/missions/wotg/05_While_the_Cat_is_Away.lua +++ b/scripts/missions/wotg/05_While_the_Cat_is_Away.lua @@ -7,6 +7,7 @@ -- EAST_RONFAURE_S : !zone 81 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WOTG, xi.mission.id.wotg.WHILE_THE_CAT_IS_AWAY) mission.reward = diff --git a/scripts/missions/wotg/06_A_Timeswept_Butterfly.lua b/scripts/missions/wotg/06_A_Timeswept_Butterfly.lua index dbaa324d6f2..a9cde5897fb 100644 --- a/scripts/missions/wotg/06_A_Timeswept_Butterfly.lua +++ b/scripts/missions/wotg/06_A_Timeswept_Butterfly.lua @@ -7,6 +7,7 @@ -- LA_VAULE_S : !zone 85 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WOTG, xi.mission.id.wotg.A_TIMESWEPT_BUTTERFLY) mission.reward = diff --git a/scripts/missions/wotg/07_Purple_The_New_Black.lua b/scripts/missions/wotg/07_Purple_The_New_Black.lua index 3f0f2d443c2..d973327eb5d 100644 --- a/scripts/missions/wotg/07_Purple_The_New_Black.lua +++ b/scripts/missions/wotg/07_Purple_The_New_Black.lua @@ -8,6 +8,7 @@ -- _2d1 (Reinforced Gateway) : !pos -114.386 -3.599 -179.804 85 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WOTG, xi.mission.id.wotg.PURPLE_THE_NEW_BLACK) mission.reward = diff --git a/scripts/missions/wotg/08_In_the_Name_of_the_Father.lua b/scripts/missions/wotg/08_In_the_Name_of_the_Father.lua index 30648954c75..686eff6a8bc 100644 --- a/scripts/missions/wotg/08_In_the_Name_of_the_Father.lua +++ b/scripts/missions/wotg/08_In_the_Name_of_the_Father.lua @@ -11,6 +11,7 @@ require('scripts/missions/wotg/helpers') ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WOTG, xi.mission.id.wotg.IN_THE_NAME_OF_THE_FATHER) mission.reward = diff --git a/scripts/missions/wotg/09_Dancers_in_Distress.lua b/scripts/missions/wotg/09_Dancers_in_Distress.lua index 0e4cbde48ea..d0b6c523605 100644 --- a/scripts/missions/wotg/09_Dancers_in_Distress.lua +++ b/scripts/missions/wotg/09_Dancers_in_Distress.lua @@ -13,6 +13,7 @@ local pastJugnerID = zones[xi.zone.JUGNER_FOREST_S] local sandoriaSID = zones[xi.zone.SOUTHERN_SAN_DORIA_S] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WOTG, xi.mission.id.wotg.DANCERS_IN_DISTRESS) mission.reward = diff --git a/scripts/missions/wotg/10_Daughter_of_a_Knight.lua b/scripts/missions/wotg/10_Daughter_of_a_Knight.lua index 4acecb8dfdf..64f6c668c86 100644 --- a/scripts/missions/wotg/10_Daughter_of_a_Knight.lua +++ b/scripts/missions/wotg/10_Daughter_of_a_Knight.lua @@ -12,6 +12,7 @@ local pastJugnerID = zones[xi.zone.JUGNER_FOREST_S] local presentJugnerID = zones[xi.zone.JUGNER_FOREST] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WOTG, xi.mission.id.wotg.DAUGHTER_OF_A_KNIGHT) mission.reward = diff --git a/scripts/missions/wotg/11_A_Spoonful_of_Sugar.lua b/scripts/missions/wotg/11_A_Spoonful_of_Sugar.lua index 6f71d504c93..a32f353f32c 100644 --- a/scripts/missions/wotg/11_A_Spoonful_of_Sugar.lua +++ b/scripts/missions/wotg/11_A_Spoonful_of_Sugar.lua @@ -6,6 +6,7 @@ -- Raustigne : !pos 3.979 -1.999 44.456 80 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WOTG, xi.mission.id.wotg.A_SPOONFUL_OF_SUGAR) mission.reward = diff --git a/scripts/missions/wotg/12_Affairs_of_State.lua b/scripts/missions/wotg/12_Affairs_of_State.lua index 9cdfe3c4635..26e41a53968 100644 --- a/scripts/missions/wotg/12_Affairs_of_State.lua +++ b/scripts/missions/wotg/12_Affairs_of_State.lua @@ -7,6 +7,7 @@ -- Radford : !pos -205.303 -8.000 26.874 87 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WOTG, xi.mission.id.wotg.AFFAIRS_OF_STATE) mission.reward = diff --git a/scripts/missions/wotg/13_Borne_by_the_Wind.lua b/scripts/missions/wotg/13_Borne_by_the_Wind.lua index 59092a29472..6f34ef6d5b8 100644 --- a/scripts/missions/wotg/13_Borne_by_the_Wind.lua +++ b/scripts/missions/wotg/13_Borne_by_the_Wind.lua @@ -6,6 +6,7 @@ -- Bulwark_Gate : !pos -447.174 -1.831 342.417 98 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WOTG, xi.mission.id.wotg.BORNE_BY_THE_WIND) mission.reward = diff --git a/scripts/missions/wotg/14_A_Nation_on_the_Brink.lua b/scripts/missions/wotg/14_A_Nation_on_the_Brink.lua index cad58587623..204a01e5c72 100644 --- a/scripts/missions/wotg/14_A_Nation_on_the_Brink.lua +++ b/scripts/missions/wotg/14_A_Nation_on_the_Brink.lua @@ -8,6 +8,7 @@ local pastSauromugueID = zones[xi.zone.SAUROMUGUE_CHAMPAIGN_S] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WOTG, xi.mission.id.wotg.A_NATION_ON_THE_BRINK) mission.reward = diff --git a/scripts/missions/wotg/15_Crossroads_of_Time.lua b/scripts/missions/wotg/15_Crossroads_of_Time.lua index e63b1217162..d367e28889e 100644 --- a/scripts/missions/wotg/15_Crossroads_of_Time.lua +++ b/scripts/missions/wotg/15_Crossroads_of_Time.lua @@ -9,6 +9,7 @@ require('scripts/missions/wotg/helpers') ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WOTG, xi.mission.id.wotg.CROSSROADS_OF_TIME) mission.reward = diff --git a/scripts/missions/wotg/16_Sandswept_Memories.lua b/scripts/missions/wotg/16_Sandswept_Memories.lua index d5cf21e142c..215c632394f 100644 --- a/scripts/missions/wotg/16_Sandswept_Memories.lua +++ b/scripts/missions/wotg/16_Sandswept_Memories.lua @@ -6,6 +6,7 @@ -- Lion Springs Door : !pos 96 0 106 80 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WOTG, xi.mission.id.wotg.SANDSWEPT_MEMORIES) mission.reward = diff --git a/scripts/missions/wotg/17_Northland_Exposure.lua b/scripts/missions/wotg/17_Northland_Exposure.lua index d9fa65b3da3..657f6ecc24d 100644 --- a/scripts/missions/wotg/17_Northland_Exposure.lua +++ b/scripts/missions/wotg/17_Northland_Exposure.lua @@ -6,6 +6,7 @@ -- BEAUCEDINE_GLACIER_S : !zone 136 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WOTG, xi.mission.id.wotg.NORTHLAND_EXPOSURE) mission.reward = diff --git a/scripts/missions/wotg/18_Traitor_in_the_Midst.lua b/scripts/missions/wotg/18_Traitor_in_the_Midst.lua index fe8eece05c0..d2db0af232f 100644 --- a/scripts/missions/wotg/18_Traitor_in_the_Midst.lua +++ b/scripts/missions/wotg/18_Traitor_in_the_Midst.lua @@ -11,6 +11,7 @@ -- Regal Pawprints (Naoi) : !pos 53.812 0.307 -299.136 136 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WOTG, xi.mission.id.wotg.TRAITOR_IN_THE_MIDST) mission.reward = diff --git a/scripts/missions/wotg/19_Betrayal_at_Beaucedine.lua b/scripts/missions/wotg/19_Betrayal_at_Beaucedine.lua index 7842e9eac36..4977f86e969 100644 --- a/scripts/missions/wotg/19_Betrayal_at_Beaucedine.lua +++ b/scripts/missions/wotg/19_Betrayal_at_Beaucedine.lua @@ -8,6 +8,7 @@ local pastBeaucedineID = zones[xi.zone.BEAUCEDINE_GLACIER_S] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WOTG, xi.mission.id.wotg.BETRAYAL_AT_BEAUCEDINE) mission.reward = diff --git a/scripts/missions/wotg/20_On_Thin_Ice.lua b/scripts/missions/wotg/20_On_Thin_Ice.lua index 87ff32863cc..495ee1bb12b 100644 --- a/scripts/missions/wotg/20_On_Thin_Ice.lua +++ b/scripts/missions/wotg/20_On_Thin_Ice.lua @@ -6,6 +6,7 @@ -- Raustigne : !pos 3.979 -1.999 44.456 80 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WOTG, xi.mission.id.wotg.ON_THIN_ICE) mission.reward = diff --git a/scripts/missions/wotg/21_Proof_of_Valor.lua b/scripts/missions/wotg/21_Proof_of_Valor.lua index 079d657727a..d5fcc42794d 100644 --- a/scripts/missions/wotg/21_Proof_of_Valor.lua +++ b/scripts/missions/wotg/21_Proof_of_Valor.lua @@ -8,6 +8,7 @@ local pastSandoriaID = zones[xi.zone.SOUTHERN_SAN_DORIA_S] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WOTG, xi.mission.id.wotg.PROOF_OF_VALOR) mission.reward = diff --git a/scripts/missions/wotg/22_A_Sanguinary_Prelude.lua b/scripts/missions/wotg/22_A_Sanguinary_Prelude.lua index 1db7e708887..59d5087e54b 100644 --- a/scripts/missions/wotg/22_A_Sanguinary_Prelude.lua +++ b/scripts/missions/wotg/22_A_Sanguinary_Prelude.lua @@ -5,6 +5,7 @@ -- !addmission 5 21 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WOTG, xi.mission.id.wotg.A_SANGUINARY_PRELUDE) mission.reward = diff --git a/scripts/missions/wotg/23_Dungeons_and_Dancers.lua b/scripts/missions/wotg/23_Dungeons_and_Dancers.lua index cc00be6852f..2bb9f924730 100644 --- a/scripts/missions/wotg/23_Dungeons_and_Dancers.lua +++ b/scripts/missions/wotg/23_Dungeons_and_Dancers.lua @@ -6,6 +6,7 @@ -- Regal Pawprints (G-9) : !pos -145.266 -61.851 -174.171 136 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WOTG, xi.mission.id.wotg.DUNGEONS_AND_DANCERS) mission.reward = diff --git a/scripts/missions/wotg/24_Distorter_of_Time.lua b/scripts/missions/wotg/24_Distorter_of_Time.lua index b48fa261c39..e90bd10b58b 100644 --- a/scripts/missions/wotg/24_Distorter_of_Time.lua +++ b/scripts/missions/wotg/24_Distorter_of_Time.lua @@ -6,6 +6,7 @@ -- Regal Pawprints (9) : !pos 54.437 -41.904 104.974 136 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WOTG, xi.mission.id.wotg.DISTORTER_OF_TIME) mission.reward = diff --git a/scripts/missions/wotg/25_The_Will_of_the_World.lua b/scripts/missions/wotg/25_The_Will_of_the_World.lua index 330c3490309..15839e70fb5 100644 --- a/scripts/missions/wotg/25_The_Will_of_the_World.lua +++ b/scripts/missions/wotg/25_The_Will_of_the_World.lua @@ -6,6 +6,7 @@ -- Raustigne : !pos 3.979 -1.999 44.456 80 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WOTG, xi.mission.id.wotg.THE_WILL_OF_THE_WORLD) mission.reward = diff --git a/scripts/missions/wotg/26_Fate_in_Haze.lua b/scripts/missions/wotg/26_Fate_in_Haze.lua index bf9dc328461..fa35e0d7316 100644 --- a/scripts/missions/wotg/26_Fate_in_Haze.lua +++ b/scripts/missions/wotg/26_Fate_in_Haze.lua @@ -8,6 +8,7 @@ require('scripts/missions/wotg/helpers') ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WOTG, xi.mission.id.wotg.FATE_IN_HAZE) mission.reward = diff --git a/scripts/missions/wotg/27_The_Scent_of_Battle.lua b/scripts/missions/wotg/27_The_Scent_of_Battle.lua index 65b3c5e62c1..f223f57e204 100644 --- a/scripts/missions/wotg/27_The_Scent_of_Battle.lua +++ b/scripts/missions/wotg/27_The_Scent_of_Battle.lua @@ -6,6 +6,7 @@ -- Bulwark Gate : !pos -447.174 -1.831 342.417 98 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WOTG, xi.mission.id.wotg.THE_SCENT_OF_BATTLE) mission.reward = diff --git a/scripts/missions/wotg/28_Another_World.lua b/scripts/missions/wotg/28_Another_World.lua index d06b557ab89..557b519fb8c 100644 --- a/scripts/missions/wotg/28_Another_World.lua +++ b/scripts/missions/wotg/28_Another_World.lua @@ -6,6 +6,7 @@ -- Halver : !pos 2 0.1 0.1 233 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WOTG, xi.mission.id.wotg.ANOTHER_WORLD) mission.reward = diff --git a/scripts/missions/wotg/29_A_Hawk_in_Repose.lua b/scripts/missions/wotg/29_A_Hawk_in_Repose.lua index 62c093e66e1..ca76af3be04 100644 --- a/scripts/missions/wotg/29_A_Hawk_in_Repose.lua +++ b/scripts/missions/wotg/29_A_Hawk_in_Repose.lua @@ -6,6 +6,7 @@ -- Weathered Gravestone : !pos 149.728 -5.109 -395.121 105 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WOTG, xi.mission.id.wotg.A_HAWK_IN_REPOSE) mission.reward = diff --git a/scripts/missions/wotg/30_The_Battle_of_Xarcabard.lua b/scripts/missions/wotg/30_The_Battle_of_Xarcabard.lua index a764f2d78eb..660ffd53940 100644 --- a/scripts/missions/wotg/30_The_Battle_of_Xarcabard.lua +++ b/scripts/missions/wotg/30_The_Battle_of_Xarcabard.lua @@ -6,6 +6,7 @@ -- Rally Point: Red : !pos -106.071 -25.5 -52.841 137 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WOTG, xi.mission.id.wotg.THE_BATTLE_OF_XARCABARD) mission.reward = diff --git a/scripts/missions/wotg/31_Prelude_to_a_Storm.lua b/scripts/missions/wotg/31_Prelude_to_a_Storm.lua index e7d953b3b9a..ef2c2702411 100644 --- a/scripts/missions/wotg/31_Prelude_to_a_Storm.lua +++ b/scripts/missions/wotg/31_Prelude_to_a_Storm.lua @@ -9,6 +9,7 @@ local pastXarcabardID = zones[xi.zone.XARCABARD_S] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WOTG, xi.mission.id.wotg.PRELUDE_TO_A_STORM) mission.reward = diff --git a/scripts/missions/wotg/32_Storms_Crescendo.lua b/scripts/missions/wotg/32_Storms_Crescendo.lua index 6f1c4634fc1..c26eb9d931c 100644 --- a/scripts/missions/wotg/32_Storms_Crescendo.lua +++ b/scripts/missions/wotg/32_Storms_Crescendo.lua @@ -8,6 +8,7 @@ local pastXarcabardID = zones[xi.zone.XARCABARD_S] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WOTG, xi.mission.id.wotg.STORMS_CRESCENDO) mission.reward = diff --git a/scripts/missions/wotg/33_Into_the_Beasts_Maw.lua b/scripts/missions/wotg/33_Into_the_Beasts_Maw.lua index 2f2741c2e4a..939638beed7 100644 --- a/scripts/missions/wotg/33_Into_the_Beasts_Maw.lua +++ b/scripts/missions/wotg/33_Into_the_Beasts_Maw.lua @@ -10,6 +10,7 @@ local pastBaileysID = zones[xi.zone.CASTLE_ZVAHL_BAILEYS_S] local pastXarcabardID = zones[xi.zone.XARCABARD_S] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WOTG, xi.mission.id.wotg.INTO_THE_BEASTS_MAW) mission.reward = diff --git a/scripts/missions/wotg/34_The_Hunter_Ensnared.lua b/scripts/missions/wotg/34_The_Hunter_Ensnared.lua index 49992b385c2..de4a9d6c8b7 100644 --- a/scripts/missions/wotg/34_The_Hunter_Ensnared.lua +++ b/scripts/missions/wotg/34_The_Hunter_Ensnared.lua @@ -6,6 +6,7 @@ -- Rally Point: Red : !pos -106.071 -25.5 -52.841 137 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WOTG, xi.mission.id.wotg.THE_HUNTER_ENSNARED) mission.reward = diff --git a/scripts/missions/wotg/35_Flight_of_the_Lion.lua b/scripts/missions/wotg/35_Flight_of_the_Lion.lua index 7e8da92f1e7..0cdd55dbcc4 100644 --- a/scripts/missions/wotg/35_Flight_of_the_Lion.lua +++ b/scripts/missions/wotg/35_Flight_of_the_Lion.lua @@ -6,6 +6,7 @@ -- Bulwark Gate : !pos -447.174 -1.831 342.417 98 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WOTG, xi.mission.id.wotg.FLIGHT_OF_THE_LION) mission.reward = diff --git a/scripts/missions/wotg/36_Fall_of_the_Hawk.lua b/scripts/missions/wotg/36_Fall_of_the_Hawk.lua index d4adf235774..231bb9e0908 100644 --- a/scripts/missions/wotg/36_Fall_of_the_Hawk.lua +++ b/scripts/missions/wotg/36_Fall_of_the_Hawk.lua @@ -5,6 +5,7 @@ -- !addmission 5 35 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WOTG, xi.mission.id.wotg.FALL_OF_THE_HAWK) mission.reward = diff --git a/scripts/missions/wotg/37_Darkness_Descends.lua b/scripts/missions/wotg/37_Darkness_Descends.lua index f4b679326d9..5f30b39a466 100644 --- a/scripts/missions/wotg/37_Darkness_Descends.lua +++ b/scripts/missions/wotg/37_Darkness_Descends.lua @@ -5,6 +5,7 @@ -- !addmission 5 36 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WOTG, xi.mission.id.wotg.DARKNESS_DESCENDS) mission.reward = diff --git a/scripts/missions/wotg/38_Adieu_Lilisette.lua b/scripts/missions/wotg/38_Adieu_Lilisette.lua index 4c5c991451a..7fe28c8158d 100644 --- a/scripts/missions/wotg/38_Adieu_Lilisette.lua +++ b/scripts/missions/wotg/38_Adieu_Lilisette.lua @@ -8,6 +8,7 @@ require('scripts/missions/wotg/helpers') ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WOTG, xi.mission.id.wotg.ADIEU_LILISETTE) mission.reward = diff --git a/scripts/missions/wotg/39_By_the_Fading_Light.lua b/scripts/missions/wotg/39_By_the_Fading_Light.lua index 9c6a1682372..aa777838984 100644 --- a/scripts/missions/wotg/39_By_the_Fading_Light.lua +++ b/scripts/missions/wotg/39_By_the_Fading_Light.lua @@ -8,6 +8,7 @@ require('scripts/missions/wotg/helpers') ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WOTG, xi.mission.id.wotg.BY_THE_FADING_LIGHT) mission.reward = diff --git a/scripts/missions/wotg/40_Edge_of_Existence.lua b/scripts/missions/wotg/40_Edge_of_Existence.lua index b93900a4137..7c839379b92 100644 --- a/scripts/missions/wotg/40_Edge_of_Existence.lua +++ b/scripts/missions/wotg/40_Edge_of_Existence.lua @@ -12,6 +12,7 @@ -- Sauromugue Champaign [S] : !pos 369 8 -227 98 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WOTG, xi.mission.id.wotg.EDGE_OF_EXISTENCE) mission.reward = diff --git a/scripts/missions/wotg/41_Her_Memories.lua b/scripts/missions/wotg/41_Her_Memories.lua index 8dc880202c4..6d54490b2de 100644 --- a/scripts/missions/wotg/41_Her_Memories.lua +++ b/scripts/missions/wotg/41_Her_Memories.lua @@ -5,6 +5,7 @@ -- !addmission 5 40 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WOTG, xi.mission.id.wotg.HER_MEMORIES) mission.reward = diff --git a/scripts/missions/wotg/42_Forget_Me_Not.lua b/scripts/missions/wotg/42_Forget_Me_Not.lua index 7b222788403..6f3a7cca1cf 100644 --- a/scripts/missions/wotg/42_Forget_Me_Not.lua +++ b/scripts/missions/wotg/42_Forget_Me_Not.lua @@ -14,6 +14,7 @@ require('scripts/missions/wotg/helpers') ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WOTG, xi.mission.id.wotg.FORGET_ME_NOT) mission.reward = diff --git a/scripts/missions/wotg/43_Pillar_of_Hope.lua b/scripts/missions/wotg/43_Pillar_of_Hope.lua index cafb00240d5..d9bae3b7c50 100644 --- a/scripts/missions/wotg/43_Pillar_of_Hope.lua +++ b/scripts/missions/wotg/43_Pillar_of_Hope.lua @@ -6,6 +6,7 @@ -- Veridical Conflux : !pos -142.279 -6.749 585.239 89 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WOTG, xi.mission.id.wotg.PILLAR_OF_HOPE) mission.reward = diff --git a/scripts/missions/wotg/44_Glimmer_of_Life.lua b/scripts/missions/wotg/44_Glimmer_of_Life.lua index 8651e539686..c8084166e16 100644 --- a/scripts/missions/wotg/44_Glimmer_of_Life.lua +++ b/scripts/missions/wotg/44_Glimmer_of_Life.lua @@ -6,6 +6,7 @@ -- Veridical Conflux : !pos -142.279 -6.749 585.239 89 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WOTG, xi.mission.id.wotg.GLIMMER_OF_LIFE) mission.reward = diff --git a/scripts/missions/wotg/45_Time_Slips_Away.lua b/scripts/missions/wotg/45_Time_Slips_Away.lua index ec36fdb881f..701dc8e0ce7 100644 --- a/scripts/missions/wotg/45_Time_Slips_Away.lua +++ b/scripts/missions/wotg/45_Time_Slips_Away.lua @@ -6,6 +6,7 @@ -- Veridical Conflux : !pos -142.279 -6.749 585.239 89 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WOTG, xi.mission.id.wotg.TIME_SLIPS_AWAY) mission.reward = diff --git a/scripts/missions/wotg/46_When_Wills_Collide.lua b/scripts/missions/wotg/46_When_Wills_Collide.lua index a92aaa8637b..0333db005e4 100644 --- a/scripts/missions/wotg/46_When_Wills_Collide.lua +++ b/scripts/missions/wotg/46_When_Wills_Collide.lua @@ -6,6 +6,7 @@ -- Veridical Conflux : !pos -142.279 -6.749 585.239 89 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WOTG, xi.mission.id.wotg.WHEN_WILLS_COLLIDE) mission.reward = diff --git a/scripts/missions/wotg/47_Whispers_of_Dawn.lua b/scripts/missions/wotg/47_Whispers_of_Dawn.lua index e75e74625df..b4157b7b334 100644 --- a/scripts/missions/wotg/47_Whispers_of_Dawn.lua +++ b/scripts/missions/wotg/47_Whispers_of_Dawn.lua @@ -6,6 +6,7 @@ -- Veridical Conflux : !pos -142.279 -6.749 585.239 89 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WOTG, xi.mission.id.wotg.WHISPERS_OF_DAWN) mission.reward = diff --git a/scripts/missions/wotg/48_A_Dreamy_Interlude.lua b/scripts/missions/wotg/48_A_Dreamy_Interlude.lua index 74f690533cc..96cb45a041a 100644 --- a/scripts/missions/wotg/48_A_Dreamy_Interlude.lua +++ b/scripts/missions/wotg/48_A_Dreamy_Interlude.lua @@ -6,6 +6,7 @@ -- Veridical Conflux : !pos -142.279 -6.749 585.239 89 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WOTG, xi.mission.id.wotg.A_DREAMY_INTERLUDE) mission.reward = diff --git a/scripts/missions/wotg/49_Cait_in_the_Woods.lua b/scripts/missions/wotg/49_Cait_in_the_Woods.lua index e6ae6bad54c..405aaca58ec 100644 --- a/scripts/missions/wotg/49_Cait_in_the_Woods.lua +++ b/scripts/missions/wotg/49_Cait_in_the_Woods.lua @@ -6,6 +6,7 @@ -- Blank (Cait Sith) : !pos 221.857 -49.213 176.24 81 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WOTG, xi.mission.id.wotg.CAIT_IN_THE_WOODS) mission.reward = diff --git a/scripts/missions/wotg/50_Fork_in_the_Road.lua b/scripts/missions/wotg/50_Fork_in_the_Road.lua index 4998f1e70df..8a509fa6c15 100644 --- a/scripts/missions/wotg/50_Fork_in_the_Road.lua +++ b/scripts/missions/wotg/50_Fork_in_the_Road.lua @@ -12,6 +12,7 @@ -- Walk of Echoes : !pos -702.325 0.399 -481.664 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WOTG, xi.mission.id.wotg.FORK_IN_THE_ROAD) mission.reward = diff --git a/scripts/missions/wotg/51_Maiden_of_the_Dusk.lua b/scripts/missions/wotg/51_Maiden_of_the_Dusk.lua index f48491bbe4c..a862345dd57 100644 --- a/scripts/missions/wotg/51_Maiden_of_the_Dusk.lua +++ b/scripts/missions/wotg/51_Maiden_of_the_Dusk.lua @@ -7,6 +7,7 @@ -- Ornate Door : !pos -700 -20.25 -303.398 89 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WOTG, xi.mission.id.wotg.MAIDEN_OF_THE_DUSK) mission.reward = @@ -78,24 +79,21 @@ mission.sections = end, }, - onZoneIn = - { - function(player, prevZone) - local missionStatus = mission:getVar(player, 'Status') - - if missionStatus == 1 then - return 4 - elseif missionStatus == 4 then - return 6 - elseif missionStatus == 5 then - return 7 - elseif missionStatus == 6 then - return 8 - elseif missionStatus == 7 then - return 9 - end - end, - }, + onZoneIn = function(player, prevZone) + local missionStatus = mission:getVar(player, 'Status') + + if missionStatus == 1 then + return 4 + elseif missionStatus == 4 then + return 6 + elseif missionStatus == 5 then + return 7 + elseif missionStatus == 6 then + return 8 + elseif missionStatus == 7 then + return 9 + end + end, onEventUpdate = { diff --git a/scripts/missions/wotg/52_Where_It_All_Began.lua b/scripts/missions/wotg/52_Where_It_All_Began.lua index a10de5b3916..906bc92aeb0 100644 --- a/scripts/missions/wotg/52_Where_It_All_Began.lua +++ b/scripts/missions/wotg/52_Where_It_All_Began.lua @@ -6,6 +6,7 @@ -- Lion Springs Door : !pos 96 0 106 80 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WOTG, xi.mission.id.wotg.WHERE_IT_ALL_BEGAN) mission.reward = diff --git a/scripts/missions/wotg/53_Token_of_Troth.lua b/scripts/missions/wotg/53_Token_of_Troth.lua index f769042d475..19a744b2c45 100644 --- a/scripts/missions/wotg/53_Token_of_Troth.lua +++ b/scripts/missions/wotg/53_Token_of_Troth.lua @@ -6,6 +6,7 @@ -- Bulwark Gate : !pos -447.174 -1.831 342.417 98 ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WOTG, xi.mission.id.wotg.A_TOKEN_OF_TROTH) mission.reward = diff --git a/scripts/missions/wotg/54_Lest_We_Forget.lua b/scripts/missions/wotg/54_Lest_We_Forget.lua index 4e71d040cb1..67f1c0033d5 100644 --- a/scripts/missions/wotg/54_Lest_We_Forget.lua +++ b/scripts/missions/wotg/54_Lest_We_Forget.lua @@ -8,6 +8,7 @@ local graubergID = zones[xi.zone.GRAUBERG_S] ----------------------------------- +---@type TMission local mission = Mission:new(xi.mission.log_id.WOTG, xi.mission.id.wotg.LEST_WE_FORGET) mission.reward = {} From 61f9a405590195fa1c1661dc262bdd4618f61452 Mon Sep 17 00:00:00 2001 From: claywar Date: Sat, 7 Sep 2024 08:42:31 -0400 Subject: [PATCH 2/3] [lls] Move quest definitions to generic Container, add TMission type Fix ordering for Container sections, correct overload break out remaining overload definitions --- scripts/globals/interaction/mission.lua | 26 ++++++++- scripts/globals/interaction/quest.lua | 6 +- scripts/specs/core/CBaseEntity.lua | 58 ++++++++++++++++--- .../specs/types/{Quest.lua => Container.lua} | 22 +++---- 4 files changed, 87 insertions(+), 25 deletions(-) rename scripts/specs/types/{Quest.lua => Container.lua} (80%) diff --git a/scripts/globals/interaction/mission.lua b/scripts/globals/interaction/mission.lua index aa19ba82070..f65744f238e 100644 --- a/scripts/globals/interaction/mission.lua +++ b/scripts/globals/interaction/mission.lua @@ -3,18 +3,27 @@ ----------------------------------- require('scripts/globals/interaction/container') ----------------------------------- - +---@see TInteractionContainer +---@class TMission : TInteractionContainer +---@field areaId integer +---@field missionId integer Mission = setmetatable({ areaId = -1 }, { __index = Container }) Mission.__index = Mission ----@diagnostic disable-next-line: duplicate-set-field Mission.__eq = function(m1, m2) return m1.areaId == m2.areaId and m1.missionId == m2.missionId end +---@type rewardParam Mission.reward = {} ----@diagnostic disable-next-line: duplicate-set-field +---@type TMissionSection[] +Mission.sections = {} + +---@nodiscard +---@param areaId integer +---@param missionId integer +---@return TMission function Mission:new(areaId, missionId) local obj = Container:new(Mission.getVarPrefix(areaId, missionId)) setmetatable(obj, self) @@ -23,10 +32,17 @@ function Mission:new(areaId, missionId) return obj end +---@nodiscard +---@param areaId integer +---@param missionId integer +---@return string function Mission.getVarPrefix(areaId, missionId) return string.format('Mission[%d][%d]', areaId, missionId) end +---@nodiscard +---@param player CBaseEntity +---@return table function Mission:getCheckArgs(player) return { player:getCurrentMission(self.areaId), player:getMissionStatus(self.areaId) } end @@ -35,10 +51,14 @@ end -- Mission operations ----------------------------------- +---@param player CBaseEntity +---@return nil function Mission:begin(player) player:addMission(self.areaId, self.missionId) end +---@param player CBaseEntity +---@return boolean function Mission:complete(player) local didComplete = npcUtil.completeMission(player, self.areaId, self.missionId, self.reward) if didComplete then diff --git a/scripts/globals/interaction/quest.lua b/scripts/globals/interaction/quest.lua index b8fef1b35f4..d6a4362127c 100644 --- a/scripts/globals/interaction/quest.lua +++ b/scripts/globals/interaction/quest.lua @@ -10,7 +10,6 @@ require('scripts/globals/interaction/container') Quest = setmetatable({ areaId = 0 }, { __index = Container }) Quest.__index = Quest ----@diagnostic disable-next-line: duplicate-set-field Quest.__eq = function(q1, q2) return q1.areaId == q2.areaId and q1.questId == q2.questId end @@ -21,6 +20,7 @@ Quest.reward = {} ---@type TQuestSection[] Quest.sections = {} +---@nodiscard ---@param areaId xi.questLog ---@param questId integer ---@return TQuest @@ -32,6 +32,7 @@ function Quest:new(areaId, questId) return obj end +---@nodiscard ---@param areaId xi.questLog ---@param questId integer ---@return string @@ -39,8 +40,9 @@ function Quest.getVarPrefix(areaId, questId) return string.format('Quest[%d][%d]', areaId, questId) end +---@nodiscard ---@param player CBaseEntity ----@return { [integer]: xi.questStatus } +---@return table function Quest:getCheckArgs(player) return { player:getQuestStatus(self.areaId, self.questId) } end diff --git a/scripts/specs/core/CBaseEntity.lua b/scripts/specs/core/CBaseEntity.lua index 7e9b25cc548..5b66d252c26 100644 --- a/scripts/specs/core/CBaseEntity.lua +++ b/scripts/specs/core/CBaseEntity.lua @@ -432,10 +432,14 @@ end ---@param arg1 number ---@param arg2 number ---@return nil ----@overload fun(arg0: table): nil function CBaseEntity:lookAt(arg0, arg1, arg2) end +---@param posTable table +---@return nil +function CBaseEntity:lookAt(posTable) +end + ---@param PLuaBaseEntity CBaseEntity ---@param nonGlobal boolean? ---@return nil @@ -492,11 +496,21 @@ end ---@param arg1 number ---@param arg2 number ---@return number ----@overload fun(arg0: table): number ----@overload fun(arg0: CBaseEntity): number function CBaseEntity:checkDistance(arg0, arg1, arg2) end +---@nodiscard +---@param posTable table +---@return number +function CBaseEntity:checkDistance(posTable) +end + +---@nodiscard +---@param targetEntity CBaseEntity +---@return number +function CBaseEntity:checkDistance(targetEntity) +end + ---@param milliseconds integer? ---@return nil function CBaseEntity:wait(milliseconds) @@ -620,10 +634,17 @@ end ---@param target CBaseEntity ---@param degrees integer? ---@return integer ----@overload fun(posX: number?, posY: number?, posZ: number?): integer function CBaseEntity:getWorldAngle(target, degrees) end +---@nodiscard +---@param posX number +---@param posY number +---@param posZ number +---@return integer +function CBaseEntity:getWorldAngle(posX, posY, posZ) +end + ---@nodiscard ---@param target CBaseEntity ---@return integer @@ -772,10 +793,14 @@ end ---@param rot integer? ---@param zoneId integer? ---@return nil ----@overload fun(arg0: table): nil function CBaseEntity:setPos(x, y, z, rot, zoneId) end +---@param posTable table +---@return nil +function CBaseEntity:setPos(posTable) +end + ---@return nil function CBaseEntity:warp() end @@ -933,10 +958,15 @@ end ---@param arg2 integer ---@param arg3 integer ---@return nil ----@overload fun(itemID: integer, rawPrice: number): nil function CBaseEntity:addShopItem(itemID, rawPrice, arg2, arg3) end +---@param itemID integer +---@param rawPrice number +---@return nil +function CBaseEntity:addShopItem(itemID, rawPrice) +end + ---@nodiscard ---@param guildID integer ---@return table @@ -2681,10 +2711,14 @@ end ---@param subPower integer? ---@param tier integer? ---@return boolean ----@overload fun(effectID: CStatusEffect): boolean function CBaseEntity:addStatusEffect(effectID, power, tick, duration, subType, subPower, tier) end +---@param effect CStatusEffect +---@return boolean +function CBaseEntity:addStatusEffect(effect) +end + -- NOTE: Currently this function allows for an optional last parameter at any position. This is represented -- in currently-used overloads, but should be standardized in the future and just pass 0-values. ---@param effectID integer @@ -3711,10 +3745,13 @@ end ---@param skillID integer ---@param PLuaBaseEntity CBaseEntity? ---@return nil ----@overload fun(): nil function CBaseEntity:useMobAbility(skillID, PLuaBaseEntity) end +---@return nil +function CBaseEntity:useMobAbility() +end + ---@nodiscard ---@param skillID integer ---@return number @@ -3728,10 +3765,13 @@ end ---@param PLuaBaseEntity CBaseEntity ---@return nil ----@overload fun(): nil function CBaseEntity:drawIn(PLuaBaseEntity) end +---@return nil +function CBaseEntity:drawIn() +end + ---@param level integer ---@return nil function CBaseEntity:weaknessTrigger(level) diff --git a/scripts/specs/types/Quest.lua b/scripts/specs/types/Container.lua similarity index 80% rename from scripts/specs/types/Quest.lua rename to scripts/specs/types/Container.lua index a945a06ac4d..951b309c328 100644 --- a/scripts/specs/types/Quest.lua +++ b/scripts/specs/types/Container.lua @@ -1,24 +1,15 @@ --- Supporting Class Definitions for Interaction Quests. TQuest definition --- is contained within scripts/globals/interaction/quest.lua - +-- Interaction Container definitions ---@meta --- Definitions for quest.sections{} ----@class TQuestSection ----@field check fun(player: CBaseEntity, status: xi.questStatus, vars: { [string]: integer }): boolean ----@field [xi.zone] ZoneSection - --- TODO: Below here, we can most likely be generic and reuse these definitions for Hidden Quests, Missions, --- and perhaps Battlefields as well ---@class ZoneSection ---@field onZoneIn? fun(player: CBaseEntity, prevZone: xi.zone): integer|table? ---@field onZoneOut? onZoneHandler ---@field afterZoneIn? onZoneHandler ----@field [string]? EntitySection|TAction|fun(player: CBaseEntity, npc: CBaseEntity): TAction? ---@field onEventUpdate? onEventHandler ---@field onEventFinish? onEventHandler ---@field onTriggerAreaEnter? onTriggerAreaHandler ---@field onTriggerAreaLeave? onTriggerAreaHandler +---@field [string]? EntitySection|TAction|fun(player: CBaseEntity, npc: CBaseEntity): TAction? ---@alias onZoneHandler fun(player: CBaseEntity): TAction? @@ -32,3 +23,12 @@ ---@class onEventHandler ---@field [integer] fun(player: CBaseEntity, csid: integer, option: integer, npc: CBaseEntity) + +-- Quest and Mission sections vary slightly based on their check function (below): +---@class TQuestSection +---@field check fun(player: CBaseEntity, status: xi.questStatus, vars: { [string]: integer }): boolean +---@field [xi.zone] ZoneSection + +---@class TMissionSection +---@field check fun(player: CBaseEntity, currentMission: integer, missionStatus: integer, vars: { [string]: integer }): boolean +---@field [xi.zone] ZoneSection From 6ff1fcd8bf9fcaa0a36aa66108f1d1a89662f55c Mon Sep 17 00:00:00 2001 From: claywar Date: Sat, 7 Sep 2024 08:48:07 -0400 Subject: [PATCH 3/3] Fix issues identified in mission scripts from annotations --- .../missions/amk/01_A_Moogle_Kupo_dEtat.lua | 20 +- .../02_Drenched_It_Began_with_a_Raindrop.lua | 14 +- .../amk/09_Rescue_A_Moogles_Labor_of_Love.lua | 5 +- .../missions/asa/01_A_Shantotto_Ascension.lua | 3 +- .../bastok/5_2_Xarcabard_Land_of_Truths.lua | 3 +- .../missions/cop/1_1_The_Rites_of_Life.lua | 16 +- .../missions/cop/2_1_An_Invitation_West.lua | 13 +- scripts/missions/cop/3_3_The_Road_Forks.lua | 15 +- scripts/missions/cop/8_3_When_Angels_Fall.lua | 13 +- scripts/missions/cop/8_4_Dawn.lua | 50 ++-- scripts/missions/rotz/01_The_New_Frontier.lua | 9 +- .../rotz/04_The_Temple_of_Uggalepih.lua | 21 +- .../rotz/08_Return_to_Delkfutts_Tower.lua | 31 +-- .../missions/rotz/13_The_Gate_of_the_Gods.lua | 9 +- .../missions/rotz/15_The_Sealed_Shrine.lua | 13 +- scripts/missions/rotz/17_Awakening.lua | 15 +- .../rov/1_01_Rhapsodies_of_Vanadiel.lua | 27 +- scripts/missions/rov/1_02_Resonance.lua | 18 +- .../missions/rov/1_10_Eddies_of_Despair_I.lua | 9 +- scripts/missions/rov/1_12_Fates_Call.lua | 31 +-- scripts/missions/rov/2_01_Spirits_Awoken.lua | 13 +- scripts/missions/rov/2_03_Call_to_Serve.lua | 49 ++-- .../missions/rov/2_05_Inescapable_Binds.lua | 9 +- scripts/missions/rov/2_06_Desert_Winds.lua | 9 +- scripts/missions/rov/2_07_Ever_Forward.lua | 23 +- scripts/missions/rov/2_12_Prime_Number.lua | 18 +- scripts/missions/rov/2_16_Ganged_Up_On.lua | 39 ++- scripts/missions/rov/2_17_Sacrifice.lua | 38 ++- scripts/missions/rov/2_18_Somber_Dreams.lua | 29 +- .../missions/rov/2_24_The_Cursed_Temple.lua | 25 +- .../sandoria/2_3_2_Journey_to_Windurst.lua | 13 +- .../sandoria/3_1_Infiltrate_Davoi.lua | 13 +- .../sandoria/3_2_The_Crystal_Spring.lua | 19 +- scripts/missions/sandoria/4_1_Magicite.lua | 13 +- .../sandoria/5_1_The_Ruins_of_FeiYin.lua | 32 +-- .../missions/sandoria/5_2_The_Shadow_Lord.lua | 3 +- .../missions/sandoria/8_1_Coming_of_Age.lua | 30 +- .../sandoria/9_2_The_Heir_to_the_Light.lua | 60 ++-- .../missions/soa/1_1_Rumors_from_the_West.lua | 51 ++-- .../missions/soa/1_3_Onward_to_Adoulin.lua | 9 +- .../1_4_Heartwings_and_the_Kindhearted.lua | 9 +- scripts/missions/soa/2_2_1_Ortharsyne.lua | 9 +- .../missions/soa/2_4_0_Honor_and_Audacity.lua | 9 +- .../soa/2_5_2_For_Whom_Do_We_Toil.lua | 13 +- .../missions/soa/2_7_1_Behind_the_Sluices.lua | 9 +- .../soa/3_2_0_The_Princesss_Dilemma.lua | 9 +- .../soa/3_2_2_The_Smallest_of_Favors.lua | 23 +- .../soa/3_3_0_Summoned_by_Spirits.lua | 9 +- .../soa/3_4_3_The_Orders_Treasures.lua | 9 +- .../missions/soa/3_6_0_Drifting_Northwest.lua | 9 +- .../3_6_1_Kumhau_the_Flashfrost_Naakual.lua | 26 +- scripts/missions/soa/3_6_2_Soul_Siphon.lua | 26 +- scripts/missions/soa/3_6_3_Stonewalled.lua | 13 +- .../missions/soa/4_2_0_Lighting_the_Way.lua | 26 +- scripts/missions/soa/4_2_1_Sajjaka.lua | 9 +- scripts/missions/soa/4_2_2_Studying_Up.lua | 26 +- scripts/missions/soa/4_2_3_A_Vow_of_Truth.lua | 9 +- scripts/missions/soa/4_3_0_The_Gates.lua | 13 +- scripts/missions/soa/4_3_1_Morimar.lua | 13 +- .../missions/soa/4_3_2_A_New_Force_Arises.lua | 46 ++-- .../missions/soa/4_3_5_A_Shrouded_Canopy.lua | 9 +- .../soa/4_4_0_Cries_from_the_Deep.lua | 13 +- .../soa/4_4_4_An_Emergency_Convocation.lua | 19 +- scripts/missions/soa/4_6_0_Balamors_Ruse.lua | 13 +- scripts/missions/soa/5_1_2_Heroes_Unite.lua | 26 +- .../missions/soa/5_2_0_Yggdrasil_Beckons.lua | 38 ++- .../soa/5_2_1_Returning_to_the_Trees.lua | 9 +- .../soa/5_2_2_The_Key_to_the_Turris.lua | 13 +- .../missions/soa/5_3_0_Teodors_Summons.lua | 13 +- scripts/missions/soa/5_3_2_Watery_Grave.lua | 42 ++- scripts/missions/soa/5_4_0_Reckoning.lua | 36 +-- scripts/missions/soa/5_4_1_Abomination.lua | 49 ++-- scripts/missions/soa/5_5_0_Undying_Light.lua | 36 +-- .../missions/soa/5_5_1_The_Light_Within.lua | 32 +-- scripts/missions/toau/15_The_Black_Coffin.lua | 48 ++-- scripts/missions/toau/20_Teahouse_Tumult.lua | 13 +- .../missions/toau/22_Shield_of_Diplomacy.lua | 13 +- .../toau/30_Prevalence_of_Pirates.lua | 19 +- .../missions/toau/31_Shades_of_Vengeance.lua | 13 +- .../missions/toau/34_Testing_the_Waters.lua | 13 +- .../missions/toau/36_Gaze_of_the_Saboteur.lua | 13 +- .../missions/toau/40_Unraveling_Reason.lua | 27 +- scripts/missions/toau/42_Path_of_Darkness.lua | 13 +- scripts/missions/toau/44_Nashmeiras_Plea.lua | 13 +- .../windurst/1_2_The_Heart_of_the_Matter.lua | 9 +- .../windurst/2_3_0_The_Three_Kingdoms.lua | 3 +- scripts/missions/windurst/4_1_Magicite.lua | 13 +- .../missions/windurst/5_1_The_Final_Seal.lua | 13 +- .../windurst/5_2_The_Shadow_Awaits.lua | 22 +- .../windurst/6_1_Full_Moon_Fountain.lua | 13 +- scripts/missions/windurst/8_1_Vain.lua | 260 +++++++----------- .../windurst/9_1_Doll_of_the_Dead.lua | 26 +- .../missions/windurst/9_2_Moon_Reading.lua | 32 +-- scripts/missions/wotg/03_Cait_Sith.lua | 13 +- .../wotg/04_The_Queen_of_the_Dance.lua | 21 +- .../wotg/05_While_the_Cat_is_Away.lua | 13 +- .../wotg/06_A_Timeswept_Butterfly.lua | 13 +- .../missions/wotg/07_Purple_The_New_Black.lua | 13 +- .../wotg/14_A_Nation_on_the_Brink.lua | 29 +- .../missions/wotg/15_Crossroads_of_Time.lua | 13 +- .../missions/wotg/17_Northland_Exposure.lua | 9 +- .../wotg/19_Betrayal_at_Beaucedine.lua | 19 +- scripts/missions/wotg/21_Proof_of_Valor.lua | 2 +- .../missions/wotg/22_A_Sanguinary_Prelude.lua | 9 +- .../missions/wotg/23_Dungeons_and_Dancers.lua | 13 +- .../missions/wotg/24_Distorter_of_Time.lua | 13 +- scripts/missions/wotg/26_Fate_in_Haze.lua | 19 +- scripts/missions/wotg/28_Another_World.lua | 13 +- .../wotg/30_The_Battle_of_Xarcabard.lua | 13 +- .../missions/wotg/31_Prelude_to_a_Storm.lua | 13 +- scripts/missions/wotg/32_Storms_Crescendo.lua | 21 +- .../missions/wotg/33_Into_the_Beasts_Maw.lua | 29 +- scripts/missions/wotg/36_Fall_of_the_Hawk.lua | 9 +- .../missions/wotg/37_Darkness_Descends.lua | 19 +- .../missions/wotg/46_When_Wills_Collide.lua | 13 +- scripts/missions/wotg/54_Lest_We_Forget.lua | 19 +- scripts/zones/Jugner_Forest/mobs/Fradubio.lua | 1 + 117 files changed, 986 insertions(+), 1432 deletions(-) diff --git a/scripts/missions/amk/01_A_Moogle_Kupo_dEtat.lua b/scripts/missions/amk/01_A_Moogle_Kupo_dEtat.lua index 68b48f6e182..d8cc8fc4278 100644 --- a/scripts/missions/amk/01_A_Moogle_Kupo_dEtat.lua +++ b/scripts/missions/amk/01_A_Moogle_Kupo_dEtat.lua @@ -15,16 +15,18 @@ mission.reward = -- Since there are so many zones with interactions: -- Populate each by hand mission.sections = {} -mission.sections[1] = {} -- REMEMBER: Lua is 1-indexed! - -mission.sections[1].check = function(player, currentMission, missionStatus, vars) - return currentMission == mission.missionId and - xi.settings.main.ENABLE_AMK == 1 and - xi.moghouse.isInMogHouseInHomeNation(player) and - player:getMainLvl() >= 10 and - player:getCharVar('HQuest[moghouseExpo]notSeen') == 0 -end +mission.sections[1] = -- REMEMBER: Lua is 1-indexed! +{ + check = function(player, currentMission, missionStatus, vars) + return currentMission == mission.missionId and + xi.settings.main.ENABLE_AMK == 1 and + xi.moghouse.isInMogHouseInHomeNation(player) and + player:getMainLvl() >= 10 and + player:getCharVar('HQuest[moghouseExpo]notSeen') == 0 + end, +} +---@type ZoneSection local moogleTriggerEvent = { -- TODO: Does there need to be onZoneIn here? diff --git a/scripts/missions/amk/02_Drenched_It_Began_with_a_Raindrop.lua b/scripts/missions/amk/02_Drenched_It_Began_with_a_Raindrop.lua index 7dad50b2fee..7fde622c6cb 100644 --- a/scripts/missions/amk/02_Drenched_It_Began_with_a_Raindrop.lua +++ b/scripts/missions/amk/02_Drenched_It_Began_with_a_Raindrop.lua @@ -18,13 +18,15 @@ mission.reward = -- Since there are so many zones with interactions: -- Populate each by hand mission.sections = {} -mission.sections[1] = {} -- REMEMBER: Lua is 1-indexed! - -mission.sections[1].check = function(player, currentMission, missionStatus, vars) - return currentMission == mission.missionId and - xi.moghouse.isInMogHouseInHomeNation(player) -end +mission.sections[1] = -- REMEMBER: Lua is 1-indexed! +{ + check = function(player, currentMission, missionStatus, vars) + return currentMission == mission.missionId and + xi.moghouse.isInMogHouseInHomeNation(player) + end, +} +---@type ZoneSection local moogleTriggerEvent = { ['Moogle'] = diff --git a/scripts/missions/amk/09_Rescue_A_Moogles_Labor_of_Love.lua b/scripts/missions/amk/09_Rescue_A_Moogles_Labor_of_Love.lua index d8284b9a0cd..a5f8bac8e4b 100644 --- a/scripts/missions/amk/09_Rescue_A_Moogles_Labor_of_Love.lua +++ b/scripts/missions/amk/09_Rescue_A_Moogles_Labor_of_Love.lua @@ -122,7 +122,8 @@ mission.sections = end -- Determine if QM triggered is in markerset - local keyItem = 0 + ---@type xi.keyItem + local keyItem for idx, markerIdIndex in ipairs(markerSets[amkMarkerSet]) do if npc:getID() == ID.npc.QM_AMK[markerIdIndex] then keyItem = xi.ki.STONE_OF_SURYA + idx - 1 @@ -130,7 +131,7 @@ mission.sections = end -- Give KI if QM is correct - if keyItem ~= 0 and not player:hasKeyItem(keyItem) then + if keyItem and not player:hasKeyItem(keyItem) then player:addKeyItem(keyItem) return mission:messageSpecial(ID.text.KEYITEM_OBTAINED, keyItem) end diff --git a/scripts/missions/asa/01_A_Shantotto_Ascension.lua b/scripts/missions/asa/01_A_Shantotto_Ascension.lua index 7ae21bbf070..912544546d1 100644 --- a/scripts/missions/asa/01_A_Shantotto_Ascension.lua +++ b/scripts/missions/asa/01_A_Shantotto_Ascension.lua @@ -36,7 +36,8 @@ mission.sections = onEventFinish = { [510] = function(player, csid, option, npc) - return mission:event(514) + -- TODO: This is most likely a pos change, followed by onZoneIn event + player:startEvent(514) end, [514] = function(player, csid, option, npc) diff --git a/scripts/missions/bastok/5_2_Xarcabard_Land_of_Truths.lua b/scripts/missions/bastok/5_2_Xarcabard_Land_of_Truths.lua index b8198d9596a..43cf4545af5 100644 --- a/scripts/missions/bastok/5_2_Xarcabard_Land_of_Truths.lua +++ b/scripts/missions/bastok/5_2_Xarcabard_Land_of_Truths.lua @@ -155,7 +155,8 @@ mission.sections = player:addMission(xi.mission.log_id.ZILART, xi.mission.id.zilart.THE_NEW_FRONTIER) end - return mission:progressEvent(7) + -- TODO: This is most likely a pos change followed by onZoneIn event + player:startEvent(7) end end, diff --git a/scripts/missions/cop/1_1_The_Rites_of_Life.lua b/scripts/missions/cop/1_1_The_Rites_of_Life.lua index 892583aa739..7acffef3412 100644 --- a/scripts/missions/cop/1_1_The_Rites_of_Life.lua +++ b/scripts/missions/cop/1_1_The_Rites_of_Life.lua @@ -36,20 +36,24 @@ mission.sections = onEventFinish = { + -- TODO: These are most likely a series of pos changes that trigger + -- onZoneIn events. In addition, set status vars after each one + -- so that on disconnect, it will resume at the latest state. This + -- pattern should also change in section 3 [22] = function(player, csid, option, npc) - return mission:event(36) + player:startEvent(36) end, [36] = function(player, csid, option, npc) - return mission:event(37) + player:startEvent(37) end, [37] = function(player, csid, option, npc) - return mission:event(38) + player:startEvent(38) end, [38] = function(player, csid, option, npc) - return mission:event(39) + player:startEvent(39) end, [39] = function(player, csid, option, npc) @@ -94,11 +98,11 @@ mission.sections = onEventFinish = { [10] = function(player, csid, option, npc) - return mission:event(206) + player:startEvent(206) end, [206] = function(player, csid, option, npc) - return mission:event(207) + player:startEvent(207) end, [207] = function(player, csid, option, npc) diff --git a/scripts/missions/cop/2_1_An_Invitation_West.lua b/scripts/missions/cop/2_1_An_Invitation_West.lua index e020f28d56f..1c12c2aecde 100644 --- a/scripts/missions/cop/2_1_An_Invitation_West.lua +++ b/scripts/missions/cop/2_1_An_Invitation_West.lua @@ -25,14 +25,11 @@ mission.sections = [xi.zone.LUFAISE_MEADOWS] = { - onZoneIn = - { - function(player, prevZone) - if mission:getVar(player, 'Status') == 0 then - return 110 - end - end, - }, + onZoneIn = function(player, prevZone) + if mission:getVar(player, 'Status') == 0 then + return 110 + end + end, onEventFinish = { diff --git a/scripts/missions/cop/3_3_The_Road_Forks.lua b/scripts/missions/cop/3_3_The_Road_Forks.lua index 3f10145a7e2..27850b124de 100644 --- a/scripts/missions/cop/3_3_The_Road_Forks.lua +++ b/scripts/missions/cop/3_3_The_Road_Forks.lua @@ -419,15 +419,12 @@ mission.sections = end, }, - onZoneOut = - { - function(player) - if player:hasKeyItem(xi.ki.MIMEO_JEWEL) then - player:messageSpecial(attohwaChasmID.text.MIMEO_JEWEL_OFFSET + 4) - player:delKeyItem(xi.ki.MIMEO_JEWEL) - end - end, - }, + onZoneOut = function(player) + if player:hasKeyItem(xi.ki.MIMEO_JEWEL) then + player:messageSpecial(attohwaChasmID.text.MIMEO_JEWEL_OFFSET + 4) + player:delKeyItem(xi.ki.MIMEO_JEWEL) + end + end, onEventFinish = { diff --git a/scripts/missions/cop/8_3_When_Angels_Fall.lua b/scripts/missions/cop/8_3_When_Angels_Fall.lua index 4ca6abb4751..c0d5cba35e0 100644 --- a/scripts/missions/cop/8_3_When_Angels_Fall.lua +++ b/scripts/missions/cop/8_3_When_Angels_Fall.lua @@ -171,14 +171,11 @@ mission.sections = [xi.zone.ALTAIEU] = { - onZoneIn = - { - function(player, prevZone) - if mission:getVar(player, 'Status') == 6 then - return 165 - end - end, - }, + onZoneIn = function(player, prevZone) + if mission:getVar(player, 'Status') == 6 then + return 165 + end + end, onEventFinish = { diff --git a/scripts/missions/cop/8_4_Dawn.lua b/scripts/missions/cop/8_4_Dawn.lua index b6ed1a289db..214df2a19f6 100644 --- a/scripts/missions/cop/8_4_Dawn.lua +++ b/scripts/missions/cop/8_4_Dawn.lua @@ -82,18 +82,15 @@ mission.sections = [xi.zone.EMPYREAL_PARADOX] = { - onZoneIn = - { - function(player, prevZone) - local missionStatus = mission:getVar(player, 'Status') + onZoneIn = function(player, prevZone) + local missionStatus = mission:getVar(player, 'Status') - if missionStatus == 2 then - return 6 - elseif missionStatus == 3 then - return 3 - end - end, - }, + if missionStatus == 2 then + return 6 + elseif missionStatus == 3 then + return 3 + end + end, ['TR_Entrance'] = { @@ -268,14 +265,11 @@ mission.sections = [xi.zone.ULEGUERAND_RANGE] = { - onZoneIn = - { - function(player, prevZone) - if mission:getVar(player, 'LProg') == 1 then - return 17 - end - end, - }, + onZoneIn = function(player, prevZone) + if mission:getVar(player, 'LProg') == 1 then + return 17 + end + end, onEventFinish = { @@ -358,12 +352,9 @@ mission.sections = [xi.zone.MHAURA] = { - onZoneIn = - { - function(player, prevZone) - return 322 - end, - }, + onZoneIn = function(player, prevZone) + return 322 + end, onEventFinish = { @@ -385,12 +376,9 @@ mission.sections = [xi.zone.OLDTON_MOVALPOLOS] = { - onZoneIn = - { - function(player, prevZone) - return 57 - end, - }, + onZoneIn = function(player, prevZone) + return 57 + end, onEventFinish = { diff --git a/scripts/missions/rotz/01_The_New_Frontier.lua b/scripts/missions/rotz/01_The_New_Frontier.lua index 35a82d098b8..9ae2302402a 100644 --- a/scripts/missions/rotz/01_The_New_Frontier.lua +++ b/scripts/missions/rotz/01_The_New_Frontier.lua @@ -27,12 +27,9 @@ mission.sections = [xi.zone.NORG] = { - onZoneIn = - { - function(player, prevZone) - return 1 - end, - }, + onZoneIn = function(player, prevZone) + return 1 + end, onEventFinish = { diff --git a/scripts/missions/rotz/04_The_Temple_of_Uggalepih.lua b/scripts/missions/rotz/04_The_Temple_of_Uggalepih.lua index 28ac37038d9..13cf5ad0d34 100644 --- a/scripts/missions/rotz/04_The_Temple_of_Uggalepih.lua +++ b/scripts/missions/rotz/04_The_Temple_of_Uggalepih.lua @@ -39,18 +39,15 @@ mission.sections = [xi.zone.SACRIFICIAL_CHAMBER] = { - onZoneIn = - { - function(player, prevZone) - local missionStatus = player:getMissionStatus(mission.areaId) - - if missionStatus == 1 then - return 7 - elseif missionStatus == 2 then - return 8 - end - end, - }, + onZoneIn = function(player, prevZone) + local missionStatus = player:getMissionStatus(mission.areaId) + + if missionStatus == 1 then + return 7 + elseif missionStatus == 2 then + return 8 + end + end, onEventUpdate = { diff --git a/scripts/missions/rotz/08_Return_to_Delkfutts_Tower.lua b/scripts/missions/rotz/08_Return_to_Delkfutts_Tower.lua index ad6ae13a43d..1e285dbe623 100644 --- a/scripts/missions/rotz/08_Return_to_Delkfutts_Tower.lua +++ b/scripts/missions/rotz/08_Return_to_Delkfutts_Tower.lua @@ -61,12 +61,9 @@ mission.sections = [xi.zone.LOWER_DELKFUTTS_TOWER] = { - onZoneIn = - { - function(player, prevZone) - return 15 - end, - }, + onZoneIn = function(player, prevZone) + return 15 + end, onEventFinish = { @@ -85,12 +82,9 @@ mission.sections = [xi.zone.STELLAR_FULCRUM] = { - onZoneIn = - { - function(player, prevZone) - return 0 - end, - }, + onZoneIn = function(player, prevZone) + return 0 + end, onEventUpdate = { @@ -118,14 +112,11 @@ mission.sections = [xi.zone.STELLAR_FULCRUM] = { - onZoneIn = - { - function(player, prevZone) - if player:getMissionStatus(mission.areaId) == 3 then - return 17 - end - end, - }, + onZoneIn = function(player, prevZone) + if player:getMissionStatus(mission.areaId) == 3 then + return 17 + end + end, onEventFinish = { diff --git a/scripts/missions/rotz/13_The_Gate_of_the_Gods.lua b/scripts/missions/rotz/13_The_Gate_of_the_Gods.lua index 1abe04e3b0a..cd5b2455872 100644 --- a/scripts/missions/rotz/13_The_Gate_of_the_Gods.lua +++ b/scripts/missions/rotz/13_The_Gate_of_the_Gods.lua @@ -24,12 +24,9 @@ mission.sections = [xi.zone.RUAUN_GARDENS] = { - onZoneIn = - { - function(player, prevZone) - return 51 - end, - }, + onZoneIn = function(player, prevZone) + return 51 + end, onEventFinish = { diff --git a/scripts/missions/rotz/15_The_Sealed_Shrine.lua b/scripts/missions/rotz/15_The_Sealed_Shrine.lua index 5f9655adf8d..6c59e507260 100644 --- a/scripts/missions/rotz/15_The_Sealed_Shrine.lua +++ b/scripts/missions/rotz/15_The_Sealed_Shrine.lua @@ -69,14 +69,11 @@ mission.sections = [xi.zone.THE_SHRINE_OF_RUAVITAU] = { - onZoneIn = - { - function(player, prevZone) - if player:getMissionStatus(mission.areaId) == 1 then - return 51 - end - end, - }, + onZoneIn = function(player, prevZone) + if player:getMissionStatus(mission.areaId) == 1 then + return 51 + end + end, onEventFinish = { diff --git a/scripts/missions/rotz/17_Awakening.lua b/scripts/missions/rotz/17_Awakening.lua index 2e0c6fadf89..508cc24523f 100644 --- a/scripts/missions/rotz/17_Awakening.lua +++ b/scripts/missions/rotz/17_Awakening.lua @@ -50,7 +50,7 @@ mission.sections = { ['_6tc'] = { - onTrigger = function(player, csid, option, npc) + onTrigger = function(player, npc) if not utils.mask.getBit(player:getMissionStatus(mission.areaId), 1) then return mission:event(20) end @@ -68,14 +68,11 @@ mission.sections = [xi.zone.NORG] = { - onZoneIn = - { - function(player, prevZone) - if not utils.mask.getBit(player:getMissionStatus(mission.areaId), 0) then - return 176 - end - end, - }, + onZoneIn = function(player, prevZone) + if not utils.mask.getBit(player:getMissionStatus(mission.areaId), 0) then + return 176 + end + end, onEventFinish = { diff --git a/scripts/missions/rov/1_01_Rhapsodies_of_Vanadiel.lua b/scripts/missions/rov/1_01_Rhapsodies_of_Vanadiel.lua index 74d3ed79d9a..cef3f19e0b7 100644 --- a/scripts/missions/rov/1_01_Rhapsodies_of_Vanadiel.lua +++ b/scripts/missions/rov/1_01_Rhapsodies_of_Vanadiel.lua @@ -29,23 +29,22 @@ local rovEntryZones = } mission.sections = {} -mission.sections[1] = {} - -mission.sections[1].check = function(player, currentMission, missionStatus, vars) - return currentMission == mission.missionId and - xi.settings.main.ENABLE_ROV == 1 and - player:getMainLvl() >= 3 and - not player:isInMogHouse() -end +mission.sections[1] = +{ + check = function(player, currentMission, missionStatus, vars) + return currentMission == mission.missionId and + xi.settings.main.ENABLE_ROV == 1 and + player:getMainLvl() >= 3 and + not player:isInMogHouse() + end, +} +---@type ZoneSection local rovZoneInEvent = { - onZoneIn = - { - function(player, prevZone) - return 30035 - end, - }, + onZoneIn = function(player, prevZone) + return 30035 + end, onEventFinish = { diff --git a/scripts/missions/rov/1_02_Resonance.lua b/scripts/missions/rov/1_02_Resonance.lua index c7f3c787867..fbb4e6867f1 100644 --- a/scripts/missions/rov/1_02_Resonance.lua +++ b/scripts/missions/rov/1_02_Resonance.lua @@ -22,12 +22,9 @@ mission.sections = [xi.zone.MHAURA] = { - onZoneIn = - { - function(player, prevZone) - return 368 - end, - }, + onZoneIn = function(player, prevZone) + return 368 + end, onEventFinish = { @@ -42,12 +39,9 @@ mission.sections = [xi.zone.SELBINA] = { - onZoneIn = - { - function(player, prevZone) - return 176 - end, - }, + onZoneIn = function(player, prevZone) + return 176 + end, onEventFinish = { diff --git a/scripts/missions/rov/1_10_Eddies_of_Despair_I.lua b/scripts/missions/rov/1_10_Eddies_of_Despair_I.lua index 48ed0a1fc47..14500ca965d 100644 --- a/scripts/missions/rov/1_10_Eddies_of_Despair_I.lua +++ b/scripts/missions/rov/1_10_Eddies_of_Despair_I.lua @@ -42,12 +42,9 @@ mission.sections = [xi.zone.ESCHA_ZITAH] = { - onZoneIn = - { - function(player, prevZone) - return 1 - end, - }, + onZoneIn = function(player, prevZone) + return 1 + end, onEventUpdate = { diff --git a/scripts/missions/rov/1_12_Fates_Call.lua b/scripts/missions/rov/1_12_Fates_Call.lua index c040aa112a5..cf5922e6a97 100644 --- a/scripts/missions/rov/1_12_Fates_Call.lua +++ b/scripts/missions/rov/1_12_Fates_Call.lua @@ -29,26 +29,25 @@ local rovEntryZones = } mission.sections = {} -mission.sections[1] = {} - -mission.sections[1].check = function(player, currentMission, missionStatus, vars) - local pNation = player:getNation() +mission.sections[1] = +{ + check = function(player, currentMission, missionStatus, vars) + local pNation = player:getNation() - return currentMission == mission.missionId and - ( - player:getRank(pNation) > 5 or - (player:getCurrentMission(pNation) == xi.mission.id.nation.SHADOW_LORD and player:getMissionStatus(pNation) >= 4) - ) -end + return currentMission == mission.missionId and + ( + player:getRank(pNation) > 5 or + (player:getCurrentMission(pNation) == xi.mission.id.nation.SHADOW_LORD and player:getMissionStatus(pNation) >= 4) + ) + end, +} +---@type ZoneSection local rovZoneInEvent = { - onZoneIn = - { - function(player, prevZone) - return 30036 - end, - }, + onZoneIn = function(player, prevZone) + return 30036 + end, onEventFinish = { diff --git a/scripts/missions/rov/2_01_Spirits_Awoken.lua b/scripts/missions/rov/2_01_Spirits_Awoken.lua index ae7de92e72e..16e475e52cd 100644 --- a/scripts/missions/rov/2_01_Spirits_Awoken.lua +++ b/scripts/missions/rov/2_01_Spirits_Awoken.lua @@ -22,14 +22,11 @@ mission.sections = [xi.zone.LOWER_DELKFUTTS_TOWER] = { - onZoneIn = - { - function(player, prevZone) - if prevZone == xi.zone.QUFIM_ISLAND then - return 51 - end - end, - }, + onZoneIn = function(player, prevZone) + if prevZone == xi.zone.QUFIM_ISLAND then + return 51 + end + end, onEventUpdate = { diff --git a/scripts/missions/rov/2_03_Call_to_Serve.lua b/scripts/missions/rov/2_03_Call_to_Serve.lua index 461367c14e6..94f64d31c42 100644 --- a/scripts/missions/rov/2_03_Call_to_Serve.lua +++ b/scripts/missions/rov/2_03_Call_to_Serve.lua @@ -37,35 +37,32 @@ mission.sections = end, }, - onZoneIn = - { - function(player, prevZone) - if - xi.rhapsodies.charactersAvailable(player) and - mission:getVar(player, 'Retrieve') == 0 - then - -- Note: Working with the assumption that there are four variable parameters for this mission, - -- the following observations have been made. The first parameter *does* have an impact on dialogue - -- however, it was not observed in caps (A 1-value makes Prishe sound at best more vulnerable). The - -- second parameter seems to align with having completed Darkness Named, which like previous events, - -- moves from a 0-value to 2. + onZoneIn = function(player, prevZone) + if + xi.rhapsodies.charactersAvailable(player) and + mission:getVar(player, 'Retrieve') == 0 + then + -- Note: Working with the assumption that there are four variable parameters for this mission, + -- the following observations have been made. The first parameter *does* have an impact on dialogue + -- however, it was not observed in caps (A 1-value makes Prishe sound at best more vulnerable). The + -- second parameter seems to align with having completed Darkness Named, which like previous events, + -- moves from a 0-value to 2. - -- Unknown ----------------------------. - -- Unknown -------------------------. | - -- CoP Progress ----------------. | | - -- Unknown -------------------. | | | - -- | | | | - -- Minimum Progress : 0, 0, 1, 1 - -- Darkness Named Completed : 0, 2, 1, 1 + -- Unknown ----------------------------. + -- Unknown -------------------------. | + -- CoP Progress ----------------. | | + -- Unknown -------------------. | | | + -- | | | | + -- Minimum Progress : 0, 0, 1, 1 + -- Darkness Named Completed : 0, 2, 1, 1 - -- Inferring the second parameter to the above scheme, and leaving the other three values as static. + -- Inferring the second parameter to the above scheme, and leaving the other three values as static. - return 399 - elseif mission:getVar(player, 'Status') == 0 then - return 402 - end - end, - }, + return 399 + elseif mission:getVar(player, 'Status') == 0 then + return 402 + end + end, onEventUpdate = { diff --git a/scripts/missions/rov/2_05_Inescapable_Binds.lua b/scripts/missions/rov/2_05_Inescapable_Binds.lua index b609d1578db..872d713b56c 100644 --- a/scripts/missions/rov/2_05_Inescapable_Binds.lua +++ b/scripts/missions/rov/2_05_Inescapable_Binds.lua @@ -31,12 +31,9 @@ mission.sections = [xi.zone.AHT_URHGAN_WHITEGATE] = { - onZoneIn = - { - function(player, prevZone) - return { 165, 0 } - end, - }, + onZoneIn = function(player, prevZone) + return { 165, 0 } + end, onEventUpdate = { diff --git a/scripts/missions/rov/2_06_Desert_Winds.lua b/scripts/missions/rov/2_06_Desert_Winds.lua index cf838adfef3..96158b6d75e 100644 --- a/scripts/missions/rov/2_06_Desert_Winds.lua +++ b/scripts/missions/rov/2_06_Desert_Winds.lua @@ -28,12 +28,9 @@ mission.sections = [xi.zone.AHT_URHGAN_WHITEGATE] = { - onZoneIn = - { - function(player, prevZone) - return { 165, 0 } - end, - }, + onZoneIn = function(player, prevZone) + return { 165, 0 } + end, onEventUpdate = { diff --git a/scripts/missions/rov/2_07_Ever_Forward.lua b/scripts/missions/rov/2_07_Ever_Forward.lua index c86a1f9fe52..20eb1c5d516 100644 --- a/scripts/missions/rov/2_07_Ever_Forward.lua +++ b/scripts/missions/rov/2_07_Ever_Forward.lua @@ -69,21 +69,20 @@ mission.sections = }, } -mission.sections[2] = {} - -mission.sections[2].check = function(player, currentMission, missionStatus, vars) - return currentMission == mission.missionId and - player:getCurrentMission(xi.mission.log_id.TOAU) >= xi.mission.id.toau.ROYAL_PUPPETEER -end +mission.sections[2] = +{ + check = function(player, currentMission, missionStatus, vars) + return currentMission == mission.missionId and + player:getCurrentMission(xi.mission.log_id.TOAU) >= xi.mission.id.toau.ROYAL_PUPPETEER + end, +} +---@type ZoneSection local rovZoneInEvent = { - onZoneIn = - { - function(player, prevZone) - return 30039 - end, - }, + onZoneIn = function(player, prevZone) + return 30039 + end, onEventFinish = { diff --git a/scripts/missions/rov/2_12_Prime_Number.lua b/scripts/missions/rov/2_12_Prime_Number.lua index fc8a975ddef..1bedeb85ac5 100644 --- a/scripts/missions/rov/2_12_Prime_Number.lua +++ b/scripts/missions/rov/2_12_Prime_Number.lua @@ -22,12 +22,9 @@ mission.sections = [xi.zone.ALZADAAL_UNDERSEA_RUINS] = { - onZoneIn = - { - function(player, prevZone) - return 124 - end, - }, + onZoneIn = function(player, prevZone) + return 124 + end, onEventFinish = { @@ -48,12 +45,9 @@ mission.sections = [xi.zone.THE_SHROUDED_MAW] = { - onZoneIn = - { - function(player, prevZone) - return 12 - end, - }, + onZoneIn = function(player, prevZone) + return 12 + end, onEventFinish = { diff --git a/scripts/missions/rov/2_16_Ganged_Up_On.lua b/scripts/missions/rov/2_16_Ganged_Up_On.lua index faae6104c00..f058e1e0d89 100644 --- a/scripts/missions/rov/2_16_Ganged_Up_On.lua +++ b/scripts/missions/rov/2_16_Ganged_Up_On.lua @@ -42,27 +42,24 @@ mission.sections = end, }, - onZoneIn = - { - function(player, prevZone) - if - xi.rhapsodies.charactersAvailable(player) and - mission:getVar(player, 'Status') == 0 - then - -- Lilisette is required for this event to occur, and was tested during repeat of - -- Where It All Began to reobtain Moonshade earring. There are two patterns of - -- parameters that were captured, with the known breakpoint of being above or below - -- WotG26 (Fate in Haze) - - -- WotG8 : 0, 0, 0, 0 - -- WotG26, WotG50 : 1, 1, 0, 0 - - return 183 - elseif mission:getVar(player, 'Option') == 0 then - return 185 - end - end, - }, + onZoneIn = function(player, prevZone) + if + xi.rhapsodies.charactersAvailable(player) and + mission:getVar(player, 'Status') == 0 + then + -- Lilisette is required for this event to occur, and was tested during repeat of + -- Where It All Began to reobtain Moonshade earring. There are two patterns of + -- parameters that were captured, with the known breakpoint of being above or below + -- WotG26 (Fate in Haze) + + -- WotG8 : 0, 0, 0, 0 + -- WotG26, WotG50 : 1, 1, 0, 0 + + return 183 + elseif mission:getVar(player, 'Option') == 0 then + return 185 + end + end, onEventUpdate = { diff --git a/scripts/missions/rov/2_17_Sacrifice.lua b/scripts/missions/rov/2_17_Sacrifice.lua index caa7df4a882..114ef8a91e4 100644 --- a/scripts/missions/rov/2_17_Sacrifice.lua +++ b/scripts/missions/rov/2_17_Sacrifice.lua @@ -54,21 +54,18 @@ mission.sections = end, }, - onZoneIn = - { - function(player, prevZone) - -- TODO: This event was observed with a character at minimum requirements for the mission, but not - -- seen while Fate in Haze was active, or WotG and additional quests completed. This may need to be - -- updated over time as more data becomes available. + onZoneIn = function(player, prevZone) + -- TODO: This event was observed with a character at minimum requirements for the mission, but not + -- seen while Fate in Haze was active, or WotG and additional quests completed. This may need to be + -- updated over time as more data becomes available. - if - player:getCurrentMission(xi.mission.log_id.WOTG) < xi.mission.id.wotg.FATE_IN_HAZE and - xi.rhapsodies.charactersAvailable(player) - then - return 26 - end - end, - }, + if + player:getCurrentMission(xi.mission.log_id.WOTG) < xi.mission.id.wotg.FATE_IN_HAZE and + xi.rhapsodies.charactersAvailable(player) + then + return 26 + end + end, onEventFinish = { @@ -85,14 +82,11 @@ mission.sections = [xi.zone.GRAUBERG_S] = { - onZoneIn = - { - function(player, prevZone) - if mission:getVar(player, 'Status') == 2 then - return 47 - end - end, - }, + onZoneIn = function(player, prevZone) + if mission:getVar(player, 'Status') == 2 then + return 47 + end + end, onEventFinish = { diff --git a/scripts/missions/rov/2_18_Somber_Dreams.lua b/scripts/missions/rov/2_18_Somber_Dreams.lua index fc4b93c09f1..8e2efbebf46 100644 --- a/scripts/missions/rov/2_18_Somber_Dreams.lua +++ b/scripts/missions/rov/2_18_Somber_Dreams.lua @@ -58,7 +58,7 @@ mission.sections = ['Cetus'] = { - onMobDeath = function(mob, player, isKiller, noKiller) + onMobDeath = function(mob, player, optParams) -- NOTE: Current Cetus implementation is set to level 150 until fully implemented. In addition, -- when this mob is implemented, there is a 15 minute (non-displayed) timer mechanice for fight -- length, and on failure, the player must zone prior to being able to pop again. Logging out @@ -85,21 +85,18 @@ mission.sections = [xi.zone.WALK_OF_ECHOES] = { - onZoneIn = - { - function(player, prevZone) - -- TODO: Find if there's a message displayed if not charactersAvailable. At this time, the event - -- will not trigger, and mission will not be completed. - - if - prevZone == xi.zone.GRAUBERG_S and - mission:getVar(player, 'Status') == 2 and - xi.rhapsodies.charactersAvailable(player) - then - return 28 - end - end, - }, + onZoneIn = function(player, prevZone) + -- TODO: Find if there's a message displayed if not charactersAvailable. At this time, the event + -- will not trigger, and mission will not be completed. + + if + prevZone == xi.zone.GRAUBERG_S and + mission:getVar(player, 'Status') == 2 and + xi.rhapsodies.charactersAvailable(player) + then + return 28 + end + end, onEventUpdate = { diff --git a/scripts/missions/rov/2_24_The_Cursed_Temple.lua b/scripts/missions/rov/2_24_The_Cursed_Temple.lua index 8f0ff574f4c..4609d7f5e6f 100644 --- a/scripts/missions/rov/2_24_The_Cursed_Temple.lua +++ b/scripts/missions/rov/2_24_The_Cursed_Temple.lua @@ -42,21 +42,18 @@ mission.sections = end, }, - onZoneIn = - { - function(player, prevZone) - -- NOTE: This event appears to only be played if the player has completed ZM4 prior to logging this mission. On - -- ZM4 complete, if this mission is active, the player will be moved to Wisdom of our Forefathers, where this - -- is not present. + onZoneIn = function(player, prevZone) + -- NOTE: This event appears to only be played if the player has completed ZM4 prior to logging this mission. On + -- ZM4 complete, if this mission is active, the player will be moved to Wisdom of our Forefathers, where this + -- is not present. - if - player:hasCompletedMission(xi.mission.log_id.ZILART, xi.mission.id.zilart.THE_TEMPLE_OF_UGGALEPIH) and - mission:getVar(player, 'Status') == 0 - then - return 93 - end - end, - }, + if + player:hasCompletedMission(xi.mission.log_id.ZILART, xi.mission.id.zilart.THE_TEMPLE_OF_UGGALEPIH) and + mission:getVar(player, 'Status') == 0 + then + return 93 + end + end, onEventFinish = { diff --git a/scripts/missions/sandoria/2_3_2_Journey_to_Windurst.lua b/scripts/missions/sandoria/2_3_2_Journey_to_Windurst.lua index c633f55eb66..469dcde36b3 100644 --- a/scripts/missions/sandoria/2_3_2_Journey_to_Windurst.lua +++ b/scripts/missions/sandoria/2_3_2_Journey_to_Windurst.lua @@ -66,14 +66,11 @@ mission.sections = end, }, - onZoneIn = - { - function(player, prevZone) - if player:getMissionStatus(mission.areaId) == 3 then - return 42 - end - end, - }, + onZoneIn = function(player, prevZone) + if player:getMissionStatus(mission.areaId) == 3 then + return 42 + end + end, onEventUpdate = { diff --git a/scripts/missions/sandoria/3_1_Infiltrate_Davoi.lua b/scripts/missions/sandoria/3_1_Infiltrate_Davoi.lua index 5b94cf64347..1ad638366ca 100644 --- a/scripts/missions/sandoria/3_1_Infiltrate_Davoi.lua +++ b/scripts/missions/sandoria/3_1_Infiltrate_Davoi.lua @@ -153,14 +153,11 @@ mission.sections = end, }, - onZoneIn = - { - function(player, prevZone) - if player:getMissionStatus(mission.areaId) == 2 then - return 116 - end - end, - }, + onZoneIn = function(player, prevZone) + if player:getMissionStatus(mission.areaId) == 2 then + return 116 + end + end, onEventFinish = { diff --git a/scripts/missions/sandoria/3_2_The_Crystal_Spring.lua b/scripts/missions/sandoria/3_2_The_Crystal_Spring.lua index c174890f61e..38202aa6137 100644 --- a/scripts/missions/sandoria/3_2_The_Crystal_Spring.lua +++ b/scripts/missions/sandoria/3_2_The_Crystal_Spring.lua @@ -69,17 +69,14 @@ mission.sections = end, }, - onZoneIn = - { - function(player, prevZone) - if - prevZone == xi.zone.NORTHERN_SAN_DORIA and - player:getMissionStatus(mission.areaId) == 2 - then - return 555 - end - end, - }, + onZoneIn = function(player, prevZone) + if + prevZone == xi.zone.NORTHERN_SAN_DORIA and + player:getMissionStatus(mission.areaId) == 2 + then + return 555 + end + end, onEventFinish = { diff --git a/scripts/missions/sandoria/4_1_Magicite.lua b/scripts/missions/sandoria/4_1_Magicite.lua index ad8f84a463c..cde24bd9b3b 100644 --- a/scripts/missions/sandoria/4_1_Magicite.lua +++ b/scripts/missions/sandoria/4_1_Magicite.lua @@ -322,14 +322,11 @@ mission.sections = end, }, - onZoneIn = - { - function(player, prevZone) - if mission:getVar(player, 'Option') == 2 then -- Fickbix CS - return 10000 - end - end, - }, + onZoneIn = function(player, prevZone) + if mission:getVar(player, 'Option') == 2 then -- Fickbix CS + return 10000 + end + end, onEventFinish = { diff --git a/scripts/missions/sandoria/5_1_The_Ruins_of_FeiYin.lua b/scripts/missions/sandoria/5_1_The_Ruins_of_FeiYin.lua index 6c4fec430db..3cd14cba9b0 100644 --- a/scripts/missions/sandoria/5_1_The_Ruins_of_FeiYin.lua +++ b/scripts/missions/sandoria/5_1_The_Ruins_of_FeiYin.lua @@ -98,17 +98,14 @@ mission.sections = end, }, - onZoneIn = - { - function(player, prevZone) - if - prevZone == xi.zone.NORTHERN_SAN_DORIA and - player:getMissionStatus(mission.areaId) == 0 - then - return 509 - end - end, - }, + onZoneIn = function(player, prevZone) + if + prevZone == xi.zone.NORTHERN_SAN_DORIA and + player:getMissionStatus(mission.areaId) == 0 + then + return 509 + end + end, onEventFinish = { @@ -159,14 +156,11 @@ mission.sections = [xi.zone.FEIYIN] = { - onZoneIn = - { - function(player, prevZone) - if player:getMissionStatus(mission.areaId) == 10 then - return 1 - end - end, - }, + onZoneIn = function(player, prevZone) + if player:getMissionStatus(mission.areaId) == 10 then + return 1 + end + end, onEventFinish = { diff --git a/scripts/missions/sandoria/5_2_The_Shadow_Lord.lua b/scripts/missions/sandoria/5_2_The_Shadow_Lord.lua index e863b2fd2a5..f8e54591ce8 100644 --- a/scripts/missions/sandoria/5_2_The_Shadow_Lord.lua +++ b/scripts/missions/sandoria/5_2_The_Shadow_Lord.lua @@ -137,7 +137,8 @@ mission.sections = player:addMission(xi.mission.log_id.ZILART, xi.mission.id.zilart.THE_NEW_FRONTIER) end - return mission:progressEvent(7) + -- TODO: This is most likely a pos change and onZoneIn + player:startEvent(7) end end, diff --git a/scripts/missions/sandoria/8_1_Coming_of_Age.lua b/scripts/missions/sandoria/8_1_Coming_of_Age.lua index 60134249f4b..f639b77caa6 100644 --- a/scripts/missions/sandoria/8_1_Coming_of_Age.lua +++ b/scripts/missions/sandoria/8_1_Coming_of_Age.lua @@ -79,14 +79,11 @@ mission.sections = end, }, - onZoneIn = - { - function(player, prevZone) - if player:getMissionStatus(mission.areaId) == 0 then - return 116 - end - end, - }, + onZoneIn = function(player, prevZone) + if player:getMissionStatus(mission.areaId) == 0 then + return 116 + end + end, onEventFinish = { @@ -183,17 +180,14 @@ mission.sections = { ['Grilau'] = mission:messageSpecial(northernSandoriaID.text.ORIGINAL_MISSION_OFFSET + 127):setPriority(1000), - onZoneIn = - { - function(player, prevZone) - if - mission:getVar(player, 'Progress') < os.time() and - not player:isInMogHouse() - then - return 16 - end + onZoneIn = function(player, prevZone) + if + mission:getVar(player, 'Progress') < os.time() and + not player:isInMogHouse() + then + return 16 end - }, + end, onEventFinish = { diff --git a/scripts/missions/sandoria/9_2_The_Heir_to_the_Light.lua b/scripts/missions/sandoria/9_2_The_Heir_to_the_Light.lua index 9d667cddf14..4e85bf915c0 100644 --- a/scripts/missions/sandoria/9_2_The_Heir_to_the_Light.lua +++ b/scripts/missions/sandoria/9_2_The_Heir_to_the_Light.lua @@ -126,7 +126,7 @@ mission.sections = elseif missionStatus > 5 then return mission:progressEvent(30) elseif missionStatus > 4 then - return mission:progressEvent(npc, chateauID.text.HEIR_TO_LIGHT_EXTRA) + return mission:messageText(chateauID.text.HEIR_TO_LIGHT_EXTRA) elseif missionStatus > 1 then return mission:progressEvent(29) end @@ -185,14 +185,11 @@ mission.sections = end, }, - onZoneIn = - { - function(player, prevZone) - if player:getMissionStatus(mission.areaId) == 1 then - return 10 - end - end, - }, + onZoneIn = function(player, prevZone) + if player:getMissionStatus(mission.areaId) == 1 then + return 10 + end + end, onEventFinish = { @@ -230,18 +227,15 @@ mission.sections = end, }, - onZoneIn = - { - function(player, prevZone) - local missionStatus = player:getMissionStatus(mission.areaId) + onZoneIn = function(player, prevZone) + local missionStatus = player:getMissionStatus(mission.areaId) - if missionStatus == 0 then - return 1 - elseif missionStatus == 4 then - return 0 - end - end, - }, + if missionStatus == 0 then + return 1 + elseif missionStatus == 4 then + return 0 + end + end, onEventFinish = { @@ -257,14 +251,11 @@ mission.sections = [xi.zone.FEIYIN] = { - onZoneIn = - { - function(player, prevZone) - if player:getMissionStatus(mission.areaId) == 2 then - return 23 - end - end, - }, + onZoneIn = function(player, prevZone) + if player:getMissionStatus(mission.areaId) == 2 then + return 23 + end + end, onEventFinish = { @@ -373,14 +364,11 @@ mission.sections = [xi.zone.SOUTHERN_SAN_DORIA] = { - onZoneIn = - { - function(player, prevZone) - if mission:getVar(player, 'Option') == 1 then - return 0 - end - end, - }, + onZoneIn = function(player, prevZone) + if mission:getVar(player, 'Option') == 1 then + return 0 + end + end, onEventFinish = { diff --git a/scripts/missions/soa/1_1_Rumors_from_the_West.lua b/scripts/missions/soa/1_1_Rumors_from_the_West.lua index ab0cf3c8932..f9299bc9739 100644 --- a/scripts/missions/soa/1_1_Rumors_from_the_West.lua +++ b/scripts/missions/soa/1_1_Rumors_from_the_West.lua @@ -78,16 +78,13 @@ mission.sections = -- Optional CS's [xi.zone.NORTHERN_SAN_DORIA] = { - onZoneIn = - { - function(player, prevZone) - local missionStatus = player:getMissionStatus(mission.areaId) - local seenCS = utils.mask.getBit(missionStatus, 0) - if not seenCS and not player:isInMogHouse() then - return 878 - end - end, - }, + onZoneIn = function(player, prevZone) + local missionStatus = player:getMissionStatus(mission.areaId) + local seenCS = utils.mask.getBit(missionStatus, 0) + if not seenCS and not player:isInMogHouse() then + return 878 + end + end, onEventFinish = { @@ -101,16 +98,13 @@ mission.sections = [xi.zone.BASTOK_MARKETS] = { - onZoneIn = - { - function(player, prevZone) - local missionStatus = player:getMissionStatus(mission.areaId) - local seenCS = utils.mask.getBit(missionStatus, 1) - if not seenCS and not player:isInMogHouse() then - return 22 - end - end, - }, + onZoneIn = function(player, prevZone) + local missionStatus = player:getMissionStatus(mission.areaId) + local seenCS = utils.mask.getBit(missionStatus, 1) + if not seenCS and not player:isInMogHouse() then + return 22 + end + end, onEventFinish = { @@ -124,16 +118,13 @@ mission.sections = [xi.zone.WINDURST_WOODS] = { - onZoneIn = - { - function(player, prevZone) - local missionStatus = player:getMissionStatus(mission.areaId) - local seenCS = utils.mask.getBit(missionStatus, 2) - if not seenCS and not player:isInMogHouse() then - return 839 - end - end, - }, + onZoneIn = function(player, prevZone) + local missionStatus = player:getMissionStatus(mission.areaId) + local seenCS = utils.mask.getBit(missionStatus, 2) + if not seenCS and not player:isInMogHouse() then + return 839 + end + end, onEventFinish = { diff --git a/scripts/missions/soa/1_3_Onward_to_Adoulin.lua b/scripts/missions/soa/1_3_Onward_to_Adoulin.lua index dfeec4f0253..5b3cce7bba5 100644 --- a/scripts/missions/soa/1_3_Onward_to_Adoulin.lua +++ b/scripts/missions/soa/1_3_Onward_to_Adoulin.lua @@ -51,12 +51,9 @@ mission.sections = [xi.zone.CEIZAK_BATTLEGROUNDS] = { - onZoneIn = - { - function(player, prevZone) - return 3 - end, - }, + onZoneIn = function(player, prevZone) + return 3 + end, onEventFinish = { diff --git a/scripts/missions/soa/1_4_Heartwings_and_the_Kindhearted.lua b/scripts/missions/soa/1_4_Heartwings_and_the_Kindhearted.lua index 063174ba916..fb5f71ff86f 100644 --- a/scripts/missions/soa/1_4_Heartwings_and_the_Kindhearted.lua +++ b/scripts/missions/soa/1_4_Heartwings_and_the_Kindhearted.lua @@ -23,12 +23,9 @@ mission.sections = [xi.zone.WESTERN_ADOULIN] = { - onZoneIn = - { - function(player, prevZone) - return 2 - end, - }, + onZoneIn = function(player, prevZone) + return 2 + end, onEventFinish = { diff --git a/scripts/missions/soa/2_2_1_Ortharsyne.lua b/scripts/missions/soa/2_2_1_Ortharsyne.lua index a08040e1595..74ffecf4f7a 100644 --- a/scripts/missions/soa/2_2_1_Ortharsyne.lua +++ b/scripts/missions/soa/2_2_1_Ortharsyne.lua @@ -23,12 +23,9 @@ mission.sections = [xi.zone.YORCIA_WEALD] = { - onZoneIn = - { - function(player, prevZone) - return 1 - end, - }, + onZoneIn = function(player, prevZone) + return 1 + end, onEventFinish = { diff --git a/scripts/missions/soa/2_4_0_Honor_and_Audacity.lua b/scripts/missions/soa/2_4_0_Honor_and_Audacity.lua index 3975daa76cd..f9df49ef99b 100644 --- a/scripts/missions/soa/2_4_0_Honor_and_Audacity.lua +++ b/scripts/missions/soa/2_4_0_Honor_and_Audacity.lua @@ -28,12 +28,9 @@ mission.sections = [xi.zone.RALA_WATERWAYS] = { - onZoneIn = - { - function(player, prevZone) - return 342 - end, - }, + onZoneIn = function(player, prevZone) + return 342 + end, onEventFinish = { diff --git a/scripts/missions/soa/2_5_2_For_Whom_Do_We_Toil.lua b/scripts/missions/soa/2_5_2_For_Whom_Do_We_Toil.lua index 9912e6218e0..dc295c2513a 100644 --- a/scripts/missions/soa/2_5_2_For_Whom_Do_We_Toil.lua +++ b/scripts/missions/soa/2_5_2_For_Whom_Do_We_Toil.lua @@ -48,14 +48,11 @@ mission.sections = end, }, - onZoneIn = - { - function(player, prevZone) - if player:getMissionStatus(mission.areaId) == 0 then - return 356 - end - end, - }, + onZoneIn = function(player, prevZone) + if player:getMissionStatus(mission.areaId) == 0 then + return 356 + end + end, onEventFinish = { diff --git a/scripts/missions/soa/2_7_1_Behind_the_Sluices.lua b/scripts/missions/soa/2_7_1_Behind_the_Sluices.lua index fe579f118e1..d644a76c15b 100644 --- a/scripts/missions/soa/2_7_1_Behind_the_Sluices.lua +++ b/scripts/missions/soa/2_7_1_Behind_the_Sluices.lua @@ -106,12 +106,9 @@ mission.sections = [xi.zone.RALA_WATERWAYS] = { - onZoneIn = - { - function(player, prevZone) - return 353 - end, - }, + onZoneIn = function(player, prevZone) + return 353 + end, onEventFinish = { diff --git a/scripts/missions/soa/3_2_0_The_Princesss_Dilemma.lua b/scripts/missions/soa/3_2_0_The_Princesss_Dilemma.lua index 4f138982620..dd1ffd5832b 100644 --- a/scripts/missions/soa/3_2_0_The_Princesss_Dilemma.lua +++ b/scripts/missions/soa/3_2_0_The_Princesss_Dilemma.lua @@ -28,12 +28,9 @@ mission.sections = [xi.zone.CELENNIA_MEMORIAL_LIBRARY] = { - onZoneIn = - { - function(player, prevZone) - return 2 - end, - }, + onZoneIn = function(player, prevZone) + return 2 + end, onEventUpdate = { diff --git a/scripts/missions/soa/3_2_2_The_Smallest_of_Favors.lua b/scripts/missions/soa/3_2_2_The_Smallest_of_Favors.lua index 5b17173b9c3..e5173b0f8a7 100644 --- a/scripts/missions/soa/3_2_2_The_Smallest_of_Favors.lua +++ b/scripts/missions/soa/3_2_2_The_Smallest_of_Favors.lua @@ -28,19 +28,16 @@ mission.sections = [xi.zone.CEIZAK_BATTLEGROUNDS] = { - onZoneIn = - { - function(player, prevZone) - -- TODO: Do not include Waypoint teleports to Ceizak - - if - prevZone == xi.zone.WESTERN_ADOULIN and - mission:getVar(player, 'Timer') <= VanadielUniqueDay() - then - return 20 - end - end, - }, + onZoneIn = function(player, prevZone) + -- TODO: Do not include Waypoint teleports to Ceizak + + if + prevZone == xi.zone.WESTERN_ADOULIN and + mission:getVar(player, 'Timer') <= VanadielUniqueDay() + then + return 20 + end + end, onEventFinish = { diff --git a/scripts/missions/soa/3_3_0_Summoned_by_Spirits.lua b/scripts/missions/soa/3_3_0_Summoned_by_Spirits.lua index 7d3156fe7f5..ce51b4d9398 100644 --- a/scripts/missions/soa/3_3_0_Summoned_by_Spirits.lua +++ b/scripts/missions/soa/3_3_0_Summoned_by_Spirits.lua @@ -28,12 +28,9 @@ mission.sections = [xi.zone.CELENNIA_MEMORIAL_LIBRARY] = { - onZoneIn = - { - function(player, prevZone) - return 3 - end, - }, + onZoneIn = function(player, prevZone) + return 3 + end, onEventFinish = { diff --git a/scripts/missions/soa/3_4_3_The_Orders_Treasures.lua b/scripts/missions/soa/3_4_3_The_Orders_Treasures.lua index e9fc744efed..65b454544d6 100644 --- a/scripts/missions/soa/3_4_3_The_Orders_Treasures.lua +++ b/scripts/missions/soa/3_4_3_The_Orders_Treasures.lua @@ -28,12 +28,9 @@ mission.sections = [xi.zone.CELENNIA_MEMORIAL_LIBRARY] = { - onZoneIn = - { - function(player, prevZone) - return 4 - end, - }, + onZoneIn = function(player, prevZone) + return 4 + end, onEventFinish = { diff --git a/scripts/missions/soa/3_6_0_Drifting_Northwest.lua b/scripts/missions/soa/3_6_0_Drifting_Northwest.lua index 8ea2ff7bf33..ba9d4078e3f 100644 --- a/scripts/missions/soa/3_6_0_Drifting_Northwest.lua +++ b/scripts/missions/soa/3_6_0_Drifting_Northwest.lua @@ -29,12 +29,9 @@ mission.sections = [xi.zone.KAMIHR_DRIFTS] = { - onZoneIn = - { - function(player, prevZone) - return 29 - end, - }, + onZoneIn = function(player, prevZone) + return 29 + end, onEventFinish = { diff --git a/scripts/missions/soa/3_6_1_Kumhau_the_Flashfrost_Naakual.lua b/scripts/missions/soa/3_6_1_Kumhau_the_Flashfrost_Naakual.lua index d76b9d7cf6a..f82d05c559e 100644 --- a/scripts/missions/soa/3_6_1_Kumhau_the_Flashfrost_Naakual.lua +++ b/scripts/missions/soa/3_6_1_Kumhau_the_Flashfrost_Naakual.lua @@ -47,14 +47,11 @@ mission.sections = { ['Crawling_Cave'] = mission:progressEvent(30), - onZoneIn = - { - function(player, prevZone) - if mission:getVar(player, 'Status') == 2 then - return 31 - end - end, - }, + onZoneIn = function(player, prevZone) + if mission:getVar(player, 'Status') == 2 then + return 31 + end + end, onEventFinish = { @@ -71,14 +68,11 @@ mission.sections = [xi.zone.CEIZAK_BATTLEGROUNDS] = { - onZoneIn = - { - function(player, prevZone) - if mission:getVar(player, 'Status') == 1 then - return 27 - end - end, - }, + onZoneIn = function(player, prevZone) + if mission:getVar(player, 'Status') == 1 then + return 27 + end + end, onEventUpdate = { diff --git a/scripts/missions/soa/3_6_2_Soul_Siphon.lua b/scripts/missions/soa/3_6_2_Soul_Siphon.lua index 6c9f316f969..4ec4550347f 100644 --- a/scripts/missions/soa/3_6_2_Soul_Siphon.lua +++ b/scripts/missions/soa/3_6_2_Soul_Siphon.lua @@ -30,14 +30,11 @@ mission.sections = { ['Hollowed_Pathway'] = mission:progressEvent(32), - onZoneIn = - { - function(player, prevZone) - if mission:getVar(player, 'Status') == 2 then - mission:complete(player) - end - end, - }, + onZoneIn = function(player, prevZone) + if mission:getVar(player, 'Status') == 2 then + mission:complete(player) + end + end, onEventFinish = { @@ -52,14 +49,11 @@ mission.sections = [xi.zone.CIRDAS_CAVERNS] = { - onZoneIn = - { - function(player, prevZone) - if mission:getVar(player, 'Status') == 1 then - return 29 - end - end, - }, + onZoneIn = function(player, prevZone) + if mission:getVar(player, 'Status') == 1 then + return 29 + end + end, onEventFinish = { diff --git a/scripts/missions/soa/3_6_3_Stonewalled.lua b/scripts/missions/soa/3_6_3_Stonewalled.lua index 2020307d4a8..72dee25437f 100644 --- a/scripts/missions/soa/3_6_3_Stonewalled.lua +++ b/scripts/missions/soa/3_6_3_Stonewalled.lua @@ -57,14 +57,11 @@ mission.sections = [xi.zone.CIRDAS_CAVERNS] = { - onZoneIn = - { - function(player, prevZone) - if mission:getVar(player, 'Status') == 1 then - return 30 - end - end, - }, + onZoneIn = function(player, prevZone) + if mission:getVar(player, 'Status') == 1 then + return 30 + end + end, onEventUpdate = { diff --git a/scripts/missions/soa/4_2_0_Lighting_the_Way.lua b/scripts/missions/soa/4_2_0_Lighting_the_Way.lua index 0f0e9bdc110..db2cb1e16f7 100644 --- a/scripts/missions/soa/4_2_0_Lighting_the_Way.lua +++ b/scripts/missions/soa/4_2_0_Lighting_the_Way.lua @@ -32,14 +32,11 @@ mission.sections = { ['Alpine_Trail'] = mission:progressEvent(44), - onZoneIn = - { - function(player, prevZone) - if mission:getVar(player, 'Status') == 2 then - mission:complete(player) - end - end, - }, + onZoneIn = function(player, prevZone) + if mission:getVar(player, 'Status') == 2 then + mission:complete(player) + end + end, onEventFinish = { @@ -54,14 +51,11 @@ mission.sections = [xi.zone.MOUNT_KAMIHR] = { - onZoneIn = - { - function(player, prevZone) - if mission:getVar(player, 'Status') == 1 then - return 1 - end - end, - }, + onZoneIn = function(player, prevZone) + if mission:getVar(player, 'Status') == 1 then + return 1 + end + end, onEventUpdate = { diff --git a/scripts/missions/soa/4_2_1_Sajjaka.lua b/scripts/missions/soa/4_2_1_Sajjaka.lua index 8a1a3886a78..b3aae229947 100644 --- a/scripts/missions/soa/4_2_1_Sajjaka.lua +++ b/scripts/missions/soa/4_2_1_Sajjaka.lua @@ -28,12 +28,9 @@ mission.sections = [xi.zone.CELENNIA_MEMORIAL_LIBRARY] = { - onZoneIn = - { - function(player, prevZone) - return 5 - end, - }, + onZoneIn = function(player, prevZone) + return 5 + end, onEventUpdate = { diff --git a/scripts/missions/soa/4_2_2_Studying_Up.lua b/scripts/missions/soa/4_2_2_Studying_Up.lua index 64ff9691d1b..6939f178993 100644 --- a/scripts/missions/soa/4_2_2_Studying_Up.lua +++ b/scripts/missions/soa/4_2_2_Studying_Up.lua @@ -31,14 +31,11 @@ mission.sections = { ['Alpine_Trail'] = mission:progressEvent(45), - onZoneIn = - { - function(player, prevZone) - if mission:getVar(player, 'Status') == 2 then - mission:complete(player) - end - end, - }, + onZoneIn = function(player, prevZone) + if mission:getVar(player, 'Status') == 2 then + mission:complete(player) + end + end, onEventFinish = { @@ -53,14 +50,11 @@ mission.sections = [xi.zone.MOUNT_KAMIHR] = { - onZoneIn = - { - function(player, prevZone) - if mission:getVar(player, 'Status') == 1 then - return 2 - end - end, - }, + onZoneIn = function(player, prevZone) + if mission:getVar(player, 'Status') == 1 then + return 2 + end + end, onEventUpdate = { diff --git a/scripts/missions/soa/4_2_3_A_Vow_of_Truth.lua b/scripts/missions/soa/4_2_3_A_Vow_of_Truth.lua index 2a8434b6519..51f1c027bfa 100644 --- a/scripts/missions/soa/4_2_3_A_Vow_of_Truth.lua +++ b/scripts/missions/soa/4_2_3_A_Vow_of_Truth.lua @@ -28,12 +28,9 @@ mission.sections = [xi.zone.WOH_GATES] = { - onZoneIn = - { - function(player, prevZone) - return 7 - end, - }, + onZoneIn = function(player, prevZone) + return 7 + end, onEventFinish = { diff --git a/scripts/missions/soa/4_3_0_The_Gates.lua b/scripts/missions/soa/4_3_0_The_Gates.lua index a44062eb969..97944452e74 100644 --- a/scripts/missions/soa/4_3_0_The_Gates.lua +++ b/scripts/missions/soa/4_3_0_The_Gates.lua @@ -41,14 +41,11 @@ mission.sections = end, }, - onZoneIn = - { - function(player, prevZone) - if mission:getVar(player, 'Status') == 1 then - return 9 - end - end, - }, + onZoneIn = function(player, prevZone) + if mission:getVar(player, 'Status') == 1 then + return 9 + end + end, onEventFinish = { diff --git a/scripts/missions/soa/4_3_1_Morimar.lua b/scripts/missions/soa/4_3_1_Morimar.lua index 48fcd7b1d81..5ab102eb97c 100644 --- a/scripts/missions/soa/4_3_1_Morimar.lua +++ b/scripts/missions/soa/4_3_1_Morimar.lua @@ -45,14 +45,11 @@ mission.sections = [xi.zone.MOUNT_KAMIHR] = { - onZoneIn = - { - function(player, prevZone) - if mission:getVar(player, 'Status') == 1 then - return 3 - end - end, - }, + onZoneIn = function(player, prevZone) + if mission:getVar(player, 'Status') == 1 then + return 3 + end + end, onEventUpdate = { diff --git a/scripts/missions/soa/4_3_2_A_New_Force_Arises.lua b/scripts/missions/soa/4_3_2_A_New_Force_Arises.lua index b2b613edf1c..6c0b96067eb 100644 --- a/scripts/missions/soa/4_3_2_A_New_Force_Arises.lua +++ b/scripts/missions/soa/4_3_2_A_New_Force_Arises.lua @@ -60,20 +60,17 @@ mission.sections = [xi.zone.CELENNIA_MEMORIAL_LIBRARY] = { - onZoneIn = - { - function(player, prevZone) - local numScales = getNumScales(player) - - if - numScales > 0 and - numScales < 3 and - not mission:isVarBitsSet(player, 'Option', 0) - then - return 6 - end - end, - }, + onZoneIn = function(player, prevZone) + local numScales = getNumScales(player) + + if + numScales > 0 and + numScales < 3 and + not mission:isVarBitsSet(player, 'Option', 0) + then + return 6 + end + end, onEventFinish = { @@ -120,18 +117,15 @@ mission.sections = [xi.zone.MOUNT_KAMIHR] = { - onZoneIn = - { - function(player, prevZone) - local numScales = getNumScales(player) - - if numScales ~= 3 then - return 4 - else - return 5 - end - end, - }, + onZoneIn = function(player, prevZone) + local numScales = getNumScales(player) + + if numScales ~= 3 then + return 4 + else + return 5 + end + end, onEventUpdate = { diff --git a/scripts/missions/soa/4_3_5_A_Shrouded_Canopy.lua b/scripts/missions/soa/4_3_5_A_Shrouded_Canopy.lua index b1c53ffd717..ec9d435a96a 100644 --- a/scripts/missions/soa/4_3_5_A_Shrouded_Canopy.lua +++ b/scripts/missions/soa/4_3_5_A_Shrouded_Canopy.lua @@ -28,12 +28,9 @@ mission.sections = [xi.zone.LEAFALLIA] = { - onZoneIn = - { - function(player, prevZone) - return 2 - end, - }, + onZoneIn = function(player, prevZone) + return 2 + end, onEventFinish = { diff --git a/scripts/missions/soa/4_4_0_Cries_from_the_Deep.lua b/scripts/missions/soa/4_4_0_Cries_from_the_Deep.lua index 99adf89b5ae..55ae02936c9 100644 --- a/scripts/missions/soa/4_4_0_Cries_from_the_Deep.lua +++ b/scripts/missions/soa/4_4_0_Cries_from_the_Deep.lua @@ -35,14 +35,11 @@ mission.sections = end, }, - onZoneIn = - { - function(player, prevZone) - if mission:getVar(player, 'Status') == 1 then - return 1550 - end - end, - }, + onZoneIn = function(player, prevZone) + if mission:getVar(player, 'Status') == 1 then + return 1550 + end + end, onEventFinish = { diff --git a/scripts/missions/soa/4_4_4_An_Emergency_Convocation.lua b/scripts/missions/soa/4_4_4_An_Emergency_Convocation.lua index 1e2a5894330..30c7a339650 100644 --- a/scripts/missions/soa/4_4_4_An_Emergency_Convocation.lua +++ b/scripts/missions/soa/4_4_4_An_Emergency_Convocation.lua @@ -40,18 +40,15 @@ mission.sections = end, }, - onZoneIn = - { - function(player, prevZone) - local missionStatus = mission:getVar(player, 'Status') + onZoneIn = function(player, prevZone) + local missionStatus = mission:getVar(player, 'Status') - if missionStatus == 1 then - return 1551 - elseif missionStatus == 2 then - return 1552 - end - end, - }, + if missionStatus == 1 then + return 1551 + elseif missionStatus == 2 then + return 1552 + end + end, onEventUpdate = { diff --git a/scripts/missions/soa/4_6_0_Balamors_Ruse.lua b/scripts/missions/soa/4_6_0_Balamors_Ruse.lua index 457e50327dd..640143b7f90 100644 --- a/scripts/missions/soa/4_6_0_Balamors_Ruse.lua +++ b/scripts/missions/soa/4_6_0_Balamors_Ruse.lua @@ -58,14 +58,11 @@ mission.sections = ['Spoutdrenched_Toad'] = keyItemOnMobDeath, ['Waterway_Pugil'] = keyItemOnMobDeath, - onZoneIn = - { - function(player, prevZone) - if mission:getVar(player, 'Status') == 1 then - return 369 - end - end, - }, + onZoneIn = function(player, prevZone) + if mission:getVar(player, 'Status') == 1 then + return 369 + end + end, onEventFinish = { diff --git a/scripts/missions/soa/5_1_2_Heroes_Unite.lua b/scripts/missions/soa/5_1_2_Heroes_Unite.lua index 1ec40fffc39..a43e34a67b7 100644 --- a/scripts/missions/soa/5_1_2_Heroes_Unite.lua +++ b/scripts/missions/soa/5_1_2_Heroes_Unite.lua @@ -31,14 +31,11 @@ mission.sections = { ['Alpine_Trail'] = mission:progressEvent(60, 267, 300, 200, 100, 4063, 1999, 1999, 0), - onZoneIn = - { - function(player, prevZone) - if mission:getVar(player, 'Status') == 2 then - mission:complete(player) - end - end, - }, + onZoneIn = function(player, prevZone) + if mission:getVar(player, 'Status') == 2 then + mission:complete(player) + end + end, onEventFinish = { @@ -53,14 +50,11 @@ mission.sections = [xi.zone.MOUNT_KAMIHR] = { - onZoneIn = - { - function(player, prevZone) - if mission:getVar(player, 'Status') == 1 then - return 6 - end - end, - }, + onZoneIn = function(player, prevZone) + if mission:getVar(player, 'Status') == 1 then + return 6 + end + end, onEventUpdate = { diff --git a/scripts/missions/soa/5_2_0_Yggdrasil_Beckons.lua b/scripts/missions/soa/5_2_0_Yggdrasil_Beckons.lua index 14a7cbf3901..18a6ab8f92b 100644 --- a/scripts/missions/soa/5_2_0_Yggdrasil_Beckons.lua +++ b/scripts/missions/soa/5_2_0_Yggdrasil_Beckons.lua @@ -37,17 +37,14 @@ mission.sections = end, }, - onZoneIn = - { - function(player, prevZone) - if - mission:isVarBitsSet(player, 'Status', 3) and - not player:hasKeyItem(xi.ki.DHOKMAKS_BLOOD_SIGIL) - then - return 36 - end - end, - }, + onZoneIn = function(player, prevZone) + if + mission:isVarBitsSet(player, 'Status', 3) and + not player:hasKeyItem(xi.ki.DHOKMAKS_BLOOD_SIGIL) + then + return 36 + end + end, onEventFinish = { @@ -96,17 +93,14 @@ mission.sections = end, }, - onZoneIn = - { - function(player, prevZone) - if - mission:isVarBitsSet(player, 'Status', 1) and - not player:hasKeyItem(xi.ki.ASHRAKKS_BLOOD_SIGIL) - then - return 4 - end - end, - }, + onZoneIn = function(player, prevZone) + if + mission:isVarBitsSet(player, 'Status', 1) and + not player:hasKeyItem(xi.ki.ASHRAKKS_BLOOD_SIGIL) + then + return 4 + end + end, onEventFinish = { diff --git a/scripts/missions/soa/5_2_1_Returning_to_the_Trees.lua b/scripts/missions/soa/5_2_1_Returning_to_the_Trees.lua index 3d0f24c554c..d78ee5cc266 100644 --- a/scripts/missions/soa/5_2_1_Returning_to_the_Trees.lua +++ b/scripts/missions/soa/5_2_1_Returning_to_the_Trees.lua @@ -28,12 +28,9 @@ mission.sections = [xi.zone.LEAFALLIA] = { - onZoneIn = - { - function(player, prevZone) - return 11 - end, - }, + onZoneIn = function(player, prevZone) + return 11 + end, onEventFinish = { diff --git a/scripts/missions/soa/5_2_2_The_Key_to_the_Turris.lua b/scripts/missions/soa/5_2_2_The_Key_to_the_Turris.lua index da1aea3a1a0..71554337967 100644 --- a/scripts/missions/soa/5_2_2_The_Key_to_the_Turris.lua +++ b/scripts/missions/soa/5_2_2_The_Key_to_the_Turris.lua @@ -41,14 +41,11 @@ mission.sections = [xi.zone.KAMIHR_DRIFTS] = { - onZoneIn = - { - function(player, prevZone) - if mission:getVar(player, 'Status') == 1 then - return 58 - end - end, - }, + onZoneIn = function(player, prevZone) + if mission:getVar(player, 'Status') == 1 then + return 58 + end + end, onEventFinish = { diff --git a/scripts/missions/soa/5_3_0_Teodors_Summons.lua b/scripts/missions/soa/5_3_0_Teodors_Summons.lua index 60eae73d617..b9dce2dd977 100644 --- a/scripts/missions/soa/5_3_0_Teodors_Summons.lua +++ b/scripts/missions/soa/5_3_0_Teodors_Summons.lua @@ -45,14 +45,11 @@ mission.sections = [xi.zone.MOUNT_KAMIHR] = { - onZoneIn = - { - function(player, prevZone) - if mission:getVar(player, 'Status') == 1 then - return 7 - end - end, - }, + onZoneIn = function(player, prevZone) + if mission:getVar(player, 'Status') == 1 then + return 7 + end + end, onEventUpdate = { diff --git a/scripts/missions/soa/5_3_2_Watery_Grave.lua b/scripts/missions/soa/5_3_2_Watery_Grave.lua index f80e65933b4..4c3247bcb42 100644 --- a/scripts/missions/soa/5_3_2_Watery_Grave.lua +++ b/scripts/missions/soa/5_3_2_Watery_Grave.lua @@ -24,31 +24,25 @@ mission.sections = [xi.zone.RALA_WATERWAYS] = { - onZoneIn = - { - function(player, prevZone) - if mission:getVar(player, 'Status') == 1 then - return 375 - end - end, - }, + onZoneIn = function(player, prevZone) + if mission:getVar(player, 'Status') == 1 then + return 375 + end + end, - afterZoneIn = - { - function(player) - if - not player:hasKeyItem(xi.ki.ASH_RUNIC_BOARD) and - mission:getVar(player, 'Status') == 0 and - mission:getVar(player, 'Timer') <= VanadielUniqueDay() - then - -- TODO: This message needs verification, and need to determine if there - -- is a unique event or message. For future Instance implementation, on - -- instance fail, Timer var should be set to VanadielUniqueDay() + 1 - player:delKeyItem(xi.ki.BLANK_ASH_RUNIC_BOARD) - npcUtil.giveKeyItem(player, xi.ki.ASH_RUNIC_BOARD) - end - end, - }, + afterZoneIn = function(player) + if + not player:hasKeyItem(xi.ki.ASH_RUNIC_BOARD) and + mission:getVar(player, 'Status') == 0 and + mission:getVar(player, 'Timer') <= VanadielUniqueDay() + then + -- TODO: This message needs verification, and need to determine if there + -- is a unique event or message. For future Instance implementation, on + -- instance fail, Timer var should be set to VanadielUniqueDay() + 1 + player:delKeyItem(xi.ki.BLANK_ASH_RUNIC_BOARD) + npcUtil.giveKeyItem(player, xi.ki.ASH_RUNIC_BOARD) + end + end, onEventFinish = { diff --git a/scripts/missions/soa/5_4_0_Reckoning.lua b/scripts/missions/soa/5_4_0_Reckoning.lua index ecb2409700e..face2ad42d3 100644 --- a/scripts/missions/soa/5_4_0_Reckoning.lua +++ b/scripts/missions/soa/5_4_0_Reckoning.lua @@ -24,14 +24,11 @@ mission.sections = [xi.zone.RAKAZNAR_TURRIS] = { - onZoneIn = - { - function(player, prevZone) - if mission:getVar(player, 'Status') == 1 then - return 3 - end - end, - }, + onZoneIn = function(player, prevZone) + if mission:getVar(player, 'Status') == 1 then + return 3 + end + end, onEventFinish = { @@ -50,19 +47,16 @@ mission.sections = [xi.zone.RAKAZNAR_INNER_COURT] = { - afterZoneIn = - { - function(player) - if - not player:hasKeyItem(xi.ki.CRYSTALLIZED_PSYCHE) and - mission:getVar(player, 'Status') == 0 - then - -- TODO: This message needs verification, and need to determine if there - -- is a unique event or message. - npcUtil.giveKeyItem(player, xi.ki.CRYSTALLIZED_PSYCHE) - end - end, - }, + afterZoneIn = function(player) + if + not player:hasKeyItem(xi.ki.CRYSTALLIZED_PSYCHE) and + mission:getVar(player, 'Status') == 0 + then + -- TODO: This message needs verification, and need to determine if there + -- is a unique event or message. + npcUtil.giveKeyItem(player, xi.ki.CRYSTALLIZED_PSYCHE) + end + end, }, }, } diff --git a/scripts/missions/soa/5_4_1_Abomination.lua b/scripts/missions/soa/5_4_1_Abomination.lua index bdc88f4c5dc..8e16d467c1e 100644 --- a/scripts/missions/soa/5_4_1_Abomination.lua +++ b/scripts/missions/soa/5_4_1_Abomination.lua @@ -23,14 +23,11 @@ mission.sections = [xi.zone.RAKAZNAR_TURRIS] = { - onZoneIn = - { - function(player, prevZone) - if mission:getVar(player, 'Status') == 1 then - return 4 - end - end, - }, + onZoneIn = function(player, prevZone) + if mission:getVar(player, 'Status') == 1 then + return 4 + end + end, onEventFinish = { @@ -50,14 +47,11 @@ mission.sections = [xi.zone.CEIZAK_BATTLEGROUNDS] = { - onZoneIn = - { - function(player, prevZone) - if mission:getVar(player, 'Status') == 2 then - return 29 - end - end, - }, + onZoneIn = function(player, prevZone) + if mission:getVar(player, 'Status') == 2 then + return 29 + end + end, onEventFinish = { @@ -69,19 +63,16 @@ mission.sections = [xi.zone.RAKAZNAR_INNER_COURT] = { - afterZoneIn = - { - function(player) - if - not player:hasKeyItem(xi.ki.AWAKENED_CRYSTALLIZED_PSYCHE) and - mission:getVar(player, 'Status') == 0 - then - -- TODO: This message needs verification, and need to determine if there - -- is a unique event or message. - npcUtil.giveKeyItem(player, xi.ki.AWAKENED_CRYSTALLIZED_PSYCHE) - end - end, - }, + afterZoneIn = function(player) + if + not player:hasKeyItem(xi.ki.AWAKENED_CRYSTALLIZED_PSYCHE) and + mission:getVar(player, 'Status') == 0 + then + -- TODO: This message needs verification, and need to determine if there + -- is a unique event or message. + npcUtil.giveKeyItem(player, xi.ki.AWAKENED_CRYSTALLIZED_PSYCHE) + end + end, }, }, } diff --git a/scripts/missions/soa/5_5_0_Undying_Light.lua b/scripts/missions/soa/5_5_0_Undying_Light.lua index 90054540b0c..496cba43fc3 100644 --- a/scripts/missions/soa/5_5_0_Undying_Light.lua +++ b/scripts/missions/soa/5_5_0_Undying_Light.lua @@ -23,19 +23,16 @@ mission.sections = [xi.zone.WESTERN_ADOULIN] = { - onZoneIn = - { - function(player, prevZone) - -- TODO: This event does not occur on retail if warping from Ceizak to - -- Adoulin, and only occurs if they enter through the gate. - if - prevZone == xi.zone.CEIZAK_BATTLEGROUNDS and - mission:getVar(player, 'Status') == 0 - then - return 182 - end - end, - }, + onZoneIn = function(player, prevZone) + -- TODO: This event does not occur on retail if warping from Ceizak to + -- Adoulin, and only occurs if they enter through the gate. + if + prevZone == xi.zone.CEIZAK_BATTLEGROUNDS and + mission:getVar(player, 'Status') == 0 + then + return 182 + end + end, onEventUpdate = { @@ -67,14 +64,11 @@ mission.sections = end, }, - onZoneIn = - { - function(player, prevZone) - if mission:getVar(player, 'Status') == 2 then - return 1549 - end - end, - }, + onZoneIn = function(player, prevZone) + if mission:getVar(player, 'Status') == 2 then + return 1549 + end + end, onEventFinish = { diff --git a/scripts/missions/soa/5_5_1_The_Light_Within.lua b/scripts/missions/soa/5_5_1_The_Light_Within.lua index ba9d17bfe77..308c9435810 100644 --- a/scripts/missions/soa/5_5_1_The_Light_Within.lua +++ b/scripts/missions/soa/5_5_1_The_Light_Within.lua @@ -38,17 +38,14 @@ mission.sections = [xi.zone.CEIZAK_BATTLEGROUNDS] = { - onZoneIn = - { - function(player, prevZone) - if - mission:getVar(player, 'Status') == 1 and - mission:getVar(player, 'Timer') <= VanadielUniqueDay() - then - return 30 - end - end, - }, + onZoneIn = function(player, prevZone) + if + mission:getVar(player, 'Status') == 1 and + mission:getVar(player, 'Timer') <= VanadielUniqueDay() + then + return 30 + end + end, onEventUpdate = { @@ -79,14 +76,11 @@ mission.sections = [xi.zone.LEAFALLIA] = { - onZoneIn = - { - function(player, prevZone) - if mission:getVar(player, 'Status') == 2 then - return 13 - end - end, - }, + onZoneIn = function(player, prevZone) + if mission:getVar(player, 'Status') == 2 then + return 13 + end + end, onEventUpdate = { diff --git a/scripts/missions/toau/15_The_Black_Coffin.lua b/scripts/missions/toau/15_The_Black_Coffin.lua index 6bcff188896..65e27e9e2b5 100644 --- a/scripts/missions/toau/15_The_Black_Coffin.lua +++ b/scripts/missions/toau/15_The_Black_Coffin.lua @@ -42,18 +42,15 @@ mission.sections = end, }, - onZoneIn = - { - function(player, prevZone) - if - prevZone == xi.zone.THE_ASHU_TALIF and - player:getMissionStatus(mission.areaId) == 2 - then - player:setPos(-456, -3, -405, 64) - return 9 - end - end, - }, + onZoneIn = function(player, prevZone) + if + prevZone == xi.zone.THE_ASHU_TALIF and + player:getMissionStatus(mission.areaId) == 2 + then + player:setPos(-456, -3, -405, 64) + return 9 + end + end, onEventFinish = { @@ -70,21 +67,18 @@ mission.sections = [xi.zone.NASHMAU] = { - onZoneIn = - { - function(player, prevZone) - if - prevZone == xi.zone.ARRAPAGO_REEF and - player:getMissionStatus(mission.areaId) == 3 and - player:getXPos() == 0 and - player:getYPos() == 0 and - player:getZPos() == 0 - then - player:setPos(-13, 2, -62, 194) - return 281 - end - end, - }, + onZoneIn = function(player, prevZone) + if + prevZone == xi.zone.ARRAPAGO_REEF and + player:getMissionStatus(mission.areaId) == 3 and + player:getXPos() == 0 and + player:getYPos() == 0 and + player:getZPos() == 0 + then + player:setPos(-13, 2, -62, 194) + return 281 + end + end, onEventFinish = { diff --git a/scripts/missions/toau/20_Teahouse_Tumult.lua b/scripts/missions/toau/20_Teahouse_Tumult.lua index 5eed84168c6..bd988be710c 100644 --- a/scripts/missions/toau/20_Teahouse_Tumult.lua +++ b/scripts/missions/toau/20_Teahouse_Tumult.lua @@ -32,14 +32,11 @@ mission.sections = end, }, - onZoneIn = - { - function(player, prevZone) - if player:getMissionStatus(mission.areaId) == 0 then - return 10 - end - end, - }, + onZoneIn = function(player, prevZone) + if player:getMissionStatus(mission.areaId) == 0 then + return 10 + end + end, onEventFinish = { diff --git a/scripts/missions/toau/22_Shield_of_Diplomacy.lua b/scripts/missions/toau/22_Shield_of_Diplomacy.lua index 8cd4801a72a..40ac1495083 100644 --- a/scripts/missions/toau/22_Shield_of_Diplomacy.lua +++ b/scripts/missions/toau/22_Shield_of_Diplomacy.lua @@ -33,14 +33,11 @@ mission.sections = end, }, - onZoneIn = - { - function(player, prevZone) - if player:getMissionStatus(mission.areaId) == 0 then - return 1 - end - end, - }, + onZoneIn = function(player, prevZone) + if player:getMissionStatus(mission.areaId) == 0 then + return 1 + end + end, onEventFinish = { diff --git a/scripts/missions/toau/30_Prevalence_of_Pirates.lua b/scripts/missions/toau/30_Prevalence_of_Pirates.lua index b41594167f2..d8cfc072765 100644 --- a/scripts/missions/toau/30_Prevalence_of_Pirates.lua +++ b/scripts/missions/toau/30_Prevalence_of_Pirates.lua @@ -23,17 +23,14 @@ mission.sections = [xi.zone.ARRAPAGO_REEF] = { - onZoneIn = - { - function(player, prevZone) - if - prevZone == xi.zone.CAEDARVA_MIRE and - player:getMissionStatus(mission.areaId) == 0 - then - return 13 - end - end, - }, + onZoneIn = function(player, prevZone) + if + prevZone == xi.zone.CAEDARVA_MIRE and + player:getMissionStatus(mission.areaId) == 0 + then + return 13 + end + end, onTriggerAreaEnter = { diff --git a/scripts/missions/toau/31_Shades_of_Vengeance.lua b/scripts/missions/toau/31_Shades_of_Vengeance.lua index 1769958d34e..b6af8bdae8e 100644 --- a/scripts/missions/toau/31_Shades_of_Vengeance.lua +++ b/scripts/missions/toau/31_Shades_of_Vengeance.lua @@ -36,14 +36,11 @@ mission.sections = end, }, - onZoneIn = - { - function(player, prevZone) - if player:getMissionStatus(mission.areaId) == 1 then - return 21 - end - end, - }, + onZoneIn = function(player, prevZone) + if player:getMissionStatus(mission.areaId) == 1 then + return 21 + end + end, onEventFinish = { diff --git a/scripts/missions/toau/34_Testing_the_Waters.lua b/scripts/missions/toau/34_Testing_the_Waters.lua index 4ef8e912512..15af1c76dcf 100644 --- a/scripts/missions/toau/34_Testing_the_Waters.lua +++ b/scripts/missions/toau/34_Testing_the_Waters.lua @@ -46,14 +46,11 @@ mission.sections = [xi.zone.TALACCA_COVE] = { - onZoneIn = - { - function(player, prevZone) - if player:getMissionStatus(mission.areaId) == 1 then - return 106 - end - end, - }, + onZoneIn = function(player, prevZone) + if player:getMissionStatus(mission.areaId) == 1 then + return 106 + end + end, onEventFinish = { diff --git a/scripts/missions/toau/36_Gaze_of_the_Saboteur.lua b/scripts/missions/toau/36_Gaze_of_the_Saboteur.lua index 1b5467259a1..3127e069415 100644 --- a/scripts/missions/toau/36_Gaze_of_the_Saboteur.lua +++ b/scripts/missions/toau/36_Gaze_of_the_Saboteur.lua @@ -34,14 +34,11 @@ mission.sections = end, }, - onZoneIn = - { - function(player, prevZone) - if player:getMissionStatus(mission.areaId) == 0 then - return 6 - end - end, - }, + onZoneIn = function(player, prevZone) + if player:getMissionStatus(mission.areaId) == 0 then + return 6 + end + end, onEventFinish = { diff --git a/scripts/missions/toau/40_Unraveling_Reason.lua b/scripts/missions/toau/40_Unraveling_Reason.lua index 0ebac755c06..71177892f79 100644 --- a/scripts/missions/toau/40_Unraveling_Reason.lua +++ b/scripts/missions/toau/40_Unraveling_Reason.lua @@ -65,23 +65,20 @@ mission.sections = [xi.zone.WAJAOM_WOODLANDS] = { - onZoneIn = - { - function(player, prevZone) - -- Each of these 3 cutscenes that follow Ru'Lude 10098 are onZone events. It is possible - -- to not require this, but is retail accurate. + onZoneIn = function(player, prevZone) + -- Each of these 3 cutscenes that follow Ru'Lude 10098 are onZone events. It is possible + -- to not require this, but is retail accurate. - local missionStatus = player:getMissionStatus(mission.areaId) + local missionStatus = player:getMissionStatus(mission.areaId) - if missionStatus == 0 then - return 11 - elseif missionStatus == 1 then - return 21 - else - return 22 - end - end, - }, + if missionStatus == 0 then + return 11 + elseif missionStatus == 1 then + return 21 + else + return 22 + end + end, onEventFinish = { diff --git a/scripts/missions/toau/42_Path_of_Darkness.lua b/scripts/missions/toau/42_Path_of_Darkness.lua index 56827a596e0..a7ebb124622 100644 --- a/scripts/missions/toau/42_Path_of_Darkness.lua +++ b/scripts/missions/toau/42_Path_of_Darkness.lua @@ -76,14 +76,11 @@ mission.sections = end, }, - onZoneIn = - { - function(player, prevZone) - if player:getMissionStatus(mission.areaId) == 2 then - return 7 - end - end, - }, + onZoneIn = function(player, prevZone) + if player:getMissionStatus(mission.areaId) == 2 then + return 7 + end + end, onEventFinish = { diff --git a/scripts/missions/toau/44_Nashmeiras_Plea.lua b/scripts/missions/toau/44_Nashmeiras_Plea.lua index 5c130bd4ca9..a1d4c0ddd59 100644 --- a/scripts/missions/toau/44_Nashmeiras_Plea.lua +++ b/scripts/missions/toau/44_Nashmeiras_Plea.lua @@ -55,14 +55,11 @@ mission.sections = end, }, - onZoneIn = - { - function(player, prevZone) - if player:getMissionStatus(mission.areaId) == 2 then - return 10 - end - end, - }, + onZoneIn = function(player, prevZone) + if player:getMissionStatus(mission.areaId) == 2 then + return 10 + end + end, onEventFinish = { diff --git a/scripts/missions/windurst/1_2_The_Heart_of_the_Matter.lua b/scripts/missions/windurst/1_2_The_Heart_of_the_Matter.lua index 7616b6cfaae..ce1e305b2ae 100644 --- a/scripts/missions/windurst/1_2_The_Heart_of_the_Matter.lua +++ b/scripts/missions/windurst/1_2_The_Heart_of_the_Matter.lua @@ -368,12 +368,9 @@ mission.sections = [xi.zone.EAST_SARUTABARUTA] = { - onZoneIn = - { - function(player, prevZone) - return 48 - end, - }, + onZoneIn = function(player, prevZone) + return 48 + end, onEventFinish = { diff --git a/scripts/missions/windurst/2_3_0_The_Three_Kingdoms.lua b/scripts/missions/windurst/2_3_0_The_Three_Kingdoms.lua index ea9c667700a..178e83562af 100644 --- a/scripts/missions/windurst/2_3_0_The_Three_Kingdoms.lua +++ b/scripts/missions/windurst/2_3_0_The_Three_Kingdoms.lua @@ -218,7 +218,8 @@ mission.sections = elseif missionStatus == 7 then return mission:progressEvent(547) elseif missionStatus == 11 then - player:showText(northernSandoriaID.text.KASARORO_DIALOG + 20) + player:showText(npc, northernSandoriaID.text.KASARORO_DIALOG + 20) + return mission:noAction() end end, }, diff --git a/scripts/missions/windurst/4_1_Magicite.lua b/scripts/missions/windurst/4_1_Magicite.lua index 184bd962f71..c062a741cdc 100644 --- a/scripts/missions/windurst/4_1_Magicite.lua +++ b/scripts/missions/windurst/4_1_Magicite.lua @@ -276,14 +276,11 @@ mission.sections = end, }, - onZoneIn = - { - function(player, prevZone) - if mission:getVar(player, 'Option') == 2 then -- Fickbix CS - return 10000 - end - end, - }, + onZoneIn = function(player, prevZone) + if mission:getVar(player, 'Option') == 2 then -- Fickbix CS + return 10000 + end + end, onEventFinish = { diff --git a/scripts/missions/windurst/5_1_The_Final_Seal.lua b/scripts/missions/windurst/5_1_The_Final_Seal.lua index f9bc24e169b..b3e7c488dab 100644 --- a/scripts/missions/windurst/5_1_The_Final_Seal.lua +++ b/scripts/missions/windurst/5_1_The_Final_Seal.lua @@ -136,14 +136,11 @@ mission.sections = [xi.zone.FEIYIN] = { - onZoneIn = - { - function(player, prevZone) - if player:getMissionStatus(mission.areaId) == 10 then - return 1 - end - end, - }, + onZoneIn = function(player, prevZone) + if player:getMissionStatus(mission.areaId) == 10 then + return 1 + end + end, onEventFinish = { diff --git a/scripts/missions/windurst/5_2_The_Shadow_Awaits.lua b/scripts/missions/windurst/5_2_The_Shadow_Awaits.lua index 903ce20e1c5..9c12f8fd0c7 100644 --- a/scripts/missions/windurst/5_2_The_Shadow_Awaits.lua +++ b/scripts/missions/windurst/5_2_The_Shadow_Awaits.lua @@ -143,7 +143,8 @@ mission.sections = player:addMission(xi.mission.log_id.ZILART, xi.mission.id.zilart.THE_NEW_FRONTIER) end - return mission:progressEvent(7) + -- TODO: Check captures, the player is most likely zoned and this even triggered via onZoneIn + player:startEvent(7) end end, @@ -160,17 +161,14 @@ mission.sections = [xi.zone.CASTLE_ZVAHL_BAILEYS] = { - afterZoneIn = - { - function(player) - if - player:getMissionStatus(mission.areaId) == 4 and - not player:hasKeyItem(xi.ki.SHADOW_FRAGMENT) - then - npcUtil.giveKeyItem(player, xi.ki.SHADOW_FRAGMENT) - end - end, - }, + afterZoneIn = function(player) + if + player:getMissionStatus(mission.areaId) == 4 and + not player:hasKeyItem(xi.ki.SHADOW_FRAGMENT) + then + npcUtil.giveKeyItem(player, xi.ki.SHADOW_FRAGMENT) + end + end, }, }, } diff --git a/scripts/missions/windurst/6_1_Full_Moon_Fountain.lua b/scripts/missions/windurst/6_1_Full_Moon_Fountain.lua index 3cbfc696b8a..2ad4d2fbe4a 100644 --- a/scripts/missions/windurst/6_1_Full_Moon_Fountain.lua +++ b/scripts/missions/windurst/6_1_Full_Moon_Fountain.lua @@ -186,14 +186,11 @@ mission.sections = [xi.zone.FULL_MOON_FOUNTAIN] = { - onZoneIn = - { - function(player, prevZone) - if player:getMissionStatus(mission.areaId) == 3 then - return 50 - end - end, - }, + onZoneIn = function(player, prevZone) + if player:getMissionStatus(mission.areaId) == 3 then + return 50 + end + end, onEventFinish = { diff --git a/scripts/missions/windurst/8_1_Vain.lua b/scripts/missions/windurst/8_1_Vain.lua index d8e90458e25..9633fbb2445 100644 --- a/scripts/missions/windurst/8_1_Vain.lua +++ b/scripts/missions/windurst/8_1_Vain.lua @@ -106,14 +106,11 @@ mission.sections = [xi.zone.BATALLIA_DOWNS] = { - onZoneIn = - { - function(player, prevZone) - if player:getMissionStatus(mission.areaId) == 1 then - return 903 - end - end, - }, + onZoneIn = function(player, prevZone) + if player:getMissionStatus(mission.areaId) == 1 then + return 903 + end + end, onEventUpdate = { @@ -129,14 +126,11 @@ mission.sections = [xi.zone.BEAUCEDINE_GLACIER] = { - onZoneIn = - { - function(player, prevZone) - if player:getMissionStatus(mission.areaId) == 1 then - return 116 - end - end, - }, + onZoneIn = function(player, prevZone) + if player:getMissionStatus(mission.areaId) == 1 then + return 116 + end + end, onEventUpdate = { @@ -148,14 +142,11 @@ mission.sections = [xi.zone.BUBURIMU_PENINSULA] = { - onZoneIn = - { - function(player, prevZone) - if player:getMissionStatus(mission.areaId) == 1 then - return 5 - end - end, - }, + onZoneIn = function(player, prevZone) + if player:getMissionStatus(mission.areaId) == 1 then + return 5 + end + end, onEventUpdate = { @@ -221,14 +212,11 @@ mission.sections = [xi.zone.EAST_RONFAURE] = { - onZoneIn = - { - function(player, prevZone) - if player:getMissionStatus(mission.areaId) == 1 then - return 23 - end - end, - }, + onZoneIn = function(player, prevZone) + if player:getMissionStatus(mission.areaId) == 1 then + return 23 + end + end, onEventUpdate = { @@ -244,14 +232,11 @@ mission.sections = [xi.zone.EAST_SARUTABARUTA] = { - onZoneIn = - { - function(player, prevZone) - if player:getMissionStatus(mission.areaId) == 1 then - return 52 - end - end, - }, + onZoneIn = function(player, prevZone) + if player:getMissionStatus(mission.areaId) == 1 then + return 52 + end + end, onEventUpdate = { @@ -277,14 +262,11 @@ mission.sections = [xi.zone.KONSCHTAT_HIGHLANDS] = { - onZoneIn = - { - function(player, prevZone) - if player:getMissionStatus(mission.areaId) == 1 then - return 106 - end - end, - }, + onZoneIn = function(player, prevZone) + if player:getMissionStatus(mission.areaId) == 1 then + return 106 + end + end, onEventUpdate = { @@ -300,14 +282,11 @@ mission.sections = [xi.zone.LA_THEINE_PLATEAU] = { - onZoneIn = - { - function(player, prevZone) - if player:getMissionStatus(mission.areaId) == 1 then - return 125 - end - end, - }, + onZoneIn = function(player, prevZone) + if player:getMissionStatus(mission.areaId) == 1 then + return 125 + end + end, onEventUpdate = { @@ -319,14 +298,11 @@ mission.sections = [xi.zone.MERIPHATAUD_MOUNTAINS] = { - onZoneIn = - { - function(player, prevZone) - if player:getMissionStatus(mission.areaId) == 1 then - return 34 - end - end, - }, + onZoneIn = function(player, prevZone) + if player:getMissionStatus(mission.areaId) == 1 then + return 34 + end + end, onEventUpdate = { @@ -342,14 +318,11 @@ mission.sections = [xi.zone.NORTH_GUSTABERG] = { - onZoneIn = - { - function(player, prevZone) - if player:getMissionStatus(mission.areaId) == 1 then - return 246 - end - end, - }, + onZoneIn = function(player, prevZone) + if player:getMissionStatus(mission.areaId) == 1 then + return 246 + end + end, onEventUpdate = { @@ -365,14 +338,11 @@ mission.sections = [xi.zone.PASHHOW_MARSHLANDS] = { - onZoneIn = - { - function(player, prevZone) - if player:getMissionStatus(mission.areaId) == 1 then - return 15 - end - end, - }, + onZoneIn = function(player, prevZone) + if player:getMissionStatus(mission.areaId) == 1 then + return 15 + end + end, onEventUpdate = { @@ -386,14 +356,11 @@ mission.sections = [xi.zone.ROLANBERRY_FIELDS] = { - onZoneIn = - { - function(player, prevZone) - if player:getMissionStatus(mission.areaId) == 1 then - return 4 - end - end, - }, + onZoneIn = function(player, prevZone) + if player:getMissionStatus(mission.areaId) == 1 then + return 4 + end + end, onEventUpdate = { @@ -418,14 +385,11 @@ mission.sections = end, }, - onZoneIn = - { - function(player, prevZone) - if player:getMissionStatus(mission.areaId) == 1 then - return 3 - end - end, - }, + onZoneIn = function(player, prevZone) + if player:getMissionStatus(mission.areaId) == 1 then + return 3 + end + end, onEventFinish = { @@ -437,14 +401,11 @@ mission.sections = [xi.zone.SAUROMUGUE_CHAMPAIGN] = { - onZoneIn = - { - function(player, prevZone) - if player:getMissionStatus(mission.areaId) == 1 then - return 5 - end - end, - }, + onZoneIn = function(player, prevZone) + if player:getMissionStatus(mission.areaId) == 1 then + return 5 + end + end, onEventUpdate = { @@ -465,14 +426,11 @@ mission.sections = [xi.zone.SOUTH_GUSTABERG] = { - onZoneIn = - { - function(player, prevZone) - if player:getMissionStatus(mission.areaId) == 1 then - return 37 - end - end, - }, + onZoneIn = function(player, prevZone) + if player:getMissionStatus(mission.areaId) == 1 then + return 37 + end + end, onEventUpdate = { @@ -490,14 +448,11 @@ mission.sections = [xi.zone.TAHRONGI_CANYON] = { - onZoneIn = - { - function(player, prevZone) - if player:getMissionStatus(mission.areaId) == 1 then - return 37 - end - end, - }, + onZoneIn = function(player, prevZone) + if player:getMissionStatus(mission.areaId) == 1 then + return 37 + end + end, onEventUpdate = { @@ -516,14 +471,11 @@ mission.sections = [xi.zone.THE_SANCTUARY_OF_ZITAH] = { - onZoneIn = - { - function(player, prevZone) - if player:getMissionStatus(mission.areaId) == 1 then - return 4 - end - end, - }, + onZoneIn = function(player, prevZone) + if player:getMissionStatus(mission.areaId) == 1 then + return 4 + end + end, onEventUpdate = { @@ -539,14 +491,11 @@ mission.sections = [xi.zone.VALKURM_DUNES] = { - onZoneIn = - { - function(player, prevZone) - if player:getMissionStatus(mission.areaId) == 1 then - return 5 - end - end, - }, + onZoneIn = function(player, prevZone) + if player:getMissionStatus(mission.areaId) == 1 then + return 5 + end + end, onEventUpdate = { @@ -564,14 +513,11 @@ mission.sections = [xi.zone.WEST_RONFAURE] = { - onZoneIn = - { - function(player, prevZone) - if player:getMissionStatus(mission.areaId) == 1 then - return 53 - end - end, - }, + onZoneIn = function(player, prevZone) + if player:getMissionStatus(mission.areaId) == 1 then + return 53 + end + end, onEventUpdate = { @@ -583,14 +529,11 @@ mission.sections = [xi.zone.WEST_SARUTABARUTA] = { - onZoneIn = - { - function(player, prevZone) - if player:getMissionStatus(mission.areaId) == 1 then - return 50 - end - end, - }, + onZoneIn = function(player, prevZone) + if player:getMissionStatus(mission.areaId) == 1 then + return 50 + end + end, onEventUpdate = { @@ -606,14 +549,11 @@ mission.sections = [xi.zone.XARCABARD] = { - onZoneIn = - { - function(player, prevZone) - if player:getMissionStatus(mission.areaId) == 1 then - return 11 - end - end, - }, + onZoneIn = function(player, prevZone) + if player:getMissionStatus(mission.areaId) == 1 then + return 11 + end + end, onEventUpdate = { diff --git a/scripts/missions/windurst/9_1_Doll_of_the_Dead.lua b/scripts/missions/windurst/9_1_Doll_of_the_Dead.lua index adb472d96e3..29e7c104ddf 100644 --- a/scripts/missions/windurst/9_1_Doll_of_the_Dead.lua +++ b/scripts/missions/windurst/9_1_Doll_of_the_Dead.lua @@ -79,14 +79,11 @@ mission.sections = [xi.zone.FULL_MOON_FOUNTAIN] = { - onZoneIn = - { - function(player, prevZone) - if player:getMissionStatus(mission.areaId) == 7 then - return 61 - end - end, - }, + onZoneIn = function(player, prevZone) + if player:getMissionStatus(mission.areaId) == 7 then + return 61 + end + end, onEventFinish = { @@ -108,14 +105,11 @@ mission.sections = end, }, - onZoneIn = - { - function(player, prevZone) - if player:getMissionStatus(mission.areaId) == 1 then - return 335 - end - end, - }, + onZoneIn = function(player, prevZone) + if player:getMissionStatus(mission.areaId) == 1 then + return 335 + end + end, onEventFinish = { diff --git a/scripts/missions/windurst/9_2_Moon_Reading.lua b/scripts/missions/windurst/9_2_Moon_Reading.lua index 95d6e06dfd3..a0b7bede60b 100644 --- a/scripts/missions/windurst/9_2_Moon_Reading.lua +++ b/scripts/missions/windurst/9_2_Moon_Reading.lua @@ -80,17 +80,14 @@ mission.sections = [xi.zone.CHAMBER_OF_ORACLES] = { - onZoneIn = - { - function(player, prevZone) - if - prevZone == xi.zone.QUICKSAND_CAVES and - player:getMissionStatus(mission.areaId) >= 1 - then - return 3 - end - end, - }, + onZoneIn = function(player, prevZone) + if + prevZone == xi.zone.QUICKSAND_CAVES and + player:getMissionStatus(mission.areaId) >= 1 + then + return 3 + end + end, onEventFinish = { @@ -215,14 +212,11 @@ mission.sections = [xi.zone.WINDURST_WALLS] = { - onZoneIn = - { - function(player, prevZone) - if player:getMissionStatus(mission.areaId) == 4 then - return 443 - end - end, - }, + onZoneIn = function(player, prevZone) + if player:getMissionStatus(mission.areaId) == 4 then + return 443 + end + end, onEventFinish = { diff --git a/scripts/missions/wotg/03_Cait_Sith.lua b/scripts/missions/wotg/03_Cait_Sith.lua index cecee6180e6..443c61e0829 100644 --- a/scripts/missions/wotg/03_Cait_Sith.lua +++ b/scripts/missions/wotg/03_Cait_Sith.lua @@ -31,14 +31,11 @@ mission.sections = [xi.zone.SOUTHERN_SAN_DORIA_S] = { - onZoneIn = - { - function(player, prevZone) - if prevZone == xi.zone.EAST_RONFAURE_S then - return 67 - end - end, - }, + onZoneIn = function(player, prevZone) + if prevZone == xi.zone.EAST_RONFAURE_S then + return 67 + end + end, onEventFinish = { diff --git a/scripts/missions/wotg/04_The_Queen_of_the_Dance.lua b/scripts/missions/wotg/04_The_Queen_of_the_Dance.lua index c66b1a551bf..2fa0b3a9bd6 100644 --- a/scripts/missions/wotg/04_The_Queen_of_the_Dance.lua +++ b/scripts/missions/wotg/04_The_Queen_of_the_Dance.lua @@ -74,18 +74,15 @@ mission.sections = { ['Lion_Springs'] = mission:progressEvent(70, 1, 0, 2964, 0, 66453367, 8366690, 4095, 131140), - onZoneIn = - { - function(player, prevZone) - local missionStatus = player:getMissionStatus(mission.areaId) - - if missionStatus == 3 then - return mission:progressEvent(152) - elseif missionStatus == 4 then - return mission:progressEvent(153) - end - end, - }, + onZoneIn = function(player, prevZone) + local missionStatus = player:getMissionStatus(mission.areaId) + + if missionStatus == 3 then + return mission:progressEvent(152) + elseif missionStatus == 4 then + return mission:progressEvent(153) + end + end, onEventUpdate = { diff --git a/scripts/missions/wotg/05_While_the_Cat_is_Away.lua b/scripts/missions/wotg/05_While_the_Cat_is_Away.lua index 6bc390bc3a2..62bdf12023b 100644 --- a/scripts/missions/wotg/05_While_the_Cat_is_Away.lua +++ b/scripts/missions/wotg/05_While_the_Cat_is_Away.lua @@ -24,14 +24,11 @@ mission.sections = [xi.zone.EAST_RONFAURE_S] = { - onZoneIn = - { - function(player, prevZone) - if prevZone == xi.zone.SOUTHERN_SAN_DORIA_S then - return 7 - end - end, - }, + onZoneIn = function(player, prevZone) + if prevZone == xi.zone.SOUTHERN_SAN_DORIA_S then + return 7 + end + end, onEventUpdate = { diff --git a/scripts/missions/wotg/06_A_Timeswept_Butterfly.lua b/scripts/missions/wotg/06_A_Timeswept_Butterfly.lua index a9cde5897fb..d02307b3424 100644 --- a/scripts/missions/wotg/06_A_Timeswept_Butterfly.lua +++ b/scripts/missions/wotg/06_A_Timeswept_Butterfly.lua @@ -24,14 +24,11 @@ mission.sections = [xi.zone.LA_VAULE_S] = { - onZoneIn = - { - function(player, prevZone) - if prevZone == xi.zone.JUGNER_FOREST_S then - return 1 - end - end, - }, + onZoneIn = function(player, prevZone) + if prevZone == xi.zone.JUGNER_FOREST_S then + return 1 + end + end, onEventFinish = { diff --git a/scripts/missions/wotg/07_Purple_The_New_Black.lua b/scripts/missions/wotg/07_Purple_The_New_Black.lua index d973327eb5d..cf4ee7c7ce7 100644 --- a/scripts/missions/wotg/07_Purple_The_New_Black.lua +++ b/scripts/missions/wotg/07_Purple_The_New_Black.lua @@ -45,14 +45,11 @@ mission.sections = [xi.zone.LA_VAULE_S] = { - onZoneIn = - { - function(player, prevZone) - if player:getMissionStatus(mission.areaId) == 2 then - return 6 - end - end, - }, + onZoneIn = function(player, prevZone) + if player:getMissionStatus(mission.areaId) == 2 then + return 6 + end + end, onEventFinish = { diff --git a/scripts/missions/wotg/14_A_Nation_on_the_Brink.lua b/scripts/missions/wotg/14_A_Nation_on_the_Brink.lua index 204a01e5c72..dfdd89f17ac 100644 --- a/scripts/missions/wotg/14_A_Nation_on_the_Brink.lua +++ b/scripts/missions/wotg/14_A_Nation_on_the_Brink.lua @@ -57,22 +57,19 @@ mission.sections = end, }, - onZoneIn = - { - function(player, prevZone) - local missionStatus = player:getMissionStatus(mission.areaId) - - if missionStatus == 2 then - return 4 - elseif missionStatus == 3 then - return 20 - elseif missionStatus == 4 then - return 21 - elseif missionStatus == 5 then - return 22 - end - end, - }, + onZoneIn = function(player, prevZone) + local missionStatus = player:getMissionStatus(mission.areaId) + + if missionStatus == 2 then + return 4 + elseif missionStatus == 3 then + return 20 + elseif missionStatus == 4 then + return 21 + elseif missionStatus == 5 then + return 22 + end + end, onEventUpdate = { diff --git a/scripts/missions/wotg/15_Crossroads_of_Time.lua b/scripts/missions/wotg/15_Crossroads_of_Time.lua index d367e28889e..11ff0036994 100644 --- a/scripts/missions/wotg/15_Crossroads_of_Time.lua +++ b/scripts/missions/wotg/15_Crossroads_of_Time.lua @@ -27,14 +27,11 @@ mission.sections = [xi.zone.SOUTHERN_SAN_DORIA_S] = { - onZoneIn = - { - function(player, prevZone) - if prevZone == xi.zone.EAST_RONFAURE_S then - return 145 - end - end, - }, + onZoneIn = function(player, prevZone) + if prevZone == xi.zone.EAST_RONFAURE_S then + return 145 + end + end, onEventFinish = { diff --git a/scripts/missions/wotg/17_Northland_Exposure.lua b/scripts/missions/wotg/17_Northland_Exposure.lua index 657f6ecc24d..e3ea26f2860 100644 --- a/scripts/missions/wotg/17_Northland_Exposure.lua +++ b/scripts/missions/wotg/17_Northland_Exposure.lua @@ -24,12 +24,9 @@ mission.sections = [xi.zone.BEAUCEDINE_GLACIER_S] = { - onZoneIn = - { - function(player, prevZone) - return 13 - end, - }, + onZoneIn = function(player, prevZone) + return 13 + end, onEventFinish = { diff --git a/scripts/missions/wotg/19_Betrayal_at_Beaucedine.lua b/scripts/missions/wotg/19_Betrayal_at_Beaucedine.lua index 4977f86e969..6f33238434c 100644 --- a/scripts/missions/wotg/19_Betrayal_at_Beaucedine.lua +++ b/scripts/missions/wotg/19_Betrayal_at_Beaucedine.lua @@ -34,8 +34,12 @@ mission.sections = return mission:progressEvent(15, 136, 300, 200, 100, 0, 9306122, 0, 0) elseif missionStatus == 1 then local zoneObj = player:getZone() - local mobHalphas = zoneObj:queryEntitiesByName('Count_Halphas')[1] + if not zoneObj then + return + end + + local mobHalphas = zoneObj:queryEntitiesByName('Count_Halphas')[1] if not mobHalphas:isSpawned() then SpawnMob(mobHalphas:getID()):updateClaim(player) @@ -62,14 +66,11 @@ mission.sections = end, }, - onZoneIn = - { - function(player, prevZone) - if mission:getVar(player, 'Status') == 3 then - return 30 - end - end, - }, + onZoneIn = function(player, prevZone) + if mission:getVar(player, 'Status') == 3 then + return 30 + end + end, onEventFinish = { diff --git a/scripts/missions/wotg/21_Proof_of_Valor.lua b/scripts/missions/wotg/21_Proof_of_Valor.lua index d5fcc42794d..dfdc412c663 100644 --- a/scripts/missions/wotg/21_Proof_of_Valor.lua +++ b/scripts/missions/wotg/21_Proof_of_Valor.lua @@ -35,7 +35,7 @@ local orcItems = local function completePetition(player, posBit, numSignatures) mission:setVarBit(player, 'Status', posBit) - mission:addVar(player, 'Option', numSignatures) + mission:incrementVar(player, 'Option', numSignatures) local totalSignatures = mission:getVar(player, 'Option') diff --git a/scripts/missions/wotg/22_A_Sanguinary_Prelude.lua b/scripts/missions/wotg/22_A_Sanguinary_Prelude.lua index 59d5087e54b..7595324cdb5 100644 --- a/scripts/missions/wotg/22_A_Sanguinary_Prelude.lua +++ b/scripts/missions/wotg/22_A_Sanguinary_Prelude.lua @@ -23,12 +23,9 @@ mission.sections = [xi.zone.BEAUCEDINE_GLACIER_S] = { - onZoneIn = - { - function(player, prevZone) - return 17 - end, - }, + onZoneIn = function(player, prevZone) + return 17 + end, onEventFinish = { diff --git a/scripts/missions/wotg/23_Dungeons_and_Dancers.lua b/scripts/missions/wotg/23_Dungeons_and_Dancers.lua index 2bb9f924730..465fb933c9a 100644 --- a/scripts/missions/wotg/23_Dungeons_and_Dancers.lua +++ b/scripts/missions/wotg/23_Dungeons_and_Dancers.lua @@ -48,14 +48,11 @@ mission.sections = end, }, - onZoneIn = - { - function(player, prevZone) - if mission:getVar(player, 'Status') == 2 then - return 18 - end - end, - }, + onZoneIn = function(player, prevZone) + if mission:getVar(player, 'Status') == 2 then + return 18 + end + end, onEventFinish = { diff --git a/scripts/missions/wotg/24_Distorter_of_Time.lua b/scripts/missions/wotg/24_Distorter_of_Time.lua index e90bd10b58b..5273f45e350 100644 --- a/scripts/missions/wotg/24_Distorter_of_Time.lua +++ b/scripts/missions/wotg/24_Distorter_of_Time.lua @@ -38,14 +38,11 @@ mission.sections = end, }, - onZoneIn = - { - function(player, prevZone) - if mission:getVar(player, 'Status') == 1 then - return 19 - end - end, - }, + onZoneIn = function(player, prevZone) + if mission:getVar(player, 'Status') == 1 then + return 19 + end + end, onEventFinish = { diff --git a/scripts/missions/wotg/26_Fate_in_Haze.lua b/scripts/missions/wotg/26_Fate_in_Haze.lua index fa35e0d7316..d171bb888c5 100644 --- a/scripts/missions/wotg/26_Fate_in_Haze.lua +++ b/scripts/missions/wotg/26_Fate_in_Haze.lua @@ -45,18 +45,15 @@ mission.sections = end, }, - onZoneIn = - { - function(player, prevZone) - local missionStatus = mission:getVar(player, 'Status') + onZoneIn = function(player, prevZone) + local missionStatus = mission:getVar(player, 'Status') - if missionStatus == 1 then - return 154 - elseif missionStatus == 2 then - return 155 - end - end, - }, + if missionStatus == 1 then + return 154 + elseif missionStatus == 2 then + return 155 + end + end, onEventUpdate = { diff --git a/scripts/missions/wotg/28_Another_World.lua b/scripts/missions/wotg/28_Another_World.lua index 557b519fb8c..2d8b0409937 100644 --- a/scripts/missions/wotg/28_Another_World.lua +++ b/scripts/missions/wotg/28_Another_World.lua @@ -23,14 +23,11 @@ mission.sections = [xi.zone.SOUTHERN_SAN_DORIA] = { - onZoneIn = - { - function(player, prevZone) - if prevZone == xi.zone.EAST_RONFAURE then - return 945 - end - end, - }, + onZoneIn = function(player, prevZone) + if prevZone == xi.zone.EAST_RONFAURE then + return 945 + end + end, onEventFinish = { diff --git a/scripts/missions/wotg/30_The_Battle_of_Xarcabard.lua b/scripts/missions/wotg/30_The_Battle_of_Xarcabard.lua index 660ffd53940..8b25ebf99b7 100644 --- a/scripts/missions/wotg/30_The_Battle_of_Xarcabard.lua +++ b/scripts/missions/wotg/30_The_Battle_of_Xarcabard.lua @@ -34,14 +34,11 @@ mission.sections = end, }, - onZoneIn = - { - function(player, prevZone) - if mission:getVar(player, 'Status') == 0 then - return 17 - end - end, - }, + onZoneIn = function(player, prevZone) + if mission:getVar(player, 'Status') == 0 then + return 17 + end + end, onEventFinish = { diff --git a/scripts/missions/wotg/31_Prelude_to_a_Storm.lua b/scripts/missions/wotg/31_Prelude_to_a_Storm.lua index ef2c2702411..2f389887a86 100644 --- a/scripts/missions/wotg/31_Prelude_to_a_Storm.lua +++ b/scripts/missions/wotg/31_Prelude_to_a_Storm.lua @@ -64,14 +64,11 @@ mission.sections = end, }, - onZoneIn = - { - function(player, prevZone) - if mission:getVar(player, 'Status') == 2 then - return 22 - end - end, - }, + onZoneIn = function(player, prevZone) + if mission:getVar(player, 'Status') == 2 then + return 22 + end + end, onEventUpdate = { diff --git a/scripts/missions/wotg/32_Storms_Crescendo.lua b/scripts/missions/wotg/32_Storms_Crescendo.lua index c26eb9d931c..92dd7a5f434 100644 --- a/scripts/missions/wotg/32_Storms_Crescendo.lua +++ b/scripts/missions/wotg/32_Storms_Crescendo.lua @@ -70,18 +70,15 @@ mission.sections = end, }, - onZoneIn = - { - function(player, prevZone) - local missionStatus = mission:getVar(player, 'Status') - - if missionStatus == 2 then - return 20 - elseif missionStatus == 4 then - return 39 - end - end, - }, + onZoneIn = function(player, prevZone) + local missionStatus = mission:getVar(player, 'Status') + + if missionStatus == 2 then + return 20 + elseif missionStatus == 4 then + return 39 + end + end, onEventFinish = { diff --git a/scripts/missions/wotg/33_Into_the_Beasts_Maw.lua b/scripts/missions/wotg/33_Into_the_Beasts_Maw.lua index 939638beed7..abf27419bd0 100644 --- a/scripts/missions/wotg/33_Into_the_Beasts_Maw.lua +++ b/scripts/missions/wotg/33_Into_the_Beasts_Maw.lua @@ -65,22 +65,19 @@ mission.sections = end, }, - onZoneIn = - { - function(player, prevZone) - local missionStatus = mission:getVar(player, 'Status') - - if missionStatus == 0 then - return 1 - elseif missionStatus == 2 then - return 14 - elseif missionStatus == 3 then - return 15 - elseif missionStatus == 5 then - return 3 - end - end, - }, + onZoneIn = function(player, prevZone) + local missionStatus = mission:getVar(player, 'Status') + + if missionStatus == 0 then + return 1 + elseif missionStatus == 2 then + return 14 + elseif missionStatus == 3 then + return 15 + elseif missionStatus == 5 then + return 3 + end + end, onEventUpdate = { diff --git a/scripts/missions/wotg/36_Fall_of_the_Hawk.lua b/scripts/missions/wotg/36_Fall_of_the_Hawk.lua index 231bb9e0908..3a90166053d 100644 --- a/scripts/missions/wotg/36_Fall_of_the_Hawk.lua +++ b/scripts/missions/wotg/36_Fall_of_the_Hawk.lua @@ -22,12 +22,9 @@ mission.sections = [xi.zone.CASTLE_ZVAHL_BAILEYS_S] = { - onZoneIn = - { - function(player, prevZone) - return 4 - end, - }, + onZoneIn = function(player, prevZone) + return 4 + end, onEventFinish = { diff --git a/scripts/missions/wotg/37_Darkness_Descends.lua b/scripts/missions/wotg/37_Darkness_Descends.lua index 5f30b39a466..6374539e1f3 100644 --- a/scripts/missions/wotg/37_Darkness_Descends.lua +++ b/scripts/missions/wotg/37_Darkness_Descends.lua @@ -22,18 +22,15 @@ mission.sections = [xi.zone.THRONE_ROOM_S] = { - onZoneIn = - { - function(player, prevZone) - local missionStatus = mission:getVar(player, 'Status') + onZoneIn = function(player, prevZone) + local missionStatus = mission:getVar(player, 'Status') - if missionStatus == 0 then - return 8 - elseif missionStatus == 2 then - return 10 - end - end, - }, + if missionStatus == 0 then + return 8 + elseif missionStatus == 2 then + return 10 + end + end, onEventUpdate = { diff --git a/scripts/missions/wotg/46_When_Wills_Collide.lua b/scripts/missions/wotg/46_When_Wills_Collide.lua index 0333db005e4..82bbaaea378 100644 --- a/scripts/missions/wotg/46_When_Wills_Collide.lua +++ b/scripts/missions/wotg/46_When_Wills_Collide.lua @@ -72,14 +72,11 @@ mission.sections = end, }, - onZoneIn = - { - function(player, prevZone) - if mission:getVar(player, 'Status') == 2 then - return 2 - end - end, - }, + onZoneIn = function(player, prevZone) + if mission:getVar(player, 'Status') == 2 then + return 2 + end + end, onEventUpdate = { diff --git a/scripts/missions/wotg/54_Lest_We_Forget.lua b/scripts/missions/wotg/54_Lest_We_Forget.lua index 67f1c0033d5..6fdc6895eb0 100644 --- a/scripts/missions/wotg/54_Lest_We_Forget.lua +++ b/scripts/missions/wotg/54_Lest_We_Forget.lua @@ -69,17 +69,14 @@ mission.sections = end, }, - afterZoneIn = - { - function(player) - if - not player:hasItem(xi.item.MOONSHADE_EARRING) and - mission:getVar(player, 'Status') == 0 - then - mission:setLocalVar(player, 'Option', 1) - end - end, - }, + afterZoneIn = function(player) + if + not player:hasItem(xi.item.MOONSHADE_EARRING) and + mission:getVar(player, 'Status') == 0 + then + mission:setLocalVar(player, 'Option', 1) + end + end, onEventUpdate = { diff --git a/scripts/zones/Jugner_Forest/mobs/Fradubio.lua b/scripts/zones/Jugner_Forest/mobs/Fradubio.lua index a20246f6372..29124b0a6f4 100644 --- a/scripts/zones/Jugner_Forest/mobs/Fradubio.lua +++ b/scripts/zones/Jugner_Forest/mobs/Fradubio.lua @@ -40,6 +40,7 @@ entity.onMobWeaponSkill = function(target, mob, skill) if mobTarget then pet:updateEnmity(mobTarget) end + break end end