LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v0.4.3c: fixed additional bugs with the berserker passive buff

Browse Source
This commit is contained in:
Evan Debenham 2016-11-06 16:41:48 -05:00
parent 223a84a67e
commit d6fdccd21f
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java
View File

@ -965,6 +965,10 @@ public class Hero extends Char {
dmg -= Random.NormalIntRange(belongings.armor.DRMin(), belongings.armor.DRMax())/2; dmg -= Random.NormalIntRange(belongings.armor.DRMin(), belongings.armor.DRMax())/2;
} }
if (subClass == HeroSubClass.BERSERKER && berserk == null){
berserk = Buff.affect(this, Berserk.class);
}
super.damage( dmg, src ); super.damage( dmg, src );
} }
@ -1393,9 +1397,10 @@ public class Hero extends Char {
@Override @Override
public boolean isAlive() { public boolean isAlive() {
if (subClass == HeroSubClass.BERSERKER){ if (subClass == HeroSubClass.BERSERKER
if (berserk == null) berserk = Buff.affect(this, Berserk.class); && berserk != null
if (berserk.berserking()) return true; && berserk.berserking()){
return true;
} }
return super.isAlive(); return super.isAlive();
} }