From 16cac2f1ab53b648dbf1958045f84e9b226bcb3e Mon Sep 17 00:00:00 2001
From: minjaesong <alswo9628@gmail.com>
Date: Tue, 4 Mar 2025 20:56:12 +0900
Subject: [PATCH] fixing minor bugs

---
 .../gameactors/FixtureRingBusCore.kt              | 15 +++++++++------
 .../gameactors/FixtureRingBusExerciser.kt         | 13 ++++++++-----
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/ModuleComputers/src/net/torvald/terrarum/modulecomputers/gameactors/FixtureRingBusCore.kt b/ModuleComputers/src/net/torvald/terrarum/modulecomputers/gameactors/FixtureRingBusCore.kt
index a69c26fb1..e77ca2bbc 100644
--- a/ModuleComputers/src/net/torvald/terrarum/modulecomputers/gameactors/FixtureRingBusCore.kt
+++ b/ModuleComputers/src/net/torvald/terrarum/modulecomputers/gameactors/FixtureRingBusCore.kt
@@ -31,10 +31,9 @@ open class FixtureRingBusCore : Electric {
     private var portEmit = Point2i(0, 0)
     private var portSink = Point2i(1, 0)
     
-    constructor(portEmit: Point2i, portSink: Point2i, blockBox: BlockBox, nameFun: () -> String, mainUI: UICanvas?) : super(
+    constructor(portEmit: Point2i, portSink: Point2i, blockBox: BlockBox, nameFun: () -> String) : super(
         blockBox0 = blockBox,
         nameFun = nameFun,
-        mainUI = mainUI
     ) {
         this.portEmit = portEmit
         this.portSink = portSink
@@ -74,7 +73,7 @@ open class FixtureRingBusCore : Electric {
         NORMAL,
         ABORT,
         ELECTING,
-        ELECTED_MONITOR
+        IVE_GOT_ELECTED
     }
 
     private var currentState = RingBusState.NORMAL
@@ -109,7 +108,7 @@ open class FixtureRingBusCore : Electric {
                 RingBusState.NORMAL -> handleNormalState(frame, frameNumber)
                 RingBusState.ABORT -> handleAbortState(frame, frameNumber)
                 RingBusState.ELECTING -> handleElectingState(frame, frameNumber)
-                RingBusState.ELECTED_MONITOR -> handleElectedMonitorState(frame, frameNumber)
+                RingBusState.IVE_GOT_ELECTED -> handleIveGotElectedState(frame, frameNumber)
             }
         } catch (e: NullPointerException) {
             handleFrameLoss()
@@ -147,7 +146,8 @@ open class FixtureRingBusCore : Electric {
             }
 
             if (frame.getSender() == mac && frame.getBallot() == mac) {
-                currentState = RingBusState.ELECTED_MONITOR
+                currentState = RingBusState.IVE_GOT_ELECTED
+                // elected Active Monitor sends out the first token
                 val newFrame = emitNewFrame(NetFrame.makeToken(mac))
                 setWireEmissionAt(portEmit.x, portEmit.y, Vector2(1.0, newFrame.toDouble()))
             } else {
@@ -158,12 +158,15 @@ open class FixtureRingBusCore : Electric {
         }
     }
 
-    private fun handleElectedMonitorState(frame: NetFrame, frameNumber: Int) {
+    private fun handleIveGotElectedState(frame: NetFrame, frameNumber: Int) {
         if (frame.getFrameType() == "abort") {
+            // immediately return to normal state
             val newFrame = emitNewFrame(NetFrame.makeToken(mac))
             currentState = RingBusState.NORMAL
             setWireEmissionAt(portEmit.x, portEmit.y, Vector2(1.0, newFrame.toDouble()))
         } else {
+            // make sure to skip a turn after the election, even if the NIC has something to send out
+            currentState = RingBusState.NORMAL
             setWireEmissionAt(portEmit.x, portEmit.y, Vector2())
         }
     }
diff --git a/ModuleComputers/src/net/torvald/terrarum/modulecomputers/gameactors/FixtureRingBusExerciser.kt b/ModuleComputers/src/net/torvald/terrarum/modulecomputers/gameactors/FixtureRingBusExerciser.kt
index 557288bc5..cbd659984 100644
--- a/ModuleComputers/src/net/torvald/terrarum/modulecomputers/gameactors/FixtureRingBusExerciser.kt
+++ b/ModuleComputers/src/net/torvald/terrarum/modulecomputers/gameactors/FixtureRingBusExerciser.kt
@@ -3,6 +3,7 @@ package net.torvald.terrarum.modulecomputers.gameactors
 import net.torvald.terrarum.Point2i
 import net.torvald.terrarum.langpack.Lang
 import net.torvald.terrarum.modulebasegame.gameactors.BlockBox
+import net.torvald.terrarum.modulecomputers.ui.UIRingBusAnalyser
 import net.torvald.terrarum.modulecomputers.ui.UIRingBusExerciser
 
 /**
@@ -14,9 +15,10 @@ class FixtureRingBusExerciser : FixtureRingBusCore {
         portEmit = Point2i(0, 0),
         portSink = Point2i(1, 0),
         blockBox = BlockBox(BlockBox.NO_COLLISION, 2, 2),
-        nameFun = { Lang["ITEM_DEBUG_RING_BUS_EXERCISER"] },
-        mainUI = UIRingBusExerciser(this)
-    )
+        nameFun = { Lang["ITEM_DEBUG_RING_BUS_EXERCISER"] }
+    ) {
+        this.mainUI = UIRingBusExerciser(this)
+    }
 
 
 }
@@ -33,8 +35,9 @@ class FixtureRingBusAnalyser : FixtureRingBusCore {
         portSink = Point2i(1, 0),
         blockBox = BlockBox(BlockBox.NO_COLLISION, 2, 1),
         nameFun = { Lang["ITEM_DEBUG_RING_BUS_Analyser"] },
-        mainUI = UIRingBusAnalyser()
-    )
+    ) {
+        this.mainUI = UIRingBusAnalyser(this)
+    }
 
 
 }