Merge branch 'base' of https://github.com/shigukahz/server into base

LandSandBoat · Feb 4, 2025 · 09be98e · 09be98e
2 parents a99e9a1 + 6e34213
commit 09be98e
Show file tree

Hide file tree

Showing 151 changed files with 707 additions and 1,161 deletions.
diff --git a/documentation/mods_by_id.txt b/documentation/mods_by_id.txt
@@ -328,7 +328,7 @@
     JUMP_ATT_BONUS               = 362, // ATT% bonus for jump + high jump
     HIGH_JUMP_ENMITY_REDUCTION   = 363, // for gear that reduces more enmity from high jump
     REWARD_HP_BONUS              = 364, // Percent to add to reward HP healed. (364)
-    SNAP_SHOT                    = 365, // Percent reduction to range attack delay
+    SNAPSHOT                     = 365, // Percent reduction to range attack delay
     MAIN_DMG_RATING              = 366, // adds damage rating to main hand weapon (maneater/blau dolch etc hidden effects)
     SUB_DMG_RATING               = 367, // adds damage rating to off hand weapon
     REGAIN                       = 368, // auto regain TP (from items) | this is multiplied by 10 e.g. 20 is 2% TP

diff --git a/scripts/battlefields/QuBia_Arena/those_who_lurk_in_shadows.lua b/scripts/battlefields/QuBia_Arena/those_who_lurk_in_shadows.lua
@@ -38,8 +38,7 @@ function content:onEventFinishWin(player, csid, option, npc)
         player:getCurrentMission(xi.mission.log_id.ACP) >= xi.mission.id.acp.THOSE_WHO_LURK_IN_SHADOWS_III
     then
         player:setCharVar('LastIvoryKey', getMidnight())
-        player:addKeyItem(xi.ki.IVORY_KEY)
-        player:messageSpecial(qubiaID.text.KEYITEM_OBTAINED, xi.ki.IVORY_KEY)
+        npcUtil.giveKeyItem(player, xi.ki.IVORY_KEY)
     end
 end
 

diff --git a/scripts/effects/flurry.lua b/scripts/effects/flurry.lua
@@ -8,7 +8,7 @@ effectObject.onEffectGain = function(target, effect)
     -- Overwrites regular Haste Effect
     target:delStatusEffect(xi.effect.HASTE)
 
-    effect:addMod(xi.mod.SNAP_SHOT, effect:getPower())
+    effect:addMod(xi.mod.SNAPSHOT, effect:getPower())
 end
 
 effectObject.onEffectTick = function(target, effect)

diff --git a/scripts/effects/flurry_ii.lua b/scripts/effects/flurry_ii.lua
@@ -8,7 +8,7 @@ effectObject.onEffectGain = function(target, effect)
     -- Overwrites regular Haste Effect
     target:delStatusEffect(xi.effect.HASTE)
 
-    effect:addMod(xi.mod.SNAP_SHOT, effect:getPower())
+    effect:addMod(xi.mod.SNAPSHOT, effect:getPower())
 end
 
 effectObject.onEffectTick = function(target, effect)

diff --git a/scripts/effects/velocity_shot.lua b/scripts/effects/velocity_shot.lua
@@ -11,7 +11,6 @@ effectObject.onEffectGain = function(target, effect)
     effect:addMod(xi.mod.ATTP, -15)
     effect:addMod(xi.mod.HASTE_ABILITY, -1500)
     effect:addMod(xi.mod.RATTP, 15)
-    effect:addMod(xi.mod.RANGED_DELAYP, -15)
 end
 
 effectObject.onEffectTick = function(target, effect)

diff --git a/scripts/enum/mod.lua b/scripts/enum/mod.lua
@@ -565,7 +565,7 @@ xi.mod =
     ENHANCES_STRAFE                 = 282, -- Strafe merit augment, +50 TP gained per merit level on breath use.
     ENHANCES_SPIRIT_LINK            = 281, -- Adds erase/-na to Spirit Link
     REWARD_HP_BONUS                 = 364,
-    SNAP_SHOT                       = 365,
+    SNAPSHOT                        = 365,
 
     DMG_RATING                      = 287, -- adds damage rating to weapon (+DMG augments, maneater/blau dolch etc hidden effects)
     MAIN_DMG_RATING                 = 366, -- adds damage rating to mainhand weapon

