From 5e440f63676312889a11da48880a49f027bb99c7 Mon Sep 17 00:00:00 2001 From: ThrisStraizo <45871917+ThrisStraizo@users.noreply.github.com> Date: Sat, 13 Jun 2026 11:40:16 -0700 Subject: [PATCH] [lua] More Maat adjustments This PR adjusts the quest finished dialogue for Maat after obtaining Maats cap, setting the level cap to max level instead of 99, and removing the titles in the mob luas as its already provided in the IF. --- .../Chamber_of_Oracles/shattering_stars_drg.lua | 2 +- .../Chamber_of_Oracles/shattering_stars_nin.lua | 2 +- .../Chamber_of_Oracles/shattering_stars_sam.lua | 2 +- .../battlefields/Waughroon_Shrine/shattering_stars_bst.lua | 2 +- .../battlefields/Waughroon_Shrine/shattering_stars_rdm.lua | 2 +- .../battlefields/Waughroon_Shrine/shattering_stars_thf.lua | 2 +- scripts/quests/jeuno/LB05_2_Beyond_the_Sun.lua | 7 ++++++- scripts/zones/Balgas_Dais/mobs/Maat_mnk.lua | 1 - scripts/zones/Balgas_Dais/mobs/Maat_smn.lua | 1 - scripts/zones/Balgas_Dais/mobs/Maat_whm.lua | 2 -- scripts/zones/Chamber_of_Oracles/mobs/Maat_drg.lua | 1 - scripts/zones/Chamber_of_Oracles/mobs/Maat_nin.lua | 1 - scripts/zones/Chamber_of_Oracles/mobs/Maat_sam.lua | 1 - scripts/zones/Horlais_Peak/mobs/Maat_blm.lua | 1 - scripts/zones/Horlais_Peak/mobs/Maat_rng.lua | 1 - scripts/zones/Horlais_Peak/mobs/Maat_war.lua | 1 - scripts/zones/QuBia_Arena/mobs/Maat_brd.lua | 1 - scripts/zones/QuBia_Arena/mobs/Maat_drk.lua | 1 - scripts/zones/QuBia_Arena/mobs/Maat_pld.lua | 1 - scripts/zones/Waughroon_Shrine/mobs/Maat_thf.lua | 2 -- 20 files changed, 12 insertions(+), 22 deletions(-) diff --git a/scripts/battlefields/Chamber_of_Oracles/shattering_stars_drg.lua b/scripts/battlefields/Chamber_of_Oracles/shattering_stars_drg.lua index 29e0c7823ec..ed3d58a0bd6 100644 --- a/scripts/battlefields/Chamber_of_Oracles/shattering_stars_drg.lua +++ b/scripts/battlefields/Chamber_of_Oracles/shattering_stars_drg.lua @@ -9,7 +9,7 @@ local content = Battlefield:new({ zoneId = xi.zone.CHAMBER_OF_ORACLES, battlefieldId = xi.battlefield.id.SHATTERING_STARS_DRG, maxPlayers = 1, - levelCap = 99, + levelCap = xi.settings.main.MAX_LEVEL, allowSubjob = false, timeLimit = utils.minutes(10), index = 4, diff --git a/scripts/battlefields/Chamber_of_Oracles/shattering_stars_nin.lua b/scripts/battlefields/Chamber_of_Oracles/shattering_stars_nin.lua index 3819390629c..748a8d5630e 100644 --- a/scripts/battlefields/Chamber_of_Oracles/shattering_stars_nin.lua +++ b/scripts/battlefields/Chamber_of_Oracles/shattering_stars_nin.lua @@ -9,7 +9,7 @@ local content = Battlefield:new({ zoneId = xi.zone.CHAMBER_OF_ORACLES, battlefieldId = xi.battlefield.id.SHATTERING_STARS_NIN, maxPlayers = 1, - levelCap = 99, + levelCap = xi.settings.main.MAX_LEVEL, allowSubjob = false, timeLimit = utils.minutes(10), index = 3, diff --git a/scripts/battlefields/Chamber_of_Oracles/shattering_stars_sam.lua b/scripts/battlefields/Chamber_of_Oracles/shattering_stars_sam.lua index 5b62abcd216..b78519da678 100644 --- a/scripts/battlefields/Chamber_of_Oracles/shattering_stars_sam.lua +++ b/scripts/battlefields/Chamber_of_Oracles/shattering_stars_sam.lua @@ -9,7 +9,7 @@ local content = Battlefield:new({ zoneId = xi.zone.CHAMBER_OF_ORACLES, battlefieldId = xi.battlefield.id.SHATTERING_STARS_SAM, maxPlayers = 1, - levelCap = 99, + levelCap = xi.settings.main.MAX_LEVEL, allowSubjob = false, timeLimit = utils.minutes(10), index = 2, diff --git a/scripts/battlefields/Waughroon_Shrine/shattering_stars_bst.lua b/scripts/battlefields/Waughroon_Shrine/shattering_stars_bst.lua index 476c89a3095..98bf51d32da 100644 --- a/scripts/battlefields/Waughroon_Shrine/shattering_stars_bst.lua +++ b/scripts/battlefields/Waughroon_Shrine/shattering_stars_bst.lua @@ -9,7 +9,7 @@ local content = Battlefield:new({ zoneId = xi.zone.WAUGHROON_SHRINE, battlefieldId = xi.battlefield.id.SHATTERING_STARS_BST, maxPlayers = 1, - levelCap = 99, + levelCap = xi.settings.main.MAX_LEVEL, allowSubjob = false, timeLimit = utils.minutes(10), index = 8, diff --git a/scripts/battlefields/Waughroon_Shrine/shattering_stars_rdm.lua b/scripts/battlefields/Waughroon_Shrine/shattering_stars_rdm.lua index b8d9634b304..a7112bf74c7 100644 --- a/scripts/battlefields/Waughroon_Shrine/shattering_stars_rdm.lua +++ b/scripts/battlefields/Waughroon_Shrine/shattering_stars_rdm.lua @@ -9,7 +9,7 @@ local content = Battlefield:new({ zoneId = xi.zone.WAUGHROON_SHRINE, battlefieldId = xi.battlefield.id.SHATTERING_STARS_RDM, maxPlayers = 1, - levelCap = 99, + levelCap = xi.settings.main.MAX_LEVEL, allowSubjob = false, timeLimit = utils.minutes(10), index = 6, diff --git a/scripts/battlefields/Waughroon_Shrine/shattering_stars_thf.lua b/scripts/battlefields/Waughroon_Shrine/shattering_stars_thf.lua index 95a1c778c4b..9d3be4751f6 100644 --- a/scripts/battlefields/Waughroon_Shrine/shattering_stars_thf.lua +++ b/scripts/battlefields/Waughroon_Shrine/shattering_stars_thf.lua @@ -9,7 +9,7 @@ local content = Battlefield:new({ zoneId = xi.zone.WAUGHROON_SHRINE, battlefieldId = xi.battlefield.id.SHATTERING_STARS_THF, maxPlayers = 1, - levelCap = 99, + levelCap = xi.settings.main.MAX_LEVEL, allowSubjob = false, timeLimit = utils.minutes(10), index = 7, diff --git a/scripts/quests/jeuno/LB05_2_Beyond_the_Sun.lua b/scripts/quests/jeuno/LB05_2_Beyond_the_Sun.lua index 6c0f9452103..4ab8cb303c4 100644 --- a/scripts/quests/jeuno/LB05_2_Beyond_the_Sun.lua +++ b/scripts/quests/jeuno/LB05_2_Beyond_the_Sun.lua @@ -61,7 +61,12 @@ quest.sections = ['Maat'] = { onTrigger = function(player, npc) - return quest:event(94) -- Default dialog after completing this quest? Needs confirmation. + if + player:getMainJob() <= 15 and + player:getMainLvl() >= 66 + then + return quest:event(78, player:getMainJob()) + end end, }, }, diff --git a/scripts/zones/Balgas_Dais/mobs/Maat_mnk.lua b/scripts/zones/Balgas_Dais/mobs/Maat_mnk.lua index fec19f4adb5..bcd74b46169 100644 --- a/scripts/zones/Balgas_Dais/mobs/Maat_mnk.lua +++ b/scripts/zones/Balgas_Dais/mobs/Maat_mnk.lua @@ -99,7 +99,6 @@ entity.onMobFight = function(mob, target) xi.combat.behavior.disableAllActions(mob) mob:showText(mob, ID.text.YOUVE_COME_A_LONG_WAY) players[1]:disengage() - players[1]:addTitle(xi.title.MAAT_MASHER) battlefield:win() return end diff --git a/scripts/zones/Balgas_Dais/mobs/Maat_smn.lua b/scripts/zones/Balgas_Dais/mobs/Maat_smn.lua index 8ccd9522e96..d16c86299e8 100644 --- a/scripts/zones/Balgas_Dais/mobs/Maat_smn.lua +++ b/scripts/zones/Balgas_Dais/mobs/Maat_smn.lua @@ -117,7 +117,6 @@ entity.onMobFight = function(mob, target) xi.combat.behavior.disableAllActions(pet) mob:showText(mob, ID.text.YOUVE_COME_A_LONG_WAY) players[1]:disengage() - players[1]:addTitle(xi.title.MAAT_MASHER) battlefield:win() return end diff --git a/scripts/zones/Balgas_Dais/mobs/Maat_whm.lua b/scripts/zones/Balgas_Dais/mobs/Maat_whm.lua index 393d8b3b52a..1a1c26f3a32 100644 --- a/scripts/zones/Balgas_Dais/mobs/Maat_whm.lua +++ b/scripts/zones/Balgas_Dais/mobs/Maat_whm.lua @@ -125,7 +125,6 @@ entity.onMobFight = function(mob, target) xi.combat.behavior.disableAllActions(mob) mob:showText(mob, ID.text.YOUVE_COME_A_LONG_WAY) players[1]:disengage() - players[1]:addTitle(xi.title.MAAT_MASHER) battlefield:win() return end @@ -165,7 +164,6 @@ entity.onMobFight = function(mob, target) xi.combat.behavior.disableAllActions(mob) mob:showText(mob, ID.text.YOUVE_COME_A_LONG_WAY) players[1]:disengage() - players[1]:addTitle(xi.title.MAAT_MASHER) battlefield:win() return end diff --git a/scripts/zones/Chamber_of_Oracles/mobs/Maat_drg.lua b/scripts/zones/Chamber_of_Oracles/mobs/Maat_drg.lua index d079fe096ee..4ddaac3f975 100644 --- a/scripts/zones/Chamber_of_Oracles/mobs/Maat_drg.lua +++ b/scripts/zones/Chamber_of_Oracles/mobs/Maat_drg.lua @@ -103,7 +103,6 @@ entity.onMobFight = function(mob, target) xi.combat.behavior.disableAllActions(mob) xi.combat.behavior.disableAllActions(pet) mob:showText(mob, ID.text.YOUVE_COME_A_LONG_WAY) - players[1]:addTitle(xi.title.MAAT_MASHER) players[1]:disengage() battlefield:win() return diff --git a/scripts/zones/Chamber_of_Oracles/mobs/Maat_nin.lua b/scripts/zones/Chamber_of_Oracles/mobs/Maat_nin.lua index 82d7dba0579..5d3c825b075 100644 --- a/scripts/zones/Chamber_of_Oracles/mobs/Maat_nin.lua +++ b/scripts/zones/Chamber_of_Oracles/mobs/Maat_nin.lua @@ -25,7 +25,6 @@ entity.onMobInitialize = function(mob) if target:getHPP() <= 20 then xi.combat.behavior.disableAllActions(target) target:showText(target, ID.text.YOUVE_COME_A_LONG_WAY) - user:addTitle(xi.title.MAAT_MASHER) battlefield:win() end end diff --git a/scripts/zones/Chamber_of_Oracles/mobs/Maat_sam.lua b/scripts/zones/Chamber_of_Oracles/mobs/Maat_sam.lua index dadf6fc07cb..985e08f74c7 100644 --- a/scripts/zones/Chamber_of_Oracles/mobs/Maat_sam.lua +++ b/scripts/zones/Chamber_of_Oracles/mobs/Maat_sam.lua @@ -97,7 +97,6 @@ entity.onMobFight = function(mob, target) then xi.combat.behavior.disableAllActions(mob) mob:showText(mob, ID.text.YOUVE_COME_A_LONG_WAY) - players[1]:addTitle(xi.title.MAAT_MASHER) players[1]:disengage() battlefield:win() return diff --git a/scripts/zones/Horlais_Peak/mobs/Maat_blm.lua b/scripts/zones/Horlais_Peak/mobs/Maat_blm.lua index da6015dcc91..58b718de22a 100644 --- a/scripts/zones/Horlais_Peak/mobs/Maat_blm.lua +++ b/scripts/zones/Horlais_Peak/mobs/Maat_blm.lua @@ -129,7 +129,6 @@ entity.onMobFight = function(mob, target) then xi.combat.behavior.disableAllActions(mob) mob:showText(mob, ID.text.YOUVE_COME_A_LONG_WAY) - players[1]:addTitle(xi.title.MAAT_MASHER) players[1]:disengage() battlefield:win() return diff --git a/scripts/zones/Horlais_Peak/mobs/Maat_rng.lua b/scripts/zones/Horlais_Peak/mobs/Maat_rng.lua index 4d183c3205a..4655dc507aa 100644 --- a/scripts/zones/Horlais_Peak/mobs/Maat_rng.lua +++ b/scripts/zones/Horlais_Peak/mobs/Maat_rng.lua @@ -99,7 +99,6 @@ entity.onMobFight = function(mob, target) then xi.combat.behavior.disableAllActions(mob) mob:showText(mob, ID.text.YOUVE_COME_A_LONG_WAY) - players[1]:addTitle(xi.title.MAAT_MASHER) players[1]:disengage() battlefield:win() return diff --git a/scripts/zones/Horlais_Peak/mobs/Maat_war.lua b/scripts/zones/Horlais_Peak/mobs/Maat_war.lua index 598cc32ae6d..76944533053 100644 --- a/scripts/zones/Horlais_Peak/mobs/Maat_war.lua +++ b/scripts/zones/Horlais_Peak/mobs/Maat_war.lua @@ -93,7 +93,6 @@ entity.onMobFight = function(mob, target) then xi.combat.behavior.disableAllActions(mob) mob:showText(mob, ID.text.YOUVE_COME_A_LONG_WAY) - players[1]:addTitle(xi.title.MAAT_MASHER) players[1]:disengage() battlefield:win() return diff --git a/scripts/zones/QuBia_Arena/mobs/Maat_brd.lua b/scripts/zones/QuBia_Arena/mobs/Maat_brd.lua index 4d56228807e..5aa6e906370 100644 --- a/scripts/zones/QuBia_Arena/mobs/Maat_brd.lua +++ b/scripts/zones/QuBia_Arena/mobs/Maat_brd.lua @@ -117,7 +117,6 @@ entity.onMobFight = function(mob, target) xi.combat.behavior.disableAllActions(mob) mob:showText(mob, ID.text.YOUVE_COME_A_LONG_WAY) players[1]:disengage() - players[1]:addTitle(xi.title.MAAT_MASHER) battlefield:win() return end diff --git a/scripts/zones/QuBia_Arena/mobs/Maat_drk.lua b/scripts/zones/QuBia_Arena/mobs/Maat_drk.lua index f8c62e74d18..2758d114405 100644 --- a/scripts/zones/QuBia_Arena/mobs/Maat_drk.lua +++ b/scripts/zones/QuBia_Arena/mobs/Maat_drk.lua @@ -126,7 +126,6 @@ entity.onMobFight = function(mob, target) xi.combat.behavior.disableAllActions(mob) mob:showText(mob, ID.text.YOUVE_COME_A_LONG_WAY) players[1]:disengage() - players[1]:addTitle(xi.title.MAAT_MASHER) battlefield:win() return end diff --git a/scripts/zones/QuBia_Arena/mobs/Maat_pld.lua b/scripts/zones/QuBia_Arena/mobs/Maat_pld.lua index eb855110d68..8d8fc1ae406 100644 --- a/scripts/zones/QuBia_Arena/mobs/Maat_pld.lua +++ b/scripts/zones/QuBia_Arena/mobs/Maat_pld.lua @@ -112,7 +112,6 @@ entity.onMobFight = function(mob, target) xi.combat.behavior.disableAllActions(mob) mob:showText(mob, ID.text.YOUVE_COME_A_LONG_WAY) players[1]:disengage() - players[1]:addTitle(xi.title.MAAT_MASHER) battlefield:win() return end diff --git a/scripts/zones/Waughroon_Shrine/mobs/Maat_thf.lua b/scripts/zones/Waughroon_Shrine/mobs/Maat_thf.lua index e35d80cbb1a..f6abbb90617 100644 --- a/scripts/zones/Waughroon_Shrine/mobs/Maat_thf.lua +++ b/scripts/zones/Waughroon_Shrine/mobs/Maat_thf.lua @@ -27,7 +27,6 @@ entity.onMobInitialize = function(mob) mob:addListener('ITEM_STOLEN', 'MAAT_ITEM_STOLEN', function(mobArg, player, itemId) mobArg:messageText(mobArg, ID.text.YOUVE_COME_A_LONG_WAY) xi.combat.behavior.disableAllActions(mobArg) - player:addTitle(xi.title.MAAT_MASHER) player:disengage() mobArg:getBattlefield():win() end) @@ -105,7 +104,6 @@ entity.onMobFight = function(mob, target) then xi.combat.behavior.disableAllActions(mob) mob:showText(mob, ID.text.YOUVE_COME_A_LONG_WAY) - players[1]:addTitle(xi.title.MAAT_MASHER) players[1]:disengage() battlefield:win() return