Updated create and update calls to services

#237 - Changed Prisma find calls to repos
Minor improvements for char. type management
2024-11-17 20:59:24 +01:00 · 2024-11-17 19:48:00 +01:00 · 2024-11-17 18:00:58 +01:00 · 2024-11-17 17:53:25 +01:00 · 2024-11-16 23:12:37 +01:00 · 2024-11-16 01:21:35 +01:00
68 changed files with 1413 additions and 833 deletions
--- a/.env.example
+++ b/.env.example
@ -4,6 +4,7 @@ PORT=4000
 DATABASE_URL="mysql://root@localhost:3306/nq"
 REDIS_URL="redis://@127.0.0.1:6379/4"
 JWT_SECRET="secret"
+CLIENT_URL="http://localhost:5173"

 # Game configuration
 ALLOW_DIAGONAL_MOVEMENT=false
@ -17,4 +18,4 @@ DEFAULT_CHARACTER_POS_Y="0"
 SMTP_HOST="my.directonline.io"
 SMTP_PORT="587"
 SMTP_USER="no-reply@sylvan.quest"
-SMTP_PASSWORD="Z%kI*1xe67WuGg"
+SMTP_PASSWORD=""
--- a/package-lock.json
+++ b/package-lock.json
@ -19,7 +19,6 @@
        "prisma": "^5.17.0",
        "sharp": "^0.33.4",
        "socket.io": "^4.7.5",
-        "ts-node": "^10.9.2",
        "typescript": "^5.5.3",
        "zod": "^3.23.8"
      },
@ -30,13 +29,15 @@
        "@types/node": "^20.14.11",
        "@types/nodemailer": "^6.4.16",
        "nodemon": "^3.1.4",
-        "prettier": "^3.3.3"
+        "prettier": "^3.3.3",
+        "ts-node": "^10.9.2"
      }
    },
    "node_modules/@cspotcode/source-map-support": {
      "version": "0.8.1",
      "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz",
      "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@jridgewell/trace-mapping": "0.3.9"
@ -426,6 +427,7 @@
      "version": "3.1.2",
      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
      "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
+      "dev": true,
      "license": "MIT",
      "engines": {
        "node": ">=6.0.0"
@ -435,12 +437,14 @@
      "version": "1.5.0",
      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
      "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
+      "dev": true,
      "license": "MIT"
    },
    "node_modules/@jridgewell/trace-mapping": {
      "version": "0.3.9",
      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz",
      "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@jridgewell/resolve-uri": "^3.0.3",
@ -526,9 +530,9 @@
      ]
    },
    "node_modules/@prisma/client": {
-      "version": "5.21.1",
-      "resolved": "https://registry.npmjs.org/@prisma/client/-/client-5.21.1.tgz",
-      "integrity": "sha512-3n+GgbAZYjaS/k0M03yQsQfR1APbr411r74foknnsGpmhNKBG49VuUkxIU6jORgvJPChoD4WC4PqoHImN1FP0w==",
+      "version": "5.22.0",
+      "resolved": "https://registry.npmjs.org/@prisma/client/-/client-5.22.0.tgz",
+      "integrity": "sha512-M0SVXfyHnQREBKxCgyo7sffrKttwE6R8PMq330MIUF0pTwjUhLbW84pFDlf06B27XyCR++VtjugEnIHdr07SVA==",
      "hasInstallScript": true,
      "license": "Apache-2.0",
      "engines": {
@ -544,48 +548,48 @@
      }
    },
    "node_modules/@prisma/debug": {
-      "version": "5.21.1",
-      "resolved": "https://registry.npmjs.org/@prisma/debug/-/debug-5.21.1.tgz",
-      "integrity": "sha512-uY8SAhcnORhvgtOrNdvWS98Aq/nkQ9QDUxrWAgW8XrCZaI3j2X7zb7Xe6GQSh6xSesKffFbFlkw0c2luHQviZA==",
+      "version": "5.22.0",
+      "resolved": "https://registry.npmjs.org/@prisma/debug/-/debug-5.22.0.tgz",
+      "integrity": "sha512-AUt44v3YJeggO2ZU5BkXI7M4hu9BF2zzH2iF2V5pyXT/lRTyWiElZ7It+bRH1EshoMRxHgpYg4VB6rCM+mG5jQ==",
      "license": "Apache-2.0"
    },
    "node_modules/@prisma/engines": {
-      "version": "5.21.1",
-      "resolved": "https://registry.npmjs.org/@prisma/engines/-/engines-5.21.1.tgz",
-      "integrity": "sha512-hGVTldUkIkTwoV8//hmnAAiAchi4oMEKD3aW5H2RrnI50tTdwza7VQbTTAyN3OIHWlK5DVg6xV7X8N/9dtOydA==",
+      "version": "5.22.0",
+      "resolved": "https://registry.npmjs.org/@prisma/engines/-/engines-5.22.0.tgz",
+      "integrity": "sha512-UNjfslWhAt06kVL3CjkuYpHAWSO6L4kDCVPegV6itt7nD1kSJavd3vhgAEhjglLJJKEdJ7oIqDJ+yHk6qO8gPA==",
      "hasInstallScript": true,
      "license": "Apache-2.0",
      "dependencies": {
-        "@prisma/debug": "5.21.1",
-        "@prisma/engines-version": "5.21.1-1.bf0e5e8a04cada8225617067eaa03d041e2bba36",
-        "@prisma/fetch-engine": "5.21.1",
-        "@prisma/get-platform": "5.21.1"
+        "@prisma/debug": "5.22.0",
+        "@prisma/engines-version": "5.22.0-44.605197351a3c8bdd595af2d2a9bc3025bca48ea2",
+        "@prisma/fetch-engine": "5.22.0",
+        "@prisma/get-platform": "5.22.0"
      }
    },
    "node_modules/@prisma/engines-version": {
-      "version": "5.21.1-1.bf0e5e8a04cada8225617067eaa03d041e2bba36",
-      "resolved": "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-5.21.1-1.bf0e5e8a04cada8225617067eaa03d041e2bba36.tgz",
-      "integrity": "sha512-qvnEflL0//lh44S/T9NcvTMxfyowNeUxTunPcDfKPjyJNrCNf2F1zQLcUv5UHAruECpX+zz21CzsC7V2xAeM7Q==",
+      "version": "5.22.0-44.605197351a3c8bdd595af2d2a9bc3025bca48ea2",
+      "resolved": "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-5.22.0-44.605197351a3c8bdd595af2d2a9bc3025bca48ea2.tgz",
+      "integrity": "sha512-2PTmxFR2yHW/eB3uqWtcgRcgAbG1rwG9ZriSvQw+nnb7c4uCr3RAcGMb6/zfE88SKlC1Nj2ziUvc96Z379mHgQ==",
      "license": "Apache-2.0"
    },
    "node_modules/@prisma/fetch-engine": {
-      "version": "5.21.1",
-      "resolved": "https://registry.npmjs.org/@prisma/fetch-engine/-/fetch-engine-5.21.1.tgz",
-      "integrity": "sha512-70S31vgpCGcp9J+mh/wHtLCkVezLUqe/fGWk3J3JWZIN7prdYSlr1C0niaWUyNK2VflLXYi8kMjAmSxUVq6WGQ==",
+      "version": "5.22.0",
+      "resolved": "https://registry.npmjs.org/@prisma/fetch-engine/-/fetch-engine-5.22.0.tgz",
+      "integrity": "sha512-bkrD/Mc2fSvkQBV5EpoFcZ87AvOgDxbG99488a5cexp5Ccny+UM6MAe/UFkUC0wLYD9+9befNOqGiIJhhq+HbA==",
      "license": "Apache-2.0",
      "dependencies": {
-        "@prisma/debug": "5.21.1",
-        "@prisma/engines-version": "5.21.1-1.bf0e5e8a04cada8225617067eaa03d041e2bba36",
-        "@prisma/get-platform": "5.21.1"
+        "@prisma/debug": "5.22.0",
+        "@prisma/engines-version": "5.22.0-44.605197351a3c8bdd595af2d2a9bc3025bca48ea2",
+        "@prisma/get-platform": "5.22.0"
      }
    },
    "node_modules/@prisma/get-platform": {
-      "version": "5.21.1",
-      "resolved": "https://registry.npmjs.org/@prisma/get-platform/-/get-platform-5.21.1.tgz",
-      "integrity": "sha512-sRxjL3Igst3ct+e8ya/x//cDXmpLbZQ5vfps2N4tWl4VGKQAmym77C/IG/psSMsQKszc8uFC/q1dgmKFLUgXZQ==",
+      "version": "5.22.0",
+      "resolved": "https://registry.npmjs.org/@prisma/get-platform/-/get-platform-5.22.0.tgz",
+      "integrity": "sha512-pHhpQdr1UPFpt+zFfnPazhulaZYCUqeIcPpJViYoq9R+D/yw4fjE+CtnsnKzPYm0ddUbeXUzjGVGIRVgPDCk4Q==",
      "license": "Apache-2.0",
      "dependencies": {
-        "@prisma/debug": "5.21.1"
+        "@prisma/debug": "5.22.0"
      }
    },
    "node_modules/@socket.io/component-emitter": {
@ -598,24 +602,28 @@
      "version": "1.0.11",
      "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.11.tgz",
      "integrity": "sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==",
+      "dev": true,
      "license": "MIT"
    },
    "node_modules/@tsconfig/node12": {
      "version": "1.0.11",
      "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz",
      "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==",
+      "dev": true,
      "license": "MIT"
    },
    "node_modules/@tsconfig/node14": {
      "version": "1.0.3",
      "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz",
      "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==",
+      "dev": true,
      "license": "MIT"
    },
    "node_modules/@tsconfig/node16": {
      "version": "1.0.4",
      "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz",
      "integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==",
+      "dev": true,
      "license": "MIT"
    },
    "node_modules/@types/bcryptjs": {
@ -721,9 +729,9 @@
      "license": "MIT"
    },
    "node_modules/@types/node": {
-      "version": "20.17.5",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.17.5.tgz",
-      "integrity": "sha512-n8FYY/pRxu496441gIcAQFZPKXbhsd6VZygcq+PTSZ75eMh/Ke0hCAROdUa21qiFqKNsPPYic46yXDO1JGiPBQ==",
+      "version": "20.17.6",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.17.6.tgz",
+      "integrity": "sha512-VEI7OdvK2wP7XHnsuXbAJnEpEkF6NjSN45QJlL4VGqZSXsnicpesdTWsg9RISeSdYd3yeRj/y3k5KGjUXYnFwQ==",
      "license": "MIT",
      "dependencies": {
        "undici-types": "~6.19.2"
@ -740,9 +748,9 @@
      }
    },
    "node_modules/@types/qs": {
-      "version": "6.9.16",
-      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.16.tgz",
-      "integrity": "sha512-7i+zxXdPD0T4cKDuxCUXJ4wHcsJLwENa6Z3dCu8cfCK743OGy5Nu1RmAGqDPsoTDINVEcdXKRvR/zre+P2Ku1A==",
+      "version": "6.9.17",
+      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.17.tgz",
+      "integrity": "sha512-rX4/bPcfmvxHDv0XjfJELTTr+iB+tn032nPILqHm5wbthUUUuVtNGGqzhya9XUxjTP8Fpr0qYgSZZKxGY++svQ==",
      "dev": true,
      "license": "MIT"
    },
@ -793,6 +801,7 @@
      "version": "8.14.0",
      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz",
      "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==",
