Finalised spritesheet generator, updated init command for correct offset values

Reviewed-on: #1

.env.example

@@ -3,7 +3,7 @@ ENV=development
 HOST="0.0.0.0"
 PORT=4000
 JWT_SECRET="secret"
-CLIENT_URL="http://192.168.3.4:5173"
+CLIENT_URL="http://localhost:5173"
 
 # Database configuration
 REDIS_URL="redis://@127.0.0.1:6379/4"

.prettierrc.json

@@ -3,6 +3,6 @@
   "semi": false,
   "tabWidth": 2,
   "singleQuote": true,
-  "printWidth": 300,
+  "printWidth": 200,
   "trailingComma": "none"
 }

README.md

@@ -2,12 +2,22 @@
 
 This is the server for the Noxious game.
 
+## Projects requirements
+
+- NodeJS 20.x or higher
+- MySQL 8.x or higher
+- Redis 7.x or higher
+
 ## Installation
 
 1. Clone the repository
 2. Install dependencies with `npm install`
 3. Copy the `.env.example` file to `.env` and fill in the required variables
-4. Run the server with `npm run dev`
+4. Extract assets.zip to the `public` folder
+5. After MySQL and Redis are running, run `npx mikro-orm migration:up` to create the database schema
+6. Run the server with `npm run dev`
+7. Write `init` in the console to import default data and restart the server
+8. Write `tiles` in the console to fix tile sizes
 
 ## Commands
 
@@ -33,8 +43,12 @@ Run `npx mikro-orm migration:create --initial` to create a new initial migration
 
 ### Create migrations
 
-Run `npx mikro-orm migration:create` to create a new migration.
+Run `npx mikro-orm migration:create` to create a new migration. You do this when you want to add a new table or change an existing one.
 
 ### Apply migrations
 
-Run `npx mikro-orm migration:up` to apply all pending migrations.
+Run `npx mikro-orm migration:up` to apply all pending migrations.
+
+### Import default data
+
+After running the server, write `init` in the console to import default data.

migrations/Migration20250128165214.ts

@@ -1,22 +1,38 @@
 import { Migration } from '@mikro-orm/migrations';
 
