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

v0.4.3b: fixed some bugs with the berserker subclass

Browse Source
This commit is contained in:
Evan Debenham 2016-11-04 02:39:11 -04:00
parent d980a8d867
commit 965d0f04ea
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Berserk.java
View File

@ -119,7 +119,7 @@ public class Berserk extends Buff {
}
return state == State.BERSERK;
return state == State.BERSERK && target.SHLD > 0;
}
public void recover(float percent){

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

@ -1393,10 +1393,9 @@ public class Hero extends Char {
@Override
public boolean isAlive() {
if (subClass == HeroSubClass.BERSERKER
&& berserk != null
&& berserk.berserking()){
return true;
if (subClass == HeroSubClass.BERSERKER){
if (berserk == null) berserk = Buff.affect(this, Berserk.class);
if (berserk.berserking()) return true;
}
return super.isAlive();
}