diff --git a/assets/graphics/gui/quickbar/item_slots_atlas2.tga b/assets/graphics/gui/quickbar/item_slots_atlas2.tga index 7e2ce43ed..cc90e57dc 100644 --- a/assets/graphics/gui/quickbar/item_slots_atlas2.tga +++ b/assets/graphics/gui/quickbar/item_slots_atlas2.tga @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c531fd2d33574627126c160036b6c4e88cc330823b8067ee8ffd2743601a0c2c +oid sha256:ea29b15866918c4e60562806c615470a65bede3e040596657843dc03cc72f518 size 561810 diff --git a/src/net/torvald/terrarum/modulebasegame/ui/ItemSlotImageFactory.kt b/src/net/torvald/terrarum/modulebasegame/ui/ItemSlotImageFactory.kt index c5f57d69e..3db6aed96 100644 --- a/src/net/torvald/terrarum/modulebasegame/ui/ItemSlotImageFactory.kt +++ b/src/net/torvald/terrarum/modulebasegame/ui/ItemSlotImageFactory.kt @@ -55,9 +55,9 @@ data class ItemSlotImage(val baseTex: TextureRegion, val itemTex: TextureRegion? fun draw(batch: SpriteBatch, cx: Int, cy: Int) { // just draws two image on the centre - batch.draw(baseTex, cx - (baseTex.regionWidth).div(2).toFloat(), cy - (baseTex.regionHeight).div(2).toFloat()) + 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.regionHeight).div(2).toFloat()) + batch.draw(itemTex, cx - (itemTex.regionWidth).div(2).toFloat(), cy - (itemTex.regionWidth).div(2).toFloat()) } } \ No newline at end of file diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UIQuickslotBar.kt b/src/net/torvald/terrarum/modulebasegame/ui/UIQuickslotBar.kt index bc6b56426..2a59c7df8 100644 --- a/src/net/torvald/terrarum/modulebasegame/ui/UIQuickslotBar.kt +++ b/src/net/torvald/terrarum/modulebasegame/ui/UIQuickslotBar.kt @@ -106,20 +106,20 @@ class UIQuickslotBar : UICanvas() { val percentage = item.durability / item.maxDurability val barCol = UIItemInventoryCellCommonRes.getHealthMeterColour(percentage, 0f, 1f) val barBack = barCol mul UIItemInventoryCellCommonRes.meterBackDarkening - val durabilityIndex = percentage.times(36).roundToInt() + val durabilityIndex = percentage.times(38).roundToInt() // draw bar background batch.color = barBack - batch.draw(ItemSlotImageFactory.slotImage.get(6,7), slotX - 19f, slotY - 21f) + batch.draw(ItemSlotImageFactory.slotImage.get(8,7), slotX - 19f, slotY - 19f) // draw bar foreground batch.color = barCol - batch.draw(ItemSlotImageFactory.slotImage.get(durabilityIndex % 10,4 + durabilityIndex / 10), slotX - 19f, slotY - 21f) + batch.draw(ItemSlotImageFactory.slotImage.get(durabilityIndex % 10,4 + durabilityIndex / 10), slotX - 19f, slotY - 19f) } else if (item.stackable) { val amountString = qs!!.qty.toItemCountText() batch.color = Color(0xfff066_ff.toInt()) val textLen = amountString.length * App.fontSmallNumbers.W - val y = slotY + 23 - App.fontSmallNumbers.H + val y = slotY + 25 - App.fontSmallNumbers.H val x = slotX - 19 + (38 - textLen) / 2 App.fontSmallNumbers.draw(batch, amountString, x.toFloat(), y.toFloat()) } diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UIQuickslotPie.kt b/src/net/torvald/terrarum/modulebasegame/ui/UIQuickslotPie.kt index e3c8d2c6b..ba3af4ede 100644 --- a/src/net/torvald/terrarum/modulebasegame/ui/UIQuickslotPie.kt +++ b/src/net/torvald/terrarum/modulebasegame/ui/UIQuickslotPie.kt @@ -90,20 +90,20 @@ class UIQuickslotPie : UICanvas() { val percentage = item.durability / item.maxDurability val barCol = UIItemInventoryCellCommonRes.getHealthMeterColour(percentage, 0f, 1f) val barBack = barCol mul UIItemInventoryCellCommonRes.meterBackDarkening - val durabilityIndex = percentage.times(36).roundToInt() + val durabilityIndex = percentage.times(38).roundToInt() // draw bar background batch.color = barBack - batch.draw(ItemSlotImageFactory.slotImage.get(6,7), slotX - 19f, slotY - 21f) + batch.draw(ItemSlotImageFactory.slotImage.get(8,7), slotX - 19f, slotY - 19f) // draw bar foreground batch.color = barCol - batch.draw(ItemSlotImageFactory.slotImage.get(durabilityIndex % 10,4 + durabilityIndex / 10), slotX - 19f, slotY - 21f) + batch.draw(ItemSlotImageFactory.slotImage.get(durabilityIndex % 10,4 + durabilityIndex / 10), slotX - 19f, slotY - 19f) } else if (item.stackable) { val amountString = qs!!.qty.toItemCountText() batch.color = Color(0xfff066_ff.toInt()) val textLen = amountString.length * App.fontSmallNumbers.W - val y = slotY + 23 - App.fontSmallNumbers.H + val y = slotY + 25 - App.fontSmallNumbers.H val x = slotX - 19 + (38 - textLen) / 2 App.fontSmallNumbers.draw(batch, amountString, x.toFloat(), y.toFloat()) }