diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/ThrowingHammer.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/ThrowingHammer.java index c4b75fec8..1a0a46091 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/ThrowingHammer.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/ThrowingHammer.java @@ -33,12 +33,6 @@ public class ThrowingHammer extends MissileWeapon { sticky = false; } - @Override - public int min(int lvl) { - return Math.round(1.6f * tier) + //8 base, down from 10 - (tier == 1 ? lvl : 2*lvl); //scaling unchanged - } - @Override public int max(int lvl) { return 4 * tier + //20 base, down from 25 diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/ThrowingStone.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/ThrowingStone.java index 42625185a..97dfc9db9 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/ThrowingStone.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/ThrowingStone.java @@ -31,16 +31,10 @@ public class ThrowingStone extends MissileWeapon { bones = false; tier = 1; - baseUses = 3; + baseUses = 5; sticky = false; } - @Override - public int min(int lvl) { - return tier + //1 base, down from 2 - (tier == 1 ? lvl : 2*lvl); //scaling unchanged - } - @Override public int price() { return super.price()/2; //half normal value diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/Tomahawk.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/Tomahawk.java index f78eb3228..2ef4e9510 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/Tomahawk.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/Tomahawk.java @@ -44,12 +44,12 @@ public class Tomahawk extends MissileWeapon { @Override public int max(int lvl) { return Math.round(3.75f * tier) + //15 base, down from 20 - (tier-2)*lvl; //+2 per level, down from +4 + (tier)*lvl; //scaling unchanged } @Override public int proc( Char attacker, Char defender, int damage ) { - Buff.affect( defender, Bleeding.class ).set( damage ); + Buff.affect( defender, Bleeding.class ).set( Math.round(damage*0.6f) ); return super.proc( attacker, defender, damage ); } }