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

v0.3.4: cleaned up ring of force

Browse Source
This commit is contained in:
Evan Debenham
2016-01-03 21:02:24 -05:00
committed by Evan Debenham
parent c19e6c2442
commit 6c95e48f14
4 changed files with 36 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java
+5 -6
View File
@@ -324,12 +324,11 @@ public class Hero extends Char {
if (wep != null) {
dmg = wep.damageRoll( this ) + bonus;
} else {
int str = STR() - 8;
dmg = bonus == 0 ?
str > 1 ? Random.NormalIntRange( 1, str ) : 1
: bonus > 0 ?
str > 0 ? Random.NormalIntRange( str/2+bonus, (int)(str*0.5f*bonus) + str*2 ) : 1
: 0;
if (bonus != 0){
dmg = Random.NormalIntRange( RingOfForce.min(bonus, STR()), RingOfForce.max(bonus, STR()) );
} else {
dmg = Random.NormalIntRange(1, Math.max(STR()-8, 1));
}
}
if (dmg < 0) dmg = 0;
return buff( Fury.class ) != null ? (int)(dmg * 1.5f) : dmg;