diff --git a/package-lock.json b/package-lock.json index 87e2589..f3b4a1c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1256,9 +1256,9 @@ } }, "node_modules/@isaacs/cliui/node_modules/ansi-regex": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", + "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==", "dev": true, "license": "MIT", "engines": { @@ -2171,9 +2171,9 @@ } }, "node_modules/@vue/devtools-api": { - "version": "6.6.3", - "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.6.3.tgz", - "integrity": "sha512-0MiMsFma/HqA6g3KLKn+AGpL1kgKhFWszC9U29NfpWK5LE7bjeXxySWJrOJ77hBz+TBrBQ7o4QJqbPbqbs8rJw==", + "version": "6.6.4", + "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.6.4.tgz", + "integrity": "sha512-sGhTPMuXqZ1rVOk32RylztWkfXTRhuS7vgAKv0zjqk8gbsHkJ7xfFf+jbySxt7tWObEJwyKaHMikV/WGDiQm8g==", "license": "MIT" }, "node_modules/@vue/devtools-core": { @@ -2873,9 +2873,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001658", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001658.tgz", - "integrity": "sha512-N2YVqWbJELVdrnsW5p+apoQyYt51aBMSsBZki1XZEfeBCexcM/sf4xiAHcXQBkuOwJBXtWF7aW1sYX6tKebPHw==", + "version": "1.0.30001660", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001660.tgz", + "integrity": "sha512-GacvNTTuATm26qC74pt+ad1fW15mlQ/zuTzzY1ZoIzECTP8HURDfF43kNxPgf7H1jmelCBQTTbBNxdSXOA7Bqg==", "dev": true, "funding": [ { @@ -6333,9 +6333,9 @@ "license": "MIT" }, "node_modules/string-width/node_modules/ansi-regex": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", + "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==", "dev": true, "license": "MIT", "engines": { @@ -6612,9 +6612,9 @@ } }, "node_modules/tinyspy": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-3.0.0.tgz", - "integrity": "sha512-q5nmENpTHgiPVd1cJDDc9cVoYN5x4vCvwT3FMilvKPKneCBZAxn2YWQjDF0UMcE9k0Cay1gBiDfTMU0g+mPMQA==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-3.0.2.tgz", + "integrity": "sha512-n1cw8k1k0x4pgA2+9XrOkFydTerNcJ1zWCO5Nn9scWHTD+5tp8dghT2x1uduQePZTZgd3Tupf+x9BxJjeJi77Q==", "dev": true, "license": "MIT", "engines": { @@ -7333,9 +7333,9 @@ } }, "node_modules/wrap-ansi/node_modules/ansi-regex": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", + "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==", "dev": true, "license": "MIT", "engines": { diff --git a/src/components/forms/ChipsInput.vue b/src/components/forms/ChipsInput.vue index fd48ba7..61f435c 100644 --- a/src/components/forms/ChipsInput.vue +++ b/src/components/forms/ChipsInput.vue @@ -2,22 +2,9 @@
{{ chip }} - +
- +
@@ -41,9 +28,13 @@ const currentInput: Ref = ref('') const internalValue = ref([]) // Initialize internalValue with props.modelValue -watch(() => props.modelValue, (newValue) => { - internalValue.value = newValue ? [...newValue] : [] -}, { immediate: true }) +watch( + () => props.modelValue, + (newValue) => { + internalValue.value = newValue ? [...newValue] : [] + }, + { immediate: true } +) const addChip = () => { const trimmedInput = currentInput.value.trim() @@ -65,4 +56,4 @@ const handleBackspace = (event: KeyboardEvent) => { emit('update:modelValue', internalValue.value) } } - \ No newline at end of file + diff --git a/src/components/gameMaster/zoneEditor/ZoneEditor.vue b/src/components/gameMaster/zoneEditor/ZoneEditor.vue index 507d586..c2196a2 100644 --- a/src/components/gameMaster/zoneEditor/ZoneEditor.vue +++ b/src/components/gameMaster/zoneEditor/ZoneEditor.vue @@ -231,32 +231,36 @@ onBeforeUnmount(() => { }) // watch zoneEditorStore.objectList and update originX and originY of objects in zoneObjects -watch(objectList, (newObjects) => { - zoneObjects.value = zoneObjects.value.map(zoneObject => { - const updatedObject = newObjects.find(obj => obj.id === zoneObject.objectId); - if (updatedObject) { - return { - ...zoneObject, - object: { - ...zoneObject.object, +watch( + objectList, + (newObjects) => { + zoneObjects.value = zoneObjects.value.map((zoneObject) => { + const updatedObject = newObjects.find((obj) => obj.id === zoneObject.objectId) + if (updatedObject) { + return { + ...zoneObject, + object: { + ...zoneObject.object, + originX: updatedObject.originX, + originY: updatedObject.originY + } + } + } + return zoneObject + }) + + // Update selectedObject if it exists + if (zoneEditorStore.selectedObject) { + const updatedObject = newObjects.find((obj) => obj.id === zoneEditorStore.selectedObject?.id) + if (updatedObject) { + zoneEditorStore.setSelectedObject({ + ...zoneEditorStore.selectedObject, originX: updatedObject.originX, originY: updatedObject.originY - } - }; + }) + } } - return zoneObject; - }); - - // Update selectedObject if it exists - if (zoneEditorStore.selectedObject) { - const updatedObject = newObjects.find(obj => obj.id === zoneEditorStore.selectedObject?.id); - if (updatedObject) { - zoneEditorStore.setSelectedObject({ - ...zoneEditorStore.selectedObject, - originX: updatedObject.originX, - originY: updatedObject.originY - }); - } - } -}, { deep: true }) + }, + { deep: true } +) diff --git a/src/components/gui/Chat.vue b/src/components/gui/Chat.vue index 1698e1e..bb65ee1 100644 --- a/src/components/gui/Chat.vue +++ b/src/components/gui/Chat.vue @@ -33,7 +33,7 @@ const chatWindow = ref(null) const sendMessage = () => { if (!message.value.trim()) return - gameStore.connection?.emit('chat:send_message', { message: message.value }, (response: boolean) => {}); + gameStore.connection?.emit('chat:send_message', { message: message.value }, (response: boolean) => {}) message.value = '' } diff --git a/src/components/gui/UserPanel.vue b/src/components/gui/UserPanel.vue index 1e70f24..2a32f5f 100644 --- a/src/components/gui/UserPanel.vue +++ b/src/components/gui/UserPanel.vue @@ -4,10 +4,10 @@

