curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-06-12 19:44:05 +09:00
Code Issues Packages Projects Releases Wiki Activity

fix: placing a switch also flips it up as soon as it's been placed

Browse Source
This commit is contained in:
minjaesong
2024-03-05 05:50:20 +09:00
parent 5b5534bcb9
commit bb1a45db27
4 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/net/torvald/terrarum/modulebasegame/gameactors/FixtureBase.kt
View File

@@ -76,8 +76,9 @@ open class Electric : FixtureBase {
// these are characteristic properties of the fixture (they have constant value) so must not be serialised // these are characteristic properties of the fixture (they have constant value) so must not be serialised
@Transient val wireEmitterTypes: HashMap<BlockBoxIndex, WireEmissionType> = HashMap() @Transient val wireEmitterTypes: HashMap<BlockBoxIndex, WireEmissionType> = HashMap()
@Transient val wireSinkTypes: HashMap<BlockBoxIndex, WireEmissionType> = HashMap() @Transient val wireSinkTypes: HashMap<BlockBoxIndex, WireEmissionType> = HashMap()
@Transient val wireEmission: HashMap<BlockBoxIndex, Vector2> = HashMap()
@Transient val wireConsumption: HashMap<BlockBoxIndex, Vector2> = HashMap() val wireEmission: HashMap<BlockBoxIndex, Vector2> = HashMap()
val wireConsumption: HashMap<BlockBoxIndex, Vector2> = HashMap()
// these are NOT constant so they ARE serialised. Type: Map<SinkType (String) -> Charge (Double> // these are NOT constant so they ARE serialised. Type: Map<SinkType (String) -> Charge (Double>
// Use case: signal buffer (sinkType=digital_bit), battery (sinkType=electricity), etc. // Use case: signal buffer (sinkType=digital_bit), battery (sinkType=electricity), etc.

4
src/net/torvald/terrarum/modulebasegame/gameactors/FixtureLogicSignalEmitter.kt
View File

@@ -35,6 +35,10 @@ class FixtureLogicSignalEmitter : Electric {
setWireEmissionAt(0, 0, Vector2(1.0, 0.0)) setWireEmissionAt(0, 0, Vector2(1.0, 0.0))
} }
override fun updateSignal() {
setWireEmissionAt(0, 0, Vector2(1.0, 0.0))
}
override fun dispose() { } override fun dispose() { }
companion object { companion object {

4
src/net/torvald/terrarum/modulebasegame/gameactors/FixtureMusicalTurntable.kt
View File

@@ -28,7 +28,9 @@ class FixtureMusicalTurntable : Electric, PlaysMusic {
constructor() : super( constructor() : super(
BlockBox(BlockBox.NO_COLLISION, 1, 1), BlockBox(BlockBox.NO_COLLISION, 1, 1),
nameFun = { Lang["ITEM_TURNTABLE"] } nameFun = { Lang["ITEM_TURNTABLE"] }
) ) {
clickLatch.forceLatch()
}
@Transient var musicNowPlaying: MusicContainer? = null; private set @Transient var musicNowPlaying: MusicContainer? = null; private set

4
src/net/torvald/terrarum/modulebasegame/gameactors/FixtureSignalSwitchManual.kt
View File

@@ -21,7 +21,9 @@ class FixtureSignalSwitchManual : Electric {
constructor() : super( constructor() : super(
BlockBox(BlockBox.NO_COLLISION, 1, 1), BlockBox(BlockBox.NO_COLLISION, 1, 1),
nameFun = { Lang["ITEM_LOGIC_SIGNAL_SWITCH"] } nameFun = { Lang["ITEM_LOGIC_SIGNAL_SWITCH"] }
) ) {
clickLatch.forceLatch()
}
private val variant = (Math.random() * 8).toInt() private val variant = (Math.random() * 8).toInt()
private var state = false // false = off private var state = false // false = off