code refactor to clarify the state of item being dynamic

fix: simple item cell not showing itemcount for stackable and canbedynamic items
This commit is contained in:
minjaesong
2024-02-11 20:51:54 +09:00
parent 8e97914834
commit 77bc646991
30 changed files with 51 additions and 50 deletions

View File

@@ -19,7 +19,7 @@ class ItemHomeComputer(originalID: ItemID) : FixtureItemBase(originalID, "net.to
override var dynamicID: ItemID = originalID override var dynamicID: ItemID = originalID
override var baseMass = 20.0 override var baseMass = 20.0
override val isDynamic = false override val canBeDynamic = false
override val materialId = "" override val materialId = ""
override val itemImage: TextureRegion override val itemImage: TextureRegion
get() = FixtureItemBase.getItemImageFromSheet("dwarventech", "sprites/fixtures/desktop_computer.tga", TerrarumAppConfiguration.TILE_SIZE, TerrarumAppConfiguration.TILE_SIZE) get() = FixtureItemBase.getItemImageFromSheet("dwarventech", "sprites/fixtures/desktop_computer.tga", TerrarumAppConfiguration.TILE_SIZE, TerrarumAppConfiguration.TILE_SIZE)

View File

@@ -572,7 +572,7 @@ object ModMgr {
override var baseMass: Double = tile.density / 100.0 override var baseMass: Double = tile.density / 100.0
override var baseToolSize: Double? = null override var baseToolSize: Double? = null
override var inventoryCategory = if (isWall) Category.WALL else Category.BLOCK override var inventoryCategory = if (isWall) Category.WALL else Category.BLOCK
override var isDynamic = false override var canBeDynamic = false
override val materialId = tile.material override val materialId = tile.material
override var equipPosition = EquipPosition.HAND_GRIP override var equipPosition = EquipPosition.HAND_GRIP
// override val itemImage: TextureRegion // override val itemImage: TextureRegion

View File

@@ -3,7 +3,6 @@ package net.torvald.terrarum.gameitems
import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.graphics.Color
import com.badlogic.gdx.graphics.g2d.TextureRegion import com.badlogic.gdx.graphics.g2d.TextureRegion
import net.torvald.terrarum.* import net.torvald.terrarum.*
import net.torvald.terrarum.App.printdbg
import net.torvald.terrarum.ReferencingRanges.PREFIX_ACTORITEM import net.torvald.terrarum.ReferencingRanges.PREFIX_ACTORITEM
import net.torvald.terrarum.ReferencingRanges.PREFIX_DYNAMICITEM import net.torvald.terrarum.ReferencingRanges.PREFIX_DYNAMICITEM
import net.torvald.terrarum.ReferencingRanges.PREFIX_VIRTUALTILE import net.torvald.terrarum.ReferencingRanges.PREFIX_VIRTUALTILE
@@ -115,7 +114,10 @@ abstract class GameItem(val originalID: ItemID) : Comparable<GameItem>, Cloneabl
* *
* The opposite of this is called STATIC and their example is a Block. * The opposite of this is called STATIC and their example is a Block.
*/ */
abstract val isDynamic: Boolean abstract val canBeDynamic: Boolean
val isCurrentlyDynamic: Boolean
get() = originalID != dynamicID
/** /**
* Where to equip the item. * Where to equip the item.

View File

@@ -192,7 +192,7 @@ open class ActorHumanoid : ActorWithBody, Controllable, Pocketed, Factionable, L
override var baseMass: Double = 0.0 override var baseMass: Double = 0.0
override var baseToolSize: Double? = null override var baseToolSize: Double? = null
override var inventoryCategory = "should_not_be_seen" override var inventoryCategory = "should_not_be_seen"
override val isDynamic = false override val canBeDynamic = false
override val materialId = "" override val materialId = ""
init { init {

View File

@@ -83,7 +83,7 @@ class ActorInventory() : FixtureInventory() {
if (amount < 0) throw IllegalArgumentException("Consuming negative amount of an item (expected >=0, got $amount)") if (amount < 0) throw IllegalArgumentException("Consuming negative amount of an item (expected >=0, got $amount)")
if (item.stackable && !item.isDynamic) { if (item.stackable && !item.canBeDynamic) {
remove(item, amount) remove(item, amount)
} }
else if (item.isUnique) { else if (item.isUnique) {
@@ -93,7 +93,7 @@ class ActorInventory() : FixtureInventory() {
val newItem: GameItem val newItem: GameItem
// unpack newly-made dynamic item (e.g. any weapon, floppy disk) // unpack newly-made dynamic item (e.g. any weapon, floppy disk)
if (item.isDynamic && item.originalID == item.dynamicID) { if (item.canBeDynamic && !item.isCurrentlyDynamic) {
itemEquipped[item.equipPosition] = null itemEquipped[item.equipPosition] = null
remove(item, 1) remove(item, 1)

View File

@@ -46,7 +46,7 @@ open class HumanoidNPC : ActorHumanoid, AIControlled, CanBeAnItem {
actorValue[AVKey.SCALE] = value actorValue[AVKey.SCALE] = value
} }
override var inventoryCategory = "npc" override var inventoryCategory = "npc"
override val isDynamic = false override val canBeDynamic = false
override val materialId = "" override val materialId = ""
override fun startPrimaryUse(actor: ActorWithBody, delta: Float): Long { override fun startPrimaryUse(actor: ActorWithBody, delta: Float): Long {

View File

@@ -235,7 +235,7 @@ class AxeCopper(originalID: ItemID) : GameItem(originalID) {
override var baseToolSize: Double? = BASE_MASS_AND_SIZE override var baseToolSize: Double? = BASE_MASS_AND_SIZE
override var inventoryCategory = Category.TOOL override var inventoryCategory = Category.TOOL
override val isDynamic = true override val canBeDynamic = true
override val materialId = "CUPR" override val materialId = "CUPR"
override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE
override val itemImage: TextureRegion override val itemImage: TextureRegion
@@ -264,7 +264,7 @@ class AxeIron(originalID: ItemID) : GameItem(originalID) {
override var baseToolSize: Double? = BASE_MASS_AND_SIZE override var baseToolSize: Double? = BASE_MASS_AND_SIZE
override var inventoryCategory = Category.TOOL override var inventoryCategory = Category.TOOL
override val isDynamic = true override val canBeDynamic = true
override val materialId = "IRON" override val materialId = "IRON"
override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE
override val itemImage: TextureRegion override val itemImage: TextureRegion
@@ -293,7 +293,7 @@ class AxeSteel(originalID: ItemID) : GameItem(originalID) {
override var baseToolSize: Double? = BASE_MASS_AND_SIZE override var baseToolSize: Double? = BASE_MASS_AND_SIZE
override var inventoryCategory = Category.TOOL override var inventoryCategory = Category.TOOL
override val isDynamic = true override val canBeDynamic = true
override val materialId = "STAL" override val materialId = "STAL"
override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE
override val itemImage: TextureRegion override val itemImage: TextureRegion
@@ -322,7 +322,7 @@ class AxeWood(originalID: ItemID) : GameItem(originalID) {
override var baseToolSize: Double? = BASE_MASS_AND_SIZE override var baseToolSize: Double? = BASE_MASS_AND_SIZE
override var inventoryCategory = Category.TOOL override var inventoryCategory = Category.TOOL
override val isDynamic = true override val canBeDynamic = true
override val materialId = "WOOD" override val materialId = "WOOD"
override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE
override val itemImage: TextureRegion override val itemImage: TextureRegion
@@ -351,7 +351,7 @@ class AxeStone(originalID: ItemID) : GameItem(originalID) {
override var baseToolSize: Double? = BASE_MASS_AND_SIZE override var baseToolSize: Double? = BASE_MASS_AND_SIZE
override var inventoryCategory = Category.TOOL override var inventoryCategory = Category.TOOL
override val isDynamic = true override val canBeDynamic = true
override val materialId = "ROCK" override val materialId = "ROCK"
override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE
override val itemImage: TextureRegion override val itemImage: TextureRegion

View File

@@ -41,7 +41,7 @@ open class FixtureItemBase(originalID: ItemID, val fixtureClassName: String) : G
override var dynamicID: ItemID = originalID override var dynamicID: ItemID = originalID
@Transient override var baseMass = 1.0 @Transient override var baseMass = 1.0
@Transient override var inventoryCategory = Category.FIXTURE @Transient override var inventoryCategory = Category.FIXTURE
override val isDynamic = false override val canBeDynamic = false
@Transient override val materialId = "" @Transient override val materialId = ""
@Transient override var equipPosition: Int = EquipPosition.HAND_GRIP @Transient override var equipPosition: Int = EquipPosition.HAND_GRIP

View File

@@ -64,7 +64,7 @@ open class ItemFileRef(originalID: ItemID) : GameItem(originalID) {
override var baseMass = 1.0 override var baseMass = 1.0
override var baseToolSize: Double? = null override var baseToolSize: Double? = null
override var inventoryCategory = Category.MISC override var inventoryCategory = Category.MISC
override val isDynamic = false override val canBeDynamic = false
override val materialId = "" override val materialId = ""
override var equipPosition = EquipPosition.HAND_GRIP override var equipPosition = EquipPosition.HAND_GRIP

View File

@@ -11,7 +11,7 @@ class ItemFurnaceAndAnvil(originalID: ItemID) : FixtureItemBase(originalID, "net
override var baseMass = 100.0 override var baseMass = 100.0
override val isDynamic = false override val canBeDynamic = false
override val materialId = "" override val materialId = ""
override val itemImage: TextureRegion override val itemImage: TextureRegion
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(5,3) get() = CommonResourcePool.getAsItemSheet("basegame.items").get(5,3)

View File

@@ -11,7 +11,7 @@ class ItemJukebox(originalID: ItemID) : FixtureItemBase(originalID, "net.torvald
override var baseMass = 200.0 override var baseMass = 200.0
override val isDynamic = false override val canBeDynamic = false
override val materialId = "" override val materialId = ""
override val itemImage: TextureRegion override val itemImage: TextureRegion
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(6,3) get() = CommonResourcePool.getAsItemSheet("basegame.items").get(6,3)
@@ -28,7 +28,7 @@ class ItemMusicalTurntable(originalID: ItemID) : FixtureItemBase(originalID, "ne
override var baseMass = 20.0 override var baseMass = 20.0
override val isDynamic = false override val canBeDynamic = false
override val materialId = "" override val materialId = ""
override val itemImage: TextureRegion override val itemImage: TextureRegion
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(7,3) get() = CommonResourcePool.getAsItemSheet("basegame.items").get(7,3)

View File

@@ -12,7 +12,7 @@ class ItemLogicSignalEmitter(originalID: ItemID) : FixtureItemBase(originalID, "
override var dynamicID: ItemID = originalID override var dynamicID: ItemID = originalID
override var baseMass = FixtureLogicSignalEmitter.MASS override var baseMass = FixtureLogicSignalEmitter.MASS
override val isDynamic = false override val canBeDynamic = false
override val materialId = "" override val materialId = ""
override val itemImage: TextureRegion override val itemImage: TextureRegion
get() = getItemImageFromSingleImage("basegame", "sprites/fixtures/signal_source.tga") get() = getItemImageFromSingleImage("basegame", "sprites/fixtures/signal_source.tga")

View File

@@ -11,7 +11,7 @@ import net.torvald.terrarumsansbitmap.gdx.TextureRegionPack
*/ */
class ItemSmelterBasic(originalID: ItemID) : FixtureItemBase(originalID, "net.torvald.terrarum.modulebasegame.gameactors.FixtureSmelterBasic") { class ItemSmelterBasic(originalID: ItemID) : FixtureItemBase(originalID, "net.torvald.terrarum.modulebasegame.gameactors.FixtureSmelterBasic") {
override var baseMass = 100.0 override var baseMass = 100.0
override val isDynamic = false override val canBeDynamic = false
override val materialId = "" override val materialId = ""
override val itemImage: TextureRegion override val itemImage: TextureRegion
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(4,3) get() = CommonResourcePool.getAsItemSheet("basegame.items").get(4,3)

View File

@@ -14,7 +14,7 @@ class ItemStorageChest(originalID: ItemID) : FixtureItemBase(originalID, "net.to
override var dynamicID: ItemID = originalID override var dynamicID: ItemID = originalID
override var baseMass = FixtureTikiTorch.MASS override var baseMass = FixtureTikiTorch.MASS
override val isDynamic = false override val canBeDynamic = false
override val materialId = "" override val materialId = ""
override val itemImage: TextureRegion override val itemImage: TextureRegion
get() = getItemImageFromSingleImage("basegame", "sprites/fixtures/storage_chest.tga") get() = getItemImageFromSingleImage("basegame", "sprites/fixtures/storage_chest.tga")

View File

@@ -14,7 +14,7 @@ class ItemSwingingDoorOak(originalID: ItemID) :
override var dynamicID: ItemID = originalID override var dynamicID: ItemID = originalID
override var baseMass = 20.0 // 360[L] * 0.1 * 0.56[SpecificGravity], rounded to the nearest integer override var baseMass = 20.0 // 360[L] * 0.1 * 0.56[SpecificGravity], rounded to the nearest integer
override val isDynamic = false override val canBeDynamic = false
override val materialId = "" override val materialId = ""
override val itemImage: TextureRegion override val itemImage: TextureRegion
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(8,10) get() = CommonResourcePool.getAsItemSheet("basegame.items").get(8,10)
@@ -27,7 +27,7 @@ class ItemSwingingDoorEbony(originalID: ItemID) :
override var dynamicID: ItemID = originalID override var dynamicID: ItemID = originalID
override var baseMass = 30.0 // 360[L] * 0.1 * 0.82[SpecificGravity], rounded to the nearest integer override var baseMass = 30.0 // 360[L] * 0.1 * 0.82[SpecificGravity], rounded to the nearest integer
override val isDynamic = false override val canBeDynamic = false
override val materialId = "" override val materialId = ""
override val itemImage: TextureRegion override val itemImage: TextureRegion
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(9,10) get() = CommonResourcePool.getAsItemSheet("basegame.items").get(9,10)
@@ -40,7 +40,7 @@ class ItemSwingingDoorBirch(originalID: ItemID) :
override var dynamicID: ItemID = originalID override var dynamicID: ItemID = originalID
override var baseMass = 17.0 // 360[L] * 0.1 * 0.48[SpecificGravity], rounded to the nearest integer override var baseMass = 17.0 // 360[L] * 0.1 * 0.48[SpecificGravity], rounded to the nearest integer
override val isDynamic = false override val canBeDynamic = false
override val materialId = "" override val materialId = ""
override val itemImage: TextureRegion override val itemImage: TextureRegion
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(10,10) get() = CommonResourcePool.getAsItemSheet("basegame.items").get(10,10)
@@ -53,7 +53,7 @@ class ItemSwingingDoorRosewood(originalID: ItemID) :
override var dynamicID: ItemID = originalID override var dynamicID: ItemID = originalID
override var baseMass = 24.0 // 360[L] * 0.1 * 0.68[SpecificGravity], rounded to the nearest integer override var baseMass = 24.0 // 360[L] * 0.1 * 0.68[SpecificGravity], rounded to the nearest integer
override val isDynamic = false override val canBeDynamic = false
override val materialId = "" override val materialId = ""
override val itemImage: TextureRegion override val itemImage: TextureRegion
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(11,10) get() = CommonResourcePool.getAsItemSheet("basegame.items").get(11,10)

View File

@@ -16,7 +16,7 @@ class ItemTapestry(originalID: ItemID) : FixtureItemBase(originalID, "net.torval
override var dynamicID: ItemID = originalID override var dynamicID: ItemID = originalID
override var baseMass = 6.0 override var baseMass = 6.0
override val isDynamic = false override val canBeDynamic = false
override val materialId = "" override val materialId = ""
override val itemImage: TextureRegion override val itemImage: TextureRegion
get() = CommonResourcePool.getAsTextureRegion("itemplaceholder_16") get() = CommonResourcePool.getAsTextureRegion("itemplaceholder_16")

View File

@@ -12,7 +12,7 @@ class ItemTikiTorch(originalID: ItemID) : FixtureItemBase(originalID, "net.torva
override var dynamicID: ItemID = originalID override var dynamicID: ItemID = originalID
override var baseMass = FixtureTikiTorch.MASS override var baseMass = FixtureTikiTorch.MASS
override val isDynamic = false override val canBeDynamic = false
override val materialId = "" override val materialId = ""
override val itemImage: TextureRegion override val itemImage: TextureRegion
get() = getItemImageFromSheet("basegame", "sprites/fixtures/tiki_torch.tga", 16, 32) get() = getItemImageFromSheet("basegame", "sprites/fixtures/tiki_torch.tga", 16, 32)

View File

@@ -12,7 +12,7 @@ class ItemTypewriter(originalID: ItemID) : FixtureItemBase(originalID, "net.torv
override var dynamicID: ItemID = originalID override var dynamicID: ItemID = originalID
override var baseMass = FixtureTikiTorch.MASS override var baseMass = FixtureTikiTorch.MASS
override val isDynamic = false override val canBeDynamic = false
override val materialId = "" override val materialId = ""
override val itemImage: TextureRegion override val itemImage: TextureRegion
get() = getItemImageFromSheet("basegame", "sprites/fixtures/typewriter.tga", 32, 16) get() = getItemImageFromSheet("basegame", "sprites/fixtures/typewriter.tga", 32, 16)

View File

@@ -11,7 +11,7 @@ class ItemWallCalendar(originalID: ItemID) : FixtureItemBase(originalID, "net.to
override var dynamicID: ItemID = originalID override var dynamicID: ItemID = originalID
override var baseMass = 1.0 override var baseMass = 1.0
override val isDynamic = false override val canBeDynamic = false
override val materialId = "" override val materialId = ""
override val itemImage: TextureRegion override val itemImage: TextureRegion
get() = getItemImageFromSingleImage("basegame", "sprites/fixtures/calendar.tga") get() = getItemImageFromSingleImage("basegame", "sprites/fixtures/calendar.tga")

View File

@@ -10,7 +10,7 @@ class ItemWorkbench(originalID: ItemID) : FixtureItemBase(originalID, "net.torva
override var baseMass = 20.0 override var baseMass = 20.0
override val isDynamic = false override val canBeDynamic = false
override val materialId = "" override val materialId = ""
override val itemImage: TextureRegion override val itemImage: TextureRegion
get() = getItemImageFromSingleImage("basegame", "sprites/fixtures/workbench.tga") get() = getItemImageFromSingleImage("basegame", "sprites/fixtures/workbench.tga")

View File

@@ -12,7 +12,7 @@ class ItemWorldPortal(originalID: ItemID) : FixtureItemBase(originalID, "net.tor
override var dynamicID: ItemID = originalID override var dynamicID: ItemID = originalID
override var baseMass = 6000.0 override var baseMass = 6000.0
override val isDynamic = false override val canBeDynamic = false
override val materialId = "" override val materialId = ""
override val itemImage: TextureRegion override val itemImage: TextureRegion
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(3,3) get() = CommonResourcePool.getAsItemSheet("basegame.items").get(3,3)

View File

@@ -40,7 +40,7 @@ object MusicDiscHelper {
open class MusicDiscPrototype(originalID: ItemID, module: String, path: String) : ItemFileRef(originalID) { open class MusicDiscPrototype(originalID: ItemID, module: String, path: String) : ItemFileRef(originalID) {
override var refPath = path override var refPath = path
override var refModuleName = module override var refModuleName = module
override val isDynamic = false override val canBeDynamic = false
@Transient override var ref = ModMgr.getFile(refModuleName, refPath) @Transient override var ref = ModMgr.getFile(refModuleName, refPath)
override var mediumIdentifier = "music_disc" override var mediumIdentifier = "music_disc"

View File

@@ -14,7 +14,7 @@ open class OreItemBase(originalID: ItemID, private val registerToOreDict: Boolea
override var baseMass = 10.0 override var baseMass = 10.0
override var baseToolSize: Double? = null override var baseToolSize: Double? = null
override var inventoryCategory = Category.GENERIC override var inventoryCategory = Category.GENERIC
override val isDynamic = false override val canBeDynamic = false
override val materialId = "OORE" override val materialId = "OORE"
override var equipPosition = EquipPosition.HAND_GRIP override var equipPosition = EquipPosition.HAND_GRIP

View File

@@ -230,7 +230,7 @@ class PickaxeCopper(originalID: ItemID) : GameItem(originalID) {
override var baseToolSize: Double? = BASE_MASS_AND_SIZE override var baseToolSize: Double? = BASE_MASS_AND_SIZE
override var inventoryCategory = Category.TOOL override var inventoryCategory = Category.TOOL
override val isDynamic = true override val canBeDynamic = true
override val materialId = "CUPR" override val materialId = "CUPR"
override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE
override val itemImage: TextureRegion override val itemImage: TextureRegion
@@ -260,7 +260,7 @@ class PickaxeIron(originalID: ItemID) : GameItem(originalID) {
override var baseToolSize: Double? = BASE_MASS_AND_SIZE override var baseToolSize: Double? = BASE_MASS_AND_SIZE
override var inventoryCategory = Category.TOOL override var inventoryCategory = Category.TOOL
override val isDynamic = true override val canBeDynamic = true
override val materialId = "IRON" override val materialId = "IRON"
override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE
override val itemImage: TextureRegion override val itemImage: TextureRegion
@@ -290,7 +290,7 @@ class PickaxeSteel(originalID: ItemID) : GameItem(originalID) {
override var baseToolSize: Double? = BASE_MASS_AND_SIZE override var baseToolSize: Double? = BASE_MASS_AND_SIZE
override var inventoryCategory = Category.TOOL override var inventoryCategory = Category.TOOL
override val isDynamic = true override val canBeDynamic = true
override val materialId = "STAL" override val materialId = "STAL"
override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE
override val itemImage: TextureRegion override val itemImage: TextureRegion
@@ -320,7 +320,7 @@ class PickaxeWood(originalID: ItemID) : GameItem(originalID) {
override var baseToolSize: Double? = BASE_MASS_AND_SIZE override var baseToolSize: Double? = BASE_MASS_AND_SIZE
override var inventoryCategory = Category.TOOL override var inventoryCategory = Category.TOOL
override val isDynamic = true override val canBeDynamic = true
override val materialId = "WOOD" override val materialId = "WOOD"
override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE
override val itemImage: TextureRegion override val itemImage: TextureRegion
@@ -350,7 +350,7 @@ class PickaxeStone(originalID: ItemID) : GameItem(originalID) {
override var baseToolSize: Double? = BASE_MASS_AND_SIZE override var baseToolSize: Double? = BASE_MASS_AND_SIZE
override var inventoryCategory = Category.TOOL override var inventoryCategory = Category.TOOL
override val isDynamic = true override val canBeDynamic = true
override val materialId = "ROCK" override val materialId = "ROCK"
override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE
override val itemImage: TextureRegion override val itemImage: TextureRegion

View File

@@ -136,7 +136,7 @@ class SledgehammerCopper(originalID: ItemID) : GameItem(originalID) {
override var baseToolSize: Double? = BASE_MASS_AND_SIZE override var baseToolSize: Double? = BASE_MASS_AND_SIZE
override var inventoryCategory = Category.TOOL override var inventoryCategory = Category.TOOL
override val isDynamic = true override val canBeDynamic = true
override val materialId = "CUPR" override val materialId = "CUPR"
override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE
override val itemImage: TextureRegion override val itemImage: TextureRegion
@@ -160,7 +160,7 @@ class SledgehammerIron(originalID: ItemID) : GameItem(originalID) {
override var baseToolSize: Double? = BASE_MASS_AND_SIZE override var baseToolSize: Double? = BASE_MASS_AND_SIZE
override var inventoryCategory = Category.TOOL override var inventoryCategory = Category.TOOL
override val isDynamic = true override val canBeDynamic = true
override val materialId = "IRON" override val materialId = "IRON"
override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE
override val itemImage: TextureRegion override val itemImage: TextureRegion
@@ -184,7 +184,7 @@ class SledgehammerSteel(originalID: ItemID) : GameItem(originalID) {
override var baseToolSize: Double? = BASE_MASS_AND_SIZE override var baseToolSize: Double? = BASE_MASS_AND_SIZE
override var inventoryCategory = Category.TOOL override var inventoryCategory = Category.TOOL
override val isDynamic = true override val canBeDynamic = true
override val materialId = "STAL" override val materialId = "STAL"
override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE
override val itemImage: TextureRegion override val itemImage: TextureRegion
@@ -211,7 +211,7 @@ class SledgehammerWood(originalID: ItemID) : GameItem(originalID) {
override var baseToolSize: Double? = BASE_MASS_AND_SIZE override var baseToolSize: Double? = BASE_MASS_AND_SIZE
override var inventoryCategory = Category.TOOL override var inventoryCategory = Category.TOOL
override val isDynamic = true override val canBeDynamic = true
override val materialId = "WOOD" override val materialId = "WOOD"
override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE
override val itemImage: TextureRegion override val itemImage: TextureRegion

View File

@@ -88,7 +88,7 @@ class WireCutterAll(originalID: ItemID) : GameItem(originalID) {
override var baseMass = 0.1 override var baseMass = 0.1
override var baseToolSize: Double? = baseMass override var baseToolSize: Double? = baseMass
override var inventoryCategory = Category.TOOL override var inventoryCategory = Category.TOOL
override val isDynamic = false override val canBeDynamic = false
override val materialId = "" override val materialId = ""
override val itemImage: TextureRegion override val itemImage: TextureRegion
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(1, 3) get() = CommonResourcePool.getAsItemSheet("basegame.items").get(1, 3)

View File

@@ -14,7 +14,7 @@ class WireGraphDebugger(originalID: ItemID) : GameItem(originalID) {
override var baseToolSize: Double? = PickaxeCore.BASE_MASS_AND_SIZE override var baseToolSize: Double? = PickaxeCore.BASE_MASS_AND_SIZE
override var inventoryCategory = Category.TOOL override var inventoryCategory = Category.TOOL
override val isDynamic = false override val canBeDynamic = false
override val materialId = "CUPR" override val materialId = "CUPR"
override var baseMass = 2.0 override var baseMass = 2.0
override val itemImage: TextureRegion override val itemImage: TextureRegion

View File

@@ -18,7 +18,7 @@ class WirePieceSignalWire(originalID: ItemID, private val atlasID: String, priva
override var baseMass = 0.001 override var baseMass = 0.001
override var baseToolSize: Double? = null override var baseToolSize: Double? = null
override var inventoryCategory = Category.WIRE override var inventoryCategory = Category.WIRE
override val isDynamic = false override val canBeDynamic = false
override val materialId = "" override val materialId = ""
override val itemImage: TextureRegion override val itemImage: TextureRegion
get() = CommonResourcePool.getAsItemSheet(atlasID).get(sheetX, sheetY) get() = CommonResourcePool.getAsItemSheet(atlasID).get(sheetX, sheetY)

View File

@@ -2,7 +2,6 @@ package net.torvald.terrarum.ui
import com.badlogic.gdx.Gdx import com.badlogic.gdx.Gdx
import com.badlogic.gdx.Input import com.badlogic.gdx.Input
import com.badlogic.gdx.Input.Keys
import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.graphics.Color
import com.badlogic.gdx.graphics.OrthographicCamera import com.badlogic.gdx.graphics.OrthographicCamera
import com.badlogic.gdx.graphics.g2d.SpriteBatch import com.badlogic.gdx.graphics.g2d.SpriteBatch
@@ -98,7 +97,7 @@ class UIItemInventoryElemSimple(
// if item has durability, draw that and don't draw count; durability and itemCount cannot coexist // if item has durability, draw that and don't draw count; durability and itemCount cannot coexist
if (item!!.maxDurability > 0.0) { if (item!!.isCurrentlyDynamic && item!!.maxDurability > 0.0) {
// draw durability metre // draw durability metre
val barFullLen = width val barFullLen = width
val barOffset = posX val barOffset = posX
@@ -133,11 +132,11 @@ class UIItemInventoryElemSimple(
// set tooltip accordingly // set tooltip accordingly
if (tooltipShowing[hash] != true && item != null && mouseUp) { if (tooltipShowing[hash] != true && mouseUp) {
// printdbg(this, "calling INGAME.setTooltipMessage by $hash") // printdbg(this, "calling INGAME.setTooltipMessage by $hash")
val grey = App.fontGame.toColorCode(11, 11, 11) val grey = App.fontGame.toColorCode(11, 11, 11)
val itemIDstr = "\n$grey(${item?.originalID}${if (item?.originalID == item?.dynamicID) "" else "/${item?.dynamicID}"})" val itemIDstr = "\n$grey(${item?.originalID}${if (item?.isCurrentlyDynamic == true) "/${item?.dynamicID}" else ""})"
val nameStr0 = if (item?.nameSecondary?.isNotBlank() == true) "${item?.name}\n$grey${item?.nameSecondary}" else "${item?.name}" val nameStr0 = if (item?.nameSecondary?.isNotBlank() == true) "${item?.name}\n$grey${item?.nameSecondary}" else "${item?.name}"
val nameStr = if (Gdx.input.isKeyPressed(Input.Keys.ALT_LEFT)) nameStr0 + itemIDstr else nameStr0 val nameStr = if (Gdx.input.isKeyPressed(Input.Keys.ALT_LEFT)) nameStr0 + itemIDstr else nameStr0
val descStr = Lang.getOrNull("TOOLTIP_${item?.originalID}")?.replace("\n","\n$grey") val descStr = Lang.getOrNull("TOOLTIP_${item?.originalID}")?.replace("\n","\n$grey")

View File

@@ -168,7 +168,7 @@ class UIItemInventoryElemWide(
// printdbg(this, "calling INGAME.setTooltipMessage by $hash") // printdbg(this, "calling INGAME.setTooltipMessage by $hash")
val grey = App.fontGame.toColorCode(11, 11, 11) val grey = App.fontGame.toColorCode(11, 11, 11)
val itemIDstr = "\n$grey(${item?.originalID}${if (item?.originalID == item?.dynamicID) "" else "/${item?.dynamicID}"})" val itemIDstr = "\n$grey(${item?.originalID}${if (item?.isCurrentlyDynamic == true) "/${item?.dynamicID}" else ""})"
val nameStr0 = if (item?.nameSecondary?.isNotBlank() == true) "${item?.name}\n$grey${item?.nameSecondary}" else "${item?.name}" val nameStr0 = if (item?.nameSecondary?.isNotBlank() == true) "${item?.name}\n$grey${item?.nameSecondary}" else "${item?.name}"
val nameStr = if (Gdx.input.isKeyPressed(Input.Keys.ALT_LEFT)) nameStr0 + itemIDstr else nameStr0 val nameStr = if (Gdx.input.isKeyPressed(Input.Keys.ALT_LEFT)) nameStr0 + itemIDstr else nameStr0
val descStr = Lang.getOrNull("TOOLTIP_${item?.originalID}")?.replace("\n","\n$grey") val descStr = Lang.getOrNull("TOOLTIP_${item?.originalID}")?.replace("\n","\n$grey")