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

v0.4.2: stealth weapons now correctly apply strength bonus on surprise hit

Browse Source
This commit is contained in:
Evan Debenham 2016-09-04 04:52:04 -04:00
parent 1faed412d4
commit aeb699ec1b
3 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/AssassinsBlade.java
View File

@ -43,10 +43,15 @@ public class AssassinsBlade extends MeleeWeapon {
@Override
public int damageRoll(Hero hero) {
Char enemy = hero.enemy();
if (enemy instanceof Mob && ((Mob) enemy).surprisedBy(hero))
if (enemy instanceof Mob && ((Mob) enemy).surprisedBy(hero)) {
//deals avg damage to max on surprise, instead of min to max.
return imbue.damageFactor(Random.NormalIntRange((min() + max())/2, max()));
else
int damage = imbue.damageFactor(Random.NormalIntRange((min() + max()) / 2, max()));
int exStr = hero.STR() - STRReq();
if (exStr > 0) {
damage += Random.IntRange( 0, exStr );
}
return damage;
} else
return super.damageRoll(hero);
}

11
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Dagger.java
View File

@ -43,10 +43,15 @@ public class Dagger extends MeleeWeapon {
@Override
public int damageRoll(Hero hero) {
Char enemy = hero.enemy();
if (enemy instanceof Mob && ((Mob) enemy).surprisedBy(hero))
if (enemy instanceof Mob && ((Mob) enemy).surprisedBy(hero)) {
//deals avg damage to max on surprise, instead of min to max.
return imbue.damageFactor(Random.NormalIntRange((min() + max())/2, max()));
else
int damage = imbue.damageFactor(Random.NormalIntRange((min() + max()) / 2, max()));
int exStr = hero.STR() - STRReq();
if (exStr > 0) {
damage += Random.IntRange( 0, exStr );
}
return damage;
} else
return super.damageRoll(hero);
}
}

11
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Dirk.java
View File

@ -43,10 +43,15 @@ public class Dirk extends MeleeWeapon {
@Override
public int damageRoll(Hero hero) {
Char enemy = hero.enemy();
if (enemy instanceof Mob && ((Mob) enemy).surprisedBy(hero))
if (enemy instanceof Mob && ((Mob) enemy).surprisedBy(hero)) {
//deals avg damage to max on surprise, instead of min to max.
return imbue.damageFactor(Random.NormalIntRange((min() + max())/2, max()));
else
int damage = imbue.damageFactor(Random.NormalIntRange((min() + max()) / 2, max()));
int exStr = hero.STR() - STRReq();
if (exStr > 0) {
damage += Random.IntRange( 0, exStr );
}
return damage;
} else
return super.damageRoll(hero);
}
}