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

v2.2.0: fixed ClassArmor upgrade sometimes changing specific glyph state

Browse Source
This commit is contained in:
Evan Debenham
2023-07-14 13:26:44 -04:00
parent 3307d2d2fb
commit daa7c31490
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/ClassArmor.java
+12 -5
View File
@@ -101,10 +101,6 @@ abstract public class ClassArmor extends Armor {
switch (owner.heroClass) { switch (owner.heroClass) {
case WARRIOR: case WARRIOR:
classArmor = new WarriorArmor(); classArmor = new WarriorArmor();
BrokenSeal seal = armor.checkSeal();
if (seal != null) {
classArmor.affixSeal(seal);
}
break; break;
case ROGUE: case ROGUE:
classArmor = new RogueArmor(); classArmor = new RogueArmor();
@@ -123,7 +119,18 @@ abstract public class ClassArmor extends Armor {
classArmor.level(armor.trueLevel()); classArmor.level(armor.trueLevel());
classArmor.tier = armor.tier; classArmor.tier = armor.tier;
classArmor.augment = armor.augment; classArmor.augment = armor.augment;
classArmor.inscribe( armor.glyph ); BrokenSeal seal = armor.checkSeal();
if (seal != null) {
//want to preserve whether the glyph is on the armor or the seal
if (seal.getGlyph() != null) {
classArmor.affixSeal(seal);
} else {
classArmor.inscribe(armor.glyph);
classArmor.affixSeal(seal);
}
} else {
classArmor.inscribe(armor.glyph);
}
classArmor.cursed = armor.cursed; classArmor.cursed = armor.cursed;
classArmor.curseInfusionBonus = armor.curseInfusionBonus; classArmor.curseInfusionBonus = armor.curseInfusionBonus;
classArmor.masteryPotionBonus = armor.masteryPotionBonus; classArmor.masteryPotionBonus = armor.masteryPotionBonus;