From 099dc7406a5c273a174f59a2f65bda6045a09510 Mon Sep 17 00:00:00 2001 From: hookstar Date: Sat, 11 May 2024 08:48:28 -0500 Subject: [PATCH] [Cleanup]Standardize AF Quest Names --- .../ahtUrhgan/{Beginnings.lua => BLU_AF1_Beginnings.lua} | 0 scripts/quests/ahtUrhgan/{Omens.lua => BLU_AF2_Omens.lua} | 0 .../{Transformations.lua => BLU_AF3_Transformations.lua} | 0 ...ll_Occasions.lua => COR_AF1_Equipped_for_All_Occasions.lua} | 0 .../quests/bastok/{Dark_Legacy.lua => DRK_AF1_Dark_Legacy.lua} | 0 .../quests/bastok/{Dark_Puppet.lua => DRK_AF2_Dark_Puppet.lua} | 0 .../bastok/{Blade_of_Evil.lua => DRK_AF3_Blade_of_Evil.lua} | 3 ++- .../{Ghosts_of_the_Past.lua => MNK_AF1_Ghosts_of_the_Past.lua} | 2 +- .../{The_First_Meeting.lua => MNK_AF2_The_First_Meeting.lua} | 2 +- .../bastok/{True_Strength.lua => MNK_AF3_True_Strength.lua} | 2 +- .../quests/bastok/{The_Doorman.lua => WAR_AF1_The_Doorman.lua} | 2 +- ...Talekeepers_Truth.lua => WAR_AF2_The_Talekeepers_Truth.lua} | 2 +- ...e_Talekeepers_Gift.lua => WAR_AF3_The_Talekeepers_Gift.lua} | 1 + .../{On_Sabbatical.lua => SCH_AF1_On_Sabbatical.lua} | 0 .../{Downward_Helix.lua => SCH_AF2_Downward_Helix.lua} | 0 ...e_Unfinished_Waltz.lua => DNC_AF1_The_Unfinished_Waltz.lua} | 0 ...The_Road_to_Divadom.lua => DNC_AF2_The_Road_to_Divadom.lua} | 0 .../jeuno/{Comeback_Queen.lua => DNC_AF3_Comeback_Queen.lua} | 0 .../{The_Sacred_Katana.lua => SAM_AF1_The_Sacred_Katana.lua} | 0 .../quests/outlands/{Yomi_Okuri.lua => SAM_AF2_Yomi_Okuri.lua} | 0 .../{A_Thief_in_Norg.lua => SAM_AF3_A_Thief_in_Norg.lua} | 0 scripts/quests/sandoria/RDM_AF1_The_Crimson_Trial.lua | 2 +- scripts/quests/sandoria/RDM_AF2_Enveloped_in_Darkness.lua | 2 +- .../{The_Puppet_Master.lua => SMN_AF1_The_Puppet_Master.lua} | 0 ...Tenshodo_Showdown.lua => THF_AF1_The_Tenshodo_Showdown.lua} | 0 ...As_Thick_as_Thieves.lua => THF_AF2_As_Thick_as_Thieves.lua} | 0 ...g_the_Marquisate.lua => THF_AF3_Hitting_the_Marquisate.lua} | 0 27 files changed, 10 insertions(+), 8 deletions(-) rename scripts/quests/ahtUrhgan/{Beginnings.lua => BLU_AF1_Beginnings.lua} (100%) rename scripts/quests/ahtUrhgan/{Omens.lua => BLU_AF2_Omens.lua} (100%) rename scripts/quests/ahtUrhgan/{Transformations.lua => BLU_AF3_Transformations.lua} (100%) rename scripts/quests/ahtUrhgan/{Equipped_for_All_Occasions.lua => COR_AF1_Equipped_for_All_Occasions.lua} (100%) rename scripts/quests/bastok/{Dark_Legacy.lua => DRK_AF1_Dark_Legacy.lua} (100%) rename scripts/quests/bastok/{Dark_Puppet.lua => DRK_AF2_Dark_Puppet.lua} (100%) rename scripts/quests/bastok/{Blade_of_Evil.lua => DRK_AF3_Blade_of_Evil.lua} (96%) rename scripts/quests/bastok/{Ghosts_of_the_Past.lua => MNK_AF1_Ghosts_of_the_Past.lua} (97%) rename scripts/quests/bastok/{The_First_Meeting.lua => MNK_AF2_The_First_Meeting.lua} (98%) rename scripts/quests/bastok/{True_Strength.lua => MNK_AF3_True_Strength.lua} (97%) rename scripts/quests/bastok/{The_Doorman.lua => WAR_AF1_The_Doorman.lua} (98%) rename scripts/quests/bastok/{The_Talekeepers_Truth.lua => WAR_AF2_The_Talekeepers_Truth.lua} (98%) rename scripts/quests/bastok/{The_Talekeepers_Gift.lua => WAR_AF3_The_Talekeepers_Gift.lua} (98%) rename scripts/quests/crystalWar/{On_Sabbatical.lua => SCH_AF1_On_Sabbatical.lua} (100%) rename scripts/quests/crystalWar/{Downward_Helix.lua => SCH_AF2_Downward_Helix.lua} (100%) rename scripts/quests/jeuno/{The_Unfinished_Waltz.lua => DNC_AF1_The_Unfinished_Waltz.lua} (100%) rename scripts/quests/jeuno/{The_Road_to_Divadom.lua => DNC_AF2_The_Road_to_Divadom.lua} (100%) rename scripts/quests/jeuno/{Comeback_Queen.lua => DNC_AF3_Comeback_Queen.lua} (100%) rename scripts/quests/outlands/{The_Sacred_Katana.lua => SAM_AF1_The_Sacred_Katana.lua} (100%) rename scripts/quests/outlands/{Yomi_Okuri.lua => SAM_AF2_Yomi_Okuri.lua} (100%) rename scripts/quests/outlands/{A_Thief_in_Norg.lua => SAM_AF3_A_Thief_in_Norg.lua} (100%) rename scripts/quests/windurst/{The_Puppet_Master.lua => SMN_AF1_The_Puppet_Master.lua} (100%) rename scripts/quests/windurst/{The_Tenshodo_Showdown.lua => THF_AF1_The_Tenshodo_Showdown.lua} (100%) rename scripts/quests/windurst/{As_Thick_as_Thieves.lua => THF_AF2_As_Thick_as_Thieves.lua} (100%) rename scripts/quests/windurst/{Hitting_the_Marquisate.lua => THF_AF3_Hitting_the_Marquisate.lua} (100%) diff --git a/scripts/quests/ahtUrhgan/Beginnings.lua b/scripts/quests/ahtUrhgan/BLU_AF1_Beginnings.lua similarity index 100% rename from scripts/quests/ahtUrhgan/Beginnings.lua rename to scripts/quests/ahtUrhgan/BLU_AF1_Beginnings.lua diff --git a/scripts/quests/ahtUrhgan/Omens.lua b/scripts/quests/ahtUrhgan/BLU_AF2_Omens.lua similarity index 100% rename from scripts/quests/ahtUrhgan/Omens.lua rename to scripts/quests/ahtUrhgan/BLU_AF2_Omens.lua diff --git a/scripts/quests/ahtUrhgan/Transformations.lua b/scripts/quests/ahtUrhgan/BLU_AF3_Transformations.lua similarity index 100% rename from scripts/quests/ahtUrhgan/Transformations.lua rename to scripts/quests/ahtUrhgan/BLU_AF3_Transformations.lua diff --git a/scripts/quests/ahtUrhgan/Equipped_for_All_Occasions.lua b/scripts/quests/ahtUrhgan/COR_AF1_Equipped_for_All_Occasions.lua similarity index 100% rename from scripts/quests/ahtUrhgan/Equipped_for_All_Occasions.lua rename to scripts/quests/ahtUrhgan/COR_AF1_Equipped_for_All_Occasions.lua diff --git a/scripts/quests/bastok/Dark_Legacy.lua b/scripts/quests/bastok/DRK_AF1_Dark_Legacy.lua similarity index 100% rename from scripts/quests/bastok/Dark_Legacy.lua rename to scripts/quests/bastok/DRK_AF1_Dark_Legacy.lua diff --git a/scripts/quests/bastok/Dark_Puppet.lua b/scripts/quests/bastok/DRK_AF2_Dark_Puppet.lua similarity index 100% rename from scripts/quests/bastok/Dark_Puppet.lua rename to scripts/quests/bastok/DRK_AF2_Dark_Puppet.lua diff --git a/scripts/quests/bastok/Blade_of_Evil.lua b/scripts/quests/bastok/DRK_AF3_Blade_of_Evil.lua similarity index 96% rename from scripts/quests/bastok/Blade_of_Evil.lua rename to scripts/quests/bastok/DRK_AF3_Blade_of_Evil.lua index f01b8820dfb..a277bd079c5 100644 --- a/scripts/quests/bastok/Blade_of_Evil.lua +++ b/scripts/quests/bastok/DRK_AF3_Blade_of_Evil.lua @@ -23,7 +23,8 @@ quest.sections = check = function(player, status, vars) return status == xi.questStatus.QUEST_AVAILABLE and player:hasCompletedQuest(xi.questLog.BASTOK, xi.quest.id.bastok.DARK_PUPPET) and - player:getMainJob() == xi.job.DRK + player:getMainJob() == xi.job.DRK and + player:getMainLvl() >= xi.settings.main.AF3_QUEST_LEVEL end, [xi.zone.BEADEAUX] = diff --git a/scripts/quests/bastok/Ghosts_of_the_Past.lua b/scripts/quests/bastok/MNK_AF1_Ghosts_of_the_Past.lua similarity index 97% rename from scripts/quests/bastok/Ghosts_of_the_Past.lua rename to scripts/quests/bastok/MNK_AF1_Ghosts_of_the_Past.lua index bea42058d0a..95b06d238b7 100644 --- a/scripts/quests/bastok/Ghosts_of_the_Past.lua +++ b/scripts/quests/bastok/MNK_AF1_Ghosts_of_the_Past.lua @@ -23,7 +23,7 @@ quest.sections = check = function(player, status, vars) return status == xi.questStatus.QUEST_AVAILABLE and player:getMainJob() == xi.job.MNK and - player:getMainLvl() >= 40 + player:getMainLvl() >= xi.settings.main.AF1_QUEST_LEVEL end, [xi.zone.PORT_BASTOK] = diff --git a/scripts/quests/bastok/The_First_Meeting.lua b/scripts/quests/bastok/MNK_AF2_The_First_Meeting.lua similarity index 98% rename from scripts/quests/bastok/The_First_Meeting.lua rename to scripts/quests/bastok/MNK_AF2_The_First_Meeting.lua index f3700d544f3..f4592862840 100644 --- a/scripts/quests/bastok/The_First_Meeting.lua +++ b/scripts/quests/bastok/MNK_AF2_The_First_Meeting.lua @@ -25,7 +25,7 @@ quest.sections = not quest:getMustZone(player) and player:hasCompletedQuest(xi.questLog.BASTOK, xi.quest.id.bastok.GHOSTS_OF_THE_PAST) and player:getMainJob() == xi.job.MNK and - player:getMainLvl() >= 50 + player:getMainLvl() >= xi.settings.main.AF2_QUEST_LEVEL end, [xi.zone.PORT_BASTOK] = diff --git a/scripts/quests/bastok/True_Strength.lua b/scripts/quests/bastok/MNK_AF3_True_Strength.lua similarity index 97% rename from scripts/quests/bastok/True_Strength.lua rename to scripts/quests/bastok/MNK_AF3_True_Strength.lua index 7f0f72721b2..d9f582cf822 100644 --- a/scripts/quests/bastok/True_Strength.lua +++ b/scripts/quests/bastok/MNK_AF3_True_Strength.lua @@ -25,7 +25,7 @@ quest.sections = return status == xi.questStatus.QUEST_AVAILABLE and player:hasCompletedQuest(xi.questLog.BASTOK, xi.quest.id.bastok.THE_FIRST_MEETING) and player:getMainJob() == xi.job.MNK and - player:getMainLvl() >= 50 + player:getMainLvl() >= xi.settings.main.AF3_QUEST_LEVEL end, [xi.zone.METALWORKS] = diff --git a/scripts/quests/bastok/The_Doorman.lua b/scripts/quests/bastok/WAR_AF1_The_Doorman.lua similarity index 98% rename from scripts/quests/bastok/The_Doorman.lua rename to scripts/quests/bastok/WAR_AF1_The_Doorman.lua index 6ddd17482f0..e9e5d348ca7 100644 --- a/scripts/quests/bastok/The_Doorman.lua +++ b/scripts/quests/bastok/WAR_AF1_The_Doorman.lua @@ -24,7 +24,7 @@ quest.sections = check = function(player, status, vars) return status == xi.questStatus.QUEST_AVAILABLE and player:getMainJob() == xi.job.WAR and - player:getMainLvl() >= 40 + player:getMainLvl() >= xi.settings.main.AF1_QUEST_LEVEL end, [xi.zone.BASTOK_MINES] = diff --git a/scripts/quests/bastok/The_Talekeepers_Truth.lua b/scripts/quests/bastok/WAR_AF2_The_Talekeepers_Truth.lua similarity index 98% rename from scripts/quests/bastok/The_Talekeepers_Truth.lua rename to scripts/quests/bastok/WAR_AF2_The_Talekeepers_Truth.lua index ad0c38d8642..ca4d95b4a24 100644 --- a/scripts/quests/bastok/The_Talekeepers_Truth.lua +++ b/scripts/quests/bastok/WAR_AF2_The_Talekeepers_Truth.lua @@ -25,7 +25,7 @@ quest.sections = return status == xi.questStatus.QUEST_AVAILABLE and player:hasCompletedQuest(xi.questLog.BASTOK, xi.quest.id.bastok.THE_DOORMAN) and player:getMainJob() == xi.job.WAR and - player:getMainLvl() >= 50 + player:getMainLvl() >= xi.settings.main.AF2_QUEST_LEVEL end, [xi.zone.BASTOK_MINES] = diff --git a/scripts/quests/bastok/The_Talekeepers_Gift.lua b/scripts/quests/bastok/WAR_AF3_The_Talekeepers_Gift.lua similarity index 98% rename from scripts/quests/bastok/The_Talekeepers_Gift.lua rename to scripts/quests/bastok/WAR_AF3_The_Talekeepers_Gift.lua index 15db6647d47..ac04bdf06b5 100644 --- a/scripts/quests/bastok/The_Talekeepers_Gift.lua +++ b/scripts/quests/bastok/WAR_AF3_The_Talekeepers_Gift.lua @@ -26,6 +26,7 @@ quest.sections = return status == xi.questStatus.QUEST_AVAILABLE and player:hasCompletedQuest(xi.questLog.BASTOK, xi.quest.id.bastok.THE_TALEKEEPERS_TRUTH) and player:getMainJob() == xi.job.WAR and + player:getMainLvl() >= xi.settings.main.AF3_QUEST_LEVEL and quest:getVar(player, 'Timer') <= VanadielUniqueDay() and not quest:getMustZone(player) end, diff --git a/scripts/quests/crystalWar/On_Sabbatical.lua b/scripts/quests/crystalWar/SCH_AF1_On_Sabbatical.lua similarity index 100% rename from scripts/quests/crystalWar/On_Sabbatical.lua rename to scripts/quests/crystalWar/SCH_AF1_On_Sabbatical.lua diff --git a/scripts/quests/crystalWar/Downward_Helix.lua b/scripts/quests/crystalWar/SCH_AF2_Downward_Helix.lua similarity index 100% rename from scripts/quests/crystalWar/Downward_Helix.lua rename to scripts/quests/crystalWar/SCH_AF2_Downward_Helix.lua diff --git a/scripts/quests/jeuno/The_Unfinished_Waltz.lua b/scripts/quests/jeuno/DNC_AF1_The_Unfinished_Waltz.lua similarity index 100% rename from scripts/quests/jeuno/The_Unfinished_Waltz.lua rename to scripts/quests/jeuno/DNC_AF1_The_Unfinished_Waltz.lua diff --git a/scripts/quests/jeuno/The_Road_to_Divadom.lua b/scripts/quests/jeuno/DNC_AF2_The_Road_to_Divadom.lua similarity index 100% rename from scripts/quests/jeuno/The_Road_to_Divadom.lua rename to scripts/quests/jeuno/DNC_AF2_The_Road_to_Divadom.lua diff --git a/scripts/quests/jeuno/Comeback_Queen.lua b/scripts/quests/jeuno/DNC_AF3_Comeback_Queen.lua similarity index 100% rename from scripts/quests/jeuno/Comeback_Queen.lua rename to scripts/quests/jeuno/DNC_AF3_Comeback_Queen.lua diff --git a/scripts/quests/outlands/The_Sacred_Katana.lua b/scripts/quests/outlands/SAM_AF1_The_Sacred_Katana.lua similarity index 100% rename from scripts/quests/outlands/The_Sacred_Katana.lua rename to scripts/quests/outlands/SAM_AF1_The_Sacred_Katana.lua diff --git a/scripts/quests/outlands/Yomi_Okuri.lua b/scripts/quests/outlands/SAM_AF2_Yomi_Okuri.lua similarity index 100% rename from scripts/quests/outlands/Yomi_Okuri.lua rename to scripts/quests/outlands/SAM_AF2_Yomi_Okuri.lua diff --git a/scripts/quests/outlands/A_Thief_in_Norg.lua b/scripts/quests/outlands/SAM_AF3_A_Thief_in_Norg.lua similarity index 100% rename from scripts/quests/outlands/A_Thief_in_Norg.lua rename to scripts/quests/outlands/SAM_AF3_A_Thief_in_Norg.lua diff --git a/scripts/quests/sandoria/RDM_AF1_The_Crimson_Trial.lua b/scripts/quests/sandoria/RDM_AF1_The_Crimson_Trial.lua index 5048e3eaff4..e41b515dae4 100644 --- a/scripts/quests/sandoria/RDM_AF1_The_Crimson_Trial.lua +++ b/scripts/quests/sandoria/RDM_AF1_The_Crimson_Trial.lua @@ -25,7 +25,7 @@ quest.sections = check = function(player, status, vars) return status == xi.questStatus.QUEST_AVAILABLE and player:getMainJob() == xi.job.RDM and - player:getMainLvl() >= 40 + player:getMainLvl() >= xi.settings.main.AF1_QUEST_LEVEL end, [xi.zone.SOUTHERN_SAN_DORIA] = diff --git a/scripts/quests/sandoria/RDM_AF2_Enveloped_in_Darkness.lua b/scripts/quests/sandoria/RDM_AF2_Enveloped_in_Darkness.lua index 6ebc71897f8..b4685cc14d1 100644 --- a/scripts/quests/sandoria/RDM_AF2_Enveloped_in_Darkness.lua +++ b/scripts/quests/sandoria/RDM_AF2_Enveloped_in_Darkness.lua @@ -26,7 +26,7 @@ quest.sections = return status == xi.questStatus.QUEST_AVAILABLE and player:getQuestStatus(xi.questLog.SANDORIA, xi.quest.id.sandoria.THE_CRIMSON_TRIAL) == xi.questStatus.QUEST_COMPLETED and player:getMainJob() == xi.job.RDM and - player:getMainLvl() >= 50 + player:getMainLvl() >= xi.settings.main.AF2_QUEST_LEVEL end, [xi.zone.CHATEAU_DORAGUILLE] = diff --git a/scripts/quests/windurst/The_Puppet_Master.lua b/scripts/quests/windurst/SMN_AF1_The_Puppet_Master.lua similarity index 100% rename from scripts/quests/windurst/The_Puppet_Master.lua rename to scripts/quests/windurst/SMN_AF1_The_Puppet_Master.lua diff --git a/scripts/quests/windurst/The_Tenshodo_Showdown.lua b/scripts/quests/windurst/THF_AF1_The_Tenshodo_Showdown.lua similarity index 100% rename from scripts/quests/windurst/The_Tenshodo_Showdown.lua rename to scripts/quests/windurst/THF_AF1_The_Tenshodo_Showdown.lua diff --git a/scripts/quests/windurst/As_Thick_as_Thieves.lua b/scripts/quests/windurst/THF_AF2_As_Thick_as_Thieves.lua similarity index 100% rename from scripts/quests/windurst/As_Thick_as_Thieves.lua rename to scripts/quests/windurst/THF_AF2_As_Thick_as_Thieves.lua diff --git a/scripts/quests/windurst/Hitting_the_Marquisate.lua b/scripts/quests/windurst/THF_AF3_Hitting_the_Marquisate.lua similarity index 100% rename from scripts/quests/windurst/Hitting_the_Marquisate.lua rename to scripts/quests/windurst/THF_AF3_Hitting_the_Marquisate.lua