konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v0.6.5: correct bugs with berserk and improved icon clarity

Browse Source
This commit is contained in:
Evan Debenham
2018-05-01 01:18:07 -04:00
committed by Evan Debenham
parent ca6a35ba21
commit af8a748a85
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Berserk.java
+5 -3
View File
@@ -123,12 +123,13 @@ public class Berserk extends Buff {
} }
return state == State.BERSERK; return state == State.BERSERK && target.SHLD > 0;
} }
public void damage(int damage){ public void damage(int damage){
if (state == State.RECOVERING) return; if (state == State.RECOVERING) return;
power = Math.min(1.1f, power + (damage/(float)target.HT)/3f ); power = Math.min(1.1f, power + (damage/(float)target.HT)/3f );
BuffIndicator.refreshHero();
} }
public void recover(float percent){ public void recover(float percent){
@@ -151,14 +152,15 @@ public class Berserk extends Buff {
public void tintIcon(Image icon) { public void tintIcon(Image icon) {
switch (state){ switch (state){
case NORMAL: default: case NORMAL: default:
if (power < 1f) icon.hardlight(1f, 1f - 0.6f*power, 0f); if (power < 0.5f) icon.hardlight(1f, 1f, 0.5f - (power));
else if (power < 1f) icon.hardlight(1f, 1.5f - power, 0f);
else icon.hardlight(1f, 0f, 0f); else icon.hardlight(1f, 0f, 0f);
break; break;
case BERSERK: case BERSERK:
icon.hardlight(1f, 0f, 0f); icon.hardlight(1f, 0f, 0f);
break; break;
case RECOVERING: case RECOVERING:
icon.hardlight(0.35f, 0.45f, 0.75f); icon.hardlight(1f - (levelRecovery*0.5f), 1f - (levelRecovery*0.3f), 1f);
break; break;
} }
} }