From e97b1078537e95426dd6b4d22f4a2c418790220c Mon Sep 17 00:00:00 2001 From: Sainan <63328889+Sainan@users.noreply.github.com> Date: Thu, 14 Aug 2025 07:56:29 -0700 Subject: [PATCH] feat: nemesis convert message (#2616) Closes #2614 Reviewed-on: https://onlyg.it/OpenWF/SpaceNinjaServer/pulls/2616 Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com> Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com> --- src/helpers/nemesisHelpers.ts | 28 ++++++++++---- src/services/missionInventoryUpdateService.ts | 38 +++++++++---------- 2 files changed, 38 insertions(+), 28 deletions(-) diff --git a/src/helpers/nemesisHelpers.ts b/src/helpers/nemesisHelpers.ts index 641ccb27..50eeef97 100644 --- a/src/helpers/nemesisHelpers.ts +++ b/src/helpers/nemesisHelpers.ts @@ -22,8 +22,11 @@ export interface INemesisManifest { ephemeraTypes?: Record; firstKillReward: string; firstConvertReward: string; - messageTitle: string; - messageBody: string; + killMessageSubject: string; + killMessageBody: string; + convertMessageSubject: string; + convertMessageBody: string; + convertMessageIcon: string; minBuild: string; } @@ -57,8 +60,11 @@ class KuvaLichManifest implements INemesisManifest { }; firstKillReward = "/Lotus/StoreItems/Upgrades/Skins/Clan/LichKillerBadgeItem"; firstConvertReward = "/Lotus/StoreItems/Upgrades/Skins/Sigils/KuvaLichSigil"; - messageTitle = "/Lotus/Language/Inbox/VanquishKuvaMsgTitle"; - messageBody = "/Lotus/Language/Inbox/VanquishLichMsgBody"; + killMessageSubject = "/Lotus/Language/Inbox/VanquishKuvaMsgTitle"; + killMessageBody = "/Lotus/Language/Inbox/VanquishLichMsgBody"; + convertMessageSubject = "/Lotus/Language/Kingpins/InboxKuvaConvertedSubject"; + convertMessageBody = "/Lotus/Language/Kingpins/InboxKuvaConvertedBody"; + convertMessageIcon = "/Lotus/Interface/Graphics/WorldStatePanel/Grineer.png"; minBuild = "2019.10.31.22.42"; // 26.0.0 } @@ -131,8 +137,11 @@ class LawyerManifest implements INemesisManifest { }; firstKillReward = "/Lotus/StoreItems/Upgrades/Skins/Clan/CorpusLichBadgeItem"; firstConvertReward = "/Lotus/StoreItems/Upgrades/Skins/Sigils/CorpusLichSigil"; - messageTitle = "/Lotus/Language/Inbox/VanquishLawyerMsgTitle"; - messageBody = "/Lotus/Language/Inbox/VanquishLichMsgBody"; + killMessageSubject = "/Lotus/Language/Inbox/VanquishLawyerMsgTitle"; + killMessageBody = "/Lotus/Language/Inbox/VanquishLichMsgBody"; + convertMessageSubject = "/Lotus/Language/Kingpins/InboxSisterConvertedSubject"; + convertMessageBody = "/Lotus/Language/Kingpins/InboxSisterConvertedBody"; + convertMessageIcon = "/Lotus/Interface/Graphics/WorldStatePanel/Corpus.png"; minBuild = "2021.07.05.17.03"; // 30.5.0 } @@ -166,8 +175,11 @@ class InfestedLichManfest implements INemesisManifest { ephemeraChance = 0; firstKillReward = "/Lotus/StoreItems/Upgrades/Skins/Sigils/InfLichVanquishedSigil"; firstConvertReward = "/Lotus/StoreItems/Upgrades/Skins/Sigils/InfLichConvertedSigil"; - messageTitle = "/Lotus/Language/Inbox/VanquishBandMsgTitle"; - messageBody = "/Lotus/Language/Inbox/VanquishBandMsgBody"; + killMessageSubject = "/Lotus/Language/Inbox/VanquishBandMsgTitle"; + killMessageBody = "/Lotus/Language/Inbox/VanquishBandMsgBody"; + convertMessageSubject = "/Lotus/Language/Kingpins/InboxBandConvertedSubject"; + convertMessageBody = "/Lotus/Language/Kingpins/InboxBandConvertedBody"; + convertMessageIcon = "/Lotus/Interface/Graphics/WorldStatePanel/Infested.png"; minBuild = "2025.03.18.09.51"; // 38.5.0 } diff --git a/src/services/missionInventoryUpdateService.ts b/src/services/missionInventoryUpdateService.ts index 7cc71a0e..eea01155 100644 --- a/src/services/missionInventoryUpdateService.ts +++ b/src/services/missionInventoryUpdateService.ts @@ -841,26 +841,24 @@ export const addMissionInventoryUpdates = async ( } } - if (value.killed) { - await createMessage(inventory.accountOwnerId, [ - { - sndr: "/Lotus/Language/Bosses/Ordis", - msg: manifest.messageBody, - arg: [ - { - Key: "LICH_NAME", - Tag: value.nemesisName - } - ], - att: att, - countedAtt: countedAtt, - attVisualOnly: true, - sub: manifest.messageTitle, - icon: "/Lotus/Interface/Icons/Npcs/Ordis.png", - highPriority: true - } - ]); - } + await createMessage(inventory.accountOwnerId, [ + { + sndr: value.killed ? "/Lotus/Language/Bosses/Ordis" : value.nemesisName, + msg: value.killed ? manifest.killMessageBody : manifest.convertMessageBody, + arg: [ + { + Key: "LICH_NAME", + Tag: value.nemesisName + } + ], + att: att, + countedAtt: countedAtt, + attVisualOnly: true, + sub: value.killed ? manifest.killMessageSubject : manifest.convertMessageSubject, + icon: value.killed ? "/Lotus/Interface/Icons/Npcs/Ordis.png" : manifest.convertMessageIcon, + highPriority: true + } + ]); inventory.Nemesis = undefined; }