diff --git a/assets/mods/basegame/blocks/_emsv.tga b/assets/mods/basegame/blocks/217_emsv.tga similarity index 100% rename from assets/mods/basegame/blocks/_emsv.tga rename to assets/mods/basegame/blocks/217_emsv.tga diff --git a/assets/mods/basegame/sprites/fixtures/storage_chest.tga b/assets/mods/basegame/sprites/fixtures/storage_chest.tga new file mode 100644 index 000000000..e9810393f --- /dev/null +++ b/assets/mods/basegame/sprites/fixtures/storage_chest.tga @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6f1c919d29f75e86fe110417fd05aef62a51fcebfe57879df802ed7cb160aa61 +size 1314 diff --git a/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureStorageChest.kt b/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureStorageChest.kt index 95bfaf931..aee8f256d 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureStorageChest.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureStorageChest.kt @@ -5,6 +5,7 @@ import net.torvald.terrarum.TerrarumAppConfiguration.TILE_SIZE import net.torvald.terrarum.gameactors.AVKey import net.torvald.terrarum.langpack.Lang import net.torvald.terrarum.modulebasegame.gameactors.FixtureInventory.Companion.CAPACITY_MODE_COUNT +import net.torvald.terrarum.modulebasegame.gameitems.FixtureItemBase import net.torvald.terrarum.modulebasegame.ui.* import net.torvald.terrarumsansbitmap.gdx.TextureRegionPack @@ -24,9 +25,11 @@ internal class FixtureStorageChest : FixtureBase { (mainUI as UIStorageChest).chestInventory = this.inventory!! (mainUI as UIStorageChest).chestNameFun = this.nameFun - setHitboxDimension(TILE_SIZE, TILE_SIZE, 0, 1) + val itemImage = FixtureItemBase.getItemImageFromSingleImage("basegame", "sprites/fixtures/storage_chest.tga") - makeNewSprite(TextureRegionPack(CommonResourcePool.getAsTextureRegion("itemplaceholder_16").texture, 16, 16)).let { + setHitboxDimension(TILE_SIZE, TILE_SIZE, 1, 0) + + makeNewSprite(TextureRegionPack(itemImage.texture, 18, 18)).let { it.setRowsAndFrames(1,1) } diff --git a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemStorageChest.kt b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemStorageChest.kt index 1556a25b7..2d846cf57 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemStorageChest.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemStorageChest.kt @@ -17,7 +17,7 @@ class ItemStorageChest(originalID: ItemID) : FixtureItemBase(originalID, "net.to override val isDynamic = false override val materialId = "" override val itemImage: TextureRegion - get() = CommonResourcePool.getAsTextureRegion("itemplaceholder_48") + get() = getItemImageFromSingleImage("basegame", "sprites/fixtures/storage_chest.tga") override var baseToolSize: Double? = baseMass override var originalName = "ITEM_STORAGE_CHEST" diff --git a/work_files/graphics/sprites/fixtures/storage_chest.kra b/work_files/graphics/sprites/fixtures/storage_chest.kra new file mode 100644 index 000000000..d22e42718 --- /dev/null +++ b/work_files/graphics/sprites/fixtures/storage_chest.kra @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:417d832824d33f261b8fe703085e2e28db65d0f194da86bf0bbd57595ff05c14 +size 96462