-
+
diff --git a/src/services/zone.ts b/src/services/zone.ts
index 82a8bd1..5352f68 100644
--- a/src/services/zone.ts
+++ b/src/services/zone.ts
@@ -12,10 +12,10 @@ export function getTile(x: number, y: number, layer: Phaser.Tilemaps.TilemapLaye
export function tileToWorldXY(layer: Phaser.Tilemaps.TilemapLayer, pos_x: number, pos_y: number) {
const worldPoint = layer.tileToWorldXY(pos_x, pos_y)
- const position_x = worldPoint.x + config.tile_size.y
- const position_y = worldPoint.y
+ const positionX = worldPoint.x + config.tile_size.y
+ const positionY = worldPoint.y
- return { position_x, position_y }
+ return { positionX, positionY }
}
export function tileToWorldX(layer: Phaser.Tilemaps.TilemapLayer, pos_x: number, pos_y: number): number {
@@ -86,7 +86,7 @@ export const updateZoneTiles = (zoneTilemap: Tilemap, tiles: Phaser.Tilemaps.Til
}
// Update the tilemap with any new 'blank_tile' entries
- zoneTiles.forEach((row: string[], y: number) => {
+ zoneTiles.forEach((row: any, y: number) => {
row.forEach((tileId, x) => {
placeTile(zoneTilemap, tiles, x, y, tileId)
})
@@ -101,12 +101,12 @@ export const calculateDepth = (x: number, y: number, mapWidth: number) => {
return y * mapWidth + x
}
-export const sortByDepth = (items: T[], mapWidth: number) => {
+export const sortByDepth = (items: T[], mapWidth: number) => {
return [...items].sort((a, b) => {
- const aX = 'position_x' in a ? a.position_x : a.x
- const aY = 'position_y' in a ? a.position_y : a.y
- const bX = 'position_x' in b ? b.position_x : b.x
- const bY = 'position_y' in b ? b.position_y : b.y
+ const aX = 'positionX' in a ? a.positionX : a.x
+ const aY = 'positionY' in a ? a.positionY : a.y
+ const bX = 'positionX' in b ? b.positionX : b.x
+ const bY = 'positionY' in b ? b.positionY : b.y
return calculateDepth(aX, aY, mapWidth) - calculateDepth(bX, bY, mapWidth)
})
}
diff --git a/src/stores/zoneEditor.ts b/src/stores/zoneEditor.ts
index 4dc87c2..3a7378a 100644
--- a/src/stores/zoneEditor.ts
+++ b/src/stores/zoneEditor.ts
@@ -3,9 +3,9 @@ import { useGameStore } from '@/stores/game'
import type { Zone, Object, Tile, ZoneObject } from '@/types'
type TeleportSettings = {
- x: number
- y: number
- zoneId: number
+ toZoneId: number
+ toPositionX: number
+ toPositionY: number
}
export const useZoneEditorStore = defineStore('zoneEditor', {
@@ -28,9 +28,9 @@ export const useZoneEditorStore = defineStore('zoneEditor', {
isCreateZoneModalShown: false,
isSettingsModalShown: false,
teleportSettings: {
- x: 0,
- y: 0,
- zoneId: 0
+ toZoneId: 0,
+ toPositionX: 0,
+ toPositionY: 0
}
}),
actions: {
diff --git a/src/types.ts b/src/types.ts
index 6cce59b..907a774 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -23,8 +23,8 @@ export type Object = {
id: string
name: string
tags: any | null
- origin_x: number
- origin_y: number
+ originX: number
+ originY: number
isAnimated: boolean
frameSpeed: number
frameWidth: number
@@ -66,8 +66,8 @@ export type ZoneObject = {
objectId: string
object: Object
depth: number
- position_x: number
- position_y: number
+ positionX: number
+ positionY: number
}
export enum ZoneEventTileType {
@@ -82,8 +82,19 @@ export type ZoneEventTile = {
zoneId: number
zone: Zone
type: ZoneEventTileType
- position_x: number
- position_y: number
+ positionX: number
+ positionY: number
+ teleport?: ZoneEventTileTeleport
+}
+
+export type ZoneEventTileTeleport = {
+ id: string
+ zoneEventTileId: string
+ zoneEventTile: ZoneEventTile
+ toZoneId: number
+ toZone: Zone
+ toPositionX: number
+ toPositionY: number
}
export type User = {
@@ -128,8 +139,8 @@ export type Character = {
level: number
experience: number
role: string
- position_x: number
- position_y: number
+ positionX: number
+ positionY: number
rotation: number
zoneId: number
zone: Zone
@@ -167,8 +178,8 @@ export type SpriteAction = {
sprite: Sprite
action: string
sprites: string[]
- origin_x: number
- origin_y: number
+ originX: number
+ originY: number
isAnimated: boolean
isLooping: boolean
frameWidth: number