From 5a3c9dfe1acccb7fd163ad8b6695e952e9f94fa8 Mon Sep 17 00:00:00 2001 From: Charlize Date: Thu, 14 Mar 2024 08:26:09 -0700 Subject: [PATCH] Merging Branches With New Spritesheet and Fixed Visuals --- assets/penny_spritesheet.png | Bin 11847 -> 18088 bytes src/prefabs/Character.js | 15 +++++++-------- src/prefabs/Enemy.js | 17 +++++++---------- src/prefabs/Selection.js | 3 +-- src/scenes/Fighting.js | 1 - src/scenes/Menu.js | 10 ++++++++-- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/assets/penny_spritesheet.png b/assets/penny_spritesheet.png index d6647dca09ab17be3bb95807e4ca0b42446df9e5..e5dd3a3837ee80a9dec654ee5af1675932c2a8c0 100644 GIT binary patch delta 15439 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 0){ scene.time.delayedCall(character.hurtTimer, () => { character.clearTint() scene.enemy.attacking = false - damage.setVisible(false) + damage_txt.setVisible(false) + this.attackText_below.setVisible(false) + this.attackText.setVisible(false) if (character.health > 0){ this.stateMachine.transition('idle') diff --git a/src/prefabs/Enemy.js b/src/prefabs/Enemy.js index b70093e..006f9c7 100644 --- a/src/prefabs/Enemy.js +++ b/src/prefabs/Enemy.js @@ -18,7 +18,6 @@ class Enemy extends Phaser.GameObjects.Sprite { // setting up the character to attack this.selectedChar = -1 - // this.damaged = false // setting up state machines scene.enemyFSM = new StateMachine('default', { @@ -47,7 +46,7 @@ class DefaultState extends State { // ensure enemy is not attacking in this scene enemy.hasAttacked = false enemy.dmgToPlayer = 0 - scene.enemy_attacking + // scene.player_turn = true enemy.clearTint() enemy.anims.play(`${enemy.name}_default`, true) @@ -82,24 +81,23 @@ class SingleAttackState extends State { // enemy will randomize their attack on a character enter (scene, enemy) { // the damage to player becomes the attack power of this enemy + enemy.anims.play(`${enemy.name}_singleAttack`, true) + scene.time.delayedCall(enemy.damagedTimer, () => { enemy.dmgToPlayer = enemy.attack_dmg enemy.hasAttacked = true }) enemy.selectedChar = enemy.charAttacking(scene.checkLiving()) scene.characters[enemy.selectedChar].hurt = true - // enemy.hasAttacked = true - this.attackText_below = scene.add.bitmapText(centerX, centerY+1, 'font', `${scene.characters[enemy.selectedChar].name} takes ${enemy.dmgToPlayer} damage`, 12).setOrigin(0.5).setTint(0x1a1200) - this.attackText = scene.add.bitmapText(centerX, centerY, 'font', `${scene.characters[enemy.selectedChar].name} takes ${enemy.dmgToPlayer} damage`, 12).setOrigin(0.5) - + } execute(scene, enemy) { if (enemy.hasAttacked == true) { - // reset the selected char here (TEMP) + // PROBLEM + + // reset the selected char here this.selectedChar = -1 scene.changeTurn() - this.attackText_below.setVisible(false) - this.attackText.setVisible(false) this.stateMachine.transition('default') } } @@ -130,7 +128,6 @@ class DamagedState extends State { class DefeatState extends State { // the enemy will be knocked out in this state enter (scene, enemy) { - // maybe increase a variable to check how many players have defeatd enemy.anims.play(`${enemy.name}_defeat`, true) // enemy.setTint('#A020F0') scene.active_enemies -= 1 diff --git a/src/prefabs/Selection.js b/src/prefabs/Selection.js index 4c9ed86..1fb36a7 100644 --- a/src/prefabs/Selection.js +++ b/src/prefabs/Selection.js @@ -14,7 +14,6 @@ class SelectionMenu extends Phaser.GameObjects.Graphics{ this.current_selection = 2 // what the cursor is pointing at this.cursor_pos = -20 - // initializing temporary selection button //see: https://github.com/phaserjs/examples/blob/master/public/src/game%20objects/text/simple%20text%20button.js this.container_bg = scene.add.image(x,y - 4, 'container') @@ -27,7 +26,7 @@ class SelectionMenu extends Phaser.GameObjects.Graphics{ this.availableChar = this.scene.checkActive() this.charCursor = scene.add.image(this.characters[this.current_player].x + 15, this.characters[this.current_player].y - tileSize * 1.5, 'char_cursor') - this.attackingPlayer + this.attackingPlayer = undefined // initialize an attacking Player } updateAvailable() { diff --git a/src/scenes/Fighting.js b/src/scenes/Fighting.js index 412a75a..223e889 100644 --- a/src/scenes/Fighting.js +++ b/src/scenes/Fighting.js @@ -13,7 +13,6 @@ class Fighting extends Phaser.Scene { this.active_enemies = 1 // Note: in future scenes it may change the amount this.FSM_holder = Array(3).fill(0) this.textAdded = false - this.temp_dmg = 200 // initializing the amt the player will do to the enemy this.dmgToEnemy = 0 this.enemy_dmg = 0 diff --git a/src/scenes/Menu.js b/src/scenes/Menu.js index 5e09a87..3b31105 100644 --- a/src/scenes/Menu.js +++ b/src/scenes/Menu.js @@ -147,16 +147,22 @@ class Menu extends Phaser.Scene{ frames: this.anims.generateFrameNumbers('penny', { start: 0, end:7}), }) this.anims.create({ - key: 'PENNY_damaged', + key: 'PENNY_singleAttack', frameRate: 8, repeat: 0, frames: this.anims.generateFrameNumbers('penny', { start: 8, end:15}), }) + this.anims.create({ + key: 'PENNY_damaged', + frameRate: 8, + repeat: 0, + frames: this.anims.generateFrameNumbers('penny', { start: 16, end:23}), + }) this.anims.create({ key: 'PENNY_defeat', frameRate: 8, repeat: -1, - frames: this.anims.generateFrameNumbers('penny', { start: 16, end: 16}), + frames: this.anims.generateFrameNumbers('penny', { start: 24, end: 24}), }) }