diff --git a/scripts/globals/abyssea/atma.lua b/scripts/globals/abyssea/atma.lua
@@ -73,7 +73,7 @@ xi.atma.atmaMods =
     [xi.ki.ATMA_OF_THE_MERCILESS_MATRIARCH]    = { xi.mod.MACC, 50, xi.mod.FASTCAST, 20, xi.mod.ENMITY, -50 },
     [xi.ki.ATMA_OF_THE_BROTHER_WOLF]           = { xi.mod.MATT, 20, xi.mod.MDEF, 20, xi.mod.FIRE_MEVA, 100 },
     [xi.ki.ATMA_OF_THE_EARTH_WYRM]             = { xi.mod.EARTH_MEVA, 100, xi.mod.DMG, -2000, xi.mod.FORCE_EARTH_DWBONUS, 1 },
-    [xi.ki.ATMA_OF_THE_ASCENDING_ONE]          = { xi.mod.WIND_MEVA, 100, xi.mod.HASTE_GEAR, 500, xi.mod.SNAP_SHOT, 5 },
+    [xi.ki.ATMA_OF_THE_ASCENDING_ONE]          = { xi.mod.WIND_MEVA, 100, xi.mod.HASTE_GEAR, 500, xi.mod.SNAPSHOT, 5 },
     [xi.ki.ATMA_OF_THE_SCORPION_QUEEN]         = { xi.mod.STORETP, 20, xi.mod.CRITHITRATE, 30, xi.mod.BINDRES, 50 },
     [xi.ki.ATMA_OF_A_THOUSAND_NEEDLES]         = { xi.mod.HPP, 20, xi.mod.MPP, 20, xi.mod.DEX, 10 },
     [xi.ki.ATMA_OF_THE_BURNING_EFFIGY]         = { xi.mod.STR, 20, xi.mod.FORCE_FIRE_DWBONUS, 1 }, -- fire based ws + 0.2 fTP] = {},

diff --git a/scripts/globals/aftermath.lua b/scripts/globals/aftermath.lua
@@ -58,7 +58,7 @@ xi.aftermath.effects =
     [24] = { mods = { xi.mod.STORETP, 10, xi.mod.ZANSHIN, 10 }, duration = getTier2RelicDuration }, -- Amanomurakumo
     [25] = { mods = { xi.mod.ACC, 20, xi.mod.MACC, 20, xi.mod.REFRESH, 5 }, duration = getTier2RelicDuration }, -- Mjollnir
     [26] = { mods = { xi.mod.REFRESH, 15, xi.mod.DMG, -2000 }, duration = getTier2RelicDuration }, -- Claustrum
-    [27] = { mods = { xi.mod.RACC, 30, xi.mod.SNAP_SHOT, 5 }, duration = getTier2RelicDuration }, -- Yoichinoyumi
+    [27] = { mods = { xi.mod.RACC, 30, xi.mod.SNAPSHOT, 5 }, duration = getTier2RelicDuration }, -- Yoichinoyumi
     [28] = { mods = { xi.mod.ENMITY, -25, xi.mod.RATTP, 10 }, duration = getTier2RelicDuration }, -- Annihilator
 
     -----------------------------------

diff --git a/scripts/globals/armorstorage.lua b/scripts/globals/armorstorage.lua
@@ -1,7 +1,5 @@
 -----------------------------------
---
 --  Armor Storage
---
 -----------------------------------
 xi = xi or {}
 xi.armorStorage = xi.armorStorage or {}

