imshvc/noxious_client
1
0
Fork 0
forked from noxious/client
Code Pull Requests Activity

Walk improvement

Browse Source
This commit is contained in:
Dennis Postma 2025-02-06 13:46:21 +01:00
parent 2a2841cf16
commit 15b212160d
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/components/gameMaster/mapEditor/partials/SelectedPlacedMapObject.vue
View File

@ -41,12 +41,12 @@
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import type { Map as MapT, MapObject, PlacedMapObject } from '@/application/types' import type { MapObject, Map as MapT, PlacedMapObject } from '@/application/types'
import Modal from '@/components/utilities/Modal.vue' import Modal from '@/components/utilities/Modal.vue'
import { onMounted, ref } from 'vue' import { useMapEditorComposable } from '@/composables/useMapEditorComposable'
import { MapObjectStorage } from '@/storage/storages' import { MapObjectStorage } from '@/storage/storages'
import { useGameStore } from '@/stores/gameStore' import { useGameStore } from '@/stores/gameStore'
import { useMapEditorComposable } from '@/composables/useMapEditorComposable' import { onMounted, ref } from 'vue'
const props = defineProps<{ const props = defineProps<{
placedMapObject: PlacedMapObject placedMapObject: PlacedMapObject
@ -77,7 +77,7 @@ const handleDelete = () => {
emit('delete', props.placedMapObject.id, props.map) emit('delete', props.placedMapObject.id, props.map)
} }
async function handleUpdate () { async function handleUpdate() {
if (!mapObject.value) return if (!mapObject.value) return
gameStore.connection?.emit( gameStore.connection?.emit(
@ -86,8 +86,9 @@ async function handleUpdate () {
id: props.placedMapObject.mapObject as string, id: props.placedMapObject.mapObject as string,
name: mapObjectName.value, name: mapObjectName.value,
originX: mapObjectOriginX.value, originX: mapObjectOriginX.value,
originY: mapObjectOriginY.value, originY: mapObjectOriginY.value
}, async (response: boolean) => { },
async (response: boolean) => {
if (!response) return if (!response) return
// Update mapObject in storage // Update mapObject in storage
await mapObjectStorage.update(mapObject.value!.id, { await mapObjectStorage.update(mapObject.value!.id, {

19
src/composables/useCharacterSpriteComposable.ts
View File

@ -1,3 +1,4 @@
import config from '@/application/config'
import { Direction } from '@/application/enums' import { Direction } from '@/application/enums'
import { type MapCharacter } from '@/application/types' import { type MapCharacter } from '@/application/types'
import { calculateIsometricDepth, tileToWorldX, tileToWorldY } from '@/services/mapService' import { calculateIsometricDepth, tileToWorldX, tileToWorldY } from '@/services/mapService'
@ -35,9 +36,10 @@ export function useCharacterSpriteComposable(scene: Phaser.Scene, tilemap: Phase
tween.value.stop() tween.value.stop()
} }
const distance = Math.sqrt(Math.pow(newPositionX - currentPositionX.value, 2) + Math.pow(newPositionY - currentPositionY.value, 2)) const tileDistance = Math.sqrt(Math.pow((newPositionX - currentPositionX.value) / config.tile_size.width, 2) + Math.pow((newPositionY - currentPositionY.value) / config.tile_size.height, 2))
const baseSpeed = 150 // pixels per second
const duration = (distance / baseSpeed) * 1000 // Convert to milliseconds const baseDuration = 300 // milliseconds per tile
const duration = Math.min(baseDuration * tileDistance, baseDuration)
tween.value = tilemap.scene.tweens.add({ tween.value = tilemap.scene.tweens.add({
targets: characterContainer.value, targets: characterContainer.value,
@ -73,10 +75,13 @@ export function useCharacterSpriteComposable(scene: Phaser.Scene, tilemap: Phase
characterSprite.value!.setTexture(charTexture.value) characterSprite.value!.setTexture(charTexture.value)
}) })
characterSprite.value.anims.play({ characterSprite.value.anims.play(
key: fullAnimationName, {
repeat: loop ? -1 : 0 key: fullAnimationName,
}, ignoreIfPlaying) repeat: loop ? -1 : 0
},
ignoreIfPlaying
)
} }
const calcDirection = (oldPositionX: number, oldPositionY: number, newPositionX: number, newPositionY: number): Direction => { const calcDirection = (oldPositionX: number, oldPositionY: number, newPositionX: number, newPositionY: number): Direction => {