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

V0.2.0: Corrected Ring of Force implementation

Browse Source
This commit is contained in:
Evan Debenham 2014-09-11 19:57:05 -04:00
parent 110631ea77
commit 1615f5e502
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java
View File

@ -316,15 +316,15 @@ public class Hero extends Char {
public int damageRoll() {
int dmg;
int bonus = 0;
for (Buff buff : buffs( RingOfEvasion.Evasion.class )) {
for (Buff buff : buffs( RingOfForce.Force.class )) {
bonus += ((RingOfForce.Force)buff).level;
}
if (belongings.weapon != null) {
dmg = belongings.weapon.damageRoll( this ) + bonus;
} else {
bonus *= 1+Math.round(lvl/5f);
dmg = Random.NormalIntRange( 1, Math.min(1 , STR()-9+bonus ) );
int bonusMax = 1 + (int)(bonus * (lvl/5f));
dmg = Random.NormalIntRange( 1+bonus, Math.max(1+bonus , STR()-9+bonusMax ) );
}
return buff( Fury.class ) != null ? (int)(dmg * 1.5f) : dmg;
}