OpenWF/SpaceNinjaServer
14
11
Fork 16
Code Issues 38 Pull Requests 4 Actions Packages Projects Releases Activity

fix: use 1-indexing for ChainStage #1601

Closed
Sainan wants to merge 3 commits from give-key-chain-message-fix into main
pull from: give-key-chain-message-fix
merge into: OpenWF:main
Conversation 0 Commits 3 Files Changed 3 +7 -7
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 184407d6f0 - Show all commits

2
src/controllers/custom/manageQuestsController.ts
View File

@ -107,7 +107,7 @@ export const manageQuestsController: RequestHandler = async (req, res) => {
questKey.CompletionDate = undefined;
}
questKey.Progress.pop();
const stage = questKey.Progress.length - 1;
const stage = questKey.Progress.length;
if (stage > 0) {
await giveKeyChainStageTriggered(inventory, {
KeyChain: questKey.ItemType,

2
src/services/itemDataService.ts
View File

@ -185,7 +185,7 @@ export const getKeyChainMessage = ({ KeyChain, ChainStage }: IKeyChainRequest):
throw new Error(`KeyChain ${KeyChain} does not contain chain stages`);
}
const keyChainStage = chainStages[ChainStage];
const keyChainStage = chainStages[ChainStage - 1];
// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
if (!keyChainStage) {
throw new Error(`KeyChainStage ${ChainStage} not found`);

10
src/services/questService.ts
View File

@ -63,13 +63,13 @@ export const updateQuestStage = (
throw new Error(`Progress should always exist when giving keychain triggered items or messages`);
}
const questStage = quest.Progress[ChainStage];
const questStage = quest.Progress[ChainStage - 1];
// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
if (!questStage) {
const questStageIndex = quest.Progress.push(questStageUpdate) - 1;
if (questStageIndex !== ChainStage) {
throw new Error(`Quest stage index mismatch: ${questStageIndex} !== ${ChainStage}`);
if (questStageIndex !== ChainStage - 1) {
throw new Error(`Quest stage index mismatch: ${questStageIndex} !== ${ChainStage - 1}`);
}
return;
}
@ -308,11 +308,11 @@ export const giveKeyChainStageTriggered = async (
const chainStages = ExportKeys[keyChainInfo.KeyChain]?.chainStages;
if (chainStages) {
if (chainStages[keyChainInfo.ChainStage].itemsToGiveWhenTriggered.length > 0) {
if (chainStages[keyChainInfo.ChainStage - 1].itemsToGiveWhenTriggered.length > 0) {
await giveKeyChainItem(inventory, keyChainInfo);
}
if (chainStages[keyChainInfo.ChainStage].messageToSendWhenTriggered) {
if (chainStages[keyChainInfo.ChainStage - 1].messageToSendWhenTriggered) {
await giveKeyChainMessage(inventory, inventory.accountOwnerId, keyChainInfo);
}
}