diff --git a/assets/mods/basegame/items/items.tga b/assets/mods/basegame/items/items.tga index cd09e1805..d61e0dedd 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:deae4cfa1393231a4d6eb92c38608ea67e36a1082ff1260d7a91318a47b63ce0 +oid sha256:2626d5c79a9e521b4493399cdaefb49b61acf5f8749b40011798608437160489 size 2408466 diff --git a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemSwingingDoorOak.kt b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemSwingingDoorOak.kt index ec13367d0..07c7324a0 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemSwingingDoorOak.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemSwingingDoorOak.kt @@ -21,7 +21,7 @@ class ItemSwingingDoorOak(originalID: ItemID) : override val isDynamic = false override val materialId = "" override val itemImage: TextureRegion - get() = CommonResourcePool.getAsTextureRegion("itemplaceholder_16") + get() = CommonResourcePool.getAsItemSheet("basegame.items").get(8,3) override var baseToolSize: Double? = baseMass init { @@ -46,7 +46,7 @@ class ItemSwingingDoorEbony(originalID: ItemID) : override val isDynamic = false override val materialId = "" override val itemImage: TextureRegion - get() = CommonResourcePool.getAsTextureRegion("itemplaceholder_16") + get() = CommonResourcePool.getAsItemSheet("basegame.items").get(9,3) override var baseToolSize: Double? = baseMass init { @@ -71,7 +71,7 @@ class ItemSwingingDoorBirch(originalID: ItemID) : override val isDynamic = false override val materialId = "" override val itemImage: TextureRegion - get() = CommonResourcePool.getAsTextureRegion("itemplaceholder_16") + get() = CommonResourcePool.getAsItemSheet("basegame.items").get(10,3) override var baseToolSize: Double? = baseMass init { @@ -96,7 +96,7 @@ class ItemSwingingDoorRosewood(originalID: ItemID) : override val isDynamic = false override val materialId = "" override val itemImage: TextureRegion - get() = CommonResourcePool.getAsTextureRegion("itemplaceholder_16") + get() = CommonResourcePool.getAsItemSheet("basegame.items").get(11,3) override var baseToolSize: Double? = baseMass init { diff --git a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemWorldPortal.kt b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemWorldPortal.kt index dc6d9d224..748df6219 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemWorldPortal.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemWorldPortal.kt @@ -1,6 +1,7 @@ package net.torvald.terrarum.modulebasegame.gameitems import com.badlogic.gdx.graphics.g2d.TextureRegion +import net.torvald.terrarum.CommonResourcePool import net.torvald.terrarum.gameitems.ItemID import net.torvald.terrarum.modulebasegame.gameactors.FixtureTikiTorch @@ -18,7 +19,7 @@ class ItemWorldPortal(originalID: ItemID) : FixtureItemBase(originalID, "net.tor override val isDynamic = false override val materialId = "" override val itemImage: TextureRegion - get() = getItemImageFromSheet("basegame", "sprites/fixtures/portal_device.tga", 80, 32) + get() = CommonResourcePool.getAsItemSheet("basegame.items").get(3,3) override var baseToolSize: Double? = baseMass diff --git a/src/net/torvald/terrarum/modulebasegame/gameitems/WireGraphDebugger.kt b/src/net/torvald/terrarum/modulebasegame/gameitems/WireGraphDebugger.kt index 3e371cb86..1d041dc0a 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameitems/WireGraphDebugger.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameitems/WireGraphDebugger.kt @@ -21,7 +21,7 @@ class WireGraphDebugger(originalID: ItemID) : GameItem(originalID) { override val materialId = "CUPR" override var baseMass = 2.0 override val itemImage: TextureRegion - get() = CommonResourcePool.getAsTextureRegion("itemplaceholder_24") + get() = CommonResourcePool.getAsItemSheet("basegame.items").get(2,3) init { super.equipPosition = GameItem.EquipPosition.HAND_GRIP diff --git a/src/net/torvald/terrarum/modulebasegame/ui/ItemSlotImageFactory.kt b/src/net/torvald/terrarum/modulebasegame/ui/ItemSlotImageFactory.kt index 4a3423067..bf19190f5 100644 --- a/src/net/torvald/terrarum/modulebasegame/ui/ItemSlotImageFactory.kt +++ b/src/net/torvald/terrarum/modulebasegame/ui/ItemSlotImageFactory.kt @@ -58,7 +58,7 @@ data class ItemSlotImage(val baseTex: TextureRegion, val itemTex: TextureRegion? batch.draw(baseTex, cx - (baseTex.regionWidth).div(2).toFloat(), cy - (baseTex.regionWidth).div(2).toFloat()) if (itemTex != null) - batch.draw(itemTex, cx - (itemTex.regionWidth).div(2).toFloat(), cy - (itemTex.regionWidth).div(2).toFloat()) + batch.draw(itemTex, cx - (itemTex.regionWidth).div(2).toFloat(), cy - (itemTex.regionHeight).div(2).toFloat()) } } \ No newline at end of file diff --git a/work_files/graphics/items/basegame_items.kra b/work_files/graphics/items/basegame_items.kra index 54e33ec67..017046864 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:bfb72dd1e0ac1ff1337a49f31dc09a59035208475935084b98a0e77b451d29ea -size 168739 +oid sha256:015e05e06f6bf250eb9186b22173dc4a63e5e936f58a7adb1e14c0abbb07154d +size 249960