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

not reading material csv issue fixed

Browse Source
This commit is contained in:
minjaesong
2019-03-12 00:47:06 +09:00
parent 7f53be48d1
commit 1ac735805d
12 changed files with 124 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/net/torvald/terrarum/modulebasegame/EntryPoint.kt
View File

@@ -64,7 +64,7 @@ class EntryPoint : ModuleEntryPoint() {
override var stackable = true
override var inventoryCategory = if (i in ItemCodex.ITEM_TILES) Category.BLOCK else Category.WALL
override var isDynamic = false
override val material = MaterialCodex[blockProp.material]
override val material = MaterialCodex.getOrDefault(blockProp.material)
init {
equipPosition = EquipPosition.HAND_GRIP

6
src/net/torvald/terrarum/modulebasegame/items/PickaxeGeneric.kt
View File

@@ -81,7 +81,7 @@ class PickaxeCopper(override val originalID: ItemID) : GameItem() {
override var inventoryCategory = Category.TOOL
override val isUnique = false
override val isDynamic = true
override var material = MaterialCodex["CUPR"]
override val material = MaterialCodex["CUPR"]
override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE
override val itemImage: TextureRegion?
get() = (AppLoader.resourcePool["basegame.items24"] as TextureRegionPack).get(0,0)
@@ -109,7 +109,7 @@ class PickaxeIron(override val originalID: ItemID) : GameItem() {
override var inventoryCategory = Category.TOOL
override val isUnique = false
override val isDynamic = true
override var material = MaterialCodex["IRON"]
override val material = MaterialCodex["IRON"]
override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE
override val itemImage: TextureRegion?
get() = (AppLoader.resourcePool["basegame.items24"] as TextureRegionPack).get(1,0)
@@ -137,7 +137,7 @@ class PickaxeSteel(override val originalID: ItemID) : GameItem() {
override var inventoryCategory = Category.TOOL
override val isUnique = false
override val isDynamic = true
override var material = MaterialCodex["STAL"]
override val material = MaterialCodex["STAL"]
override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE
override val itemImage: TextureRegion?
get() = (AppLoader.resourcePool["basegame.items24"] as TextureRegionPack).get(2,0)

9
src/net/torvald/terrarum/modulebasegame/ui/UIItemInventoryDynamicList.kt
View File

@@ -287,7 +287,14 @@ class UIItemInventoryDynamicList(
// set tooltip accordingly
if (isCompactMode && it.mouseUp && !tooltipSet) {
(Terrarum.ingame as? Ingame)?.setTooltipMessage(it.item?.name)
(Terrarum.ingame as? Ingame)?.setTooltipMessage(
if (AppLoader.IS_DEVELOPMENT_BUILD) {
it.item?.name + "/Mat: ${it.item?.material?.identifier}"
}
else {
it.item?.name
}
)
tooltipSet = true
}
}