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

v2.0.0: fixed rare errors with blacksmith and resin boosted wands

Browse Source
This commit is contained in:
Evan Debenham
2022-11-02 17:11:50 -04:00
parent 47ce50e267
commit 3a2b427f97
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Blacksmith.java
+1 -1
View File
@@ -214,7 +214,7 @@ public class Blacksmith extends NPC {
public static void upgrade( Item item1, Item item2 ) { public static void upgrade( Item item1, Item item2 ) {
Item first, second; Item first, second;
if (item2.level() > item1.level()) { if (item2.trueLevel() > item1.trueLevel()) {
first = item2; first = item2;
second = item1; second = item1;
} else { } else {
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java
+2
View File
@@ -381,6 +381,8 @@ public class Armor extends EquipableItem {
@Override @Override
public int level() { public int level() {
int level = super.level(); int level = super.level();
//TODO warrior's seal upgrade should probably be considered here too
// instead of being part of true level
if (curseInfusionBonus) level += 1 + level/6; if (curseInfusionBonus) level += 1 + level/6;
return level; return level;
} }