diff --git a/assets/mods/basegame/crafting/masonry.json b/assets/mods/basegame/crafting/masonry.json new file mode 100644 index 000000000..57b2efca1 --- /dev/null +++ b/assets/mods/basegame/crafting/masonry.json @@ -0,0 +1,16 @@ +{ + /* stone brick */ + "basegame:19": { + "workbench": "masonry", + "ingredients": [ + [1, 1, "$ROCK"] + ] + }, + /* white stone tile */ + "basegame:18": { + "workbench": "masonry", + "ingredients": [ + [1, 1, "basegame:21"] + ] + } +} \ No newline at end of file diff --git a/assets/mods/basegame/crafting/wires.json b/assets/mods/basegame/crafting/wires.json index 678366a3d..7e49318fd 100644 --- a/assets/mods/basegame/crafting/wires.json +++ b/assets/mods/basegame/crafting/wires.json @@ -75,31 +75,31 @@ "item@basegame:44": { /* signal blocker */ "workbench": "basiccrafting", "ingredients": [ - [1, 2, "basegame:21", 1, "item@basegame:116", 1, "item@basegame:112"] /* 2 marbles, 1 tin, 1 copper */ + [1, 2, "$ROCK", 1, "item@basegame:116", 1, "item@basegame:112"] /* 2 rocks, 1 tin, 1 copper */ ] }, "item@basegame:45": { /* signal latch */ "workbench": "basiccrafting", "ingredients": [ - [1, 3, "basegame:21", 1, "item@basegame:116", 2, "item@basegame:112"] /* 3 marbles, 3 tin, 3 copper */ + [1, 3, "$ROCK", 1, "item@basegame:116", 2, "item@basegame:112"] /* 3 rocks, 3 tin, 3 copper */ ] }, "item@basegame:8": { /* signal emitter */ "workbench": "basiccrafting", "ingredients": [ - [2, 1, "basegame:21", 1, "item@basegame:116"] /* 1 marbles, 1 tin, 1 copper */ + [2, 1, "$ROCK", 1, "item@basegame:116"] /* 1 rocks, 1 tin, 1 copper */ ] }, "item@basegame:46": { /* signal repeater */ "workbench": "basiccrafting", "ingredients": [ - [1, 1, "basegame:21", 1, "item@basegame:116"] /* 1 marbles, 1 tin, 1 copper */ + [1, 1, "$ROCK", 1, "item@basegame:116"] /* 1 rocks, 1 tin, 1 copper */ ] }, "item@basegame:49": { /* signal adder */ "workbench": "basiccrafting", "ingredients": [ - [1, 1, "basegame:21", 1, "item@basegame:116"] /* 2 marbles, 2 tin, 2 copper */ + [1, 1, "$ROCK", 1, "item@basegame:116"] /* 2 rocks, 2 tin, 2 copper */ ] } } \ No newline at end of file diff --git a/assets/mods/basegame/items/items.tga b/assets/mods/basegame/items/items.tga index f18c93d0e..4f6d1bc86 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:a94421dd5e707addb20f037d7754df47424972ecf5cf0a8cabad7d5321dbbb6e +oid sha256:fba68e3ce167441e395d781d658f35ef4eb950f666972a55fb68d893288780b5 size 2408466 diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UIAlloyingFurnace.kt b/src/net/torvald/terrarum/modulebasegame/ui/UIAlloyingFurnace.kt index f9ede7838..ab1ff9ec6 100644 --- a/src/net/torvald/terrarum/modulebasegame/ui/UIAlloyingFurnace.kt +++ b/src/net/torvald/terrarum/modulebasegame/ui/UIAlloyingFurnace.kt @@ -66,22 +66,22 @@ class UIAlloyingFurnace(val smelter: FixtureAlloyingFurnace) : UICanvas( private val leftPanelY = playerThings.posY private val backdropColour = Color(0x999999_c8.toInt()) - private val backdropZoom = 9f + private val backdropZoom = 10f private val backdropX = (leftPanelX + (leftPanelWidth - smelterBackdrops.tileW * backdropZoom) / 2).toFloat() private val backdropY = (leftPanelY + (leftPanelHeight - smelterBackdrops.tileH * backdropZoom) / 2).toFloat() - private val oreX1 = backdropX + 3 * backdropZoom + 4 - private val oreX2 = backdropX + 9 * backdropZoom - 1 + private val oreX1 = backdropX + 3 * backdropZoom + 7 + private val oreX2 = backdropX + 9 * backdropZoom + 2 private val oreY1 = backdropY + 6 * backdropZoom + 3 private val oreY2 = backdropY + 6 * backdropZoom + 3 - private val fireboxX = backdropX + 6 * backdropZoom + 2 + private val fireboxX = backdropX + 6 * backdropZoom + 4 private val fireboxY = backdropY + 21 * backdropZoom - 2 private val productX = backdropX + 21 * backdropZoom + 1 private val productY = backdropY + 11 * backdropZoom - 3 - private val thermoX = (backdropX + 16 * backdropZoom + 3).toInt() + private val thermoX = (backdropX + 13 * backdropZoom + 3).toInt() private val thermoY = (backdropY + 21 * backdropZoom - 2).toInt() diff --git a/work_files/graphics/items/basegame_items.kra b/work_files/graphics/items/basegame_items.kra index 09e9bd012..0c30e81b0 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:11e9a14cb662a0c7ce97834775dc3bbf08562582d08f0b3cf87b5fd4827b22e0 -size 1668883 +oid sha256:a0e6bba296b229202ccf450de60556e80d4001c0c20e570120a2c2b42afafba8 +size 1668794 diff --git a/work_files/graphics/sprites/fixtures/sevenseg.kra b/work_files/graphics/sprites/fixtures/sevenseg.kra new file mode 100644 index 000000000..9eb7a0e48 --- /dev/null +++ b/work_files/graphics/sprites/fixtures/sevenseg.kra @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0818b9edf5657335383f45c57b13a58ba0e2211263c3805b8e1d17876cd80531 +size 312503