diff --git a/src/net/torvald/terrarum/itemproperties/Calculate.kt b/src/net/torvald/terrarum/itemproperties/Calculate.kt index c1e6f43d2..9f8cfc3f2 100644 --- a/src/net/torvald/terrarum/itemproperties/Calculate.kt +++ b/src/net/torvald/terrarum/itemproperties/Calculate.kt @@ -22,7 +22,7 @@ object Calculate { * TODO Newtons as unit? */ @JvmStatic fun pickaxePower(actor: ActorWithBody, material: Material?): Float { - return (4.0 * (material?.forceMod?.toDouble() ?: 0.15) * (actor.avStrength / 1000.0)).toFloat() + return (6.0 * (material?.forceMod?.toDouble() ?: 0.15) * (actor.avStrength / 1000.0)).toFloat() } @JvmStatic fun hatchetPower(actor: ActorWithBody, material: Material?): Float { diff --git a/src/net/torvald/terrarum/modulebasegame/gameactors/ActorInventory.kt b/src/net/torvald/terrarum/modulebasegame/gameactors/ActorInventory.kt index 346d2c0a4..887f20365 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameactors/ActorInventory.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameactors/ActorInventory.kt @@ -127,7 +127,7 @@ class ActorInventory() : FixtureInventory() { val swingDmgToFrameDmg = App.UPDATE_RATE.toDouble() / actor.actorValue.getAsDouble(AVKey.ACTION_INTERVAL)!! // damage the item - newItem.durability -= (baseDamagePerSwing * swingDmgToFrameDmg).toFloat() + newItem.durability -= (baseDamagePerSwing * swingDmgToFrameDmg / 1.5f).toFloat() if (newItem.durability <= 0) { remove(newItem, 1) diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UICrafting.kt b/src/net/torvald/terrarum/modulebasegame/ui/UICrafting.kt index 84a505caa..8ab36f9b1 100644 --- a/src/net/torvald/terrarum/modulebasegame/ui/UICrafting.kt +++ b/src/net/torvald/terrarum/modulebasegame/ui/UICrafting.kt @@ -356,6 +356,7 @@ class UICrafting(val full: UIInventoryFull?) : UICanvas( fun resetUI() { // reset spinner resetSpinner() + // reset selected recipe status recipeClicked = null filterPlayerListUsing(recipeClicked) @@ -364,6 +365,10 @@ class UICrafting(val full: UIInventoryFull?) : UICanvas( playerThings.removeFromForceHighlightList(oldSelectedItems) itemListIngredients.rebuild(FILTER_CAT_ALL) + // reset scroll + itemListCraftable.itemPage = 0 + playerThings.itemList.itemPage = 0 + refreshCraftButtonStatus() }