From a1a6dc580153ef0ec026a65dd5eeff1cb32100e1 Mon Sep 17 00:00:00 2001 From: minjaesong Date: Thu, 21 Mar 2024 00:42:34 +0900 Subject: [PATCH] more sign stuffs --- assets/mods/basegame/items/items.tga | 2 +- .../modulebasegame/gameactors/FixtureTextSignCopper.kt | 1 + .../terrarum/modulebasegame/gameitems/ItemTextSignCopper.kt | 4 +++- work_files/graphics/items/basegame_items.kra | 4 ++-- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/assets/mods/basegame/items/items.tga b/assets/mods/basegame/items/items.tga index 1747810df..1b30a62f8 100644 --- a/assets/mods/basegame/items/items.tga +++ b/assets/mods/basegame/items/items.tga @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fd956077bd3073a050168f0bcbc587b193d4a069020250927d8227123b274ac9 +oid sha256:d10733651b188c717482ec84926ef5d248192c2130a23a82fbbdc8154abf8f05 size 2408466 diff --git a/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureTextSignCopper.kt b/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureTextSignCopper.kt index 995f349d8..36f859be3 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureTextSignCopper.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureTextSignCopper.kt @@ -189,6 +189,7 @@ class FixtureTextSignCopper : Electric { pixmapOverlayEmsv.dispose() pixmapOverlayUnlitEmsv.dispose() overlays.forEach { it.dispose() } + batch.dispose() } diff --git a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemTextSignCopper.kt b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemTextSignCopper.kt index 99298be89..ca81919f7 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemTextSignCopper.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemTextSignCopper.kt @@ -18,7 +18,9 @@ class ItemTextSignCopper(originalID: ItemID) : FixtureItemBase(originalID, "net. override val canBeDynamic = false override val materialId = "" override val itemImage: TextureRegion - get() = CommonResourcePool.getAsItemSheet("basegame.items").get(10, 3) + get() = CommonResourcePool.getAsItemSheet("basegame.items").get(14, 4) + override val itemImageEmissive: TextureRegion + get() = CommonResourcePool.getAsItemSheet("basegame.items").get(13, 4) override var baseToolSize: Double? = baseMass override var originalName = "ITEM_COPPER_SIGN" diff --git a/work_files/graphics/items/basegame_items.kra b/work_files/graphics/items/basegame_items.kra index fb1f0d97d..1ba9d5f44 100644 --- a/work_files/graphics/items/basegame_items.kra +++ b/work_files/graphics/items/basegame_items.kra @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:414759d9ececca660a1f8872ef70234c1eb945f86bc0b670c3d6c62b4aaee7c0 -size 1694477 +oid sha256:0d75d07253f4317ef3ed1218703c2aaa59e6a52fddad5696efc9f7f35821a596 +size 1716642