diff --git a/scripts/globals/dynamis.lua b/scripts/globals/dynamis.lua
@@ -1046,8 +1046,7 @@ xi.dynamis.hourglassAndCurrencyExchangeNPCOnEventUpdate = function(player, csid,
                 player:messageSpecial(ID.text.NOT_ENOUGH_GIL)
             else
                 player:delGil(price)
-                player:addKeyItem(option)
-                player:messageSpecial(ID.text.KEYITEM_OBTAINED, option)
+                npcUtil.giveKeyItem(player, option)
             end
 
             player:updateEvent(xi.dynamis.getDynamisMapList(player), player:getGil())
@@ -1064,8 +1063,7 @@ xi.dynamis.hourglassAndCurrencyExchangeNPCOnEventFinish = function(player, csid,
     -- bought prismatic hourglass
     if csid == baseCs + 4 then
         player:tradeComplete()
-        player:addKeyItem(xi.ki.PRISMATIC_HOURGLASS)
-        player:messageSpecial(ID.text.KEYITEM_OBTAINED, xi.ki.PRISMATIC_HOURGLASS)
+        npcUtil.giveKeyItem(player, xi.ki.PRISMATIC_HOURGLASS)
 
     -- refund timeless hourglass
     elseif csid == baseCs + 13 then

diff --git a/scripts/globals/unity.lua b/scripts/globals/unity.lua
@@ -148,7 +148,7 @@ function xi.unity.onEventUpdate(player, csid, option, npc)
     local zoneId               = player:getZoneID()
     local ID                   = zones[zoneId]
     local accolades            = player:getCurrency('unity_accolades')
-    local weeklyAccoladesSpent = player:getCharVar('weekly_sparks_spent')
+    local weeklyAccoladesSpent = player:getCharVar('weekly_accolades_spent')
     local remainingLimit       = xi.settings.main.WEEKLY_EXCHANGE_LIMIT - player:getCharVar('weekly_accolades_spent')
     local category             = bit.band(option, 0xF)
     local selection            = bit.band(bit.rshift(option, 5), 0xFF)

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
@@ -131,8 +131,7 @@ mission.sections =
 
                     -- Give KI if QM is correct
                     if keyItem and not player:hasKeyItem(keyItem) then
-                        player:addKeyItem(keyItem)
-                        return mission:messageSpecial(ID.text.KEYITEM_OBTAINED, keyItem)
+                        return mission:keyItem(keyItem)
                     end
                 end,
             },

diff --git a/scripts/missions/asa/04_Sugar-Coated_Directive.lua b/scripts/missions/asa/04_Sugar-Coated_Directive.lua
@@ -60,9 +60,8 @@ mission.sections =
                 {
                     [2] = function(player, csid, option, npc)
                         player:delKeyItem(xi.ki.DOMINAS_SCARLET_SEAL)
-                        player:addKeyItem(xi.ki.SCARLET_COUNTERSEAL)
                         player:messageSpecial(flamesID.text.ATTACH_SEAL, xi.ki.DOMINAS_SCARLET_SEAL)
-                        player:messageSpecial(flamesID.text.KEYITEM_OBTAINED, xi.ki.SCARLET_COUNTERSEAL)
+                        npcUtil.giveKeyItem(player, xi.ki.SCARLET_COUNTERSEAL)
                     end,
                 }
             },
@@ -91,9 +90,8 @@ mission.sections =
                 {
                     [2] = function(player, csid, option, npc)
                         player:delKeyItem(xi.ki.DOMINAS_AZURE_SEAL)
-                        player:addKeyItem(xi.ki.AZURE_COUNTERSEAL)
                         player:messageSpecial(frostID.text.ATTACH_SEAL, xi.ki.DOMINAS_AZURE_SEAL)
-                        player:messageSpecial(frostID.text.KEYITEM_OBTAINED, xi.ki.AZURE_COUNTERSEAL)
+                        npcUtil.giveKeyItem(player, xi.ki.AZURE_COUNTERSEAL)
                     end,
                 }
             },
@@ -122,9 +120,8 @@ mission.sections =
                 {
                     [2] = function(player, csid, option, npc)
                         player:delKeyItem(xi.ki.DOMINAS_EMERALD_SEAL)
-                        player:addKeyItem(xi.ki.EMERALD_COUNTERSEAL)
                         player:messageSpecial(galesID.text.ATTACH_SEAL, xi.ki.DOMINAS_EMERALD_SEAL)
-                        player:messageSpecial(galesID.text.KEYITEM_OBTAINED, xi.ki.EMERALD_COUNTERSEAL)
+                        npcUtil.giveKeyItem(player, xi.ki.EMERALD_COUNTERSEAL)
                     end,
                 }
             },
@@ -153,9 +150,8 @@ mission.sections =
                 {
                     [2] = function(player, csid, option, npc)
                         player:delKeyItem(xi.ki.DOMINAS_VIOLET_SEAL)
-                        player:addKeyItem(xi.ki.VIOLET_COUNTERSEAL)
                         player:messageSpecial(stormsID.text.ATTACH_SEAL, xi.ki.DOMINAS_VIOLET_SEAL)
-                        player:messageSpecial(stormsID.text.KEYITEM_OBTAINED, xi.ki.VIOLET_COUNTERSEAL)
+                        npcUtil.giveKeyItem(player, xi.ki.VIOLET_COUNTERSEAL)
                     end,
                 }
             },
