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

v0.6.3: corrected some minor bugs with some missile weapons

Browse Source
This commit is contained in:
Evan Debenham 2018-01-20 15:34:38 -05:00
parent 8461500d66
commit 91f31aef9f
3 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/Boomerang.java
View File

@ -95,8 +95,8 @@ public class Boomerang extends MissileWeapon {
} }
@Override @Override
public void rangedHit( Char enemy ) { public void rangedHit( Char enemy, int cell ) {
circleBack(enemy.pos, curUser); circleBack(cell, curUser);
} }
@Override @Override
@ -107,7 +107,7 @@ public class Boomerang extends MissileWeapon {
private void circleBack( int from, Hero owner ) { private void circleBack( int from, Hero owner ) {
((MissileSprite)curUser.sprite.parent.recycle( MissileSprite.class )). ((MissileSprite)curUser.sprite.parent.recycle( MissileSprite.class )).
reset( from, curUser.pos, curItem, null ); reset( from, owner.sprite, curItem, null );
if (throwEquiped) { if (throwEquiped) {
owner.belongings.weapon = this; owner.belongings.weapon = this;

9
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/MissileWeapon.java
View File

@ -83,12 +83,7 @@ abstract public class MissileWeapon extends Weapon {
rangedMiss( cell ); rangedMiss( cell );
} else { } else {
//int bonus = RingOfSharpshooting.getBonus(curUser, RingOfSharpshooting.Aim.class); rangedHit( enemy, cell );
//if (curUser.heroClass == HeroClass.HUNTRESS && enemy.buff(PinCushion.class) == null)
// bonus += 3;
rangedHit( enemy );
} }
} }
@ -129,7 +124,7 @@ abstract public class MissileWeapon extends Weapon {
return delay; return delay;
} }
protected void rangedHit( Char enemy ){ protected void rangedHit( Char enemy, int cell ){
//if this weapon was thrown from a source stack, degrade that stack. //if this weapon was thrown from a source stack, degrade that stack.
//unless a weapon is about to break, then break the one being thrown //unless a weapon is about to break, then break the one being thrown
if (parent != null){ if (parent != null){

4
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/TippedDart.java
View File

@ -38,11 +38,11 @@ public abstract class TippedDart extends Dart {
} }
@Override @Override
protected void rangedHit(Char enemy) { protected void rangedHit(Char enemy, int cell) {
if (enemy.isAlive()) if (enemy.isAlive())
Buff.affect(enemy, PinCushion.class).stick(new Dart()); Buff.affect(enemy, PinCushion.class).stick(new Dart());
else else
Dungeon.level.drop( new Dart(), enemy.pos).sprite.drop(); Dungeon.level.drop( new Dart(), cell ).sprite.drop();
} }
@Override @Override