diff --git a/core/src/main/assets/messages/items/items.properties b/core/src/main/assets/messages/items/items.properties index 2c7214a5d..c24554f09 100644 --- a/core/src/main/assets/messages/items/items.properties +++ b/core/src/main/assets/messages/items/items.properties @@ -2160,7 +2160,8 @@ items.weapon.missiles.fishingspear.desc=Tiny throwing spears that work well as a items.weapon.missiles.forcecube.name=force cube items.weapon.missiles.forcecube.ondeath=You killed yourself with your own Force Cube... -items.weapon.missiles.forcecube.desc=This oddly-shaped weapon is small enough to hold in your hand, but is incredibly heavy. When thrown, it will spread the force of its impact over a small area, damaging everything in the blast. +items.weapon.missiles.forcecube.stats_desc=This weapon spreads the force of its impact over a small area, hitting everything nearby. +items.weapon.missiles.forcecube.desc=These oddly-shaped magical cubes are small enough to hold in your hand, but are incredibly heavy. items.weapon.missiles.heavyboomerang.name=heavy boomerang items.weapon.missiles.heavyboomerang,stats_desc=This weapon circles back to the location it was thrown from after a few turns. @@ -2198,7 +2199,7 @@ items.weapon.missiles.throwingclub.name=throwing club 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.desc=These hefty hammers are designed to be thrown at an enemy. While they are a bit lacking in damage, their smooth all-metal construction means they are quite durable, and won't stick to enemies. +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 items.weapon.missiles.throwingknife.stats_desc=This weapon is stronger against unaware enemies. 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 634d7b9d7..a77637aa0 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,6 +47,12 @@ 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 @@ -59,6 +65,7 @@ public class ForceCube extends MissileWeapon { return; } + //TODO ID progress is pretty screwy here rangedHit( null, cell ); Dungeon.level.pressCell(cell); 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 ff46e38f4..4cbc310fa 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 @@ -32,7 +32,7 @@ public class ThrowingHammer extends MissileWeapon { hitSoundPitch = 0.8f; tier = 5; - baseUses = 15; + baseUses = 12; sticky = false; }