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

at least some of the new UIs are working

Browse Source
This commit is contained in:
minjaesong
2017-10-23 03:44:45 +09:00
parent 7379c4d979
commit faec65eb81
26 changed files with 848 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/net/torvald/terrarum/gameactors/ActorHumanoid.kt
View File

@@ -9,7 +9,7 @@ import net.torvald.terrarum.gameworld.GameWorld
import net.torvald.terrarum.itemproperties.GameItem
import net.torvald.terrarum.itemproperties.Material
import net.torvald.terrarum.realestate.LandUtil
import net.torvald.terrarum.ui.UIInventory
import net.torvald.terrarum.ui.UIInventoryFull
import net.torvald.terrarum.worlddrawer.LightmapRenderer
import java.util.*
@@ -530,7 +530,7 @@ open class ActorHumanoid(
// force update inventory UI
try {
(Terrarum.ingame!!.uiInventoryPlayer as UIInventory).shutUpAndRebuild()
(Terrarum.ingame!!.uiInventoryPlayer as UIInventoryFull).rebuildList()
}
catch (LateInitMyArse: kotlin.UninitializedPropertyAccessException) { }
}

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

@@ -35,6 +35,8 @@ class ActorInventory(val actor: Pocketed, var maxCapacity: Int, var capacityMode
val itemList = ArrayList<InventoryPair>()
val quickBar = Array<ItemID?>(10, { null }) // 0: Slot 1, 9: Slot 10
var currency = 0 // unified currency for whole civs; Dwarf Fortress approach seems too complicated
init {
}