diff --git a/src/shattered_sword/AI/BullAI.ts b/src/shattered_sword/AI/BullAI.ts index 559263d..971fc1a 100644 --- a/src/shattered_sword/AI/BullAI.ts +++ b/src/shattered_sword/AI/BullAI.ts @@ -17,9 +17,9 @@ export default class BullAI extends EnemyAI { } collideWithPlayer(player: PlayerController): void { - player.damage(10); if (this.isAttacking && !player.invincible) { player.bleedCounter += 3; } + player.damage(10); } } \ No newline at end of file diff --git a/src/shattered_sword/AI/SnakeAI.ts b/src/shattered_sword/AI/SnakeAI.ts index 9b92814..c317a91 100644 --- a/src/shattered_sword/AI/SnakeAI.ts +++ b/src/shattered_sword/AI/SnakeAI.ts @@ -10,9 +10,9 @@ export default class SnakeAI extends EnemyAI { } collideWithPlayer(player: PlayerController): void { - player.damage(10); if (this.isAttacking && !player.invincible ) { player.poisonCounter = 5; } + player.damage(10); } } \ No newline at end of file diff --git a/src/shattered_sword/AI/TigerAI.ts b/src/shattered_sword/AI/TigerAI.ts index 5e44b3d..1e7c800 100644 --- a/src/shattered_sword/AI/TigerAI.ts +++ b/src/shattered_sword/AI/TigerAI.ts @@ -22,9 +22,9 @@ export default class TigerAI extends EnemyAI { } collideWithPlayer(player: PlayerController): void { - player.damage(10); if (this.isAttacking && !player.invincible) { player.bleedCounter += 3; } + player.damage(10); } } \ No newline at end of file diff --git a/src/shattered_sword/Player/PlayerController.ts b/src/shattered_sword/Player/PlayerController.ts index 7255db2..8d29bd0 100644 --- a/src/shattered_sword/Player/PlayerController.ts +++ b/src/shattered_sword/Player/PlayerController.ts @@ -293,9 +293,6 @@ export default class PlayerController extends StateMachineAI implements BattlerA this.CURRENT_SHIELD = newshield; //update shield value } else{ - //i frame here - PlayerController.invincibilityTimer.start(); - this.invincible = true; //console.log("hurt anim"); (this.owner).animation.play("HURT" ); damage *= this.damage_multiplier; diff --git a/src/shattered_sword/Scenes/GameLevel.ts b/src/shattered_sword/Scenes/GameLevel.ts index 8ab6624..8569251 100644 --- a/src/shattered_sword/Scenes/GameLevel.ts +++ b/src/shattered_sword/Scenes/GameLevel.ts @@ -993,7 +993,6 @@ export default class GameLevel extends Scene { break; } } - } protected addCheckPoint(startingTile: Vec2, size: Vec2, enter: string, exit: string): Rect {