From 67092d4ab948f8a033150088a2a13088e5305639 Mon Sep 17 00:00:00 2001 From: minjaesong Date: Sat, 23 Mar 2024 23:47:20 +0900 Subject: [PATCH] alloy yield doubled; turntable now requires brass for crafting --- assets/mods/basegame/crafting/fixtures.json | 2 +- assets/mods/basegame/items/items.tga | 2 +- assets/mods/basegame/smelting/alloys.json | 12 ++++++------ assets/mods/basegame/sprites/fixtures/turntable.tga | 2 +- .../gameactors/FixtureAlloyingFurnace.kt | 3 ++- .../gameactors/FixtureMusicalTurntable.kt | 2 ++ work_files/graphics/items/basegame_items.kra | 4 ++-- work_files/graphics/sprites/fixtures/turntable.kra | 4 ++-- 8 files changed, 17 insertions(+), 14 deletions(-) diff --git a/assets/mods/basegame/crafting/fixtures.json b/assets/mods/basegame/crafting/fixtures.json index 4ef7e846c..2e52f4eab 100644 --- a/assets/mods/basegame/crafting/fixtures.json +++ b/assets/mods/basegame/crafting/fixtures.json @@ -109,7 +109,7 @@ "item@basegame:30": { /* turntable */ "workbench": "basiccrafting", "ingredients": [ - [1, 4, "item@basegame:144", 14, "$WOOD", 10, "item@basegame:113"] /* 1 turntable = 4 quartz, 14 wood, 10 iron */ + [1, 4, "item@basegame:144", 14, "$WOOD", 10, "item@basegame:177"] /* 1 turntable = 4 quartz, 14 wood, 10 brass */ ] }, diff --git a/assets/mods/basegame/items/items.tga b/assets/mods/basegame/items/items.tga index 719acb81e..e38233a05 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:c7e3f29270dc3084ff7c01cbbb6d0bef1e5fc1b3ffce534e3df6077f9b54556e +oid sha256:a1922a5416cc4c66223e272ffcc86251a1f903e3ce0d9190877878b62675ab11 size 2408466 diff --git a/assets/mods/basegame/smelting/alloys.json b/assets/mods/basegame/smelting/alloys.json index 7113b439d..8ebe4b155 100644 --- a/assets/mods/basegame/smelting/alloys.json +++ b/assets/mods/basegame/smelting/alloys.json @@ -2,26 +2,26 @@ /* as for the plus operator, the itemIDs must be sorted lexicographically and first word should come left */ "item@basegame:112+item@basegame:116": { /* copper + tin -> bronze */ "difficulty": 1.0, - "product": [1, "item@basegame:176"] + "product": [2, "item@basegame:176"] }, "item@basegame:112+item@basegame:115": { /* copper + zinc -> brass */ "difficulty": 1.0, - "product": [1, "item@basegame:177"] + "product": [2, "item@basegame:177"] }, "item@basegame:117+item@basegame:118": { /* gold + silver -> electrum */ "difficulty": 1.0, - "product": [1, "item@basegame:178"] + "product": [2, "item@basegame:178"] }, "item@basegame:112+item@basegame:118": { /* copper + silver -> silver billon */ "difficulty": 1.0, - "product": [1, "item@basegame:179"] + "product": [2, "item@basegame:179"] }, "item@basegame:112+item@basegame:117": { /* copper + gold -> rose gold */ "difficulty": 1.0, - "product": [1, "item@basegame:180"] + "product": [2, "item@basegame:180"] }, "item@basegame:116+item@basegame:119": { /* tin + lead -> solder */ "difficulty": 1.0, - "product": [1, "item@basegame:181"] + "product": [2, "item@basegame:181"] } } \ No newline at end of file diff --git a/assets/mods/basegame/sprites/fixtures/turntable.tga b/assets/mods/basegame/sprites/fixtures/turntable.tga index 0af3dd59d..7919ccf34 100644 --- a/assets/mods/basegame/sprites/fixtures/turntable.tga +++ b/assets/mods/basegame/sprites/fixtures/turntable.tga @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aebafc17465d04c77fbb9b90c929a14f5fbd429a86918a7c184821fffe7f454c +oid sha256:e7a2194305ea6eb7ff7d2931493e9cc4944b7b4d00318ea92f7909dfcb4329f1 size 4114 diff --git a/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureAlloyingFurnace.kt b/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureAlloyingFurnace.kt index fcbb65ba0..f5ef43f9e 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureAlloyingFurnace.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureAlloyingFurnace.kt @@ -319,13 +319,14 @@ class FixtureAlloyingFurnace : FixtureBase { progress += temperature if (progress >= FixtureSmelterBasic.CALORIES_PER_ROASTING) { + val moq = smeltingProduct.moq val smeltingProduct = smeltingProduct.item // check if the item even exists if (ItemCodex[smeltingProduct] == null) throw NullPointerException("No item prop for $smeltingProduct") if (productItem == null) - productItem = InventoryPair(smeltingProduct, 1L) + productItem = InventoryPair(smeltingProduct, moq) else productItemStatus.changeCount(1) diff --git a/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureMusicalTurntable.kt b/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureMusicalTurntable.kt index dcbb872c0..05f3a36ce 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureMusicalTurntable.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureMusicalTurntable.kt @@ -166,6 +166,8 @@ class FixtureMusicalTurntable : Electric, PlaysMusic { super.reload() // cannot resume playback, just stop the music musicNowPlaying = null + // update sprite + (sprite as SheetSpriteAnimation).currentRow = (disc == null).toInt() } override fun dispose() { diff --git a/work_files/graphics/items/basegame_items.kra b/work_files/graphics/items/basegame_items.kra index a191905b5..66f9f1fb7 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:3c8be6de34bfdc16c07b5caab43a5872c95d3ef5636752f6c15c3fc20d4184a4 -size 1715464 +oid sha256:18ac47774f92c4d3a7cbc1ace0d627d884ab7a8c1111966112862cddc24688f2 +size 1725583 diff --git a/work_files/graphics/sprites/fixtures/turntable.kra b/work_files/graphics/sprites/fixtures/turntable.kra index 15cc7d943..d13ba8aeb 100644 --- a/work_files/graphics/sprites/fixtures/turntable.kra +++ b/work_files/graphics/sprites/fixtures/turntable.kra @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3689db97bbf51750c3a685374b79a9c2b1951d141b009162e6de4886928a41d3 -size 130339 +oid sha256:659e405872af1e581dcb1b367f7f09502456d6185c9864c4721f49efdd0a2936 +size 177471