From 12cd7b667a66858d831d70f85960e548506c45c1 Mon Sep 17 00:00:00 2001
From: Dennis Postma <dennis@directonline.io>
Date: Sun, 21 Jul 2024 22:26:28 +0200
Subject: [PATCH] Updated TS types

---
 .../utilities/zoneEditor/partials/Objects.vue |  2 +-
 src/stores/game.ts                            |  2 +-
 src/types.ts                                  | 24 ++++++++++++++-----
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/components/utilities/zoneEditor/partials/Objects.vue b/src/components/utilities/zoneEditor/partials/Objects.vue
index d173c01..b8364da 100644
--- a/src/components/utilities/zoneEditor/partials/Objects.vue
+++ b/src/components/utilities/zoneEditor/partials/Objects.vue
@@ -23,7 +23,7 @@
               {{ tag }}
             </button>
           </div>
-          <div class=" h-full overflow-auto">
+          <div class="h-full overflow-auto">
             <div class="flex justify-between flex-wrap gap-2.5 items-center">
               <div v-for="(object, index) in filteredObjects" :key="index" class="max-w-1/4 inline-block">
                 <img
diff --git a/src/stores/game.ts b/src/stores/game.ts
index 87785b1..9f2c9d2 100644
--- a/src/stores/game.ts
+++ b/src/stores/game.ts
@@ -61,6 +61,6 @@ export const useGameStore = defineStore('game', {
       this.character = null
 
       useCookies().remove('token')
-    },
+    }
   }
 })
diff --git a/src/types.ts b/src/types.ts
index 45dc508..3d4bf36 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -16,10 +16,10 @@ export type Sprite = {
   origin_x: number
   origin_y: number
   frameSpeed: number
+  frameWidth: number
+  frameHeight: number
   isAnimated: boolean
   isLooping: boolean
-  isPlayableCharacter: boolean
-  isEnemy: boolean
   createdAt: Date
   updatedAt: Date
 }
@@ -27,7 +27,7 @@ export type Sprite = {
 export type Tile = {
   id: string
   name: string
-  tags: string[]
+  tags?: any
   createdAt: Date
   updatedAt: Date
 }
@@ -35,9 +35,13 @@ export type Tile = {
 export type Object = {
   id: string
   name: string
-  tags: string[]
+  tags?: any
   origin_x: number
   origin_y: number
+  isAnimated: boolean
+  frameSpeed: number
+  frameWidth: number
+  frameHeight: number
   createdAt: Date
   updatedAt: Date
   ZoneObject: ZoneObject[]
@@ -93,7 +97,8 @@ export type Zone = {
   name: string
   width: number
   height: number
-  tiles: any // Using 'any' for Json type, consider using a more specific type if possible
+  tiles: string[][]
+  pvp: boolean
   zoneEventTiles: ZoneEventTile[]
   zoneObjects: ZoneObject[]
   characters: Character[]
@@ -113,11 +118,18 @@ export type ZoneObject = {
   position_y: number
 }
 
+export enum ZoneEventTileType {
+  BLOCK = 'BLOCK',
+  WARP = 'WARP',
+  NPC = 'NPC',
+  ITEM = 'ITEM'
+}
+
 export type ZoneEventTile = {
   id: string
   zoneId: number
   zone: Zone
-  type: 'BLOCK' | 'WARP' | 'NPC' | 'ITEM'
+  type: ZoneEventTileType
   position_x: number
   position_y: number
 }