@@ -184,9 +180,8 @@ mission.sections =
                 {
                     [2] = function(player, csid, option, npc)
                         player:delKeyItem(xi.ki.DOMINAS_CERULEAN_SEAL)
-                        player:addKeyItem(xi.ki.CERULEAN_COUNTERSEAL)
                         player:messageSpecial(tidesID.text.ATTACH_SEAL, xi.ki.DOMINAS_CERULEAN_SEAL)
-                        player:messageSpecial(tidesID.text.KEYITEM_OBTAINED, xi.ki.CERULEAN_COUNTERSEAL)
+                        npcUtil.giveKeyItem(player, xi.ki.CERULEAN_COUNTERSEAL)
                     end,
                 }
             },
@@ -215,9 +210,8 @@ mission.sections =
                 {
                     [2] = function(player, csid, option, npc)
                         player:delKeyItem(xi.ki.DOMINAS_AMBER_SEAL)
-                        player:addKeyItem(xi.ki.AMBER_COUNTERSEAL)
                         player:messageSpecial(tremorsID.text.ATTACH_SEAL, xi.ki.DOMINAS_AMBER_SEAL)
-                        player:messageSpecial(tremorsID.text.KEYITEM_OBTAINED, xi.ki.AMBER_COUNTERSEAL)
+                        npcUtil.giveKeyItem(player, xi.ki.AMBER_COUNTERSEAL)
                     end,
                 }
             },
@@ -322,9 +316,8 @@ mission.sections =
                 {
                     [2] = function(player, csid, option, npc)
                         player:delKeyItem(xi.ki.DOMINAS_SCARLET_SEAL)
-                        player:addKeyItem(xi.ki.SCARLET_COUNTERSEAL)
                         player:messageSpecial(flamesID.text.ATTACH_SEAL, xi.ki.DOMINAS_SCARLET_SEAL)
-                        player:messageSpecial(flamesID.text.KEYITEM_OBTAINED, xi.ki.SCARLET_COUNTERSEAL)
+                        npcUtil.giveKeyItem(player, xi.ki.SCARLET_COUNTERSEAL)
                     end,
                 }
             },
@@ -353,9 +346,8 @@ mission.sections =
                 {
                     [2] = function(player, csid, option, npc)
                         player:delKeyItem(xi.ki.DOMINAS_AZURE_SEAL)
-                        player:addKeyItem(xi.ki.AZURE_COUNTERSEAL)
                         player:messageSpecial(frostID.text.ATTACH_SEAL, xi.ki.DOMINAS_AZURE_SEAL)
-                        player:messageSpecial(frostID.text.KEYITEM_OBTAINED, xi.ki.AZURE_COUNTERSEAL)
+                        npcUtil.giveKeyItem(player, xi.ki.AZURE_COUNTERSEAL)
                     end,
                 }
             },
@@ -384,9 +376,8 @@ mission.sections =
                 {
                     [2] = function(player, csid, option, npc)
                         player:delKeyItem(xi.ki.DOMINAS_EMERALD_SEAL)
-                        player:addKeyItem(xi.ki.EMERALD_COUNTERSEAL)
                         player:messageSpecial(galesID.text.ATTACH_SEAL, xi.ki.DOMINAS_EMERALD_SEAL)
-                        player:messageSpecial(galesID.text.KEYITEM_OBTAINED, xi.ki.EMERALD_COUNTERSEAL)
+                        npcUtil.giveKeyItem(player, xi.ki.EMERALD_COUNTERSEAL)
                     end,
                 }
             },
@@ -415,9 +406,8 @@ mission.sections =
                 {
                     [2] = function(player, csid, option, npc)
                         player:delKeyItem(xi.ki.DOMINAS_VIOLET_SEAL)
-                        player:addKeyItem(xi.ki.VIOLET_COUNTERSEAL)
                         player:messageSpecial(stormsID.text.ATTACH_SEAL, xi.ki.DOMINAS_VIOLET_SEAL)
-                        player:messageSpecial(stormsID.text.KEYITEM_OBTAINED, xi.ki.VIOLET_COUNTERSEAL)
+                        npcUtil.giveKeyItem(player, xi.ki.VIOLET_COUNTERSEAL)
                     end,
                 }
             },
@@ -446,9 +436,8 @@ mission.sections =
                 {
                     [2] = function(player, csid, option, npc)
                         player:delKeyItem(xi.ki.DOMINAS_CERULEAN_SEAL)
-                        player:addKeyItem(xi.ki.CERULEAN_COUNTERSEAL)
                         player:messageSpecial(tidesID.text.ATTACH_SEAL, xi.ki.DOMINAS_CERULEAN_SEAL)
-                        player:messageSpecial(tidesID.text.KEYITEM_OBTAINED, xi.ki.CERULEAN_COUNTERSEAL)
+                        npcUtil.giveKeyItem(player, xi.ki.CERULEAN_COUNTERSEAL)
                     end,
                 }
             },
