diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Brute.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Brute.java index 484dce331..1bfeb1a67 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Brute.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Brute.java @@ -40,7 +40,7 @@ public class Brute extends Mob { defenseSkill = 15; EXP = 8; - maxLvl = 15; + maxLvl = 16; loot = Gold.class; lootChance = 0.5f; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Spinner.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Spinner.java index d8dbd5282..92b19ecfd 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Spinner.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Spinner.java @@ -41,7 +41,7 @@ public class Spinner extends Mob { defenseSkill = 14; EXP = 9; - maxLvl = 16; + maxLvl = 17; loot = new MysteryMeat(); lootChance = 0.125f; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java index a1b4ddcc2..f20906556 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java @@ -386,7 +386,8 @@ public class Armor extends EquipableItem { @Override public void onHeroGainExp(float levelPercent, Hero hero) { if (!levelKnown && isEquipped(hero) && availableUsesToID <= USES_TO_ID/2f) { - availableUsesToID = Math.min(USES_TO_ID/2f, availableUsesToID + levelPercent * USES_TO_ID/2f); + //gains enough uses to ID over 0.5 levels + availableUsesToID = Math.min(USES_TO_ID/2f, availableUsesToID + levelPercent * USES_TO_ID); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/Ring.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/Ring.java index df2ec7640..ab4f3e005 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/Ring.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/Ring.java @@ -298,6 +298,7 @@ public class Ring extends KindofMisc { public void onHeroGainExp( float levelPercent, Hero hero ){ if (isIdentified() || !isEquipped(hero)) return; + //becomes IDed after 1 level levelsToID -= levelPercent; if (levelsToID <= 0){ identify(); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/Wand.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/Wand.java index 1a486cefd..e03ec993c 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/Wand.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/Wand.java @@ -182,6 +182,7 @@ public abstract class Wand extends Item { public void onHeroGainExp( float levelPercent, Hero hero ){ if (!isIdentified() && availableUsesToID <= USES_TO_ID/2f) { + //gains enough uses to ID over 1 level availableUsesToID = Math.min(USES_TO_ID/2f, availableUsesToID + levelPercent * USES_TO_ID/2f); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/Weapon.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/Weapon.java index be58d851f..44b030bf5 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/Weapon.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/Weapon.java @@ -119,7 +119,8 @@ abstract public class Weapon extends KindOfWeapon { public void onHeroGainExp( float levelPercent, Hero hero ){ if (!levelKnown && isEquipped(hero) && availableUsesToID <= USES_TO_ID/2f) { - availableUsesToID = Math.min(USES_TO_ID/2f, availableUsesToID + levelPercent * USES_TO_ID/2f); + //gains enough uses to ID over 0.5 levels + availableUsesToID = Math.min(USES_TO_ID/2f, availableUsesToID + levelPercent * USES_TO_ID); } }