OpenWF/SpaceNinjaServer
28
29
Fork 35
Code Issues 21 Pull Requests Actions Packages Projects Releases Activity

improve guildTech request types

Browse Source
This commit is contained in:
Sainan 2025-03-14 15:10:42 +01:00
parent 0facdd1af9
commit 44f77ff929
1 changed files with 23 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/controllers/api/guildTechController.ts
View File

@ -28,8 +28,7 @@ export const guildTechController: RequestHandler = async (req, res) => {
const inventory = await getInventory(accountId); const inventory = await getInventory(accountId);
const guild = await getGuildForRequestEx(req, inventory); const guild = await getGuildForRequestEx(req, inventory);
const data = JSON.parse(String(req.body)) as TGuildTechRequest; const data = JSON.parse(String(req.body)) as TGuildTechRequest;
const action = data.Action.split(",")[0]; if (data.Action == "Sync") {
if (action == "Sync") {
let needSave = false; let needSave = false;
const techProjects: ITechProjectClient[] = []; const techProjects: ITechProjectClient[] = [];
if (guild.TechProjects) { if (guild.TechProjects) {
@ -53,18 +52,18 @@ export const guildTechController: RequestHandler = async (req, res) => {
await guild.save(); await guild.save();
} }
res.json({ TechProjects: techProjects }); res.json({ TechProjects: techProjects });
} else if (action == "Start") { } else if (data.Action == "Start") {
if (!hasAccessToDojo(inventory) || !(await hasGuildPermission(guild, accountId, GuildPermission.Fabricator))) { if (!hasAccessToDojo(inventory) || !(await hasGuildPermission(guild, accountId, GuildPermission.Fabricator))) {
res.status(400).send("-1").end(); res.status(400).send("-1").end();
return; return;
} }
const recipe = ExportDojoRecipes.research[data.RecipeType!]; const recipe = ExportDojoRecipes.research[data.RecipeType];
guild.TechProjects ??= []; guild.TechProjects ??= [];
if (!guild.TechProjects.find(x => x.ItemType == data.RecipeType)) { if (!guild.TechProjects.find(x => x.ItemType == data.RecipeType)) {
const techProject = const techProject =
guild.TechProjects[ guild.TechProjects[
guild.TechProjects.push({ guild.TechProjects.push({
ItemType: data.RecipeType!, ItemType: data.RecipeType,
ReqCredits: config.noDojoResearchCosts ? 0 : scaleRequiredCount(recipe.price), ReqCredits: config.noDojoResearchCosts ? 0 : scaleRequiredCount(recipe.price),
ReqItems: recipe.ingredients.map(x => ({ ReqItems: recipe.ingredients.map(x => ({
ItemType: x.ItemType, ItemType: x.ItemType,
@ -80,12 +79,12 @@ export const guildTechController: RequestHandler = async (req, res) => {
} }
await guild.save(); await guild.save();
res.end(); res.end();
} else if (action == "Contribute") { } else if (data.Action == "Contribute") {
if (!hasAccessToDojo(inventory)) { if (!hasAccessToDojo(inventory)) {
res.status(400).send("-1").end(); res.status(400).send("-1").end();
return; return;
} }
const contributions = data as IGuildTechContributeFields; const contributions = data;
const techProject = guild.TechProjects!.find(x => x.ItemType == contributions.RecipeType)!; const techProject = guild.TechProjects!.find(x => x.ItemType == contributions.RecipeType)!;
if (contributions.VaultCredits) { if (contributions.VaultCredits) {
@ -136,7 +135,7 @@ export const guildTechController: RequestHandler = async (req, res) => {
if (techProject.ReqCredits == 0 && !techProject.ReqItems.find(x => x.ItemCount > 0)) { if (techProject.ReqCredits == 0 && !techProject.ReqItems.find(x => x.ItemCount > 0)) {
// This research is now fully funded. // This research is now fully funded.
const recipe = ExportDojoRecipes.research[data.RecipeType!]; const recipe = ExportDojoRecipes.research[data.RecipeType];
processFundedProject(guild, techProject, recipe); processFundedProject(guild, techProject, recipe);
} }
@ -146,12 +145,12 @@ export const guildTechController: RequestHandler = async (req, res) => {
InventoryChanges: inventoryChanges, InventoryChanges: inventoryChanges,
Vault: getGuildVault(guild) Vault: getGuildVault(guild)
}); });
} else if (action == "Buy") { } else if (data.Action.split(",")[0] == "Buy") {
if (!hasAccessToDojo(inventory) || !(await hasGuildPermission(guild, accountId, GuildPermission.Fabricator))) { if (!hasAccessToDojo(inventory) || !(await hasGuildPermission(guild, accountId, GuildPermission.Fabricator))) {
res.status(400).send("-1").end(); res.status(400).send("-1").end();
return; return;
} }
const purchase = data as IGuildTechBuyFields; const purchase = data as IGuildTechBuyRequest;
const quantity = parseInt(data.Action.split(",")[1]); const quantity = parseInt(data.Action.split(",")[1]);
const recipeChanges = [ const recipeChanges = [
{ {
@ -173,13 +172,12 @@ export const guildTechController: RequestHandler = async (req, res) => {
Recipes: recipeChanges Recipes: recipeChanges
} }
}); });
} else if (action == "Fabricate") { } else if (data.Action == "Fabricate") {
if (!hasAccessToDojo(inventory) || !(await hasGuildPermission(guild, accountId, GuildPermission.Fabricator))) { if (!hasAccessToDojo(inventory) || !(await hasGuildPermission(guild, accountId, GuildPermission.Fabricator))) {
res.status(400).send("-1").end(); res.status(400).send("-1").end();
return; return;
} }
const payload = data as IGuildTechFabricateRequest; const recipe = ExportDojoRecipes.fabrications[data.RecipeType];
const recipe = ExportDojoRecipes.fabrications[payload.RecipeType];
const inventoryChanges: IInventoryChanges = updateCurrency(inventory, recipe.price, false); const inventoryChanges: IInventoryChanges = updateCurrency(inventory, recipe.price, false);
inventoryChanges.MiscItems = recipe.ingredients.map(x => ({ inventoryChanges.MiscItems = recipe.ingredients.map(x => ({
ItemType: x.ItemType, ItemType: x.ItemType,
@ -233,20 +231,24 @@ const setTechLogState = (
}; };
type TGuildTechRequest = type TGuildTechRequest =
| ({ | { Action: "Sync" | "SomethingElseThatWeMightNotKnowAbout" }
Action: string; | IGuildTechBasicRequest
} & Partial<IGuildTechStartFields> & | IGuildTechContributeRequest;
Partial<IGuildTechContributeFields>)
| IGuildTechFabricateRequest;
interface IGuildTechStartFields { interface IGuildTechBasicRequest {
Action: "Start" | "Fabricate";
Mode: "Guild"; Mode: "Guild";
RecipeType: string; RecipeType: string;
} }
type IGuildTechBuyFields = IGuildTechStartFields; interface IGuildTechBuyRequest {
Action: string;
Mode: "Guild";
RecipeType: string;
}
interface IGuildTechContributeFields { interface IGuildTechContributeRequest {
Action: "Contribute";
ResearchId: ""; ResearchId: "";
RecipeType: string; RecipeType: string;
RegularCredits: number; RegularCredits: number;
@ -254,9 +256,3 @@ interface IGuildTechContributeFields {
VaultCredits: number; VaultCredits: number;
VaultMiscItems: IMiscItem[]; VaultMiscItems: IMiscItem[];
} }
interface IGuildTechFabricateRequest {
Action: "Fabricate";
Mode: "Guild";
RecipeType: string;
}