From 570d315bf53d5e052686a98b7df3f942c6359780 Mon Sep 17 00:00:00 2001
From: Dennis Postma <dennis@directonline.io>
Date: Thu, 14 Nov 2024 23:46:13 +0100
Subject: [PATCH] Small improvements
---
package-lock.json | 28 +++++++++----------
.../gameMaster/zoneEditor/ZoneEditor.vue | 1 -
.../zoneEditor/zonePartials/ZoneObjects.vue | 6 ++--
src/components/gui/Chat.vue | 1 -
src/components/screens/ZoneEditor.vue | 2 +-
5 files changed, 18 insertions(+), 20 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 4ecfe5b..75b9300 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6890,34 +6890,34 @@
}
},
"node_modules/tailwindcss": {
- "version": "3.4.14",
- "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.14.tgz",
- "integrity": "sha512-IcSvOcTRcUtQQ7ILQL5quRDg7Xs93PdJEk1ZLbhhvJc7uj/OAhYOnruEiwnGgBvUtaUAJ8/mhSw1o8L2jCiENA==",
+ "version": "3.4.15",
+ "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.15.tgz",
+ "integrity": "sha512-r4MeXnfBmSOuKUWmXe6h2CcyfzJCEk4F0pptO5jlnYSIViUkVmsawj80N5h2lO3gwcmSb4n3PuN+e+GC1Guylw==",
"dev": true,
"license": "MIT",
"dependencies": {
"@alloc/quick-lru": "^5.2.0",
"arg": "^5.0.2",
- "chokidar": "^3.5.3",
+ "chokidar": "^3.6.0",
"didyoumean": "^1.2.2",
"dlv": "^1.1.3",
- "fast-glob": "^3.3.0",
+ "fast-glob": "^3.3.2",
"glob-parent": "^6.0.2",
"is-glob": "^4.0.3",
- "jiti": "^1.21.0",
+ "jiti": "^1.21.6",
"lilconfig": "^2.1.0",
- "micromatch": "^4.0.5",
+ "micromatch": "^4.0.8",
"normalize-path": "^3.0.0",
"object-hash": "^3.0.0",
- "picocolors": "^1.0.0",
- "postcss": "^8.4.23",
+ "picocolors": "^1.1.1",
+ "postcss": "^8.4.47",
"postcss-import": "^15.1.0",
"postcss-js": "^4.0.1",
- "postcss-load-config": "^4.0.1",
- "postcss-nested": "^6.0.1",
- "postcss-selector-parser": "^6.0.11",
- "resolve": "^1.22.2",
- "sucrase": "^3.32.0"
+ "postcss-load-config": "^4.0.2",
+ "postcss-nested": "^6.2.0",
+ "postcss-selector-parser": "^6.1.2",
+ "resolve": "^1.22.8",
+ "sucrase": "^3.35.0"
},
"bin": {
"tailwind": "lib/cli.js",
diff --git a/src/components/gameMaster/zoneEditor/ZoneEditor.vue b/src/components/gameMaster/zoneEditor/ZoneEditor.vue
index ff755e9..dc20f3b 100644
--- a/src/components/gameMaster/zoneEditor/ZoneEditor.vue
+++ b/src/components/gameMaster/zoneEditor/ZoneEditor.vue
@@ -63,7 +63,6 @@ function save() {
}
gameStore.connection?.emit('gm:zone_editor:zone:update', data, (response: Zone) => {
- console.log(response.updatedAt)
zoneEditorStore.setZone(response)
})
}
diff --git a/src/components/gameMaster/zoneEditor/zonePartials/ZoneObjects.vue b/src/components/gameMaster/zoneEditor/zonePartials/ZoneObjects.vue
index 860d50e..b93cab7 100644
--- a/src/components/gameMaster/zoneEditor/zonePartials/ZoneObjects.vue
+++ b/src/components/gameMaster/zoneEditor/zonePartials/ZoneObjects.vue
@@ -56,7 +56,7 @@ function pencil(pointer: Phaser.Input.Pointer) {
id: uuidv4(),
zoneId: zoneEditorStore.zone.id,
zone: zoneEditorStore.zone,
- objectId: zoneEditorStore.selectedObject,
+ objectId: zoneEditorStore.selectedObject.id,
object: zoneEditorStore.selectedObject,
depth: 0,
isRotated: false,
@@ -65,7 +65,7 @@ function pencil(pointer: Phaser.Input.Pointer) {
}
// Add new object to zoneObjects
- zoneEditorStore.zone.zoneObjects = zoneEditorStore.zone.zoneObjects.concat(newObject as ZoneObject)
+ zoneEditorStore.zone.zoneObjects = zoneEditorStore.zone.zoneObjects.concat(newObject as ZoneObjectT)
}
function eraser(pointer: Phaser.Input.Pointer) {
@@ -134,7 +134,7 @@ function moveZoneObject(id: string) {
// Check if zone is set
if (!zoneEditorStore.zone) return
- movingZoneObject.value = zoneEditorStore.zone.zoneObjects.find((object) => object.id === id) as ZoneObject
+ movingZoneObject.value = zoneEditorStore.zone.zoneObjects.find((object) => object.id === id) as ZoneObjectT
function handlePointerMove(pointer: Phaser.Input.Pointer) {
if (!movingZoneObject.value) return
diff --git a/src/components/gui/Chat.vue b/src/components/gui/Chat.vue
index f664dd5..caa8f7f 100644
--- a/src/components/gui/Chat.vue
+++ b/src/components/gui/Chat.vue
@@ -61,7 +61,6 @@ const scrollToBottom = () => {
}
gameStore.connection?.on('chat:message', (data: Chat) => {
- console.log(data)
chats.value.push(data)
scrollToBottom()
diff --git a/src/components/screens/ZoneEditor.vue b/src/components/screens/ZoneEditor.vue
index b2f69f9..2d0b1d4 100644
--- a/src/components/screens/ZoneEditor.vue
+++ b/src/components/screens/ZoneEditor.vue
@@ -2,7 +2,7 @@
<div class="flex justify-center items-center h-dvh relative">
<Game :config="gameConfig" @create="createGame">
<Scene name="main" @preload="preloadScene" @create="createScene">
- <ZoneEditor :key="JSON.stringify(`${zoneEditorStore.zone?.id}_${zoneEditorStore.zone?.createdAt}_${zoneEditorStore.zone?.updatedAt}`)" />
+ <ZoneEditor :key="JSON.stringify(`${zoneEditorStore.zone?.id}_${zoneEditorStore.zone?.createdAt}_${zoneEditorStore.zone?.updatedAt ?? ''}`)" />
</Scene>
</Game>
</div>