diff --git a/src/shattered_sword/AI/EnemyAI.ts b/src/shattered_sword/AI/EnemyAI.ts index 03e13c0..038075a 100644 --- a/src/shattered_sword/AI/EnemyAI.ts +++ b/src/shattered_sword/AI/EnemyAI.ts @@ -230,13 +230,13 @@ export default class EnemyAI extends StateMachineAI implements BattlerAI { if(this.poisonTimer.isStopped() && this.poisonCounter >0){ this.poisonCounter --; this.poisonTimer.start(); - this.damage( Math.round(this.CURRENT_HP/20) + (this.player._ai).extraDotDmg ); + this.damage( 2+ Math.round(this.CURRENT_HP/20) + (this.player._ai).extraDotDmg ); } if(this.bleedTimer.isStopped() && this.bleedCounter >0){ this.bleedCounter --; this.bleedTimer.start(); - this.damage(3 +Math.round(this.CURRENT_HP/33) + (this.player._ai).extraDotDmg ); + this.damage(3 +Math.round(this.maxHealth/33) + (this.player._ai).extraDotDmg ); } if (this.healthBar) { diff --git a/src/shattered_sword/AI/SnakeAI.ts b/src/shattered_sword/AI/SnakeAI.ts index a84e1ab..9b92814 100644 --- a/src/shattered_sword/AI/SnakeAI.ts +++ b/src/shattered_sword/AI/SnakeAI.ts @@ -11,7 +11,7 @@ export default class SnakeAI extends EnemyAI { collideWithPlayer(player: PlayerController): void { player.damage(10); - if (this.isAttacking && !player.invincible && !player.godMode) { + if (this.isAttacking && !player.invincible ) { player.poisonCounter = 5; } } diff --git a/src/shattered_sword/GameSystems/items/WeaponTypes/LaserGun.ts b/src/shattered_sword/GameSystems/items/WeaponTypes/LaserGun.ts index a19abd8..2d342d3 100644 --- a/src/shattered_sword/GameSystems/items/WeaponTypes/LaserGun.ts +++ b/src/shattered_sword/GameSystems/items/WeaponTypes/LaserGun.ts @@ -72,7 +72,7 @@ export default class laserGun extends WeaponType { createRequiredAssets(scene: Scene): [Line] { let line = scene.add.graphic(GraphicType.LINE, "primary", {start: new Vec2(-1, 1), end: new Vec2(-1, -1)}); line.color = this.color; - line.thickness = 72; + line.thickness = 90; line.tweens.add("fade", { startDelay: 0, diff --git a/src/shattered_sword/Player/PlayerController.ts b/src/shattered_sword/Player/PlayerController.ts index 6643db4..bf917fe 100644 --- a/src/shattered_sword/Player/PlayerController.ts +++ b/src/shattered_sword/Player/PlayerController.ts @@ -98,7 +98,7 @@ export default class PlayerController extends StateMachineAI implements BattlerA invincible : boolean = false; static level : number = 1; - godMode: boolean = false; + static godMode: boolean = false; tilemap: OrthogonalTilemap; @@ -195,6 +195,7 @@ export default class PlayerController extends StateMachineAI implements BattlerA PlayerController.buffPool = new Array(); PlayerController.enemiesKilled = 0; PlayerController.level = 1; + PlayerController.godMode = false; } initializePlatformer(): void { @@ -267,14 +268,14 @@ export default class PlayerController extends StateMachineAI implements BattlerA if(this.bleedTimer.isStopped() && this.bleedCounter >0){ this.bleedCounter --; this.bleedTimer.start(); - this.damage( 2 + Math.round(this.CURRENT_HP/50) ); + this.damage( 2 + Math.round(this.MAX_HP/50) ); } } // TODO - figure out attacker damage(damage: number, attacker?: GameNode): void { - if (this.godMode) { + if (PlayerController.godMode) { //console.log("godmode"); return; } diff --git a/src/shattered_sword/Scenes/GameLevel.ts b/src/shattered_sword/Scenes/GameLevel.ts index e50a2f6..383cf11 100644 --- a/src/shattered_sword/Scenes/GameLevel.ts +++ b/src/shattered_sword/Scenes/GameLevel.ts @@ -1209,7 +1209,7 @@ export default class GameLevel extends Scene { // Cheat protected enableCheat() { if (this.pauseInput.text.toUpperCase() === "UUDDLRLRBABA") { - (this.player._ai).godMode = true; + PlayerController.godMode = true; } else { let commands = this.pauseInput.text.split(' '); @@ -1238,7 +1238,7 @@ export default class GameLevel extends Scene { } } } - (this.player._ai).godMode = false; + PlayerController.godMode = false; } this.pauseInput.text = ""; }