From 43fe08071f7bed40f8b34e08a4886142818f8b79 Mon Sep 17 00:00:00 2001
From: Dennis Postma <dennis@directonline.io>
Date: Mon, 3 Jun 2024 20:40:08 +0200
Subject: [PATCH] Added better security for character loading, worked on zone
 joining and moving logic

---
 src/components/World.vue             |  8 ++------
 src/components/sprites/Character.vue | 27 ++++++++++++++-------------
 src/engine/Map/IMap.ts               |  4 ++--
 src/engine/Map/Map.ts                | 26 ++++++++++++--------------
 4 files changed, 30 insertions(+), 35 deletions(-)

diff --git a/src/components/World.vue b/src/components/World.vue
index 1679d18..ce65386 100644
--- a/src/components/World.vue
+++ b/src/components/World.vue
@@ -2,8 +2,8 @@
   <TilemapLayer v-if="zoneStore.isLoaded" :tilemap="tileMap" :tileset="zoneStore.getTiles" ref="tilemapLayer" :layerIndex="0" :cull-padding-x="10" :cull-padding-y="10" />
   <Controls :layer="layer" />
   <Character :layer="layer" />
-  <Container v-if="zoneStore.isLoaded && zoneStore.getPlayers.length > 0">
-    <Character :layer="layer" v-for="player in zoneStore.getPlayers" :key="player.id" :player="player" />
+  <Container v-if="zoneStore.isLoaded && zoneStore.getCharacters.length > 0">
+    <Character :layer="layer" v-for="character in zoneStore.getCharacters" :key="character.id" :character="character" />
   </Container>
 </template>
 
@@ -78,10 +78,6 @@ socket.getConnection.on('character:zone:load', (data) => {
 // Listen for player join events
 socket.getConnection.on('character:zone:character_join', (data: CharacterType) => {
   console.log('character:zone:character_join', data)
-  if (data.id === socket.getConnection.character.id) {
-    console.log('self')
-    return
-  }
   zoneStore.addCharacter(data)
 })
 
diff --git a/src/components/sprites/Character.vue b/src/components/sprites/Character.vue
index a782da9..4866edb 100644
--- a/src/components/sprites/Character.vue
+++ b/src/components/sprites/Character.vue
@@ -1,7 +1,7 @@
 <template>
   <Container>
     <Text
-      :text="props.player?.name"
+      :text="props.character?.name"
       :x="position.x - 50"
       :y="position.y - 80"
       :style="{
@@ -22,13 +22,14 @@ import { Container, onPostUpdate, onPreUpdate, Sprite, Text, useScene } from 'ph
 import { reactive, type Ref, ref } from 'vue'
 import config from '@/config'
 import { useSocketStore } from '@/stores/socket'
+import {type Character as CharacterT } from '@/types'
 
 const socket = useSocketStore()
 
 const props = defineProps({
   layer: Phaser.Tilemaps.TilemapLayer,
-  player: {
-    type: Object,
+  character: {
+    type: Object as () => CharacterT | undefined,
     default: undefined
   }
 })
@@ -41,10 +42,10 @@ const scene = useScene()
 
 const position = reactive({ x: 0, y: 0 })
 
-if (props.player !== undefined) {
-  console.log('player', props.player)
-  position.x = props.player?.coords.x
-  position.y = props.player?.coords.y
+if (props.character !== undefined) {
+  console.log('character', props.character)
+  position.x = props.character?.position_x
+  position.y = props.character?.position_y
 }
 
 const pointer_tile = ref(undefined)
@@ -74,20 +75,20 @@ function onPointerClick(pointer: Phaser.Input.Pointer) {
   }
 }
 
-if (!props.player) {
+if (!props.character) {
   scene.input.on(Phaser.Input.Events.POINTER_UP, onPointerClick)
 }
 
-socket.getConnection.on('player_moved', (data: any) => {
-  console.log('player_moved', data)
+socket.getConnection.on('character:move', (data: any) => {
+  console.log('character moved', data)
 
-  if (data.id !== props.player?.id) {
+  if (data.id !== props.character?.id) {
     console.log('not you')
     return
   }
 
-  position.x = data.coords.x
-  position.y = data.coords.y
+  position.x = data.position_x
+  position.y = data.position_y
 })
 
 function getTile(x: number, y: number, layer: Phaser.Tilemaps.TilemapLayer): Phaser.Tilemaps.Tile | undefined {
diff --git a/src/engine/Map/IMap.ts b/src/engine/Map/IMap.ts
index ba2b26e..240d5cd 100644
--- a/src/engine/Map/IMap.ts
+++ b/src/engine/Map/IMap.ts
@@ -1,4 +1,4 @@
-import Player from '../Player/Player'
+import type { Character } from '@/types'
 
 export default interface IMap {
   readonly id: number
@@ -6,5 +6,5 @@ export default interface IMap {
   width: number
   height: number
   data: any
-  players: Array<Player> | []
+  characters: Array<Character> | []
 }
diff --git a/src/engine/Map/Map.ts b/src/engine/Map/Map.ts
index 0551c77..32ceb15 100644
--- a/src/engine/Map/Map.ts
+++ b/src/engine/Map/Map.ts
@@ -1,5 +1,6 @@
 import type IMap from '@/engine/Map/IMap'
 import Player from '@/engine/Player/Player'
+import type { Character } from '@/types'
 
 export default class Map implements IMap {
   id: number
@@ -7,31 +8,28 @@ export default class Map implements IMap {
   width: number
   height: number
   data: any
-  players: Array<Player> | []
+  characters: Character[]
 
-  constructor(id: number, name: string, width: number, height: number, data: any, players: Array<Player> | []) {
+  constructor(id: number, name: string, width: number, height: number, data: any, characters: Character[]) {
     this.id = id
     this.name = name
     this.width = width
     this.height = height
     this.data = data
-    this.players = players
+    this.characters = characters
   }
 
-  public addPlayer(player: Player) {
-    // @ts-ignore
-    this.players.push(player)
+  public addCharacter(character: Character) {
+    this.characters.push(character)
   }
 
-  public removePlayer(player: Player) {
-    this.players = this.players.filter((p) => p.id !== player.id)
+  public removeCharacter(character: Character) {
+    this.characters = this.characters.filter((c: Character) => c.id !== character.id)
   }
 
-  public movePlayer(player: Player, x: number, y: number) {
-    const playerIndex = this.players.findIndex((p) => p.id === player.id)
-    if (playerIndex !== -1) {
-      this.players[playerIndex].coords.x = x
-      this.players[playerIndex].coords.y = y
-    }
+  public moveCharacter(character: Character, x: number, y: number) {
+    const index = this.characters.findIndex((c: Character) => c.id === character.id)
+    this.characters[index].position_x = x
+    this.characters[index].position_y = y
   }
 }