From 26d644a982c2ea4b29ff7ea09de3f04efc4a7e93 Mon Sep 17 00:00:00 2001 From: Sainan <63328889+Sainan@users.noreply.github.com> Date: Wed, 23 Apr 2025 11:36:57 -0700 Subject: [PATCH] feat: handle scale for the dojo decos that need it (#1795) Closes #1785 Reviewed-on: https://onlyg.it/OpenWF/SpaceNinjaServer/pulls/1795 Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com> Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com> --- src/controllers/api/placeDecoInComponentController.ts | 4 +++- src/models/guildModel.ts | 1 + src/services/guildService.ts | 1 + src/types/guildTypes.ts | 1 + 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/controllers/api/placeDecoInComponentController.ts b/src/controllers/api/placeDecoInComponentController.ts index cf50a90b..a45806a8 100644 --- a/src/controllers/api/placeDecoInComponentController.ts +++ b/src/controllers/api/placeDecoInComponentController.ts @@ -37,6 +37,7 @@ export const placeDecoInComponentController: RequestHandler = async (req, res) = const deco = component.Decos.find(x => x._id.equals(request.MoveId))!; deco.Pos = request.Pos; deco.Rot = request.Rot; + deco.Scale = request.Scale; } else { const deco = component.Decos[ @@ -45,6 +46,7 @@ export const placeDecoInComponentController: RequestHandler = async (req, res) = Type: request.Type, Pos: request.Pos, Rot: request.Rot, + Scale: request.Scale, Name: request.Name, Sockets: request.Sockets }) - 1 @@ -113,9 +115,9 @@ interface IPlaceDecoInComponentRequest { Type: string; Pos: number[]; Rot: number[]; + Scale?: number; Name?: string; Sockets?: number; - Scale?: number; // only provided alongside MoveId and seems to always be 1 MoveId?: string; ShipDeco?: boolean; VaultDeco?: boolean; diff --git a/src/models/guildModel.ts b/src/models/guildModel.ts index ffb5dac5..15a4c5a6 100644 --- a/src/models/guildModel.ts +++ b/src/models/guildModel.ts @@ -23,6 +23,7 @@ const dojoDecoSchema = new Schema({ Type: String, Pos: [Number], Rot: [Number], + Scale: Number, Name: String, Sockets: Number, RegularCredits: Number, diff --git a/src/services/guildService.ts b/src/services/guildService.ts index d409654d..aba101e6 100644 --- a/src/services/guildService.ts +++ b/src/services/guildService.ts @@ -222,6 +222,7 @@ export const getDojoClient = async ( Type: deco.Type, Pos: deco.Pos, Rot: deco.Rot, + Scale: deco.Scale, Name: deco.Name, Sockets: deco.Sockets, PictureFrameInfo: deco.PictureFrameInfo diff --git a/src/types/guildTypes.ts b/src/types/guildTypes.ts index 59e7a3a0..dc71e3ec 100644 --- a/src/types/guildTypes.ts +++ b/src/types/guildTypes.ts @@ -206,6 +206,7 @@ export interface IDojoDecoClient { Type: string; Pos: number[]; Rot: number[]; + Scale?: number; Name?: string; // for teleporters Sockets?: number; RegularCredits?: number;