Enemy pirates always parry

Kikketer · Jul 18, 2024 · e7db26e · e7db26e
1 parent 18caf8e
commit e7db26e
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 13 deletions.
diff --git a/boatBattle.ts b/boatBattle.ts
@@ -94,7 +94,7 @@ namespace BoatBattle {
         hitEnemies.forEach((enemy) => {
             // No looting of EnemyPirates
             if (enemy.health > 0) {
-                enemy.hit(1)
+                enemy.hit({ attacker: pirate, damage: 1 })
             }
         })
 

diff --git a/enemy.ts b/enemy.ts
@@ -58,7 +58,7 @@ class Enemy {
         this.sprite.follow(this._currentTarget.sprite, this._speed)
     }
 
-    protected hit(damage: number) {
+    protected hit({ attacker, damage }: { attacker: Pirate, damage: number }) {
         this.health -= damage
 
         if (this.health <= 0) {

diff --git a/enemyPirate.ts b/enemyPirate.ts
@@ -5,11 +5,16 @@ class EnemyPirate extends Enemy {
     static attackLeftAnimation: Image[] = Utils.flipAnimation(Utils.swapAnimationColors(assets.animation`Pirate Swing w Sword`, 14, 2))
     static deathRightAnimation: Image[] = Utils.swapAnimationColors(assets.animation`Pirate Dead`, 14, 2)
     static deathLeftAnimation: Image[] = Utils.flipAnimation(Utils.swapAnimationColors(assets.animation`Pirate Dead`, 14, 2))
-    // static parrySound: music.SoundEffect = music.createSoundEffect(WaveShape.Noise, 5000, 5000, 255, 0, 100, SoundExpressionEffect.Vibrato, InterpolationCurve.Curve)
+    static parryRightAnimation: Image[] = Utils.swapAnimationColors([assets.animation`Pirate Swing w Sword`[0]], 14, 2)
+    static parryLeftAnimation: Image[] = Utils.swapAnimationColors(Utils.flipAnimation([assets.animation`Pirate Swing w Sword`[0]]), 14, 2)
+    static parrySound: music.SoundEffect = music.createSoundEffect(WaveShape.Noise, 5000, 5000, 255, 0, 100, SoundExpressionEffect.Vibrato, InterpolationCurve.Curve)
 
     static directionChangeInterval: number = 1000
     static attackDelayMin: number = 3000
     static attackDelayMax: number = 5000
+    static chanceOfParry: number = 100
+
+    private _isParrying: boolean = false
 
     constructor({ x, y, target, riches }: { x: number, y: number, target?: EnemyTarget, riches?: number }) {
         super({ x, y, target, sprite: sprites.create(assets.animation`Pirate Walk`[0]), riches, speed: 20, minDistanceFromTarget: 10 })
@@ -18,22 +23,45 @@ class EnemyPirate extends Enemy {
         this.walk('left')
     }
 
-    public hit(damage: number) {
-        super.hit(damage)
-
-        if (this.health <= 0) {
+    public hit({ attacker, damage }: {attacker: Pirate, damage: number }) {
+        if (Math.randomRange(0, 100) < EnemyPirate.chanceOfParry) {
+            this._isParrying = true
+            // Face the attacker
+            if (attacker.sprite.x > this.sprite.x) {
+                this.walk('right')
+            } else {
+                this.walk('left')
+            }
+            // Pause walking:
+            this.sprite.follow(this._currentTarget.sprite, 0)
+            // music.play(EnemyPirate.parrySound, music.PlaybackMode.InBackground)
             animation.runImageAnimation(
                 this.sprite,
-                this._facing === 'right' ? EnemyPirate.deathRightAnimation : EnemyPirate.deathLeftAnimation,
-                100,
+                this._facing === 'right' ? EnemyPirate.parryRightAnimation : EnemyPirate.parryLeftAnimation,
+                500,
                 false
             )
+            setTimeout(() => {
+                this._isParrying = false
+                this.walk()
+            }, EnemyPirate.parryRightAnimation.length * 500 + 1000)
+        } else {
+            super.hit({ attacker, damage })
+
+            if (this.health <= 0) {
+                animation.runImageAnimation(
+                    this.sprite,
+                    this._facing === 'right' ? EnemyPirate.deathRightAnimation : EnemyPirate.deathLeftAnimation,
+                    100,
+                    false
+                )
+            }
         }
     }
 
     public render() {
         // No Undead walking!
-        if (this.health <= 0 || this._isAttacking) return
+        if (this.health <= 0 || this._isAttacking || this._isParrying) return
 
         super.render()
 

diff --git a/main.ts b/main.ts
@@ -182,4 +182,4 @@ function startGame(initialState?: States) {
     switchState(initialState ? initialState : States.Menu)
 }
 
-startGame()
+startGame(States.BoatBattle)
diff --git a/militia.ts b/militia.ts
@@ -18,8 +18,8 @@ class Militia extends Enemy {
         this.walk('left')
     }
 
-    public hit(damage: number) {
-        super.hit(damage)
+    public hit({ attacker, damage }: { attacker: Pirate, damage: number }) {
+        super.hit({ attacker, damage })
 
         if (this.health <= 0) {
             animation.runImageAnimation(