Almost finalised refactoring

src/application/types.ts

@@ -34,7 +34,7 @@ export type Tile = {
   updatedAt: Date
 }
 
-export type Object = {
+export type MapObject = {
   id: UUID
   name: string
   tags: any | null
@@ -46,7 +46,6 @@ export type Object = {
   frameHeight: number
   createdAt: Date
   updatedAt: Date
-  MapObject: PlacedMapObject[]
 }
 
 export type Item = {
@@ -56,7 +55,6 @@ export type Item = {
   itemType: ItemType
   stackable: boolean
   rarity: ItemRarity
-  spriteId: UUID | null
   sprite?: Sprite
   createdAt: Date
   updatedAt: Date
@@ -74,7 +72,7 @@ export type Map = {
   pvp: boolean
   mapEffects: MapEffect[]
   mapEventTiles: MapEventTile[]
-  mapObjects: PlacedMapObject[]
+  placedMapObjects: PlacedMapObject[]
   characters: Character[]
   chats: Chat[]
   createdAt: Date
@@ -83,7 +81,6 @@ export type Map = {
 
 export type MapEffect = {
   id: UUID
-  mapId: UUID
   map: Map
   effect: string
   strength: number
@@ -91,10 +88,8 @@ export type MapEffect = {
 
 export type PlacedMapObject = {
   id: UUID
-  mapId: UUID
   map: Map
-  objectId: UUID
-  object: Object
+  mapObject: MapObject
   depth: number
   isRotated: boolean
   positionX: number
@@ -110,7 +105,6 @@ export enum MapEventTileType {
 
 export type MapEventTile = {
   id: UUID
-  mapId: UUID
   map: Map
   type: MapEventTileType
   positionX: number
@@ -120,7 +114,6 @@ export type MapEventTile = {
 
 export type MapEventTileTeleport = {
   id: UUID
-  mapEventTileId: UUID
   mapEventTile: MapEventTile
   toMapId: UUID
   toMap: Map
@@ -155,8 +148,6 @@ export type CharacterType = {
   gender: CharacterGender
   race: CharacterRace
   isSelectable: boolean
-  characters: Character[]
-  spriteId?: string
   sprite?: Sprite
   createdAt: Date
   updatedAt: Date
@@ -165,7 +156,7 @@ export type CharacterType = {
 export type CharacterHair = {
   id: UUID
   name: string
-  sprite: Sprite
+  sprite?: Sprite
   gender: CharacterGender
   isSelectable: boolean
 }
@@ -184,9 +175,7 @@ export type Character = {
   positionX: number
   positionY: number
   rotation: number
-  characterTypeId: UUID | null
   characterType: CharacterType | null | string
-  characterHairId: UUID | null
   characterHair: CharacterHair | null
   mapId: UUID
   map: Map
@@ -202,9 +191,7 @@ export type MapCharacter = {
 
 export type CharacterItem = {
   id: UUID
-  characterId: UUID
   character: Character
-  itemId: UUID
   item: Item
   quantity: number
 }
@@ -212,7 +199,6 @@ export type CharacterItem = {
 export type CharacterEquipment = {
   id: UUID
   slot: CharacterEquipmentSlotType
-  characterItemId: UUID
   characterItem: CharacterItem
 }
 
@@ -250,9 +236,7 @@ export type SpriteAction = {
 
 export type Chat = {
   id: UUID
-  characterId: UUID
   character: Character
-  mapId: UUID
   map: Map
   message: string
   createdAt: Date