diff --git a/assets/graphics/fonts/terrarum-sans-bitmap/futhark.tga b/assets/graphics/fonts/terrarum-sans-bitmap/futhark.tga index 797a28e99..7aeece46d 100644 --- a/assets/graphics/fonts/terrarum-sans-bitmap/futhark.tga +++ b/assets/graphics/fonts/terrarum-sans-bitmap/futhark.tga @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0b9b03aad1a550411c508a721456fdfccf18365b1d02f6aabf104c7e948c6753 +oid sha256:f7fef0785183c24f2a52ef0a2aca5737da5ed14805b4dd7ab5c8a241b2e01f69 size 69164 diff --git a/lib/TerrarumSansBitmap.jar b/lib/TerrarumSansBitmap.jar index 68e2cc56c..d9efad0a2 100644 Binary files a/lib/TerrarumSansBitmap.jar and b/lib/TerrarumSansBitmap.jar differ diff --git a/src/net/torvald/terrarum/ModMgr.kt b/src/net/torvald/terrarum/ModMgr.kt index 50ec89895..f9b19c0f2 100644 --- a/src/net/torvald/terrarum/ModMgr.kt +++ b/src/net/torvald/terrarum/ModMgr.kt @@ -165,7 +165,6 @@ object ModMgr { val langPath = "locales/" @JvmStatic operator fun invoke(module: String) { - println("arstneitars") Lang.load(getPath(module, langPath)) } } diff --git a/src/net/torvald/terrarum/StateInGameGDX.kt b/src/net/torvald/terrarum/StateInGameGDX.kt index d6ff1fef7..0e5061a78 100644 --- a/src/net/torvald/terrarum/StateInGameGDX.kt +++ b/src/net/torvald/terrarum/StateInGameGDX.kt @@ -145,6 +145,7 @@ class StateInGameGDX(val batch: SpriteBatch) : Screen { fun enter() { + Gdx.input.inputProcessor = GameController diff --git a/src/net/torvald/terrarum/TerrarumGDX.kt b/src/net/torvald/terrarum/TerrarumGDX.kt index aa6d59c1d..2acbf3908 100644 --- a/src/net/torvald/terrarum/TerrarumGDX.kt +++ b/src/net/torvald/terrarum/TerrarumGDX.kt @@ -17,9 +17,11 @@ import com.badlogic.gdx.graphics.glutils.FrameBuffer import com.badlogic.gdx.graphics.glutils.ShapeRenderer import com.google.gson.JsonArray import com.google.gson.JsonPrimitive +import net.torvald.terrarum.blockproperties.BlockCodex import net.torvald.terrarum.gameactors.ActorWithPhysics.Companion.TILE_SIZE import net.torvald.terrarum.gamecontroller.GameController import net.torvald.terrarum.imagefont.TinyAlphNum +import net.torvald.terrarum.itemproperties.ItemCodex import net.torvald.terrarum.utils.JsonFetcher import net.torvald.terrarum.utils.JsonWriter import net.torvald.terrarum.worlddrawer.RGB10 @@ -287,6 +289,10 @@ object TerrarumGDX : ApplicationAdapter() { fontSmallNumbers = TinyAlphNum + ModMgr // invoke Module Manager, will also invoke BlockCodex + ItemCodex // invoke Item Codex + + ingame = StateInGameGDX(batch) diff --git a/src/net/torvald/terrarum/UIItemInventoryElem.kt b/src/net/torvald/terrarum/UIItemInventoryElem.kt index 3fbb9fb18..bb91b958e 100644 --- a/src/net/torvald/terrarum/UIItemInventoryElem.kt +++ b/src/net/torvald/terrarum/UIItemInventoryElem.kt @@ -5,6 +5,7 @@ import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.graphics.g2d.SpriteBatch import com.badlogic.gdx.graphics.g2d.TextureRegion import net.torvald.colourutil.CIELabUtil.darkerLab +import net.torvald.terrarum.blockproperties.BlockCodex import net.torvald.terrarum.itemproperties.GameItem import net.torvald.terrarum.ui.UIInventory import net.torvald.terrarum.ui.UIItem @@ -49,7 +50,7 @@ class UIItemInventoryElem( private val textOffsetY = 8f - private val durabilityCol = Color(0x22ff11) + private val durabilityCol = Color(0x22ff11_ff) private val durabilityBack: Color; get() = durabilityCol.darkerLab(0.4f) private val durabilityBarOffY = 35f @@ -84,7 +85,10 @@ class UIItemInventoryElem( if (item != null && itemImage != null) { blendNormal() + //println("orgID: ${item!!.originalID}, nameKey: ${BlockCodex[item!!.originalID].nameKey}, itemOrgName: ${item!!.originalName}") + // item image + batch.color = Color.WHITE batch.draw(itemImage, posX + imgOffset, posY + imgOffset) // if mouse is over, text lights up @@ -111,15 +115,19 @@ class UIItemInventoryElem( // quickslot marker (TEMPORARY UNTIL WE GET BETTER DESIGN) + batch.color = Color.WHITE + if (quickslot != null) { val label = quickslot!!.plus(0xE010).toChar() val labelW = TerrarumGDX.fontGame.getWidth("$label") - batch.color = Color.WHITE TerrarumGDX.fontGame.draw(batch, "$label", barOffset + barFullLen - labelW, posY + textOffsetY) } } + // see IFs above? + batch.color = Color.WHITE + } override fun keyDown(keycode: Int): Boolean { diff --git a/src/net/torvald/terrarum/itemproperties/GameItem.kt b/src/net/torvald/terrarum/itemproperties/GameItem.kt index d585a01fa..6fafb9b24 100644 --- a/src/net/torvald/terrarum/itemproperties/GameItem.kt +++ b/src/net/torvald/terrarum/itemproperties/GameItem.kt @@ -31,9 +31,11 @@ abstract class GameItem : Comparable, Cloneable { /** * OriginalName is always read from Language files. */ - abstract protected val originalName: String + abstract val originalName: String - private var newName: String = "I AM VITTUN PLACEHOLDER" + + var newName: String = "I AM VITTUN PLACEHOLDER" + private set var name: String set(value) { diff --git a/src/net/torvald/terrarum/itemproperties/ItemCodex.kt b/src/net/torvald/terrarum/itemproperties/ItemCodex.kt index de8aae710..2be9ce0bb 100644 --- a/src/net/torvald/terrarum/itemproperties/ItemCodex.kt +++ b/src/net/torvald/terrarum/itemproperties/ItemCodex.kt @@ -53,7 +53,7 @@ object ItemCodex { override val material = Material(0,0,0,0,0,0,0,0,0,0.0) init { - + println("[ItemCodex] recording item ID $originalID") } override fun primaryUse(delta: Float): Boolean { diff --git a/src/net/torvald/terrarum/ui/UIInventory.kt b/src/net/torvald/terrarum/ui/UIInventory.kt index 78c9c749c..e2428d1c9 100644 --- a/src/net/torvald/terrarum/ui/UIInventory.kt +++ b/src/net/torvald/terrarum/ui/UIInventory.kt @@ -83,7 +83,7 @@ class UIInventory( iconSpriteSheet = TextureRegionPack("./assets/graphics/gui/inventory/category.tga", 20, 20), iconSpriteSheetIndices = intArrayOf(9,6,7,1,0,2,3,4,5,8), iconCol = defaultTextColour, - highlightBackCol = Color(0xb8b8b8), + highlightBackCol = Color(0xb8b8b8_ff.toInt()), highlightBackBlendMode = BlendMode.MULTIPLY, backgroundCol = Color(0), // will use custom background colour! backgroundBlendMode = BlendMode.NORMAL, @@ -102,9 +102,9 @@ class UIInventory( item = null, amount = UIItemInventoryElem.UNIQUE_ITEM_HAS_NO_AMOUNT, itemImage = null, - mouseoverBackCol = Color(0x282828), + mouseoverBackCol = Color(0x282828_ff), mouseoverBackBlendMode = BlendMode.SCREEN, - backCol = Color(0xd4d4d4), + backCol = Color(0xd4d4d4_ff.toInt()), backBlendMode = BlendMode.MULTIPLY, drawBackOnNull = true, inactiveTextCol = defaultTextColour @@ -167,7 +167,7 @@ class UIInventory( // cat bar background blendMul() - batch.color = Color(0xcccccc) + batch.color = Color(0xcccccc_ff.toInt()) batch.fillRect(0f, 0f, catButtons.width.toFloat(), height.toFloat()) catButtons.render(batch) @@ -196,7 +196,7 @@ class UIInventory( // encumbrance bar background blendMul() - batch.color = Color(0xa0a0a0) + batch.color = Color(0xa0a0a0_ff.toInt()) batch.fillRect( width - 3 - weightBarWidth, height - controlHelpHeight + 3f, @@ -205,7 +205,7 @@ class UIInventory( ) // encumbrance bar blendNormal() - batch.color = if (isEncumbered) Color(0xccff0000.toInt()) else Color(0xcc00ff00.toInt()) + batch.color = if (isEncumbered) Color(0xff0000_cc.toInt()) else Color(0x00ff00_cc.toInt()) batch.fillRect( width - 3 - weightBarWidth, height - controlHelpHeight + 3f, diff --git a/src/net/torvald/terrarum/ui/UIItemTextButtonList.kt b/src/net/torvald/terrarum/ui/UIItemTextButtonList.kt index 1b7d64d37..504916386 100644 --- a/src/net/torvald/terrarum/ui/UIItemTextButtonList.kt +++ b/src/net/torvald/terrarum/ui/UIItemTextButtonList.kt @@ -35,7 +35,7 @@ class UIItemTextButtonList( val highlightCol: Color = Color(0x00f8ff_ff), val highlightBackCol: Color = Color(0xb0b0b0_ff.toInt()), val highlightBackBlendMode: String = BlendMode.MULTIPLY, - val inactiveCol: Color = Color(0xc0c0c0), + val inactiveCol: Color = Color(0xc0c0c0_ff.toInt()), val backgroundCol: Color = Color(0), val backgroundBlendMode: String = BlendMode.NORMAL, val kinematic: Boolean = false diff --git a/work_files/graphics/fonts/futhark.psd b/work_files/graphics/fonts/futhark.psd index 6114d5179..57fd7f54e 100644 --- a/work_files/graphics/fonts/futhark.psd +++ b/work_files/graphics/fonts/futhark.psd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b0a011d715abc24c22f11db49748180e875d59403d34a079dfb01607fd029033 -size 93879 +oid sha256:b1125b573a6262417e180910abac1fdafa6de1c3e88ef8ea8ea1b92fb6ee61b4 +size 93927