@@ -477,9 +466,8 @@ mission.sections =
                 {
                     [2] = function(player, csid, option, npc)
                         player:delKeyItem(xi.ki.DOMINAS_AMBER_SEAL)
-                        player:addKeyItem(xi.ki.AMBER_COUNTERSEAL)
                         player:messageSpecial(tremorsID.text.ATTACH_SEAL, xi.ki.DOMINAS_AMBER_SEAL)
-                        player:messageSpecial(tremorsID.text.KEYITEM_OBTAINED, xi.ki.AMBER_COUNTERSEAL)
+                        npcUtil.giveKeyItem(player, xi.ki.AMBER_COUNTERSEAL)
                     end,
                 }
             },

diff --git a/scripts/missions/sandoria/2_2_The_Davoi_Report.lua b/scripts/missions/sandoria/2_2_The_Davoi_Report.lua
@@ -10,7 +10,6 @@
 -- '!'            : !pos 211 2 -104 149
 -- Papal Chambers : !pos 131 -11 122 231
 -----------------------------------
-local davoiID            = zones[xi.zone.DAVOI]
 local southernSandoriaID = zones[xi.zone.SOUTHERN_SAN_DORIA]
 local northernSandoriaID = zones[xi.zone.NORTHERN_SAN_DORIA]
 -----------------------------------
@@ -84,8 +83,7 @@ mission.sections =
                         xPos > 210 and xPos < 212
                     then
                         player:setMissionStatus(player:getNation(), 2)
-                        player:addKeyItem(xi.ki.LOST_DOCUMENT)
-                        return mission:messageSpecial(davoiID.text.KEYITEM_OBTAINED, xi.ki.LOST_DOCUMENT)
+                        return mission:keyItem(xi.ki.LOST_DOCUMENT)
                     end
                 end,
             },

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
@@ -98,8 +98,7 @@ local collectOrb = function(player, csid, option, npc)
 
     mission:setVarBit(player, 'GizmoEmpty', gizmoNum)
     mission:setVar(player, 'OrbsCollected', numberCollected + 1)
-    player:addKeyItem(ki)
-    player:messageSpecial(outerHorutotoRuinsID.text.KEYITEM_OBTAINED, ki)
+    npcUtil.giveKeyItem(player, ki)
 
     -- collected all the orbs
     if mission:getVar(player, 'OrbsCollected') == 6 then

diff --git a/scripts/quests/bastok/Inheritance.lua b/scripts/quests/bastok/Inheritance.lua
@@ -117,8 +117,7 @@ quest.sections =
                 onTrigger = function(player, npc)
                     if player:getLocalVar('killed_wsnm') == 1 then
                         player:setLocalVar('killed_wsnm', 0)
-                        player:addKeyItem(xi.ki.ANNALS_OF_TRUTH)
-                        return quest:messageSpecial(westernAltepaID.text.KEYITEM_OBTAINED, xi.ki.ANNALS_OF_TRUTH)
+                        return quest:keyItem(xi.ki.ANNALS_OF_TRUTH)
                     elseif
                         player:hasKeyItem(xi.ki.MAP_TO_THE_ANNALS_OF_TRUTH) and
                         not player:hasKeyItem(xi.keyItem.ANNALS_OF_TRUTH) and

diff --git a/scripts/quests/bastok/Shoot_First_Ask_Questions_Later.lua b/scripts/quests/bastok/Shoot_First_Ask_Questions_Later.lua
@@ -121,8 +121,7 @@ quest.sections =
                 onTrigger = function(player, npc)
                     if player:getLocalVar('killed_wsnm') == 1 then
                         player:setLocalVar('killed_wsnm', 0)
-                        player:addKeyItem(xi.ki.ANNALS_OF_TRUTH)
-                        return quest:messageSpecial(boyahdaTreeID.text.KEYITEM_OBTAINED, xi.ki.ANNALS_OF_TRUTH)
+                        return quest:keyItem(xi.ki.ANNALS_OF_TRUTH)
                     elseif
                         player:hasKeyItem(xi.ki.MAP_TO_THE_ANNALS_OF_TRUTH) and
                         not player:hasKeyItem(xi.keyItem.ANNALS_OF_TRUTH) and

