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

v3.2.0: fixed incorrect ID text when last thrown weapon is consumed

Browse Source
This commit is contained in:
Evan Debenham
2025-07-26 20:18:05 -04:00
parent 1126c48953
commit dbcdd9e478
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/Weapon.java
View File

@@ -170,6 +170,14 @@ abstract public class Weapon extends KindOfWeapon {
defender.damage(Smite.bonusDmg((Hero) attacker, defender), Smite.INSTANCE); defender.damage(Smite.bonusDmg((Hero) attacker, defender), Smite.INSTANCE);
} }
} }
//do not progress toward ID in the specific case of a missile weapon with no parent using
// up it's last shot, as in this case there's nothing left to ID anyway
if (this instanceof MissileWeapon
&& ((MissileWeapon) this).durabilityLeft() <= ((MissileWeapon) this).durabilityPerUse()
&& ((MissileWeapon) this).parent == null){
return damage;
}
if (!levelKnown && attacker == Dungeon.hero) { if (!levelKnown && attacker == Dungeon.hero) {
float uses = Math.min( availableUsesToID, Talent.itemIDSpeedFactor(Dungeon.hero, this) ); float uses = Math.min( availableUsesToID, Talent.itemIDSpeedFactor(Dungeon.hero, this) );