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

v0.8.2: added a temp reference to equipped weps when using thrown weps

Browse Source
This commit is contained in:
Evan Debenham 2020-07-25 14:34:44 -04:00
parent a298053118
commit 666e009334
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Belongings.java
View File

@ -53,6 +53,9 @@ public class Belongings implements Iterable<Item> {
public KindofMisc misc = null; public KindofMisc misc = null;
public Ring ring = null; public Ring ring = null;
//used when thrown weapons temporary occupy the weapon slot
public KindOfWeapon stashedWeapon = null;
public Belongings( Hero owner ) { public Belongings( Hero owner ) {
this.owner = owner; this.owner = owner;

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

@ -323,11 +323,12 @@ public class Hero extends Char {
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; belongings.stashedWeapon = belongings.weapon;
belongings.weapon = wep; belongings.weapon = wep;
boolean hit = attack( enemy ); boolean hit = attack( enemy );
Invisibility.dispel(); Invisibility.dispel();
belongings.weapon = equipped; belongings.weapon = belongings.stashedWeapon;
belongings.stashedWeapon = null;
if (subClass == HeroSubClass.GLADIATOR){ if (subClass == HeroSubClass.GLADIATOR){
if (hit) { if (hit) {

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/KindOfWeapon.java
View File

@ -42,7 +42,7 @@ abstract public class KindOfWeapon extends EquipableItem {
@Override @Override
public boolean isEquipped( Hero hero ) { public boolean isEquipped( Hero hero ) {
return hero.belongings.weapon == this; return hero.belongings.weapon == this || hero.belongings.stashedWeapon == this;
} }
@Override @Override