+      "dev": true,
      "license": "MIT",
      "bin": {
        "acorn": "bin/acorn"
@ -805,6 +814,7 @@
      "version": "8.3.4",
      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.4.tgz",
      "integrity": "sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "acorn": "^8.11.0"
@ -831,6 +841,7 @@
      "version": "4.1.3",
      "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
      "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
+      "dev": true,
      "license": "MIT"
    },
    "node_modules/array-flatten": {
@ -938,14 +949,14 @@
      "license": "BSD-3-Clause"
    },
    "node_modules/bullmq": {
-      "version": "5.23.0",
-      "resolved": "https://registry.npmjs.org/bullmq/-/bullmq-5.23.0.tgz",
-      "integrity": "sha512-VILKTIOwo9AopMyVqvDhQ1qyLrOtBSfu+G2bntgauQfxYzT7ETj+h2HeUe7a9i9AU/+OXJGYYm49NHJedEz7VQ==",
+      "version": "5.26.2",
+      "resolved": "https://registry.npmjs.org/bullmq/-/bullmq-5.26.2.tgz",
+      "integrity": "sha512-UdHBrJoRkpXoF8b/FVEkuRBnaUZoA7+qHQNyTx1n2oNVZ4iWxqGqss+M9xAwXOpBmSNvOSlaBdHpf+5QJTU8GQ==",
      "license": "MIT",
      "dependencies": {
        "cron-parser": "^4.6.0",
        "ioredis": "^5.4.1",
-        "msgpackr": "^1.10.1",
+        "msgpackr": "^1.11.2",
        "node-abort-controller": "^3.1.1",
        "semver": "^7.5.4",
        "tslib": "^2.0.0",
@ -1115,6 +1126,7 @@
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
      "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
+      "dev": true,
      "license": "MIT"
    },
    "node_modules/cron-parser": {
@ -1196,6 +1208,7 @@
      "version": "4.0.2",
      "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
      "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
+      "dev": true,
      "license": "BSD-3-Clause",
      "engines": {
        "node": ">=0.3.1"
@ -1825,6 +1838,7 @@
      "version": "1.3.6",
      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
+      "dev": true,
      "license": "ISC"
    },
    "node_modules/media-typer": {
@ -2050,9 +2064,9 @@
      }
    },
    "node_modules/object-inspect": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz",
-      "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==",
+      "version": "1.13.3",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.3.tgz",
+      "integrity": "sha512-kDCGIbxkDSXE3euJZZXzc6to7fCrKHNI/hSRQnRuQ+BWjFNzZwiFF8fj/6o2t2G9/jTj8PSIYTfCLelLZEeRpA==",
      "license": "MIT",
      "engines": {
        "node": ">= 0.4"
@ -2164,13 +2178,13 @@
      }
    },
    "node_modules/prisma": {
-      "version": "5.21.1",
-      "resolved": "https://registry.npmjs.org/prisma/-/prisma-5.21.1.tgz",
-      "integrity": "sha512-PB+Iqzld/uQBPaaw2UVIk84kb0ITsLajzsxzsadxxl54eaU5Gyl2/L02ysivHxK89t7YrfQJm+Ggk37uvM70oQ==",
+      "version": "5.22.0",
+      "resolved": "https://registry.npmjs.org/prisma/-/prisma-5.22.0.tgz",
+      "integrity": "sha512-vtpjW3XuYCSnMsNVBjLMNkTj6OZbudcPPTPYHqX0CJfpcdWciI1dM8uHETwmDxxiqEwCIE6WvXucWUetJgfu/A==",
      "hasInstallScript": true,
      "license": "Apache-2.0",
      "dependencies": {
-        "@prisma/engines": "5.21.1"
+        "@prisma/engines": "5.22.0"
      },
      "bin": {
        "prisma": "build/index.js"
@ -2700,6 +2714,7 @@
      "version": "10.9.2",
      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz",
      "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==",
+      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@cspotcode/source-map-support": "^0.8.0",
@ -2819,6 +2834,7 @@
      "version": "3.0.1",
      "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz",
      "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==",
+      "dev": true,
      "license": "MIT"
    },
    "node_modules/vary": {
@ -2855,6 +2871,7 @@
      "version": "3.1.1",
      "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
      "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
+      "dev": true,
      "license": "MIT",
      "engines": {
        "node": ">=6"
--- a/package.json
+++ b/package.json
@ -20,7 +20,6 @@
    "prisma": "^5.17.0",
    "sharp": "^0.33.4",
    "socket.io": "^4.7.5",
-    "ts-node": "^10.9.2",
    "typescript": "^5.5.3",
    "zod": "^3.23.8"
  },
@ -30,6 +29,7 @@
    "@types/jsonwebtoken": "^9.0.6",
    "@types/node": "^20.14.11",
    "@types/nodemailer": "^6.4.16",
+    "ts-node": "^10.9.2",
    "nodemon": "^3.1.4",
    "prettier": "^3.3.3"
  }
--- a/prisma/migrations/20241113010305_init/migration.sql
+++ b/prisma/migrations/20241113010305_init/migration.sql
@ -1,3 +1,14 @@
+-- CreateTable
+CREATE TABLE `World` (
+    `date` DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3),
+    `isRainEnabled` BOOLEAN NOT NULL DEFAULT false,
+    `rainPercentage` INTEGER NOT NULL DEFAULT 0,
+    `isFogEnabled` BOOLEAN NOT NULL DEFAULT false,
+    `fogDensity` INTEGER NOT NULL DEFAULT 0,
+
+    UNIQUE INDEX `World_date_key`(`date`)
+) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+
 -- CreateTable
 CREATE TABLE `Chat` (
    `id` INTEGER NOT NULL AUTO_INCREMENT,
--- a/prisma/migrations/20241114191537_set_default_value_for_created_at_in_chat/migration.sql
+++ b/prisma/migrations/20241114191537_set_default_value_for_created_at_in_chat/migration.sql
@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE `Chat` MODIFY `createdAt` DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3);
--- a/prisma/migrations/20241117163808_added_selectable_field_to_character_types/migration.sql
+++ b/prisma/migrations/20241117163808_added_selectable_field_to_character_types/migration.sql
@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE `CharacterType` ADD COLUMN `isEnabledForCharCreation` BOOLEAN NOT NULL DEFAULT false;
--- a/prisma/schema/sprite.prisma
+++ b/prisma/schema/sprite.prisma
@ -1,3 +1,21 @@
+model World {
+  date           DateTime @unique @default(now())
+  isRainEnabled  Boolean  @default(false)
+  rainPercentage Int      @default(0)
+  isFogEnabled   Boolean  @default(false)
+  fogDensity     Int      @default(0)
+}
+
+model Chat {
+  id          Int       @id @default(autoincrement())
+  characterId Int
+  character   Character @relation(fields: [characterId], references: [id], onDelete: Cascade)
+  zoneId      Int
+  zone        Zone      @relation(fields: [zoneId], references: [id], onDelete: Cascade)
+  message     String
+  createdAt   DateTime  @default(now())
+}
+
 model Sprite {
  id             String          @id @default(uuid())
  name           String
@ -13,8 +31,8 @@ model SpriteAction {
  sprite      Sprite  @relation(fields: [spriteId], references: [id], onDelete: Cascade)
  action      String
  sprites     Json?
-  originX    Decimal @default(0)
-  originY    Decimal @default(0)
+  originX     Decimal @default(0)
+  originY     Decimal @default(0)
  isAnimated  Boolean @default(false)
  isLooping   Boolean @default(false)
  frameWidth  Int     @default(0)
--- a/prisma/schema/schema.prisma
+++ b/prisma/schema/schema.prisma
@ -11,7 +11,7 @@
 // npx prisma migrate deploy

 generator client {
-  provider = "prisma-client-js"
+  provider        = "prisma-client-js"
  previewFeatures = ["prismaSchemaFolder"]
 }

@ -19,13 +19,3 @@ datasource db {
  provider = "mysql"
  url      = env("DATABASE_URL")
 }
-
-model Chat {
-  id          Int       @id @default(autoincrement())
-  characterId Int
-  character   Character @relation(fields: [characterId], references: [id], onDelete: Cascade)
-  zoneId      Int
-  zone        Zone      @relation(fields: [zoneId], references: [id], onDelete: Cascade)
-  message     String
-  createdAt   DateTime
-}
--- a/prisma/schema/user.prisma
+++ b/prisma/schema/user.prisma
@ -1,11 +1,11 @@
 model User {
-  id                   Int                  @id @default(autoincrement())
-  username             String               @unique
-  email                String               @unique
-  password             String
-  online               Boolean              @default(false)
-  characters           Character[]
-  passwordResetTokens  PasswordResetToken[]
+  id                  Int                  @id @default(autoincrement())
+  username            String               @unique
+  email               String               @unique
+  password            String
+  online              Boolean              @default(false)
+  characters          Character[]
+  passwordResetTokens PasswordResetToken[]
 }

 model PasswordResetToken {
@ -30,15 +30,16 @@ enum CharacterRace {
 }

 model CharacterType {
-  id         Int             @id @default(autoincrement())
-  name       String
-  gender     CharacterGender
-  race       CharacterRace
-  characters Character[]
-  spriteId   String?
-  sprite     Sprite?         @relation(fields: [spriteId], references: [id], onDelete: Cascade)
-  createdAt  DateTime        @default(now())
-  updatedAt  DateTime        @updatedAt
+  id                       Int             @id @default(autoincrement())
+  name                     String
+  gender                   CharacterGender
+  race                     CharacterRace
+  isEnabledForCharCreation Boolean         @default(false)
+  characters               Character[]
+  spriteId                 String?
+  sprite                   Sprite?         @relation(fields: [spriteId], references: [id], onDelete: Cascade)
+  createdAt                DateTime        @default(now())
+  updatedAt                DateTime        @updatedAt
 }

 model Character {
@ -71,4 +72,4 @@ model CharacterItem {
  itemId      String
  item        Item      @relation(fields: [itemId], references: [id], onDelete: Cascade)
  quantity    Int
-}
+}
--- a/src/managers/characterManager.ts
+++ b/src/managers/characterManager.ts
@ -1,42 +0,0 @@
-import { ExtendedCharacter, TSocket } from '../utilities/types'
-import { Zone } from '@prisma/client'
-import prisma from '../utilities/prisma'
-
-class CharacterManager {
-  private characters!: ExtendedCharacter[]
-
-  public async boot() {
-    this.characters = []
-  }
-
-  public initCharacter(character: ExtendedCharacter) {
-    this.characters = [...this.characters, character]
-  }
-
-  public async removeCharacter(character: ExtendedCharacter) {
-    await prisma.character.update({
-      where: { id: character.id },
-      data: {
-        positionX: character.positionX,
-        positionY: character.positionY,
-        rotation: character.rotation,
-        zoneId: character.zoneId
-      }
-    })
-    this.characters = this.characters.filter((x) => x.id !== character.id)
-  }
-
-  public getCharacterFromSocket(socket: TSocket) {
-    return this.characters.find((x) => x.id === socket?.characterId)
-  }
-
-  public hasResetMovement(character: ExtendedCharacter) {
-    return this.characters.find((x) => x.id === character.id)?.resetMovement
-  }
-
-  public getCharactersInZone(zone: Zone) {
-    return this.characters.filter((x) => x.zoneId === zone.id)
-  }
-}
-
-export default new CharacterManager()
--- a/src/managers/dateManager.ts
+++ b/src/managers/dateManager.ts
@ -1,7 +1,7 @@
 import { Server } from 'socket.io'
 import { appLogger } from '../utilities/logger'
-import { getRootPath } from '../utilities/storage'
-import { readJsonValue, setJsonValue } from '../utilities/json'
+import worldService from '../services/worldService'
+import worldRepository from '../repositories/worldRepository'

 class DateManager {
  private static readonly GAME_SPEED = 8 // 24 game hours / 3 real hours
@ -18,17 +18,37 @@ class DateManager {
    appLogger.info('Date manager loaded')
  }

-  public stop(): void {
-    if (this.intervalId) {
-      clearInterval(this.intervalId)
-      this.intervalId = null
+  public async setTime(time: string): Promise<void> {
+    try {
+      let newDate: Date
+
+      // Check if it's just a time (HH:mm or HH:mm:ss format)
+      if (/^\d{1,2}:\d{2}(:\d{2})?$/.test(time)) {
+        const [hours, minutes] = time.split(':').map(Number)
+        newDate = new Date(this.currentDate) // Clone current date
+        newDate.setHours(hours, minutes)
+      } else {
+        // Treat as full datetime string
+        newDate = new Date(time)
+        if (isNaN(newDate.getTime())) return
+      }
+
+      this.currentDate = newDate
+      this.emitDate()
+      await this.saveDate()
+    } catch (error) {
+      appLogger.error(`Failed to set time: ${error instanceof Error ? error.message : String(error)}`)
+      throw error
    }
  }

  private async loadDate(): Promise<void> {
    try {
-      const dateString = await readJsonValue<string>(this.getWorldFilePath(), 'date')
-      this.currentDate = new Date(dateString)
+      const world = await worldRepository.getFirst()
+
+      if (world) {
+        this.currentDate = world.date
+      }
    } catch (error) {
      appLogger.error(`Failed to load date: ${error instanceof Error ? error.message : String(error)}`)
      this.currentDate = new Date() // Use current date as fallback
@ -39,7 +59,7 @@ class DateManager {
    this.intervalId = setInterval(() => {
      this.advanceGameTime()
      this.emitDate()
-      this.saveDate()
+      void this.saveDate()
    }, DateManager.UPDATE_INTERVAL)
  }

@ -54,14 +74,22 @@ class DateManager {

  private async saveDate(): Promise<void> {
    try {
-      await setJsonValue(this.getWorldFilePath(), 'date', this.currentDate)
+      await worldService.update({
+        date: this.currentDate
+      })
    } catch (error) {
      appLogger.error(`Failed to save date: ${error instanceof Error ? error.message : String(error)}`)
    }
  }

-  private getWorldFilePath(): string {
-    return getRootPath('data', 'world.json')
+  public cleanup(): void {
+    if (this.intervalId) {
+      clearInterval(this.intervalId)
+    }
+  }
+
+  public getCurrentDate(): Date {
+    return this.currentDate
  }
 }

--- a/src/managers/weatherManager.ts
+++ b/src/managers/weatherManager.ts
@ -0,0 +1,127 @@
+import { Server } from 'socket.io'
+import { appLogger } from '../utilities/logger'
+import worldService from '../services/worldService'
+import worldRepository from '../repositories/worldRepository'
+
+interface WeatherState {
+  isRainEnabled: boolean
+  rainPercentage: number
+  isFogEnabled: boolean
+  fogDensity: number
+}
+
+class WeatherManager {
+  private static readonly UPDATE_INTERVAL = 60000 // Check weather every minute
+  private static readonly RAIN_CHANCE = 0.2 // 20% chance of rain
+  private static readonly FOG_CHANCE = 0.15 // 15% chance of fog
+
+  private io: Server | null = null
+  private intervalId: NodeJS.Timeout | null = null
+  private weatherState: WeatherState = {
+    isRainEnabled: false,
+    rainPercentage: 0,
+    isFogEnabled: false,
+    fogDensity: 0
+  }
+
+  public async boot(io: Server): Promise<void> {
+    this.io = io
+    await this.loadWeather()
+    this.startWeatherLoop()
+    appLogger.info('Weather manager loaded')
+  }
+
+  public async toggleRain(): Promise<void> {
+    this.weatherState.isRainEnabled = !this.weatherState.isRainEnabled
+    this.weatherState.rainPercentage = this.weatherState.isRainEnabled
+      ? Math.floor(Math.random() * 50) + 50 // 50-100%
+      : 0
+
+    await this.saveWeather()
+    this.emitWeather()
+  }
+
+  public async toggleFog(): Promise<void> {
+    this.weatherState.isFogEnabled = !this.weatherState.isFogEnabled
+    this.weatherState.fogDensity = this.weatherState.isFogEnabled
+      ? Math.floor((Math.random() * 0.7 + 0.3) * 100) // Convert 0.3-1.0 to 30-100
+      : 0
+
+    await this.saveWeather()
+    this.emitWeather()
+  }
+
+  private async loadWeather(): Promise<void> {
+    try {
+      const world = await worldRepository.getFirst()
+
+      if (world) {
+        this.weatherState = {
+          isRainEnabled: world.isRainEnabled,
+          rainPercentage: world.rainPercentage,
+          isFogEnabled: world.isFogEnabled,
+          fogDensity: world.fogDensity
+        }
+      }
+    } catch (error) {
+      appLogger.error(`Failed to load weather: ${error instanceof Error ? error.message : String(error)}`)
+    }
+  }
+
+  public getWeatherState(): WeatherState {
+    return this.weatherState
+  }
+
+  private startWeatherLoop(): void {
+    this.intervalId = setInterval(async () => {
+      this.updateWeather()
+      this.emitWeather()
+      await this.saveWeather().catch((error) => {
+        appLogger.error(`Failed to save weather: ${error instanceof Error ? error.message : String(error)}`)
+      })
+    }, WeatherManager.UPDATE_INTERVAL)
+  }
+
+  private updateWeather(): void {
+    // Update rain
+    if (Math.random() < WeatherManager.RAIN_CHANCE) {
+      this.weatherState.isRainEnabled = !this.weatherState.isRainEnabled
+      this.weatherState.rainPercentage = this.weatherState.isRainEnabled
+        ? Math.floor(Math.random() * 50) + 50 // 50-100%
+        : 0
+    }
+
+    // Update fog
+    if (Math.random() < WeatherManager.FOG_CHANCE) {
+      this.weatherState.isFogEnabled = !this.weatherState.isFogEnabled
+      this.weatherState.fogDensity = this.weatherState.isFogEnabled
+        ? Math.floor((Math.random() * 0.7 + 0.3) * 100) // Convert 0.3-1.0 to 30-100
+        : 0
+    }
+  }
+
+  private emitWeather(): void {
+    this.io?.emit('weather', this.weatherState)
+  }
+
+  private async saveWeather(): Promise<void> {
+    try {
+      await worldService.update({
+        isRainEnabled: this.weatherState.isRainEnabled,
+        rainPercentage: this.weatherState.rainPercentage,
+        isFogEnabled: this.weatherState.isFogEnabled,
+        fogDensity: this.weatherState.fogDensity
+      })
+    } catch (error) {
+      appLogger.error(`Failed to save weather: ${error instanceof Error ? error.message : String(error)}`)
+    }
+  }
+
+  public cleanup(): void {
+    if (this.intervalId) {
+      clearInterval(this.intervalId)
+    }
+  }
+}
+
+export default new WeatherManager()
--- a/src/managers/zoneManager.ts
+++ b/src/managers/zoneManager.ts
@ -3,53 +3,53 @@ import ZoneRepository from '../repositories/zoneRepository'
 import ZoneService from '../services/zoneService'
 import LoadedZone from '../models/loadedZone'
 import { gameLogger } from '../utilities/logger'
+import ZoneCharacter from '../models/zoneCharacter'

 class ZoneManager {
-  private loadedZones: LoadedZone[] = []
+  private readonly zones = new Map<number, LoadedZone>()

-  // Method to initialize zoneEditor manager
-  public async boot() {
+  public async boot(): Promise<void> {
+    // Create first zone if it doesn't exist
    if (!(await ZoneRepository.getById(1))) {
-      const zoneService = new ZoneService()
-      await zoneService.createDemoZone()
+      await new ZoneService().createDemoZone()
    }

    const zones = await ZoneRepository.getAll()
+    await Promise.all(zones.map((zone) => this.loadZone(zone)))

-    for (const zone of zones) {
-      await this.loadZone(zone)
-    }
-
-    gameLogger.info('Zone manager loaded')
+    gameLogger.info(`Zone manager loaded with ${this.zones.size} zones`)
  }

-  // Method to handle individual zoneEditor loading
-  public async loadZone(zone: Zone) {
+  public async loadZone(zone: Zone): Promise<void> {
    const loadedZone = new LoadedZone(zone)
-    this.loadedZones.push(loadedZone)
+    this.zones.set(zone.id, loadedZone)
    gameLogger.info(`Zone ID ${zone.id} loaded`)
  }

-  // Method to handle individual zoneEditor unloading
-  public unloadZone(zoneId: number) {
-    this.loadedZones = this.loadedZones.filter((loadedZone) => loadedZone.getZone().id !== zoneId)
+  public unloadZone(zoneId: number): void {
+    this.zones.delete(zoneId)
    gameLogger.info(`Zone ID ${zoneId} unloaded`)
  }

-  // Getter for loaded zones
  public getLoadedZones(): LoadedZone[] {
-    return this.loadedZones
+    return Array.from(this.zones.values())
  }

-  // Getter for zone by id
  public getZoneById(zoneId: number): LoadedZone | undefined {
-    return this.loadedZones.find((loadedZone) => loadedZone.getZone().id === zoneId)
+    return this.zones.get(zoneId)
  }
-}

-export interface ZoneAssets {
-  tiles: string[]
-  objects: string[]
+  public getCharacter(characterId: number): ZoneCharacter | undefined {
+    for (const zone of this.zones.values()) {
+      const character = zone.getCharactersInZone().find((char) => char.character.id === characterId)
+      if (character) return character
+    }
+    return undefined
+  }
+
+  public removeCharacter(characterId: number): void {
+    this.zones.forEach((zone) => zone.removeCharacter(characterId))
+  }
 }

 export default new ZoneManager()
--- a/src/middleware/authentication.ts
+++ b/src/middleware/authentication.ts
@ -37,7 +37,7 @@ export async function Authentication(socket: TSocket, next: any) {
        return next(new Error('Authentication error'))
      }

-      socket.user = (await UserRepository.getById(decoded.id)) as User
+      socket.userId = decoded.id
      next()
    })
  } else {
--- a/src/models/loadedZone.ts
+++ b/src/models/loadedZone.ts
@ -1,9 +1,10 @@
-import { Zone } from '@prisma/client'
-import zoneRepository from '../repositories/zoneRepository'
+import { Character, Zone } from '@prisma/client'
+import zoneEventTileRepository from '../repositories/zoneEventTileRepository'
+import ZoneCharacter from './zoneCharacter'

 class LoadedZone {
  private readonly zone: Zone
-  // private readonly npcs: ZoneNPC[] = []
+  private characters: ZoneCharacter[] = []

  constructor(zone: Zone) {
    this.zone = zone
@ -13,10 +14,31 @@ class LoadedZone {
    return this.zone
  }

+  public addCharacter(character: Character) {
+    const zoneCharacter = new ZoneCharacter(character)
+    this.characters.push(zoneCharacter)
+  }
+
+  public async removeCharacter(id: number) {
+    const zoneCharacter = this.getCharacterById(id)
+    if (zoneCharacter) {
+      await zoneCharacter.savePosition()
+      this.characters = this.characters.filter((c) => c.character.id !== id)
+    }
+  }
+
+  public getCharacterById(id: number): ZoneCharacter | undefined {
+    return this.characters.find((c) => c.character.id === id)
+  }
+
+  public getCharactersInZone(): ZoneCharacter[] {
+    return this.characters
+  }
+
  public async getGrid(): Promise<number[][]> {
    let grid: number[][] = Array.from({ length: this.zone.height }, () => Array.from({ length: this.zone.width }, () => 0))

-    const eventTiles = await zoneRepository.getEventTiles(this.zone.id)
+    const eventTiles = await zoneEventTileRepository.getAll(this.zone.id)

    // Set the grid values based on the event tiles, these are strings
    eventTiles.forEach((eventTile) => {
@ -27,20 +49,6 @@ class LoadedZone {

    return grid
  }
-
-  /**
-   * @TODO: Implement this
-   * @param position
-   */
-  public async isPositionWalkable(position: { x: number; y: number }): Promise<boolean> {
-    const grid = await this.getGrid()
-    if (!grid?.length) return false
-
-    const gridX = Math.floor(position.x)
-    const gridY = Math.floor(position.y)
-
-    return grid[gridY]?.[gridX] === 1 || grid[gridY]?.[Math.ceil(position.x)] === 1 || grid[Math.ceil(position.y)]?.[gridX] === 1 || grid[Math.ceil(position.y)]?.[Math.ceil(position.x)] === 1
-  }
 }

 export default LoadedZone
--- a/src/models/zoneCharacter.ts
+++ b/src/models/zoneCharacter.ts
@ -0,0 +1,19 @@
+import { Character } from '@prisma/client'
+import { CharacterService } from '../services/character/characterService'
+
+class ZoneCharacter {
+  public readonly character: Character
+  public isMoving: boolean = false
+  public currentPath: Array<{ x: number; y: number }> | null = null
+
+  constructor(character: Character) {
+    this.character = character
+  }
+
+  public async savePosition() {
+    const characterService = new CharacterService()
+    await characterService.updateCharacterPosition(this.character.id, this.character.positionX, this.character.positionY, this.character.rotation, this.character.zoneId)
+  }
+}
+
+export default ZoneCharacter
--- a/src/repositories/characterRepository.ts
+++ b/src/repositories/characterRepository.ts
@ -1,5 +1,6 @@
 import prisma from '../utilities/prisma' // Import the global Prisma instance
 import { Character } from '@prisma/client'
+import { appLogger } from '../utilities/logger'

 class CharacterRepository {
  async getByUserId(userId: number): Promise<Character[] | null> {
@ -19,7 +20,8 @@ class CharacterRepository {
      })
    } catch (error: any) {
      // Handle error
-      throw new Error(`Failed to get character by user ID: ${error.message}`)
+      appLogger.error(`Failed to get character by user ID: ${error instanceof Error ? error.message : String(error)}`)
+      return null
    }
  }

@ -41,7 +43,8 @@ class CharacterRepository {
      })
    } catch (error: any) {
      // Handle error
-      throw new Error(`Failed to get character by user ID and character ID: ${error.message}`)
+      appLogger.error(`Failed to get character by user ID and character ID: ${error instanceof Error ? error.message : String(error)}`)
+      return null
    }
  }

@ -62,7 +65,8 @@ class CharacterRepository {
      })
    } catch (error: any) {
      // Handle error
-      throw new Error(`Failed to get character by ID: ${error.message}`)
+      appLogger.error(`Failed to get character by ID: ${error instanceof Error ? error.message : String(error)}`)
+      return null
    }
  }

@ -79,7 +83,8 @@ class CharacterRepository {
      })
    } catch (error: any) {
      // Handle error
-      throw new Error(`Failed to update character: ${error.message}`)
+      appLogger.error(`Failed to update character: ${error instanceof Error ? error.message : String(error)}`)
+      return null
    }
  }

@ -93,7 +98,8 @@ class CharacterRepository {
      })
    } catch (error: any) {
      // Handle error
-      throw new Error(`Failed to delete character by user ID and character ID: ${error.message}`)
+      appLogger.error(`Failed to delete character by user ID and character ID: ${error instanceof Error ? error.message : String(error)}`)
+      return null
    }
  }

@ -114,7 +120,8 @@ class CharacterRepository {
      })
    } catch (error: any) {
      // Handle error
-      throw new Error(`Failed to get character by name: ${error.message}`)
+      appLogger.error(`Failed to get character by name: ${error instanceof Error ? error.message : String(error)}`)
+      return null
    }
  }
 }
