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

v3.2.5: fixed thrown weapon merging not accounting for ID ready

Browse Source
This commit is contained in:
Evan Debenham
2025-09-18 14:21:42 -04:00
parent 7d10b6051a
commit 07c4d2f4ca
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -539,9 +539,13 @@ abstract public class MissileWeapon extends Weapon {
durability = MAX_DURABILITY; durability = MAX_DURABILITY;
} }
masteryPotionBonus = masteryPotionBonus || ((MissileWeapon) other).masteryPotionBonus;
levelKnown = levelKnown || other.levelKnown; levelKnown = levelKnown || other.levelKnown;
cursedKnown = cursedKnown || other.cursedKnown; cursedKnown = cursedKnown || other.cursedKnown;
if (((Weapon)other).readyToIdentify()){
setIDReady();
}
masteryPotionBonus = masteryPotionBonus || ((MissileWeapon) other).masteryPotionBonus;
enchantHardened = enchantHardened || ((MissileWeapon) other).enchantHardened; enchantHardened = enchantHardened || ((MissileWeapon) other).enchantHardened;
//if other has a curse/enchant status that's a higher priority, copy it. in the following order: //if other has a curse/enchant status that's a higher priority, copy it. in the following order: