diff --git a/src/components/gameMaster/assetManager/partials/characterHair/CharacterHairDetails.vue b/src/components/gameMaster/assetManager/partials/characterHair/CharacterHairDetails.vue index eb030dd..73a38a5 100644 --- a/src/components/gameMaster/assetManager/partials/characterHair/CharacterHairDetails.vue +++ b/src/components/gameMaster/assetManager/partials/characterHair/CharacterHairDetails.vue @@ -13,8 +13,8 @@
- - @@ -46,7 +46,7 @@ const selectedCharacterHair = computed(() => assetManagerStore.selectedCharacter const characterName = ref('') const characterGender = ref('MALE' as CharacterGender.MALE) -const characterIsEnabledForCharCreation = ref(false) +const characterIsSelectable = ref(false) const characterSpriteId = ref(null) const genderOptions: CharacterGender[] = ['MALE' as CharacterGender.MALE, 'FEMALE' as CharacterGender.FEMALE] @@ -58,7 +58,7 @@ if (!selectedCharacterHair.value) { if (selectedCharacterHair.value) { characterName.value = selectedCharacterHair.value.name characterGender.value = selectedCharacterHair.value.gender - characterIsEnabledForCharCreation.value = selectedCharacterHair.value.isEnabledForCharCreation + characterIsSelectable.value = selectedCharacterHair.value.isSelectable characterSpriteId.value = selectedCharacterHair.value.spriteId } @@ -89,7 +89,7 @@ function saveCharacterHair() { id: selectedCharacterHair.value!.id, name: characterName.value, gender: characterGender.value, - isEnabledForCharCreation: characterIsEnabledForCharCreation.value, + isSelectable: characterIsSelectable.value, spriteId: characterSpriteId.value } @@ -106,7 +106,7 @@ watch(selectedCharacterHair, (characterHair: CharacterHair | null) => { if (!characterHair) return characterName.value = characterHair.name characterGender.value = characterHair.gender - characterIsEnabledForCharCreation.value = characterHair.isEnabledForCharCreation + characterIsSelectable.value = characterHair.isSelectable characterSpriteId.value = characterHair.spriteId }) diff --git a/src/components/gameMaster/assetManager/partials/characterType/CharacterTypeDetails.vue b/src/components/gameMaster/assetManager/partials/characterType/CharacterTypeDetails.vue index 3c718e4..88caf99 100644 --- a/src/components/gameMaster/assetManager/partials/characterType/CharacterTypeDetails.vue +++ b/src/components/gameMaster/assetManager/partials/characterType/CharacterTypeDetails.vue @@ -19,8 +19,8 @@
- - @@ -53,7 +53,7 @@ const selectedCharacterType = computed(() => assetManagerStore.selectedCharacter const characterName = ref('') const characterGender = ref('MALE' as CharacterGender.MALE) const characterRace = ref('HUMAN' as CharacterRace.HUMAN) -const characterIsEnabledForCharCreation = ref(false) +const characterIsSelectable = ref(false) const characterSpriteId = ref(null) const genderOptions: CharacterGender[] = ['MALE' as CharacterGender.MALE, 'FEMALE' as CharacterGender.FEMALE] @@ -67,7 +67,7 @@ if (selectedCharacterType.value) { characterName.value = selectedCharacterType.value.name characterGender.value = selectedCharacterType.value.gender characterRace.value = selectedCharacterType.value.race - characterIsEnabledForCharCreation.value = selectedCharacterType.value.isEnabledForCharCreation + characterIsSelectable.value = selectedCharacterType.value.isSelectable characterSpriteId.value = selectedCharacterType.value.spriteId } @@ -99,7 +99,7 @@ function saveCharacterType() { name: characterName.value, gender: characterGender.value, race: characterRace.value, - isEnabledForCharCreation: characterIsEnabledForCharCreation.value, + isSelectable: characterIsSelectable.value, spriteId: characterSpriteId.value } @@ -117,7 +117,7 @@ watch(selectedCharacterType, (characterType: CharacterType | null) => { characterName.value = characterType.name characterGender.value = characterType.gender characterRace.value = characterType.race - characterIsEnabledForCharCreation.value = characterType.isEnabledForCharCreation + characterIsSelectable.value = characterType.isSelectable characterSpriteId.value = characterType.spriteId }) diff --git a/src/composables/gameComposable.ts b/src/composables/gameComposable.ts index e8f41ea..1adf2f4 100644 --- a/src/composables/gameComposable.ts +++ b/src/composables/gameComposable.ts @@ -82,7 +82,7 @@ export async function loadSpriteTextures(scene: Phaser.Scene, sprite: Sprite) { scene.textures.addSpriteSheet(sprite_action.key, anim, { frameWidth: sprite_action.frameWidth ?? 0, frameHeight: sprite_action.frameHeight ?? 0 }) scene.anims.create({ key: sprite_action.key, - frameRate: 7, // TODO | 262 : Allow configuring frame rate + frameRate: sprite_action.frameSpeed, frames: scene.anims.generateFrameNumbers(sprite_action.key, { start: 0, end: sprite_action.frameCount! - 1 }), repeat: -1 }) diff --git a/src/types.ts b/src/types.ts index 71df9c4..a73a3f0 100644 --- a/src/types.ts +++ b/src/types.ts @@ -137,7 +137,7 @@ export type CharacterType = { name: string gender: CharacterGender race: CharacterRace - isEnabledForCharCreation: boolean + isSelectable: boolean characters: Character[] spriteId?: string sprite?: Sprite @@ -151,7 +151,7 @@ export type CharacterHair = { spriteId: string sprite: Sprite gender: CharacterGender - isEnabledForCharCreation: boolean + isSelectable: boolean // @TODO: Do we need addedAt and updatedAt? }