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

v0.9.4: magical infusion now preserves curses

Browse Source
This commit is contained in:
Evan Debenham 2021-07-05 19:51:14 -04:00
parent 853ecad6e6
commit dfddf0fd94
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/MagicalInfusion.java
View File

@ -52,9 +52,9 @@ public class MagicalInfusion extends InventorySpell {
Degrade.detach( curUser, Degrade.class ); Degrade.detach( curUser, Degrade.class );
if (item instanceof Weapon && ((Weapon) item).enchantment != null && !((Weapon) item).hasCurseEnchant()) { if (item instanceof Weapon && ((Weapon) item).enchantment != null) {
((Weapon) item).upgrade(true); ((Weapon) item).upgrade(true);
} else if (item instanceof Armor && ((Armor) item).glyph != null && !((Armor) item).hasCurseGlyph()) { } else if (item instanceof Armor && ((Armor) item).glyph != null) {
((Armor) item).upgrade(true); ((Armor) item).upgrade(true);
} else { } else {
item.upgrade(); item.upgrade();

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

@ -242,7 +242,7 @@ abstract public class Weapon extends KindOfWeapon {
public Item upgrade(boolean enchant ) { public Item upgrade(boolean enchant ) {
if (enchant){ if (enchant){
if (enchantment == null || hasCurseEnchant()){ if (enchantment == null){
enchant(Enchantment.random()); enchant(Enchantment.random());
} }
} else { } else {