actor walk and jump power is reduced when encumbered (temp. commented out)

src/net/torvald/terrarum/modulebasegame/gameactors/ActorHumanoid.kt

@@ -14,6 +14,7 @@ import net.torvald.terrarum.gameactors.faction.Faction
 import net.torvald.terrarum.gameitems.GameItem
 import net.torvald.terrarum.realestate.LandUtil
 import org.dyn4j.geometry.Vector2
+import kotlin.math.pow
 
 /**
  * Humanoid actor class to provide same controlling function (such as work, jump)
@@ -592,7 +593,7 @@ open class ActorHumanoid : ActorWithBody, Controllable, Pocketed, Factionable, L
     }
 
     private fun getJumpAcc(pwr: Double, timedJumpCharge: Double): Double {
-        return pwr * timedJumpCharge * JUMP_ACCELERATION_MOD * Math.pow(scale, 0.25) // positive value
+        return pwr * timedJumpCharge * JUMP_ACCELERATION_MOD
     }
 
     @Transient private var oldMAX_JUMP_LENGTH = -1 // init
@@ -652,7 +653,11 @@ open class ActorHumanoid : ActorWithBody, Controllable, Pocketed, Factionable, L
         }
 
     private val jumpPower: Double
-        get() = actorValue.getAsDouble(AVKey.JUMPPOWER)!! * (actorValue.getAsDouble(AVKey.JUMPPOWERBUFF) ?: 1.0)
+        get() = actorValue.getAsDouble(AVKey.JUMPPOWER)!! * // base stat
+                (actorValue.getAsDouble(AVKey.JUMPPOWERBUFF) ?: 1.0) * // buffed stat
+                jumpMultByTile * // tile-specific
+                scale.pow(0.25)
+//                ((encumberment / avStrengthNormalised).pow(-1.0/3.0)).coerceIn(0.1, 1.0) // encumbered actors move slower
 
     private fun jumpFunc(len: Int, counter: Int): Double {
         // linear time mode
@@ -662,6 +667,7 @@ open class ActorHumanoid : ActorWithBody, Controllable, Pocketed, Factionable, L
         return timedJumpCharge
     }
 
+
     /**
      * See ./work_files/Jump power by pressing time.gcx
      */

src/net/torvald/terrarum/modulebasegame/gameactors/FixtureInventory.kt

@@ -31,11 +31,11 @@ open class FixtureInventory() {
     /**
      * Sorted by referenceID.
      */
-    val itemList = SortedArrayList<InventoryPair>()
+    protected val itemList = SortedArrayList<InventoryPair>()
     var wallet = BigInteger("0") // unified currency for whole civs; Dwarf Fortress approach seems too complicated
 
-    fun isEmpty() = getTotalCount() == 0L
-    fun isNotEmpty() = getTotalCount() > 0
+    fun isEmpty() = totalCount == 0L
+    fun isNotEmpty() = totalCount > 0
 
     open fun add(itemID: ItemID, count: Long = 1) {
         if (ItemCodex[itemID] == null)
@@ -81,6 +81,8 @@ open class FixtureInventory() {
             itemList.add(InventoryPair(item.dynamicID, count))
         }
 //        insertionSortLastElem(itemList)
+
+        updateEncumbrance()
     }
 
     open fun remove(itemID: ItemID, count: Long) = remove(ItemCodex[itemID]!!, count) {}
@@ -124,12 +126,26 @@ open class FixtureInventory() {
         else {
 //            throw InventoryFailedTransactionError("[${this.javaClass.canonicalName}] Tried to remove $item, but the inventory does not have it.")
         }
+
+        itemList.sumOf { ItemCodex[it.itm]!!.mass * it.qty }
+
+        updateEncumbrance()
     }
     
     /**
      * HashMap<GameItem, Amounts>
      */
-    inline fun forEach(consumer: (InventoryPair) -> Unit) = itemList.forEach(consumer)
+    fun forEach(consumer: (InventoryPair) -> Unit) {
+        itemList.forEach(consumer)
+        updateEncumbrance()
+    }
+
+    fun first(predicate: (InventoryPair) -> Boolean) = itemList.first(predicate)
+    fun all(predicate: (InventoryPair) -> Boolean) = itemList.all(predicate)
+    fun any(predicate: (InventoryPair) -> Boolean) = itemList.any(predicate)
+    fun none(predicate: (InventoryPair) -> Boolean) = itemList.none()
+    fun filter(predicate: (InventoryPair) -> Boolean) = itemList.filter(predicate)
+    fun map(transformation: (InventoryPair) -> Any) = itemList.map(transformation)
 
     /**
      * Get capacity of inventory
@@ -139,33 +155,52 @@ open class FixtureInventory() {
         get() = if (capacityMode == CAPACITY_MODE_NO_ENCUMBER)
             maxCapacity.toDouble()
         else if (capacityMode == CAPACITY_MODE_WEIGHT)
-            getTotalWeight()
+            totalWeight
         else
-            getTotalCount().toDouble()
+            totalCount.toDouble()
 
-    fun getTotalWeight(): Double = itemList.sumOf { ItemCodex[it.itm]!!.mass * it.qty }
+    @Transient private var totalWeight0 = -1.0
+
+    val totalWeight: Double// = itemList.sumOf { ItemCodex[it.itm]!!.mass * it.qty }
+        get() {
+            if (totalWeight0 < 0.0) updateEncumbrance()
+            return totalWeight0
+        }
+
+    @Transient private var totalCount0 = -1L
 
     /**
      * Real amount
      */
-    fun getTotalCount(): Long = itemList.sumOf { it.qty }
+    val totalCount: Long
+        get() {
+            if (totalCount0 < 0) updateEncumbrance()
+            return totalCount0
+        }
 
     /**
      * Unique amount, multiple items are calculated as one
      */
-    fun getTotalUniqueCount(): Long = itemList.size.toLong()
+    val totalUniqueCount: Long
+        get() = itemList.size.toLong()
 
     /**
      * Check whether the itemList contains too many items
      * @return
      */
     val isEncumbered: Boolean
+        get() = encumberment >= 1.0
+
+    /**
+     * How encumbered the actor is. 1.0 if weight of the items are exactly same as the capacity limit, >1.0 if encumbered.
+     */
+    val encumberment: Double
         get() = if (capacityMode == CAPACITY_MODE_NO_ENCUMBER)
-            false
+            0.0
         else if (capacityMode == CAPACITY_MODE_WEIGHT)
-            maxCapacity < capacity
+            capacity / maxCapacity
         else
-            false
+            0.0
     
     fun contains(item: GameItem) = contains(item.dynamicID)
     fun contains(id: ItemID) =
@@ -218,6 +253,11 @@ open class FixtureInventory() {
     open fun clear() {
         itemList.clear()
     }
+
+    fun updateEncumbrance() {
+        totalWeight0 = itemList.sumOf { ItemCodex[it.itm]!!.mass * it.qty }
+        totalCount0 = itemList.sumOf { it.qty }
+    }
 }
 
 class InventoryPair : Comparable<InventoryPair> {