From ca4b2e9149daf5586c46db321f233bc46714126a Mon Sep 17 00:00:00 2001 From: Justin Edmund Date: Thu, 1 Dec 2022 05:35:27 -0800 Subject: [PATCH] Add JobSkillObject and 0th index --- types/Party.d.ts | 9 +++------ types/index.d.ts | 7 +++++++ utils/appState.tsx | 8 +++----- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/types/Party.d.ts b/types/Party.d.ts index 3d3f808d..fb6609a2 100644 --- a/types/Party.d.ts +++ b/types/Party.d.ts @@ -1,15 +1,12 @@ +import { JobSkillObject } from "~types" + interface Party { id: string name: string description: string raid: Raid job: Job - job_skills: { - [key: number]: JobSkill - 1: JobSkill - 2: JobSkill - 3: JobSkill - } + job_skills: JobSkillObject shortcode: string extra: boolean favorited: boolean diff --git a/types/index.d.ts b/types/index.d.ts index be978e8d..d37ca641 100644 --- a/types/index.d.ts +++ b/types/index.d.ts @@ -1,2 +1,9 @@ export type SearchableObject = Character | Weapon | Summon | JobSkill export type SearchableObjectArray = (Character | Weapon | Summon | JobSkill)[] +export type JobSkillObject = { + [key: number]: JobSkill | undefined + 0: JobSkill | undefined + 1: JobSkill | undefined + 2: JobSkill | undefined + 3: JobSkill | undefined +} diff --git a/utils/appState.tsx b/utils/appState.tsx index f161cba4..42ef90ab 100644 --- a/utils/appState.tsx +++ b/utils/appState.tsx @@ -1,4 +1,5 @@ import { proxy } from "valtio" +import { JobSkillObject } from "~types" const emptyJob: Job = { id: "-1", @@ -25,11 +26,7 @@ interface AppState { name: string | undefined description: string | undefined job: Job - jobSkills: { - 1: JobSkill | undefined - 2: JobSkill | undefined - 3: JobSkill | undefined - } + jobSkills: JobSkillObject raid: Raid | undefined element: number extra: boolean @@ -71,6 +68,7 @@ export const initialAppState: AppState = { description: undefined, job: emptyJob, jobSkills: { + 0: undefined, 1: undefined, 2: undefined, 3: undefined,