--- a/src/repositories/chatRepository.ts
+++ b/src/repositories/chatRepository.ts
@ -0,0 +1,49 @@
+import prisma from '../utilities/prisma'
+import { Chat } from '@prisma/client'
+
+class ChatRepository {
+  async getById(id: number): Promise<Chat | null> {
+    return prisma.chat.findUnique({
+      where: { id },
+      include: {
+        character: true,
+        zone: true
+      }
+    })
+  }
+
+  async getAll(): Promise<Chat[]> {
+    return prisma.chat.findMany({
+      include: {
+        character: true,
+        zone: true
+      }
+    })
+  }
+
+  async getByCharacterId(characterId: number): Promise<Chat[]> {
+    return prisma.chat.findMany({
+      where: {
+        characterId
+      },
+      include: {
+        character: true,
+        zone: true
+      }
+    })
+  }
+
+  async getByZoneId(zoneId: number): Promise<Chat[]> {
+    return prisma.chat.findMany({
+      where: {
+        zoneId
+      },
+      include: {
+        character: true,
+        zone: true
+      }
+    })
+  }
+}
+
+export default new ChatRepository()
--- a/src/repositories/passwordResetTokenRepository.ts
+++ b/src/repositories/passwordResetTokenRepository.ts
@ -1,4 +1,5 @@
-import prisma from '../utilities/prisma' // Import the global Prisma instance
+import prisma from '../utilities/prisma'
+import { appLogger } from '../utilities/logger' // Import the global Prisma instance

 class PasswordResetTokenRepository {
  async getById(id: number): Promise<any> {
@ -10,7 +11,7 @@ class PasswordResetTokenRepository {
      })
    } catch (error: any) {
      // Handle error
-      throw new Error(`Failed to get password reset token by ID: ${error.message}`)
+      appLogger.error(`Failed to get password reset token by ID: ${error instanceof Error ? error.message : String(error)}`)
    }
  }

@ -23,7 +24,7 @@ class PasswordResetTokenRepository {
      })
    } catch (error: any) {
      // Handle error
-      throw new Error(`Failed to get password reset token by user ID: ${error.message}`)
+      appLogger.error(`Failed to get password reset token by user ID: ${error instanceof Error ? error.message : String(error)}`)
    }
  }

@ -36,7 +37,7 @@ class PasswordResetTokenRepository {
      })
    } catch (error: any) {
      // Handle error
-      throw new Error(`Failed to get password reset token by token: ${error.message}`)
+      appLogger.error(`Failed to get password reset token by token: ${error instanceof Error ? error.message : String(error)}`)
    }
  }
 }
--- a/src/repositories/userRepository.ts
+++ b/src/repositories/userRepository.ts
@ -1,5 +1,6 @@
 import prisma from '../utilities/prisma' // Import the global Prisma instance
 import { User } from '@prisma/client'
+import { appLogger } from '../utilities/logger'

 class UserRepository {
  async getById(id: number): Promise<User | null> {
@ -11,7 +12,8 @@ class UserRepository {
      })
    } catch (error: any) {
      // Handle error
-      throw new Error(`Failed to get user by ID: ${error.message}`)
+      appLogger.error(`Failed to get user by ID: ${error instanceof Error ? error.message : String(error)}`)
+      return null
    }
  }

@ -24,7 +26,8 @@ class UserRepository {
      })
    } catch (error: any) {
      // Handle error
-      throw new Error(`Failed to get user by username: ${error.message}`)
+      appLogger.error(`Failed to get user by username: ${error instanceof Error ? error.message : String(error)}`)
+      return null
    }
  }

@ -37,7 +40,8 @@ class UserRepository {
      })
    } catch (error: any) {
      // Handle error
-      throw new Error(`Failed to get user by email: ${error.message}`)
+      appLogger.error(`Failed to get user by email: ${error instanceof Error ? error.message : String(error)}`)
+      return null
    }
  }
 }
--- a/src/repositories/worldRepository.ts
+++ b/src/repositories/worldRepository.ts
@ -0,0 +1,19 @@
+import prisma from '../utilities/prisma' // Import the global Prisma instance
+import { World } from '@prisma/client'
+import { gameLogger } from '../utilities/logger'
+
+class WorldRepository {
+  async getFirst(): Promise<World | null> {
+    try {
+      return await prisma.world.findFirst({
+        orderBy: { date: 'desc' }
+      })
+    } catch (error: any) {
+      // Handle error
+      gameLogger.error(`Failed to get first world: ${error instanceof Error ? error.message : String(error)}`)
+      return null
+    }
+  }
+}
+
+export default new WorldRepository()
--- a/src/repositories/zoneEventTileRepository.ts
+++ b/src/repositories/zoneEventTileRepository.ts
@ -0,0 +1,37 @@
+import { ZoneEventTile } from '@prisma/client'
+import prisma from '../utilities/prisma'
+import { appLogger } from '../utilities/logger'
+
+class ZoneEventTileRepository {
+
+  async getAll(id: number): Promise<ZoneEventTile[]> {
+    try {
+      return await prisma.zoneEventTile.findMany({
+        where: {
+          zoneId: id
+        }
+      })
+    } catch (error: any) {
+      appLogger.error(`Failed to get zone event tiles: ${error.message}`)
+      return []
+    }
+  }
+
+  async getEventTileByZoneIdAndPosition(zoneId: number, positionX: number, positionY: number) {
+    try {
+      return await prisma.zoneEventTile.findFirst({
+        where: {
+          zoneId: zoneId,
+          positionX: positionX,
+          positionY: positionY
+        },
+        include: { teleport: true }
+      })
+    } catch (error: any) {
+      appLogger.error(`Failed to get zone event tile: ${error.message}`)
+      return null
+    }
+  }
+}
+
+export default new ZoneEventTileRepository()
--- a/src/repositories/zoneRepository.ts
+++ b/src/repositories/zoneRepository.ts
@ -1,20 +1,9 @@
 import { Zone, ZoneEventTile, ZoneEventTileType, ZoneObject } from '@prisma/client'
 import prisma from '../utilities/prisma'
-import { ZoneEventTileWithTeleport } from '../socketEvents/zone/characterMove'
+import { ZoneEventTileWithTeleport } from '../utilities/types'
 import { appLogger } from '../utilities/logger'