diff --git a/scripts/quests/bastok/The_Walls_of_Your_Mind.lua b/scripts/quests/bastok/The_Walls_of_Your_Mind.lua
@@ -118,8 +118,7 @@ quest.sections =
                 onTrigger = function(player, npc)
                     if player:getLocalVar('killed_wsnm') == 1 then
                         player:setLocalVar('killed_wsnm', 0)
-                        player:addKeyItem(xi.ki.ANNALS_OF_TRUTH)
-                        return quest:messageSpecial(bostaunieuxID.text.KEYITEM_OBTAINED, xi.ki.ANNALS_OF_TRUTH)
+                        return quest:keyItem(xi.ki.ANNALS_OF_TRUTH)
                     elseif
                         player:hasKeyItem(xi.ki.MAP_TO_THE_ANNALS_OF_TRUTH) and
                         not player:hasKeyItem(xi.keyItem.ANNALS_OF_TRUTH) and

diff --git a/scripts/quests/bastok/The_Weight_of_Your_Limits.lua b/scripts/quests/bastok/The_Weight_of_Your_Limits.lua
@@ -118,8 +118,7 @@ quest.sections =
                 onTrigger = function(player, npc)
                     if player:getLocalVar('killed_wsnm') == 1 then
                         player:setLocalVar('killed_wsnm', 0)
-                        player:addKeyItem(xi.ki.ANNALS_OF_TRUTH)
-                        return quest:messageSpecial(ziTahID.text.KEYITEM_OBTAINED, xi.ki.ANNALS_OF_TRUTH)
+                        return quest:keyItem(xi.ki.ANNALS_OF_TRUTH)
                     elseif
                         player:hasKeyItem(xi.ki.MAP_TO_THE_ANNALS_OF_TRUTH) and
                         not player:hasKeyItem(xi.keyItem.ANNALS_OF_TRUTH) and

diff --git a/scripts/quests/jeuno/Axe_the_Competition.lua b/scripts/quests/jeuno/Axe_the_Competition.lua
@@ -117,8 +117,7 @@ quest.sections =
                 onTrigger = function(player, npc)
                     if player:getLocalVar('killed_wsnm') == 1 then
                         player:setLocalVar('killed_wsnm', 0)
-                        player:addKeyItem(xi.ki.ANNALS_OF_TRUTH)
-                        return quest:messageSpecial(uggalepihID.text.KEYITEM_OBTAINED, xi.ki.ANNALS_OF_TRUTH)
+                        return quest:keyItem(xi.ki.ANNALS_OF_TRUTH)
                     elseif
                         player:hasKeyItem(xi.ki.MAP_TO_THE_ANNALS_OF_TRUTH) and
                         not player:hasKeyItem(xi.keyItem.ANNALS_OF_TRUTH) and

diff --git a/scripts/quests/outlands/Bugi_Soden.lua b/scripts/quests/outlands/Bugi_Soden.lua
@@ -117,8 +117,7 @@ quest.sections =
                 onTrigger = function(player, npc)
                     if player:getLocalVar('killed_wsnm') == 1 then
                         player:setLocalVar('killed_wsnm', 0)
-                        player:addKeyItem(xi.ki.ANNALS_OF_TRUTH)
-                        return quest:messageSpecial(onzozoID.text.KEYITEM_OBTAINED, xi.ki.ANNALS_OF_TRUTH)
+                        return quest:keyItem(xi.ki.ANNALS_OF_TRUTH)
                     elseif
                         player:hasKeyItem(xi.ki.MAP_TO_THE_ANNALS_OF_TRUTH) and
                         not player:hasKeyItem(xi.keyItem.ANNALS_OF_TRUTH) and

diff --git a/scripts/quests/outlands/Cloak_and_Dagger.lua b/scripts/quests/outlands/Cloak_and_Dagger.lua
@@ -120,8 +120,7 @@ quest.sections =
                 onTrigger = function(player, npc)
                     if player:getLocalVar('killed_wsnm') == 1 then
                         player:setLocalVar('killed_wsnm', 0)
-                        player:addKeyItem(xi.ki.ANNALS_OF_TRUTH)
-                        return quest:messageSpecial(gustavTunnelID.text.KEYITEM_OBTAINED, xi.ki.ANNALS_OF_TRUTH)
+                        return quest:keyItem(xi.ki.ANNALS_OF_TRUTH)
                     elseif
                         player:hasKeyItem(xi.ki.MAP_TO_THE_ANNALS_OF_TRUTH) and
                         not player:hasKeyItem(xi.keyItem.ANNALS_OF_TRUTH) and