1.0.3: wrapping up

build.gradle

@@ -15,8 +15,8 @@ allprojects {
         appName = 'Shorter Pixel Dungeon'
         appPackageName = 'com.trashboxbobylev.shorterpd'
 
-        appVersionCode = 576
-        appVersionName = 'Short-1.0.2'
+        appVersionCode = 577
+        appVersionName = 'Short-1.0.3'
 
         appJavaCompatibility = JavaVersion.VERSION_1_8
 

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java

@@ -288,7 +288,7 @@ public int DRMax(int lvl){
 			return tier/4*3 + lvl + augment.defenseFactor(lvl);
 		}
 
-		int max = Math.max(1, (tier-1) * (2 + lvl) + augment.defenseFactor(lvl));
+		int max = (int) Math.max(1, (tier-1) * (2 + lvl*0.75f) + augment.defenseFactor(lvl));
 		if (lvl > max){
 			return ((lvl - max)+1)/2;
 		} else {

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/AssassinsBlade.java

@@ -40,8 +40,8 @@ public class AssassinsBlade extends MeleeWeapon {
 
 	@Override
 	public int max(int lvl) {
-		return  4*(tier) +    //16 base, down from 20
-				lvl*(tier);   //scaling unchanged
+		return (int) (4*(tier) +    //16 base, down from 20
+						lvl*(tier)*0.75f);   //scaling unchanged
 	}
 
 	@Override

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/BattleAxe.java

@@ -37,8 +37,8 @@ public class BattleAxe extends MeleeWeapon {
 
 	@Override
 	public int max(int lvl) {
-		return  4*(tier) +    //16 base, down from 20
-				lvl*(tier);   //scaling unchanged
+		return (int) (4*(tier) +    //16 base, down from 20
+						lvl*(tier)*0.75f);   //scaling unchanged
 	}
 
 }

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Crossbow.java

@@ -38,7 +38,7 @@ public class Crossbow extends MeleeWeapon {
 
 	@Override
 	public int max(int lvl) {
-		return  4*(tier) +    //16 base, down from 20
-				lvl*(tier-1);     //+3 per level, down from +4
+		return (int) (4*(tier) +    //16 base, down from 20
+						lvl*(tier-1)*0.75f);     //+3 per level, down from +4
 	}
 }

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Dagger.java

@@ -42,8 +42,8 @@ public class Dagger extends MeleeWeapon {
 
 	@Override
 	public int max(int lvl) {
-		return  7*(tier) +    //7 base, down from 8
-				lvl*(tier);   //scaling unchanged
+		return (int) (7*(tier) +    //7 base, down from 8
+						lvl*(tier)*0.75f);   //scaling unchanged
 	}
 
 	@Override

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Dirk.java

@@ -40,8 +40,8 @@ public class Dirk extends MeleeWeapon {
 
 	@Override
 	public int max(int lvl) {
-		return  5*(tier) +    //10 base, down from 12
-				lvl*(tier);   //scaling unchanged
+		return (int) (5*(tier) +    //10 base, down from 12
+						lvl*(tier)*0.75f);   //scaling unchanged
 	}
 
 	@Override

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Flail.java

@@ -39,6 +39,6 @@ public class Flail extends MeleeWeapon {
 	@Override
 	public int max(int lvl) {
 		return  Math.round(7*(tier)) +        //28 base, up from 20
-				lvl*Math.round(1.6f*(tier));  //+6.4 per level, up from +4
+				lvl*Math.round(1.6f*0.75f*(tier));  //+6.4 per level, up from +4
 	}
 }

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Gauntlet.java

@@ -38,7 +38,7 @@ public class Gauntlet extends MeleeWeapon {
 	@Override
 	public int max(int lvl) {
 		return  Math.round(3*(tier-1)) +     //12 base, down from 24
-				lvl*Math.round(0.5f*(tier));  //+2.5 per level, down from +5
+				lvl*Math.round(0.375f*(tier));  //+2.5 per level, down from +5
 	}
 
 }

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Glaive.java

@@ -39,7 +39,7 @@ public class Glaive extends MeleeWeapon {
 	@Override
 	public int max(int lvl) {
 		return  Math.round(8*(tier-1)) +    //32 base, up from 24
-				lvl*Math.round(tier+2); //+7 per level, up from +5
+				lvl*Math.round((tier+2)*0.75f); //+7 per level, up from +5
 	}
 
 }

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Gloves.java

@@ -40,7 +40,7 @@ public class Gloves extends MeleeWeapon {
 	@Override
 	public int max(int lvl) {
 		return  Math.round(2*(tier+1)) +     //4 base, down from 8
-				lvl*Math.round(0.5f*(tier+1));  //+0.5 per level, down from +1
+				lvl*Math.round(0.5f*(tier+1)*0.75f);  //+0.5 per level, down from +1
 	}
 
 }

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Greataxe.java

@@ -36,8 +36,8 @@ public class Greataxe extends MeleeWeapon {
 
 	@Override
 	public int max(int lvl) {
-		return  6*(tier+1) +    //36 base, up from 24
-				lvl*(tier);   //scaling unchanged
+		return (int) (6*(tier+1) +    //36 base, up from 24
+						lvl*(tier)*0.75f);   //scaling unchanged
 	}
 
 	@Override

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Greatshield.java

@@ -36,7 +36,7 @@ public class Greatshield extends MeleeWeapon {
 	@Override
 	public int max(int lvl) {
 		return  Math.round(3*(tier-1)) +     //12 base, down from 24
-				lvl*Math.round(0.5f*(tier));                   //+2.5 per level, down from +5
+				lvl*Math.round(0.5f*0.75f*(tier));                   //+2.5 per level, down from +5
 	}
 
 	@Override

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/HandAxe.java

@@ -37,8 +37,8 @@ public class HandAxe extends MeleeWeapon {
 
 	@Override
 	public int max(int lvl) {
-		return  5*(tier) +    //10 base, down from 15
-				lvl*(tier);   //scaling unchanged
+		return (int) (5*(tier) +    //10 base, down from 15
+						lvl*(tier)*0.75f);   //scaling unchanged
 	}
 
 }

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Mace.java

@@ -37,8 +37,8 @@ public class Mace extends MeleeWeapon {
 
 	@Override
 	public int max(int lvl) {
-		return  13 +    //13 base, down from 16
-				lvl*(tier);   //scaling unchanged
+		return (int) (13 +    //13 base, down from 16
+						lvl*(tier)*0.75f);   //scaling unchanged
 	}
 
 }

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MagesStaff.java

@@ -88,8 +88,8 @@ public MagesStaff() {
 
 	@Override
 	public int max(int lvl) {
-		return  Math.round(6f*(tier)) + //6 base damage, down from 8
-				lvl*(tier);               //scaling unaffected
+		return (int) (Math.round(6f*(tier)) + //6 base damage, down from 8
+						lvl*(tier)*0.75f);               //scaling unaffected
 	}
 
 	public MagesStaff(Wand wand){

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MeleeWeapon.java

@@ -40,8 +40,8 @@ public int min(int lvl) {
 
 	@Override
 	public int max(int lvl) {
-		return  4*(tier+1) +    //base
-				lvl*(tier);   //level scaling
+		return (int) (4*(tier+1) +    //base
+						lvl*(tier)*0.75f);   //level scaling
 	}
 
 	public int STRReq(int lvl){

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Quarterstaff.java

@@ -37,8 +37,8 @@ public class Quarterstaff extends MeleeWeapon {
 
 	@Override
 	public int max(int lvl) {
-		return  5*(tier) +    //10 base, down from 12
-				lvl*(tier);   //scaling unchanged
+		return (int) (5*(tier) +    //10 base, down from 12
+						lvl*(tier)*0.75f);   //scaling unchanged
 	}
 
 	@Override

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/RoundShield.java

@@ -39,7 +39,7 @@ public class RoundShield extends MeleeWeapon {
 	@Override
 	public int max(int lvl) {
 		return  Math.round(4f*(tier-1)) +     //8 base, down from 16
-				Math.round(1.5f*lvl);                   //+1.5 per level, down from +3
+				Math.round(1.5f*0.75f*lvl);                   //+1.5 per level, down from +3
 	}
 
 

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/RunicBlade.java

@@ -40,6 +40,6 @@ public class RunicBlade extends MeleeWeapon {
 	@Override
 	public int max(int lvl) {
 		return  4*(tier) +                	//16 base, down from 20
-				Math.round(lvl*(tier+1));	//+5 per level, up from +4
+				Math.round(lvl*(tier+1)*0.75f);	//+5 per level, up from +4
 	}
 }

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Sai.java

@@ -38,7 +38,7 @@ public class Sai extends MeleeWeapon {
 	@Override
 	public int max(int lvl) {
 		return  Math.round(4f*(tier-1)) +     //8 base, down from 16
-				lvl*Math.round(0.5f*(tier));  //+1.5 per level, down from +3
+				lvl*Math.round(0.5f*0.75f*(tier));  //+1.5 per level, down from +3
 	}
 
 }

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Scimitar.java

@@ -37,8 +37,8 @@ public class Scimitar extends MeleeWeapon {
 
 	@Override
 	public int max(int lvl) {
-		return  13 +    //13 base, down from 16
-				lvl*(tier);   //scaling unchanged
+		return (int) (13 +    //13 base, down from 16
+						lvl*(tier)*0.75f);   //scaling unchanged
 	}
 
 }

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Spear.java

@@ -39,7 +39,7 @@ public class Spear extends MeleeWeapon {
 	@Override
 	public int max(int lvl) {
 		return  Math.round(8f*(tier)) +    //16 base, up from 12
-				lvl*Math.round((tier+1)); //+3 per level, up from +2
+				lvl*Math.round((tier+1)*0.75f); //+3 per level, up from +2
 	}
 
 }

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/WarHammer.java

@@ -37,8 +37,8 @@ public class WarHammer extends MeleeWeapon {
 
 	@Override
 	public int max(int lvl) {
-		return  4*(tier) +    //20 base, down from 24
-				lvl*(tier);   //scaling unchanged
+		return (int) (4*(tier) +    //20 base, down from 24
+						lvl*(tier)*0.75f);   //scaling unchanged
 	}
 
 }

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Whip.java

@@ -37,8 +37,8 @@ public class Whip extends MeleeWeapon {
 
 	@Override
 	public int max(int lvl) {
-		return  5*(tier-1) +    //10 base, down from 16
-				lvl*(tier-1);     //+2 per level, down from +3
+		return (int) (5*(tier-1) +    //10 base, down from 16
+						lvl*(tier-1)*0.75f);     //+2 per level, down from +3
 	}
 
 }

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/Bolas.java

@@ -40,8 +40,8 @@ public class Bolas extends MissileWeapon {
 
 	@Override
 	public int max(int lvl) {
-		return  Math.round(2.5f * tier) +                      //7 base, down from 12
-				(tier == 1 ? lvl : (tier-1)*lvl); //scaling unchanged
+		return (int) (Math.round(2.5f * tier) +                      //7 base, down from 12
+						(tier == 1 ? lvl : (tier-1)*lvl)*0.75f); //scaling unchanged
 	}
 
 	@Override

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/HeavyBoomerang.java

@@ -46,8 +46,8 @@ public class HeavyBoomerang extends MissileWeapon {
 
 	@Override
 	public int max(int lvl) {
-		return  3 * tier +                  //12 base, down from 16
-				(tier-1) * lvl;               //scaling unchanged
+		return (int) (3 * tier +                  //12 base, down from 16
+						(tier-1) * lvl*0.75f);               //scaling unchanged
 	}
 
 	@Override

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

@@ -90,8 +90,8 @@ public int max() {
 
 	@Override
 	public int max(int lvl) {
-		return  4 * tier +                      //base
-				(tier == 1 ? lvl : (tier-1)*lvl); //level scaling
+		return (int) (4 * tier +                      //base
+						(tier == 1 ? lvl : (tier-1)*lvl)*0.75f); //level scaling
 	}
 
 	public int STRReq(int lvl){

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/Shuriken.java

@@ -39,8 +39,8 @@ public class Shuriken extends MissileWeapon {
 
 	@Override
 	public int max(int lvl) {
-		return  3 * tier +                      //6 base, down from 8
-				(tier == 1 ? lvl : (tier-1)*lvl); //scaling unchanged
+		return (int) (3 * tier +                      //6 base, down from 8
+						(tier == 1 ? lvl : (tier-1)*lvl)*0.75f); //scaling unchanged
 	}
 
 	@Override

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/ThrowingClub.java

@@ -38,7 +38,7 @@ public class ThrowingClub extends MissileWeapon {
 
 	@Override
 	public int max(int lvl) {
-		return  3 * tier +                  //6 base, down from 8
-				(tier-1) * lvl;               //scaling unchanged
+		return (int) (3 * tier +                  //6 base, down from 8
+						(tier-1) * lvl*0.75f);               //scaling unchanged
 	}
 }

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/ThrowingHammer.java

@@ -38,7 +38,7 @@ public class ThrowingHammer extends MissileWeapon {
 
 	@Override
 	public int max(int lvl) {
-		return  4 * (tier-1) +                  //16 base, down from 20
-				(tier-1) * lvl;               //scaling unchanged
+		return (int) (4 * (tier-1) +                  //16 base, down from 20
+						(tier-1) * lvl*0.75f);               //scaling unchanged
 	}
 }

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/ThrowingKnife.java

@@ -43,8 +43,8 @@ public class ThrowingKnife extends MissileWeapon {
 
 	@Override
 	public int max(int lvl) {
-		return  5 * tier +                      //5 base, up from 4
-				(tier == 1 ? lvl : (tier-1)*lvl); //scaling unchanged
+		return (int) (5 * tier +                      //5 base, up from 4
+						(tier == 1 ? lvl : (tier-1)*lvl)*0.75f); //scaling unchanged
 	}
 
 	@Override

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/Tomahawk.java

@@ -46,8 +46,8 @@ public int min(int lvl) {
 
 	@Override
 	public int max(int lvl) {
-		return 12 +  //13 base, down from 16
-				(tier-1)*lvl;                 //scaling unchanged
+		return (int) (12 +  //13 base, down from 16
+						(tier-1)*lvl*0.75f);                 //scaling unchanged
 	}
 
 	@Override

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/darts/Dart.java

@@ -87,8 +87,8 @@ public int min(int lvl) {
 	@Override
 	public int max(int lvl) {
 		if (bow != null){
-			return  9 +                       //9 base
-					2*bow.buffedLvl() + lvl; //+2 per bow level, +1 per level (default scaling +1)
+			return (int) (9 +                       //9 base
+								(2*bow.buffedLvl() + lvl)*0.75f); //+2 per bow level, +1 per level (default scaling +1)
 		} else {
 			return  1 +     //1 base, down from 3
 					lvl;  //scaling unchanged

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/changelist/v1_X_Changes.java

@@ -1,6 +1,7 @@
 package com.shatteredpixel.shatteredpixeldungeon.ui.changelist;
 
 import com.shatteredpixel.shatteredpixeldungeon.Assets;
+import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.DwarfKing;
 import com.shatteredpixel.shatteredpixeldungeon.items.bombs.WoollyBomb;
 import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.MagesStaff;
 import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.Sword;
@@ -16,7 +17,17 @@
 public class v1_X_Changes {
 
 	public static void addAllChanges( ArrayList<ChangeInfo> changeInfos ){
-		ChangeInfo changes = new ChangeInfo("Short-1.0.2", true, "");
+		ChangeInfo changes = new ChangeInfo("Short-1.0.3", true, "");
+		changes.hardlight(0xCCCCCC);
+		changeInfos.add(changes);
+		changes.addButton( new ChangeButton(Icons.get(Icons.SHORTER_CHEST), "Developer Commentary",
+				"_-_ Released December 4th, 2021"));
+		changes.addButton(new ChangeButton(new ItemSprite(new Sword()), "Equipment",
+				"_-_ Armors and weapons (except spirit bow) have 25% less max scaling."));
+		changes.addButton(new ChangeButton(new KingSprite(), "DK",
+				"Fixed impossible phase 2."));
+
+		changes = new ChangeInfo("Short-1.0.2", true, "");
 		changes.hardlight(0xCCCCCC);
 		changeInfos.add(changes);
 		changes.addButton(new ChangeButton(new RatSprite(), "Sewer enemy adjustments",