From 01b5569169e569119ddda3a006298845e6e89b6a Mon Sep 17 00:00:00 2001 From: minjaesong Date: Sat, 2 Mar 2024 01:11:02 +0900 Subject: [PATCH] bulb now requires walls to spawn --- assets/mods/basegame/crafting/wires.json | 21 ++++++++++++++++--- .../gameactors/FixtureSignalBulb.kt | 1 + 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/assets/mods/basegame/crafting/wires.json b/assets/mods/basegame/crafting/wires.json index 27278c9f4..35db45218 100644 --- a/assets/mods/basegame/crafting/wires.json +++ b/assets/mods/basegame/crafting/wires.json @@ -2,24 +2,39 @@ "wire@basegame:8192": { /* signal wire red */ "workbench": "", "ingredients": [ - [10, 1, "item@basegame:112"], /* 1 copper */ [1, 1, "$SIGNALWIRE"] /* 1 other signal wire */ ] }, "wire@basegame:8193": { /* signal wire green */ "workbench": "", "ingredients": [ - [10, 1, "item@basegame:112"], /* 1 copper */ [1, 1, "$SIGNALWIRE"] /* 1 other signal wire */ ] }, "wire@basegame:8194": { /* signal wire blue */ "workbench": "", "ingredients": [ - [10, 1, "item@basegame:112"], /* 1 copper */ [1, 1, "$SIGNALWIRE"] /* 1 other signal wire */ ] }, + "wire@basegame:8192": { /* signal wire red */ + "workbench": "wirerollingmill", + "ingredients": [ + [10, 1, "item@basegame:112"] /* 1 copper */ + ] + }, + "wire@basegame:8193": { /* signal wire green */ + "workbench": "wirerollingmill", + "ingredients": [ + [10, 1, "item@basegame:112"] /* 1 copper */ + ] }, + "wire@basegame:8194": { /* signal wire blue */ + "workbench": "wirerollingmill", + "ingredients": [ + [10, 1, "item@basegame:112"] /* 1 copper */ + ] + }, + "item@basegame:35": { /* copper bulb */ "workbench": "basiccrafting", "ingredients": [ diff --git a/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureSignalBulb.kt b/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureSignalBulb.kt index f2431c2a0..12d2d687f 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureSignalBulb.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureSignalBulb.kt @@ -14,6 +14,7 @@ import net.torvald.terrarumsansbitmap.gdx.TextureRegionPack class FixtureSignalBulb : Electric { @Transient override val spawnNeedsFloor = false + @Transient override val spawnNeedsWall = true constructor() : super( BlockBox(BlockBox.NO_COLLISION, 1, 1),