signal adder

assets/mods/basegame/crafting/wires.json

@@ -50,19 +50,25 @@
   "item@basegame:45": { /* signal latch */
     "workbench": "basiccrafting",
     "ingredients": [
-      [1, 3, "basegame:21", 1, "item@basegame:116", 2, "item@basegame:112"] /* 3 marbles, 1 tin, 2 copper */
+      [1, 3, "basegame:21", 1, "item@basegame:116", 2, "item@basegame:112"] /* 3 marbles, 3 tin, 3 copper */
     ]
   },
   "item@basegame:8": { /* signal emitter */
     "workbench": "basiccrafting",
     "ingredients": [
-      [2, 1, "basegame:21", 1, "item@basegame:116"] /* 1 marbles, 1 tin, 2 copper */
+      [2, 1, "basegame:21", 1, "item@basegame:116"] /* 1 marbles, 1 tin, 1 copper */
     ]
   },
   "item@basegame:46": { /* signal repeater */
     "workbench": "basiccrafting",
     "ingredients": [
-      [1, 1, "basegame:21", 1, "item@basegame:116"] /* 1 marbles, 1 tin, 2 copper */
+      [1, 1, "basegame:21", 1, "item@basegame:116"] /* 1 marbles, 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 */
     ]
   }
 }

assets/mods/basegame/items/itemid.csv

@@ -47,6 +47,7 @@ id;classname;tags
 46;net.torvald.terrarum.modulebasegame.gameitems.ItemLogicSignalRepeaterHorz;FIXTURE,SIGNAL
 47;net.torvald.terrarum.modulebasegame.gameitems.ItemWrench;TOOL,WRENCH
 48;net.torvald.terrarum.modulebasegame.gameitems.ItemAlloyingFurnace;FIXTURE,STATION
+49;net.torvald.terrarum.modulebasegame.gameitems.ItemLogicSignalAdder;FIXTURE,SIGNAL
 
 # ingots
 112;net.torvald.terrarum.modulebasegame.gameitems.IngotCopper;INGOT

assets/mods/basegame/locales/en/itemdesc.json

@@ -55,5 +55,6 @@
   "TOOLTIP_item@basegame:35": "Shows a signal status",
   "TOOLTIP_item@basegame:44": "Cuts the signal using the cutting signal",
   "TOOLTIP_item@basegame:45": "Latches onto the signal on the latch signal",
-  "TOOLTIP_item@basegame:46": "Delays a signal by a short amount"
+  "TOOLTIP_item@basegame:46": "Delays a signal by a short amount",
+  "TOOLTIP_item@basegame:49": "Logically adds two signals"
 }

assets/mods/basegame/locales/en/items.json

@@ -38,6 +38,7 @@
   "ITEM_INGOT_TIN": "Tin Ingot",
   "ITEM_INGOT_ZINC": "Zinc Ingot",
   "ITEM_JUKEBOX": "Jukebox",
+  "ITEM_LOGIC_SIGNAL_ADDER": "Logic Signal Adder",
   "ITEM_LOGIC_SIGNAL_BLOCKER": "Logic Signal Blocker",
   "ITEM_LOGIC_SIGNAL_EMITTER": "Logic Signal Emitter",
   "ITEM_LOGIC_SIGNAL_LATCH": "Logic Signal Latch",

assets/mods/basegame/locales/koKR/itemdesc.json

@@ -53,5 +53,6 @@
   "TOOLTIP_item@basegame:35": "신호의 상태를 보여줍니다",
   "TOOLTIP_item@basegame:44": "지나가는 신호를 자르기 신호에 따라 자릅니다",
   "TOOLTIP_item@basegame:45": "들어오는 신호를 걸쇠 신호에 따라 잠시 저장합니다",
-  "TOOLTIP_item@basegame:46": "들어오는 신호를 살짝 지연시킵니다"
+  "TOOLTIP_item@basegame:46": "들어오는 신호를 살짝 지연시킵니다",
+  "TOOLTIP_item@basegame:49": "들어오는 신호의 합을 구합니다"
 }

assets/mods/basegame/locales/koKR/items.json

@@ -38,6 +38,7 @@
   "ITEM_INGOT_TIN": "주석괴",
   "ITEM_INGOT_ZINC": "아연괴",
   "ITEM_JUKEBOX": "주크박스",
+  "ITEM_LOGIC_SIGNAL_ADDER": "신호 가산기",
   "ITEM_LOGIC_SIGNAL_BLOCKER": "신호 차단기",
   "ITEM_LOGIC_SIGNAL_EMITTER": "신호발생기",
   "ITEM_LOGIC_SIGNAL_LATCH": "신호 걸쇠",