Game menu

- - - - + + + +
@@ -30,14 +30,13 @@ \ No newline at end of file + diff --git a/src/components/gui/partials/CharacterScreen.vue b/src/components/gui/partials/CharacterScreen.vue index d8778d5..37963bb 100644 --- a/src/components/gui/partials/CharacterScreen.vue +++ b/src/components/gui/partials/CharacterScreen.vue @@ -1,69 +1,68 @@ \ No newline at end of file + diff --git a/src/components/gui/partials/Equipment.vue b/src/components/gui/partials/Equipment.vue index 90032e0..8110c18 100644 --- a/src/components/gui/partials/Equipment.vue +++ b/src/components/gui/partials/Equipment.vue @@ -1,90 +1,89 @@ \ No newline at end of file + diff --git a/src/components/gui/partials/Inventory.vue b/src/components/gui/partials/Inventory.vue index 21a809c..30c28c7 100644 --- a/src/components/gui/partials/Inventory.vue +++ b/src/components/gui/partials/Inventory.vue @@ -1,17 +1,17 @@ \ No newline at end of file +
+

Chest items

+
+
+
+
+ + diff --git a/src/components/gui/partials/Settings.vue b/src/components/gui/partials/Settings.vue index 564c20c..500e884 100644 --- a/src/components/gui/partials/Settings.vue +++ b/src/components/gui/partials/Settings.vue @@ -1,40 +1,40 @@ \ No newline at end of file + diff --git a/src/components/gui/partials/settings/CharacterSettings.vue b/src/components/gui/partials/settings/CharacterSettings.vue index bca082a..13ff820 100644 --- a/src/components/gui/partials/settings/CharacterSettings.vue +++ b/src/components/gui/partials/settings/CharacterSettings.vue @@ -1,25 +1,25 @@ \ No newline at end of file + diff --git a/src/components/utilities/ConfirmationModal.vue b/src/components/utilities/ConfirmationModal.vue index 771a76c..e8715af 100644 --- a/src/components/utilities/ConfirmationModal.vue +++ b/src/components/utilities/ConfirmationModal.vue @@ -30,15 +30,15 @@ const props = defineProps({ watch( () => props.modalOpened, (val) => { - modalOpened.value = val; + modalOpened.value = val } ) -const modalOpened = ref(props.modalOpened); +const modalOpened = ref(props.modalOpened) \ No newline at end of file + diff --git a/src/components/zone/Objects.vue b/src/components/zone/Objects.vue index d0e7cdb..a79b335 100644 --- a/src/components/zone/Objects.vue +++ b/src/components/zone/Objects.vue @@ -1,7 +1,3 @@ - - - \ No newline at end of file + diff --git a/src/components/zone/Tiles.vue b/src/components/zone/Tiles.vue index 1a0973d..b1290d4 100644 --- a/src/components/zone/Tiles.vue +++ b/src/components/zone/Tiles.vue @@ -53,21 +53,15 @@ function createTileLayer() { } function createTileArray() { - return Array.from({ length: zone.value?.width ?? 0 }, () => - Array.from({ length: zone.value?.height ?? 0 }, () => 'blank_tile') - ) + return Array.from({ length: zone.value?.width ?? 0 }, () => Array.from({ length: zone.value?.height ?? 0 }, () => 'blank_tile')) } onBeforeMount(() => { if (zone.value?.tiles) { setAllTiles(zoneTilemap.value, tiles.value, zone.value.tiles) - tileArray.value = zone.value.tiles.map(row => - row.map(tileId => tileId || 'blank_tile') - ) + tileArray.value = zone.value.tiles.map((row) => row.map((tileId) => tileId || 'blank_tile')) } else { - tileArray.value.forEach((row, y) => - row.forEach((_, x) => placeTile(zoneTilemap.value, tiles.value, x, y, 'blank_tile')) - ) + tileArray.value.forEach((row, y) => row.forEach((_, x) => placeTile(zoneTilemap.value, tiles.value, x, y, 'blank_tile'))) } }) @@ -76,4 +70,4 @@ onBeforeUnmount(() => { zoneTilemap.value.removeAllLayers() zoneTilemap.value.destroy() }) - \ No newline at end of file + diff --git a/src/components/zone/Zone.vue b/src/components/zone/Zone.vue index df2c9ce..6a5bf4f 100644 --- a/src/components/zone/Zone.vue +++ b/src/components/zone/Zone.vue @@ -1,6 +1,6 @@ @@ -48,18 +48,20 @@ gameStore.connection?.on('character:move', (data: ExtendedCharacterT) => { zoneStore.updateCharacter(data) }) -watch(() => zoneStore.zone, (newZone) => { - console.log('Zone changed:', newZone) -}, { deep: true }) +watch( + () => zoneStore.zone, + (newZone) => { + console.log('Zone changed:', newZone) + }, + { deep: true } +) -onBeforeMount(() => { - -}); +onBeforeMount(() => {}) onBeforeUnmount(() => { gameStore.connection?.off('zone:teleport') gameStore.connection?.off('zone:character:join') gameStore.connection?.off('zone:character:leave') gameStore.connection?.off('character:move') -}); +}) diff --git a/src/composables/usePointerHandlers.ts b/src/composables/usePointerHandlers.ts index 1efeb52..1edda26 100644 --- a/src/composables/usePointerHandlers.ts +++ b/src/composables/usePointerHandlers.ts @@ -11,7 +11,7 @@ export function usePointerHandlers(scene: Phaser.Scene, layer: Phaser.Tilemaps.T const gameHandlers = useGamePointerHandlers(scene, layer, waypoint, camera, isDragging) const zoneEditorHandlers = useZoneEditorPointerHandlers(scene, layer, waypoint, camera, isDragging) - let currentHandlers = computed(() => zoneEditorStore.active ? zoneEditorHandlers : gameHandlers) + let currentHandlers = computed(() => (zoneEditorStore.active ? zoneEditorHandlers : gameHandlers)) const setupPointerHandlers = () => { currentHandlers.value.setupPointerHandlers() @@ -21,12 +21,15 @@ export function usePointerHandlers(scene: Phaser.Scene, layer: Phaser.Tilemaps.T currentHandlers.value.cleanupPointerHandlers() } - watch(() => zoneEditorStore.active, (newValue, oldValue) => { - if (newValue !== oldValue) { - cleanupPointerHandlers() - setupPointerHandlers() + watch( + () => zoneEditorStore.active, + (newValue, oldValue) => { + if (newValue !== oldValue) { + cleanupPointerHandlers() + setupPointerHandlers() + } } - }) + ) return { setupPointerHandlers, cleanupPointerHandlers } -} \ No newline at end of file +} diff --git a/src/screens/Characters.vue b/src/screens/Characters.vue index 04a80e5..7b52e02 100644 --- a/src/screens/Characters.vue +++ b/src/screens/Characters.vue @@ -3,17 +3,13 @@
- +
@@ -26,7 +22,14 @@ - @@ -50,7 +53,10 @@
-