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

inventoryItem -> gameItem

Browse Source
This commit is contained in:
Song Minjae
2017-04-29 23:11:54 +09:00
parent 9a7885fc80
commit c9c761598a
17 changed files with 84 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,7 @@
package net.torvald.terrarum
import net.torvald.terrarum.gameactors.ActorHumanoid
import net.torvald.terrarum.itemproperties.InventoryItem
import net.torvald.terrarum.itemproperties.GameItem
import net.torvald.terrarum.ui.UIVitalMetre
/**
@@ -10,7 +10,7 @@ import net.torvald.terrarum.ui.UIVitalMetre
object AmmoMeterProxy {
operator fun invoke(actor: ActorHumanoid, meter: UIVitalMetre) {
val currentItem = actor.inventory.itemEquipped[InventoryItem.EquipPosition.HAND_GRIP]
val currentItem = actor.inventory.itemEquipped[GameItem.EquipPosition.HAND_GRIP]
if (currentItem == null) {
meter.vitalGetterMax = { null }
@@ -18,7 +18,7 @@ object AmmoMeterProxy {
}
else {
meter.vitalGetterVal = {
if (currentItem.stackable && currentItem.maxDurability == InventoryItem.DURABILITY_NA) {
if (currentItem.stackable && currentItem.maxDurability == GameItem.DURABILITY_NA) {
actor.inventory.getByDynamicID(currentItem.dynamicID)!!.amount.toFloat()
}
else
@@ -26,7 +26,7 @@ object AmmoMeterProxy {
}
meter.vitalGetterMax = {
if (currentItem.stackable && currentItem.maxDurability == InventoryItem.DURABILITY_NA)
if (currentItem.stackable && currentItem.maxDurability == GameItem.DURABILITY_NA)
500f
else
currentItem.maxDurability.toFloat()