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

v0.6.3: fixed boomerang taking an accuracy penalty when used as melee

Browse Source
This commit is contained in:
Evan Debenham 2018-02-01 21:30:45 -05:00 committed by Evan Debenham
parent e4a3d3ff10
commit 0fb0f9ce2a
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -281,14 +281,19 @@ public class Hero extends Char {
return belongings.armor == null ? 0 : belongings.armor.tier; return belongings.armor == null ? 0 : belongings.armor.tier;
} }
//this variable is only needed because of the boomerang, remove if/when it is no longer equippable
boolean rangedAttack = false;
public boolean shoot( Char enemy, MissileWeapon wep ) { public boolean shoot( Char enemy, MissileWeapon wep ) {
//temporarily set the hero's weapon to the missile weapon being used //temporarily set the hero's weapon to the missile weapon being used
KindOfWeapon equipped = belongings.weapon; KindOfWeapon equipped = belongings.weapon;
belongings.weapon = wep; belongings.weapon = wep;
rangedAttack = true;
boolean result = attack( enemy ); boolean result = attack( enemy );
Invisibility.dispel(); Invisibility.dispel();
belongings.weapon = equipped; belongings.weapon = equipped;
rangedAttack = false;
return result; return result;
} }
@ -298,7 +303,7 @@ public class Hero extends Char {
KindOfWeapon wep = belongings.weapon; KindOfWeapon wep = belongings.weapon;
float accuracy = 1; float accuracy = 1;
if (wep instanceof MissileWeapon if (wep instanceof MissileWeapon && rangedAttack
&& Dungeon.level.distance( pos, target.pos ) == 1) { && Dungeon.level.distance( pos, target.pos ) == 1) {
accuracy *= 0.5f; accuracy *= 0.5f;
} }