curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-03-07 20:31:51 +09:00
Code Issues Packages Projects Releases Wiki Activity

a piece of wire is considered as a tool for inventory (for now)

Browse Source
This commit is contained in:
minjaesong
2019-03-10 18:13:29 +09:00
parent 4b91f485a5
commit 2570b13ad4
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
assets/mods/basegame/items/itemid.csv
View File

@@ -1,2 +1,3 @@
"id";"classname"
"8448";"net.torvald.terrarum.modulebasegame.items.PickaxeGeneric"
"8448";"net.torvald.terrarum.modulebasegame.items.PickaxeGeneric"
"8449";"net.torvald.terrarum.modulebasegame.items.WirePieceSignalWire"
1 id classname
2 8448 net.torvald.terrarum.modulebasegame.items.PickaxeGeneric
3 8449 net.torvald.terrarum.modulebasegame.items.WirePieceSignalWire

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

@@ -50,16 +50,16 @@ class UIItemInventoryDynamicList(
val catIconsMeaning = listOf( // sortedBy: catArrangement
GameItem.Category.WEAPON,
GameItem.Category.TOOL,
GameItem.Category.ARMOUR,
GameItem.Category.GENERIC,
GameItem.Category.POTION,
GameItem.Category.MAGIC,
GameItem.Category.BLOCK,
GameItem.Category.WALL,
GameItem.Category.MISC,
"__all__"
arrayOf(GameItem.Category.WEAPON),
arrayOf(GameItem.Category.TOOL, GameItem.Category.WIRE),
arrayOf(GameItem.Category.ARMOUR),
arrayOf(GameItem.Category.GENERIC),
arrayOf(GameItem.Category.POTION),
arrayOf(GameItem.Category.MAGIC),
arrayOf(GameItem.Category.BLOCK),
arrayOf(GameItem.Category.WALL),
arrayOf(GameItem.Category.MISC),
arrayOf("__all__")
)
private val inventoryUI = parentUI
@@ -316,7 +316,7 @@ class UIItemInventoryDynamicList(
// filter items
inventory.forEach {
if (ItemCodex[it.item]!!.inventoryCategory == filter || filter == "__all__")
if ((filter.contains(ItemCodex[it.item]!!.inventoryCategory) || filter[0] == "__all__"))
inventorySortList.add(it)
}