From 05fad3f9364344845a433e06ca895c6e15af77f5 Mon Sep 17 00:00:00 2001 From: Aeshur Date: Wed, 25 Feb 2026 00:06:34 -0500 Subject: [PATCH] [lua] WoTG 41 - Her Memories - Lua Cleanup --- scripts/missions/wotg/helpers.lua | 2 +- .../quests/crystalWar/Her_Memories_Carnelian_Footfalls.lua | 5 +++-- scripts/quests/crystalWar/Her_Memories_Homecoming_Queen.lua | 6 +++--- .../quests/crystalWar/Her_Memories_Of_Malign_Maladies.lua | 3 +-- scripts/quests/crystalWar/Her_Memories_Operation_Cupid.lua | 5 +++-- scripts/zones/Bastok_Markets_[S]/IDs.lua | 1 + scripts/zones/Southern_San_dOria_[S]/IDs.lua | 1 + scripts/zones/Windurst_Waters_[S]/IDs.lua | 1 + 8 files changed, 14 insertions(+), 10 deletions(-) diff --git a/scripts/missions/wotg/helpers.lua b/scripts/missions/wotg/helpers.lua index 15f6be85f77..05a3c8d1fd2 100644 --- a/scripts/missions/wotg/helpers.lua +++ b/scripts/missions/wotg/helpers.lua @@ -117,7 +117,7 @@ xi.wotg.helpers.checkMemoryFragments = function(player) end end - if numFragments == 3 then + if numFragments == 4 then player:messageName(ID.text.REPORT_TO_CAIT_SITH, nil) player:completeMission(xi.mission.log_id.WOTG, xi.mission.id.wotg.HER_MEMORIES) diff --git a/scripts/quests/crystalWar/Her_Memories_Carnelian_Footfalls.lua b/scripts/quests/crystalWar/Her_Memories_Carnelian_Footfalls.lua index b5d51919d38..e0cbe525772 100644 --- a/scripts/quests/crystalWar/Her_Memories_Carnelian_Footfalls.lua +++ b/scripts/quests/crystalWar/Her_Memories_Carnelian_Footfalls.lua @@ -80,8 +80,9 @@ quest.sections = onEventFinish = { [172] = function(player, csid, option, npc) - xi.wotg.helpers.checkMemoryFragments(player) - quest:complete(player) + if quest:complete(player) then + xi.wotg.helpers.checkMemoryFragments(player) + end end, }, }, diff --git a/scripts/quests/crystalWar/Her_Memories_Homecoming_Queen.lua b/scripts/quests/crystalWar/Her_Memories_Homecoming_Queen.lua index a7707d8c9ed..966c9106549 100644 --- a/scripts/quests/crystalWar/Her_Memories_Homecoming_Queen.lua +++ b/scripts/quests/crystalWar/Her_Memories_Homecoming_Queen.lua @@ -48,9 +48,9 @@ local function handleQuestCompletion(player, csid, option, npc) player:delKeyItem(questData[2]) end - xi.wotg.helpers.checkMemoryFragments(player) - - quest:complete(player) + if quest:complete(player) then + xi.wotg.helpers.checkMemoryFragments(player) + end end end diff --git a/scripts/quests/crystalWar/Her_Memories_Of_Malign_Maladies.lua b/scripts/quests/crystalWar/Her_Memories_Of_Malign_Maladies.lua index 4170be9d5f1..002e0f003d6 100644 --- a/scripts/quests/crystalWar/Her_Memories_Of_Malign_Maladies.lua +++ b/scripts/quests/crystalWar/Her_Memories_Of_Malign_Maladies.lua @@ -155,9 +155,8 @@ quest.sections = onEventFinish = { [169] = function(player, csid, option, npc) - xi.wotg.helpers.checkMemoryFragments(player) - if quest:complete(player) then + xi.wotg.helpers.checkMemoryFragments(player) player:delKeyItem(xi.ki.FEY_STONE) end end, diff --git a/scripts/quests/crystalWar/Her_Memories_Operation_Cupid.lua b/scripts/quests/crystalWar/Her_Memories_Operation_Cupid.lua index 1f982a44b1a..56f13791ae0 100644 --- a/scripts/quests/crystalWar/Her_Memories_Operation_Cupid.lua +++ b/scripts/quests/crystalWar/Her_Memories_Operation_Cupid.lua @@ -121,8 +121,9 @@ quest.sections = onEventFinish = { [24] = function(player, csid, option, npc) - xi.wotg.helpers.checkMemoryFragments(player) - quest:complete(player) + if quest:complete(player) then + xi.wotg.helpers.checkMemoryFragments(player) + end end, }, }, diff --git a/scripts/zones/Bastok_Markets_[S]/IDs.lua b/scripts/zones/Bastok_Markets_[S]/IDs.lua index 96aa983e1c0..9697a93f8e0 100644 --- a/scripts/zones/Bastok_Markets_[S]/IDs.lua +++ b/scripts/zones/Bastok_Markets_[S]/IDs.lua @@ -12,6 +12,7 @@ zones[xi.zone.BASTOK_MARKETS_S] = GIL_OBTAINED = 6392, -- Obtained gil. KEYITEM_OBTAINED = 6394, -- Obtained key item: . ITEM_RETURNED_TO_CHAR = 6403, -- The is returned to you. + REPORT_TO_CAIT_SITH = 6993, -- You have obtained all of Lilisette's memory fragments. Make haste and report to Cait Sith. CARRIED_OVER_POINTS = 7002, -- You have carried over login point[/s]. LOGIN_CAMPAIGN_UNDERWAY = 7003, -- The [/January/February/March/April/May/June/July/August/September/October/November/December] Login Campaign is currently underway! LOGIN_NUMBER = 7004, -- In celebration of your most recent login (login no. ), we have provided you with points! You currently have a total of points. diff --git a/scripts/zones/Southern_San_dOria_[S]/IDs.lua b/scripts/zones/Southern_San_dOria_[S]/IDs.lua index 762d419eb42..8b05189e29d 100644 --- a/scripts/zones/Southern_San_dOria_[S]/IDs.lua +++ b/scripts/zones/Southern_San_dOria_[S]/IDs.lua @@ -12,6 +12,7 @@ zones[xi.zone.SOUTHERN_SAN_DORIA_S] = ITEM_OBTAINED = 6391, -- Obtained: . GIL_OBTAINED = 6392, -- Obtained gil. KEYITEM_OBTAINED = 6394, -- Obtained key item: . + REPORT_TO_CAIT_SITH = 6993, -- You have obtained all of Lilisette's memory fragments. Make haste and report to Cait Sith. CARRIED_OVER_POINTS = 7002, -- You have carried over login point[/s]. LOGIN_CAMPAIGN_UNDERWAY = 7003, -- The [/January/February/March/April/May/June/July/August/September/October/November/December] Login Campaign is currently underway! LOGIN_NUMBER = 7004, -- In celebration of your most recent login (login no. ), we have provided you with points! You currently have a total of points. diff --git a/scripts/zones/Windurst_Waters_[S]/IDs.lua b/scripts/zones/Windurst_Waters_[S]/IDs.lua index 3790986d2de..d3c1bfc6492 100644 --- a/scripts/zones/Windurst_Waters_[S]/IDs.lua +++ b/scripts/zones/Windurst_Waters_[S]/IDs.lua @@ -15,6 +15,7 @@ zones[xi.zone.WINDURST_WATERS_S] = KEYITEM_LOST = 6395, -- Lost key item: . NOT_HAVE_ENOUGH_GIL = 6396, -- You do not have enough gil. ITEMS_OBTAINED = 6400, -- You obtain ! + REPORT_TO_CAIT_SITH = 6993, -- You have obtained all of Lilisette's memory fragments. Make haste and report to Cait Sith. CARRIED_OVER_POINTS = 7002, -- You have carried over login point[/s]. LOGIN_CAMPAIGN_UNDERWAY = 7003, -- The [/January/February/March/April/May/June/July/August/September/October/November/December] Login Campaign is currently underway! LOGIN_NUMBER = 7004, -- In celebration of your most recent login (login no. ), we have provided you with points! You currently have a total of points.