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

v3.0.0: fixed enchants/glyphs not working with body form in some cases

Browse Source
This commit is contained in:
Evan Debenham
2025-02-10 13:55:17 -05:00
parent aa1ae2f409
commit b3570adc94
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java
View File

@@ -693,6 +693,10 @@ public class Armor extends EquipableItem {
&& owner.buff(HolyWard.HolyArmBuff.class) != null
&& ((Hero) owner).subClass != HeroSubClass.PALADIN){
return false;
} else if (owner.buff(BodyForm.BodyFormBuff.class) != null
&& owner.buff(BodyForm.BodyFormBuff.class).glyph() != null
&& owner.buff(BodyForm.BodyFormBuff.class).glyph().getClass().equals(type)){
return true;
} else {
return glyph.getClass() == type;
}

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

@@ -457,8 +457,12 @@ abstract public class Weapon extends KindOfWeapon {
&& owner instanceof Hero
&& isEquipped((Hero) owner)
&& owner.buff(HolyWeapon.HolyWepBuff.class) != null
&& ((Hero) owner).subClass != HeroSubClass.PALADIN){
&& ((Hero) owner).subClass != HeroSubClass.PALADIN) {
return false;
} else if (owner.buff(BodyForm.BodyFormBuff.class) != null
&& owner.buff(BodyForm.BodyFormBuff.class).enchant() != null
&& owner.buff(BodyForm.BodyFormBuff.class).enchant().getClass().equals(type)){
return true;
} else {
return enchantment.getClass() == type;
}