From 36a79830243004fabdb079e1f52184d6e6331f91 Mon Sep 17 00:00:00 2001
From: Song Minjae <alswo9628@gmail.com>
Date: Tue, 25 Apr 2017 17:24:56 +0900
Subject: [PATCH] durability meter: stack of (new) tools displayed as intended
 - displaying NOT based on their stacks but their health

---
 src/net/torvald/terrarum/AmmoMeterProxy.kt                 | 5 ++---
 src/net/torvald/terrarum/gameactors/PlayerBuilderSigrid.kt | 2 +-
 src/net/torvald/terrarum/itemproperties/InventoryItem.kt   | 5 ++++-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/net/torvald/terrarum/AmmoMeterProxy.kt b/src/net/torvald/terrarum/AmmoMeterProxy.kt
index 319ddae76..e14e97334 100644
--- a/src/net/torvald/terrarum/AmmoMeterProxy.kt
+++ b/src/net/torvald/terrarum/AmmoMeterProxy.kt
@@ -19,8 +19,7 @@ object AmmoMeterProxy {
         }
         else {
             meter.vitalGetterVal = {
-                if (ItemCodex[currentItem.originalID].stackable) {
-                    //println("[AmmoMeterProxy] currentItem: $currentItem")
+                if (currentItem.stackable && currentItem.maxDurability == InventoryItem.DURABILITY_NA) {
                     actor.inventory.getByDynamicID(currentItem.dynamicID)!!.amount.toFloat()
                 }
                 else
@@ -28,7 +27,7 @@ object AmmoMeterProxy {
             }
 
             meter.vitalGetterMax = {
-                if (ItemCodex[currentItem.originalID].stackable)
+                if (currentItem.stackable && currentItem.maxDurability == InventoryItem.DURABILITY_NA)
                     500f
                 else
                     currentItem.maxDurability.toFloat()
diff --git a/src/net/torvald/terrarum/gameactors/PlayerBuilderSigrid.kt b/src/net/torvald/terrarum/gameactors/PlayerBuilderSigrid.kt
index 42e565525..7acafb2e0 100644
--- a/src/net/torvald/terrarum/gameactors/PlayerBuilderSigrid.kt
+++ b/src/net/torvald/terrarum/gameactors/PlayerBuilderSigrid.kt
@@ -42,7 +42,7 @@ object PlayerBuilderSigrid {
         p.actorValue[AVKey.SPEEDBUFF] = 1.0
         p.actorValue[AVKey.ACCEL] = ActorHumanoid.WALK_ACCEL_BASE
         p.actorValue[AVKey.ACCELBUFF] = 1.0
-        p.actorValue[AVKey.JUMPPOWER] = 5.0
+        p.actorValue[AVKey.JUMPPOWER] = 5.2
 
         p.actorValue[AVKey.BASEMASS] = 80.0
         p.actorValue[AVKey.SCALEBUFF] = 1.0 // Constant 1.0 for player, meant to be used by random mobs
diff --git a/src/net/torvald/terrarum/itemproperties/InventoryItem.kt b/src/net/torvald/terrarum/itemproperties/InventoryItem.kt
index 4faa5c595..25f7627a9 100644
--- a/src/net/torvald/terrarum/itemproperties/InventoryItem.kt
+++ b/src/net/torvald/terrarum/itemproperties/InventoryItem.kt
@@ -108,7 +108,7 @@ abstract class InventoryItem : Comparable<InventoryItem>, Cloneable {
     open var scale: Double = 1.0
 
     /**
-     * Set to zero if durability not applicable
+     * Set to zero (InventoryItem.DURABILITY_NA) if durability not applicable
      */
     open var maxDurability: Int = 0
 
@@ -255,6 +255,9 @@ abstract class InventoryItem : Comparable<InventoryItem>, Cloneable {
     }
 
     companion object {
+
+        val DURABILITY_NA = 0
+
         fun generateUniqueDynamicID(inventory: ActorInventory): Int {
             var ret: Int
             do {