sign engraver wip

2026-03-07 12:21:52 +09:00 · 2024-03-22 18:34:34 +09:00
parent 8e8c206e3a
commit 7690d3d672
13 changed files with 262 additions and 6 deletions
--- a/assets/mods/basegame/blocks/blocks.csv
+++ b/assets/mods/basegame/blocks/blocks.csv
@@ -3,11 +3,11 @@
 "1";"N/A";"N/A";"BLOCK_UPDATE";"0.0312";"0.0312";"0.0312";"0.0312";"1";"1";"AIIR";"0";"1";"N/A";"0";"0";"4";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.0";"INTERNAL,NORANDTILE"

 # rocks
-"16";"17";"17";"BLOCK_STONE";"0.1252";"0.1252";"0.1252";"0.1252";"48";"2400";"ROCK";"1";"1";"N/A";"0";"4";"16";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.0";"ROCK,NATURAL,OREBEARING,SHALLOWROCK"
-"17";"17";"17";"BLOCK_STONE_QUARRIED";"0.1252";"0.1252";"0.1252";"0.1252";"48";"2400";"ROCK";"1";"1";"N/A";"0";"4";"16";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.0";"ROCK,NATURAL,OREBEARING,SHALLOWROCK"
+"16";"17";"17";"BLOCK_STONE";"0.1252";"0.1252";"0.1252";"0.1252";"48";"2400";"ROCK";"1";"1";"N/A";"0";"4";"16";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.0";"ROCK,NATURAL,OREBEARING,SHALLOWROCK,BRICKROCK"
+"17";"17";"17";"BLOCK_STONE_QUARRIED";"0.1252";"0.1252";"0.1252";"0.1252";"48";"2400";"ROCK";"1";"1";"N/A";"0";"4";"16";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.0";"ROCK,NATURAL,OREBEARING,SHALLOWROCK,BRICKROCK"
 "18";"18";"18";"BLOCK_STONE_TILE_WHITE";"0.1252";"0.1252";"0.1252";"0.1252";"48";"2400";"ROCK";"1";"1";"N/A";"0";"4";"16";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.18";"STONE,NORANDTILE"
 "19";"19";"19";"BLOCK_STONE_BRICKS";"0.1252";"0.1252";"0.1252";"0.1252";"48";"2400";"ROCK";"1";"1";"N/A";"0";"4";"16";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.0";"STONE,NORANDTILE"
-"20";"20";"20";"BLOCK_STONE_DEEP";"0.1252";"0.1252";"0.1252";"0.1252";"80";"2400";"ROCK";"1";"1";"N/A";"0";"4";"16";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.0";"ROCK,NATURA,OREBEARING,DEEPROCK"
+"20";"20";"20";"BLOCK_STONE_DEEP";"0.1252";"0.1252";"0.1252";"0.1252";"80";"2400";"ROCK";"1";"1";"N/A";"0";"4";"16";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.0";"ROCK,NATURA,OREBEARING,DEEPROCK,BRICKROCK"
 "21";"21";"21";"BLOCK_STONE_MARBLE";"0.1252";"0.1252";"0.1252";"0.1252";"48";"2400";"ROCK";"1";"1";"N/A";"0";"4";"16";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.1";"ROCK,NATURAL,DEEPROCK"

 # dirts
--- a/assets/mods/basegame/crafting/masonry.json
+++ b/assets/mods/basegame/crafting/masonry.json
@@ -3,14 +3,15 @@
  "basegame:19": {
    "workbench": "masonry",
    "ingredients": [
-      [1, 1, "$ROCK"]
+      [1, 1, "$BRICKROCK"]
    ]
  },
  /* white stone tile */
  "basegame:18": {
    "workbench": "masonry",
    "ingredients": [
-      [1, 1, "basegame:21"]
+      [1, 1, "basegame:21"],
+      [1, 3, "$BRICKROCK"]
    ]
  }
 }
--- a/assets/mods/basegame/items/itemid.csv
+++ b/assets/mods/basegame/items/itemid.csv
@@ -51,6 +51,7 @@ id;classname;tags
 50;net.torvald.terrarum.modulebasegame.gameitems.ItemSolderingWire;
 51;net.torvald.terrarum.modulebasegame.gameitems.ItemElectricWorkbench;FIXTURE,CRAFTING
 52;net.torvald.terrarum.modulebasegame.gameitems.ItemLogicSignalSevenSeg;FIXTURE,SIGNAL
+53;net.torvald.terrarum.modulebasegame.gameitems.ItemEngravingWorkbench;FIXTURE,CRAFTING

 # ingots
 112;net.torvald.terrarum.modulebasegame.gameitems.IngotCopper;INGOT
--- a/assets/mods/basegame/locales/en/game.json
+++ b/assets/mods/basegame/locales/en/game.json
@@ -1,4 +1,5 @@
 {
+  "CONTEXT_ENGRAVER_TEXT": "Text",
  "CONTEXT_GENERATOR_SEED": "Seed",
  "CONTEXT_ITEM_FIXTURES": "Fixtures",
  "CONTEXT_ITEM_MAP": "Map",
--- a/assets/mods/basegame/locales/en/items.json
+++ b/assets/mods/basegame/locales/en/items.json
@@ -5,11 +5,13 @@
  "ITEM_CHERRY_BOMB": "Bomb",
  "ITEM_COAL_COKE": "Coal Coke",
  "ITEM_COPPER_BULB": "Copper Bulb",
+  "ITEM_COPPER_SIGN": "Copper Sign",
  "ITEM_DOOR_OAK": "Oak Door",
  "ITEM_DOOR_EBONY": "Ebony Door",
  "ITEM_DOOR_BIRCH": "Birch Door",
  "ITEM_DOOR_ROSEWOOD": "Rosewood Door",
  "ITEM_ELECTRIC_WORKBENCH": "Electric Workbench",
+  "ITEM_ENGRAVING_WORKBENCH": "Engraving Workbench",
  "ITEM_FURNACE_AND_ANVIL": "Furnace and Anvil",
  "ITEM_GEM_RUBY": "Raw Ruby",
  "ITEM_GEM_EMERALD": "Raw Emerald",
--- a/assets/mods/basegame/locales/koKR/game.json
+++ b/assets/mods/basegame/locales/koKR/game.json
@@ -1,4 +1,5 @@
 {
+  "CONTEXT_ENGRAVER_TEXT": "문구",
  "CONTEXT_GENERATOR_SEED": "시드",
  "CONTEXT_ITEM_FIXTURES": "기구",
  "CONTEXT_ITEM_MAP": "지도",
--- a/assets/mods/basegame/locales/koKR/items.json
+++ b/assets/mods/basegame/locales/koKR/items.json
@@ -5,11 +5,13 @@
  "ITEM_CHERRY_BOMB": "폭탄",
  "ITEM_COAL_COKE": "코크스",
  "ITEM_COPPER_BULB": "구리 전구",
+  "ITEM_COPPER_SIGN": "구리 간판",
  "ITEM_DOOR_OAK": "나무 문",
  "ITEM_DOOR_EBONY": "흑단 문",
  "ITEM_DOOR_BIRCH": "백단 문",
  "ITEM_DOOR_ROSEWOOD": "자단 문",
  "ITEM_ELECTRIC_WORKBENCH": "전기 작업대",
+  "ITEM_ENGRAVING_WORKBENCH": "조각 작업대",
  "ITEM_FURNACE_AND_ANVIL": "화로와 모루",
  "ITEM_GEM_RUBY": "홍옥석",
  "ITEM_GEM_EMERALD": "취옥석",