-export class Migration20250101224501 extends Migration {
+export class Migration20250128165214 extends Migration {
 
   override async up(): Promise<void> {
-    this.addSql(`create table \`map_object\` (\`id\` varchar(255) not null, \`name\` varchar(255) not null, \`tags\` json null, \`origin_x\` int not null default 0, \`origin_y\` int not null default 0, \`is_animated\` tinyint(1) not null default false, \`frame_rate\` int not null default 0, \`frame_width\` int not null default 0, \`frame_height\` int not null default 0, \`created_at\` datetime not null, \`updated_at\` datetime not null, primary key (\`id\`)) default character set utf8mb4 engine = InnoDB;`);
+    this.addSql(`create table \`map\` (\`id\` varchar(255) not null, \`name\` varchar(255) not null, \`width\` int not null default 10, \`height\` int not null default 10, \`tiles\` json null, \`pvp\` tinyint(1) not null default false, \`created_at\` datetime not null, \`updated_at\` datetime not null, primary key (\`id\`)) default character set utf8mb4 engine = InnoDB;`);
+
+    this.addSql(`create table \`map_effect\` (\`id\` varchar(255) not null, \`map_id\` varchar(255) not null, \`effect\` varchar(255) not null, \`strength\` int not null, primary key (\`id\`)) default character set utf8mb4 engine = InnoDB;`);
+    this.addSql(`alter table \`map_effect\` add index \`map_effect_map_id_index\`(\`map_id\`);`);
+
+    this.addSql(`create table \`map_event_tile\` (\`id\` varchar(255) not null, \`map_id\` varchar(255) not null, \`type\` enum('BLOCK', 'TELEPORT', 'NPC', 'ITEM') not null, \`position_x\` int not null, \`position_y\` int not null, primary key (\`id\`)) default character set utf8mb4 engine = InnoDB;`);
+    this.addSql(`alter table \`map_event_tile\` add index \`map_event_tile_map_id_index\`(\`map_id\`);`);
+
+    this.addSql(`create table \`map_event_tile_teleport\` (\`id\` varchar(255) not null, \`map_event_tile_id\` varchar(255) not null, \`to_map_id\` varchar(255) not null, \`to_rotation\` int not null, \`to_position_x\` int not null, \`to_position_y\` int not null, primary key (\`id\`)) default character set utf8mb4 engine = InnoDB;`);
+    this.addSql(`alter table \`map_event_tile_teleport\` add unique \`map_event_tile_teleport_map_event_tile_id_unique\`(\`map_event_tile_id\`);`);
+    this.addSql(`alter table \`map_event_tile_teleport\` add index \`map_event_tile_teleport_to_map_id_index\`(\`to_map_id\`);`);
+
+    this.addSql(`create table \`map_object\` (\`id\` varchar(255) not null, \`name\` varchar(255) not null, \`tags\` json null, \`origin_x\` numeric(10,2) not null default 0, \`origin_y\` numeric(10,2) not null default 0, \`frame_rate\` int not null default 0, \`frame_width\` int not null default 0, \`frame_height\` int not null default 0, \`created_at\` datetime not null, \`updated_at\` datetime not null, primary key (\`id\`)) default character set utf8mb4 engine = InnoDB;`);
+
+    this.addSql(`create table \`placed_map_object\` (\`id\` varchar(255) not null, \`map_id\` varchar(255) not null, \`map_object_id\` varchar(255) not null, \`is_rotated\` tinyint(1) not null default false, \`position_x\` int not null default 0, \`position_y\` int not null default 0, primary key (\`id\`)) default character set utf8mb4 engine = InnoDB;`);
+    this.addSql(`alter table \`placed_map_object\` add index \`placed_map_object_map_id_index\`(\`map_id\`);`);
+    this.addSql(`alter table \`placed_map_object\` add index \`placed_map_object_map_object_id_index\`(\`map_object_id\`);`);
 
     this.addSql(`create table \`sprite\` (\`id\` varchar(255) not null, \`name\` varchar(255) not null, \`created_at\` datetime not null, \`updated_at\` datetime not null, primary key (\`id\`)) default character set utf8mb4 engine = InnoDB;`);
 
-    this.addSql(`create table \`item\` (\`id\` varchar(255) not null, \`name\` varchar(255) not null, \`description\` varchar(255) null, \`item_type\` enum('WEAPON', 'HELMET', 'CHEST', 'LEGS', 'BOOTS', 'GLOVES', 'RING', 'NECKLACE') not null, \`stackable\` tinyint(1) not null default false, \`rarity\` enum('COMMON', 'UNCOMMON', 'RARE', 'EPIC', 'LEGENDARY') not null default 'COMMON', \`sprite_id\` varchar(255) null, \`created_at\` datetime not null, \`updated_at\` datetime not null, primary key (\`id\`)) default character set utf8mb4 engine = InnoDB;`);
+    this.addSql(`create table \`item\` (\`id\` varchar(255) not null, \`name\` varchar(255) not null, \`description\` varchar(255) not null default '', \`item_type\` enum('WEAPON', 'HELMET', 'CHEST', 'LEGS', 'BOOTS', 'GLOVES', 'RING', 'NECKLACE') not null, \`stackable\` tinyint(1) not null default false, \`rarity\` enum('COMMON', 'UNCOMMON', 'RARE', 'EPIC', 'LEGENDARY') not null default 'COMMON', \`sprite_id\` varchar(255) null, \`created_at\` datetime not null, \`updated_at\` datetime not null, primary key (\`id\`)) default character set utf8mb4 engine = InnoDB;`);
     this.addSql(`alter table \`item\` add index \`item_sprite_id_index\`(\`sprite_id\`);`);
 
     this.addSql(`create table \`character_type\` (\`id\` varchar(255) not null, \`name\` varchar(255) not null, \`gender\` enum('MALE', 'FEMALE') not null, \`race\` enum('HUMAN', 'ELF', 'DWARF', 'ORC', 'GOBLIN') not null, \`is_selectable\` tinyint(1) not null default false, \`sprite_id\` varchar(255) null, \`created_at\` datetime not null, \`updated_at\` datetime not null, primary key (\`id\`)) default character set utf8mb4 engine = InnoDB;`);
     this.addSql(`alter table \`character_type\` add index \`character_type_sprite_id_index\`(\`sprite_id\`);`);
 
-    this.addSql(`create table \`character_hair\` (\`id\` varchar(255) not null, \`name\` varchar(255) not null, \`gender\` varchar(255) not null default 'MALE', \`is_selectable\` tinyint(1) not null default false, \`sprite_id\` varchar(255) null, primary key (\`id\`)) default character set utf8mb4 engine = InnoDB;`);
+    this.addSql(`create table \`character_hair\` (\`id\` varchar(255) not null, \`name\` varchar(255) not null, \`gender\` varchar(255) not null default 'MALE', \`is_selectable\` tinyint(1) not null default false, \`sprite_id\` varchar(255) null, \`created_at\` datetime not null, \`updated_at\` datetime not null, primary key (\`id\`)) default character set utf8mb4 engine = InnoDB;`);
     this.addSql(`alter table \`character_hair\` add index \`character_hair_sprite_id_index\`(\`sprite_id\`);`);
 
-    this.addSql(`create table \`sprite_action\` (\`id\` varchar(255) not null, \`sprite_id\` varchar(255) not null, \`action\` varchar(255) not null, \`sprites\` json null, \`origin_x\` int not null default 0, \`origin_y\` int not null default 0, \`is_animated\` tinyint(1) not null default false, \`is_looping\` tinyint(1) not null default false, \`frame_width\` int not null default 0, \`frame_height\` int not null default 0, \`frame_rate\` int not null default 0, primary key (\`id\`)) default character set utf8mb4 engine = InnoDB;`);
+    this.addSql(`create table \`sprite_action\` (\`id\` varchar(255) not null, \`sprite_id\` varchar(255) not null, \`action\` varchar(255) not null, \`sprites\` json null, \`origin_x\` numeric(5,2) not null default 0, \`origin_y\` numeric(5,2) not null default 0, \`frame_width\` int not null default 0, \`frame_height\` int not null default 0, \`frame_rate\` int not null default 0, primary key (\`id\`)) default character set utf8mb4 engine = InnoDB;`);
     this.addSql(`alter table \`sprite_action\` add index \`sprite_action_sprite_id_index\`(\`sprite_id\`);`);
 
     this.addSql(`create table \`tile\` (\`id\` varchar(255) not null, \`name\` varchar(255) not null, \`tags\` json null, \`created_at\` datetime not null, \`updated_at\` datetime not null, primary key (\`id\`)) default character set utf8mb4 engine = InnoDB;`);
@@ -29,20 +45,16 @@ export class Migration20250101224501 extends Migration {
     this.addSql(`alter table \`password_reset_token\` add index \`password_reset_token_user_id_index\`(\`user_id\`);`);
     this.addSql(`alter table \`password_reset_token\` add unique \`password_reset_token_token_unique\`(\`token\`);`);
 
-    this.addSql(`create table \`world\` (\`date\` datetime not null, \`is_rain_enabled\` tinyint(1) not null default false, \`rain_percentage\` int not null default 0, \`is_fog_enabled\` tinyint(1) not null default false, \`fog_density\` int not null default 0, primary key (\`date\`)) default character set utf8mb4 engine = InnoDB;`);
-
-    this.addSql(`create table \`zone\` (\`id\` varchar(255) not null, \`name\` varchar(255) not null, \`width\` int not null default 10, \`height\` int not null default 10, \`tiles\` json null, \`pvp\` tinyint(1) not null default false, \`created_at\` datetime not null, \`updated_at\` datetime not null, primary key (\`id\`)) default character set utf8mb4 engine = InnoDB;`);
-
-    this.addSql(`create table \`character\` (\`id\` varchar(255) not null, \`user_id\` varchar(255) not null, \`name\` varchar(255) not null, \`online\` tinyint(1) not null default false, \`role\` varchar(255) not null default 'player', \`zone_id\` varchar(255) not null, \`position_x\` int not null default 0, \`position_y\` int not null default 0, \`rotation\` int not null default 0, \`character_type_id\` varchar(255) null, \`character_hair_id\` varchar(255) null, \`alignment\` int not null default 50, \`hitpoints\` int not null default 100, \`mana\` int not null default 100, \`level\` int not null default 1, \`experience\` int not null default 0, \`strength\` int not null default 10, \`dexterity\` int not null default 10, \`intelligence\` int not null default 10, \`wisdom\` int not null default 10, primary key (\`id\`)) default character set utf8mb4 engine = InnoDB;`);
+    this.addSql(`create table \`character\` (\`id\` varchar(255) not null, \`user_id\` varchar(255) not null, \`name\` varchar(255) not null, \`online\` tinyint(1) not null default false, \`role\` varchar(255) not null default 'player', \`map_id\` varchar(255) not null, \`position_x\` int not null default 0, \`position_y\` int not null default 0, \`rotation\` int not null default 0, \`character_type_id\` varchar(255) null, \`character_hair_id\` varchar(255) null, \`alignment\` int not null default 50, \`hitpoints\` int not null default 100, \`mana\` int not null default 100, \`level\` int not null default 1, \`experience\` int not null default 0, \`strength\` int not null default 10, \`dexterity\` int not null default 10, \`intelligence\` int not null default 10, \`wisdom\` int not null default 10, primary key (\`id\`)) default character set utf8mb4 engine = InnoDB;`);
     this.addSql(`alter table \`character\` add index \`character_user_id_index\`(\`user_id\`);`);
     this.addSql(`alter table \`character\` add unique \`character_name_unique\`(\`name\`);`);
-    this.addSql(`alter table \`character\` add index \`character_zone_id_index\`(\`zone_id\`);`);
+    this.addSql(`alter table \`character\` add index \`character_map_id_index\`(\`map_id\`);`);
     this.addSql(`alter table \`character\` add index \`character_character_type_id_index\`(\`character_type_id\`);`);
     this.addSql(`alter table \`character\` add index \`character_character_hair_id_index\`(\`character_hair_id\`);`);
 
-    this.addSql(`create table \`chat\` (\`id\` varchar(255) not null, \`character_id\` varchar(255) not null, \`zone_id\` varchar(255) not null, \`message\` varchar(255) not null, \`created_at\` datetime not null, primary key (\`id\`)) default character set utf8mb4 engine = InnoDB;`);
+    this.addSql(`create table \`chat\` (\`id\` varchar(255) not null, \`character_id\` varchar(255) not null, \`map_id\` varchar(255) not null, \`message\` varchar(255) not null, \`created_at\` datetime not null, primary key (\`id\`)) default character set utf8mb4 engine = InnoDB;`);
     this.addSql(`alter table \`chat\` add index \`chat_character_id_index\`(\`character_id\`);`);
-    this.addSql(`alter table \`chat\` add index \`chat_zone_id_index\`(\`zone_id\`);`);
+    this.addSql(`alter table \`chat\` add index \`chat_map_id_index\`(\`map_id\`);`);
 
     this.addSql(`create table \`character_item\` (\`id\` varchar(255) not null, \`character_id\` varchar(255) not null, \`item_id\` varchar(255) not null, \`quantity\` int not null, primary key (\`id\`)) default character set utf8mb4 engine = InnoDB;`);
     this.addSql(`alter table \`character_item\` add index \`character_item_character_id_index\`(\`character_id\`);`);
@@ -52,19 +64,17 @@ export class Migration20250101224501 extends Migration {
     this.addSql(`alter table \`character_equipment\` add index \`character_equipment_character_id_index\`(\`character_id\`);`);
     this.addSql(`alter table \`character_equipment\` add index \`character_equipment_character_item_id_index\`(\`character_item_id\`);`);
 
-    this.addSql(`create table \`zone_effect\` (\`id\` varchar(255) not null, \`zone_id\` varchar(255) not null, \`effect\` varchar(255) not null, \`strength\` int not null, primary key (\`id\`)) default character set utf8mb4 engine = InnoDB;`);
-    this.addSql(`alter table \`zone_effect\` add index \`zone_effect_zone_id_index\`(\`zone_id\`);`);
+    this.addSql(`create table \`world\` (\`date\` datetime not null, \`rain_percentage\` int not null default 0, \`fog_density\` int not null default 0, primary key (\`date\`)) default character set utf8mb4 engine = InnoDB;`);
 
-    this.addSql(`create table \`zone_event_tile\` (\`id\` varchar(255) not null, \`zone_id\` varchar(255) not null, \`type\` enum('BLOCK', 'TELEPORT', 'NPC', 'ITEM') not null, \`position_x\` int not null, \`position_y\` int not null, primary key (\`id\`)) default character set utf8mb4 engine = InnoDB;`);
-    this.addSql(`alter table \`zone_event_tile\` add index \`zone_event_tile_zone_id_index\`(\`zone_id\`);`);
+    this.addSql(`alter table \`map_effect\` add constraint \`map_effect_map_id_foreign\` foreign key (\`map_id\`) references \`map\` (\`id\`) on update cascade on delete cascade;`);
 
-    this.addSql(`create table \`zone_event_tile_teleport\` (\`id\` varchar(255) not null, \`zone_event_tile_id\` varchar(255) not null, \`to_zone_id\` varchar(255) not null, \`to_rotation\` int not null, \`to_position_x\` int not null, \`to_position_y\` int not null, primary key (\`id\`)) default character set utf8mb4 engine = InnoDB;`);
-    this.addSql(`alter table \`zone_event_tile_teleport\` add unique \`zone_event_tile_teleport_zone_event_tile_id_unique\`(\`zone_event_tile_id\`);`);
-    this.addSql(`alter table \`zone_event_tile_teleport\` add index \`zone_event_tile_teleport_to_zone_id_index\`(\`to_zone_id\`);`);
+    this.addSql(`alter table \`map_event_tile\` add constraint \`map_event_tile_map_id_foreign\` foreign key (\`map_id\`) references \`map\` (\`id\`) on update cascade on delete cascade;`);
 
-    this.addSql(`create table \`zone_object\` (\`id\` varchar(255) not null, \`zone_id\` varchar(255) not null, \`map_object_id\` varchar(255) not null, \`depth\` int not null default 0, \`is_rotated\` tinyint(1) not null default false, \`position_x\` int not null default 0, \`position_y\` int not null default 0, primary key (\`id\`)) default character set utf8mb4 engine = InnoDB;`);
-    this.addSql(`alter table \`zone_object\` add index \`zone_object_zone_id_index\`(\`zone_id\`);`);
-    this.addSql(`alter table \`zone_object\` add index \`zone_object_map_object_id_index\`(\`map_object_id\`);`);
+    this.addSql(`alter table \`map_event_tile_teleport\` add constraint \`map_event_tile_teleport_map_event_tile_id_foreign\` foreign key (\`map_event_tile_id\`) references \`map_event_tile\` (\`id\`) on update cascade on delete cascade;`);
+    this.addSql(`alter table \`map_event_tile_teleport\` add constraint \`map_event_tile_teleport_to_map_id_foreign\` foreign key (\`to_map_id\`) references \`map\` (\`id\`) on update cascade on delete cascade;`);
+
+    this.addSql(`alter table \`placed_map_object\` add constraint \`placed_map_object_map_id_foreign\` foreign key (\`map_id\`) references \`map\` (\`id\`) on update cascade on delete cascade;`);
+    this.addSql(`alter table \`placed_map_object\` add constraint \`placed_map_object_map_object_id_foreign\` foreign key (\`map_object_id\`) references \`map_object\` (\`id\`) on update cascade on delete cascade;`);
 
     this.addSql(`alter table \`item\` add constraint \`item_sprite_id_foreign\` foreign key (\`sprite_id\`) references \`sprite\` (\`id\`) on update cascade on delete set null;`);
 
@@ -77,28 +87,18 @@ export class Migration20250101224501 extends Migration {
     this.addSql(`alter table \`password_reset_token\` add constraint \`password_reset_token_user_id_foreign\` foreign key (\`user_id\`) references \`user\` (\`id\`) on update cascade on delete cascade;`);
 
     this.addSql(`alter table \`character\` add constraint \`character_user_id_foreign\` foreign key (\`user_id\`) references \`user\` (\`id\`) on update cascade on delete cascade;`);
-    this.addSql(`alter table \`character\` add constraint \`character_zone_id_foreign\` foreign key (\`zone_id\`) references \`zone\` (\`id\`) on update cascade;`);
+    this.addSql(`alter table \`character\` add constraint \`character_map_id_foreign\` foreign key (\`map_id\`) references \`map\` (\`id\`) on update cascade;`);
     this.addSql(`alter table \`character\` add constraint \`character_character_type_id_foreign\` foreign key (\`character_type_id\`) references \`character_type\` (\`id\`) on update cascade on delete set null;`);
     this.addSql(`alter table \`character\` add constraint \`character_character_hair_id_foreign\` foreign key (\`character_hair_id\`) references \`character_hair\` (\`id\`) on update cascade on delete set null;`);
 
     this.addSql(`alter table \`chat\` add constraint \`chat_character_id_foreign\` foreign key (\`character_id\`) references \`character\` (\`id\`) on update cascade on delete cascade;`);
-    this.addSql(`alter table \`chat\` add constraint \`chat_zone_id_foreign\` foreign key (\`zone_id\`) references \`zone\` (\`id\`) on update cascade on delete cascade;`);
+    this.addSql(`alter table \`chat\` add constraint \`chat_map_id_foreign\` foreign key (\`map_id\`) references \`map\` (\`id\`) on update cascade on delete cascade;`);
 
     this.addSql(`alter table \`character_item\` add constraint \`character_item_character_id_foreign\` foreign key (\`character_id\`) references \`character\` (\`id\`) on update cascade on delete cascade;`);
     this.addSql(`alter table \`character_item\` add constraint \`character_item_item_id_foreign\` foreign key (\`item_id\`) references \`item\` (\`id\`) on update cascade on delete cascade;`);
 
     this.addSql(`alter table \`character_equipment\` add constraint \`character_equipment_character_id_foreign\` foreign key (\`character_id\`) references \`character\` (\`id\`) on update cascade on delete cascade;`);
     this.addSql(`alter table \`character_equipment\` add constraint \`character_equipment_character_item_id_foreign\` foreign key (\`character_item_id\`) references \`character_item\` (\`id\`) on update cascade on delete cascade;`);
-
-    this.addSql(`alter table \`zone_effect\` add constraint \`zone_effect_zone_id_foreign\` foreign key (\`zone_id\`) references \`zone\` (\`id\`) on update cascade on delete cascade;`);
-
-    this.addSql(`alter table \`zone_event_tile\` add constraint \`zone_event_tile_zone_id_foreign\` foreign key (\`zone_id\`) references \`zone\` (\`id\`) on update cascade on delete cascade;`);
-
-    this.addSql(`alter table \`zone_event_tile_teleport\` add constraint \`zone_event_tile_teleport_zone_event_tile_id_foreign\` foreign key (\`zone_event_tile_id\`) references \`zone_event_tile\` (\`id\`) on update cascade on delete cascade;`);
-    this.addSql(`alter table \`zone_event_tile_teleport\` add constraint \`zone_event_tile_teleport_to_zone_id_foreign\` foreign key (\`to_zone_id\`) references \`zone\` (\`id\`) on update cascade on delete cascade;`);
-
-    this.addSql(`alter table \`zone_object\` add constraint \`zone_object_zone_id_foreign\` foreign key (\`zone_id\`) references \`zone\` (\`id\`) on update cascade on delete cascade;`);
-    this.addSql(`alter table \`zone_object\` add constraint \`zone_object_map_object_id_foreign\` foreign key (\`map_object_id\`) references \`map_object\` (\`id\`) on update cascade on delete cascade;`);
   }
 
 }

mikro-orm.config.ts

@@ -8,15 +8,15 @@ import serverConfig from './src/application/config'
 export default defineConfig({
   extensions: [Migrator],
   metadataProvider: TsMorphMetadataProvider,
-  entities: ['./src/entities/**/*.js'],
-  entitiesTs: ['./src/entities/**/*.ts'],
+  entities: ['./src/entities/*.js'],
+  entitiesTs: ['./src/entities/*.ts'],
   driver: MySqlDriver,
   host: serverConfig.DB_HOST,
   port: serverConfig.DB_PORT,
   user: serverConfig.DB_USER,
   password: serverConfig.DB_PASS,
   dbName: serverConfig.DB_NAME,
-  debug: serverConfig.ENV !== 'production',
+  debug: false,
   driverOptions: {
     allowPublicKeyRetrieval: true
   },

package.json

@@ -1,9 +1,7 @@
 {
-  "useTsNode": true,
-  "alwaysAllowTs": true,
   "scripts": {
-    "start": "npx prisma migrate deploy && node dist/server.js",
-    "dev": "nodemon --ignore 'data/*' --exec tsx src/server.ts",
+    "start": "node dist/server.js",
+    "dev": "nodemon --exec tsx src/server.ts",
     "build": "tsc",
     "format": "prettier --write src/",
     "lint": "eslint .",
@@ -15,7 +13,6 @@
     "@mikro-orm/migrations": "^6.4.2",
     "@mikro-orm/mysql": "^6.4.2",
     "@mikro-orm/reflection": "^6.4.2",
-    "@prisma/client": "^6.1.0",
     "@types/ioredis": "^4.28.10",
     "bcryptjs": "^2.4.3",
     "bullmq": "^5.13.2",
@@ -46,7 +43,6 @@
     "eslint-plugin-import": "^2.31.0",
     "nodemon": "^3.1.4",
     "prettier": "^3.3.3",
-    "prisma": "^6.1.0",
     "tsx": "^4.19.2"
   }
 }

src/application/base/baseController.ts

@@ -1,4 +1,6 @@
-import { Request, Response } from 'express'
+import fs from 'fs'
+
+import { Response } from 'express'
 
 import Logger, { LoggerType } from '#application/logger'
 
@@ -19,4 +21,18 @@ export abstract class BaseController {
       message
     })
   }
+
+  protected sendFile(res: Response, filePath: string) {
+    if (!fs.existsSync(filePath)) {
+      this.logger.error(`File not found: ${filePath}`)
+      return this.sendError(res, 'Asset not found', 404)
+    }
+
+    res.sendFile(filePath, (error) => {
+      if (error) {
+        this.logger.error('Error sending file:' + error)
+        this.sendError(res, 'Error downloading the asset', 500)
+      }
+    })
+  }
 }

src/application/base/baseEntity.ts

@@ -5,23 +5,32 @@ import Logger, { LoggerType } from '#application/logger'
 
 export abstract class BaseEntity {
   protected readonly logger = Logger.type(LoggerType.ENTITY)
+  protected entityManager?: EntityManager
 
   private getEntityManager(): EntityManager {
-    return Database.getEntityManager()
+    if (!this.entityManager) {
+      this.entityManager = Database.getORM().em.fork()
+    }
+    return this.entityManager
+  }
+
+  public setEntityManager(entityManager: EntityManager) {
+    this.entityManager = entityManager
+    return this
   }
 
   async save(): Promise<this> {
     return this.execute('persist', 'save entity')
   }
 
-  async update(): Promise<this> {
-    return this.execute('merge', 'update entity')
-  }
-
   async delete(): Promise<this> {
     return this.execute('remove', 'remove entity')
   }
 
+  async update(): Promise<this> {
+    return this.execute('merge', 'update entity')
+  }
+
   private async execute(method: 'persist' | 'merge' | 'remove', actionDescription: string): Promise<this> {
     try {
       const em = this.getEntityManager()
@@ -37,7 +46,10 @@ export abstract class BaseEntity {
         throw error
       }
     } catch (error) {
-      this.logger.error(`Failed to ${actionDescription}: ${error instanceof Error ? error.message : String(error)}`)
+      const errorMessage = error instanceof Error ? error.message : error && typeof error === 'object' && 'toString' in error ? error.toString() : String(error)
+
+      console.log(errorMessage)
+      this.logger.error(`Failed to ${actionDescription}: ${errorMessage}`)
       throw error
     }
   }

src/application/base/baseEvent.ts

@@ -2,6 +2,8 @@ import { Server } from 'socket.io'
 
 import Logger, { LoggerType } from '#application/logger'
 import { TSocket } from '#application/types'
+import { Character } from '#entities/character'
+import CharacterRepository from '#repositories/characterRepository'
 
 export abstract class BaseEvent {
   protected readonly logger = Logger.type(LoggerType.GAME)
@@ -11,6 +13,16 @@ export abstract class BaseEvent {
     readonly socket: TSocket
   ) {}
 
+  protected async getCharacter(): Promise<Character | null> {
+    const characterRepository = new CharacterRepository()
+    return characterRepository.getById(this.socket.characterId!)
+  }
+
+  protected async isCharacterGM(): Promise<boolean> {
+    const character = await this.getCharacter()
+    return character?.getRole() === 'gm'
+  }
+
   protected emitError(message: string): void {
     this.socket.emit('notification', { title: 'Server message', message })
     this.logger.error('character:connect error', `Player ${this.socket.userId}: ${message}`)

src/application/base/baseRepository.ts

@@ -6,8 +6,12 @@ import Logger, { LoggerType } from '#application/logger'
 
 export abstract class BaseRepository {
   protected readonly logger = Logger.type(LoggerType.REPOSITORY)
+  private entityManager?: EntityManager
 
-  protected get em(): EntityManager {
-    return Database.getEntityManager()
+  getEntityManager(): EntityManager {
+    if (!this.entityManager) {
+      this.entityManager = Database.getORM().em.fork()
+    }
+    return this.entityManager
   }
 }

src/application/console/logReader.ts

@@ -61,8 +61,8 @@ export class LogReader {
           })
 
           stream.on('data', (data) => {
-            process.stdout.write('\r' + `[${filename}]\n${data}`)
-            process.stdout.write('\n> ')
+            console.log(`[${filename}]`)
+            console.log(data.toString()) //
           })
 
           currentPosition = newPosition

src/application/database.ts

@@ -1,4 +1,3 @@
-import { EntityManager } from '@mikro-orm/core'
 import { MikroORM } from '@mikro-orm/mysql'
 
 import Logger, { LoggerType } from './logger'
@@ -6,13 +5,11 @@ import config from '../../mikro-orm.config'
 
 class Database {
   private static orm: MikroORM
-  private static em: EntityManager
   private static logger = Logger.type(LoggerType.APP)
 
   public static async initialize(): Promise<void> {
     try {
-      Database.orm = await MikroORM.init(config)
-      Database.em = Database.orm.em.fork()
+      this.orm = await MikroORM.init(config)
       this.logger.info('Database connection initialized')
     } catch (error) {
       this.logger.error(`MikroORM connection failed: ${error}`)
@@ -21,17 +18,7 @@ class Database {
   }
 
   public static getORM(): MikroORM {
-    if (!Database.orm) {
-      throw new Error('Database not initialized. Call Database.initialize() first.')
-    }
-    return Database.orm
-  }
-
-  public static getEntityManager(): EntityManager {
-    if (!Database.em) {
-      throw new Error('Database not initialized. Call Database.initialize() first.')
-    }
-    return Database.em
+    return this.orm
   }
 }
 

src/application/enums.ts

@@ -55,7 +55,7 @@ export enum CharacterEquipmentSlotType {
   RING = 'RING'
 }
 
-export enum ZoneEventTileType {
+export enum MapEventTileType {
   BLOCK = 'BLOCK',
   TELEPORT = 'TELEPORT',
   NPC = 'NPC',

src/application/types.ts

@@ -1,8 +1,8 @@
 import { Server, Socket } from 'socket.io'
 
 import { Character } from '#entities/character'
-import { ZoneEventTile } from '#entities/zoneEventTile'
-import { ZoneEventTileTeleport } from '#entities/zoneEventTileTeleport'
+import { MapEventTile } from '#entities/mapEventTile'
+import { MapEventTileTeleport } from '#entities/mapEventTileTeleport'
 
 export type UUID = `${string}-${string}-${string}-${string}-${string}`
 
@@ -26,8 +26,8 @@ export type ExtendedCharacter = Character & {
   resetMovement?: boolean
 }
 
-export type ZoneEventTileWithTeleport = ZoneEventTile & {
-  teleport: ZoneEventTileTeleport
+export type MapEventTileWithTeleport = MapEventTile & {
+  teleport: MapEventTileTeleport
 }
 
 export type AssetData = {
@@ -37,7 +37,6 @@ export type AssetData = {
   updatedAt: Date
   originX?: number
   originY?: number
-  isAnimated?: boolean
   frameRate?: number
   frameWidth?: number
   frameHeight?: number
@@ -46,8 +45,11 @@ export type AssetData = {
 
 export type WorldSettings = {
   date: Date
-  isRainEnabled: boolean
-  isFogEnabled: boolean
+  weatherState: WeatherState
+}
+
+export type WeatherState = {
+  rainPercentage: number
   fogDensity: number
 }
 

src/commands/init.ts

@@ -9,31 +9,35 @@ import { UUID } from '#application/types'
 import { Character } from '#entities/character'
 import { CharacterHair } from '#entities/characterHair'
 import { CharacterType } from '#entities/characterType'
+import { Map } from '#entities/map'
+import { MapEffect } from '#entities/mapEffect'
 import { MapObject } from '#entities/mapObject'
 import { Sprite } from '#entities/sprite'
 import { SpriteAction } from '#entities/spriteAction'
 import { Tile } from '#entities/tile'
 import { User } from '#entities/user'
-import { Zone } from '#entities/zone'
-import { ZoneEffect } from '#entities/zoneEffect'
 import CharacterHairRepository from '#repositories/characterHairRepository'
 import CharacterTypeRepository from '#repositories/characterTypeRepository'
-import ZoneRepository from '#repositories/zoneRepository'
+import MapRepository from '#repositories/mapRepository'
 
 // @TODO : Replace this with seeding
 // https://mikro-orm.io/docs/seeding
 
 export default class InitCommand extends BaseCommand {
+  private readonly mapRepository = new MapRepository()
+  private readonly characterTypeRepository = new CharacterTypeRepository()
+  private readonly characterHairRepository = new CharacterHairRepository()
+
   public async execute(): Promise<void> {
     // Assets
     await this.importTiles()
-    await this.importObjects()
+    await this.importMapObjects()
     await this.createCharacterType()
     await this.createCharacterHair()
     // await this.createCharacterEquipment()
 
-    // Zone
-    await this.createZone()
+    // Map
+    await this.createMap()
 
     // User
     await this.createUser()
@@ -51,19 +55,19 @@ export default class InitCommand extends BaseCommand {
     }
   }
 
-  private async importObjects(): Promise<void> {
-    for (const object of fs.readdirSync(Storage.getPublicPath('objects'))) {
+  private async importMapObjects(): Promise<void> {
+    for (const mapObject of fs.readdirSync(Storage.getPublicPath('map_objects'))) {
       const newMapObject = new MapObject()
       newMapObject
-        .setId(object.split('.')[0] as UUID)
-        .setName('New object')
+        .setId(mapObject.split('.')[0] as UUID)
+        .setName('New map object')
         .setFrameWidth(
-          (await sharp(Storage.getPublicPath('objects', object))
+          (await sharp(Storage.getPublicPath('map_objects', mapObject))
             .metadata()
             .then((metadata) => metadata.height)) ?? 0
         )
         .setFrameHeight(
-          (await sharp(Storage.getPublicPath('objects', object))
+          (await sharp(Storage.getPublicPath('map_objects', mapObject))
             .metadata()
             .then((metadata) => metadata.width)) ?? 0
         )
@@ -81,12 +85,16 @@ export default class InitCommand extends BaseCommand {
     await idleRightDownAction
       .setAction('idle_right_down')
       .setSprites([
-        'data:image/png;base64,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'
+        {
+          url: 'data:image/png;base64,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',
+          offset: {
+            x: 0,
+            y: 0
+          }
+        }
       ])
       .setOriginX(0)
       .setOriginY(0)
-      .setIsAnimated(false)
-      .setIsLooping(false)
       .setFrameWidth(64)
       .setFrameHeight(94)
       .setFrameRate(0)
@@ -97,12 +105,16 @@ export default class InitCommand extends BaseCommand {
     await idleLeftUpAction
       .setAction('idle_left_up')
       .setSprites([
-        'data:image/png;base64,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'
+        {
+          url: 'data:image/png;base64,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',
+          offset: {
+            x: 0,
+            y: 0
+          }
+        }
       ])
       .setOriginX(0)
       .setOriginY(0)
-      .setIsAnimated(false)
-      .setIsLooping(false)
       .setFrameWidth(64)
       .setFrameHeight(94)
       .setFrameRate(0)
@@ -113,15 +125,37 @@ export default class InitCommand extends BaseCommand {
     await walkRightDownAction
       .setAction('walk_right_down')
       .setSprites([
-        'data:image/png;base64,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',
-        'data:image/png;base64,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',
-        'data:image/png;base64,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',
-        'data:image/png;base64,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'
+        {
+          url: 'data:image/png;base64,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',
+          offset: {
+            x: 7,
+            y: 8
+          }
+        },
+        {
+          url: 'data:image/png;base64,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',
+          offset: {
+            x: 7,
+            y: 2
+          }
+        },
+        {
+          url: 'data:image/png;base64,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',
+          offset: {
+            x: 2,
+            y: 2
+          }
+        },
+        {
+          url: 'data:image/png;base64,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',
+          offset: {
+            x: 0,
+            y: 0
+          }
+        }
       ])
       .setOriginX(0)
       .setOriginY(0)
-      .setIsAnimated(true)
-      .setIsLooping(false)
       .setFrameWidth(64)
       .setFrameHeight(94)
       .setFrameRate(7)
@@ -132,15 +166,37 @@ export default class InitCommand extends BaseCommand {
     await walkLeftUpAction
       .setAction('walk_left_up')
       .setSprites([
-        'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB0AAABdCAYAAABZy21jAAAGdElEQVR4nK2aMWgbSRSGf8lBMXKMQRJSAoY1RIsaC6RKGIMbEZUurwqHq+O40q6OAxeCK2248jrBBQ6uFKks3BhCcGWB0uikgBbMJbvnLGdkC0cQ64r1G8/uzuzOrvQqaWY037yZ92bevFGi/vPvUJVMuzkTldu7hwnlTgA8iQLbb9SglUuuuovTM7Qe6lXhodBMuznbb9Sg1xt49vK5q+7m42dU6zvI5AuwLROtdnOmAg6EZtrN2W8H32NZ30Q6t4KlrO6qfwbgBoBWBjQ4M6ACTgYB9xs1pPKaEMg6WFtFKq85v8kXgljhUADQ6w0k11aVOgIArVzCXmVDanCBUNIySL59GWBydet0EmFgQMCaauUS62xydYs0Bq56AsYRJZcJg9xfjwEARq+v1FfgmlJnqmJbJrZ+/Ck+VHXUNLCL0zMlYCDU22lQ3fmffzDg3eBDKFS6prZlKoEBt3+qzFCgplPLCO1gahlsP74bfHANViZCTe3dw0Sr3Zxl8gVoZXddKq/5BmP0+tCwIOu1LTO0I6o3en0lLQOh9u5hotUd+cD87kPltmUqAwOhPJgHiIC8tLqj0HM11GXs3cPE8cl5WDO0uiMloBI0iqhGDpGhUbdGkSRkgRl/JtIx542PSC5OzwA4UwyEayyEZtrN2V5lg+00Wrnk80+KFqiMd5mwtfVtDgSs1ndcgOTaKlJwwPQ9nVvBzUMbipOMXh97leBYyQWliIGmkbQhwAQALKdtOrfC6u6vx6xt9Yca7PeOtcvAPkMi4LK+6SpfyuoMxJfx8uzlcyxldWS2aqjWd6TxEoPStBJQZKU8RBQd3nz8zOqW9U1pdCh0mfvrMQanJy7D+fZl4GvHl3kPgXRuBXq9IdTWBc3kC1jWNzG1DByfnPu2Ph4iGgRfvpTVkVxbFWor1FT1iPL+ZmoZvgBO5NtJbwOvscQR0lbWl09T2fVBJc41en3cDT6Etk0Cj5ZLbiI7G8M643837nfZZ68xuTaH1VIF/7594+vs/nosvDp4B/H2738AnKEKv5/z8uinD1Zm9Pps4/aCRULlpKUDdsonV7dI5TWfBTOoVi5J3UAksqm+mkzZqcP37YLy6zm5ug2MdbzairSnEIc2C9GyLDRyuJpM2eeL0zMW7We2ai5jcqz3Yc5FVwJZwB0lgljK6q51ZZrOsymo3AT4dU1SAW0KqhFdkPChKwnvQkprqqKJSIxeX7gMDCpyF96Sp5bB4PwgppahdEDwyxeqqaxDfhAysS1T2IZBvc7+pVDC0aenoZco1YsTf5AEJjpevXqFo04H+PQffoUfTLCjT0+dgkIJKhbogoo0ev36NUzTxC+djuDnT9ngAKDDtaE7brW+w+xlr7KBVrs5C9S0UCigWCyiWCxie3sbw+EQxWKR1Q+HQ/bZNIOnmF++QEPiAbLvVFYoiCM/o9d3kl+5FbYrMU1VsiIAsL6+7vp+eXmJYrHo0tor6dyKXFORFa6vrzOQFygrCxMGjRMBqohtmT53TBIwSs5gXnli7x4mjrmgid/s3717h+3tbdb48vJSuKYkWbMPWwLic0xPvCC+g07n0SpN05Ra6HA4DHQZr5EG+unBi684euOODmkj4AcDOBtDNqAvCvjs3cNEaL73r/3vMLUM5ymkO4JwY3oYYEuirNdmQqF0867Wd9DqjnDw4iuc9N1jJBBmiLZluoKD0IwZuRL/IqHXG1jWN7GsbyKV16QJEOrDG42EakpnIkEpt0+7THJtlaUEZGBvmVKajq6BpDG90/DRgOqbDKD4cGBbJtB7GGXE5xCRKOUGW90Rjk/OsVfZ8L1GUeBF9WEPQUpQAnvLRIHcQp694nQa+9lLVej0ILeSuc5CoEFXSpXZiAwl7fgzMuqxqPzWRnJ/PXZyhIif+40MnVoGUtBc30lUg4G5DImAre4IlFdUkYXexGkAc79WhEmcgG5hmkbZ8Bc6vXM9xEcRr7VW6zvYb9QCwZGg9Gox7/Gm/N8VSnBRxEDXfnIX/swN89VIm4Ms7fOYSRmxskjvMjIRWSdpFDUFpLymqsfWQqGLlLmgUTaEhUHjylzQuOs8t6a07amEnnND+bvNXmVDOeYFYkQOS1kdaQwwAZCC5vz5ohctToqk6Tx/fIoNvb8eu/7mFVeUp9fo9aGVwZ6jgcdcr/fSuxAoZWD2AYDLhhKM2iiOX/6XA5GIrDNOvv9/P1uP8Q0WHzUAAAAASUVORK5CYII=',
-        'data:image/png;base64,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',
-        'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABcAAABZCAYAAADVeL+8AAAFcElEQVR4nLVZzUtbWRT/JUqURAkkIWlBeIUmuDHQrqQI3Ygu/Qtk6LLMUldDqYtAF10ozKrMLjDC7LNsEMSdm7GQboIRfBDQ99BHxQ/aQM0sknM9971z33upmQOB5H78zu/ee+75uEks//EXoiTXqPWldm9tKxE2bzIO6MbqIqzqvNZ3tHeA+rDfpMQInmvU+huri6gsr2Lm+ROt7+bkHC+XXyNXLMFzHdQbtb6kQATPNWr9Pzd/w3RlAelCBhP5itY/A+AGgFUFLAxWJClImhinipYIrCZmZ5EqWoM5xZI8RmqsLK8imZ0VJ0hiVefx5sWzwMFr4MQ6TH5eHuPu4nYwOYJAYM+t6ryadHdxizSOtX4CjiOhphgFdn91DQCwW22xX9xzmhRXPNfBq7e/R4ObWJgIHO0diMAiuH9yWN/hP38r4O/HXwPjAnvuuU4sBYBu39KKReY91w4FpTHkb74ff9VIkWjMvbWtRL1R6+eKJVhVfWCqaAWU2q02LANrI3PPdSIPlvrtVltkLYJ7a1uJ+pfTgAJ+G6ndcx0jsJn5UAEHkoC51L+cBvy60RS9ta3EzudDIysOKgGHgo8ipkgUG3xUlwAACX+A5j6Z3K8/fpIc7R0AkPc7AJ5r1PpvXjxTN8+qzgfsm6IPtZEpkgFwJZMSMDFNFa1BOMNAAf1OFzK4Gc6jOCoFa+2GSsDpQgZ3AOAOxqQLGQADu7+/ulYrkYJ1krPmwCQT+YoC5G1cZp4/Qe7VoiJIoqyFGqVrz8Ek4Il8BRP5CqYrC1qwVuDcIvgB/rzUY6i/7ebkXP1OFzLaqjU7t1tt7Hw+DLDnYH5lPdfGzcm5WlUyO6t2QYFzjaMIEZFWOJbr7xfa4kjwuHnK3cVtgH0s5mEKRvbnJCZnZVLmb49kblLA200BfeQDlVhHBuieaxv3z88+rm8fmymSQu6HjOCmfZRYe66DnmurSoQu5KOYR2VmY9kWikIjgcfJGcPEmM5xBaSEK+u5dmTKZ2RumsiVRUkA/LI0j+2zqchkNCwBJRELrpWVFWw3m8DZN3xAUAGBbp9NAQDyQ2UUR2llxmpufX0djuPgXbMp9E4pEgDw7+4DAe52RfBSqYRyuYxyuYylpSUAQKfTEUk4jnlrRPByuSwO9rd3Oh2USnLdD7AD9R/e3Nyc+pgUmkgQlmiKBOj/7VcYJQo8yqyiCJBwf58EHsoUk48g6Xa7xj7Pdcxhjqe++/v7AVCylm63qz4mCyIJWMvm0x/Y3t0F8HBgBCKB+U2RF7xifv6hCLwbKiChC0OmR6DNZhN5BmxkzvPz3apeNYgXdbjSOiNvt9qqjNHA+dvW/dX1oERvAcApNp/+UAQAPSvmNSu3Os3OqZKg78CDiXJL4kUCT2BplWQcGjgFWH8lAehlOwEns7NIZmfx6eN7VezyV7rINy7OxP+qMZ1dUKv89PE9i06nD9tClsJLElPiQ2W73Wor6+BjxbKFREriRSXD7SFgKiUBBCsLXoXRNTaFOdp/u9VWMZUXw6RYYx6XtZ89MfcTCmwLdz6jekoSMgINnIDjZrH+1+fQS3R/da0dUFwxVYKhT3+mpw5ezoeVmGIF/RgxXn8uUXmgsuWQN/SxpNB+JxcA/5Xy3D8nVyxpjivgcklGtXGJ3CSdPAGTZzNZCpeeayMF/c1LA6cv6UJmpP8jPNcZRqm23uYH99+0qC0hv05+W+pX4L9i41FbBvxP7y2h4Ka/w8YCPi4RwcflZ4zMpT/yHgWeLmQwXVlAqmjh5fJrbKwuPkqBAh/lAsUVdUPvr64HD8LjBrdbbVhVaH4iToUcCe6tbSV2GrX+BgDyE6bH9lFFvfz7D+4xoCT/AaNCPNJBtKgMAAAAAElFTkSuQmCC',
-        'data:image/png;base64,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'
+        {
+          url: 'data:image/png;base64,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',
+          offset: {
+            x: 3,
+            y: 2
+          }
+        },
+        {
+          url: 'data:image/png;base64,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',
+          offset: {
+            x: 0,
+            y: 2
+          }
+        },
+        {
+          url: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABcAAABZCAYAAADVeL+8AAAFcElEQVR4nLVZzUtbWRT/JUqURAkkIWlBeIUmuDHQrqQI3Ygu/Qtk6LLMUldDqYtAF10ozKrMLjDC7LNsEMSdm7GQboIRfBDQ99BHxQ/aQM0sknM9971z33upmQOB5H78zu/ee+75uEks//EXoiTXqPWldm9tKxE2bzIO6MbqIqzqvNZ3tHeA+rDfpMQInmvU+huri6gsr2Lm+ROt7+bkHC+XXyNXLMFzHdQbtb6kQATPNWr9Pzd/w3RlAelCBhP5itY/A+AGgFUFLAxWJClImhinipYIrCZmZ5EqWoM5xZI8RmqsLK8imZ0VJ0hiVefx5sWzwMFr4MQ6TH5eHuPu4nYwOYJAYM+t6ryadHdxizSOtX4CjiOhphgFdn91DQCwW22xX9xzmhRXPNfBq7e/R4ObWJgIHO0diMAiuH9yWN/hP38r4O/HXwPjAnvuuU4sBYBu39KKReY91w4FpTHkb74ff9VIkWjMvbWtRL1R6+eKJVhVfWCqaAWU2q02LANrI3PPdSIPlvrtVltkLYJ7a1uJ+pfTgAJ+G6ndcx0jsJn5UAEHkoC51L+cBvy60RS9ta3EzudDIysOKgGHgo8ipkgUG3xUlwAACX+A5j6Z3K8/fpIc7R0AkPc7AJ5r1PpvXjxTN8+qzgfsm6IPtZEpkgFwJZMSMDFNFa1BOMNAAf1OFzK4Gc6jOCoFa+2GSsDpQgZ3AOAOxqQLGQADu7+/ulYrkYJ1krPmwCQT+YoC5G1cZp4/Qe7VoiJIoqyFGqVrz8Ek4Il8BRP5CqYrC1qwVuDcIvgB/rzUY6i/7ebkXP1OFzLaqjU7t1tt7Hw+DLDnYH5lPdfGzcm5WlUyO6t2QYFzjaMIEZFWOJbr7xfa4kjwuHnK3cVtgH0s5mEKRvbnJCZnZVLmb49kblLA200BfeQDlVhHBuieaxv3z88+rm8fmymSQu6HjOCmfZRYe66DnmurSoQu5KOYR2VmY9kWikIjgcfJGcPEmM5xBaSEK+u5dmTKZ2RumsiVRUkA/LI0j+2zqchkNCwBJRELrpWVFWw3m8DZN3xAUAGBbp9NAQDyQ2UUR2llxmpufX0djuPgXbMp9E4pEgDw7+4DAe52RfBSqYRyuYxyuYylpSUAQKfTEUk4jnlrRPByuSwO9rd3Oh2USnLdD7AD9R/e3Nyc+pgUmkgQlmiKBOj/7VcYJQo8yqyiCJBwf58EHsoUk48g6Xa7xj7Pdcxhjqe++/v7AVCylm63qz4mCyIJWMvm0x/Y3t0F8HBgBCKB+U2RF7xifv6hCLwbKiChC0OmR6DNZhN5BmxkzvPz3apeNYgXdbjSOiNvt9qqjNHA+dvW/dX1oERvAcApNp/+UAQAPSvmNSu3Os3OqZKg78CDiXJL4kUCT2BplWQcGjgFWH8lAehlOwEns7NIZmfx6eN7VezyV7rINy7OxP+qMZ1dUKv89PE9i06nD9tClsJLElPiQ2W73Wor6+BjxbKFREriRSXD7SFgKiUBBCsLXoXRNTaFOdp/u9VWMZUXw6RYYx6XtZ89MfcTCmwLdz6jekoSMgINnIDjZrH+1+fQS3R/da0dUFwxVYKhT3+mpw5ezoeVmGIF/RgxXn8uUXmgsuWQN/SxpNB+JxcA/5Xy3D8nVyxpjivgcklGtXGJ3CSdPAGTZzNZCpeeayMF/c1LA6cv6UJmpP8jPNcZRqm23uYH99+0qC0hv05+W+pX4L9i41FbBvxP7y2h4Ka/w8YCPi4RwcflZ4zMpT/yHgWeLmQwXVlAqmjh5fJrbKwuPkqBAh/lAsUVdUPvr64HD8LjBrdbbVhVaH4iToUcCe6tbSV2GrX+BgDyE6bH9lFFvfz7D+4xoCT/AaNCPNJBtKgMAAAAAElFTkSuQmCC',
+          offset: {
+            x: 5,
+            y: 6
+          }
+        },
+        {
+          url: 'data:image/png;base64,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',
+          offset: {
+            x: 2,
+            y: 6
+          }
+        }
       ])
       .setOriginX(0)
       .setOriginY(0)
-      .setIsAnimated(true)
-      .setIsLooping(false)
       .setFrameWidth(64)
       .setFrameHeight(94)
       .setFrameRate(7)
@@ -148,7 +204,14 @@ export default class InitCommand extends BaseCommand {
       .save()
 
     const characterType = new CharacterType()
-    await characterType.setId('75b70c78-17f0-44c0-a4fa-15043cb95be0').setName('New character type').setGender(CharacterGender.MALE).setRace(CharacterRace.HUMAN).setIsSelectable(true).setSprite(characterSprite).save()
+    await characterType
+      .setId('75b70c78-17f0-44c0-a4fa-15043cb95be0')
+      .setName('New character type')
+      .setGender(CharacterGender.MALE)
+      .setRace(CharacterRace.HUMAN)
+      .setIsSelectable(true)
+      .setSprite(characterSprite)
+      .save()
   }
 
   private async createCharacterHair(): Promise<void> {
@@ -160,12 +223,16 @@ export default class InitCommand extends BaseCommand {
     await frontAction
       .setAction('front')
       .setSprites([
-        'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAASCAYAAABB7B6eAAAACXBIWXMAAAsTAAALEwEAmpwYAAAA5ElEQVR4nK2VMQ7DIAxFc4AulViysTBUldgqReoGp+pReloqIhx9LOy4IoOVYBw//DFkyZ/vUs3db2Vkuc1rMTwOrRvUwPjwZXs9S0rv/d1BkuDXYx4N41SABAl+7ZJXPzcEqQALJApmroAnC22smbQPw5WPkjoAE7w++X6JAJSF9JRWS3EWiEnzwCrBWPJLkA4gdU1sPvoQIdjGGE+xp8mTULr1IO5Orjlt9NkGaif4kIgqwC6hSarMkkgFoLZ8hVvTeQoglXwJQNMV5bsUUJNKnZJnAHhVWO76vwCjH8hs8gr4ARPESmbfQUg4AAAAAElFTkSuQmCC'
+        {
+          url: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAASCAYAAABB7B6eAAAACXBIWXMAAAsTAAALEwEAmpwYAAAA5ElEQVR4nK2VMQ7DIAxFc4AulViysTBUldgqReoGp+pReloqIhx9LOy4IoOVYBw//DFkyZ/vUs3db2Vkuc1rMTwOrRvUwPjwZXs9S0rv/d1BkuDXYx4N41SABAl+7ZJXPzcEqQALJApmroAnC22smbQPw5WPkjoAE7w++X6JAJSF9JRWS3EWiEnzwCrBWPJLkA4gdU1sPvoQIdjGGE+xp8mTULr1IO5Orjlt9NkGaif4kIgqwC6hSarMkkgFoLZ8hVvTeQoglXwJQNMV5bsUUJNKnZJnAHhVWO76vwCjH8hs8gr4ARPESmbfQUg4AAAAAElFTkSuQmCC',
+          offset: {
+            x: 0,
+            y: 0
+          }
+        }
       ])
       .setOriginX(0.5)
       .setOriginY(5.34)
-      .setIsAnimated(false)
-      .setIsLooping(false)
       .setFrameWidth(64)
       .setFrameHeight(18)
       .setFrameRate(0)
@@ -176,12 +243,16 @@ export default class InitCommand extends BaseCommand {
     await backAction
       .setAction('back')
       .setSprites([
-        'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAWCAYAAADafVyIAAAACXBIWXMAAAsTAAALEwEAmpwYAAABHUlEQVR4nJ1VuwrDMAzMB3QpZOmWxUMpdCsYsrlflU/p16YIrCJfTrLTQZCHfSflLufpvX0mVvP1sns1sk7fu8DP+7Ln16MpeZaWWwMkz0pZf++xgQO4AssmLEsi1QN3J5DFXqUT4JRASRQoBYWkpybQ7lIFssCsASUb0gDBM3x7Bm6NQF3EwKWYuBa4p8nBPbgpB+CeqxoC9pPoBgau99ixR+I6yAPPRhtLwCZ3CbzPkquQVh9Zp3uty8IJLHgpa9OV3ishyyYbOeFPhnZFh0UEeu0SoIC5dm8JoojoRgXqUCq4JcB4GIoKpkMiE2EGDUUFngnoILQiOx+6Bw46IZFYQMJIB1ccL7pn+BH/EtkjsZONgA8TMIeMgAvBF10K1sbmijzuAAAAAElFTkSuQmCC'
+        {
+          url: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAWCAYAAADafVyIAAAACXBIWXMAAAsTAAALEwEAmpwYAAABHUlEQVR4nJ1VuwrDMAzMB3QpZOmWxUMpdCsYsrlflU/p16YIrCJfTrLTQZCHfSflLufpvX0mVvP1sns1sk7fu8DP+7Ln16MpeZaWWwMkz0pZf++xgQO4AssmLEsi1QN3J5DFXqUT4JRASRQoBYWkpybQ7lIFssCsASUb0gDBM3x7Bm6NQF3EwKWYuBa4p8nBPbgpB+CeqxoC9pPoBgau99ixR+I6yAPPRhtLwCZ3CbzPkquQVh9Zp3uty8IJLHgpa9OV3ishyyYbOeFPhnZFh0UEeu0SoIC5dm8JoojoRgXqUCq4JcB4GIoKpkMiE2EGDUUFngnoILQiOx+6Bw46IZFYQMJIB1ccL7pn+BH/EtkjsZONgA8TMIeMgAvBF10K1sbmijzuAAAAAElFTkSuQmCC',
+          offset: {
+            x: 0,
+            y: 0
+          }
+        }
       ])
       .setOriginX(0.5)
       .setOriginY(4.34)
-      .setIsAnimated(false)
-      .setIsLooping(false)
       .setFrameWidth(64)
       .setFrameHeight(22)
       .setFrameRate(0)
@@ -192,49 +263,17 @@ export default class InitCommand extends BaseCommand {
     await characterHair.setId('a2471230-d238-4ffb-9eca-9eab869f1b67').setName('Hair 1').setGender(CharacterGender.MALE).setIsSelectable(true).setSprite(hairSprite).save()
   }
 
-  private async createCharacterEquipment(): Promise<void> {
-    const equipmentSprite = new Sprite()
-    equipmentSprite.id = '5b3932dd-0791-4bb7-bb1e-da9833c3cc50'
-    equipmentSprite.name = 'Male shirt'
-
-    // Create actions similar to createCharacterSprite()
-    // with appropriate sprite data and parameters
-    const actions = [
-      {
-        action: 'idle_right_down',
-        sprites: ['data:image/png;base64,...'],
-        originX: 0,
-        originY: 0,
-        isAnimated: false,
-        isLooping: false,
-        frameWidth: 64,
-        frameHeight: 94,
-        frameRate: 0
-      }
-      // Add other actions...
-    ]
-
-    for (const actionData of actions) {
-      const action = new SpriteAction()
-      Object.assign(action, actionData)
-      action.sprite = equipmentSprite
-      await action.save()
-    }
-
-    await equipmentSprite.save()
-  }
-
-  private async createZone(): Promise<void> {
-    const zone = new Zone()
-    await zone
-      .setName('New zone')
+  private async createMap(): Promise<void> {
+    const map = new Map()
+    await map
+      .setName('New map')
       .setWidth(100)
       .setHeight(100)
       .setTiles(Array.from({ length: 100 }, () => Array.from({ length: 100 }, () => 'a2fd8d6f-5042-437a-9c1e-c66b91ecc35b')))
       .save()
 
-    const effect = new ZoneEffect()
-    await effect.setEffect('light').setStrength(100).setZone(zone).save()
+    const effect = new MapEffect()
+    await effect.setEffect('light').setStrength(100).setMap(map).save()
   }
 
   private async createUser(): Promise<void> {
@@ -247,9 +286,9 @@ export default class InitCommand extends BaseCommand {
       .setUser(user)
       .setName('root')
       .setRole('gm')
-      .setZone((await ZoneRepository.getFirst())!)
-      .setCharacterType((await CharacterTypeRepository.getFirst()) ?? undefined)
-      .setCharacterHair((await CharacterHairRepository.getFirst()) ?? undefined)
+      .setMap((await this.mapRepository.getFirst())!)
+      .setCharacterType(await this.characterTypeRepository.getFirst())
+      .setCharacterHair(await this.characterHairRepository.getFirst())
       .save()
   }
 }

src/commands/listMaps.ts

@@ -0,0 +1,10 @@
+import { BaseCommand } from '#application/base/baseCommand'
+import MapManager from '#managers/mapManager'
+
+type CommandInput = string[]
+
+export default class ListMapsCommand extends BaseCommand {
+  public execute(input: CommandInput): void {
+    console.log(MapManager.getLoadedMaps())
+  }
+}

src/commands/listZones.ts

@@ -1,12 +0,0 @@
-import { Server } from 'socket.io'
-
-import { BaseCommand } from '#application/base/baseCommand'
-import ZoneManager from '#managers/zoneManager'
-
-type CommandInput = string[]
-
-export default class ListZonesCommand extends BaseCommand {
-  public execute(input: CommandInput): void {
-    console.log(ZoneManager.getLoadedZones())
-  }
-}

src/controllers/avatar.ts

@@ -16,13 +16,17 @@ interface AvatarOptions {
 }
 
 export class AvatarController extends BaseController {
+  private readonly characterTypeRepository = new CharacterTypeRepository()
+  private readonly characterHairRepository = new CharacterHairRepository()
+  private readonly characterRepository = new CharacterRepository()
+
   /**
    * Get avatar by character
    * @param req
    * @param res
    */
   public async getByName(req: Request, res: Response) {
-    const character = await CharacterRepository.getByName(req.params.characterName)
+    const character = await this.characterRepository.getByName(req.params.characterName)
     if (!character?.characterType) {
       return this.sendError(res, 'Character or character type not found', 404)
     }
@@ -53,7 +57,7 @@ export class AvatarController extends BaseController {
    */
   private async generateAvatar(res: Response, options: AvatarOptions) {
     try {
-      const characterType = await CharacterTypeRepository.getById(options.characterTypeId)
+      const characterType = await this.characterTypeRepository.getById(options.characterTypeId)
       if (!characterType?.sprite?.id) {
         return this.sendError(res, 'Character type not found', 404)
       }
@@ -70,7 +74,7 @@ export class AvatarController extends BaseController {
       })
 
       if (options.characterHairId) {
-        const characterHair = await CharacterHairRepository.getById(options.characterHairId)
+        const characterHair = await this.characterHairRepository.getById(options.characterHairId)
         if (characterHair?.sprite?.id) {
           const hairSpritePath = Storage.getPublicPath('sprites', characterHair.sprite.id, 'front.png')
           if (fs.existsSync(hairSpritePath)) {

src/controllers/cache.ts

@@ -0,0 +1,119 @@
+import { Request, Response } from 'express'
+
+import { BaseController } from '#application/base/baseController'
+import CharacterHairRepository from '#repositories/characterHairRepository'
+import CharacterTypeRepository from '#repositories/characterTypeRepository'
+import MapObjectRepository from '#repositories/mapObjectRepository'
+import MapRepository from '#repositories/mapRepository'
+import SpriteRepository from '#repositories/spriteRepository'
+import TileRepository from '#repositories/tileRepository'
+
+export class CacheController extends BaseController {
+  /**
+   * Serve a list of tiles and send as JSON
+   * @param req
+   * @param res
+   */
+  public async tiles(req: Request, res: Response) {
+    const items: any[] = []
+
+    const tileRepository = new TileRepository()
+    const tiles = await tileRepository.getAll()
+
+    for (const tile of tiles) {
+      items.push(await tile.cache())
+    }
+
+    return this.sendSuccess(res, items)
+  }
+
+  /**
+   * Serve a list of maps and send as JSON
+   * @param req
+   * @param res
+   */
+  public async maps(req: Request, res: Response) {
+    const items: any[] = []
+
+    const mapRepository = new MapRepository()
+    const maps = await mapRepository.getAll()
+
+    for (const map of maps) {
+      items.push(await map.cache())
+    }
+
+    return this.sendSuccess(res, items)
+  }
+
+  /**
+   * Serve a list of map objects and send as JSON
+   * @param req
+   * @param res
+   */
+  public async mapObjects(req: Request, res: Response) {
+    const items: any[] = []
+
+    const mapObjectRepository = new MapObjectRepository()
+    const mapObjects = await mapObjectRepository.getAll()
+
+    for (const mapObject of mapObjects) {
+      items.push(await mapObject.cache())
+    }
+
+    return this.sendSuccess(res, items)
+  }
+
+  /**
+   * Serve a list of character hairs and send as JSON
+   * @param req
+   * @param res
+   */
+  public async characterHair(req: Request, res: Response) {
+    const items: any[] = []
+
+    const characterHairRepository = new CharacterHairRepository()
+    const characterHairs = await characterHairRepository.getAll()
+
+    for (const characterHair of characterHairs) {
+      items.push(await characterHair.cache())
+    }
+
+    return this.sendSuccess(res, items)
+  }
+
+  /**
+   * Serve a list of character types and send as JSON
+   * @param req
+   * @param res
+   */
+  public async characterTypes(req: Request, res: Response) {
+    const items: any[] = []
+
+    const characterTypeRepository = new CharacterTypeRepository()
+    const characterTypes = await characterTypeRepository.getAll()
+
+    for (const characterType of characterTypes) {
+      items.push(await characterType.cache())
+    }
+
+    return this.sendSuccess(res, items)
+  }
+
+  /**
+   * Serve a list of sprites and send as JSON
+   * @param req
+   * @param res
+   */
+  public async sprites(req: Request, res: Response) {
+    const items: any[] = []
+
+    const spriteRepository = new SpriteRepository()
+    const sprites = await spriteRepository.getAll()
+
+    for (const sprite of sprites) {
+      items.push(await sprite.cache())
+    }
+
+    return this.sendSuccess(res, items)
+  }
+}

src/controllers/textures.ts

@@ -0,0 +1,19 @@
+import { Request, Response } from 'express'
+
+import { BaseController } from '#application/base/baseController'
+import Storage from '#application/storage'
+
+export class TexturesController extends BaseController {
+  /**
+   * Download texture
+   * @param req
+   * @param res
+   */
+  public async download(req: Request, res: Response) {
+    const { type, spriteId, file } = req.params
+
+    const texture = type === 'sprites' && spriteId ? Storage.getPublicPath(type, spriteId, file) : Storage.getPublicPath(type, file)
+
+    this.sendFile(res, texture)
+  }
+}

src/entities/base/character.ts

@@ -0,0 +1,295 @@
+import { randomUUID } from 'node:crypto'
+
+import { Collection, Entity, ManyToOne, OneToMany, PrimaryKey, Property } from '@mikro-orm/core'
+
+import { BaseEntity } from '#application/base/baseEntity'
+import { UUID } from '#application/types'
+import { CharacterEquipment } from '#entities/characterEquipment'
+import { CharacterHair } from '#entities/characterHair'
+import { CharacterItem } from '#entities/characterItem'
+import { CharacterType } from '#entities/characterType'
+import { Chat } from '#entities/chat'
+import { Map } from '#entities/map'
+import { User } from '#entities/user'
+
+export class BaseCharacter extends BaseEntity {
+  @PrimaryKey()
+  id = randomUUID()
+
+  @ManyToOne({ deleteRule: 'cascade' })
+  user!: User
+
+  @Property({ unique: true })
+  name!: string
+
+  @Property()
+  online = false
+
+  @Property()
+  role = 'player'
+
+  @OneToMany(() => Chat, (chat) => chat.character)
+  chats = new Collection<Chat>(this)
+
+  // Position - @TODO: Update to spawn point when current map is not found
+  @ManyToOne()
+  map!: Map
+
+  @Property()
+  positionX = 0
+
+  @Property()
+  positionY = 0
+
+  @Property()
+  rotation = 0
+
+  // Customization
+  @ManyToOne({ deleteRule: 'set null' })
+  characterType: CharacterType | null = null
+
+  @ManyToOne({ deleteRule: 'set null' })
+  characterHair: CharacterHair | null = null
+
+  // Inventory
+  @OneToMany({ mappedBy: 'character' })
+  items = new Collection<CharacterItem>(this)
+
+  @OneToMany({ mappedBy: 'character' })
+  equipment = new Collection<CharacterEquipment>(this)
+
+  // Stats
+  @Property()
+  alignment = 50
+
+  @Property()
+  hitpoints = 100
+
+  @Property()
+  mana = 100
+
+  @Property()
+  level = 1
+
+  @Property()
+  experience = 0
+
+  @Property()
+  strength = 10
+
+  @Property()
+  dexterity = 10
+
+  @Property()
+  intelligence = 10
+
+  @Property()
+  wisdom = 10
+
+  setId(id: UUID) {
+    this.id = id
+    return this
+  }
+
+  getId() {
+    return this.id
+  }
+
+  setUser(user: User) {
+    this.user = user
+    return this
+  }
+
+  getUser() {
+    return this.user
+  }
+
+  setName(name: string) {
+    this.name = name
+    return this
+  }
+
+  getName() {
+    return this.name
+  }
+
+  setOnline(online: boolean) {
+    this.online = online
+    return this
+  }
+
+  getOnline() {
+    return this.online
+  }
+
+  setRole(role: string) {
+    this.role = role
+    return this
+  }
+
+  getRole() {
+    return this.role
+  }
+
+  setChats(chats: Collection<Chat>) {
+    this.chats = chats
+    return this
+  }
+
+  getChats() {
+    return this.chats
+  }
+
+  setMap(map: Map) {
+    this.map = map
+    return this
+  }
+
+  getMap() {
+    return this.map
+  }
+
+  setPositionX(positionX: number) {
+    this.positionX = positionX
+    return this
+  }
+
+  getPositionX() {
+    return this.positionX
+  }
+
+  setPositionY(positionY: number) {
+    this.positionY = positionY
+    return this
+  }
+
+  getPositionY() {
+    return this.positionY
+  }
+
+  setRotation(rotation: number) {
+    this.rotation = rotation
+    return this
+  }
+
+  getRotation() {
+    return this.rotation
+  }
+
+  setCharacterType(characterType: CharacterType | null) {
+    this.characterType = characterType
+    return this
+  }
+
+  getCharacterType() {
+    return this.characterType
+  }
+
+  setCharacterHair(characterHair: CharacterHair | null) {
+    this.characterHair = characterHair
+    return this
+  }
+
+  getCharacterHair() {
+    return this.characterHair
+  }
+
+  setItems(items: Collection<CharacterItem>) {
+    this.items = items
+    return this
+  }
+
+  getItems() {
+    return this.items
+  }
+
+  setEquipment(equipment: Collection<CharacterEquipment>) {
+    this.equipment = equipment
+    return this
+  }
+
+  getEquipment() {
+    return this.equipment
+  }
+
+  setAlignment(alignment: number) {
+    this.alignment = alignment
+    return this
+  }
+
+  getAlignment() {
+    return this.alignment
+  }
+
+  setHitpoints(hitpoints: number) {
+    this.hitpoints = hitpoints
+    return this
+  }
+
+  getHitpoints() {
+    return this.hitpoints
+  }
+
+  setMana(mana: number) {
+    this.mana = mana
+    return this
+  }
+
+  getMana() {
+    return this.mana
+  }
+
+  setLevel(level: number) {
+    this.level = level
+    return this
+  }
+
+  getLevel() {
+    return this.level
+  }
+
+  setExperience(experience: number) {
+    this.experience = experience
+    return this
+  }
+
+  getExperience() {
+    return this.experience
+  }
+
+  setStrength(strength: number) {
+    this.strength = strength
+    return this
+  }
+
+  getStrength() {
+    return this.strength
+  }
+
+  setDexterity(dexterity: number) {
+    this.dexterity = dexterity
+    return this
+  }
+
+  getDexterity() {
+    return this.dexterity
+  }
+
+  setIntelligence(intelligence: number) {
+    this.intelligence = intelligence
+    return this
+  }
+
+  getIntelligence() {
+    return this.intelligence
+  }
+
+  setWisdom(wisdom: number) {
+    this.wisdom = wisdom
+    return this
+  }
+
+  getWisdom() {
+    return this.wisdom
+  }
+}

src/entities/base/characterEquipment.ts

@@ -0,0 +1,59 @@
+import { randomUUID } from 'node:crypto'
+
+import { Enum, ManyToOne, PrimaryKey } from '@mikro-orm/core'
+
+import { BaseEntity } from '#application/base/baseEntity'
+import { CharacterEquipmentSlotType } from '#application/enums'
+import { UUID } from '#application/types'
+import { Character } from '#entities/character'
+import { CharacterItem } from '#entities/characterItem'
+
+export class BaseCharacterEquipment extends BaseEntity {
+  @PrimaryKey()
+  id = randomUUID()
+
+  @Enum(() => CharacterEquipmentSlotType)
+  slot!: CharacterEquipmentSlotType
+
+  @ManyToOne({ deleteRule: 'cascade' })
+  character!: Character
+
+  @ManyToOne({ deleteRule: 'cascade' })
+  characterItem!: CharacterItem
+
+  setId(id: UUID) {
+    this.id = id
+    return this
+  }
+
+  getId() {
+    return this.id
+  }
+
+  setSlot(slot: CharacterEquipmentSlotType) {
+    this.slot = slot
+    return this
+  }
+
+  getSlot() {
+    return this.slot
+  }
+
+  setCharacter(character: Character) {
+    this.character = character
+    return this
+  }
+
+  getCharacter() {
+    return this.character
+  }
+
+  setCharacterItem(characterItem: CharacterItem) {
+    this.characterItem = characterItem
+    return this
+  }
+
+  getCharacterItem() {
+    return this.characterItem
+  }
+}

src/entities/base/characterHair.ts

@@ -0,0 +1,95 @@
+import { randomUUID } from 'node:crypto'
+
+import { Collection, Entity, ManyToOne, OneToMany, PrimaryKey, Property } from '@mikro-orm/core'
+
+import { BaseEntity } from '#application/base/baseEntity'
+import { CharacterGender } from '#application/enums'
+import { UUID } from '#application/types'
+import { Character } from '#entities/character'
+import { Sprite } from '#entities/sprite'
+
+export class BaseCharacterHair extends BaseEntity {
+  @PrimaryKey()
+  id = randomUUID()
+
+  @Property()
+  name!: string
+
+  @Property()
+  gender: CharacterGender = CharacterGender.MALE
+
+  @Property()
+  isSelectable = false
+
+  @ManyToOne()
+  sprite?: Sprite
+
+  @Property()
+  createdAt = new Date()
+
+  @Property()
+  updatedAt = new Date()
+
+  setId(id: UUID) {
+    this.id = id
+    return this
+  }
+
+  getId() {
+    return this.id
+  }
+
+  setName(name: string) {
+    this.name = name
+    return this
+  }
+
+  getName() {
+    return this.name
+  }
+
+  setGender(gender: CharacterGender) {
+    this.gender = gender
+    return this
+  }
+
+  getGender() {
+    return this.gender
+  }
+
+  setIsSelectable(isSelectable: boolean) {
+    this.isSelectable = isSelectable
+    return this
+  }
+
+  getIsSelectable() {
+    return this.isSelectable
+  }
+
+  setSprite(sprite: Sprite) {
+    this.sprite = sprite
+    return this
+  }
+
+  getSprite() {
+    return this.sprite
+  }
+
+  setCreatedAt(createdAt: Date) {
+    this.createdAt = createdAt
+    return this
+  }
+
+  getCreatedAt() {
+    return this.createdAt
+  }
+
+  setUpdatedAt(updatedAt: Date) {
+    this.updatedAt = updatedAt
+    return this
+  }
+
+  getUpdatedAt() {
+    return this.updatedAt
+  }
+}

src/entities/base/characterItem.ts

@@ -0,0 +1,59 @@
+import { randomUUID } from 'node:crypto'
+
+import { Collection, Entity, ManyToOne, OneToMany, PrimaryKey, Property } from '@mikro-orm/core'
+
+import { BaseEntity } from '#application/base/baseEntity'
+import { UUID } from '#application/types'
+import { Character } from '#entities/character'
+import { CharacterEquipment } from '#entities/characterEquipment'
+import { Item } from '#entities/item'
+
+export class BaseCharacterItem extends BaseEntity {
+  @PrimaryKey()
+  id = randomUUID()
+
+  @ManyToOne({ deleteRule: 'cascade' })
+  character!: Character
+
+  @ManyToOne({ deleteRule: 'cascade' })
+  item!: Item
+
+  @Property()
+  quantity!: number
+
+  setId(id: UUID) {
+    this.id = id
+    return this
+  }
+
+  getId() {
+    return this.id
+  }
+
+  setCharacter(character: Character) {
+    this.character = character
+    return this
+  }
+
+  getCharacter() {
+    return this.character
+  }
+
+  setItem(item: Item) {
+    this.item = item
+    return this
+  }
+
+  getItem() {
+    return this.item
+  }
+
+  setQuantity(quantity: number) {
+    this.quantity = quantity
+    return this
+  }
+
+  getQuantity() {
+    return this.quantity
+  }
+}

src/entities/base/characterType.ts

@@ -0,0 +1,107 @@
+import { randomUUID } from 'node:crypto'
+
+import { Collection, Entity, Enum, ManyToOne, OneToMany, PrimaryKey, Property } from '@mikro-orm/core'
+
+import { BaseEntity } from '#application/base/baseEntity'
+import { CharacterGender, CharacterRace } from '#application/enums'
+import { UUID } from '#application/types'
+import { Character } from '#entities/character'
+import { Sprite } from '#entities/sprite'
+
+export class BaseCharacterType extends BaseEntity {
+  @PrimaryKey()
+  id = randomUUID()
+
+  @Property()
+  name!: string
+
+  @Enum(() => CharacterGender)
+  gender!: CharacterGender
+
+  @Enum(() => CharacterRace)
+  race!: CharacterRace
+
+  @Property()
+  isSelectable = false
+
+  @ManyToOne()
+  sprite?: Sprite
+
+  @Property()
+  createdAt = new Date()
+
+  @Property()
+  updatedAt = new Date()
+
+  setId(id: UUID) {
+    this.id = id
+    return this
+  }
+
+  getId() {
+    return this.id
+  }
+
+  setName(name: string) {
+    this.name = name
+    return this
+  }
+
+  getName() {
+    return this.name
+  }
+
+  setGender(gender: CharacterGender) {
+    this.gender = gender
+    return this
+  }
+
+  getGender() {
+    return this.gender
+  }
+
+  setRace(race: CharacterRace) {
+    this.race = race
+    return this
+  }
+
+  getRace() {
+    return this.race
+  }
+
+  setIsSelectable(isSelectable: boolean) {
+    this.isSelectable = isSelectable
+    return this
+  }
+
+  getIsSelectable() {
+    return this.isSelectable
+  }
+
+  setSprite(sprite: Sprite) {
+    this.sprite = sprite
+    return this
+  }
+
+  getSprite() {
+    return this.sprite
+  }
+
+  setCreatedAt(createdAt: Date) {
+    this.createdAt = createdAt
+    return this
+  }
+
+  getCreatedAt() {
+    return this.createdAt
+  }
+
+  setUpdatedAt(updatedAt: Date) {
+    this.updatedAt = updatedAt
+    return this
+  }
+
+  getUpdatedAt() {
+    return this.updatedAt
+  }
+}

src/entities/base/chat.ts

@@ -0,0 +1,70 @@
+import { randomUUID } from 'node:crypto'
+
+import { Entity, ManyToOne, PrimaryKey, Property } from '@mikro-orm/core'
+
+import { BaseEntity } from '#application/base/baseEntity'
+import { UUID } from '#application/types'
+import { Character } from '#entities/character'
+import { Map } from '#entities/map'
+
+export class BaseChat extends BaseEntity {
+  @PrimaryKey()
+  id = randomUUID()
+
+  @ManyToOne({ deleteRule: 'cascade' })
+  character!: Character
+
+  @ManyToOne({ deleteRule: 'cascade' })
+  map!: Map
+
+  @Property()
+  message!: string
+
+  @Property()
+  createdAt = new Date()
+
+  setId(id: UUID) {
+    this.id = id
+    return this
+  }
+
+  getId() {
+    return this.id
+  }
+
+  setCharacter(character: Character) {
+    this.character = character
+    return this
+  }
+
+  getCharacter() {
+    return this.character
+  }
+
+  setMap(map: Map) {
+    this.map = map
+    return this
+  }
+
+  getMap() {
+    return this.map
+  }
+
+  setMessage(message: string) {
+    this.message = message
+    return this
+  }
+
+  getMessage() {
+    return this.message
+  }
+
+  setCreatedAt(createdAt: Date) {
+    this.createdAt = createdAt
+    return this
+  }
+
+  getCreatedAt() {
+    return this.createdAt
+  }
+}

src/entities/base/item.ts

@@ -0,0 +1,119 @@
+import { randomUUID } from 'node:crypto'
+
+import { Collection, Entity, Enum, ManyToOne, OneToMany, PrimaryKey, Property } from '@mikro-orm/core'
+
+import { BaseEntity } from '#application/base/baseEntity'
+import { ItemType, ItemRarity } from '#application/enums'
+import { UUID } from '#application/types'
+import { CharacterItem } from '#entities/characterItem'
+import { Sprite } from '#entities/sprite'
+
+export class BaseItem extends BaseEntity {
+  @PrimaryKey()
+  id = randomUUID()
+
+  @Property()
+  name!: string
+
+  @Property()
+  description: string = ''
+
+  @Enum(() => ItemType)
+  itemType!: ItemType
+
+  @Property()
+  stackable = false
+
+  @Enum(() => ItemRarity)
+  rarity: ItemRarity = ItemRarity.COMMON
+
+  @ManyToOne(() => Sprite)
+  sprite?: Sprite
+
+  @Property()
+  createdAt = new Date()
+
+  @Property()
+  updatedAt = new Date()
+
+  setId(id: UUID) {
+    this.id = id
+    return this
+  }
+
+  getId() {
+    return this.id
+  }
+
+  setName(name: string) {
+    this.name = name
+    return this
+  }
+
+  getName() {
+    return this.name
+  }
+
+  setDescription(description: string) {
+    this.description = description
+    return this
+  }
+
+  getDescription() {
+    return this.description
+  }
+
+  setItemType(itemType: ItemType) {
+    this.itemType = itemType
+    return this
+  }
+
+  getItemType() {
+    return this.itemType
+  }
+
+  setStackable(stackable: boolean) {
+    this.stackable = stackable
+    return this
+  }
+
+  getStackable() {
+    return this.stackable
+  }
+
+  setRarity(rarity: ItemRarity) {
+    this.rarity = rarity
+    return this
+  }
+
+  getRarity() {
+    return this.rarity
+  }
+
+  setSprite(sprite: Sprite) {
+    this.sprite = sprite
+    return this
+  }
+
+  getSprite() {
+    return this.sprite
+  }
+
+  setCreatedAt(createdAt: Date) {
+    this.createdAt = createdAt
+    return this
+  }
+
+  getCreatedAt() {
+    return this.createdAt
+  }
+
+  setUpdatedAt(updatedAt: Date) {
+    this.updatedAt = updatedAt
+    return this
+  }
+
+  getUpdatedAt() {
+    return this.updatedAt
+  }
+}

src/entities/base/map.ts

@@ -0,0 +1,143 @@
+import { randomUUID } from 'node:crypto'
+
+import { Collection, Entity, OneToMany, PrimaryKey, Property } from '@mikro-orm/core'
+
+import { BaseEntity } from '#application/base/baseEntity'
+import { UUID } from '#application/types'
+import { MapEffect } from '#entities/mapEffect'
+import { MapEventTile } from '#entities/mapEventTile'
+import { PlacedMapObject } from '#entities/placedMapObject'
+
+export class BaseMap extends BaseEntity {
+  @PrimaryKey()
+  id = randomUUID()
+
+  @Property()
+  name!: string
+
+  @Property()
+  width = 10
+
+  @Property()
+  height = 10
+
+  @Property({ type: 'json', nullable: true })
+  tiles?: any
+
+  @Property()
+  pvp = false
+
+  @Property()
+  createdAt = new Date()
+
+  @Property()
+  updatedAt = new Date()
+
+  @OneToMany(() => MapEffect, (effect) => effect.map, { orphanRemoval: true })
+  mapEffects = new Collection<MapEffect>(this)
+
+  @OneToMany(() => MapEventTile, (tile) => tile.map, { orphanRemoval: true })
+  mapEventTiles = new Collection<MapEventTile>(this)
+
+  @OneToMany(() => PlacedMapObject, (placedMapObject) => placedMapObject.map, { orphanRemoval: true })
+  placedMapObjects = new Collection<PlacedMapObject>(this)
+
+  setId(id: UUID) {
+    this.id = id
+    return this
+  }
+
+  getId() {
+    return this.id
+  }
+
+  setName(name: string) {
+    this.name = name
+    return this
+  }
+
+  getName() {
+    return this.name
+  }
+
+  setWidth(width: number) {
+    this.width = width
+    return this
+  }
+
+  getWidth() {
+    return this.width
+  }
+
+  setHeight(height: number) {
+    this.height = height
+    return this
+  }
+
+  getHeight() {
+    return this.height
+  }
+
+  setTiles(tiles: any) {
+    this.tiles = tiles
+    return this
+  }
+
+  getTiles() {
+    return this.tiles
+  }
+
+  setPvp(pvp: boolean) {
+    this.pvp = pvp
+    return this
+  }
+
+  getPvp() {
+    return this.pvp
+  }
+
+  setCreatedAt(createdAt: Date) {
+    this.createdAt = createdAt
+    return this
+  }
+
+  getCreatedAt() {
+    return this.createdAt
+  }
+
+  setUpdatedAt(updatedAt: Date) {
+    this.updatedAt = updatedAt
+    return this
+  }
+
+  getUpdatedAt() {
+    return this.updatedAt
+  }
+
+  setMapEffects(mapEffects: Collection<MapEffect>) {
+    this.mapEffects = mapEffects
+    return this
+  }
+
+  getMapEffects() {
+    return this.mapEffects
+  }
+
+  setMapEventTiles(mapEventTiles: Collection<MapEventTile>) {
+    this.mapEventTiles = mapEventTiles
+    return this
+  }
+
+  getMapEventTiles() {
+    return this.mapEventTiles
+  }
+
+  setPlacedMapObjects(placedMapObjects: Collection<PlacedMapObject>) {
+    this.placedMapObjects = placedMapObjects
+    return this
+  }
+
+  getPlacedMapObjects() {
+    return this.placedMapObjects
+  }
+}

src/entities/base/mapEffect.ts

@@ -2,18 +2,16 @@ import { randomUUID } from 'node:crypto'
 
 import { Entity, ManyToOne, PrimaryKey, Property } from '@mikro-orm/core'
 
-import { Zone } from './zone'
-
 import { BaseEntity } from '#application/base/baseEntity'
 import { UUID } from '#application/types'
+import { Map } from '#entities/map'
 
-@Entity()
-export class ZoneEffect extends BaseEntity {
+export class BaseMapEffect extends BaseEntity {
   @PrimaryKey()
   id = randomUUID()
 
   @ManyToOne({ deleteRule: 'cascade' })
-  zone!: Zone
+  map!: Map
 
   @Property()
   effect!: string
@@ -30,13 +28,13 @@ export class ZoneEffect extends BaseEntity {
     return this.id
   }
 
-  setZone(zone: Zone) {
-    this.zone = zone
+  setMap(map: Map) {
+    this.map = map
     return this
   }
 
-  getZone() {
-    return this.zone
+  getMap() {
+    return this.map
   }
 
   setEffect(effect: string) {

src/entities/base/mapEventTile.ts

@@ -2,23 +2,21 @@ import { randomUUID } from 'node:crypto'
 
 import { Entity, Enum, ManyToOne, OneToOne, PrimaryKey, Property } from '@mikro-orm/core'
 
-import { Zone } from './zone'
-import { ZoneEventTileTeleport } from './zoneEventTileTeleport'
-
 import { BaseEntity } from '#application/base/baseEntity'
-import { ZoneEventTileType } from '#application/enums'
+import { MapEventTileType } from '#application/enums'
 import { UUID } from '#application/types'
+import { Map } from '#entities/map'
+import { MapEventTileTeleport } from '#entities/mapEventTileTeleport'
 
-@Entity()
-export class ZoneEventTile extends BaseEntity {
+export class BaseMapEventTile extends BaseEntity {
   @PrimaryKey()
   id = randomUUID()
 
   @ManyToOne({ deleteRule: 'cascade' })
-  zone!: Zone
+  map!: Map
 
-  @Enum(() => ZoneEventTileType)
-  type!: ZoneEventTileType
+  @Enum(() => MapEventTileType)
+  type!: MapEventTileType
 
   @Property()
   positionX!: number
@@ -26,8 +24,8 @@ export class ZoneEventTile extends BaseEntity {
   @Property()
   positionY!: number
 
-  @OneToOne(() => ZoneEventTileTeleport, (teleport) => teleport.zoneEventTile)
-  teleport?: ZoneEventTileTeleport
+  @OneToOne(() => MapEventTileTeleport, (teleport) => teleport.mapEventTile, { eager: true })
+  teleport?: MapEventTileTeleport
 
   setId(id: UUID) {
     this.id = id
@@ -38,16 +36,16 @@ export class ZoneEventTile extends BaseEntity {
     return this.id
   }
 
-  setZone(zone: Zone) {
-    this.zone = zone
+  setMap(map: Map) {
+    this.map = map
     return this
   }
 
-  getZone() {
-    return this.zone
+  getMap() {
+    return this.map
   }
 
-  setType(type: ZoneEventTileType) {
+  setType(type: MapEventTileType) {
     this.type = type
     return this
   }
@@ -74,7 +72,7 @@ export class ZoneEventTile extends BaseEntity {
     return this.positionY
   }
 
-  setTeleport(teleport: ZoneEventTileTeleport) {
+  setTeleport(teleport: MapEventTileTeleport) {
     this.teleport = teleport
     return this
   }

src/entities/base/mapEventTileTeleport.ts

@@ -2,22 +2,20 @@ import { randomUUID } from 'node:crypto'
 
 import { Entity, ManyToOne, OneToOne, PrimaryKey, Property } from '@mikro-orm/core'
 
-import { Zone } from './zone'
-import { ZoneEventTile } from './zoneEventTile'
-
 import { BaseEntity } from '#application/base/baseEntity'
 import { UUID } from '#application/types'
+import { Map } from '#entities/map'
+import { MapEventTile } from '#entities/mapEventTile'
 
-@Entity()
-export class ZoneEventTileTeleport extends BaseEntity {
+export class BaseMapEventTileTeleport extends BaseEntity {
   @PrimaryKey()
   id = randomUUID()
 
   @OneToOne({ deleteRule: 'cascade' })
-  zoneEventTile!: ZoneEventTile
+  mapEventTile!: MapEventTile
 
-  @ManyToOne({ deleteRule: 'cascade' })
-  toZone!: Zone
+  @ManyToOne({ deleteRule: 'cascade', eager: true })
+  toMap!: Map
 
   @Property()
   toRotation!: number
@@ -37,22 +35,22 @@ export class ZoneEventTileTeleport extends BaseEntity {
     return this.id
   }
 
-  setZoneEventTile(zoneEventTile: ZoneEventTile) {
-    this.zoneEventTile = zoneEventTile
+  setMapEventTile(mapEventTile: MapEventTile) {
+    this.mapEventTile = mapEventTile
     return this
   }
 
-  getZoneEventTile() {
-    return this.zoneEventTile
+  getMapEventTile() {
+    return this.mapEventTile
   }
 
-  setToZone(toZone: Zone) {
-    this.toZone = toZone
+  setToMap(toMap: Map) {
+    this.toMap = toMap
     return this
   }
 
-  getToZone() {
-    return this.toZone
+  getToMap() {
+    return this.toMap
   }
 
   setToRotation(toRotation: number) {

src/entities/base/mapObject.ts

@@ -0,0 +1,128 @@
+import { randomUUID } from 'node:crypto'
+
+import { Entity, PrimaryKey, Property } from '@mikro-orm/core'
+
+import { BaseEntity } from '#application/base/baseEntity'
+import { UUID } from '#application/types'
+
+export class BaseMapObject extends BaseEntity {
+  @PrimaryKey()
+  id = randomUUID()
+
+  @Property()
+  name!: string
+
+  @Property({ type: 'json', nullable: true })
+  tags?: any
+
+  @Property({ type: 'decimal', precision: 10, scale: 2 })
+  originX = 0
+
+  @Property({ type: 'decimal', precision: 10, scale: 2 })
+  originY = 0
+
+  @Property()
+  frameRate = 0
+
+  @Property()
+  frameWidth = 0
+
+  @Property()
+  frameHeight = 0
+
+  @Property()
+  createdAt = new Date()
+
+  @Property()
+  updatedAt = new Date()
+
+  setId(id: UUID) {
+    this.id = id
+    return this
+  }
+
+  getId() {
+    return this.id
+  }
+
+  setName(name: string) {
+    this.name = name
+    return this
+  }
+
+  getName() {
+    return this.name
+  }
+
+  setTags(tags: any) {
+    this.tags = tags
+    return this
+  }
+
+  getTags() {
+    return this.tags
+  }
+
+  setOriginX(originX: number) {
+    this.originX = originX
+    return this
+  }
+
+  getOriginX() {
+    return this.originX
+  }
+
+  setOriginY(originY: number) {
+    this.originY = originY
+    return this
+  }
+
+  getOriginY() {
+    return this.originY
+  }
+
+  setFrameRate(frameRate: number) {
+    this.frameRate = frameRate
+    return this
+  }
+
+  getFrameRate() {
+    return this.frameRate
+  }
+
+  setFrameWidth(frameWidth: number) {
+    this.frameWidth = frameWidth
+    return this
+  }
+
+  getFrameWidth() {
+    return this.frameWidth
+  }
+
+  setFrameHeight(frameHeight: number) {
+    this.frameHeight = frameHeight
+    return this
+  }
+
+  getFrameHeight() {
+    return this.frameHeight
+  }
+
+  setCreatedAt(createdAt: Date) {
+    this.createdAt = createdAt
+    return this
+  }
+
+  getCreatedAt() {
+    return this.createdAt
+  }
+
+  setUpdatedAt(updatedAt: Date) {
+    this.updatedAt = updatedAt
+    return this
+  }
+
+  getUpdatedAt() {
+    return this.updatedAt
+  }
+}

src/entities/base/passwordResetToken.ts

@@ -0,0 +1,57 @@
+import { randomUUID } from 'node:crypto'
+
+import { Entity, ManyToOne, PrimaryKey, Property } from '@mikro-orm/core'
+
+import { BaseEntity } from '#application/base/baseEntity'
+import { UUID } from '#application/types'
+import { User } from '#entities/user'
+
+export class BasePasswordResetToken extends BaseEntity {
+  @PrimaryKey()
+  id = randomUUID()
+
+  @ManyToOne({ deleteRule: 'cascade' })
+  user!: User
+
+  @Property({ unique: true })
+  token!: string
+
+  @Property()
+  createdAt = new Date()
+
+  setId(id: UUID) {
+    this.id = id
+    return this
+  }
+
+  getId() {
+    return this.id
+  }
+
+  setUser(user: User) {
+    this.user = user
+    return this
+  }
+
+  getUser() {
+    return this.user
+  }
+
+  setToken(token: string) {
+    this.token = token
+    return this
+  }
+
+  getToken() {
+    return this.token
+  }
+
+  setCreatedAt(createdAt: Date) {
+    this.createdAt = createdAt
+    return this
+  }
+
+  getCreatedAt() {
+    return this.createdAt
+  }
+}

src/entities/base/placedMapObject.ts

@@ -2,27 +2,23 @@ import { randomUUID } from 'node:crypto'
 
 import { Entity, ManyToOne, PrimaryKey, Property } from '@mikro-orm/core'
 
-import { Zone } from './zone'
-
 import { BaseEntity } from '#application/base/baseEntity'
 import { UUID } from '#application/types'
+import { Map } from '#entities/map'
 import { MapObject } from '#entities/mapObject'
 
 //@TODO : Rename mapObject
-@Entity()
-export class ZoneObject extends BaseEntity {
+
+export class BasePlacedMapObject extends BaseEntity {
   @PrimaryKey()
   id = randomUUID()
 
   @ManyToOne({ deleteRule: 'cascade' })
-  zone!: Zone
+  map!: Map
 
-  @ManyToOne({ deleteRule: 'cascade' })
+  @ManyToOne({ deleteRule: 'cascade', eager: true })
   mapObject!: MapObject
 
-  @Property()
-  depth = 0
-
   @Property()
   isRotated = false
 
@@ -41,13 +37,13 @@ export class ZoneObject extends BaseEntity {
     return this.id
   }
 
-  setZone(zone: Zone) {
-    this.zone = zone
+  setMap(map: Map) {
+    this.map = map
     return this
   }
 
-  getZone() {
-    return this.zone
+  getMap() {
+    return this.map
   }
 
   setMapObject(mapObject: MapObject) {
@@ -59,15 +55,6 @@ export class ZoneObject extends BaseEntity {
     return this.mapObject
   }
 
-  setDepth(depth: number) {
-    this.depth = depth
-    return this
-  }
-
-  getDepth() {
-    return this.depth
-  }
-
   setIsRotated(isRotated: boolean) {
     this.isRotated = isRotated
     return this

src/entities/base/sprite.ts

@@ -0,0 +1,69 @@
+import { randomUUID } from 'node:crypto'
+
+import { Collection, Entity, OneToMany, PrimaryKey, Property } from '@mikro-orm/core'
+
+import { BaseEntity } from '#application/base/baseEntity'
+import { UUID } from '#application/types'
+import { SpriteAction } from '#entities/spriteAction'
+
+export class BaseSprite extends BaseEntity {
+  @PrimaryKey()
+  id = randomUUID()
+
+  @Property()
+  name!: string
+
+  @OneToMany(() => SpriteAction, (action) => action.sprite)
+  spriteActions = new Collection<SpriteAction>(this)
+
+  @Property()
+  createdAt = new Date()
+
+  @Property()
+  updatedAt = new Date()
+
+  setId(id: UUID) {
+    this.id = id
+    return this
+  }
+
+  getId() {
+    return this.id
+  }
+
+  setName(name: string) {
+    this.name = name
+    return this
+  }
+
+  getName() {
+    return this.name
+  }
+
+  setSpriteActions(spriteActions: Collection<SpriteAction>) {
+    this.spriteActions = spriteActions
+    return this
+  }
+
+  getSpriteActions() {
+    return this.spriteActions
+  }
+
+  setCreatedAt(createdAt: Date) {
+    this.createdAt = createdAt
+    return this
+  }
+
+  getCreatedAt() {
+    return this.createdAt
+  }
+
+  setUpdatedAt(updatedAt: Date) {
+    this.updatedAt = updatedAt
+    return this
+  }
+
+  getUpdatedAt() {
+    return this.updatedAt
+  }
+}

src/entities/base/spriteAction.ts

@@ -0,0 +1,125 @@
+import { randomUUID } from 'node:crypto'
+
+import { Entity, ManyToOne, PrimaryKey, Property } from '@mikro-orm/core'
+
+import { BaseEntity } from '#application/base/baseEntity'
+import { UUID } from '#application/types'
+import { Sprite } from '#entities/sprite'
+
+export interface SpriteImage {
+  url: string
+  offset: {
+    x: number
+    y: number
+  }
+}
+
+export class BaseSpriteAction extends BaseEntity {
+  @PrimaryKey()
+  id = randomUUID()
+
+  @ManyToOne({ deleteRule: 'cascade' })
+  sprite!: Sprite
+
+  @Property()
+  action!: string
+
+  @Property({ type: 'json', nullable: true })
+  sprites?: SpriteImage[]
+
+  @Property({ type: 'decimal', precision: 5, scale: 2 })
+  originX = 0.0
+
+  @Property({ type: 'decimal', precision: 5, scale: 2 })
+  originY = 0.0
+
+  @Property()
+  frameWidth = 0
+
+  @Property()
+  frameHeight = 0
+
+  @Property()
+  frameRate = 0
+
+  setId(id: UUID) {
+    this.id = id
+    return this
+  }
+
+  getId() {
+    return this.id
+  }
+
+  setSprite(sprite: Sprite) {
+    this.sprite = sprite
+    return this
+  }
+
+  getSprite() {
+    return this.sprite
+  }
+
+  setAction(action: string) {
+    this.action = action
+    return this
+  }
+
+  getAction() {
+    return this.action
+  }
+
+  setSprites(sprites: SpriteImage[]) {
+    this.sprites = sprites
+    return this
+  }
+
+  getSprites() {
+    return this.sprites
+  }
+
+  setOriginX(originX: number) {
+    this.originX = originX
+    return this
+  }
+
+  getOriginX() {
+    return this.originX
+  }
+
+  setOriginY(originY: number) {
+    this.originY = originY
+    return this
+  }
+
+  getOriginY() {
+    return this.originY
+  }
+
+  setFrameWidth(frameWidth: number) {
+    this.frameWidth = frameWidth
+    return this
+  }
+
+  getFrameWidth() {
+    return this.frameWidth
+  }
+
+  setFrameHeight(frameHeight: number) {
+    this.frameHeight = frameHeight
+    return this
+  }
+
+  getFrameHeight() {
+    return this.frameHeight
+  }
+
+  setFrameRate(frameRate: number) {
+    this.frameRate = frameRate
+    return this
+  }
+
+  getFrameRate() {
+    return this.frameRate
+  }
+}

src/entities/base/tile.ts

@@ -0,0 +1,68 @@
+import { randomUUID } from 'node:crypto'
+
+import { Entity, PrimaryKey, Property } from '@mikro-orm/core'
+
+import { BaseEntity } from '#application/base/baseEntity'
+import { UUID } from '#application/types'
+
+export class BaseTile extends BaseEntity {
+  @PrimaryKey()
+  id = randomUUID()
+
+  @Property()
+  name!: string
+
+  @Property({ type: 'json', nullable: true })
+  tags?: any
+
+  @Property()
+  createdAt = new Date()
+
+  @Property()
+  updatedAt = new Date()
+
+  setId(id: UUID) {
+    this.id = id
+    return this
+  }
+
+  getId() {
+    return this.id
+  }
+
+  setName(name: string) {
+    this.name = name
+    return this
+  }
+
+  getName() {
+    return this.name
+  }
+
+  setTags(tags: any) {
+    this.tags = tags
+    return this
+  }
+
+  getTags() {
+    return this.tags
+  }
+
+  setCreatedAt(createdAt: Date) {
+    this.createdAt = createdAt
+    return this
+  }
+
+  getCreatedAt() {
+    return this.createdAt
+  }
+
+  setUpdatedAt(updatedAt: Date) {
+    this.updatedAt = updatedAt
+    return this
+  }
+
+  getUpdatedAt() {
+    return this.updatedAt
+  }
+}

src/entities/base/user.ts

@@ -0,0 +1,96 @@
+import { randomUUID } from 'node:crypto'
+
+import { Collection, Entity, OneToMany, PrimaryKey, Property } from '@mikro-orm/core'
+import bcrypt from 'bcryptjs'
+
+import { BaseEntity } from '#application/base/baseEntity'
+import { UUID } from '#application/types'
+import { Character } from '#entities/character'
+import { PasswordResetToken } from '#entities/passwordResetToken'
+
+export class BaseUser extends BaseEntity {
+  @PrimaryKey()
+  id = randomUUID()
+
+  @Property({ unique: true })
+  username!: string
+
+  @Property({ unique: true })
+  email!: string
+
+  @Property()
+  password!: string
+
+  @Property()
+  online = false
+
+  @OneToMany(() => Character, (character) => character.user)
+  characters = new Collection<Character>(this)
+
+  @OneToMany(() => PasswordResetToken, (token) => token.user)
+  passwordResetTokens = new Collection<PasswordResetToken>(this)
+
+  setId(id: UUID) {
+    this.id = id
+    return this
+  }
+
+  getId() {
+    return this.id
+  }
+
+  setUsername(username: string) {
+    this.username = username
+    return this
+  }
+
+  getUsername() {
+    return this.username
+  }
+
+  setEmail(email: string) {
+    this.email = email
+    return this
+  }
+
+  getEmail() {
+    return this.email
+  }
+
+  setPassword(password: string) {
+    this.password = bcrypt.hashSync(password, 10)
+    return this
+  }
+
+  getPassword() {
+    return this.password
+  }
+
+  setOnline(online: boolean) {
+    this.online = online
+    return this
+  }
+
+  getOnline() {
+    return this.online
+  }
+
+  setCharacters(characters: Collection<Character>) {
+    this.characters = characters
+    return this
+  }
+
+  getCharacters() {
+    return this.characters
+  }
+
+  setPasswordResetTokens(passwordResetTokens: Collection<PasswordResetToken>) {
+    this.passwordResetTokens = passwordResetTokens
+    return this
+  }
+
+  getPasswordResetTokens() {
+    return this.passwordResetTokens
+    return this
+  }
+}

src/entities/base/world.ts

@@ -0,0 +1,41 @@
+import { Entity, PrimaryKey, Property } from '@mikro-orm/core'
+
+import { BaseEntity } from '#application/base/baseEntity'
+
+export class BaseWorld extends BaseEntity {
+  @PrimaryKey()
+  date = new Date()
+
+  @Property()
+  rainPercentage = 0
+
+  @Property()
+  fogDensity = 0
+
+  setDate(date: Date) {
+    this.date = date
+    return this
+  }
+
+  getDate() {
+    return this.date
+  }
+
+  setRainPercentage(rainPercentage: number) {
+    this.rainPercentage = rainPercentage
+    return this
+  }
+
+  getRainPercentage() {
+    return this.rainPercentage
+  }
+
+  setFogDensity(fogDensity: number) {
+    this.fogDensity = fogDensity
+    return this
+  }
+
+  getFogDensity() {
+    return this.fogDensity
+  }
+}

src/entities/character.ts

@@ -1,297 +1,6 @@
-import { randomUUID } from 'node:crypto'
+import { Entity } from '@mikro-orm/core'
 
-import { Collection, Entity, ManyToOne, OneToMany, PrimaryKey, Property } from '@mikro-orm/core'
-
-import { CharacterEquipment } from './characterEquipment'
-import { CharacterHair } from './characterHair'
-import { CharacterItem } from './characterItem'
-import { CharacterType } from './characterType'
-import { Chat } from './chat'
-import { User } from './user'
-import { Zone } from './zone'
-
-import { BaseEntity } from '#application/base/baseEntity'
-import { UUID } from '#application/types'
+import { BaseCharacter } from '#entities/base/character'
 
 @Entity()
-export class Character extends BaseEntity {
-  @PrimaryKey()
-  id = randomUUID()
-
-  @ManyToOne({ deleteRule: 'cascade' })
-  user!: User
-
-  @Property({ unique: true })
-  name!: string
-
-  @Property()
-  online = false
-
-  @Property()
-  role = 'player'
-
-  @OneToMany(() => Chat, (chat) => chat.character)
-  chats = new Collection<Chat>(this)
-
-  // Position
-  @ManyToOne()
-  zone!: Zone // @TODO: Update to spawn point when current zone is not found
-
-  @Property()
-  positionX = 0
-
-  @Property()
-  positionY = 0
-
-  @Property()
-  rotation = 0
-
-  // Customization
-  @ManyToOne({ deleteRule: 'set null' })
-  characterType?: CharacterType | null | undefined
-
-  @ManyToOne({ deleteRule: 'set null' })
-  characterHair?: CharacterHair | null | undefined
-
-  // Inventory
-  @OneToMany({ mappedBy: 'character' })
-  items = new Collection<CharacterItem>(this)
-
-  @OneToMany({ mappedBy: 'character' })
-  equipment = new Collection<CharacterEquipment>(this)
-
-  // Stats
-  @Property()
-  alignment = 50
-
-  @Property()
-  hitpoints = 100
-
-  @Property()
-  mana = 100
-
-  @Property()
-  level = 1
-
-  @Property()
-  experience = 0
-
-  @Property()
-  strength = 10
-
-  @Property()
-  dexterity = 10
-
-  @Property()
-  intelligence = 10
-
-  @Property()
-  wisdom = 10
-
-  setId(id: UUID) {
-    this.id = id
-    return this
-  }
-
-  getId() {
-    return this.id
-  }
-
-  setUser(user: User) {
-    this.user = user
-    return this
-  }
-
-  getUser() {
-    return this.user
-  }
-
-  setName(name: string) {
-    this.name = name
-    return this
-  }
-
-  getName() {
-    return this.name
-  }
-
-  setOnline(online: boolean) {
-    this.online = online
-    return this
-  }
-
-  getOnline() {
-    return this.online
-  }
-
-  setRole(role: string) {
-    this.role = role
-    return this
-  }
-
-  getRole() {
-    return this.role
-  }
-
-  setChats(chats: Collection<Chat>) {
-    this.chats = chats
-    return this
-  }
-
-  getChats() {
-    return this.chats
-  }
-
-  setZone(zone: Zone) {
-    this.zone = zone
-    return this
-  }
-
-  getZone() {
-    return this.zone
-  }
-
-  setPositionX(positionX: number) {
-    this.positionX = positionX
-    return this
-  }
-
-  getPositionX() {
-    return this.positionX
-  }
-
-  setPositionY(positionY: number) {
-    this.positionY = positionY
-    return this
-  }
-
-  getPositionY() {
-    return this.positionY
-  }
-
-  setRotation(rotation: number) {
-    this.rotation = rotation
-    return this
-  }
-
-  getRotation() {
-    return this.rotation
-  }
-
-  setCharacterType(characterType: CharacterType | null | undefined) {
-    this.characterType = characterType
-    return this
-  }
-
-  getCharacterType() {
-    return this.characterType
-  }
-
-  setCharacterHair(characterHair: CharacterHair | null | undefined) {
-    this.characterHair = characterHair
-    return this
-  }
-
-  getCharacterHair() {
-    return this.characterHair
-  }
-
-  setItems(items: Collection<CharacterItem>) {
-    this.items = items
-    return this
-  }
-
-  getItems() {
-    return this.items
-  }
-
-  setEquipment(equipment: Collection<CharacterEquipment>) {
-    this.equipment = equipment
-    return this
-  }
-
-  getEquipment() {
-    return this.equipment
-  }
-
-  setAlignment(alignment: number) {
-    this.alignment = alignment
-    return this
-  }
-
-  getAlignment() {
-    return this.alignment
-  }
-
-  setHitpoints(hitpoints: number) {
-    this.hitpoints = hitpoints
-    return this
-  }
-
-  getHitpoints() {
-    return this.hitpoints
-  }
-
-  setMana(mana: number) {
-    this.mana = mana
-    return this
-  }
-
-  getMana() {
-    return this.mana
-  }
-
-  setLevel(level: number) {
-    this.level = level
-    return this
-  }
-
-  getLevel() {
-    return this.level
-  }
-
-  setExperience(experience: number) {
-    this.experience = experience
-    return this
-  }
-
-  getExperience() {
-    return this.experience
-  }
-
-  setStrength(strength: number) {
-    this.strength = strength
-    return this
-  }
-
-  getStrength() {
-    return this.strength
-  }
-
-  setDexterity(dexterity: number) {
-    this.dexterity = dexterity
-    return this
-  }
-
-  getDexterity() {
-    return this.dexterity
-  }
-
-  setIntelligence(intelligence: number) {
-    this.intelligence = intelligence
-    return this
-  }
-
-  getIntelligence() {
-    return this.intelligence
-  }
-
-  setWisdom(wisdom: number) {
-    this.wisdom = wisdom
-    return this
-  }
-
-  getWisdom() {
-    return this.wisdom
-  }
-}
+export class Character extends BaseCharacter {}

src/entities/characterEquipment.ts

@@ -1,61 +1,6 @@
-import { randomUUID } from 'node:crypto'
+import { Entity } from '@mikro-orm/core'
 
-import { Entity, Enum, ManyToOne, PrimaryKey } from '@mikro-orm/core'
-
-import { Character } from './character'
-import { CharacterItem } from './characterItem'
-
-import { BaseEntity } from '#application/base/baseEntity'
-import { CharacterEquipmentSlotType } from '#application/enums'
-import { UUID } from '#application/types'
+import { BaseCharacterEquipment } from '#entities/base/characterEquipment'
 
 @Entity()
-export class CharacterEquipment extends BaseEntity {
-  @PrimaryKey()
-  id = randomUUID()
-
-  @Enum(() => CharacterEquipmentSlotType)
-  slot!: CharacterEquipmentSlotType
-
-  @ManyToOne({ deleteRule: 'cascade' })
-  character!: Character
-
-  @ManyToOne({ deleteRule: 'cascade' })
-  characterItem!: CharacterItem
-
-  setId(id: UUID) {
-    this.id = id
-    return this
-  }
-
-  getId() {
-    return this.id
-  }
-
-  setSlot(slot: CharacterEquipmentSlotType) {
-    this.slot = slot
-    return this
-  }
-
-  getSlot() {
-    return this.slot
-  }
-
-  setCharacter(character: Character) {
-    this.character = character
-    return this
-  }
-
-  getCharacter() {
-    return this.character
-  }
-
-  setCharacterItem(characterItem: CharacterItem) {
-    this.characterItem = characterItem
-    return this
-  }
-
-  getCharacterItem() {
-    return this.characterItem
-  }
-}
+export class CharacterEquipment extends BaseCharacterEquipment {}

src/entities/characterHair.ts

@@ -1,73 +1,15 @@
-import { randomUUID } from 'node:crypto'
+import { Entity } from '@mikro-orm/core'
 
-import { Collection, Entity, ManyToOne, OneToMany, PrimaryKey, Property } from '@mikro-orm/core'
-
-import { Character } from './character'
-import { Sprite } from './sprite'
-
-import { BaseEntity } from '#application/base/baseEntity'
-import { CharacterGender } from '#application/enums'
-import { UUID } from '#application/types'
+import { BaseCharacterHair } from '#entities/base/characterHair'
 
 @Entity()
-export class CharacterHair extends BaseEntity {
-  @PrimaryKey()
-  id = randomUUID()
-
-  @Property()
-  name!: string
-
-  @Property()
-  gender: CharacterGender = CharacterGender.MALE
-
-  @Property()
-  isSelectable = false
-
-  @ManyToOne({ nullable: true })
-  sprite?: Sprite
-
-  setId(id: UUID) {
-    this.id = id
-    return this
-  }
-
-  getId() {
-    return this.id
-  }
-
-  setName(name: string) {
-    this.name = name
-    return this
-  }
-
-  getName() {
-    return this.name
-  }
-
-  setGender(gender: CharacterGender) {
-    this.gender = gender
-    return this
-  }
-
-  getGender() {
-    return this.gender
-  }
-
-  setIsSelectable(isSelectable: boolean) {
-    this.isSelectable = isSelectable
-    return this
-  }
-
-  getIsSelectable() {
-    return this.isSelectable
-  }
-
-  setSprite(sprite: Sprite) {
-    this.sprite = sprite
-    return this
-  }
-
-  getSprite() {
-    return this.sprite
+export class CharacterHair extends BaseCharacterHair {
+  public async cache() {
+    try {
+      return this
+    } catch (error) {
+      console.error(error)
+      return {}
+    }
   }
 }

src/entities/characterItem.ts

@@ -1,61 +1,6 @@
-import { randomUUID } from 'node:crypto'
+import { Entity } from '@mikro-orm/core'
 
-import { Collection, Entity, ManyToOne, OneToMany, PrimaryKey, Property } from '@mikro-orm/core'
-
-import { Character } from './character'
-import { CharacterEquipment } from './characterEquipment'
-import { Item } from './item'
-
-import { BaseEntity } from '#application/base/baseEntity'
-import { UUID } from '#application/types'
+import { BaseCharacterItem } from '#entities/base/characterItem'
 
 @Entity()
-export class CharacterItem extends BaseEntity {
-  @PrimaryKey()
-  id = randomUUID()
-
-  @ManyToOne({ deleteRule: 'cascade' })
-  character!: Character
-
-  @ManyToOne({ deleteRule: 'cascade' })
-  item!: Item
-
-  @Property()
-  quantity!: number
-
-  setId(id: UUID) {
-    this.id = id
-    return this
-  }
-
-  getId() {
-    return this.id
-  }
-
-  setCharacter(character: Character) {
-    this.character = character
-    return this
-  }
-
-  getCharacter() {
-    return this.character
-  }
-
-  setItem(item: Item) {
-    this.item = item
-    return this
-  }
-
-  getItem() {
-    return this.item
-  }
-
-  setQuantity(quantity: number) {
-    this.quantity = quantity
-    return this
-  }
-
-  getQuantity() {
-    return this.quantity
-  }
-}
+export class CharacterItem extends BaseCharacterItem {}

src/entities/characterType.ts

@@ -1,121 +1,15 @@
-import { randomUUID } from 'node:crypto'
+import { Entity } from '@mikro-orm/core'
 
-import { Collection, Entity, Enum, ManyToOne, OneToMany, PrimaryKey, Property } from '@mikro-orm/core'
-
-import { Character } from './character'
-import { Sprite } from './sprite'
-
-import { BaseEntity } from '#application/base/baseEntity'
-import { CharacterGender, CharacterRace } from '#application/enums'
-import { UUID } from '#application/types'
+import { BaseCharacterType } from '#entities/base/characterType'
 
 @Entity()
-export class CharacterType extends BaseEntity {
-  @PrimaryKey()
-  id = randomUUID()
-
-  @Property()
-  name!: string
-
-  @Enum(() => CharacterGender)
-  gender!: CharacterGender
-
-  @Enum(() => CharacterRace)
-  race!: CharacterRace
-
-  @Property()
-  isSelectable = false
-
-  @OneToMany(() => Character, (character) => character.characterType)
-  characters = new Collection<Character>(this)
-
-  @ManyToOne(() => Sprite, { nullable: true })
-  sprite?: Sprite
-
-  @Property()
-  createdAt = new Date()
-
-  @Property()
-  updatedAt = new Date()
-
-  setId(id: UUID) {
-    this.id = id
-    return this
-  }
-
-  getId() {
-    return this.id
-  }
-
-  setName(name: string) {
-    this.name = name
-    return this
-  }
-
-  getName() {
-    return this.name
-  }
-
-  setGender(gender: CharacterGender) {
-    this.gender = gender
-    return this
-  }
-
-  getGender() {
-    return this.gender
-  }
-
-  setRace(race: CharacterRace) {
-    this.race = race
-    return this
-  }
-
-  getRace() {
-    return this.race
-  }
-
-  setIsSelectable(isSelectable: boolean) {
-    this.isSelectable = isSelectable
-    return this
-  }
-
-  getIsSelectable() {
-    return this.isSelectable
-  }
-
-  setSprite(sprite: Sprite) {
-    this.sprite = sprite
-    return this
-  }
-
-  getSprite() {
-    return this.sprite
-  }
-
-  setCreatedAt(createdAt: Date) {
-    this.createdAt = createdAt
-    return this
-  }
-
-  getCreatedAt() {
-    return this.createdAt
-  }
-
-  setUpdatedAt(updatedAt: Date) {
-    this.updatedAt = updatedAt
-    return this
-  }
-
-  getUpdatedAt() {
-    return this.updatedAt
-  }
-
-  setCharacters(characters: Collection<Character>) {
-    this.characters = characters
-    return this
-  }
-
-  getCharacters() {
-    return this.characters
+export class CharacterType extends BaseCharacterType {
+  public async cache() {
+    try {
+      return this
+    } catch (error) {
+      console.error(error)
+      return {}
+    }
   }
 }

src/entities/chat.ts

@@ -1,72 +1,6 @@
-import { randomUUID } from 'node:crypto'
+import { Entity } from '@mikro-orm/core'
 
-import { Entity, ManyToOne, PrimaryKey, Property } from '@mikro-orm/core'
-
-import { Character } from './character'
-import { Zone } from './zone'
-
-import { BaseEntity } from '#application/base/baseEntity'
-import { UUID } from '#application/types'
+import { BaseChat } from '#entities/base/chat'
 
 @Entity()
-export class Chat extends BaseEntity {
-  @PrimaryKey()
-  id = randomUUID()
-
-  @ManyToOne({ deleteRule: 'cascade' })
-  character!: Character
-
-  @ManyToOne({ deleteRule: 'cascade' })
-  zone!: Zone
-
-  @Property()
-  message!: string
-
-  @Property()
-  createdAt = new Date()
-
-  setId(id: UUID) {
-    this.id = id
-    return this
-  }
-
-  getId() {
-    return this.id
-  }
-
-  setCharacter(character: Character) {
-    this.character = character
-    return this
-  }
-
-  getCharacter() {
-    return this.character
-  }
-
-  setZone(zone: Zone) {
-    this.zone = zone
-    return this
-  }
-
-  getZone() {
-    return this.zone
-  }
-
-  setMessage(message: string) {
-    this.message = message
-    return this
-  }
-
-  getMessage() {
-    return this.message
-  }
-
-  setCreatedAt(createdAt: Date) {
-    this.createdAt = createdAt
-    return this
-  }
-
-  getCreatedAt() {
-    return this.createdAt
-  }
-}
+export class Chat extends BaseChat {}

src/entities/item.ts

@@ -1,121 +1,6 @@
-import { randomUUID } from 'node:crypto'
+import { Entity } from '@mikro-orm/core'
 
-import { Collection, Entity, Enum, ManyToOne, OneToMany, PrimaryKey, Property } from '@mikro-orm/core'
-
-import { CharacterItem } from './characterItem'
-import { Sprite } from './sprite'
-
-import { BaseEntity } from '#application/base/baseEntity'
-import { ItemType, ItemRarity } from '#application/enums'
-import { UUID } from '#application/types'
+import { BaseItem } from '#entities/base/item'
 
 @Entity()
-export class Item extends BaseEntity {
-  @PrimaryKey()
-  id = randomUUID()
-
-  @Property()
-  name!: string
-
-  @Property({ nullable: true })
-  description?: string
-
-  @Enum(() => ItemType)
-  itemType!: ItemType
-
-  @Property()
-  stackable = false
-
-  @Enum(() => ItemRarity)
-  rarity: ItemRarity = ItemRarity.COMMON
-
-  @ManyToOne(() => Sprite, { nullable: true })
-  sprite?: Sprite
-
-  @Property()
-  createdAt = new Date()
-
-  @Property()
-  updatedAt = new Date()
-
-  setId(id: UUID) {
-    this.id = id
-    return this
-  }
-
-  getId() {
-    return this.id
-  }
-
-  setName(name: string) {
-    this.name = name
-    return this
-  }
-
-  getName() {
-    return this.name
-  }
-
-  setDescription(description: string) {
-    this.description = description
-    return this
-  }
-
-  getDescription() {
-    return this.description
-  }
-
-  setItemType(itemType: ItemType) {
-    this.itemType = itemType
-    return this
-  }
-
-  getItemType() {
-    return this.itemType
-  }
-
-  setStackable(stackable: boolean) {
-    this.stackable = stackable
-    return this
-  }
-
-  getStackable() {
-    return this.stackable
-  }
-
-  setRarity(rarity: ItemRarity) {
-    this.rarity = rarity
-    return this
-  }
-
-  getRarity() {
-    return this.rarity
-  }
-
-  setSprite(sprite: Sprite) {
-    this.sprite = sprite
-    return this
-  }
-
-  getSprite() {
-    return this.sprite
-  }
-
-  setCreatedAt(createdAt: Date) {
-    this.createdAt = createdAt
-    return this
-  }
-
-  getCreatedAt() {
-    return this.createdAt
-  }
-
-  setUpdatedAt(updatedAt: Date) {
-    this.updatedAt = updatedAt
-    return this
-  }
-
-  getUpdatedAt() {
-    return this.updatedAt
-  }
-}
+export class Item extends BaseItem {}

src/entities/map.ts

@@ -0,0 +1,39 @@
+import { Entity } from '@mikro-orm/core'
+
+import { BaseMap } from '#entities/base/map'
+
+export type MapCacheT = ReturnType<Map['cache']> | {}
+
+@Entity()
+export class Map extends BaseMap {
+  public async cache() {
+    try {
+      await this.getPlacedMapObjects().load()
+      await this.getMapEffects().load()
+
+      return {
+        id: this.getId(),
+        name: this.getName(),
+        width: this.getWidth(),
+        height: this.getHeight(),
+        tiles: this.getTiles(),
+        pvp: this.getPvp(),
+        updatedAt: this.getUpdatedAt(),
+        placedMapObjects: this.getPlacedMapObjects().map((placedMapObject) => ({
+          id: placedMapObject.getId(),
+          mapObject: placedMapObject.getMapObject().getId(),
+          isRotated: placedMapObject.getIsRotated(),
+          positionX: placedMapObject.getPositionX(),
+          positionY: placedMapObject.getPositionY()
+        })),
+        mapEffects: this.getMapEffects().map((mapEffect) => ({
+          effect: mapEffect.getEffect(),
+          strength: mapEffect.getStrength()
+        }))
+      }
+    } catch (error) {
+      console.error(error)
+      return {}
+    }
+  }
+}

src/entities/mapEffect.ts

@@ -0,0 +1,6 @@
+import { Entity } from '@mikro-orm/core'
+
+import { BaseMapEffect } from '#entities/base/mapEffect'
+
+@Entity()
+export class MapEffect extends BaseMapEffect {}

src/entities/mapEventTile.ts

@@ -0,0 +1,6 @@
+import { Entity } from '@mikro-orm/core'
+
+import { BaseMapEventTile } from '#entities/base/mapEventTile'
+
+@Entity()
+export class MapEventTile extends BaseMapEventTile {}

src/entities/mapEventTileTeleport.ts

@@ -0,0 +1,6 @@
+import { Entity } from '@mikro-orm/core'
+
+import { BaseMapEventTileTeleport } from '#entities/base/mapEventTileTeleport'
+
+@Entity()
+export class MapEventTileTeleport extends BaseMapEventTileTeleport {}

src/entities/mapObject.ts

@@ -1,143 +1,15 @@
-import { randomUUID } from 'node:crypto'
+import { Entity } from '@mikro-orm/core'
 
-import { Collection, Entity, OneToMany, PrimaryKey, Property } from '@mikro-orm/core'
-
-import { ZoneObject } from './zoneObject'
-
-import { BaseEntity } from '#application/base/baseEntity'
-import { UUID } from '#application/types'
+import { BaseMapObject } from '#entities/base/mapObject'
 
 @Entity()
-export class MapObject extends BaseEntity {
-  @PrimaryKey()
-  id = randomUUID()
-
-  @Property()
-  name!: string
-
-  @Property({ type: 'json', nullable: true })
-  tags?: any
-
-  @Property()
-  originX = 0
-
-  @Property()
-  originY = 0
-
-  @Property()
-  isAnimated = false
-
-  @Property()
-  frameRate = 0
-
-  @Property()
-  frameWidth = 0
-
-  @Property()
-  frameHeight = 0
-
-  @Property()
-  createdAt = new Date()
-
-  @Property()
-  updatedAt = new Date()
-
-  setId(id: UUID) {
-    this.id = id
-    return this
-  }
-
-  getId() {
-    return this.id
-  }
-
-  setName(name: string) {
-    this.name = name
-    return this
-  }
-
-  getName() {
-    return this.name
-  }
-
-  setTags(tags: any) {
-    this.tags = tags
-    return this
-  }
-
-  getTags() {
-    return this.tags
-  }
-
-  setOriginX(originX: number) {
-    this.originX = originX
-    return this
-  }
-
-  getOriginX() {
-    return this.originX
-  }
-
-  setOriginY(originY: number) {
-    this.originY = originY
-    return this
-  }
-
-  getOriginY() {
-    return this.originY
-  }
-
-  setIsAnimated(isAnimated: boolean) {
-    this.isAnimated = isAnimated
-    return this
-  }
-
-  getIsAnimated() {
-    return this.isAnimated
-  }
-
-  setFrameRate(frameRate: number) {
-    this.frameRate = frameRate
-    return this
-  }
-
-  getFrameRate() {
-    return this.frameRate
-  }
-
-  setFrameWidth(frameWidth: number) {
-    this.frameWidth = frameWidth
-    return this
-  }
-
-  getFrameWidth() {
-    return this.frameWidth
-  }
-
-  setFrameHeight(frameHeight: number) {
-    this.frameHeight = frameHeight
-    return this
-  }
-
-  getFrameHeight() {
-    return this.frameHeight
-  }
-
-  setCreatedAt(createdAt: Date) {
-    this.createdAt = createdAt
-    return this
-  }
-
-  getCreatedAt() {
-    return this.createdAt
-  }
-
-  setUpdatedAt(updatedAt: Date) {
-    this.updatedAt = updatedAt
-    return this
-  }
-
-  getUpdatedAt() {
-    return this.updatedAt
+export class MapObject extends BaseMapObject {
+  public async cache() {
+    try {
+      return this
+    } catch (error) {
+      console.error(error)
+      return {}
+    }
   }
 }

src/entities/passwordResetToken.ts

@@ -1,59 +1,6 @@
-import { randomUUID } from 'node:crypto'
+import { Entity } from '@mikro-orm/core'
 
-import { Entity, ManyToOne, PrimaryKey, Property } from '@mikro-orm/core'
-
-import { User } from './user'
-
-import { BaseEntity } from '#application/base/baseEntity'
-import { UUID } from '#application/types'
+import { BasePasswordResetToken } from '#entities/base/passwordResetToken'
 
 @Entity()
-export class PasswordResetToken extends BaseEntity {
-  @PrimaryKey()
-  id = randomUUID()
-
-  @ManyToOne({ deleteRule: 'cascade' })
-  user!: User
-
-  @Property({ unique: true })
-  token!: string
-
-  @Property()
-  createdAt = new Date()
-
-  setId(id: UUID) {
-    this.id = id
-    return this
-  }
-
-  getId() {
-    return this.id
-  }
-
-  setUser(user: User) {
-    this.user = user
-    return this
-  }
-
-  getUser() {
-    return this.user
-  }
-
-  setToken(token: string) {
-    this.token = token
-    return this
-  }
-
-  getToken() {
-    return this.token
-  }
-
-  setCreatedAt(createdAt: Date) {
-    this.createdAt = createdAt
-    return this
-  }
-
-  getCreatedAt() {
-    return this.createdAt
-  }
-}
+export class PasswordResetToken extends BasePasswordResetToken {}

src/entities/placedMapObject.ts

@@ -0,0 +1,6 @@
+import { Entity } from '@mikro-orm/core'
+
+import { BasePlacedMapObject } from '#entities/base/placedMapObject'
+
+@Entity()
+export class PlacedMapObject extends BasePlacedMapObject {}

src/entities/sprite.ts

@@ -1,71 +1,32 @@
-import { randomUUID } from 'node:crypto'
+import { Entity } from '@mikro-orm/core'
 
-import { Collection, Entity, OneToMany, PrimaryKey, Property } from '@mikro-orm/core'
-
-import { SpriteAction } from './spriteAction'
-
-import { BaseEntity } from '#application/base/baseEntity'
-import { UUID } from '#application/types'
+import { BaseSprite } from '#entities/base/sprite'
 
 @Entity()
-export class Sprite extends BaseEntity {
-  @PrimaryKey()
-  id = randomUUID()
+export class Sprite extends BaseSprite {
+  public async cache() {
+    await this.getSpriteActions().load()
 
-  @Property()
-  name!: string
-
-  @OneToMany(() => SpriteAction, (action) => action.sprite)
-  spriteActions = new Collection<SpriteAction>(this)
-
-  @Property()
-  createdAt = new Date()
-
-  @Property()
-  updatedAt = new Date()
-
-  setId(id: UUID) {
-    this.id = id
-    return this
-  }
-
-  getId() {
-    return this.id
-  }
-
-  setName(name: string) {
-    this.name = name
-    return this
-  }
-
-  getName() {
-    return this.name
-  }
-
-  setSpriteActions(spriteActions: Collection<SpriteAction>) {
-    this.spriteActions = spriteActions
-    return this
-  }
-
-  getSpriteActions() {
-    return this.spriteActions
-  }
-
-  setCreatedAt(createdAt: Date) {
-    this.createdAt = createdAt
-    return this
-  }
-
-  getCreatedAt() {
-    return this.createdAt
-  }
-
-  setUpdatedAt(updatedAt: Date) {
-    this.updatedAt = updatedAt
-    return this
-  }
-
-  getUpdatedAt() {
-    return this.updatedAt
+    try {
+      return {
+        id: this.getId(),
+        name: this.getName(),
+        createdAt: this.getCreatedAt(),
+        updatedAt: this.getUpdatedAt(),
+        spriteActions: this.getSpriteActions().map((spriteAction) => ({
+          id: spriteAction.getId(),
+          action: spriteAction.getAction(),
+          originX: spriteAction.getOriginX(),
+          originY: spriteAction.getOriginY(),
+          frameWidth: spriteAction.getFrameWidth(),
+          frameHeight: spriteAction.getFrameHeight(),
+          frameRate: spriteAction.getFrameRate(),
+          frameCount: spriteAction.getSprites()?.length
+        }))
+      }
+    } catch (error) {
+      console.error(error)
+      return {}
+    }
   }
 }

src/entities/spriteAction.ts

@@ -1,143 +1,6 @@
-import { randomUUID } from 'node:crypto'
+import { Entity } from '@mikro-orm/core'
 
-import { Entity, ManyToOne, PrimaryKey, Property } from '@mikro-orm/core'
-
-import { Sprite } from './sprite'
-
-import { BaseEntity } from '#application/base/baseEntity'
-import { UUID } from '#application/types'
+import { BaseSpriteAction } from '#entities/base/spriteAction'
 
 @Entity()
-export class SpriteAction extends BaseEntity {
-  @PrimaryKey()
-  id = randomUUID()
-
-  @ManyToOne({ deleteRule: 'cascade' })
-  sprite!: Sprite
-
-  @Property()
-  action!: string
-
-  @Property({ type: 'json', nullable: true })
-  sprites?: string[]
-
-  @Property()
-  originX = 0
-
-  @Property()
-  originY = 0
-
-  @Property()
-  isAnimated = false
-
-  @Property()
-  isLooping = false
-
-  @Property()
-  frameWidth = 0
-
-  @Property()
-  frameHeight = 0
-
-  @Property()
-  frameRate = 0
-
-  setId(id: UUID) {
-    this.id = id
-    return this
-  }
-
-  getId() {
-    return this.id
-  }
-
-  setSprite(sprite: Sprite) {
-    this.sprite = sprite
-    return this
-  }
-
-  getSprite() {
-    return this.sprite
-  }
-
-  setAction(action: string) {
-    this.action = action
-    return this
-  }
-
-  getAction() {
-    return this.action
-  }
-
-  setSprites(sprites: string[]) {
-    this.sprites = sprites
-    return this
-  }
-
-  getSprites() {
-    return this.sprites
-  }
-
-  setOriginX(originX: number) {
-    this.originX = originX
-    return this
-  }
-
-  getOriginX() {
-    return this.originX
-  }
-
-  setOriginY(originY: number) {
-    this.originY = originY
-    return this
-  }
-
-  getOriginY() {
-    return this.originY
-  }
-
-  setIsAnimated(isAnimated: boolean) {
-    this.isAnimated = isAnimated
-    return this
-  }
-
-  getIsAnimated() {
-    return this.isAnimated
-  }
-
-  setIsLooping(isLooping: boolean) {
-    this.isLooping = isLooping
-    return this
-  }
-
-  getIsLooping() {
-    return this.isLooping
-  }
-
-  setFrameWidth(frameWidth: number) {
-    this.frameWidth = frameWidth
-    return this
-  }
-
-  getFrameWidth() {
-    return this.frameWidth
-  }
-
-  setFrameHeight(frameHeight: number) {
-    this.frameHeight = frameHeight
-    return this
-  }
-
-  getFrameHeight() {
-    return this.frameHeight
-  }
-
-  setFrameRate(frameRate: number) {
-    this.frameRate = frameRate
-    return this
-  }
-
-  getFrameRate() {
-    return this.frameRate
-  }
-}
+export class SpriteAction extends BaseSpriteAction {}

src/entities/tile.ts

@@ -1,69 +1,15 @@
-import { randomUUID } from 'node:crypto'
+import { Entity } from '@mikro-orm/core'
 
-import { Entity, PrimaryKey, Property } from '@mikro-orm/core'
-
-import { BaseEntity } from '#application/base/baseEntity'
-import { UUID } from '#application/types'
+import { BaseTile } from '#entities/base/tile'
 
 @Entity()
-export class Tile extends BaseEntity {
-  @PrimaryKey()
-  id = randomUUID()
-
-  @Property()
-  name!: string
-
-  @Property({ type: 'json', nullable: true })
-  tags?: any
-
-  @Property()
-  createdAt = new Date()
-
-  @Property()
-  updatedAt = new Date()
-
-  setId(id: UUID) {
-    this.id = id
-    return this
-  }
-
-  getId() {
-    return this.id
-  }
-
-  setName(name: string) {
-    this.name = name
-    return this
-  }
-
-  getName() {
-    return this.name
-  }
-
-  setTags(tags: any) {
-    this.tags = tags
-    return this
-  }
-
-  getTags() {
-    return this.tags
-  }
-
-  setCreatedAt(createdAt: Date) {
-    this.createdAt = createdAt
-    return this
-  }
-
-  getCreatedAt() {
-    return this.createdAt
-  }
-
-  setUpdatedAt(updatedAt: Date) {
-    this.updatedAt = updatedAt
-    return this
-  }
-
-  getUpdatedAt() {
-    return this.updatedAt
+export class Tile extends BaseTile {
+  public async cache() {
+    try {
+      return this
+    } catch (error) {
+      console.error(error)
+      return {}
+    }
   }
 }

src/entities/user.ts

@@ -1,98 +1,6 @@
-import { randomUUID } from 'node:crypto'
+import { Entity } from '@mikro-orm/core'
 
-import { Collection, Entity, OneToMany, PrimaryKey, Property } from '@mikro-orm/core'
-import bcrypt from 'bcryptjs'
-
-import { Character } from './character'
-import { PasswordResetToken } from './passwordResetToken'
-
-import { BaseEntity } from '#application/base/baseEntity'
-import { UUID } from '#application/types'
+import { BaseUser } from '#entities/base/user'
 
 @Entity()
-export class User extends BaseEntity {
-  @PrimaryKey()
-  id = randomUUID()
-
-  @Property({ unique: true })
-  username!: string
-
-  @Property({ unique: true })
-  email!: string
-
-  @Property()
-  password!: string
-
-  @Property()
-  online = false
-
-  @OneToMany(() => Character, (character) => character.user)
-  characters = new Collection<Character>(this)
-
-  @OneToMany(() => PasswordResetToken, (token) => token.user)
-  passwordResetTokens = new Collection<PasswordResetToken>(this)
-
-  setId(id: UUID) {
-    this.id = id
-    return this
-  }
-
-  getId() {
-    return this.id
-  }
-
-  setUsername(username: string) {
-    this.username = username
-    return this
-  }
-
-  getUsername() {
-    return this.username
-  }
-
-  setEmail(email: string) {
-    this.email = email
-    return this
-  }
-
-  getEmail() {
-    return this.email
-  }
-
-  setPassword(password: string) {
-    this.password = bcrypt.hashSync(password, 10)
-    return this
-  }
-
-  getPassword() {
-    return this.password
-  }
-
-  setOnline(online: boolean) {
-    this.online = online
-    return this
-  }
-
-  getOnline() {
-    return this.online
-  }
-
-  setCharacters(characters: Collection<Character>) {
-    this.characters = characters
-    return this
-  }
-
-  getCharacters() {
-    return this.characters
-  }
-
-  setPasswordResetTokens(passwordResetTokens: Collection<PasswordResetToken>) {
-    this.passwordResetTokens = passwordResetTokens
-    return this
-  }
-
-  getPasswordResetTokens() {
-    return this.passwordResetTokens
-    return this
-  }
-}
+export class User extends BaseUser {}

src/entities/world.ts

@@ -1,66 +1,6 @@
-import { Entity, PrimaryKey, Property } from '@mikro-orm/core'
+import { Entity } from '@mikro-orm/core'
 
-import { BaseEntity } from '#application/base/baseEntity'
+import { BaseWorld } from '#entities/base/world'
 
 @Entity()
-export class World extends BaseEntity {
-  @PrimaryKey()
-  date = new Date()
-
-  @Property()
-  isRainEnabled = false
-
-  @Property()
-  rainPercentage = 0
-
-  @Property()
-  isFogEnabled = false
-
-  @Property()
-  fogDensity = 0
-
-  setDate(date: Date) {
-    this.date = date
-    return this
-  }
-
-  getDate() {
-    return this.date
-  }
-
-  setIsRainEnabled(isRainEnabled: boolean) {
-    this.isRainEnabled = isRainEnabled
-    return this
-  }
-
-  getIsRainEnabled() {
-    return this.isRainEnabled
-  }
-
-  setRainPercentage(rainPercentage: number) {
-    this.rainPercentage = rainPercentage
-    return this
-  }
-
-  getRainPercentage() {
-    return this.rainPercentage
-  }
-
-  setIsFogEnabled(isFogEnabled: boolean) {
-    this.isFogEnabled = isFogEnabled
-    return this
-  }
-
-  getIsFogEnabled() {
-    return this.isFogEnabled
-  }
-
-  setFogDensity(fogDensity: number) {
-    this.fogDensity = fogDensity
-    return this
-  }
-
-  getFogDensity() {
-    return this.fogDensity
-  }
-}
+export class World extends BaseWorld {}

src/entities/zone.ts

@@ -1,184 +0,0 @@
-import { randomUUID } from 'node:crypto'
-
-import { Collection, Entity, OneToMany, PrimaryKey, Property } from '@mikro-orm/core'
-
-import { Character } from './character'
-import { Chat } from './chat'
-import { ZoneEffect } from './zoneEffect'
-import { ZoneEventTile } from './zoneEventTile'
-import { ZoneEventTileTeleport } from './zoneEventTileTeleport'
-import { ZoneObject } from './zoneObject'
-
-import { BaseEntity } from '#application/base/baseEntity'
-import { UUID } from '#application/types'
-
-@Entity()
-export class Zone extends BaseEntity {
-  @PrimaryKey()
-  id = randomUUID()
-
-  @Property()
-  name!: string
-
-  @Property()
-  width = 10
-
-  @Property()
-  height = 10
-
-  @Property({ type: 'json', nullable: true })
-  tiles?: any
-
-  @Property()
-  pvp = false
-
-  @Property()
-  createdAt = new Date()
-
-  @Property()
-  updatedAt = new Date()
-
-  @OneToMany(() => ZoneEffect, (effect) => effect.zone)
-  zoneEffects = new Collection<ZoneEffect>(this)
-
-  @OneToMany(() => ZoneEventTile, (tile) => tile.zone)
-  zoneEventTiles = new Collection<ZoneEventTile>(this)
-
-  @OneToMany(() => ZoneEventTileTeleport, (teleport) => teleport.toZone)
-  zoneEventTileTeleports = new Collection<ZoneEventTileTeleport>(this)
-
-  @OneToMany(() => ZoneObject, (object) => object.zone)
-  zoneObjects = new Collection<ZoneObject>(this)
-
-  @OneToMany(() => Character, (character) => character.zone)
-  characters = new Collection<Character>(this)
-
-  @OneToMany(() => Chat, (chat) => chat.zone)
-  chats = new Collection<Chat>(this)
-
-  setId(id: UUID) {
-    this.id = id
-    return this
-  }
-
-  getId() {
-    return this.id
-  }
-
-  setName(name: string) {
-    this.name = name
-    return this
-  }
-
-  getName() {
-    return this.name
-  }
-
-  setWidth(width: number) {
-    this.width = width
-    return this
-  }
-
-  getWidth() {
-    return this.width
-  }
-
-  setHeight(height: number) {
-    this.height = height
-    return this
-  }
-
-  getHeight() {
-    return this.height
-  }
-
-  setTiles(tiles: any) {
-    this.tiles = tiles
-    return this
-  }
-
-  getTiles() {
-    return this.tiles
-  }
-
-  setPvp(pvp: boolean) {
-    this.pvp = pvp
-    return this
-  }
-
-  getPvp() {
-    return this.pvp
-  }
-
-  setCreatedAt(createdAt: Date) {
-    this.createdAt = createdAt
-    return this
-  }
-
-  getCreatedAt() {
-    return this.createdAt
-  }
-
-  setUpdatedAt(updatedAt: Date) {
-    this.updatedAt = updatedAt
-    return this
-  }
-
-  getUpdatedAt() {
-    return this.updatedAt
-  }
-
-  setZoneEffects(zoneEffects: Collection<ZoneEffect>) {
-    this.zoneEffects = zoneEffects
-    return this
-  }
-
-  getZoneEffects() {
-    return this.zoneEffects
-  }
-
-  setZoneEventTiles(zoneEventTiles: Collection<ZoneEventTile>) {
-    this.zoneEventTiles = zoneEventTiles
-    return this
-  }
-
-  getZoneEventTiles() {
-    return this.zoneEventTiles
-  }
-
-  setZoneEventTileTeleports(zoneEventTileTeleports: Collection<ZoneEventTileTeleport>) {
-    this.zoneEventTileTeleports = zoneEventTileTeleports
-    return this
-  }
-
-  getZoneEventTileTeleports() {
-    return this.zoneEventTileTeleports
-  }
-
-  setZoneObjects(zoneObjects: Collection<ZoneObject>) {
-    this.zoneObjects = zoneObjects
-    return this
-  }
-
-  getZoneObjects() {
-    return this.zoneObjects
-  }
-
-  setCharacters(characters: Collection<Character>) {
-    this.characters = characters
-    return this
-  }
-
-  getCharacters() {
-    return this.characters
-  }
-
-  setChats(chats: Collection<Chat>) {
-    this.chats = chats
-    return this
-  }
-
-  getChats() {
-    return this.chats
-  }
-}

src/events/character/charactersScreen/characterHairList.ts

@@ -1,18 +0,0 @@
-import { BaseEvent } from '#application/base/baseEvent'
-import Database from '#application/database'
-import { CharacterHair } from '#entities/characterHair'
-import characterHairRepository from '#repositories/characterHairRepository'
-
-interface IPayload {}
-
-export default class characterHairListEvent extends BaseEvent {
-  public listen(): void {
-    this.socket.on('character:hair:list', this.handleEvent.bind(this))
-  }
-
-  private async handleEvent(data: IPayload, callback: (response: CharacterHair[]) => void): Promise<void> {
-    const items: CharacterHair[] = await characterHairRepository.getAllSelectable()
-    await Database.getEntityManager().populate(items, ['sprite'])
-    callback(items)
-  }
-}

src/events/character/connect.ts

@@ -1,6 +1,6 @@
 import { BaseEvent } from '#application/base/baseEvent'
 import { UUID } from '#application/types'
-import ZoneManager from '#managers/zoneManager'
+import MapManager from '#managers/mapManager'
 import CharacterHairRepository from '#repositories/characterHairRepository'
 import CharacterRepository from '#repositories/characterRepository'
 import TeleportService from '#services/teleportService'
@@ -11,34 +11,21 @@ interface CharacterConnectPayload {
 }
 
 export default class CharacterConnectEvent extends BaseEvent {
+  private readonly characterHairRepository = new CharacterHairRepository()
+  private readonly characterRepository = new CharacterRepository()
+
   public listen(): void {
     this.socket.on('character:connect', this.handleEvent.bind(this))
   }
 
-  /**
-   * Handle character connect event
-   * @TODO:
-   * 1. Check if character is already connected
-   * 2. Update character hair if provided
-   * 3. Emit character connect event
-   * 4. Let other clients know of new character
-   * @param data
-   * @param callback
-   * @private
-   */
   private async handleEvent(data: CharacterConnectPayload, callback: (response: any) => void): Promise<void> {
-    if (!this.socket.userId) {
-      this.emitError('User not authenticated')
-      return
-    }
-
     try {
       if (await this.checkForActiveCharacters()) {
         this.emitError('You are already connected to another character')
         return
       }
 
-      const character = await CharacterRepository.getByUserAndId(this.socket.userId, data.characterId)
+      const character = await this.characterRepository.getByUserAndId(this.socket.userId!, data.characterId)
 
       if (!character) {
         this.emitError('Character not found or does not belong to this user')
@@ -50,18 +37,18 @@ export default class CharacterConnectEvent extends BaseEvent {
 
       // Set character hair
       if (data.characterHairId !== undefined && data.characterHairId !== null) {
-        const characterHair = await CharacterHairRepository.getById(data.characterHairId)
-        await character.setCharacterHair(characterHair).update()
+        const characterHair = await this.characterHairRepository.getById(data.characterHairId)
+        await character.setCharacterHair(characterHair).save()
       }
 
       // Emit character connect event
       callback({ character })
 
-      // wait 300 ms, @TODO: Find a better way to do this
-      await new Promise((resolve) => setTimeout(resolve, 100))
+      // wait 300 ms, @TODO: Find a better way to do this, race condition
+      await new Promise((resolve) => setTimeout(resolve, 500))
 
       await TeleportService.teleportCharacter(character.id, {
-        targetZoneId: character.zone.id,
+        targetMapId: character.map.id,
         targetX: character.positionX,
         targetY: character.positionY,
         rotation: character.rotation,
@@ -74,7 +61,7 @@ export default class CharacterConnectEvent extends BaseEvent {
   }
 
   private async checkForActiveCharacters(): Promise<boolean> {
-    const characters = await CharacterRepository.getByUserId(this.socket.userId!)
-    return characters?.some((char) => ZoneManager.getCharacterById(char.id)) ?? false
+    const characters = await this.characterRepository.getByUserId(this.socket.userId!)
+    return characters?.some((char) => MapManager.getCharacterById(char.id)) ?? false
   }
 }

src/events/character/create.ts

@@ -4,8 +4,8 @@ import { BaseEvent } from '#application/base/baseEvent'
 import { ZCharacterCreate } from '#application/zodTypes'
 import { Character } from '#entities/character'
 import CharacterRepository from '#repositories/characterRepository'
+import MapRepository from '#repositories/mapRepository'
 import UserRepository from '#repositories/userRepository'
-import ZoneRepository from '#repositories/zoneRepository'
 
 export default class CharacterCreateEvent extends BaseEvent {
   public listen(): void {
@@ -17,30 +17,34 @@ export default class CharacterCreateEvent extends BaseEvent {
     try {
       data = ZCharacterCreate.parse(data)
 
-      const user = await UserRepository.getById(this.socket.userId!)
+      const userRepository = new UserRepository()
+      const characterRepository = new CharacterRepository()
+      const mapRepository = new MapRepository()
+
+      const user = await userRepository.getById(this.socket.userId!)
 
       if (!user) {
         return this.socket.emit('notification', { message: 'User not found' })
       }
 
       // Check if character name already exists
-      const characterExists = await CharacterRepository.getByName(data.name)
+      const characterExists = await characterRepository.getByName(data.name)
 
       if (characterExists) {
         return this.socket.emit('notification', { message: 'Character name already exists' })
       }
 
-      let characters: Character[] = await CharacterRepository.getByUserId(user.getId())
+      let characters: Character[] = await characterRepository.getByUserId(user.getId())
 
       if (characters.length >= 4) {
         return this.socket.emit('notification', { message: 'You can only have 4 characters' })
       }
 
       // @TODO: Change to default location
-      const zone = await ZoneRepository.getFirst()
+      const map = await mapRepository.getFirst()
 
       const newCharacter = new Character()
-      await newCharacter.setName(data.name).setUser(user).setZone(zone!).save()
+      await newCharacter.setName(data.name).setUser(user).setMap(map!).save()
 
       if (!newCharacter) {
         return this.socket.emit('notification', { message: 'Failed to create character. Please try again (later).' })

src/events/character/delete.ts

@@ -1,7 +1,6 @@
 import { BaseEvent } from '#application/base/baseEvent'
 import { UUID } from '#application/types'
 import { Character } from '#entities/character'
-import { Zone } from '#entities/zone'
 import CharacterRepository from '#repositories/characterRepository'
 
 type TypePayload = {
@@ -9,7 +8,6 @@ type TypePayload = {
 }
 
 type TypeResponse = {
-  zone: Zone
   characters: Character[]
 }
 
@@ -20,12 +18,9 @@ export default class CharacterDeleteEvent extends BaseEvent {
 
   private async handleEvent(data: TypePayload, callback: (response: TypeResponse) => void): Promise<any> {
     try {
-      const character = await CharacterRepository.getByUserAndId(this.socket.userId!, data.characterId)
-      if (character) {
-        await character.delete()
-      }
-
-      const characters: Character[] = await CharacterRepository.getByUserId(this.socket.userId!)
+      const characterRepository = new CharacterRepository()
+      await (await characterRepository.getByUserAndId(this.socket.userId!, data.characterId))?.delete()
+      const characters: Character[] = await characterRepository.getByUserId(this.socket.userId!)
 
       this.socket.emit('character:list', characters)
     } catch (error: any) {

src/events/character/list.ts

@@ -1,5 +1,4 @@
 import { BaseEvent } from '#application/base/baseEvent'
-import Database from '#application/database'
 import { Character } from '#entities/character'
 import CharacterRepository from '#repositories/characterRepository'
 
@@ -10,8 +9,8 @@ export default class CharacterListEvent extends BaseEvent {
 
   private async handleEvent(data: any): Promise<void> {
     try {
-      const characters: Character[] = await CharacterRepository.getByUserId(this.socket.userId!)
-      await Database.getEntityManager().populate(characters, ['characterType', 'characterHair'])
+      const characterRepository = new CharacterRepository()
+      let characters: Character[] = await characterRepository.getByUserId(this.socket.userId!)
 
       this.socket.emit('character:list', characters)
     } catch (error: any) {

src/events/chat/gameMaster/alertCommand.ts

@@ -13,22 +13,11 @@ export default class AlertCommandEvent extends BaseEvent {
 
   private async handleEvent(data: TypePayload, callback: (response: boolean) => void): Promise<void> {
     try {
-      if (!ChatService.isCommand(data.message, 'alert')) {
-        return
-      }
+      // Check if command is alert
+      if (!ChatService.isCommand(data.message, 'alert')) return
 
       // Check if character exists
-      const character = await CharacterRepository.getByUserAndId(this.socket.userId!, this.socket.characterId!)
-      if (!character) {
-        this.logger.error('chat:alert_command error', 'Character not found')
-        return callback(false)
-      }
-
-      // Check if the user is the GM
-      if (character.role !== 'gm') {
-        this.logger.info(`User ${character.id} tried to set time but is not a game master.`)
-        return callback(false)
-      }
+      if (!(await this.isCharacterGM())) return
 
       const args = ChatService.getArgs('alert', data.message)
 

src/events/chat/gameMaster/setTimeCommand.ts

@@ -14,22 +14,11 @@ export default class SetTimeCommand extends BaseEvent {
 
   private async handleEvent(data: TypePayload, callback: (response: boolean) => void): Promise<void> {
     try {
-      if (!ChatService.isCommand(data.message, 'time')) {
-        return
-      }
+      // Check if command is time
+      if (!ChatService.isCommand(data.message, 'time')) return
 
-      // Check if character exists
-      const character = await CharacterRepository.getByUserAndId(this.socket.userId!, this.socket.characterId!)
-      if (!character) {
-        this.logger.error('chat:alert_command error', 'Character not found')
-        return
-      }
-
-      // Check if the user is the GM
-      if (character.role !== 'gm') {
-        this.logger.info(`User ${character.id} tried to set time but is not a game master.`)
-        return
-      }
+      // Check if character exists and is GM
+      if (!(await this.isCharacterGM())) return
 
       // Get arguments
       const args = ChatService.getArgs('time', data.message)

src/events/chat/gameMaster/teleportCommand.ts

@@ -1,7 +1,7 @@
 import { BaseEvent } from '#application/base/baseEvent'
 import { UUID } from '#application/types'
-import ZoneManager from '#managers/zoneManager'
-import ZoneRepository from '#repositories/zoneRepository'
+import MapManager from '#managers/mapManager'
+import MapRepository from '#repositories/mapRepository'
 import ChatService from '#services/chatService'
 import TeleportService from '#services/teleportService'
 
@@ -16,36 +16,30 @@ export default class TeleportCommandEvent extends BaseEvent {
 
   private async handleEvent(data: TypePayload, callback: (response: boolean) => void) {
     try {
-      const zoneCharacter = ZoneManager.getCharacterById(this.socket.characterId!)
-      if (!zoneCharacter) {
-        this.logger.error('chat:message error', 'Character not found')
-        return
-      }
-
-      const character = zoneCharacter.character
-
-      if (character.role !== 'gm') {
-        this.logger.info(`User ${character.id} tried to set time but is not a game master.`)
-        return
-      }
-
+      // Check if command is teleport
       if (!ChatService.isCommand(data.message, 'teleport')) return
 
+      // Check if character exists and is GM
+      if (!(await this.isCharacterGM())) return
+
+      const character = await this.getCharacter()
+      if (!character) return
+
       const args = ChatService.getArgs('teleport', data.message)
 
       if (!args || args.length === 0 || args.length > 3) {
         this.socket.emit('notification', {
           title: 'Server message',
-          message: 'Usage: /teleport <zoneId> [x] [y]'
+          message: 'Usage: /teleport <mapId> [x] [y]'
         })
         return
       }
 
-      const zoneId = args[0] as UUID
+      const mapId = args[0] as UUID
       const targetX = args[1] ? parseInt(args[1], 10) : 0
       const targetY = args[2] ? parseInt(args[2], 10) : 0
 
-      if (!zoneId || isNaN(targetX) || isNaN(targetY)) {
+      if (!mapId || isNaN(targetX) || isNaN(targetY)) {
         this.socket.emit('notification', {
           title: 'Server message',
           message: 'Invalid parameters. X and Y coordinates must be numbers.'
@@ -53,16 +47,17 @@ export default class TeleportCommandEvent extends BaseEvent {
         return
       }
 
-      const zone = await ZoneRepository.getById(zoneId)
-      if (!zone) {
+      const mapRepository = new MapRepository()
+      const map = await mapRepository.getById(mapId)
+      if (!map) {
         this.socket.emit('notification', {
           title: 'Server message',
-          message: 'Zone not found'
+          message: 'Map not found'
         })
         return
       }
 
-      if (character.zone.id === zone.id && targetX === character.positionX && targetY === character.positionY) {
+      if (character.map.id === map.id && targetX === character.positionX && targetY === character.positionY) {
         this.socket.emit('notification', {
           title: 'Server message',
           message: 'You are already at that location'
@@ -71,7 +66,7 @@ export default class TeleportCommandEvent extends BaseEvent {
       }
 
       const success = await TeleportService.teleportCharacter(character.id, {
-        targetZoneId: zone.id,
+        targetMapId: map.id,
         targetX,
         targetY,
         rotation: character.rotation
@@ -86,9 +81,9 @@ export default class TeleportCommandEvent extends BaseEvent {
 
       this.socket.emit('notification', {
         title: 'Server message',
-        message: `Teleported to ${zone.name} (${targetX}, ${targetY})`
+        message: `Teleported to ${map.name} (${targetX}, ${targetY})`
       })
-      this.logger.info('teleport', `Character ${character.id} teleported to zone ${zone.id} at position (${targetX}, ${targetY})`)
+      this.logger.info('teleport', `Character ${character.id} teleported to map ${map.id} at position (${targetX}, ${targetY})`)
     } catch (error: any) {
       this.logger.error(`Error in teleport command: ${error.message}`)
       this.socket.emit('notification', {

src/events/chat/gameMaster/toggleFogCommand.ts

@@ -1,6 +1,5 @@
 import { BaseEvent } from '#application/base/baseEvent'
 import WeatherManager from '#managers/weatherManager'
-import CharacterRepository from '#repositories/characterRepository'
 import ChatService from '#services/chatService'
 
 type TypePayload = {
@@ -14,24 +13,16 @@ export default class ToggleFogCommand extends BaseEvent {
 
   private async handleEvent(data: TypePayload, callback: (response: boolean) => void): Promise<void> {
     try {
-      if (!ChatService.isCommand(data.message, 'fog')) {
-        return
-      }
+      // Check if command is fog
+      if (!ChatService.isCommand(data.message, 'fog')) return
 
-      // Check if character exists
-      const character = await CharacterRepository.getByUserAndId(this.socket.userId!, this.socket.characterId!)
-      if (!character) {
-        this.logger.error('chat:alert_command error', 'Character not found')
-        return
-      }
+      // Check if character exists and is GM
+      if (!(await this.isCharacterGM())) return
 
-      // Check if the user is the GM
-      if (character.role !== 'gm') {
-        this.logger.info(`User ${character.id} tried to set time but is not a game master.`)
-        return
-      }
+      const args = ChatService.getArgs('fog', data.message)
 
-      await WeatherManager.toggleFog()
+      await WeatherManager.setFogValue(args![0] ? Number(args![0]) : null)
+      callback(true)
     } catch (error: any) {
       this.logger.error('command error', error.message)
       callback(false)

src/events/chat/gameMaster/toggleRainCommand.ts

@@ -1,6 +1,5 @@
 import { BaseEvent } from '#application/base/baseEvent'
 import WeatherManager from '#managers/weatherManager'
-import CharacterRepository from '#repositories/characterRepository'
 import ChatService from '#services/chatService'
 
 type TypePayload = {
@@ -14,24 +13,16 @@ export default class ToggleRainCommand extends BaseEvent {
 
   private async handleEvent(data: TypePayload, callback: (response: boolean) => void): Promise<void> {
     try {
-      if (!ChatService.isCommand(data.message, 'rain')) {
-        return
-      }
+      // Check if command is rain
+      if (!ChatService.isCommand(data.message, 'rain')) return
 
-      // Check if character exists
-      const character = await CharacterRepository.getByUserAndId(this.socket.userId!, this.socket.characterId!)
-      if (!character) {
-        this.logger.error('chat:alert_command error', 'Character not found')
-        return
-      }
+      // Check if character exists and is GM
+      if (!(await this.isCharacterGM())) return
 
-      // Check if the user is the GM
-      if (character.role !== 'gm') {
-        this.logger.info(`User ${character.id} tried to set time but is not a game master.`)
-        return
-      }
+      let args = ChatService.getArgs('rain', data.message)
 
-      await WeatherManager.toggleRain()
+      await WeatherManager.setRainValue(args![0] ? Number(args![0]) : null)
+      callback(true)
     } catch (error: any) {
       this.logger.error('command error', error.message)
       callback(false)

src/events/chat/message.ts

@@ -1,6 +1,6 @@
 import { BaseEvent } from '#application/base/baseEvent'
-import ZoneManager from '#managers/zoneManager'
-import ZoneRepository from '#repositories/zoneRepository'
+import MapManager from '#managers/mapManager'
+import MapRepository from '#repositories/mapRepository'
 import ChatService from '#services/chatService'
 
 type TypePayload = {
@@ -18,21 +18,22 @@ export default class ChatMessageEvent extends BaseEvent {
         return callback(false)
       }
 
-      const zoneCharacter = ZoneManager.getCharacterById(this.socket.characterId!)
-      if (!zoneCharacter) {
+      const mapCharacter = MapManager.getCharacterById(this.socket.characterId!)
+      if (!mapCharacter) {
         this.logger.error('chat:message error', 'Character not found')
         return callback(false)
       }
 
-      const character = zoneCharacter.character
+      const character = mapCharacter.character
 
-      const zone = await ZoneRepository.getById(character.zone.id)
-      if (!zone) {
-        this.logger.error('chat:message error', 'Zone not found')
+      const mapRepository = new MapRepository()
+      const map = await mapRepository.getById(character.map.id)
+      if (!map) {
+        this.logger.error('chat:message error', 'Map not found')
         return callback(false)
       }
 
-      if (await ChatService.sendZoneMessage(character.getId(), zone.getId(), data.message)) {
+      if (await ChatService.sendMapMessage(character.getId(), map.getId(), data.message)) {
         return callback(true)
       }
 

src/events/disconnect.ts

@@ -1,5 +1,5 @@
 import { BaseEvent } from '#application/base/baseEvent'
-import ZoneManager from '#managers/zoneManager'
+import MapManager from '#managers/mapManager'
 
 export default class DisconnectEvent extends BaseEvent {
   public listen(): void {
@@ -15,13 +15,13 @@ export default class DisconnectEvent extends BaseEvent {
 
       this.io.emit('user:disconnect', this.socket.userId)
 
-      const zoneCharacter = ZoneManager.getCharacterById(this.socket.characterId!)
-      if (!zoneCharacter) {
+      const mapCharacter = MapManager.getCharacterById(this.socket.characterId!)
+      if (!mapCharacter) {
         this.logger.info('User disconnected but had no character set')
         return
       }
 
-      await zoneCharacter.disconnect(this.socket, this.io)
+      await mapCharacter.disconnect(this.socket, this.io)
       this.logger.info('User disconnected along with their character')
     } catch (error: any) {
       this.logger.error('disconnect error: ' + error.message)

src/events/gameMaster/assetManager/characterHair/create.ts

@@ -1,28 +1,22 @@
 import { BaseEvent } from '#application/base/baseEvent'
 import { CharacterHair } from '#entities/characterHair'
-import characterRepository from '#repositories/characterRepository'
 
 export default class CharacterHairCreateEvent extends BaseEvent {
   public listen(): void {
     this.socket.on('gm:characterHair:create', this.handleEvent.bind(this))
   }
 
-  private async handleEvent(data: undefined, callback: (response: boolean, characterType?: any) => void): Promise<void> {
+  private async handleEvent(data: undefined, callback: (response: boolean) => void): Promise<void> {
     try {
-      const character = await characterRepository.getById(this.socket.characterId!)
-      if (!character) return callback(false)
-
-      if (character.role !== 'gm') {
-        return callback(false)
-      }
+      if (!(await this.isCharacterGM())) return
 
       const newCharacterHair = new CharacterHair()
       await newCharacterHair.setName('New hair').save()
 
-      callback(true, newCharacterHair)
+      return callback(true)
     } catch (error) {
       console.error('Error creating character hair:', error)
-      callback(false)
+      return callback(false)
     }
   }
 }

src/events/gameMaster/assetManager/characterHair/delete.ts

@@ -1,9 +1,9 @@
 import { BaseEvent } from '#application/base/baseEvent'
+import { UUID } from '#application/types'
 import CharacterHairRepository from '#repositories/characterHairRepository'
-import characterRepository from '#repositories/characterRepository'
 
 interface IPayload {
-  id: number
+  id: UUID
 }
 
 export default class characterHairDeleteEvent extends BaseEvent {
@@ -12,20 +12,13 @@ export default class characterHairDeleteEvent extends BaseEvent {
   }
 
   private async handleEvent(data: IPayload, callback: (response: boolean) => void): Promise<void> {
-    const character = await characterRepository.getById(this.socket.characterId as number)
-    if (!character) return callback(false)
-
-    if (character.role !== 'gm') {
-      return callback(false)
-    }
-
     try {
-      const characterHair = await CharacterHairRepository.getById(data.id)
-      if (characterHair) {
-        await characterHair.delete()
-      }
+      if (!(await this.isCharacterGM())) return
 
-      callback(true)
+      const characterHair = await CharacterHairRepository.getById(data.id)
+      await (await CharacterHairRepository.getById(data.id))?.delete()
+
+      return callback(true)
     } catch (error) {
       this.logger.error(`Error deleting character type ${data.id}: ${error instanceof Error ? error.message : String(error)}`)
       callback(false)

src/events/gameMaster/assetManager/characterHair/list.ts

@@ -1,7 +1,6 @@
 import { BaseEvent } from '#application/base/baseEvent'
 import { CharacterHair } from '#entities/characterHair'
-import characterHairRepository from '#repositories/characterHairRepository'
-import characterRepository from '#repositories/characterRepository'
+import CharacterHairRepository from '#repositories/characterHairRepository'
 
 interface IPayload {}
 
@@ -11,19 +10,17 @@ export default class characterHairListEvent extends BaseEvent {
   }
 
   private async handleEvent(data: IPayload, callback: (response: CharacterHair[]) => void): Promise<void> {
-    const character = await characterRepository.getById(this.socket.characterId as number)
-    if (!character) {
-      this.logger.error('gm:characterHair:list error', 'Character not found')
+    try {
+      if (!(await this.isCharacterGM())) return
+
+      const characterHairRepository = new CharacterHairRepository()
+      const items = await characterHairRepository.getAll()
+      await characterHairRepository.getEntityManager().populate(items, ['sprite'])
+
+      return callback(items)
+    } catch (error) {
+      this.logger.error('gm:characterHair:list error', error)
       return callback([])
     }
-
-    if (character.role !== 'gm') {
-      this.logger.info(`User ${character.id} tried to list character hair but is not a game master.`)
-      return callback([])
-    }
-
-    // get all objects
-    const items = await characterHairRepository.getAll()
-    callback(items)
   }
 }

src/events/gameMaster/assetManager/characterHair/update.ts

@@ -2,11 +2,10 @@ import { BaseEvent } from '#application/base/baseEvent'
 import { CharacterGender } from '#application/enums'
 import { UUID } from '#application/types'
 import CharacterHairRepository from '#repositories/characterHairRepository'
-import characterRepository from '#repositories/characterRepository'
 import SpriteRepository from '#repositories/spriteRepository'
 
 type Payload = {
-  id: number
+  id: UUID
   name: string
   gender: CharacterGender
   isSelectable: boolean
@@ -19,20 +18,18 @@ export default class CharacterHairUpdateEvent extends BaseEvent {
   }
 
   private async handleEvent(data: Payload, callback: (success: boolean) => void): Promise<void> {
-    const character = await characterRepository.getById(this.socket.characterId as number)
-    if (!character) return callback(false)
-
-    if (character.role !== 'gm') {
-      return callback(false)
-    }
-
     try {
-      const sprite = await SpriteRepository.getById(data.spriteId)
-      const characterHair = await CharacterHairRepository.getById(data.id)
+      if (!(await this.isCharacterGM())) return
 
-      if (characterHair) {
-        await characterHair.setName(data.name).setGender(data.gender).setIsSelectable(data.isSelectable).setSprite(sprite!).update()
-      }
+      const spriteRepository = new SpriteRepository()
+      const sprite = await spriteRepository.getById(data.spriteId)
+      if (!sprite) return callback(false)
+
+      const characterHairRepository = new CharacterHairRepository()
+      const characterHair = await characterHairRepository.getById(data.id)
+      if (!characterHair) return callback(false)
+
+      await characterHair.setName(data.name).setGender(data.gender).setIsSelectable(data.isSelectable).setSprite(sprite).setUpdatedAt(new Date()).save()
 
       return callback(true)
     } catch (error) {

src/events/gameMaster/assetManager/characterType/create.ts

@@ -1,41 +1,22 @@
-import { CharacterGender, CharacterRace } from '@prisma/client'
-import { Server } from 'socket.io'
-
-import prisma from '#application/prisma'
-import { TSocket } from '#application/types'
-import characterRepository from '#repositories/characterRepository'
-
-export default class CharacterTypeCreateEvent {
-  constructor(
-    private readonly io: Server,
-    private readonly socket: TSocket
-  ) {}
+import { BaseEvent } from '#application/base/baseEvent'
+import { CharacterType } from '#entities/characterType'
 
+export default class CharacterTypeCreateEvent extends BaseEvent {
   public listen(): void {
     this.socket.on('gm:characterType:create', this.handleEvent.bind(this))
   }
 
   private async handleEvent(data: undefined, callback: (response: boolean, characterType?: any) => void): Promise<void> {
     try {
-      const character = await characterRepository.getById(this.socket.characterId as number)
-      if (!character) return callback(false)
+      if (!(await this.isCharacterGM())) return
 
-      if (character.role !== 'gm') {
-        return callback(false)
-      }
+      const newCharacterType = new CharacterType()
+      await newCharacterType.setName('New character type').save()
 
-      const newCharacterType = await prisma.characterType.create({
-        data: {
-          name: 'New character type',
-          gender: CharacterGender.MALE,
-          race: CharacterRace.HUMAN
-        }
-      })
-
-      callback(true, newCharacterType)
+      return callback(true, newCharacterType)
     } catch (error) {
       console.error('Error creating character type:', error)
-      callback(false)
+      return callback(false)
     }
   }
 }

src/events/gameMaster/assetManager/characterType/delete.ts

@@ -1,41 +1,29 @@
-import { Server } from 'socket.io'
-
-import { gameMasterLogger } from '#application/logger'
-import { TSocket } from '#application/types'
-import characterRepository from '#repositories/characterRepository'
+import { BaseEvent } from '#application/base/baseEvent'
+import { UUID } from '#application/types'
 import CharacterTypeRepository from '#repositories/characterTypeRepository'
 
 interface IPayload {
-  id: number
+  id: UUID
 }
 
-export default class CharacterTypeDeleteEvent {
-  constructor(
-    private readonly io: Server,
-    private readonly socket: TSocket
-  ) {}
-
+export default class CharacterTypeDeleteEvent extends BaseEvent {
   public listen(): void {
     this.socket.on('gm:characterType:remove', this.handleEvent.bind(this))
   }
 
   private async handleEvent(data: IPayload, callback: (response: boolean) => void): Promise<void> {
-    const character = await characterRepository.getById(this.socket.characterId!)
-    if (!character) return callback(false)
-
-    if (character.role !== 'gm') {
-      return callback(false)
-    }
-
     try {
-      const characterType = await CharacterTypeRepository.getById(data.id)
+      if (!(await this.isCharacterGM())) return
+
+      const characterTypeRepository = new CharacterTypeRepository()
+      const characterType = await characterTypeRepository.getById(data.id)
       if (!characterType) return callback(false)
 
       await characterType.delete()
-      callback(true)
+      return callback(true)
     } catch (error) {
-      gameMasterLogger.error(`Error deleting character type ${data.id}: ${error instanceof Error ? error.message : String(error)}`)
-      callback(false)
+      this.logger.error(`Error deleting character type ${data.id}: ${error instanceof Error ? error.message : String(error)}`)
+      return callback(false)
     }
   }
 }

src/events/gameMaster/assetManager/characterType/list.ts

@@ -1,37 +1,26 @@
-import { CharacterType } from '@prisma/client'
-import { Server } from 'socket.io'
-
-import { gameMasterLogger } from '#application/logger'
-import { TSocket } from '#application/types'
-import characterRepository from '#repositories/characterRepository'
+import { BaseEvent } from '#application/base/baseEvent'
+import { CharacterType } from '#entities/characterType'
 import CharacterTypeRepository from '#repositories/characterTypeRepository'
 
 interface IPayload {}
 
-export default class CharacterTypeListEvent {
-  constructor(
-    private readonly io: Server,
-    private readonly socket: TSocket
-  ) {}
-
+export default class CharacterTypeListEvent extends BaseEvent {
   public listen(): void {
     this.socket.on('gm:characterType:list', this.handleEvent.bind(this))
   }
 
   private async handleEvent(data: IPayload, callback: (response: CharacterType[]) => void): Promise<void> {
-    const character = await characterRepository.getById(this.socket.characterId as number)
-    if (!character) {
-      gameMasterLogger.error('gm:characterType:list error', 'Character not found')
+    try {
+      if (!(await this.isCharacterGM())) return
+
+      const characterTypeRepository = new CharacterTypeRepository()
+      const items = await characterTypeRepository.getAll()
+      await characterTypeRepository.getEntityManager().populate(items, ['sprite'])
+
+      return callback(items)
+    } catch (error) {
+      this.logger.error('gm:characterType:list error', error)
       return callback([])
     }
-
-    if (character.role !== 'gm') {
-      gameMasterLogger.info(`User ${character.id} tried to list character types but is not a game master.`)
-      return callback([])
-    }
-
-    // get all objects
-    const items = await CharacterTypeRepository.getAll()
-    callback(items)
   }
 }

src/events/gameMaster/assetManager/characterType/update.ts

@@ -1,53 +1,41 @@
-import { CharacterGender, CharacterRace } from '@prisma/client'
-import { Server } from 'socket.io'
-
-import prisma from '#application/prisma'
-import { TSocket } from '#application/types'
-import characterRepository from '#repositories/characterRepository'
+import { BaseEvent } from '#application/base/baseEvent'
+import { CharacterGender, CharacterRace } from '#application/enums'
+import { UUID } from '#application/types'
+import CharacterTypeRepository from '#repositories/characterTypeRepository'
+import SpriteRepository from '#repositories/spriteRepository'
 
 type Payload = {
-  id: number
+  id: UUID
   name: string
   gender: CharacterGender
   race: CharacterRace
   isSelectable: boolean
-  spriteId: string
+  spriteId: UUID
 }
 
-export default class CharacterTypeUpdateEvent {
-  constructor(
-    private readonly io: Server,
-    private readonly socket: TSocket
-  ) {}
-
+export default class CharacterTypeUpdateEvent extends BaseEvent {
   public listen(): void {
     this.socket.on('gm:characterType:update', this.handleEvent.bind(this))
   }
 
   private async handleEvent(data: Payload, callback: (success: boolean) => void): Promise<void> {
-    const character = await characterRepository.getById(this.socket.characterId!)
-    if (!character) return callback(false)
-
-    if (character.role !== 'gm') {
-      return callback(false)
-    }
-
     try {
-      await prisma.characterType.update({
-        where: { id: data.id },
-        data: {
-          name: data.name,
-          gender: data.gender,
-          race: data.race,
-          isSelectable: data.isSelectable,
-          spriteId: data.spriteId
-        }
-      })
+      if (!(await this.isCharacterGM())) return
 
-      callback(true)
+      const characterTypeRepository = new CharacterTypeRepository()
+      const characterType = await characterTypeRepository.getById(data.id)
+      if (!characterType) return callback(false)
+
+      const spriteRepository = new SpriteRepository()
+      const sprite = await spriteRepository.getById(data.spriteId)
+      if (!sprite) return callback(false)
+
+      await characterType.setName(data.name).setGender(data.gender).setRace(data.race).setIsSelectable(data.isSelectable).setSprite(sprite).save()
+
+      return callback(true)
     } catch (error) {
       console.error(error)
-      callback(false)
+      return callback(false)
     }
   }
 }

src/events/gameMaster/assetManager/item/create.ts

@@ -1,42 +1,22 @@
-import { Server } from 'socket.io'
-
-import prisma from '#application/prisma'
-import { TSocket } from '#application/types'
-import characterRepository from '#repositories/characterRepository'
-
-export default class ItemCreateEvent {
-  constructor(
-    private readonly io: Server,
-    private readonly socket: TSocket
-  ) {}
+import { BaseEvent } from '#application/base/baseEvent'
+import { Item } from '#entities/item'
 
+export default class ItemCreateEvent extends BaseEvent {
   public listen(): void {
     this.socket.on('gm:item:create', this.handleEvent.bind(this))
   }
 
   private async handleEvent(data: undefined, callback: (response: boolean, item?: any) => void): Promise<void> {
     try {
-      const character = await characterRepository.getById(this.socket.characterId as number)
-      if (!character) return callback(false)
+      if (!(await this.isCharacterGM())) return
 
-      if (character.role !== 'gm') {
-        return callback(false)
-      }
+      const newItem = new Item()
+      await newItem.setName('New Item').setItemType('WEAPON').setStackable(false).setRarity('COMMON').setSprite(null).save()
 
-      const newItem = await prisma.item.create({
-        data: {
-          name: 'New Item',
-          itemType: 'WEAPON',
-          stackable: false,
-          rarity: 'COMMON',
-          spriteId: null
-        }
-      })
-
-      callback(true, newItem)
+      return callback(true, newItem)
     } catch (error) {
       console.error('Error creating item:', error)
-      callback(false)
+      return callback(false)
     }
   }
 }

src/events/gameMaster/assetManager/item/delete.ts

@@ -1,41 +1,30 @@
-import { Server } from 'socket.io'
-
-import { gameMasterLogger } from '#application/logger'
-import prisma from '#application/prisma'
-import { TSocket } from '#application/types'
-import characterRepository from '#repositories/characterRepository'
+import { BaseEvent } from '#application/base/baseEvent'
+import { UUID } from '#application/types'
+import ItemRepository from '#repositories/itemRepository'
 
 interface IPayload {
-  id: string
+  id: UUID
 }
 
-export default class ItemDeleteEvent {
-  constructor(
-    private readonly io: Server,
-    private readonly socket: TSocket
-  ) {}
-
+export default class ItemDeleteEvent extends BaseEvent {
   public listen(): void {
     this.socket.on('gm:item:remove', this.handleEvent.bind(this))
   }
 
   private async handleEvent(data: IPayload, callback: (response: boolean) => void): Promise<void> {
-    const character = await characterRepository.getById(this.socket.characterId as number)
-    if (!character) return callback(false)
-
-    if (character.role !== 'gm') {
-      return callback(false)
-    }
-
     try {
-      await prisma.item.delete({
-        where: { id: data.id }
-      })
+      if (!(await this.isCharacterGM())) return
 
-      callback(true)
+      const itemRepository = new ItemRepository()
+      const item = await itemRepository.getById(data.id)
+      if (!item) return callback(false)
+
+      await item.delete()
+
+      return callback(true)
     } catch (error) {
-      gameMasterLogger.error(`Error deleting item ${data.id}: ${error instanceof Error ? error.message : String(error)}`)
-      callback(false)
+      this.logger.error(`Error deleting item ${data.id}: ${error instanceof Error ? error.message : String(error)}`)
+      return callback(false)
     }
   }
 }

src/events/gameMaster/assetManager/item/list.ts

@@ -1,37 +1,25 @@
-import { Item } from '@prisma/client'
-import { Server } from 'socket.io'
-
-import { gameMasterLogger } from '#application/logger'
-import { TSocket } from '#application/types'
-import characterRepository from '#repositories/characterRepository'
-import itemRepository from '#repositories/itemRepository'
+import { BaseEvent } from '#application/base/baseEvent'
+import { Item } from '#entities/item'
+import ItemRepository from '#repositories/itemRepository'
 
 interface IPayload {}
 
-export default class ItemListEvent {
-  constructor(
-    private readonly io: Server,
-    private readonly socket: TSocket
-  ) {}
-
+export default class ItemListEvent extends BaseEvent {
   public listen(): void {
     this.socket.on('gm:item:list', this.handleEvent.bind(this))
   }
 
   private async handleEvent(data: IPayload, callback: (response: Item[]) => void): Promise<void> {
-    const character = await characterRepository.getById(this.socket.characterId as number)
-    if (!character) {
-      gameMasterLogger.error('gm:item:list error', 'Character not found')
+    try {
+      if (!(await this.isCharacterGM())) return
+
+      const itemRepository = new ItemRepository()
+      const items = await itemRepository.getAll()
+
+      return callback(items)
+    } catch (error) {
+      this.logger.error('gm:item:list error', error)
       return callback([])
     }
-
-    if (character.role !== 'gm') {
-      gameMasterLogger.info(`User ${character.id} tried to list items but is not a game master.`)
-      return callback([])
-    }
-
-    // get all items
-    const items = await itemRepository.getAll()
-    callback(items)
   }
 }

src/events/gameMaster/assetManager/item/update.ts

@@ -1,55 +1,41 @@
-import { ItemType, ItemRarity } from '@prisma/client'
-import { Server } from 'socket.io'
-
-import { gameMasterLogger } from '#application/logger'
-import prisma from '#application/prisma'
-import { TSocket } from '#application/types'
-import characterRepository from '#repositories/characterRepository'
+import { BaseEvent } from '#application/base/baseEvent'
+import { ItemType, ItemRarity } from '#application/enums'
+import { UUID } from '#application/types'
+import ItemRepository from '#repositories/itemRepository'
+import SpriteRepository from '#repositories/spriteRepository'
 
 type Payload = {
-  id: string
+  id: UUID
   name: string
-  description: string | null
+  description: string
   itemType: ItemType
   stackable: boolean
   rarity: ItemRarity
-  spriteId: string | null
+  spriteId: UUID
 }
 
-export default class ItemUpdateEvent {
-  constructor(
-    private readonly io: Server,
-    private readonly socket: TSocket
-  ) {}
-
+export default class ItemUpdateEvent extends BaseEvent {
   public listen(): void {
     this.socket.on('gm:item:update', this.handleEvent.bind(this))
   }
 
   private async handleEvent(data: Payload, callback: (success: boolean) => void): Promise<void> {
-    const character = await characterRepository.getById(this.socket.characterId as number)
-    if (!character) return callback(false)
-
-    if (character.role !== 'gm') {
-      return callback(false)
-    }
-
     try {
-      await prisma.item.update({
-        where: { id: data.id },
-        data: {
-          name: data.name,
-          description: data.description,
-          itemType: data.itemType,
-          stackable: data.stackable,
-          rarity: data.rarity,
-          spriteId: data.spriteId
-        }
-      })
+      if (!(await this.isCharacterGM())) return
+
+      const itemRepository = new ItemRepository()
+      const item = await itemRepository.getById(data.id)
+      if (!item) return callback(false)
+
+      const spriteRepository = new SpriteRepository()
+      const sprite = await spriteRepository.getById(data.spriteId)
+      if (!sprite) return callback(false)
+
+      await item.setName(data.name).setDescription(data.description).setItemType(data.itemType).setStackable(data.stackable).setRarity(data.rarity).setSprite(sprite).save()
 
       return callback(true)
     } catch (error) {
-      gameMasterLogger.error(`Error updating item: ${error instanceof Error ? error.message : String(error)}`)
+      console.error(error)
       return callback(false)
     }
   }

src/events/gameMaster/assetManager/mapObject/list.ts

@@ -0,0 +1,26 @@
+import { BaseEvent } from '#application/base/baseEvent'
+import { MapObject } from '#entities/mapObject'
+import MapObjectRepository from '#repositories/mapObjectRepository'
+
+interface IPayload {}
+
+export default class MapObjectListEvent extends BaseEvent {
+  public listen(): void {
+    this.socket.on('gm:mapObject:list', this.handleEvent.bind(this))
+  }
+
+  private async handleEvent(data: IPayload, callback: (response: MapObject[]) => void): Promise<void> {
+    try {
+      if (!(await this.isCharacterGM())) return
+
+      // Get all map objects
+      const mapObjectRepository = new MapObjectRepository()
+      const mapObjects = await mapObjectRepository.getAll()
+
+      return callback(mapObjects)
+    } catch (error) {
+      this.logger.error('gm:mapObject:list error', error)
+      return callback([])
+    }
+  }
+}

src/events/gameMaster/assetManager/mapObject/remove.ts

@@ -0,0 +1,39 @@
+import fs from 'fs'
+
+import { BaseEvent } from '#application/base/baseEvent'
+import Storage from '#application/storage'
+import { UUID } from '#application/types'
+import MapObjectRepository from '#repositories/mapObjectRepository'
+
+interface IPayload {
+  mapObjectId: UUID
+}
+
+export default class MapObjectRemoveEvent extends BaseEvent {
+  public listen(): void {
+    this.socket.on('gm:mapObject:remove', this.handleEvent.bind(this))
+  }
+
+  private async handleEvent(data: IPayload, callback: (response: boolean) => void): Promise<void> {
+    try {
+      if (!(await this.isCharacterGM())) return
+      // remove the tile from the disk
+      const finalFilePath = Storage.getPublicPath('map_objects', data.mapObjectId + '.png')
+      fs.unlink(finalFilePath, async (err) => {
+        if (err) {
+          this.logger.error(`Error deleting object ${data.mapObjectId}: ${err.message}`)
+          callback(false)
+          return
+        }
+
+        const mapObjectRepository = new MapObjectRepository()
+        await (await mapObjectRepository.getById(data.mapObjectId))?.delete()
+
+        return callback(true)
+      })
+    } catch (error) {
+      this.logger.error(`Error deleting object ${data.mapObjectId}: ${error instanceof Error ? error.message : String(error)}`)
+      return callback(false)
+    }
+  }
+}

src/events/gameMaster/assetManager/mapObject/update.ts

@@ -0,0 +1,46 @@
+import { BaseEvent } from '#application/base/baseEvent'
+import { UUID } from '#application/types'
+import MapObjectRepository from '#repositories/mapObjectRepository'
+
+type Payload = {
+  id: UUID
+  name: string
+  tags: string[]
+  originX: number
+  originY: number
+  frameRate: number
+  frameWidth: number
+  frameHeight: number
+}
+
+export default class MapObjectUpdateEvent extends BaseEvent {
+  public listen(): void {
+    this.socket.on('gm:mapObject:update', this.handleEvent.bind(this))
+  }
+
+  private async handleEvent(data: Payload, callback: (success: boolean) => void): Promise<void> {
+    try {
+      if (!(await this.isCharacterGM())) return
+
+      const mapObjectRepository = new MapObjectRepository()
+
+      const mapObject = await mapObjectRepository.getById(data.id)
+      if (!mapObject) return callback(false)
+
+      await mapObject
+        .setName(data.name)
+        .setTags(data.tags)
+        .setOriginX(data.originX)
+        .setOriginY(data.originY)
+        .setFrameRate(data.frameRate)
+        .setFrameWidth(data.frameWidth)
+        .setFrameHeight(data.frameHeight)
+        .save()
+
+      return callback(true)
+    } catch (error) {
+      console.error(error)
+      return callback(false)
+    }
+  }
+}

src/events/gameMaster/assetManager/mapObject/upload.ts

@@ -0,0 +1,54 @@
+import fs from 'fs/promises'
+import { writeFile } from 'node:fs/promises'
+
+import sharp from 'sharp'
+
+import { BaseEvent } from '#application/base/baseEvent'
+import Storage from '#application/storage'
+import { MapObject } from '#entities/mapObject'
+
+interface IObjectData {
+  [key: string]: Buffer
+}
+
+export default class MapObjectUploadEvent extends BaseEvent {
+  public listen(): void {
+    this.socket.on('gm:mapObject:upload', this.handleEvent.bind(this))
+  }
+
+  private async handleEvent(data: IObjectData, callback: (response: boolean) => void): Promise<void> {
+    try {
+      if (!(await this.isCharacterGM())) return
+
+      const public_folder = Storage.getPublicPath('map_objects')
+
+      // Ensure the folder exists
+      await fs.mkdir(public_folder, { recursive: true })
+
+      const uploadPromises = Object.entries(data).map(async ([key, objectData]) => {
+        // Get image dimensions
+        const metadata = await sharp(objectData).metadata()
+        const width = metadata.width || 0
+        const height = metadata.height || 0
+
+        // Create new map object and save it to database
+        const mapObject = new MapObject()
+        await mapObject.setName('New map object').setTags([]).setOriginX(0).setOriginY(0).setFrameWidth(width).setFrameHeight(height).save()
+
+        // Save image to disk
+        const uuid = mapObject.getId()
+        const filename = `${uuid}.png`
+        const finalFilePath = Storage.getPublicPath('map_objects', filename)
+        await writeFile(finalFilePath, objectData)
+
+        this.logger.info('gm:mapObject:upload', `Object ${key} uploaded with id ${uuid}`)
+      })
+
+      await Promise.all(uploadPromises)
+      return callback(true)
+    } catch (error: any) {
+      this.logger.error('gm:mapObject:upload error', error.message)
+      return callback(false)
+    }
+  }
+}

src/events/gameMaster/assetManager/object/list.ts

@@ -1,32 +0,0 @@
-import { Object } from '@prisma/client'
-import { Server } from 'socket.io'
-
-import { TSocket } from '#application/types'
-import characterRepository from '#repositories/characterRepository'
-import ObjectRepository from '#repositories/objectRepository'
-
-interface IPayload {}
-
-export default class ObjectListEvent {
-  constructor(
-    private readonly io: Server,
-    private readonly socket: TSocket
-  ) {}
-
-  public listen(): void {
-    this.socket.on('gm:object:list', this.handleEvent.bind(this))
-  }
-
-  private async handleEvent(data: IPayload, callback: (response: Object[]) => void): Promise<void> {
-    const character = await characterRepository.getById(this.socket.characterId as number)
-    if (!character) return callback([])
-
-    if (character.role !== 'gm') {
-      return callback([])
-    }
-
-    // get all objects
-    const objects = await ObjectRepository.getAll()
-    callback(objects)
-  }
-}

src/events/gameMaster/assetManager/object/remove.ts

@@ -1,59 +0,0 @@
-import fs from 'fs'
-
-import { Server } from 'socket.io'
-
-import { gameLogger, gameMasterLogger } from '#application/logger'
-import prisma from '#application/prisma'
-import Storage from '#application/storage'
-import { TSocket } from '#application/types'
-import characterRepository from '#repositories/characterRepository'
-
-interface IPayload {
-  object: string
-}
-
-export default class ObjectRemoveEvent {
-  constructor(
-    private readonly io: Server,
-    private readonly socket: TSocket
-  ) {}
-
-  public listen(): void {
-    this.socket.on('gm:object:remove', this.handleEvent.bind(this))
-  }
-
-  private async handleEvent(data: IPayload, callback: (response: boolean) => void): Promise<void> {
-    const character = await characterRepository.getById(this.socket.characterId as number)
-    if (!character) return callback(false)
-
-    if (character.role !== 'gm') {
-      return callback(false)
-    }
-
-    try {
-      await prisma.object.delete({
-        where: {
-          id: data.object
-        }
-      })
-
-      // get root path
-      const public_folder = Storage.getPublicPath('objects')
-
-      // remove the tile from the disk
-      const finalFilePath = Storage.getPublicPath('objects', data.object + '.png')
-      fs.unlink(finalFilePath, (err) => {
-        if (err) {
-          gameMasterLogger.error(`Error deleting object ${data.object}: ${err.message}`)
-          callback(false)
-          return
-        }
-
-        callback(true)
-      })
-    } catch (error) {
-      gameLogger.error(`Error deleting object ${data.object}: ${error instanceof Error ? error.message : String(error)}`)
-      callback(false)
-    }
-  }
-}

src/events/gameMaster/assetManager/object/update.ts

@@ -1,59 +0,0 @@
-import { Server } from 'socket.io'
-
-import prisma from '#application/prisma'
-import { TSocket } from '#application/types'
-import characterRepository from '#repositories/characterRepository'
-
-type Payload = {
-  id: string
-  name: string
-  tags: string[]
-  originX: number
-  originY: number
-  isAnimated: boolean
-  frameRate: number
-  frameWidth: number
-  frameHeight: number
-}
-
-export default class ObjectUpdateEvent {
-  constructor(
-    private readonly io: Server,
-    private readonly socket: TSocket
-  ) {}
-
-  public listen(): void {
-    this.socket.on('gm:object:update', this.handleEvent.bind(this))
-  }
-
-  private async handleEvent(data: Payload, callback: (success: boolean) => void): Promise<void> {
-    const character = await characterRepository.getById(this.socket.characterId as number)
-    if (!character) return callback(false)
-
-    if (character.role !== 'gm') {
-      return callback(false)
-    }
-
-    try {
-      const object = await prisma.object.update({
-        where: {
-          id: data.id
-        },
-        data: {
-          name: data.name,
-          tags: data.tags,
-          originX: data.originX,
-          originY: data.originY,
-          isAnimated: data.isAnimated,
-          frameRate: data.frameRate,
-          frameWidth: data.frameWidth,
-          frameHeight: data.frameHeight
-        }
-      })
-      callback(true)
-    } catch (error) {
-      console.error(error)
-      callback(false)
-    }
-  }
-}

src/events/gameMaster/assetManager/object/upload.ts

@@ -1,73 +0,0 @@
-import fs from 'fs/promises'
-import { writeFile } from 'node:fs/promises'
-
-import sharp from 'sharp'
-import { Server } from 'socket.io'
-
-import { gameMasterLogger } from '#application/logger'
-import prisma from '#application/prisma'
-import Storage from '#application/storage'
-import { TSocket } from '#application/types'
-import characterRepository from '#repositories/characterRepository'
-
-interface IObjectData {
-  [key: string]: Buffer
-}
-
-export default class ObjectUploadEvent {
-  constructor(
-    private readonly io: Server,
-    private readonly socket: TSocket
-  ) {}
-
-  public listen(): void {
-    this.socket.on('gm:object:upload', this.handleEvent.bind(this))
-  }
-
-  private async handleEvent(data: IObjectData, callback: (response: boolean) => void): Promise<void> {
-    try {
-      const character = await characterRepository.getById(this.socket.characterId as number)
-      if (!character) return callback(false)
-
-      if (character.role !== 'gm') {
-        return callback(false)
-      }
-      const public_folder = Storage.getPublicPath('objects')
-
-      // Ensure the folder exists
-      await fs.mkdir(public_folder, { recursive: true })
-
-      const uploadPromises = Object.entries(data).map(async ([key, objectData]) => {
-        // Get image dimensions
-        const metadata = await sharp(objectData).metadata()
-        const width = metadata.width || 0
-        const height = metadata.height || 0
-
-        const object = await prisma.object.create({
-          data: {
-            name: key,
-            tags: [],
-            originX: 0,
-            originY: 0,
-            frameWidth: width,
-            frameHeight: height
-          }
-        })
-
-        const uuid = object.id
-        const filename = `${uuid}.png`
-        const finalFilePath = Storage.getPublicPath('objects', filename)
-        await writeFile(finalFilePath, objectData)
-
-        gameMasterLogger.info('gm:object:upload', `Object ${key} uploaded with id ${uuid}`)
-      })
-
-      await Promise.all(uploadPromises)
-
-      callback(true)
-    } catch (error: any) {
-      gameMasterLogger.error('gm:object:upload error', error.message)
-      callback(false)
-    }
-  }
-}

src/events/gameMaster/assetManager/sprite/copy.ts

@@ -1,79 +1,39 @@
-import { Server } from 'socket.io'
-
-import type { Prisma } from '@prisma/client'
-
-import { gameMasterLogger } from '#application/logger'
-import prisma from '#application/prisma'
-import { TSocket } from '#application/types'
-import CharacterRepository from '#repositories/characterRepository'
+import { BaseEvent } from '#application/base/baseEvent'
+import { UUID } from '#application/types'
+import { Sprite } from '#entities/sprite'
+import SpriteRepository from '#repositories/spriteRepository'
 
 interface CopyPayload {
-  id: string
+  id: UUID
 }
 
-export default class SpriteCopyEvent {
-  constructor(
-    private readonly io: Server,
-    private readonly socket: TSocket
-  ) {}
-
+export default class SpriteCopyEvent extends BaseEvent {
   public listen(): void {
     this.socket.on('gm:sprite:copy', this.handleEvent.bind(this))
   }
 
   private async handleEvent(payload: CopyPayload, callback: (success: boolean) => void): Promise<void> {
     try {
-      if (!(await this.validateGameMasterAccess())) {
+      if (!(await this.isCharacterGM())) return
+
+      const spriteRepository = new SpriteRepository()
+      const sourceSprite = await spriteRepository.getById(payload.id)
+
+      if (!sourceSprite) {
+        this.logger.error('gm:sprite:copy error', 'Source sprite not found')
         return callback(false)
       }
 
-      const sourceSprite = await prisma.sprite.findUnique({
-        where: { id: payload.id },
-        include: {
-          spriteActions: true
-        }
-      })
+      // Populate source sprite with spriteActions
+      await spriteRepository.getEntityManager().populate(sourceSprite, ['spriteActions'])
 
-      if (!sourceSprite) {
-        throw new Error('Source sprite not found')
-      }
+      const newSprite = new Sprite()
+      await newSprite.setName(`${sourceSprite.getName()} (Copy)`).setSpriteActions(sourceSprite.getSpriteActions()).save()
 
-      const newSprite = await prisma.sprite.create({
-        data: {
-          name: `${sourceSprite.name} (Copy)`,
-          spriteActions: {
-            create: sourceSprite.spriteActions.map((action) => ({
-              action: action.action,
-              sprites: action.sprites as Prisma.InputJsonValue,
-              originX: action.originX,
-              originY: action.originY,
-              isAnimated: action.isAnimated,
-              isLooping: action.isLooping,
-              frameWidth: action.frameWidth,
-              frameHeight: action.frameHeight,
-              frameRate: action.frameRate
-            }))
-          }
-        }
-      })
-
-      callback(true)
+      return callback(true)
     } catch (error) {
-      this.handleError(error, payload.id, callback)
+      this.logger.error(`Error copying sprite:`, String(error))
+      return callback(false)
     }
   }
-
-  private async validateGameMasterAccess(): Promise<boolean> {
-    const character = await CharacterRepository.getById(this.socket.characterId!)
-    return character?.role === 'gm'
-  }
-
-  private handleError(error: unknown, spriteId: string, callback: (success: boolean) => void): void {
-    gameMasterLogger.error(`Error copying sprite ${spriteId}: ${this.getErrorMessage(error)}`)
-    callback(false)
-  }
-
-  private getErrorMessage(error: unknown): string {
-    return error instanceof Error ? error.message : String(error)
-  }
 }

src/events/gameMaster/assetManager/sprite/create.ts

@@ -1,51 +1,36 @@
 import fs from 'fs/promises'
 
-import { Server } from 'socket.io'
-
-import prisma from '#application/prisma'
+import { BaseEvent } from '#application/base/baseEvent'
 import Storage from '#application/storage'
-import { TSocket } from '#application/types'
-import characterRepository from '#repositories/characterRepository'
-
-export default class SpriteCreateEvent {
-  constructor(
-    private readonly io: Server,
-    private readonly socket: TSocket
-  ) {}
+import { Sprite } from '#entities/sprite'
 
+export default class SpriteCreateEvent extends BaseEvent {
   public listen(): void {
     this.socket.on('gm:sprite:create', this.handleEvent.bind(this))
   }
 
   private async handleEvent(data: undefined, callback: (response: boolean) => void): Promise<void> {
     try {
-      const character = await characterRepository.getById(this.socket.characterId!)
-      if (!character) return callback(false)
-
-      if (character.role !== 'gm') {
-        return callback(false)
-      }
+      if (!(await this.isCharacterGM())) return
 
       const public_folder = Storage.getPublicPath('sprites')
 
       // Ensure the folder exists
       await fs.mkdir(public_folder, { recursive: true })
 
-      const sprite = await prisma.sprite.create({
-        data: {
-          name: 'New sprite'
-        }
-      })
+      const sprite = new Sprite()
+      await sprite.setName('New sprite').save()
+
       const uuid = sprite.id
 
       // Create folder with uuid
       const sprite_folder = Storage.getPublicPath('sprites', uuid)
       await fs.mkdir(sprite_folder, { recursive: true })
 
-      callback(true)
+      return callback(true)
     } catch (error) {
       console.error('Error creating sprite:', error)
-      callback(false)
+      return callback(false)
     }
   }
 }

src/events/gameMaster/assetManager/sprite/delete.ts

@@ -1,46 +1,33 @@
 import fs from 'fs'
 
-import { Server } from 'socket.io'
-
-import { gameMasterLogger } from '#application/logger'
-import prisma from '#application/prisma'
+import { BaseEvent } from '#application/base/baseEvent'
 import Storage from '#application/storage'
-import { TSocket } from '#application/types'
-import CharacterRepository from '#repositories/characterRepository'
+import { UUID } from '#application/types'
+import SpriteRepository from '#repositories/spriteRepository'
 
 type Payload = {
-  id: string
+  id: UUID
 }
 
-export default class GMSpriteDeleteEvent {
-  private readonly public_folder: string
-
-  constructor(
-    private readonly io: Server,
-    private readonly socket: TSocket
-  ) {
-    this.public_folder = Storage.getPublicPath('sprites')
-  }
-
+export default class GMSpriteDeleteEvent extends BaseEvent {
   public listen(): void {
     this.socket.on('gm:sprite:delete', this.handleEvent.bind(this))
   }
 
   private async handleEvent(data: Payload, callback: (response: boolean) => void): Promise<void> {
-    const character = await CharacterRepository.getById(this.socket.characterId!)
-    if (character?.role !== 'gm') {
-      return callback(false)
-    }
-
     try {
-      await this.deleteSpriteFolder(data.id)
-      await this.deleteSpriteFromDatabase(data.id)
+      if (!(await this.isCharacterGM())) return
 
-      gameMasterLogger.info(`Sprite ${data.id} deleted.`)
-      callback(true)
+      await this.deleteSpriteFolder(data.id)
+
+      const spriteRepository = new SpriteRepository()
+      await (await spriteRepository.getById(data.id))?.delete()
+
+      this.logger.info(`Sprite ${data.id} deleted.`)
+      return callback(true)
     } catch (error: any) {
-      gameMasterLogger.error('gm:sprite:delete error', error.message)
-      callback(false)
+      this.logger.error('gm:sprite:delete error', error.message)
+      return callback(false)
     }
   }
 
@@ -51,12 +38,4 @@ export default class GMSpriteDeleteEvent {
       await fs.promises.rmdir(finalFilePath, { recursive: true })
     }
   }
-
-  private async deleteSpriteFromDatabase(spriteId: string): Promise<void> {
-    await prisma.sprite.delete({
-      where: {
-        id: spriteId
-      }
-    })
-  }
 }

src/events/gameMaster/assetManager/sprite/list.ts

@@ -1,32 +1,27 @@
-import { Sprite } from '@prisma/client'
-import { Server } from 'socket.io'
-
-import { TSocket } from '#application/types'
-import characterRepository from '#repositories/characterRepository'
+import { BaseEvent } from '#application/base/baseEvent'
+import { Sprite } from '#entities/sprite'
 import SpriteRepository from '#repositories/spriteRepository'
 
 interface IPayload {}
 
-export default class SpriteListEvent {
-  constructor(
-    private readonly io: Server,
-    private readonly socket: TSocket
-  ) {}
-
+export default class SpriteListEvent extends BaseEvent {
   public listen(): void {
     this.socket.on('gm:sprite:list', this.handleEvent.bind(this))
   }
 
-  private async handleEvent(data: any, callback: (response: Sprite[]) => void): Promise<void> {
-    const character = await characterRepository.getById(this.socket.characterId!)
-    if (!character) return callback([])
+  private async handleEvent(data: IPayload, callback: (response: Sprite[]) => void): Promise<void> {
+    try {
+      if (!(await this.isCharacterGM())) return
 
-    if (character.role !== 'gm') {
+      // Get all sprites
+      const spriteRepository = new SpriteRepository()
+      const sprites = await spriteRepository.getAll()
+      await spriteRepository.getEntityManager().populate(sprites, ['spriteActions'])
+
+      return callback(sprites)
+    } catch (error) {
+      this.logger.error('gm:sprite:list error', error)
       return callback([])
     }
-
-    // get all sprites
-    const sprites = await SpriteRepository.getAll()
-    callback(sprites)
   }
 }

src/events/gameMaster/assetManager/sprite/update.ts

@@ -1,402 +1,216 @@
-import { writeFile, mkdir } from 'node:fs/promises'
-
+import { BaseEvent } from '#application/base/baseEvent'
+import { UUID } from '#application/types'
+import SpriteRepository from '#repositories/spriteRepository'
+import { SpriteAction } from '#entities/spriteAction'
 import sharp from 'sharp'
-import { Server } from 'socket.io'
+import fs from 'fs'
 
-import type { Prisma, SpriteAction } from '@prisma/client'
-
-import { gameMasterLogger } from '#application/logger'
-import prisma from '#application/prisma'
-import Storage from '#application/storage'
-import { TSocket } from '#application/types'
-import CharacterRepository from '#repositories/characterRepository'
-
-// Constants
-const ISOMETRIC_CONFIG = {
-  tileWidth: 64,
-  tileHeight: 32,
-  centerOffset: 32,
-  bodyRatios: {
-    topStart: 0.15,
-    topEnd: 0.45,
-    weightUpper: 0.7,
-    weightLower: 0.3
+interface SpriteImage {
+  url: string
+  offset: {
+    x: number
+    y: number
   }
-} as const
+}
 
-// Types
-interface ContentBounds {
-  left: number
-  right: number
+interface ImageDimensions {
+  width: number
+  height: number
+  offsetX: number
+  offsetY: number
+}
+
+interface EffectiveDimensions {
+  width: number
+  height: number
   top: number
   bottom: number
-  width: number
-  height: number
 }
 
-interface SpriteActionInput extends Omit<SpriteAction, 'id' | 'spriteId' | 'frameWidth' | 'frameHeight'> {
-  sprites: string[]
-}
-
-interface UpdatePayload {
-  id: string
+type Payload = {
+  id: UUID
   name: string
-  spriteActions: Prisma.JsonValue
+  spriteActions: Array<{
+    action: string
+    sprites: SpriteImage[]
+    originX: number
+    originY: number
+    frameRate: number
+  }>
 }
 
-interface ProcessedSpriteAction extends SpriteActionInput {
-  frameWidth: number
-  frameHeight: number
-  buffersWithDimensions: ProcessedFrame[]
-}
-
-interface ProcessedFrame {
-  buffer: Buffer
-  width: number
-  height: number
-}
-
-interface SpriteAnalysis {
-  massCenter: number
-  spinePosition: number
-  contentBounds: ContentBounds
-}
-
-export default class SpriteUpdateEvent {
-  constructor(
-    private readonly io: Server,
-    private readonly socket: TSocket
-  ) {}
-
+export default class SpriteUpdateEvent extends BaseEvent {
   public listen(): void {
     this.socket.on('gm:sprite:update', this.handleEvent.bind(this))
   }
 
-  private async handleEvent(payload: UpdatePayload, callback: (success: boolean) => void): Promise<void> {
+  private async handleEvent(data: Payload, callback: (success: boolean) => void): Promise<void> {
     try {
-      if (!(await this.validateGameMasterAccess())) {
-        return callback(false)
+      if (!(await this.isCharacterGM())) return
+
+      const spriteRepository = new SpriteRepository()
+      const sprite = await spriteRepository.getById(data.id)
+      if (!sprite) return callback(false)
+
+      await spriteRepository.getEntityManager().populate(sprite, ['spriteActions'])
+
+      // Update sprite in database
+      await sprite.setName(data.name).save()
+
+      // First verify all sprite sheets can be generated
+      for (const actionData of data.spriteActions) {
+        if (!await this.generateSpriteSheet(actionData.sprites, sprite.getId(), actionData.action)) {
+          return callback(false)
+        }
       }
 
-      const parsedActions = this.validateSpriteActions(payload.spriteActions)
+      const existingActions = sprite.getSpriteActions()
 
-      // Process sprites
-      const processedActions = await Promise.all(
-        parsedActions.map(async (action) => {
-          const spriteBuffers = await this.convertBase64ToBuffers(action.sprites)
-          const frameWidth = ISOMETRIC_CONFIG.tileWidth
-          const frameHeight = await this.calculateOptimalHeight(spriteBuffers)
-          const processedFrames = await this.normalizeFrames(spriteBuffers, frameWidth, frameHeight)
+      // Remove existing actions only after confirming sprite sheets generated successfully
+      for (const existingAction of existingActions) {
+        await spriteRepository.getEntityManager().removeAndFlush(existingAction)
+      }
 
-          return {
-            ...action,
-            frameWidth,
-            frameHeight,
-            buffersWithDimensions: processedFrames
-          }
+      // Create new actions
+      for (const actionData of data.spriteActions) {
+        // Process images and calculate dimensions
+        const imageData = await Promise.all(actionData.sprites.map(sprite => this.processImage(sprite)))
+        const effectiveDimensions = imageData.map(dimensions => this.calculateEffectiveDimensions(dimensions))
+        
+        // Calculate total height needed for the sprite sheet
+        const maxHeight = Math.max(...effectiveDimensions.map(d => d.height))
+        const maxTop = Math.max(...effectiveDimensions.map(d => d.top))
+        const maxBottom = Math.max(...effectiveDimensions.map(d => d.bottom))
+        const totalHeight = maxHeight + maxTop + maxBottom
+
+        const spriteAction = new SpriteAction()
+        spriteAction.setSprite(sprite)
+        sprite.getSpriteActions().add(spriteAction)
+
+        spriteAction
+          .setAction(actionData.action)
+          .setSprites(actionData.sprites)
+          .setOriginX(actionData.originX)
+          .setOriginY(actionData.originY)
+          .setFrameWidth(await this.calculateMaxWidth(actionData.sprites))
+          .setFrameHeight(totalHeight)
+          .setFrameRate(actionData.frameRate)
+
+        await spriteRepository.getEntityManager().persistAndFlush(spriteAction)
+      }
+
+      return callback(true)
+    } catch (error) {
+      console.error(`Error updating sprite ${data.id}:`, error)
+      return callback(false)
+    }
+  }
+
+  private async generateSpriteSheet(sprites: SpriteImage[], spriteId: string, action: string): Promise<boolean> {
+    try {
+      if (!sprites.length) return true
+
+      // Process all images and get their dimensions
+      const imageData = await Promise.all(sprites.map(sprite => this.processImage(sprite)))
+      const effectiveDimensions = imageData.map(dimensions => this.calculateEffectiveDimensions(dimensions))
+
+      // Calculate maximum dimensions
+      const maxWidth = Math.max(...effectiveDimensions.map(d => d.width))
+      const maxHeight = Math.max(...effectiveDimensions.map(d => d.height))
+      const maxTop = Math.max(...effectiveDimensions.map(d => d.top))
+      const maxBottom = Math.max(...effectiveDimensions.map(d => d.bottom))
+
+      // Calculate total height needed
+      const totalHeight = maxHeight + maxTop + maxBottom
+
+      // Process images and create sprite sheet
+      const processedImages = await Promise.all(
+        sprites.map(async (sprite, index) => {
+          const { width, height, offsetX, offsetY } = await this.processImage(sprite)
+          const uri = sprite.url.split(';base64,').pop()
+          if (!uri) throw new Error('Invalid base64 image')
+          const buffer = Buffer.from(uri, 'base64')
+
+          // Create individual frame
+          const left = offsetX >= 0 ? offsetX : 0
+          const verticalOffset = totalHeight - height - (offsetY >= 0 ? offsetY : 0)
+          return sharp({
+            create: {
+              width: maxWidth,
+              height: totalHeight,
+              channels: 4,
+              background: { r: 0, g: 0, b: 0, alpha: 0 }
+            }
+          })
+          .composite([{ input: buffer, left, top: verticalOffset }])
+          .png()
+          .toBuffer()
         })
       )
 
-      await Promise.all([
-        this.updateDatabase(payload.id, payload.name, processedActions),
-        this.saveSpritesToDisk(
-          payload.id,
-          processedActions.filter((a) => a.buffersWithDimensions.length > 0)
-        )
-      ])
-
-      callback(true)
-    } catch (error) {
-      this.handleError(error, payload.id, callback)
-    }
-  }
-
-  private async validateGameMasterAccess(): Promise<boolean> {
-    const character = await CharacterRepository.getById(this.socket.characterId!)
-    return character?.role === 'gm'
-  }
-
-  private validateSpriteActions(actions: Prisma.JsonValue): SpriteActionInput[] {
-    try {
-      const parsed = JSON.parse(JSON.stringify(actions)) as SpriteActionInput[]
-      if (!Array.isArray(parsed)) {
-        throw new Error('Sprite actions must be an array')
-      }
-      return parsed
-    } catch (error) {
-      throw new Error(`Invalid sprite actions format: ${this.getErrorMessage(error)}`)
-    }
-  }
-
-  private async convertBase64ToBuffers(sprites: string[]): Promise<Buffer[]> {
-    return sprites.map((sprite) => Buffer.from(sprite.split(',')[1], 'base64'))
-  }
-
-  private async normalizeFrames(buffers: Buffer[], frameWidth: number, frameHeight: number): Promise<ProcessedFrame[]> {
-    return Promise.all(
-      buffers.map(async (buffer) => {
-        const normalizedBuffer = await this.normalizeIsometricSprite(buffer, frameWidth, frameHeight)
-        return {
-          buffer: normalizedBuffer,
-          width: frameWidth,
-          height: frameHeight
+      // Combine frames into sprite sheet
+      const spriteSheet = await sharp({
+        create: {
+          width: maxWidth * sprites.length,
+          height: totalHeight,
+          channels: 4,
+          background: { r: 0, g: 0, b: 0, alpha: 0 }
         }
       })
-    )
-  }
-
-  private async calculateOptimalHeight(buffers: Buffer[]): Promise<number> {
-    if (!buffers.length) return ISOMETRIC_CONFIG.tileHeight // Return default height if no buffers
-
-    const heights = await Promise.all(
-      buffers.map(async (buffer) => {
-        const bounds = await this.findContentBounds(buffer)
-        return bounds.height
-      })
-    )
-    return Math.ceil(Math.max(...heights) / 2) * 2
-  }
-
-  private async normalizeIsometricSprite(buffer: Buffer, frameWidth: number, frameHeight: number): Promise<Buffer> {
-    const analysis = await this.analyzeIsometricSprite(buffer)
-    const idealCenter = Math.floor(frameWidth / 2)
-    const offset = Math.round(idealCenter - analysis.massCenter)
-
-    // Process the input sprite
-    const processedInput = await sharp(buffer)
-      .ensureAlpha()
-      .resize({
-        width: frameWidth, // Set maximum width
-        height: frameHeight, // Set maximum height
-        fit: 'inside', // Ensure image fits within dimensions
-        kernel: sharp.kernel.nearest,
-        position: 'center',
-        withoutEnlargement: true // Don't enlarge smaller images
-      })
-      .png({
-        compressionLevel: 9,
-        adaptiveFiltering: false,
-        palette: true,
-        quality: 100,
-        colors: 256
-      })
-      .toBuffer()
-
-    // Create the final composition
-    return sharp({
-      create: {
-        width: frameWidth,
-        height: frameHeight,
-        channels: 4,
-        background: { r: 0, g: 0, b: 0, alpha: 0 }
-      }
-    })
-      .composite([
-        {
-          input: processedInput,
-          left: offset,
-          top: 0,
-          blend: 'over'
-        }
-      ])
-      .png({
-        compressionLevel: 9,
-        adaptiveFiltering: false,
-        palette: true,
-        quality: 100,
-        colors: 256
-      })
-      .toBuffer()
-  }
-
-  private async analyzeIsometricSprite(buffer: Buffer): Promise<SpriteAnalysis> {
-    const { data, info } = await sharp(buffer).raw().ensureAlpha().toBuffer({ resolveWithObject: true })
-    const { width, height } = info
-    const upperStart = Math.floor(height * ISOMETRIC_CONFIG.bodyRatios.topStart)
-    const upperEnd = Math.floor(height * ISOMETRIC_CONFIG.bodyRatios.topEnd)
-
-    const { columnDensity, upperBodyDensity, bounds } = this.calculatePixelDistribution(data, width, height, upperStart, upperEnd)
-    const spinePosition = this.findSpinePosition(upperBodyDensity)
-    const massCenter = this.calculateWeightedMassCenter(columnDensity, upperBodyDensity)
-
-    return {
-      massCenter,
-      spinePosition,
-      contentBounds: bounds
-    }
-  }
-
-  private calculatePixelDistribution(data: Buffer, width: number, height: number, upperStart: number, upperEnd: number) {
-    const columnDensity = new Array(width).fill(0)
-    const upperBodyDensity = new Array(width).fill(0)
-    const bounds = { left: width, right: 0, top: height, bottom: 0 }
-
-    for (let y = 0; y < height; y++) {
-      for (let x = 0; x < width; x++) {
-        if (data[(y * width + x) * 4 + 3] > 0) {
-          columnDensity[x]++
-          if (y >= upperStart && y <= upperEnd) {
-            upperBodyDensity[x]++
-          }
-          this.updateBounds(bounds, x, y)
-        }
-      }
-    }
-
-    return {
-      columnDensity,
-      upperBodyDensity,
-      bounds: {
-        ...bounds,
-        width: bounds.right - bounds.left + 1,
-        height: bounds.bottom - bounds.top + 1
-      }
-    }
-  }
-
-  private updateBounds(bounds: { left: number; right: number; top: number; bottom: number }, x: number, y: number): void {
-    bounds.left = Math.min(bounds.left, x)
-    bounds.right = Math.max(bounds.right, x)
-    bounds.top = Math.min(bounds.top, y)
-    bounds.bottom = Math.max(bounds.bottom, y)
-  }
-
-  private findSpinePosition(density: number[]): number {
-    return density.reduce((maxIdx, curr, idx, arr) => (curr > arr[maxIdx] ? idx : maxIdx), 0)
-  }
-
-  private calculateWeightedMassCenter(columnDensity: number[], upperBodyDensity: number[]): number {
-    const upperMassCenter = this.calculateMassCenter(upperBodyDensity)
-    const lowerMassCenter = this.calculateMassCenter(columnDensity)
-
-    return Math.round(upperMassCenter * ISOMETRIC_CONFIG.bodyRatios.weightUpper + lowerMassCenter * ISOMETRIC_CONFIG.bodyRatios.weightLower)
-  }
-
-  private calculateMassCenter(density: number[]): number {
-    const totalMass = density.reduce((sum, mass) => sum + mass, 0)
-    if (!totalMass) return 0
-
-    const weightedSum = density.reduce((sum, mass, position) => sum + position * mass, 0)
-    return Math.round(weightedSum / totalMass)
-  }
-
-  private async findContentBounds(buffer: Buffer) {
-    const { data, info } = await sharp(buffer).raw().ensureAlpha().toBuffer({ resolveWithObject: true })
-
-    const width = info.width
-    const height = info.height
-
-    let left = width
-    let right = 0
-    let top = height
-    let bottom = 0
-
-    // Find actual content boundaries by checking alpha channel
-    for (let y = 0; y < height; y++) {
-      for (let x = 0; x < width; x++) {
-        const idx = (y * width + x) * 4
-        if (data[idx + 3] > 0) {
-          // If pixel is not transparent
-          left = Math.min(left, x)
-          right = Math.max(right, x)
-          top = Math.min(top, y)
-          bottom = Math.max(bottom, y)
-        }
-      }
-    }
-
-    return {
-      width: right - left + 1,
-      height: bottom - top + 1,
-      leftOffset: left,
-      topOffset: top
-    }
-  }
-
-  private async saveSpritesToDisk(id: string, actions: ProcessedSpriteAction[]): Promise<void> {
-    const publicFolder = Storage.getPublicPath('sprites', id)
-    await mkdir(publicFolder, { recursive: true })
-
-    await Promise.all(
-      actions.map(async (action) => {
-        const spritesheet = await this.createSpritesheet(action.buffersWithDimensions)
-        await writeFile(Storage.getPublicPath('sprites', id, `${action.action}.png`), spritesheet)
-      })
-    )
-  }
-
-  private async createSpritesheet(frames: ProcessedFrame[]): Promise<Buffer> {
-    const background = await sharp({
-      create: {
-        width: ISOMETRIC_CONFIG.tileWidth * frames.length,
-        height: frames[0].height,
-        channels: 4,
-        background: { r: 0, g: 0, b: 0, alpha: 0 }
-      }
-    })
-      .png({
-        compressionLevel: 9,
-        adaptiveFiltering: false,
-        palette: true,
-        quality: 100,
-        colors: 256,
-        dither: 0
-      })
-      .toBuffer()
-
-    return sharp(background)
       .composite(
-        frames.map((frame, index) => ({
-          input: frame.buffer,
-          left: index * ISOMETRIC_CONFIG.tileWidth,
-          top: 0,
-          blend: 'over'
+        processedImages.map((buffer, index) => ({
+          input: buffer,
+          left: index * maxWidth,
+          top: 0
         }))
       )
-      .png({
-        compressionLevel: 9,
-        adaptiveFiltering: false,
-        palette: true,
-        quality: 100,
-        colors: 256,
-        dither: 0
-      })
+      .png()
       .toBuffer()
-  }
 
-  private async updateDatabase(id: string, name: string, actions: ProcessedSpriteAction[]): Promise<void> {
-    await prisma.sprite.update({
-      where: { id },
-      data: {
-        name,
-        spriteActions: {
-          deleteMany: { spriteId: id },
-          create: actions.map(this.mapActionToDatabase)
-        }
-      }
-    })
-  }
+      // Ensure directory exists
+      const dir = `public/sprites/${spriteId}`
+      await fs.promises.mkdir(dir, { recursive: true })
 
-  private mapActionToDatabase(action: ProcessedSpriteAction) {
-    return {
-      action: action.action,
-      sprites: action.sprites,
-      originX: action.originX,
-      originY: action.originY,
-      isAnimated: action.isAnimated,
-      isLooping: action.isLooping,
-      frameWidth: action.frameWidth,
-      frameHeight: action.frameHeight,
-      frameRate: action.frameRate
+      // Save the sprite sheet
+      await fs.promises.writeFile(`${dir}/${action}.png`, spriteSheet)
+
+      return true
+    } catch (error) {
+      console.error('Error generating sprite sheet:', error)
+      return false
     }
   }
 
-  private handleError(error: unknown, spriteId: string, callback: (success: boolean) => void): void {
-    gameMasterLogger.error(`Error updating sprite ${spriteId}: ${this.getErrorMessage(error)}`)
-    callback(false)
+  private async processImage(sprite: SpriteImage): Promise<ImageDimensions> {
+    const uri = sprite.url.split(';base64,').pop()
+    if (!uri) throw new Error('Invalid base64 image')
+    const buffer = Buffer.from(uri, 'base64')
+    const metadata = await sharp(buffer).metadata()
+    return {
+      width: metadata.width ?? 0,
+      height: metadata.height ?? 0,
+      offsetX: sprite.offset?.x ?? 0,
+      offsetY: sprite.offset?.y ?? 0
+    }
   }
 
-  private getErrorMessage(error: unknown): string {
-    return error instanceof Error ? error.message : String(error)
+  private calculateEffectiveDimensions(imageDimensions: ImageDimensions): EffectiveDimensions {
+    return {
+      width: imageDimensions.width + Math.abs(imageDimensions.offsetX),
+      height: imageDimensions.height + Math.abs(imageDimensions.offsetY),
+      top: imageDimensions.offsetY >= 0 ? imageDimensions.offsetY : 0,
+      bottom: imageDimensions.offsetY < 0 ? Math.abs(imageDimensions.offsetY) : 0
+    }
+  }
+
+  private async calculateMaxWidth(sprites: SpriteImage[]): Promise<number> {
+    if (!sprites.length) return 0
+
+    // Process all images and get their dimensions
+    const imageData = await Promise.all(sprites.map(sprite => this.processImage(sprite)))
+    const effectiveDimensions = imageData.map(dimensions => this.calculateEffectiveDimensions(dimensions))
+
+    // Calculate maximum width needed
+    return Math.max(...effectiveDimensions.map(d => d.width))
   }
 }

src/events/gameMaster/assetManager/tile/delete.ts

@@ -1,58 +1,36 @@
 import fs from 'fs/promises'
 
-import { Server } from 'socket.io'
-
-import { gameMasterLogger } from '#application/logger'
-import prisma from '#application/prisma'
+import { BaseEvent } from '#application/base/baseEvent'
 import Storage from '#application/storage'
-import { TSocket } from '#application/types'
-import characterRepository from '#repositories/characterRepository'
+import { UUID } from '#application/types'
+import TileRepository from '#repositories/tileRepository'
 
 type Payload = {
-  id: string
+  id: UUID
 }
 
-export default class GMTileDeleteEvent {
-  private readonly public_folder: string
-
-  constructor(
-    private readonly io: Server,
-    private readonly socket: TSocket
-  ) {
-    this.public_folder = Storage.getPublicPath('tiles')
-  }
-
+export default class GMTileDeleteEvent extends BaseEvent {
   public listen(): void {
     this.socket.on('gm:tile:delete', this.handleEvent.bind(this))
   }
 
   private async handleEvent(data: Payload, callback: (response: boolean) => void): Promise<void> {
-    const character = await characterRepository.getById(this.socket.characterId as number)
-    if (!character) return callback(false)
-
-    if (character.role !== 'gm') {
-      return
-    }
-
     try {
-      gameMasterLogger.info(`Deleting tile ${data.id}`)
-      await this.deleteTileFromDatabase(data.id)
+      if (!(await this.isCharacterGM())) return
+
+      this.logger.info(`Deleting tile ${data.id}`)
+
       await this.deleteTileFile(data.id)
 
-      gameMasterLogger.info(`Tile ${data.id} deleted successfully.`)
-      callback(true)
-    } catch (error: any) {
-      gameMasterLogger.error('gm:tile:delete error', error.message)
-      callback(false)
-    }
-  }
+      const tileRepository = new TileRepository()
+      await (await tileRepository.getById(data.id))?.delete()
 
-  private async deleteTileFromDatabase(tileId: string): Promise<void> {
-    await prisma.tile.delete({
-      where: {
-        id: tileId
-      }
-    })
+      this.logger.info(`Tile ${data.id} deleted successfully.`)
+      return callback(true)
+    } catch (error: unknown) {
+      this.logger.error('gm:tile:delete error', error)
+      return callback(false)
+    }
   }
 
   private async deleteTileFile(tileId: string): Promise<void> {
@@ -63,7 +41,7 @@ export default class GMTileDeleteEvent {
       if (error.code !== 'ENOENT') {
         throw error
       }
-      gameMasterLogger.warn(`File ${finalFilePath} does not exist.`)
+      this.logger.warn(`File ${finalFilePath} does not exist.`)
     }
   }
 }