diff --git a/dist/shattered_sword_assets/images/bleeding.png b/dist/shattered_sword_assets/images/bleeding.png index 3a2af22..da46bad 100644 Binary files a/dist/shattered_sword_assets/images/bleeding.png and b/dist/shattered_sword_assets/images/bleeding.png differ diff --git a/dist/shattered_sword_assets/images/burning.png b/dist/shattered_sword_assets/images/burning.png index 6da0978..fba9e6f 100644 Binary files a/dist/shattered_sword_assets/images/burning.png and b/dist/shattered_sword_assets/images/burning.png differ diff --git a/dist/shattered_sword_assets/images/poisoning.png b/dist/shattered_sword_assets/images/poisoning.png index 41d1494..30f8ed2 100644 Binary files a/dist/shattered_sword_assets/images/poisoning.png and b/dist/shattered_sword_assets/images/poisoning.png differ diff --git a/src/shattered_sword/GameSystems/BattleManager.ts b/src/shattered_sword/GameSystems/BattleManager.ts index c8f6cb4..a6c23ea 100644 --- a/src/shattered_sword/GameSystems/BattleManager.ts +++ b/src/shattered_sword/GameSystems/BattleManager.ts @@ -41,6 +41,9 @@ export default class BattleManager { if(player.hasDoubleStrike){ enemy.damage(weapon.type.damage * (this.players[0]).CURRENT_ATK/200); } + if(player.hasLifesteal){ + player.addHealth(weapon.type.damage * player.CURRENT_ATK/100 * player.lifestealratio); + } } } } diff --git a/src/shattered_sword/Player/PlayerController.ts b/src/shattered_sword/Player/PlayerController.ts index 5f8d21c..6be9894 100644 --- a/src/shattered_sword/Player/PlayerController.ts +++ b/src/shattered_sword/Player/PlayerController.ts @@ -450,7 +450,7 @@ export default class PlayerController extends StateMachineAI implements BattlerA this.hasBleed = true; break; case BuffType.BURN: - this.hasBleed = true; + this.hasBurn = true; break; case BuffType.POISON: this.hasPoison = true; diff --git a/src/shattered_sword/Scenes/GameLevel.ts b/src/shattered_sword/Scenes/GameLevel.ts index 553763a..612fcd7 100644 --- a/src/shattered_sword/Scenes/GameLevel.ts +++ b/src/shattered_sword/Scenes/GameLevel.ts @@ -108,11 +108,11 @@ export default class GameLevel extends Scene { //buffs layer buffLayer: Layer; buffButton1 : Button; + buffLabel1 : Label; buffButton2 : Button; + buffLabel2 : Label; buffButton3 : Button; - buffLable1: Label; - buffLable2: Label; - buffLable3: Label; + buffLabel3: Label; buffs: Array; //pause layer @@ -271,24 +271,26 @@ export default class GameLevel extends Scene { case Player_Events.GIVE_BUFF: this.buffs = (this.player._ai).generateBuffs(); if(this.buffs[0].string !== undefined){ - this.buffButton1.text = this.buffs[0].string; + //this.buffButton1.text = this.buffs[0].string; + this.buffLabel1.text = this.buffs[0].string; } else{ - this.buffButton1.text = "Increase "+this.buffs[0].type + " by "+this.buffs[0].value; + //this.buffButton1.text = "Increase "+this.buffs[0].type + " by "+this.buffs[0].value; + this.buffLabel1.text = "Increase "+this.buffs[0].type + " by "+this.buffs[0].value; } if(this.buffs[1].string !== undefined){ - this.buffButton2.text = this.buffs[1].string; + this.buffLabel2.text = this.buffs[1].string; } else{ - this.buffButton2.text = "Increase "+this.buffs[1].type + " by "+this.buffs[1].value; + this.buffLabel2.text = "Increase "+this.buffs[1].type + " by "+this.buffs[1].value; } if(this.buffs[2].string !== undefined){ - this.buffButton3.text = this.buffs[2].string; + this.buffLabel3.text = this.buffs[2].string; } else{ - this.buffButton3.text = "Increase "+this.buffs[2].type + " by "+this.buffs[2].value; + this.buffLabel3.text = "Increase "+this.buffs[2].type + " by "+this.buffs[2].value; } //pause game here @@ -613,7 +615,7 @@ export default class GameLevel extends Scene { //TODO - //determine button location this.buffButton1 =