From 3a84781945a33bb817d700c502bc03893a90091a Mon Sep 17 00:00:00 2001 From: Sainan Date: Fri, 3 Jan 2025 02:43:24 +0100 Subject: [PATCH] avoid over-contributing to research --- src/controllers/api/guildTechController.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/controllers/api/guildTechController.ts b/src/controllers/api/guildTechController.ts index ff7f78f3..7d27267b 100644 --- a/src/controllers/api/guildTechController.ts +++ b/src/controllers/api/guildTechController.ts @@ -34,11 +34,17 @@ export const guildTechController: RequestHandler = async (req, res) => { } else if (data.Action == "Contribute") { const contributions = data as IGuildTechContributeFields; const techProject = guild.TechProjects!.find(x => x.ItemType == contributions.RecipeType)!; + if (contributions.RegularCredits > techProject.ReqCredits) { + contributions.RegularCredits = techProject.ReqCredits; + } techProject.ReqCredits -= contributions.RegularCredits; const miscItemChanges = []; for (const miscItem of contributions.MiscItems) { const reqItem = techProject.ReqItems.find(x => x.ItemType == miscItem.ItemType); if (reqItem) { + if (miscItem.ItemCount > reqItem.ItemCount) { + miscItem.ItemCount = reqItem.ItemCount; + } reqItem.ItemCount -= miscItem.ItemCount; miscItemChanges.push({ ItemType: miscItem.ItemType,