OpenWF/SpaceNinjaServer
19
22
Fork 23
Code Issues 29 Pull Requests 6 Actions Packages Projects Releases Activity

fix: use shared count for calendar day indecies #2265

Merged
OrdisPrime merged 5 commits from cal-fix-ii into main 2025-06-23 15:02:31 -07:00
Conversation 0 Commits 5 Files Changed 3 +13 -16
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 29a465b183 - Show all commits

13
src/controllers/api/completeCalendarEventController.ts
View File

@ -12,24 +12,21 @@ export const completeCalendarEventController: RequestHandler = async (req, res)
const calendarProgress = getCalendarProgress(inventory);
const currentSeason = getWorldState().KnownCalendarSeasons[0];
let inventoryChanges: IInventoryChanges = {};
let dayIndex = calendarProgress.SeasonProgress.LastCompletedDayIdx + 1;
for (; dayIndex != currentSeason.Days.length; ++dayIndex) {
const dayIndex = calendarProgress.SeasonProgress.LastCompletedDayIdx + 1;
const day = currentSeason.Days[dayIndex];
if (day.events.length == 0 || day.events[0].type != "CET_CHALLENGE") {
if (day.events.length != 0 && day.events[0].type == "CET_CHALLENGE") {
throw new Error(`completeCalendarEvent should not be used for challenges`);
}
if (day.events.length != 0) {
const selection = day.events[parseInt(req.query.CompletedEventIdx as string)];
if (selection.type == "CET_REWARD") {
inventoryChanges = (await handleStoreItemAcquisition(selection.reward!, inventory))
.InventoryChanges;
inventoryChanges = (await handleStoreItemAcquisition(selection.reward!, inventory)).InventoryChanges;
} else if (selection.type == "CET_UPGRADE") {
calendarProgress.YearProgress.Upgrades.push(selection.upgrade!);
} else if (selection.type != "CET_PLOT") {
throw new Error(`unexpected selection type: ${selection.type}`);
}
}
break;
}
}
calendarProgress.SeasonProgress.LastCompletedDayIdx = dayIndex;
checkCalendarChallengeCompletion(calendarProgress, currentSeason);
await inventory.save();