diff --git a/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureBase.kt b/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureBase.kt index c2ad8ddb2..5aee3cbcf 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureBase.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureBase.kt @@ -76,8 +76,9 @@ open class Electric : FixtureBase { // these are characteristic properties of the fixture (they have constant value) so must not be serialised @Transient val wireEmitterTypes: HashMap = HashMap() @Transient val wireSinkTypes: HashMap = HashMap() - @Transient val wireEmission: HashMap = HashMap() - @Transient val wireConsumption: HashMap = HashMap() + + val wireEmission: HashMap = HashMap() + val wireConsumption: HashMap = HashMap() // these are NOT constant so they ARE serialised. Type: Map Charge (Double> // Use case: signal buffer (sinkType=digital_bit), battery (sinkType=electricity), etc. diff --git a/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureLogicSignalEmitter.kt b/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureLogicSignalEmitter.kt index c16a915b5..c3b150e53 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureLogicSignalEmitter.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureLogicSignalEmitter.kt @@ -35,6 +35,10 @@ class FixtureLogicSignalEmitter : Electric { setWireEmissionAt(0, 0, Vector2(1.0, 0.0)) } + override fun updateSignal() { + setWireEmissionAt(0, 0, Vector2(1.0, 0.0)) + } + override fun dispose() { } companion object { diff --git a/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureMusicalTurntable.kt b/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureMusicalTurntable.kt index 857e0b9c2..941b961ee 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureMusicalTurntable.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureMusicalTurntable.kt @@ -28,7 +28,9 @@ class FixtureMusicalTurntable : Electric, PlaysMusic { constructor() : super( BlockBox(BlockBox.NO_COLLISION, 1, 1), nameFun = { Lang["ITEM_TURNTABLE"] } - ) + ) { + clickLatch.forceLatch() + } @Transient var musicNowPlaying: MusicContainer? = null; private set diff --git a/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureSignalSwitchManual.kt b/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureSignalSwitchManual.kt index 0bdcca266..b4a45b548 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureSignalSwitchManual.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureSignalSwitchManual.kt @@ -21,7 +21,9 @@ class FixtureSignalSwitchManual : Electric { constructor() : super( BlockBox(BlockBox.NO_COLLISION, 1, 1), nameFun = { Lang["ITEM_LOGIC_SIGNAL_SWITCH"] } - ) + ) { + clickLatch.forceLatch() + } private val variant = (Math.random() * 8).toInt() private var state = false // false = off