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

v3.2.0: fixed curse infusion not working with thrown wep exploit handler

Browse Source
This commit is contained in:
Evan Debenham
2025-07-30 12:50:36 -04:00
parent 7b8df41d34
commit ef0409a094
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -147,7 +147,7 @@ abstract public class MissileWeapon extends Weapon {
durability = MAX_DURABILITY; durability = MAX_DURABILITY;
extraThrownLeft = false; extraThrownLeft = false;
quantity = defaultQuantity(); quantity = defaultQuantity();
Buff.affect(Dungeon.hero, UpgradedSetTracker.class).levelThresholds.put(setID, level()+1); Buff.affect(Dungeon.hero, UpgradedSetTracker.class).levelThresholds.put(setID, trueLevel()+1);
} }
//thrown weapons don't get curse weakened //thrown weapons don't get curse weakened
boolean wasCursed = cursed; boolean wasCursed = cursed;
@@ -164,7 +164,7 @@ abstract public class MissileWeapon extends Weapon {
durability = MAX_DURABILITY; durability = MAX_DURABILITY;
extraThrownLeft = false; extraThrownLeft = false;
quantity = defaultQuantity(); quantity = defaultQuantity();
Buff.affect(Dungeon.hero, UpgradedSetTracker.class).levelThresholds.put(setID, level()+1); Buff.affect(Dungeon.hero, UpgradedSetTracker.class).levelThresholds.put(setID, trueLevel()+1);
} }
return super.upgrade(); return super.upgrade();
} }
@@ -771,10 +771,14 @@ abstract public class MissileWeapon extends Weapon {
public HashMap<Long, Integer> levelThresholds = new HashMap<>(); public HashMap<Long, Integer> levelThresholds = new HashMap<>();
public static boolean pickupValid(Hero h, MissileWeapon w){ public static boolean pickupValid(Hero h, MissileWeapon w){
if (Dungeon.initialVersion <= 857){
//skip this for old earlier beta runs just in case
return true;
}
if (h.buff(UpgradedSetTracker.class) != null){ if (h.buff(UpgradedSetTracker.class) != null){
HashMap<Long, Integer> levelThresholds = h.buff(UpgradedSetTracker.class).levelThresholds; HashMap<Long, Integer> levelThresholds = h.buff(UpgradedSetTracker.class).levelThresholds;
if (levelThresholds.containsKey(w.setID)){ if (levelThresholds.containsKey(w.setID)){
return w.level() >= levelThresholds.get(w.setID); return w.trueLevel() >= levelThresholds.get(w.setID);
} }
return true; return true;
} }