diff --git a/core/src/main/assets/messages/items/items.properties b/core/src/main/assets/messages/items/items.properties index 0f9ae5703..f94b96294 100644 --- a/core/src/main/assets/messages/items/items.properties +++ b/core/src/main/assets/messages/items/items.properties @@ -2201,9 +2201,11 @@ items.weapon.missiles.shuriken$shurikeninstanttracker.name=Shuriken Cooldown items.weapon.missiles.shuriken$shurikeninstanttracker.desc=You have recently thrown a shuriken instantly, and must wait before doing it again. Shurikens can still be thrown, but at normal weapon speed.\n\nTurns Remaining: %s. items.weapon.missiles.throwingclub.name=throwing club +items.weapon.missiles.throwingclub.stats_desc=This weapon doesn't stick to enemies and can be collected instantly. items.weapon.missiles.throwingclub.desc=A fairly simple but durable thrown weapon, essentially a large rock fastened to a stick. items.weapon.missiles.throwinghammer.name=throwing hammer +items.weapon.missiles.throwinghammer.stats_desc=This weapon doesn't stick to enemies and can be collected instantly. items.weapon.missiles.throwinghammer.desc=These hefty hammers are designed to be thrown at an enemy. Their smooth all-metal construction means they are quite durable. items.weapon.missiles.throwingknife.name=throwing knife diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/Bolas.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/Bolas.java index 0db7c434a..4fcde8c55 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/Bolas.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/Bolas.java @@ -46,7 +46,7 @@ public class Bolas extends MissileWeapon { @Override public int proc( Char attacker, Char defender, int damage ) { - Buff.prolong( defender, Cripple.class, Cripple.DURATION ); + Buff.prolong( defender, Cripple.class, Cripple.DURATION/2 ); return super.proc( attacker, defender, damage ); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/ForceCube.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/ForceCube.java index c9485d9f7..83f638aa5 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/ForceCube.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/ForceCube.java @@ -47,12 +47,6 @@ public class ForceCube extends MissileWeapon { sticky = false; } - @Override - public int max(int lvl) { - return 4 * tier + //20 base, down from 25 - (tier) * lvl; //scaling unchanged - } - @Override public void hitSound(float pitch) { //no hitsound as it never hits enemies directly diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/HeavyBoomerang.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/HeavyBoomerang.java index 46a9f6eda..1132cdc86 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/HeavyBoomerang.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/HeavyBoomerang.java @@ -48,7 +48,7 @@ public class HeavyBoomerang extends MissileWeapon { @Override public int max(int lvl) { return 4 * tier + //16 base, down from 20 - (tier) * lvl; //scaling unchanged + (tier-1) * lvl; //3 scaling, down from 4 } boolean circleBackhit = false; @@ -96,7 +96,7 @@ public class HeavyBoomerang extends MissileWeapon { this.returnPos = returnPos; this.returnDepth = returnDepth; this.returnBranch = returnBranch; - left = 3; + left = 4; } public int returnPos(){ diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/Kunai.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/Kunai.java index e5b576d49..30380520e 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/Kunai.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/Kunai.java @@ -35,13 +35,13 @@ public class Kunai extends MissileWeapon { hitSoundPitch = 1.1f; tier = 3; - baseUses = 5; + baseUses = 8; } @Override public int max(int lvl) { return 4 * tier + //12 base, down from 15 - (tier-1)*lvl; //scaling unchanged + tier*lvl; //scaling unchanged } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/ThrowingClub.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/ThrowingClub.java index 19a2af212..e70e69654 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/ThrowingClub.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/ThrowingClub.java @@ -22,6 +22,7 @@ package com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles; import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; public class ThrowingClub extends MissileWeapon { @@ -35,7 +36,16 @@ public class ThrowingClub extends MissileWeapon { baseUses = 12; sticky = false; } - + + @Override + public boolean doPickUp(Hero hero, int pos) { + if (super.doPickUp(hero, pos)){ + hero.spendAndNext( -TIME_TO_PICK_UP ); + return true; + } + return false; + } + @Override public int max(int lvl) { return 4 * tier + //8 base, down from 10 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 4cbc310fa..b9ce4e2a7 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 @@ -22,6 +22,7 @@ package com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles; import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; public class ThrowingHammer extends MissileWeapon { @@ -35,7 +36,16 @@ public class ThrowingHammer extends MissileWeapon { baseUses = 12; sticky = false; } - + + @Override + public boolean doPickUp(Hero hero, int pos) { + if (super.doPickUp(hero, pos)){ + hero.spendAndNext( -TIME_TO_PICK_UP ); + return true; + } + return false; + } + @Override public int max(int lvl) { return 4 * tier + //20 base, down from 25