diff --git a/assets/mods/basegame/crafting/masonry.json b/assets/mods/basegame/crafting/masonry.json index b16a845e2..0cfe22fe7 100644 --- a/assets/mods/basegame/crafting/masonry.json +++ b/assets/mods/basegame/crafting/masonry.json @@ -13,5 +13,12 @@ [1, 1, "basegame:21"], [1, 3, "$BRICKROCK"] ] + }, + /* brocks */ + "basegame:22": { + "workbench": "", + "ingredients": [ + [1, 2, "item@basegame:56"] + ] } } \ No newline at end of file diff --git a/assets/mods/basegame/items/itemid.csv b/assets/mods/basegame/items/itemid.csv index d220933ef..0c745715e 100644 --- a/assets/mods/basegame/items/itemid.csv +++ b/assets/mods/basegame/items/itemid.csv @@ -23,7 +23,7 @@ id;classname;tags 22;net.torvald.terrarum.modulebasegame.gameitems.AxeWood;TOOL,AXE 23;net.torvald.terrarum.modulebasegame.gameitems.PickaxeStone;TOOL,PICK 24;net.torvald.terrarum.modulebasegame.gameitems.AxeStone;TOOL,AXE -25;net.torvald.terrarum.modulebasegame.gameitems.ItemClayBall; +25;net.torvald.terrarum.modulebasegame.gameitems.ItemClayBall;SMELTABLE 27;net.torvald.terrarum.modulebasegame.gameitems.ItemFurnaceAndAnvil;FIXTURE,CRAFTING 28;net.torvald.terrarum.modulebasegame.gameitems.ItemJukebox;FIXTURE,MUSIC @@ -54,6 +54,8 @@ id;classname;tags 53;net.torvald.terrarum.modulebasegame.gameitems.ItemEngravingWorkbench;FIXTURE,CRAFTING 54;net.torvald.terrarum.modulebasegame.gameitems.ItemMechanicalTines;FIXTURE,MUSIC,SIGNAL 55;net.torvald.terrarum.modulebasegame.gameitems.ItemGlowOrb;LIGHT,THROWABLE +56;net.torvald.terrarum.modulebasegame.gameitems.ItemClayBrick; + # ingots diff --git a/assets/mods/basegame/items/items.tga b/assets/mods/basegame/items/items.tga index 969533bcb..4333f83e5 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:a64dfaf2d988f39b8c0299b79d9de0872fc1b1529c8772df6f668d46145a6147 +oid sha256:5e87369cfd853331b04bb8f1c5e2a5e47c8bdce2659e42e0987a5fec4753c9dd size 4816914 diff --git a/assets/mods/basegame/locales/en/blocks.json b/assets/mods/basegame/locales/en/blocks.json index d2096c5c5..943cd9441 100644 --- a/assets/mods/basegame/locales/en/blocks.json +++ b/assets/mods/basegame/locales/en/blocks.json @@ -10,6 +10,7 @@ "BLOCK_STONE_BRICKS": "Stone Bricks", "BLOCK_STONE_DEEP": "Deepstone", "BLOCK_STONE_MARBLE": "Marble", + "BLOCK_BRICKS": "Bricks", /* always plural */ "BLOCK_DIRT": "Dirt", "BLOCK_GRASS": "Grass", diff --git a/assets/mods/basegame/locales/en/items.json b/assets/mods/basegame/locales/en/items.json index c9e9d7429..e0e97b062 100644 --- a/assets/mods/basegame/locales/en/items.json +++ b/assets/mods/basegame/locales/en/items.json @@ -1,5 +1,6 @@ { "ITEM_ALLOYING_FURNACE": "Alloying Furnace", + "ITEM_BRICK_SINGULAR": "Brick", /* always singular */ "ITEM_CALENDAR": "Calendar", "ITEM_CHARCOAL": "Charcoal", "ITEM_CHERRY_BOMB": "Bomb", diff --git a/assets/mods/basegame/locales/koKR/blocks.json b/assets/mods/basegame/locales/koKR/blocks.json index e349cba01..9d6899847 100644 --- a/assets/mods/basegame/locales/koKR/blocks.json +++ b/assets/mods/basegame/locales/koKR/blocks.json @@ -10,6 +10,7 @@ "BLOCK_STONE_BRICKS": "돌 벽돌", "BLOCK_STONE_DEEP": "심층석", "BLOCK_STONE_MARBLE": "대리석", + "BLOCK_BRICKS": "벽돌", /* always plural */ "BLOCK_DIRT": "흙", "BLOCK_GRASS": "잔디", diff --git a/assets/mods/basegame/locales/koKR/items.json b/assets/mods/basegame/locales/koKR/items.json index 9f6b9ec37..465db193e 100644 --- a/assets/mods/basegame/locales/koKR/items.json +++ b/assets/mods/basegame/locales/koKR/items.json @@ -1,5 +1,6 @@ { "ITEM_ALLOYING_FURNACE": "합금 화로", + "ITEM_BRICK_SINGULAR": "벽돌", /* always singular */ "ITEM_CALENDAR": "달력", "ITEM_CHARCOAL": "목탄", "ITEM_CHERRY_BOMB": "폭탄", diff --git a/assets/mods/basegame/smelting/single_item.json b/assets/mods/basegame/smelting/single_item.json index cb7363251..e54d0e1b8 100644 --- a/assets/mods/basegame/smelting/single_item.json +++ b/assets/mods/basegame/smelting/single_item.json @@ -44,5 +44,9 @@ "item@basegame:135": { /* lead ore -> ingot */ "difficulty": 1.0, "product": [1, "item@basegame:119"] + }, + "item@basegame:25": { /* clay ball -> a brick */ + "difficulty": 1.0, + "product": [1, "item@basegame:56"] } } \ No newline at end of file diff --git a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemMisc.kt b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemMisc.kt index 4ff312da5..1e47c1681 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameitems/ItemMisc.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameitems/ItemMisc.kt @@ -49,6 +49,16 @@ class ItemClayBall(originalID: ItemID) : LightIngredientBase(originalID) { } } +/** + * Created by minjaesong on 2024-09-13. + */ +class ItemClayBrick(originalID: ItemID) : LightIngredientBase(originalID) { + override var originalName = "ITEM_BRICK_SINGULAR" + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(7,2) + } +} + /** * Created by minjaesong on 2024-02-14. */ diff --git a/work_files/graphics/items/basegame_items.kra b/work_files/graphics/items/basegame_items.kra index 69b38c1b8..44352ea29 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:2b649fc9663479b0a048ef8db4ff34d2b79e0bace76c02c6868cafa6619c018a -size 2115406 +oid sha256:fa8468ca4a9171143c8ddef1c71611e6dc0e346b9780f4283110fe0233e8bbb8 +size 2137424