-import { AssetData } from '../utilities/types'
-import tileRepository from './tileRepository'

 class ZoneRepository {
-  async getFirst(): Promise<Zone | null> {
-    try {
-      return await prisma.zone.findFirst()
-    } catch (error: any) {
-      appLogger.error(`Failed to get first zone: ${error.message}`)
-      return null
-    }
-  }
-
  async getAll(): Promise<Zone[]> {
    try {
      return await prisma.zone.findMany()
@ -64,18 +53,19 @@ class ZoneRepository {
    }
  }

-  async getEventTeleportTiles(id: number): Promise<ZoneEventTileWithTeleport[]> {
+  async getFirstEventTile(zoneId: number, positionX: number, positionY: number): Promise<ZoneEventTile | null> {
    try {
-      return (await prisma.zoneEventTile.findMany({
+      return await prisma.zoneEventTile.findFirst({
        where: {
-          zoneId: id,
-          type: ZoneEventTileType.TELEPORT
+          zoneId: zoneId,
+          positionX: positionX,
+          positionY: positionY
        },
        include: { teleport: true }
-      })) as unknown as ZoneEventTileWithTeleport[]
+      })
    } catch (error: any) {
-      appLogger.error(`Failed to get zone event tiles: ${error.message}`)
-      return []
+      appLogger.error(`Failed to get zone event tile: ${error.message}`)
+      return null
    }
  }

--- a/src/server.ts
+++ b/src/server.ts
@ -13,9 +13,9 @@ import { appLogger, watchLogs } from './utilities/logger'
 import ZoneManager from './managers/zoneManager'
 import UserManager from './managers/userManager'
 import CommandManager from './managers/commandManager'
-import CharacterManager from './managers/characterManager'
 import QueueManager from './managers/queueManager'
 import DateManager from './managers/dateManager'
+import WeatherManager from './managers/weatherManager'

 export class Server {
  private readonly app: Application
@ -27,7 +27,14 @@ export class Server {
   */
  constructor() {
    this.app = express()
-    this.app.use(cors())
+    this.app.use(
+      cors({
+        origin: config.CLIENT_URL,
+        methods: ['GET', 'POST', 'PUT', 'DELETE', 'OPTIONS'], // Add supported methods
+        allowedHeaders: ['Content-Type', 'Authorization'], // Add allowed headers
+        credentials: true
+      })
+    )
    this.app.use(express.json())
    this.app.use(express.urlencoded({ extended: true }))
    this.http = httpServer(this.app)
@ -70,12 +77,12 @@ export class Server {
    // Load date manager
    await DateManager.boot(this.io)

+    // Load weather manager
+    await WeatherManager.boot(this.io)
+
    // Load zoneEditor manager
    await ZoneManager.boot()

-    // Load character manager
-    await CharacterManager.boot()
-
    // Load command manager
    await CommandManager.boot(this.io)

--- a/src/services/character/characterMoveService.ts
+++ b/src/services/character/characterMoveService.ts
@ -1,43 +0,0 @@
-import { ExtendedCharacter } from '../../utilities/types'
-import { AStar } from '../../utilities/character/aStar'
-import ZoneManager from '../../managers/zoneManager'
-import Rotation from '../../utilities/character/rotation'
-import { gameLogger } from '../../utilities/logger'
-
-export class CharacterMoveService {
-  public updatePosition(character: ExtendedCharacter, position: { x: number; y: number }, newZoneId?: number) {
-    Object.assign(character, {
-      positionX: position.x,
-      positionY: position.y,
-      rotation: Rotation.calculate(character.positionX, character.positionY, position.x, position.y),
-      zoneId: newZoneId || character.zoneId
-    })
-
-    // await prisma.character.update({
-    //   where: { id: character.id },
-    //   data: {
-    //     positionX: position.x,
-    //     positionY: position.y,
-    //     rotation: character.rotation,
-    //     zoneId: newZoneId
-    //   }
-    // })
-  }
-
-  public async calculatePath(character: ExtendedCharacter, targetX: number, targetY: number): Promise<Array<{ x: number; y: number }> | null> {
-    const grid = await ZoneManager.getZoneById(character.zoneId)?.getGrid()
-    if (!grid?.length) {
-      gameLogger.error('character:move error', 'Grid not found or empty')
-      return null
-    }
-
-    const start = { x: Math.floor(character.positionX), y: Math.floor(character.positionY) }
-    const end = { x: Math.floor(targetX), y: Math.floor(targetY) }
-
-    return AStar.findPath(start, end, grid)
-  }
-
-  public async applyMovementDelay(): Promise<void> {
-    await new Promise((resolve) => setTimeout(resolve, 250)) // 250ms delay between steps
-  }
-}
--- a/src/services/character/characterService.ts
+++ b/src/services/character/characterService.ts
@ -0,0 +1,80 @@
+import { AStar } from '../../utilities/character/aStar'
+import ZoneManager from '../../managers/zoneManager'
+import prisma from '../../utilities/prisma'
+import Rotation from '../../utilities/character/rotation'
+import { gameLogger } from '../../utilities/logger'
+import { Character, CharacterGender, CharacterRace } from '@prisma/client'
+
+interface Position {
+  x: number
+  y: number
+}
+
+export class CharacterService {
+  private static readonly MOVEMENT_DELAY_MS = 250
+
+  public updatePosition(character: Character, position: Position, newZoneId?: number): void {
+    if (!this.isValidPosition(position)) {
+      gameLogger.error(`Invalid position coordinates: ${position.x}, ${position.y}`)
+    }
+
+    Object.assign(character, {
+      positionX: position.x,
+      positionY: position.y,
+      rotation: Rotation.calculate(character.positionX, character.positionY, position.x, position.y),
+      zoneId: newZoneId ?? character.zoneId
+    })
+  }
+
+  public async calculatePath(character: Character, targetX: number, targetY: number): Promise<Position[] | null> {
+    const zone = ZoneManager.getZoneById(character.zoneId)
+    const grid = await zone?.getGrid()
+
+    if (!grid?.length) {
+      gameLogger.error('character:move error', 'Grid not found or empty')
+      return null
+    }
+
+    const start: Position = {
+      x: Math.floor(character.positionX),
+      y: Math.floor(character.positionY)
+    }
+
+    const end: Position = {
+      x: Math.floor(targetX),
+      y: Math.floor(targetY)
+    }
+
+    return AStar.findPath(start, end, grid)
+  }
+
+  public async applyMovementDelay(): Promise<void> {
+    await new Promise((resolve) => setTimeout(resolve, CharacterService.MOVEMENT_DELAY_MS))
+  }
+
+  private isValidPosition(position: Position): boolean {
+    return Number.isFinite(position.x) && Number.isFinite(position.y) && position.x >= 0 && position.y >= 0
+  }
+
+  async create(name: string, userId: number) {
+    return prisma.character.create({
+      data: {
+        name,
+        userId
+        // characterTypeId: 1 // @TODO set to chosen character type
+      }
+    })
+  }
+
+  async updateCharacterPosition(id: number, positionX: number, positionY: number, rotation: number, zoneId: number) {
+    await prisma.character.update({
+      where: { id },
+      data: {
+        positionX,
+        positionY,
+        rotation,
+        zoneId
+      }
+    })
+  }
+}
--- a/src/services/chatService.ts
+++ b/src/services/chatService.ts
@ -0,0 +1,30 @@
+import prisma from '../utilities/prisma'
+import { gameLogger } from '../utilities/logger'
+import { Server } from 'socket.io'
+import { TSocket } from '../utilities/types'
+import ChatRepository from '../repositories/chatRepository'
+
+class ChatService {
+  async sendZoneMessage(io: Server, socket: TSocket, message: string, characterId: number, zoneId: number): Promise<boolean> {
+    try {
+      const newChat = await prisma.chat.create({
+        data: {
+          characterId,
+          zoneId,
+          message
+        }
+      })
+
+      const chat = await ChatRepository.getById(newChat.id)
+      if (!chat) return false
+
+      io.to(zoneId.toString()).emit('chat:message', chat)
+      return true
+    } catch (error: any) {
+      gameLogger.error(`Failed to save chat message: ${error instanceof Error ? error.message : String(error)}`)
+      return false
+    }
+  }
+}
+
+export default ChatService
--- a/src/services/passwordResetTokenService.ts
+++ b/src/services/passwordResetTokenService.ts
@ -0,0 +1,31 @@
+import prisma from '../utilities/prisma'
+import passwordResetTokenRepository from '../repositories/passwordResetTokenRepository'
+import { appLogger } from '../utilities/logger'
+
+class PasswordResetTokenService {
+  /**
+   * Delete token
+   * @param token
+   */
+  public async delete(token: string): Promise<boolean> {
+    try {
+      const tokenData = await passwordResetTokenRepository.getByToken(token)
+      if (!tokenData) {
+        return false
+      }
+
+      await prisma.passwordResetToken.delete({
+        where: {
+          token
+        }
+      })
+
+      return true
+    } catch (error: any) {
+      appLogger.error(`Error deleting password reset token: ${error instanceof Error ? error.message : String(error)}`)
+      return false
+    }
+  }
+}
+
+export default PasswordResetTokenService
--- a/src/services/userService.ts
+++ b/src/services/userService.ts
@ -2,9 +2,11 @@ import bcrypt from 'bcryptjs'
 import UserRepository from '../repositories/userRepository'
 import PasswordResetTokenRepository from '../repositories/passwordResetTokenRepository'
 import prisma from '../utilities/prisma'
-import { User, PasswordResetToken } from '@prisma/client'
+import { User } from '@prisma/client'
 import config from '../utilities/config'
 import NodeMailer from 'nodemailer'
+import { httpLogger } from '../utilities/logger'
+import PasswordResetTokenService from './passwordResetTokenService'

 /**
 * User service
@ -18,17 +20,23 @@ class UserService {
   * @param password
   */
  async login(username: string, password: string): Promise<boolean | User> {
-    const user = await UserRepository.getByUsername(username)
-    if (!user) {
+    try {
+      const user = await UserRepository.getByUsername(username)
+      if (!user) {
+        return false
+      }
+
+      const passwordMatch = await bcrypt.compare(password, user.password)
+      if (!passwordMatch) {
+        httpLogger.error(`Failed to login user: ${username}`)
+        return false
+      }
+
+      return user
+    } catch (error: any) {
+      httpLogger.error(`Error logging in user: ${error instanceof Error ? error.message : String(error)}`)
      return false
    }
-
-    const passwordMatch = await bcrypt.compare(password, user.password)
-    if (!passwordMatch) {
-      return false
-    }
-
-    return user
  }

  /**
@ -38,81 +46,86 @@ class UserService {
   * @param password
   */
  async register(username: string, email: string, password: string): Promise<boolean | User> {
-    const user = await UserRepository.getByUsername(username)
-    if (user) {
-      return false
-    }
-
-    const userByEmail = await UserRepository.getByEmail(email)
-    if (userByEmail) {
-      return false
-    }
-
-    const hashedPassword = await bcrypt.hash(password, 10)
-    return prisma.user.create({
-      data: {
-        username,
-        email,
-        password: hashedPassword
+    try {
+      const user = await UserRepository.getByUsername(username)
+      if (user) {
+        return false
      }
-    })
+
+      const userByEmail = await UserRepository.getByEmail(email)
+      if (userByEmail) {
+        httpLogger.error(`User already exists: ${email}`)
+        return false
+      }
+
+      const hashedPassword = await bcrypt.hash(password, 10)
+      return prisma.user.create({
+        data: {
+          username,
+          email,
+          password: hashedPassword
+        }
+      })
+    } catch (error: any) {
+      httpLogger.error(`Error registering user: ${error instanceof Error ? error.message : String(error)}`)
+      return false
+    }
  }

  /**
   * Reset password
   * @param email
   */
-  async resetPassword(email: string): Promise<boolean> {
+  async requestPasswordReset(email: string): Promise<boolean> {
+    try {
+      const user = await UserRepository.getByEmail(email)
+      if (!user) return false

-    const user = await UserRepository.getByEmail(email)
-    if ( !user ) return false
+      const token = await bcrypt.hash(new Date().getTime().toString(), 10)
+      const latestToken = await PasswordResetTokenRepository.getByUserId(user.id)

-    const token = await bcrypt.hash(new Date().getTime().toString(), 10)
-    const latestToken = await PasswordResetTokenRepository.getByUserId(user.id)
+      // Check if password reset has been requested recently
+      if (latestToken) {
+        const tokenExpiryDate = new Date(Date.now() - 24 * 60 * 60 * 1000) // 24 hours
+        const isTokenExpired = latestToken.createdAt < tokenExpiryDate

-    //Check if password reset has been requested recently
-    if (latestToken) {
+        if (!isTokenExpired) return false

-      const tokenExpiryDate = new Date(Date.now() - 24 * 60 * 60 * 1000);
-      const isTokenExpired = latestToken.createdAt < tokenExpiryDate
+        await prisma.passwordResetToken.delete({
+          where: {
+            id: latestToken.id
+          }
+        })
+      }

-      if (!isTokenExpired) return false
-
-      await prisma.passwordResetToken.delete({
-        where: {
-          id: latestToken.id
+      await prisma.passwordResetToken.create({
+        data: {
+          userId: user.id,
+          token: token
        }
      })
-    }

-    await prisma.passwordResetToken.create({
-      data: {
-        userId: user.id,
-        token: token,
-      }
-    });
+      const transporter = NodeMailer.createTransport({
+        host: config.SMTP_HOST,
+        port: config.SMTP_PORT,
+        secure: false,
+        auth: {
+          user: config.SMTP_USER,
+          pass: config.SMTP_PASSWORD
+        }
+      })

-    const transporter = NodeMailer.createTransport({
-      host: config.SMTP_HOST,
-      port: config.SMTP_PORT,
-      secure: false,
-      auth: {
-        user: config.SMTP_USER,
-        pass: config.SMTP_PASSWORD,
-      },
-    });
-
-    try {
      await transporter.sendMail({
        from: config.SMTP_USER,
        to: email,
-        subject: "Reset your password",
-        text: "A password reset has been requested, reset your password here: " + config.CLIENT_URL + "#" + token, // Plain text body
-        html: "<p>A password reset has been requested, reset your password here: <a href='" + config.CLIENT_URL + "#" + token + "'>" + config.CLIENT_URL + "#" + token + "</a></p>", // Html body
-      });
+        subject: 'Reset your password',
+        text: 'A password reset has been requested, reset your password here: ' + config.CLIENT_URL + '#' + token, // Plain text body
+        html: "<p>A password reset has been requested, reset your password here: <a href='" + config.CLIENT_URL + '#' + token + "'>" + config.CLIENT_URL + '#' + token + '</a></p>' // Html body
+      })

      return true
    } catch (error: any) {
+      httpLogger.error(`Error sending password reset email: ${error instanceof Error ? error.message : String(error)}`)
      return false
    }
  }
@ -122,19 +135,30 @@ class UserService {
   * @param urlToken
   * @param password
   */
-  async newPassword(urlToken: string, password: string): Promise<boolean | User> {
-    const tokenData = await PasswordResetTokenRepository.getByToken(urlToken)
-    if (!tokenData) {
+  async resetPassword(urlToken: string, password: string): Promise<boolean> {
+    try {
+      const tokenData = await PasswordResetTokenRepository.getByToken(urlToken)
+      if (!tokenData) {
+        return false
+      }
+
+      const hashedPassword = await bcrypt.hash(password, 10)
+      await prisma.user.update({
+        where: { id: tokenData.userId },
+        data: {
+          password: hashedPassword
+        }
+      })
+
+      // Delete the token
+      const passwordResetTokenService = new PasswordResetTokenService()
+      await passwordResetTokenService.delete(urlToken)
+
+      return true
+    } catch (error: any) {
+      httpLogger.error(`Error setting new password: ${error instanceof Error ? error.message : String(error)}`)
      return false
    }
-
-    const hashedPassword = await bcrypt.hash(password, 10)
-    return prisma.user.update({
-      where: { id: tokenData.userId },
-      data: {
-        password: hashedPassword
-      }
-    })
  }
 }

--- a/src/services/worldService.ts
+++ b/src/services/worldService.ts
@ -0,0 +1,37 @@
+import prisma from '../utilities/prisma'
+import { gameLogger } from '../utilities/logger'
+import { World } from '@prisma/client'
+import WorldRepository from '../repositories/worldRepository'
+
+class WorldService {
+  async update(worldData: Partial<World>): Promise<boolean> {
+    try {
+      const currentWorld = await WorldRepository.getFirst()
+      if (!currentWorld) {
+        // If no world exists, create first record
+        await prisma.world.create({
+          data: {
+            ...worldData,
+            date: worldData.date || new Date()
+          }
+        })
+        return true
+      }
+
+      // Update existing world using its date as unique identifier
+      await prisma.world.update({
+        where: {
+          date: currentWorld.date
+        },
+        data: worldData
+      })
+
+      return true
+    } catch (error: any) {
+      gameLogger.error(`Failed to update world: ${error instanceof Error ? error.message : String(error)}`)
+      return false
+    }
+  }
+}
+
+export default new WorldService()
--- a/src/services/zoneEventTileService.ts
+++ b/src/services/zoneEventTileService.ts
@ -1,18 +1,21 @@
 import { ExtendedCharacter, TSocket } from '../utilities/types'
 import prisma from '../utilities/prisma'
-import ZoneRepository from '../repositories/zoneRepository'
 import { ZoneEventTileTeleport } from '@prisma/client'
 import { Server } from 'socket.io'
-import CharacterManager from '../managers/characterManager'
+import ZoneManager from '../managers/zoneManager'
+import { gameLogger } from '../utilities/logger'

 export class ZoneEventTileService {
  public async handleTeleport(io: Server, socket: TSocket, character: ExtendedCharacter, teleport: ZoneEventTileTeleport): Promise<void> {
    if (teleport.toZoneId === character.zoneId) return

-    const zone = await ZoneRepository.getById(teleport.toZoneId)
-    if (!zone) return
+    const loadedZone = ZoneManager.getZoneById(teleport.toZoneId)
+    if (!loadedZone) {
+      gameLogger.error('zone:character:join error', 'Loaded zone not found')
+      return
+    }

-    // CharacterManager.moveCharacterBetweenZones(character, zone)
+    const zone = loadedZone.getZone()

    const oldZoneId = character.zoneId
    const newZoneId = teleport.toZoneId
@ -35,6 +38,10 @@ export class ZoneEventTileService {
    character.positionY = teleport.toPositionY
    character.isMoving = false

+    // Remove and add character to new zone
+    await loadedZone.removeCharacter(character.id)
+    loadedZone.addCharacter(character)
+
    // Emit events
    io.to(oldZoneId.toString()).emit('zone:character:leave', character.id)
    io.to(newZoneId.toString()).emit('zone:character:join', character)
@ -46,7 +53,7 @@ export class ZoneEventTileService {
    // Send teleport information to the client
    socket.emit('zone:character:teleport', {
      zone,
-      characters: CharacterManager.getCharactersInZone(zone)
+      characters: loadedZone.getCharactersInZone()
    })
  }
 }
--- a/src/services/zoneService.ts
+++ b/src/services/zoneService.ts
@ -1,84 +1,38 @@
 import prisma from '../utilities/prisma'
-import { AssetData } from '../utilities/types'
-import tileRepository from '../repositories/tileRepository'
-import zoneRepository from '../repositories/zoneRepository'
-import { Object, Zone, ZoneObject } from '@prisma/client'
-
-type getZoneAsetsZoneType = Zone & {
-  zoneObjects: (ZoneObject & {
-    object: Object
-  })[]
-}
+import { gameLogger } from '../utilities/logger'

 class ZoneService {
  async createDemoZone(): Promise<boolean> {
-    const tiles = [
-      ['blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile'],
-      ['blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile'],
-      ['blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile'],
-      ['blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile'],
-      ['blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile'],
-      ['blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile'],
-      ['blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile'],
-      ['blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile'],
-      ['blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile'],
-      ['blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile']
-    ]
+    try {
+      const tiles = [
+        ['blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile'],
+        ['blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile'],
+        ['blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile'],
+        ['blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile'],
+        ['blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile'],
+        ['blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile'],
+        ['blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile'],
+        ['blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile'],
+        ['blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile'],
+        ['blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile']
+      ]

-    await prisma.zone.create({
-      data: {
-        name: 'Demo zone',
-        width: 10,
-        height: 10,
-        tiles
-      }
-    })
+      await prisma.zone.create({
+        data: {
+          name: 'Demo zone',
+          width: 10,
+          height: 10,
+          tiles
+        }
+      })

-    console.log('Demo zone created.')
-    return true
-  }
+      gameLogger.info('Demo zone created.')

-  async getZoneAssets(zone: getZoneAsetsZoneType): Promise<AssetData[]> {
-    const assets: AssetData[] = []
-
-    // zone.tiles is prisma jsonvalue
-    let tiles = JSON.parse(JSON.stringify(zone.tiles))
-    tiles = [...new Set(tiles.flat())]
-
-    // Add tile assets
-    for (const tile of tiles) {
-      const tileInfo = await tileRepository.getById(tile)
-      if (!tileInfo) continue
-
-      assets.push({
-        key: tileInfo.id,
-        data: '/assets/tiles/' + tileInfo.id + '.png',
-        group: 'tiles',
-        updatedAt: tileInfo?.updatedAt || new Date()
-      } as AssetData)
+      return true
+    } catch (error: any) {
+      gameLogger.error(`Failed to create demo zone: ${error instanceof Error ? error.message : String(error)}`)
+      return false
    }
-
-    // Add object assets
-    for (const zoneObject of zone.zoneObjects) {
-      if (!zoneObject.object) continue
-
-      assets.push({
-        key: zoneObject.object.id,
-        data: '/assets/objects/' + zoneObject.object.id + '.png',
-        group: 'objects',
-        updatedAt: zoneObject.object.updatedAt || new Date()
-      } as AssetData)
-    }
-
-    // Filter out duplicate assets
-    return assets.reduce((acc: AssetData[], current) => {
-      const x = acc.find((item) => item.key === current.key && item.group === current.group)
-      if (!x) {
-        return acc.concat([current])
-      } else {
-        return acc
-      }
-    }, [])
  }
 }

--- a/src/socketEvents/character/connect.ts
+++ b/src/socketEvents/character/connect.ts
@ -1,9 +1,11 @@
 import { Server } from 'socket.io'
 import { TSocket } from '../../utilities/types'
 import CharacterRepository from '../../repositories/characterRepository'
+import { gameLogger } from '../../utilities/logger'
+import ZoneManager from '../../managers/zoneManager'

-type SocketResponseT = {
-  character_id: number
+interface CharacterConnectPayload {
+  characterId: number
 }

 export default class CharacterConnectEvent {
@ -16,16 +18,48 @@ export default class CharacterConnectEvent {
    this.socket.on('character:connect', this.handleCharacterConnect.bind(this))
  }

-  private async handleCharacterConnect(data: SocketResponseT): Promise<void> {
-    console.log('character:connect requested', data)
+  private async handleCharacterConnect({ characterId }: CharacterConnectPayload): Promise<void> {
+    if (!this.socket.userId) {
+      this.emitError('User not authenticated')
+      return
+    }
+
    try {
-      const character = await CharacterRepository.getByUserAndId(this.socket?.user?.id as number, data.character_id)
-      if (!character) return
+      if (await this.hasActiveCharacter()) {
+        this.emitError('You are already connected to another character')
+        return
+      }
+
+      const character = await this.connectCharacter(characterId)
+      if (!character) {
+        this.emitError('Character not found or does not belong to this user')
+        return
+      }

      this.socket.characterId = character.id
      this.socket.emit('character:connect', character)
-    } catch (error: any) {
-      console.log('character:connect error', error)
+    } catch (error) {
+      this.handleError('Failed to connect character', error) // @TODO : Make global error handler
    }
  }
+
+  private async hasActiveCharacter(): Promise<boolean> {
+    const characters = await CharacterRepository.getByUserId(this.socket.userId!)
+    return characters?.some((char) => ZoneManager.getCharacter(char.id)) ?? false
+  }
+
+  private async connectCharacter(characterId: number) {
+    return CharacterRepository.getByUserAndId(this.socket.userId!, characterId)
+  }
+
+  private emitError(message: string): void {
+    this.socket.emit('notification', { title: 'Server message', message })
+    gameLogger.error('character:connect error', `Player ${this.socket.userId}: ${message}`)
+  }
+
+  private handleError(context: string, error: unknown): void {
+    const errorMessage = error instanceof Error ? error.message : String(error)
+    this.emitError(`${context}: ${errorMessage}`)
+    gameLogger.error('character:connect error', errorMessage)
+  }
 }
--- a/src/socketEvents/character/create.ts
+++ b/src/socketEvents/character/create.ts
@ -2,8 +2,8 @@ import { Server } from 'socket.io'
 import { TSocket } from '../../utilities/types'
 import { Character } from '@prisma/client'
 import CharacterRepository from '../../repositories/characterRepository'
+import { CharacterService } from '../../services/character/characterService'
 import { ZCharacterCreate } from '../../utilities/zodTypes'
-import prisma from '../../utilities/prisma'
 import { gameLogger } from '../../utilities/logger'
 import { ZodError } from 'zod'

@ -23,7 +23,7 @@ export default class CharacterCreateEvent {
    try {
      data = ZCharacterCreate.parse(data)

-      const user_id = this.socket.user?.id as number
+      const user_id = this.socket.userId!

      // Check if character name already exists
      const characterExists = await CharacterRepository.getByName(data.name)
@ -38,13 +38,8 @@ export default class CharacterCreateEvent {
        return this.socket.emit('notification', { message: 'You can only have 4 characters' })
      }

-      const character: Character = await prisma.character.create({
-        data: {
-          name: data.name,
-          userId: user_id
-          // characterTypeId: 1 // @TODO set to chosen character type
-        }
-      })
+      const characterService = new CharacterService()
+      const character: Character = await characterService.create(data.name, user_id)

      characters = [...characters, character]

--- a/src/socketEvents/character/delete.ts
+++ b/src/socketEvents/character/delete.ts
@ -4,7 +4,7 @@ import { Character, Zone } from '@prisma/client'
 import CharacterRepository from '../../repositories/characterRepository'

 type TypePayload = {
-  character_id: number
+  characterId: number
 }

 type TypeResponse = {
@ -23,16 +23,13 @@ export default class CharacterDeleteEvent {
  }

  private async handleCharacterDelete(data: TypePayload, callback: (response: TypeResponse) => void): Promise<any> {
-    // zod validate
    try {
-      await CharacterRepository.deleteByUserIdAndId(this.socket.user?.id as number, data.character_id as number)
+      await CharacterRepository.deleteByUserIdAndId(this.socket.userId!, data.characterId!)

-      const user_id = this.socket.user?.id as number
-      const characters: Character[] = (await CharacterRepository.getByUserId(user_id)) as Character[]
+      const characters: Character[] = (await CharacterRepository.getByUserId(this.socket.userId!)) as Character[]

      this.socket.emit('character:list', characters)
    } catch (error: any) {
-      console.log(error)
      return this.socket.emit('notification', { message: 'Character delete failed. Please try again.' })
    }
  }
--- a/src/socketEvents/character/list.ts
+++ b/src/socketEvents/character/list.ts
@ -2,6 +2,7 @@ import { Socket, Server } from 'socket.io'
 import { TSocket } from '../../utilities/types'
 import { Character } from '@prisma/client'
 import CharacterRepository from '../../repositories/characterRepository'
+import { gameLogger } from '../../utilities/logger'

 export default class CharacterListEvent {
  constructor(
@ -15,12 +16,10 @@ export default class CharacterListEvent {

  private async handleCharacterList(data: any): Promise<void> {
    try {
-      console.log('character:list requested')
-      const user_id = this.socket.user?.id as number
-      const characters: Character[] = (await CharacterRepository.getByUserId(user_id)) as Character[]
+      const characters: Character[] = (await CharacterRepository.getByUserId(this.socket.userId!)) as Character[]
      this.socket.emit('character:list', characters)
    } catch (error: any) {
-      console.log('character:list error', error)
+      gameLogger.error('character:list error', error.message)
    }
  }
 }
--- a/src/socketEvents/chat/gameMaster/alertCommand.ts
+++ b/src/socketEvents/chat/gameMaster/alertCommand.ts
@ -15,7 +15,7 @@ export default class AlertCommandEvent {
  ) {}

  public listen(): void {
-    this.socket.on('chat:send_message', this.handleAlertCommand.bind(this))
+    this.socket.on('chat:message', this.handleAlertCommand.bind(this))
  }

  private async handleAlertCommand(data: TypePayload, callback: (response: boolean) => void): Promise<void> {
@ -24,22 +24,27 @@ export default class AlertCommandEvent {
        return
      }

+      // Check if character exists
+      const character = await CharacterRepository.getByUserAndId(this.socket.userId!, this.socket.characterId!)
+      if (!character) {
+        gameLogger.error('chat:alert_command error', 'Character not found')
+        return callback(false)
+      }
+
+      // Check if the user is the GM
+      if (character.role !== 'gm') {
+        gameLogger.info(`User ${character.id} tried to set time but is not a game master.`)
+        return callback(false)
+      }
+
      const args = getArgs('alert', data.message)

      if (!args) {
-        callback(false)
-        return
-      }
-
-      const character = await CharacterRepository.getByUserAndId(this.socket.user?.id as number, this.socket.characterId as number)
-      if (!character) {
-        gameLogger.error('chat:alert_command error', 'Character not found')
-        callback(false)
-        return
+        return callback(false)
      }

      this.io.emit('notification', { title: 'Message from GM', message: args.join(' ') })
-      callback(true)
+      return callback(true)
    } catch (error: any) {
      gameLogger.error('chat:alert_command error', error.message)
      callback(false)
--- a/src/socketEvents/chat/gameMaster/setTimeCommand.ts
+++ b/src/socketEvents/chat/gameMaster/setTimeCommand.ts
@ -0,0 +1,60 @@
+import { Server } from 'socket.io'
+import { TSocket } from '../../../utilities/types'
+import { getArgs, isCommand } from '../../../utilities/chat'
+import CharacterRepository from '../../../repositories/characterRepository'
+import { gameLogger } from '../../../utilities/logger'
+import DateManager from '../../../managers/dateManager'
+
+type TypePayload = {
+  message: string
+}
+
+export default class SetTimeCommand {
+  constructor(
+    private readonly io: Server,
+    private readonly socket: TSocket
+  ) {}
+
+  public listen(): void {
+    this.socket.on('chat:message', this.handleAlertCommand.bind(this))
+  }
+
+  private async handleAlertCommand(data: TypePayload, callback: (response: boolean) => void): Promise<void> {
+    try {
+      if (!isCommand(data.message, 'time')) {
+        return
+      }
+
+      // Check if character exists
+      const character = await CharacterRepository.getByUserAndId(this.socket.userId!, this.socket.characterId!)
+      if (!character) {
+        gameLogger.error('chat:alert_command error', 'Character not found')
+        return
+      }
+
+      // Check if the user is the GM
+      if (character.role !== 'gm') {
+        gameLogger.info(`User ${character.id} tried to set time but is not a game master.`)
+        return
+      }
+
+      // Get arguments
+      const args = getArgs('time', data.message)
+
+      if (!args) {
+        return
+      }
+
+      const time = args[0] // 24h time, e.g. 17:34
+
+      if (!time) {
+        return
+      }
+
+      await DateManager.setTime(time)
+    } catch (error: any) {
+      gameLogger.error('command error', error.message)
+      callback(false)
+    }
+  }
+}
--- a/src/socketEvents/chat/gameMaster/teleportCommand.ts
+++ b/src/socketEvents/chat/gameMaster/teleportCommand.ts
@ -2,8 +2,9 @@ import { Server } from 'socket.io'
 import { TSocket } from '../../../utilities/types'
 import { getArgs, isCommand } from '../../../utilities/chat'
 import ZoneRepository from '../../../repositories/zoneRepository'
-import CharacterManager from '../../../managers/characterManager'
-import { gameMasterLogger } from '../../../utilities/logger'
+import { gameLogger, gameMasterLogger } from '../../../utilities/logger'
+import ZoneManager from '../../../managers/zoneManager'
+import ZoneCharacter from '../../../models/zoneCharacter'

 type TypePayload = {
  message: string
@ -16,14 +17,23 @@ export default class TeleportCommandEvent {
  ) {}

  public listen(): void {
-    this.socket.on('chat:send_message', this.handleTeleportCommand.bind(this))
+    this.socket.on('chat:message', this.handleTeleportCommand.bind(this))
  }

  private async handleTeleportCommand(data: TypePayload, callback: (response: boolean) => void): Promise<void> {
    try {
-      const character = CharacterManager.getCharacterFromSocket(this.socket)
-      if (!character) {
-        this.socket.emit('notification', { title: 'Server message', message: 'Character not found' })
+      // Check if character exists
+      const zoneCharacter = ZoneManager.getCharacter(this.socket.characterId!)
+      if (!zoneCharacter) {
+        gameLogger.error('chat:message error', 'Character not found')
+        return
+      }
+
+      const character = zoneCharacter.character
+
+      // Check if the user is the GM
+      if (character.role !== 'gm') {
+        gameLogger.info(`User ${character.id} tried to set time but is not a game master.`)
        return
      }

@ -65,17 +75,15 @@ export default class TeleportCommandEvent {
      character.positionX = 0
      character.positionY = 0

-      character.resetMovement = true
+      zoneCharacter.isMoving = false

      this.socket.emit('zone:character:teleport', {
        zone,
-        characters: CharacterManager.getCharactersInZone(zone)
+        characters: ZoneManager.getZoneById(zone.id)?.getCharactersInZone()
      })

      this.socket.emit('notification', { title: 'Server message', message: `You have been teleported to ${zone.name}` })
      gameMasterLogger.info('teleport', `Character ${character.id} teleported to zone ${zone.id}`)
-
-      callback(true)
    } catch (error: any) {
      gameMasterLogger.error(`Error in teleport command: ${error.message}`)
      this.socket.emit('notification', { title: 'Server message', message: 'An error occurred while teleporting' })
--- a/src/socketEvents/chat/gameMaster/toggleFogCommand.ts
+++ b/src/socketEvents/chat/gameMaster/toggleFogCommand.ts
@ -0,0 +1,47 @@
+import { Server } from 'socket.io'
+import { TSocket } from '../../../utilities/types'
+import { isCommand } from '../../../utilities/chat'
+import CharacterRepository from '../../../repositories/characterRepository'
+import { gameLogger } from '../../../utilities/logger'
+import WeatherManager from '../../../managers/weatherManager'
+
+type TypePayload = {
+  message: string
+}
+
+export default class ToggleFogCommand {
+  constructor(
+    private readonly io: Server,
+    private readonly socket: TSocket
+  ) {}
+
+  public listen(): void {
+    this.socket.on('chat:message', this.handleAlertCommand.bind(this))
+  }
+
+  private async handleAlertCommand(data: TypePayload, callback: (response: boolean) => void): Promise<void> {
+    try {
+      if (!isCommand(data.message, 'fog')) {
+        return
+      }
+
+      // Check if character exists
+      const character = await CharacterRepository.getByUserAndId(this.socket.userId!, this.socket.characterId!)
+      if (!character) {
+        gameLogger.error('chat:alert_command error', 'Character not found')
+        return
+      }
+
+      // Check if the user is the GM
+      if (character.role !== 'gm') {
+        gameLogger.info(`User ${character.id} tried to set time but is not a game master.`)
+        return
+      }
+
+      await WeatherManager.toggleFog()
+    } catch (error: any) {
+      gameLogger.error('command error', error.message)
+      callback(false)
+    }
+  }
+}
--- a/src/socketEvents/chat/gameMaster/toggleRainCommand.ts
+++ b/src/socketEvents/chat/gameMaster/toggleRainCommand.ts
@ -0,0 +1,47 @@
+import { Server } from 'socket.io'
+import { TSocket } from '../../../utilities/types'
+import { isCommand } from '../../../utilities/chat'
+import CharacterRepository from '../../../repositories/characterRepository'
+import { gameLogger } from '../../../utilities/logger'
+import WeatherManager from '../../../managers/weatherManager'
+
+type TypePayload = {
+  message: string
+}
+
+export default class ToggleRainCommand {
+  constructor(
+    private readonly io: Server,
+    private readonly socket: TSocket
+  ) {}
+
+  public listen(): void {
+    this.socket.on('chat:message', this.handleAlertCommand.bind(this))
+  }
+
+  private async handleAlertCommand(data: TypePayload, callback: (response: boolean) => void): Promise<void> {
+    try {
+      if (!isCommand(data.message, 'rain')) {
+        return
+      }
+
+      // Check if character exists
+      const character = await CharacterRepository.getByUserAndId(this.socket.userId!, this.socket.characterId!)
+      if (!character) {
+        gameLogger.error('chat:alert_command error', 'Character not found')
+        return
+      }
+
+      // Check if the user is the GM
+      if (character.role !== 'gm') {
+        gameLogger.info(`User ${character.id} tried to set time but is not a game master.`)
+        return
+      }
+
+      await WeatherManager.toggleRain()
+    } catch (error: any) {
+      gameLogger.error('command error', error.message)
+      callback(false)
+    }
+  }
+}
--- a/src/socketEvents/chat/message.ts
+++ b/src/socketEvents/chat/message.ts
@ -0,0 +1,54 @@
+import { Server } from 'socket.io'
+import { TSocket } from '../../utilities/types'
+import ZoneRepository from '../../repositories/zoneRepository'
+import { isCommand } from '../../utilities/chat'
+import { gameLogger } from '../../utilities/logger'
+import ZoneManager from '../../managers/zoneManager'
+import ChatService from '../../services/chatService'
+
+type TypePayload = {
+  message: string
+}
+
+export default class ChatMessageEvent {
+  constructor(
+    private readonly io: Server,
+    private readonly socket: TSocket
+  ) {}
+
+  public listen(): void {
+    this.socket.on('chat:message', this.handleEvent.bind(this))
+  }
+
+  private async handleEvent(data: TypePayload, callback: (response: boolean) => void): Promise<void> {
+    try {
+      if (!data.message || isCommand(data.message)) {
+        return callback(false)
+      }
+
+      const zoneCharacter = ZoneManager.getCharacter(this.socket.characterId!)
+      if (!zoneCharacter) {
+        gameLogger.error('chat:message error', 'Character not found')
+        return callback(false)
+      }
+
+      const character = zoneCharacter.character
+
+      const zone = await ZoneRepository.getById(character.zoneId)
+      if (!zone) {
+        gameLogger.error('chat:message error', 'Zone not found')
+        return callback(false)
+      }
+
+      const chatService = new ChatService()
+      if (await chatService.sendZoneMessage(this.io, this.socket, data.message, character.id, zone.id)) {
+        return callback(true)
+      }
+
+      callback(false)
+    } catch (error: any) {
+      gameLogger.error('chat:message error', error.message)
+      callback(false)
+    }
+  }
+}
--- a/src/socketEvents/chat/sendMessage.ts
+++ b/src/socketEvents/chat/sendMessage.ts
@ -1,54 +0,0 @@
-import { Server } from 'socket.io'
-import { TSocket } from '../../utilities/types'
-import ZoneRepository from '../../repositories/zoneRepository'
-import { isCommand } from '../../utilities/chat'
-import { gameLogger } from '../../utilities/logger'
-import CharacterManager from '../../managers/characterManager'
-
-type TypePayload = {
-  message: string
-}
-
-export default class ChatMessageEvent {
-  constructor(
-    private readonly io: Server,
-    private readonly socket: TSocket
-  ) {}
-
-  public listen(): void {
-    this.socket.on('chat:send_message', this.handleChatMessage.bind(this))
-  }
-
-  private async handleChatMessage(data: TypePayload, callback: (response: boolean) => void): Promise<void> {
-    try {
-      if (!data.message || isCommand(data.message)) {
-        callback(false)
-        return
-      }
-
-      const character = CharacterManager.getCharacterFromSocket(this.socket)
-      if (!character) {
-        gameLogger.error('chat:send_message error', 'Character not found')
-        callback(false)
-        return
-      }
-
-      const zone = await ZoneRepository.getById(character.zoneId)
-      if (!zone) {
-        gameLogger.error('chat:send_message error', 'Zone not found')
-        callback(false)
-        return
-      }
-
-      callback(true)
-
-      this.io.to(zone.id.toString()).emit('chat:message', {
-        character: character,
-        message: data.message
-      })
-    } catch (error: any) {
-      gameLogger.error('chat:send_message error', error.message)
-      callback(false)
-    }
-  }
-}
--- a/src/socketEvents/disconnect.ts
+++ b/src/socketEvents/disconnect.ts
@ -1,7 +1,7 @@
 import { Server } from 'socket.io'
 import { TSocket } from '../utilities/types'
-import CharacterManager from '../managers/characterManager'
 import { gameLogger } from '../utilities/logger'
+import ZoneManager from '../managers/zoneManager'

 export default class DisconnectEvent {
  constructor(
@ -10,31 +10,34 @@ export default class DisconnectEvent {
  ) {}

  public listen(): void {
-    this.socket.on('disconnect', this.handleDisconnect.bind(this))
+    this.socket.on('disconnect', this.handleEvent.bind(this))
  }

-  private async handleDisconnect(data: any): Promise<void> {
+  private async handleEvent(data: any): Promise<void> {
    try {
-      if (!this.socket.user) {
+      if (!this.socket.userId) {
        gameLogger.info('User disconnected but had no user set')
        return
      }

-      this.io.emit('user:disconnect', this.socket.user.id)
+      this.io.emit('user:disconnect', this.socket.userId)

-      const character = CharacterManager.getCharacterFromSocket(this.socket)
-
-      if (!character) {
+      const zoneCharacter = ZoneManager.getCharacter(this.socket.characterId!)
+      if (!zoneCharacter) {
        gameLogger.info('User disconnected but had no character set')
        return
      }

-      character.resetMovement = true
+      const character = zoneCharacter.character
+
+      // Save character position and remove from zone
+      zoneCharacter.isMoving = false
+      await zoneCharacter.savePosition()
+      ZoneManager.removeCharacter(this.socket.characterId!)

      gameLogger.info('User disconnected along with their character')

-      await CharacterManager.removeCharacter(character)
-
+      // Inform other clients that the character has left
      this.io.in(character.zoneId.toString()).emit('zone:character:leave', character.id)
      this.io.emit('character:disconnect', character.id)
    } catch (error: any) {
--- a/src/socketEvents/gameMaster/assetManager/characterType/create.ts
+++ b/src/socketEvents/gameMaster/assetManager/characterType/create.ts
@ -11,10 +11,10 @@ export default class CharacterTypeCreateEvent {
  ) {}

  public listen(): void {
-    this.socket.on('gm:characterType:create', this.handleCharacterTypeCreate.bind(this))
+    this.socket.on('gm:characterType:create', this.handleEvent.bind(this))
  }

-  private async handleCharacterTypeCreate(data: undefined, callback: (response: boolean, characterType?: any) => void): Promise<void> {
+  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)
--- a/src/socketEvents/gameMaster/assetManager/characterType/delete.ts
+++ b/src/socketEvents/gameMaster/assetManager/characterType/delete.ts
@ -0,0 +1,42 @@
+import fs from 'fs'
+import { Server } from 'socket.io'
+import { TSocket } from '../../../../utilities/types'
+import prisma from '../../../../utilities/prisma'
+import characterRepository from '../../../../repositories/characterRepository'
+import { getPublicPath } from '../../../../utilities/storage'
+import { gameMasterLogger } from '../../../../utilities/logger'
+
+interface IPayload {
+  id: number
+}
+
+export default class CharacterTypeDeleteEvent {
+  constructor(
+    private readonly io: Server,
+    private readonly socket: TSocket
+  ) {}
+
+  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 as number)
+    if (!character) return callback(false)
+
+    if (character.role !== 'gm') {
+      return callback(false)
+    }
+
+    try {
+      await prisma.characterType.delete({
+        where: { id: data.id }
+      })
+
+      callback(true)
+    } catch (error) {
+      gameMasterLogger.error(`Error deleting character type ${data.id}: ${error instanceof Error ? error.message : String(error)}`)
+      callback(false)
+    }
+  }
+}
--- a/src/socketEvents/gameMaster/assetManager/characterType/list.ts
+++ b/src/socketEvents/gameMaster/assetManager/characterType/list.ts
@ -14,10 +14,10 @@ export default class CharacterTypeListEvent {
  ) {}

  public listen(): void {
-    this.socket.on('gm:characterType:list', this.handleCharacterTypeList.bind(this))
+    this.socket.on('gm:characterType:list', this.handleEvent.bind(this))
  }

-  private async handleCharacterTypeList(data: IPayload, callback: (response: CharacterType[]) => void): Promise<void> {
+  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')
--- a/src/socketEvents/gameMaster/assetManager/characterType/remove.ts
+++ b/src/socketEvents/gameMaster/assetManager/characterType/remove.ts
@ -1,56 +0,0 @@
-import fs from 'fs'
-import { Server } from 'socket.io'
-import { TSocket } from '../../../../utilities/types'
-import prisma from '../../../../utilities/prisma'
-import characterRepository from '../../../../repositories/characterRepository'
-import { getPublicPath } from '../../../../utilities/storage'
-
-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.handleObjectRemove.bind(this))
-  }
-
-  private async handleObjectRemove(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 = getPublicPath('objects')
-
-      // remove the tile from the disk
-      const finalFilePath = getPublicPath('objects', data.object + '.png')
-      fs.unlink(finalFilePath, (err) => {
-        if (err) {
-          console.log(err)
-          callback(false)
-          return
-        }
-
-        callback(true)
-      })
-    } catch (e) {
-      console.log(e)
-      callback(false)
-    }
-  }
-}
--- a/src/socketEvents/gameMaster/assetManager/characterType/update.ts
+++ b/src/socketEvents/gameMaster/assetManager/characterType/update.ts
@ -2,27 +2,25 @@ import { Server } from 'socket.io'
 import { TSocket } from '../../../../utilities/types'
 import prisma from '../../../../utilities/prisma'
 import characterRepository from '../../../../repositories/characterRepository'
+import { CharacterGender, CharacterRace } from '@prisma/client'

 type Payload = {
-  id: string
+  id: number
  name: string
-  tags: string[]
-  originX: number
-  originY: number
-  isAnimated: boolean
-  frameSpeed: number
-  frameWidth: number
-  frameHeight: number
+  gender: CharacterGender
+  race: CharacterRace
+  isEnabledForCharCreation: boolean
+  spriteId: string
 }

-export default class ObjectUpdateEvent {
+export default class CharacterTypeUpdateEvent {
  constructor(
    private readonly io: Server,
    private readonly socket: TSocket
  ) {}

  public listen(): void {
-    this.socket.on('gm:object:update', this.handleObjectUpdate.bind(this))
+    this.socket.on('gm:characterType:update', this.handleObjectUpdate.bind(this))
  }

  private async handleObjectUpdate(data: Payload, callback: (success: boolean) => void): Promise<void> {
@ -34,21 +32,17 @@ export default class ObjectUpdateEvent {
    }

    try {
-      const object = await prisma.object.update({
-        where: {
-          id: data.id
-        },
+      await prisma.characterType.update({
+        where: { id: data.id },
        data: {
          name: data.name,
-          tags: data.tags,
-          originX: data.originX,
-          originY: data.originY,
-          isAnimated: data.isAnimated,
-          frameSpeed: data.frameSpeed,
-          frameWidth: data.frameWidth,
-          frameHeight: data.frameHeight
+          gender: data.gender,
+          race: data.race,
+          isEnabledForCharCreation: data.isEnabledForCharCreation,
+          spriteId: data.spriteId
        }
      })
+
      callback(true)
    } catch (error) {
      console.error(error)
--- a/src/socketEvents/gameMaster/assetManager/object/remove.ts
+++ b/src/socketEvents/gameMaster/assetManager/object/remove.ts
@ -4,6 +4,7 @@ import { TSocket } from '../../../../utilities/types'
 import prisma from '../../../../utilities/prisma'
 import characterRepository from '../../../../repositories/characterRepository'
 import { getPublicPath } from '../../../../utilities/storage'
+import { gameLogger, gameMasterLogger } from '../../../../utilities/logger'

 interface IPayload {
  object: string
@ -41,15 +42,15 @@ export default class ObjectRemoveEvent {
      const finalFilePath = getPublicPath('objects', data.object + '.png')
      fs.unlink(finalFilePath, (err) => {
        if (err) {
-          console.log(err)
+          gameMasterLogger.error(`Error deleting object ${data.object}: ${err.message}`)
          callback(false)
          return
        }

        callback(true)
      })
-    } catch (e) {
-      console.log(e)
+    } catch (error) {
+      gameLogger.error(`Error deleting object ${data.object}: ${error instanceof Error ? error.message : String(error)}`)
      callback(false)
    }
  }
--- a/src/socketEvents/gameMaster/assetManager/sprite/create.ts
+++ b/src/socketEvents/gameMaster/assetManager/sprite/create.ts
@ -17,7 +17,7 @@ export default class SpriteCreateEvent {

  private async handleSpriteCreate(data: undefined, callback: (response: boolean) => void): Promise<void> {
    try {
-      const character = await characterRepository.getById(this.socket.characterId as number)
+      const character = await characterRepository.getById(this.socket.characterId!)
      if (!character) return callback(false)

      if (character.role !== 'gm') {
--- a/src/socketEvents/gameMaster/assetManager/sprite/delete.ts
+++ b/src/socketEvents/gameMaster/assetManager/sprite/delete.ts
@ -2,9 +2,9 @@ import { Server } from 'socket.io'
 import { TSocket } from '../../../../utilities/types'
 import fs from 'fs'
 import prisma from '../../../../utilities/prisma'
-import CharacterManager from '../../../../managers/characterManager'
 import { gameMasterLogger } from '../../../../utilities/logger'
 import { getPublicPath } from '../../../../utilities/storage'
+import CharacterRepository from '../../../../repositories/characterRepository'

 type Payload = {
  id: string
@ -21,11 +21,11 @@ export default class GMSpriteDeleteEvent {
  }

  public listen(): void {
-    this.socket.on('gm:sprite:delete', this.handleSpriteDelete.bind(this))
+    this.socket.on('gm:sprite:delete', this.handleEvent.bind(this))
  }

-  private async handleSpriteDelete(data: Payload, callback: (response: boolean) => void): Promise<void> {
-    const character = CharacterManager.getCharacterFromSocket(this.socket)
+  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)
    }
--- a/src/socketEvents/gameMaster/assetManager/sprite/list.ts
+++ b/src/socketEvents/gameMaster/assetManager/sprite/list.ts
@ -17,7 +17,7 @@ export default class SpriteListEvent {
  }

  private async handleSpriteList(data: any, callback: (response: Sprite[]) => void): Promise<void> {
-    const character = await characterRepository.getById(this.socket.characterId as number)
+    const character = await characterRepository.getById(this.socket.characterId!)
    if (!character) return callback([])

    if (character.role !== 'gm') {
--- a/src/socketEvents/gameMaster/assetManager/sprite/update.ts
+++ b/src/socketEvents/gameMaster/assetManager/sprite/update.ts
@ -4,8 +4,9 @@ import prisma from '../../../../utilities/prisma'
 import type { Prisma, SpriteAction } from '@prisma/client'
 import { writeFile, mkdir } from 'node:fs/promises'
 import sharp from 'sharp'
-import CharacterManager from '../../../../managers/characterManager'
 import { getPublicPath } from '../../../../utilities/storage'
+import CharacterRepository from '../../../../repositories/characterRepository'
+import { gameMasterLogger } from '../../../../utilities/logger'

 type SpriteActionInput = Omit<SpriteAction, 'id' | 'spriteId' | 'frameWidth' | 'frameHeight'> & {
  sprites: string[]
@ -38,7 +39,7 @@ export default class SpriteUpdateEvent {
  }

  private async handleSpriteUpdate(data: Payload, callback: (success: boolean) => void): Promise<void> {
-    const character = CharacterManager.getCharacterFromSocket(this.socket)
+    const character = await CharacterRepository.getById(this.socket.characterId!)
    if (character?.role !== 'gm') {
      return callback(false)
    }
@ -52,7 +53,7 @@ export default class SpriteUpdateEvent {

      callback(true)
    } catch (error) {
-      console.error('Error updating sprite:', error)
+      gameMasterLogger.error(`Error updating sprite ${data.id}: ${error instanceof Error ? error.message : String(error)}`)
      callback(false)
    }

@ -60,11 +61,11 @@ export default class SpriteUpdateEvent {
      try {
        const parsed = JSON.parse(JSON.stringify(spriteActions)) as SpriteActionInput[]
        if (!Array.isArray(parsed)) {
-          throw new Error('spriteActions is not an array')
+          gameMasterLogger.error('Error parsing spriteActions: spriteActions is not an array')
        }
        return parsed
      } catch (error) {
-        console.error('Error parsing spriteActions:', error)
+        gameMasterLogger.error(`Error parsing spriteActions: ${error instanceof Error ? error.message : String(error)}`)
        throw error
      }
    }
@ -75,7 +76,7 @@ export default class SpriteUpdateEvent {
          const { action, sprites } = spriteAction

          if (!Array.isArray(sprites) || sprites.length === 0) {
-            throw new Error(`Invalid sprites array for action: ${action}`)
+            gameMasterLogger.error(`Invalid sprites array for action: ${action}`)
          }

          const buffersWithDimensions = await Promise.all(
--- a/src/socketEvents/gameMaster/zoneEditor/update.ts
+++ b/src/socketEvents/gameMaster/zoneEditor/update.ts
@ -39,40 +39,52 @@ export default class ZoneUpdateEvent {
  ) {}

  public listen(): void {
-    this.socket.on('gm:zone_editor:zone:update', this.handleZoneUpdate.bind(this))
+    this.socket.on('gm:zone_editor:zone:update', this.handleEvent.bind(this))
  }

-  private async handleZoneUpdate(data: IPayload, callback: (response: Zone | null) => void): Promise<void> {
+  private async handleEvent(data: IPayload, callback: (response: Zone | null) => void): Promise<void> {
    try {
      const character = await CharacterRepository.getById(this.socket.characterId as number)
      if (!character) {
        gameMasterLogger.error('gm:zone_editor:zone:update error', 'Character not found')
-        callback(null)
-        return
+        return callback(null)
      }

      if (character.role !== 'gm') {
        gameMasterLogger.info(`User ${character.id} tried to update zone but is not a game master.`)
-        callback(null)
-        return
+        return callback(null)
      }

      gameMasterLogger.info(`User ${character.id} has updated zone via zone editor.`)

      if (!data.zoneId) {
        gameMasterLogger.info(`User ${character.id} tried to update zone but did not provide a zone id.`)
-        callback(null)
-        return
+        return callback(null)
      }

      let zone = await ZoneRepository.getById(data.zoneId)

      if (!zone) {
        gameMasterLogger.info(`User ${character.id} tried to update zone ${data.zoneId} but it does not exist.`)
-        callback(null)
-        return
+        return callback(null)
      }

+      // If tiles are larger than the zone, remove the extra tiles
+      if (data.tiles.length > data.height) {
+        data.tiles = data.tiles.slice(0, data.height)
+      }
+      for (let i = 0; i < data.tiles.length; i++) {
+        if (data.tiles[i].length > data.width) {
+          data.tiles[i] = data.tiles[i].slice(0, data.width)
+        }
+      }
+
+      // If zone event tiles are placed outside the zone's bounds, remove these
+      data.zoneEventTiles = data.zoneEventTiles.filter((tile) => tile.positionX >= 0 && tile.positionX < data.width && tile.positionY >= 0 && tile.positionY < data.height)
+
+      // If zone objects are placed outside the zone's bounds, remove these
+      data.zoneObjects = data.zoneObjects.filter((obj) => obj.positionX >= 0 && obj.positionX < data.width && obj.positionY >= 0 && obj.positionY < data.height)
+
      await prisma.zone.update({
        where: { id: data.zoneId },
        data: {
@ -134,10 +146,13 @@ export default class ZoneUpdateEvent {

      callback(zone)

+      /**
+       * @TODO #246: Reload zone for players who are currently in the zone
+       */
      zoneManager.unloadZone(data.zoneId)
      await zoneManager.loadZone(zone)
    } catch (error: any) {
-      gameMasterLogger.error('gm:zone_editor:zone:update error', error.message)
+      gameMasterLogger.error(`gm:zone_editor:zone:update error: ${error instanceof Error ? error.message : String(error)}`)
      callback(null)
    }
  }
--- a/src/socketEvents/login.ts
+++ b/src/socketEvents/login.ts
@ -1,6 +1,7 @@
 import { Server } from 'socket.io'
 import { TSocket } from '../utilities/types'
 import { gameLogger } from '../utilities/logger'
+import UserRepository from '../repositories/userRepository'

 export default class LoginEvent {
  constructor(
@ -14,13 +15,13 @@ export default class LoginEvent {

  private handleLogin(): void {
    try {
-      if (!this.socket.user) {
+      if (!this.socket.userId) {
        gameLogger.warn('Login attempt without user data')
        return
      }

-      this.socket.emit('logged_in', { user: this.socket.user })
-      gameLogger.info(`User logged in: ${this.socket.user.id}`)
+      this.socket.emit('logged_in', { user: UserRepository.getById(this.socket.userId) })
+      gameLogger.info(`User logged in: ${this.socket.userId}`)
    } catch (error: any) {
      gameLogger.error('login error', error.message)
    }
--- a/src/socketEvents/zone/characterJoin.ts
+++ b/src/socketEvents/zone/characterJoin.ts
@ -1,14 +1,16 @@
 import { Server } from 'socket.io'
-import { ExtendedCharacter, TSocket } from '../../utilities/types'
+import { TSocket } from '../../utilities/types'
 import ZoneRepository from '../../repositories/zoneRepository'
-import { Character, Zone } from '@prisma/client'
-import CharacterManager from '../../managers/characterManager'
+import { Zone } from '@prisma/client'
 import { gameLogger } from '../../utilities/logger'
 import CharacterRepository from '../../repositories/characterRepository'
+import ZoneManager from '../../managers/zoneManager'
+import zoneCharacter from '../../models/zoneCharacter'
+import zoneManager from '../../managers/zoneManager'

 interface IResponse {
  zone: Zone
-  characters: Character[]
+  characters: zoneCharacter[]
 }

 export default class CharacterJoinEvent {
@ -28,30 +30,42 @@ export default class CharacterJoinEvent {
        return
      }

-      const character = await CharacterRepository.getById(this.socket.characterId as number)
+      const character = await CharacterRepository.getById(this.socket.characterId)
      if (!character) {
        gameLogger.error('zone:character:join error', 'Character not found')
        return
      }

+      /**
+       * @TODO: If zone is not found, spawn back to the start
+       */
      const zone = await ZoneRepository.getById(character.zoneId)
      if (!zone) {
        gameLogger.error('zone:character:join error', 'Zone not found')
        return
      }

-      CharacterManager.initCharacter(character as ExtendedCharacter)
+      /**
+       * @TODO: If zone is not found, spawn back to the start
+       */
+      const loadedZone = ZoneManager.getZoneById(zone.id)
+      if (!loadedZone) {
+        gameLogger.error('zone:character:join error', 'Loaded zone not found')
+        return
+      }
+
+      loadedZone.addCharacter(character)

      this.socket.join(zone.id.toString())

-      // let other clients know of new character
-      this.io.to(zone.id.toString()).emit('zone:character:join', character)
+      // Let other clients know of new character
+      this.io.to(zone.id.toString()).emit('zone:character:join', zoneManager.getCharacter(character.id))

      // Log
      gameLogger.info(`User ${character.id} joined zone ${zone.id}`)

-      // send over zone and characters to socket
-      callback({ zone, characters: CharacterManager.getCharactersInZone(zone) })
+      // Send over zone and characters to socket
+      callback({ zone, characters: loadedZone.getCharactersInZone() })
    } catch (error: any) {
      gameLogger.error('zone:character:join error', error.message)
      this.socket.disconnect()
--- a/src/socketEvents/zone/characterLeave.ts
+++ b/src/socketEvents/zone/characterLeave.ts
@ -1,8 +1,9 @@
 import { Server } from 'socket.io'
 import { TSocket } from '../../utilities/types'
 import ZoneRepository from '../../repositories/zoneRepository'
-import CharacterManager from '../../managers/characterManager'
 import { gameLogger } from '../../utilities/logger'
+import ZoneManager from '../../managers/zoneManager'
+import CharacterRepository from '../../repositories/characterRepository'

 export default class ZoneLeaveEvent {
  constructor(
@ -16,21 +17,29 @@ export default class ZoneLeaveEvent {

  private async handleZoneLeave(): Promise<void> {
    try {
-      const character = CharacterManager.getCharacterFromSocket(this.socket)
+      if (!this.socket.characterId) {
+        gameLogger.error('zone:character:join error', 'Zone requested but no character id set')
+        return
+      }
+
+      const character = await CharacterRepository.getById(this.socket.characterId)
      if (!character) {
-        gameLogger.error('zone:character:leave error', 'Character not found')
-        return
-      }
-
-      if (!character.zoneId) {
-        gameLogger.error('zone:character:leave error', 'Character not in a zone')
+        gameLogger.error('zone:character:join error', 'Character not found')
        return
      }

+      /**
+       * @TODO: If zone is not found, spawn back to the start
+       */
      const zone = await ZoneRepository.getById(character.zoneId)
-
      if (!zone) {
-        gameLogger.error('zone:character:leave error', 'Zone not found')
+        gameLogger.error('zone:character:join error', 'Zone not found')
+        return
+      }
+
+      const loadedZone = ZoneManager.getZoneById(zone.id)
+      if (!loadedZone) {
+        gameLogger.error('zone:character:join error', 'Loaded zone not found')
        return
      }

@ -40,7 +49,7 @@ export default class ZoneLeaveEvent {
      this.io.to(zone.id.toString()).emit('zone:character:leave', character.id)

      // remove character from zone manager
-      await CharacterManager.removeCharacter(character)
+      await loadedZone.removeCharacter(character.id)

      gameLogger.info('zone:character:leave', `Character ${character.id} left zone ${zone.id}`)
    } catch (error: any) {
--- a/src/socketEvents/zone/characterMove.ts
+++ b/src/socketEvents/zone/characterMove.ts
@ -1,144 +1,96 @@
 import { Server } from 'socket.io'
-import { TSocket, ExtendedCharacter } from '../../utilities/types'
-import { CharacterMoveService } from '../../services/character/characterMoveService'
+import { TSocket, ZoneEventTileWithTeleport } from '../../utilities/types'
+import { CharacterService } from '../../services/character/characterService'
 import { ZoneEventTileService } from '../../services/zoneEventTileService'
-import prisma from '../../utilities/prisma'
-import { ZoneEventTile, ZoneEventTileTeleport } from '@prisma/client'
 import Rotation from '../../utilities/character/rotation'
-import CharacterManager from '../../managers/characterManager'
 import { gameLogger } from '../../utilities/logger'
-import QueueManager from '../../managers/queueManager'
-
-export type ZoneEventTileWithTeleport = ZoneEventTile & {
-  teleport: ZoneEventTileTeleport
-}
+import ZoneManager from '../../managers/zoneManager'
+import ZoneCharacter from '../../models/zoneCharacter'
+import zoneEventTileRepository from '../../repositories/zoneEventTileRepository'

 export default class CharacterMove {
-  private characterMoveService: CharacterMoveService
-  private zoneEventTileService: ZoneEventTileService
-  private nextPath: { [index: number]: { x: number; y: number }[] } = []
-  private currentZoneId: { [index: number]: number } = []
+  private readonly characterService = new CharacterService()
+  private readonly zoneEventTileService = new ZoneEventTileService()

  constructor(
    private readonly io: Server,
    private readonly socket: TSocket
-  ) {
-    this.characterMoveService = new CharacterMoveService()
-    this.zoneEventTileService = new ZoneEventTileService()
-  }
+  ) {}

  public listen(): void {
-    this.socket.on('character:initMove', this.handleCharacterMove.bind(this))
+    this.socket.on('character:move', this.handleCharacterMove.bind(this))
  }

  private async handleCharacterMove({ positionX, positionY }: { positionX: number; positionY: number }): Promise<void> {
-    let character = CharacterManager.getCharacterFromSocket(this.socket)
-    if (!character) {
-      gameLogger.error('character:move error', 'Character not found')
+    const zoneCharacter = ZoneManager.getCharacter(this.socket.characterId!)
+    if (!zoneCharacter?.character) {
+      gameLogger.error('character:move error', 'Character not found or not initialized')
      return
    }

-    if (!character) {
-      gameLogger.error('character:move error', 'character has not been initialized?')
-      return
+    // If already moving, cancel current movement and wait for it to fully stop
+    if (zoneCharacter.isMoving) {
+      zoneCharacter.isMoving = false
+      await new Promise((resolve) => setTimeout(resolve, 100))
    }

-    const path = await this.characterMoveService.calculatePath(character, positionX, positionY)
+    const path = await this.characterService.calculatePath(zoneCharacter.character, positionX, positionY)
    if (!path) {
-      this.io.in(character.zoneId.toString()).emit('character:moveError', 'No valid path found')
+      this.io.in(zoneCharacter.character.zoneId.toString()).emit('character:moveError', 'No valid path found')
      return
    }

-    if (!character.isMoving && character.resetMovement) {
-      character.resetMovement = false
-    }
-    if (character.isMoving && !character.resetMovement) {
-      character.resetMovement = true
-      this.nextPath[character.id] = path
-    }
-    if (!character.isMoving && !character.resetMovement) {
-      character.isMoving = true
-      this.currentZoneId[character.id] = character.zoneId
-      await this.moveAlongPath(character, path)
-    }
+    // Start new movement
+    zoneCharacter.isMoving = true
+    zoneCharacter.currentPath = path // Add this property to ZoneCharacter class
+    await this.moveAlongPath(zoneCharacter, path)
  }

-  private async moveAlongPath(character: ExtendedCharacter, path: Array<{ x: number; y: number }>): Promise<void> {
+  private async moveAlongPath(zoneCharacter: ZoneCharacter, path: Array<{ x: number; y: number }>): Promise<void> {
+    const { character } = zoneCharacter
+
    for (let i = 0; i < path.length - 1; i++) {
-      const start = path[i]
-      const end = path[i + 1]
+      // Exit if movement was cancelled or interrupted
+      if (!zoneCharacter.isMoving || zoneCharacter.currentPath !== path) {
+        return
+      }

-      // if (!(await this.movementValidator.isValidMove(character, end))) {
-      //   break
-      // }
+      const [start, end] = [path[i], path[i + 1]]
+      character.rotation = Rotation.calculate(start.x, start.y, end.x, end.y)

-      if (CharacterManager.hasResetMovement(character)) {
+      const zoneEventTile = await zoneEventTileRepository.getEventTileByZoneIdAndPosition(character.zoneId, Math.floor(end.x), Math.floor(end.y))
+
+      if (zoneEventTile?.type === 'BLOCK') break
+      if (zoneEventTile?.type === 'TELEPORT' && zoneEventTile.teleport) {
+        await this.handleZoneEventTile(zoneEventTile as ZoneEventTileWithTeleport)
        break
      }

-      character.rotation = Rotation.calculate(start.x, start.y, end.x, end.y)
-
-      const zoneEventTile = await prisma.zoneEventTile.findFirst({
-        where: {
-          zoneId: character.zoneId,
-          positionX: Math.floor(end.x),
-          positionY: Math.floor(end.y)
-        }
-      })
-
-      if (zoneEventTile) {
-        if (zoneEventTile.type === 'BLOCK') {
-          break
-        }
-
-        if (zoneEventTile.type === 'TELEPORT') {
-          const teleportTile = (await prisma.zoneEventTile.findFirst({
-            where: { id: zoneEventTile.id },
-            include: { teleport: true }
-          })) as ZoneEventTileWithTeleport
-
-          if (teleportTile) {
-            await this.handleZoneEventTile(teleportTile)
-            break
-          }
-        }
-      }
-
-      this.characterMoveService.updatePosition(character, end)
-      this.io.in(character.zoneId.toString()).emit('character:move', character)
-
-      await this.characterMoveService.applyMovementDelay()
+      this.characterService.updatePosition(character, end)
+      this.io.in(character.zoneId.toString()).emit('character:move', zoneCharacter)
+      await this.characterService.applyMovementDelay()
    }

-    if (CharacterManager.hasResetMovement(character)) {
-      character.resetMovement = false
-      if (this.currentZoneId[character.id] === character.zoneId) {
-        await this.moveAlongPath(character, this.nextPath[character.id])
-      } else {
-        delete this.currentZoneId[character.id]
-        character.isMoving = false
-      }
-    } else {
-      this.finalizeMovement(character)
+    // Only finalize if this path wasn't interrupted
+    if (zoneCharacter.isMoving && zoneCharacter.currentPath === path) {
+      this.finalizeMovement(zoneCharacter)
    }
  }

  private async handleZoneEventTile(zoneEventTile: ZoneEventTileWithTeleport): Promise<void> {
-    const character = CharacterManager.getCharacterFromSocket(this.socket)
-    if (!character) {
+    const zoneCharacter = ZoneManager.getCharacter(this.socket.characterId!)
+    if (!zoneCharacter) {
      gameLogger.error('character:move error', 'Character not found')
      return
    }

-    const teleport = zoneEventTile.teleport
-    if (teleport) {
-      await this.zoneEventTileService.handleTeleport(this.io, this.socket, character, teleport)
-      return
+    if (zoneEventTile.teleport) {
+      await this.zoneEventTileService.handleTeleport(this.io, this.socket, zoneCharacter.character, zoneEventTile.teleport)
    }
  }

-  private finalizeMovement(character: ExtendedCharacter): void {
-    character.isMoving = false
-    this.io.in(character.zoneId.toString()).emit('character:move', character)
+  private finalizeMovement(zoneCharacter: ZoneCharacter): void {
+    zoneCharacter.isMoving = false
+    this.io.in(zoneCharacter.character.zoneId.toString()).emit('character:move', zoneCharacter)
  }
 }
--- a/src/socketEvents/zone/weather.ts
+++ b/src/socketEvents/zone/weather.ts
@ -0,0 +1,24 @@
+import { Server } from 'socket.io'
+import { TSocket } from '../../utilities/types'
+import { gameLogger } from '../../utilities/logger'
+import WeatherManager from '../../managers/weatherManager'
+
+export default class Weather {
+  constructor(
+    private readonly io: Server,
+    private readonly socket: TSocket
+  ) {}
+
+  public listen(): void {
+    this.socket.on('weather', this.handleEvent.bind(this))
+  }
+
+  private async handleEvent(): Promise<void> {
+    try {
+      const weather = await WeatherManager.getWeatherState()
+      this.socket.emit('weather', weather)
+    } catch (error: any) {
+      gameLogger.error('error', error.message)
+    }
+  }
+}
--- a/src/utilities/character/rotation.ts
+++ b/src/utilities/character/rotation.ts
@ -2,33 +2,31 @@ import config from '../config'

 class Rotation {
  static calculate(X1: number, Y1: number, X2: number, Y2: number): number {
-    let rotation = 0
-
    if (config.ALLOW_DIAGONAL_MOVEMENT) {
+      // Check diagonal movements
      if (X1 > X2 && Y1 > Y2) {
-        rotation = 7
+        return 7
      } else if (X1 < X2 && Y1 < Y2) {
-        rotation = 3
+        return 3
      } else if (X1 > X2 && Y1 < Y2) {
-        rotation = 5
+        return 5
      } else if (X1 < X2 && Y1 > Y2) {
-        rotation = 1
+        return 1
      }
    }

-    if (rotation === 0) {
-      if (X1 > X2) {
-        rotation = 6
-      } else if (X1 < X2) {
-        rotation = 2
-      } else if (Y1 < Y2) {
-        rotation = 4
-      } else if (Y1 > Y2) {
-        rotation = 0
-      }
+    // Non-diagonal movements
+    if (X1 > X2) {
+      return 6
+    } else if (X1 < X2) {
+      return 2
+    } else if (Y1 < Y2) {
+      return 4
+    } else if (Y1 > Y2) {
+      return 0
    }

-    return rotation
+    return 0 // Default case
  }
 }

--- a/src/utilities/chat.ts
+++ b/src/utilities/chat.ts
@ -1,6 +1,6 @@
 export function isCommand(message: string, command?: string) {
  if (command) {
-    return message.startsWith(`/${command} `)
+    return message === `/${command}` || message.startsWith(`/${command} `)
  }
  return message.startsWith('/')
 }
--- a/src/utilities/config.ts
+++ b/src/utilities/config.ts
@ -7,7 +7,7 @@ class config {
  static REDIS_URL: string = process.env.REDIS_URL || 'redis://@127.0.0.1:6379/4'
  static HOST: string = process.env.HOST || '0.0.0.0'
  static PORT: number = process.env.PORT ? parseInt(process.env.PORT) : 6969
-  static CLIENT_URL: string = process.env.CLIENT_URL ? process.env.CLIENT_URL : 'https://sylvan.quest/'
+  static CLIENT_URL: string = process.env.CLIENT_URL ? process.env.CLIENT_URL : 'https://sylvan.quest'
  static JWT_SECRET: string = process.env.JWT_SECRET || 'secret'

  static ALLOW_DIAGONAL_MOVEMENT: boolean = process.env.ALLOW_DIAGONAL_MOVEMENT === 'true'
--- a/src/utilities/http.ts
+++ b/src/utilities/http.ts
@ -76,13 +76,13 @@ async function addHttpRoutes(app: Application) {
    }

    const userService = new UserService()
-    const sentEmail = await userService.resetPassword( email )
+    const sentEmail = await userService.requestPasswordReset(email)

    if (sentEmail) {
      return res.status(200).json({ message: 'Email has been sent' })
    }

-    return res.status(400).json({ message: 'Failed to send password reset request' })
+    return res.status(400).json({ message: 'Failed to send password reset request. Perhaps one has already been sent recently, check your spam folder.' })
  })

  /**
@ -94,13 +94,13 @@ async function addHttpRoutes(app: Application) {
    const { urlToken, password } = req.body

    try {
-      newPasswordSchema.parse({ password })
+      newPasswordSchema.parse({ urlToken, password })
    } catch (error: any) {
      return res.status(400).json({ message: error.errors[0]?.message })
    }

    const userService = new UserService()
-    const resetPassword = await userService.newPassword( urlToken, password )
+    const resetPassword = await userService.resetPassword(urlToken, password)

    if (resetPassword) {
      return res.status(200).json({ message: 'Password has been reset' })
--- a/src/utilities/json.ts
+++ b/src/utilities/json.ts
@ -1,49 +0,0 @@
-import * as fs from 'fs/promises'
-import { appLogger } from './logger'
-
-export async function readJsonFile<T>(filePath: string): Promise<T> {
-  try {
-    const fileContent = await fs.readFile(filePath, 'utf-8')
-    return JSON.parse(fileContent) as T
-  } catch (error) {
-    appLogger.error(`Error reading JSON file: ${error instanceof Error ? error.message : String(error)}`)
-    throw error
-  }
-}
-
-export async function writeJsonFile<T>(filePath: string, data: T): Promise<void> {
-  try {
-    const jsonString = JSON.stringify(data, null, 2)
-    await fs.writeFile(filePath, jsonString, 'utf-8')
-  } catch (error) {
-    appLogger.error(`Error writing JSON file: ${error instanceof Error ? error.message : String(error)}`)
-    throw error
-  }
-}
-
-export async function readJsonValue<T>(filePath: string, paramPath: string): Promise<T> {
-  try {
-    const jsonContent = await readJsonFile<any>(filePath)
-    const paramValue = paramPath.split('.').reduce((obj, key) => obj && obj[key], jsonContent)
-
-    if (paramValue === undefined) {
-      throw new Error(`Parameter ${paramPath} not found in the JSON file`)
-    }
-
-    return paramValue as T
-  } catch (error) {
-    appLogger.error(`Error reading JSON parameter: ${error instanceof Error ? error.message : String(error)}`)
-    throw error
-  }
-}
-
-export async function setJsonValue<T>(filePath: string, key: string, value: any): Promise<void> {
-  try {
-    const data = await readJsonFile<T>(filePath)
-    const updatedData = { ...data, [key]: value }
-    await writeJsonFile(filePath, updatedData)
-  } catch (error) {
-    appLogger.error(`Error setting JSON value: ${error instanceof Error ? error.message : String(error)}`)
-    throw error
-  }
-}
--- a/src/utilities/logger.ts
+++ b/src/utilities/logger.ts
@ -32,13 +32,31 @@ const watchLogs = () => {
  LOG_TYPES.forEach((type) => {
    const logFile = getRootPath('logs', `${type}.log`)

-    fs.watchFile(logFile, (curr, prev) => {
-      if (curr.size > prev.size) {
-        const stream = fs.createReadStream(logFile, { start: prev.size, end: curr.size })
-        stream.on('data', (chunk) => {
-          console.log(`[${type}]\n${chunk.toString()}`)
-        })
+    // Get initial file size
+    const stats = fs.statSync(logFile)
+    let lastPosition = stats.size
+
+    fs.watch(logFile, (eventType) => {
+      if (eventType !== 'change') {
+        return
      }
+
+      fs.stat(logFile, (err, stats) => {
+        if (err) return
+
+        if (stats.size > lastPosition) {
+          const stream = fs.createReadStream(logFile, {
+            start: lastPosition,
+            end: stats.size
+          })
+
+          stream.on('data', (chunk) => {
+            console.log(`[${type}]\n${chunk.toString()}`)
+          })
+
+          lastPosition = stats.size
+        }
+      })
    })
  })
 }
--- a/src/utilities/types.ts
+++ b/src/utilities/types.ts
@ -1,8 +1,8 @@
 import { Socket } from 'socket.io'
-import { Character, User } from '@prisma/client'
+import { Character, User, ZoneEventTile, ZoneEventTileTeleport } from '@prisma/client'

 export type TSocket = Socket & {
-  user?: User
+  userId?: number
  characterId?: number
  handshake?: {
    query?: {
@ -18,7 +18,11 @@ export type TSocket = Socket & {

 export type ExtendedCharacter = Character & {
  isMoving?: boolean
-  resetMovement: boolean
+  resetMovement?: boolean
+}
+
+export type ZoneEventTileWithTeleport = ZoneEventTile & {
+  teleport: ZoneEventTileTeleport
 }

 export type AssetData = {
--- a/src/utilities/zodTypes.ts
+++ b/src/utilities/zodTypes.ts
@ -35,13 +35,14 @@ export const registerAccountSchema = z.object({

 export const resetPasswordSchema = z.object({
  email: z
-  .string()
-  .min(3, { message: 'Email must be at least 3 characters long' })
-  .max(255, { message: 'Email must be at most 255 characters long' })
-  .regex(/^[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,}$/, { message: 'Email must be valid' })
+    .string()
+    .min(3, { message: 'Email must be at least 3 characters long' })
+    .max(255, { message: 'Email must be at most 255 characters long' })
+    .regex(/^[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,}$/, { message: 'Email must be valid' })
 })

 export const newPasswordSchema = z.object({
+  urlToken: z.string().min(10, { message: 'Invalid request' }).max(255, { message: 'Invalid request' }),
  password: z
    .string()
    .min(8, {
Author	SHA1	Message	Date
Colin Kallemein	fc92d9ea79	Updated create and update calls to services	2024-11-17 20:59:24 +01:00
Colin Kallemein	2e267a36aa	#237 - Changed Prisma find calls to repos	2024-11-17 19:48:00 +01:00
Dennis Postma	6ee8bb8334	Minor improvements for char. type management	2024-11-17 18:00:58 +01:00
Dennis Postma	ec3bf0f51e	Moved models to simplify and improve prisma schemas , added logic to update characterTypes	2024-11-17 17:53:25 +01:00
Dennis Postma	27f8bc8784	Implemented ZoneManager logics in teleport to make sure chars. are removed / added correctly	2024-11-16 23:12:37 +01:00
Dennis Postma	3185c478a6	Merge branch 'main' of ssh://gitea.directonline.io:29417/sylvan-quest/server	2024-11-16 01:21:35 +01:00
Dennis Postma	72ef04d683	Rm. comment.	2024-11-16 01:21:32 +01:00
Colin Kallemein	446e8fa617	#237 Convert prisma finds to repos for time and data	2024-11-15 21:58:08 +01:00
Dennis Postma	f7072acdd2	Added code comment for #246	2024-11-15 01:58:05 +01:00
Dennis Postma	fda8cc532e	#154 : Remove tiles, event tiles, and objects that are out of the zone's width and height before saving zone	2024-11-14 23:46:26 +01:00
Dennis Postma	821e742527	Bug fix	2024-11-14 21:03:08 +01:00
Dennis Postma	460308d555	#161 : Set default value for createdAt field, store zone chats into database	2024-11-14 20:45:37 +01:00
Dennis Postma	3f8f8745eb	#161 : Set default value for createdAt field, store zone chats into database	2024-11-14 20:43:40 +01:00
Dennis Postma	bf7f585270	Path walk improvements	2024-11-13 17:02:16 +01:00
Dennis Postma	fee4277b4f	Removed emit	2024-11-13 16:10:41 +01:00
Dennis Postma	ffc07b7403	Send title with connect error message	2024-11-13 16:07:17 +01:00
Dennis Postma	344ddbaf39	#213 : Prevent character:connect if user is already logged in from another character	2024-11-13 16:06:31 +01:00
Dennis Postma	86ed3ae4b0	Minor improvements	2024-11-13 15:34:43 +01:00
Dennis Postma	719c75616e	CORS fix	2024-11-13 13:35:41 +01:00
Dennis Postma	cf954979c5	Improved logging some more	2024-11-13 13:27:44 +01:00
Dennis Postma	01ed1bce29	#233 : Replaced all console logs, thrown errors with logger API	2024-11-13 13:25:03 +01:00
Dennis Postma	d4e0cbe398	#174 : Refactor character manager into zoneManager for better DX, major refactor of time and weather system (data is stored in DB now instead of JSON file), npm update, npm format, many other improvements	2024-11-13 13:21:01 +01:00
Dennis Postma	628b3bf1fa	npm update	2024-11-05 23:17:59 +01:00
Dennis Postma	709d34d59b	npm run format	2024-11-05 23:16:18 +01:00
Dennis Postma	c4a42066ab	#184 : Added commands to toggle rain / fog, command bug fix, minor improvements	2024-11-05 23:15:56 +01:00
Dennis Postma	26dbaa45a7	#184 : Allow GMs to set time	2024-11-05 23:07:23 +01:00
Dennis Postma	ae0241fecb	#184 : Added weather manager that periodically changes the weather in-game and emits this to players	2024-11-05 22:45:57 +01:00
Dennis Postma	3a566dae5a	CORS fix	2024-11-05 21:48:55 +01:00
Dennis Postma	ad4f33676f	Bug fix for reset password	2024-11-05 20:32:27 +01:00
Dennis Postma	44cfbd6ee8	Improved error message to client for password reset request, delete PasswordTokenReset after changing password	2024-11-05 01:00:11 +01:00
Dennis Postma	881e3375ab	Better naming	2024-11-05 00:37:38 +01:00
Dennis Postma	6a76c4797a	Added extra logging to HTTP endpoints	2024-11-05 00:33:12 +01:00
Dennis Postma	bf75ad001b	Typo	2024-11-05 00:28:27 +01:00
Dennis Postma	3b473e5826	Added client URL to .env.example and cors	2024-11-05 00:27:09 +01:00
Dennis Postma	929a36554a	Cors update	2024-11-05 00:19:02 +01:00
Dennis Postma	3fbc5f4e87	-_-	2024-11-05 00:15:20 +01:00
Colin Kallemein	1526e0947a	Added urlToken to Zod schema	2024-11-04 22:36:00 +01:00
Dennis Postma	7ec4303b40	npm format	2024-11-04 01:05:21 +01:00
Dennis Postma	f475b69022	npm update	2024-11-03 22:35:33 +01:00