diff --git a/src/constants/avatar.ts b/src/constants/avatar.ts deleted file mode 100644 index e20591e..0000000 --- a/src/constants/avatar.ts +++ /dev/null @@ -1,5 +0,0 @@ -export enum Avatar { - Hit = 'Hit', - Hurt = 'Hurt', - Normal = 'Normal', -} diff --git a/src/constants/expression.ts b/src/constants/expression.ts index b81d136..96d35ac 100644 --- a/src/constants/expression.ts +++ b/src/constants/expression.ts @@ -1,8 +1,8 @@ export enum Expression { Dead = 'Dead', Hit = 'Hit', + Hurt = 'Hurt', Normal = 'Normal', - Pissed = 'Pissed', Smug = 'Smug', Sus = 'Sus', } diff --git a/src/constants/index.ts b/src/constants/index.ts index f8a7fa1..4f8b510 100644 --- a/src/constants/index.ts +++ b/src/constants/index.ts @@ -1,5 +1,4 @@ export * from './animation' -export * from './avatar' export * from './expression' export * from './layer' export * from './music' diff --git a/src/gameobjects/player.ts b/src/gameobjects/player.ts index 5314221..714ab3d 100644 --- a/src/gameobjects/player.ts +++ b/src/gameobjects/player.ts @@ -1,4 +1,4 @@ -import { Avatar, Expression, Scene, Sound, Sprite, Tag } from '../constants' +import { Expression, Scene, Sound, Sprite, Tag } from '../constants' import { addAttack, addCursorKeys } from '../events' import { getAvatar, getChildBubble, stopMusic } from '../gameobjects' import { gameState } from '../helpers' @@ -32,7 +32,7 @@ export function addPlayer(x = center().x, y = center().y) { player.onCollide(Tag.Projectile, onHit(player)) player.onDeath(() => { - getAvatar().play(Avatar.Hurt) + getAvatar().play(Expression.Hurt) const deadPlayer = add([ sprite(Sprite.Kiki), @@ -76,17 +76,17 @@ function onHit(player: Player) { const avatar = getAvatar() if (player.hp() < player.maxHP()! / 4) { - player.play(Expression.Pissed) - avatar.play(Avatar.Hurt) + player.play(Expression.Hurt) + avatar.play(Expression.Hurt) } else { player.play(Expression.Hit) - avatar.play(Avatar.Hit) + avatar.play(Expression.Hit) } wait(1, () => { - player.play(Expression.Normal) if (player.exists()) { - avatar.play(Avatar.Normal) + player.play(Expression.Normal) + avatar.play(Expression.Normal) } }) } diff --git a/src/scenes/preload.ts b/src/scenes/preload.ts index 3065356..0439331 100644 --- a/src/scenes/preload.ts +++ b/src/scenes/preload.ts @@ -1,6 +1,5 @@ import { Animation, - Avatar, Expression, Music, Scene, @@ -74,7 +73,7 @@ scene(Scene.Preload, () => { [Expression.Smug]: 1, [Expression.Sus]: 2, [Expression.Hit]: 3, - [Expression.Pissed]: 4, + [Expression.Hurt]: 4, [Expression.Dead]: 5, }, }) @@ -82,9 +81,9 @@ scene(Scene.Preload, () => { loadSprite(Sprite.Avatar, 'sprites/avatar.png', { sliceX: 3, anims: { - [Avatar.Normal]: 0, - [Avatar.Hit]: 1, - [Avatar.Hurt]: 2, + [Expression.Normal]: 0, + [Expression.Hit]: 1, + [Expression.Hurt]: 2, }, })