OpenWF/SpaceNinjaServer
14
12
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 +5 -5
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

4
src/services/itemDataService.ts
View File

@ -143,7 +143,7 @@ export const getKeyChainItems = ({ KeyChain, ChainStage }: IKeyChainRequest): st
throw new Error(`KeyChain ${KeyChain} does not contain chain stages`); 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 // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
if (!keyChainStage) { if (!keyChainStage) {
throw new Error(`KeyChainStage ${ChainStage} not found`); throw new Error(`KeyChainStage ${ChainStage} not found`);
@ -185,7 +185,7 @@ export const getKeyChainMessage = ({ KeyChain, ChainStage }: IKeyChainRequest):
throw new Error(`KeyChain ${KeyChain} does not contain chain stages`); 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 // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
if (!keyChainStage) { if (!keyChainStage) {
throw new Error(`KeyChainStage ${ChainStage} not found`); throw new Error(`KeyChainStage ${ChainStage} not found`);

4
src/services/questService.ts
View File

@ -308,11 +308,11 @@ export const giveKeyChainStageTriggered = async (
const chainStages = ExportKeys[keyChainInfo.KeyChain]?.chainStages; const chainStages = ExportKeys[keyChainInfo.KeyChain]?.chainStages;
if (chainStages) { if (chainStages) {
if (chainStages[keyChainInfo.ChainStage].itemsToGiveWhenTriggered.length > 0) { if (chainStages[keyChainInfo.ChainStage - 1].itemsToGiveWhenTriggered.length > 0) {
await giveKeyChainItem(inventory, keyChainInfo); await giveKeyChainItem(inventory, keyChainInfo);
} }
if (chainStages[keyChainInfo.ChainStage].messageToSendWhenTriggered) { if (chainStages[keyChainInfo.ChainStage - 1].messageToSendWhenTriggered) {
await giveKeyChainMessage(inventory, inventory.accountOwnerId, keyChainInfo); await giveKeyChainMessage(inventory, inventory.accountOwnerId, keyChainInfo);
} }
} }