curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-06-11 19:14:05 +09:00
Code Issues Packages Projects Releases Wiki Activity

durability meter: stack of (new) tools displayed as intended

Browse Source 
- displaying NOT based on their stacks but their health
This commit is contained in:
Song Minjae
2017-04-25 17:24:56 +09:00
parent ab8f019109
commit 36a7983024
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/net/torvald/terrarum/AmmoMeterProxy.kt
View File

@@ -19,8 +19,7 @@ object AmmoMeterProxy {
} }
else { else {
meter.vitalGetterVal = { meter.vitalGetterVal = {
if (ItemCodex[currentItem.originalID].stackable) { if (currentItem.stackable && currentItem.maxDurability == InventoryItem.DURABILITY_NA) {
//println("[AmmoMeterProxy] currentItem: $currentItem")
actor.inventory.getByDynamicID(currentItem.dynamicID)!!.amount.toFloat() actor.inventory.getByDynamicID(currentItem.dynamicID)!!.amount.toFloat()
} }
else else
@@ -28,7 +27,7 @@ object AmmoMeterProxy {
} }
meter.vitalGetterMax = { meter.vitalGetterMax = {
if (ItemCodex[currentItem.originalID].stackable) if (currentItem.stackable && currentItem.maxDurability == InventoryItem.DURABILITY_NA)
500f 500f
else else
currentItem.maxDurability.toFloat() currentItem.maxDurability.toFloat()

2
src/net/torvald/terrarum/gameactors/PlayerBuilderSigrid.kt
View File

@@ -42,7 +42,7 @@ object PlayerBuilderSigrid {
p.actorValue[AVKey.SPEEDBUFF] = 1.0 p.actorValue[AVKey.SPEEDBUFF] = 1.0
p.actorValue[AVKey.ACCEL] = ActorHumanoid.WALK_ACCEL_BASE p.actorValue[AVKey.ACCEL] = ActorHumanoid.WALK_ACCEL_BASE
p.actorValue[AVKey.ACCELBUFF] = 1.0 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.BASEMASS] = 80.0
p.actorValue[AVKey.SCALEBUFF] = 1.0 // Constant 1.0 for player, meant to be used by random mobs p.actorValue[AVKey.SCALEBUFF] = 1.0 // Constant 1.0 for player, meant to be used by random mobs

5
src/net/torvald/terrarum/itemproperties/InventoryItem.kt
View File

@@ -108,7 +108,7 @@ abstract class InventoryItem : Comparable<InventoryItem>, Cloneable {
open var scale: Double = 1.0 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 open var maxDurability: Int = 0
@@ -255,6 +255,9 @@ abstract class InventoryItem : Comparable<InventoryItem>, Cloneable {
} }
companion object { companion object {
val DURABILITY_NA = 0
fun generateUniqueDynamicID(inventory: ActorInventory): Int { fun generateUniqueDynamicID(inventory: ActorInventory): Int {
var ret: Int var ret: Int
do { do {