解决二极管输出错误的bug

XiaofengdiZhu · Dec 29, 2023 · ee97c96 · ee97c96
1 parent e2a07bf
commit ee97c96
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/Gigavolt/BaseBlock/RotateableElectricGVElement.cs b/Gigavolt/BaseBlock/RotateableElectricGVElement.cs
@@ -24,6 +24,7 @@ public int Rotation {
         }
 
         public RotateableGVElectricElement(SubsystemGVElectricity subsystemGVElectric, CellFace cellFace) : base(subsystemGVElectric, cellFace) { }
+        public RotateableGVElectricElement(SubsystemGVElectricity subsystemGVElectric, GVCellFace cellFace) : base(subsystemGVElectric, cellFace) { }
 
         public override bool OnInteract(TerrainRaycastResult raycastResult, ComponentMiner componentMiner) {
             ++Rotation;

diff --git a/Gigavolt/Block/Gate/AdjustableDelayGateGVElectricElement.cs b/Gigavolt/Block/Gate/AdjustableDelayGateGVElectricElement.cs
@@ -4,7 +4,7 @@ public class AdjustableDelayGateGVElectricElement : BaseDelayGateGVElectricEleme
 
         public override int DelaySteps => m_delaySteps;
 
-        public AdjustableDelayGateGVElectricElement(SubsystemGVElectricity subsystemGVElectricity, CellFace cellFace) : base(subsystemGVElectricity, cellFace) {
+        public AdjustableDelayGateGVElectricElement(SubsystemGVElectricity subsystemGVElectricity, GVCellFace cellFace) : base(subsystemGVElectricity, cellFace) {
             int data = Terrain.ExtractData(subsystemGVElectricity.SubsystemTerrain.Terrain.GetCellValue(cellFace.X, cellFace.Y, cellFace.Z));
             m_delaySteps = GVAdjustableDelayGateBlock.GetDelay(data);
         }

diff --git a/Gigavolt/Block/Gate/BaseDelayGateGVElectricElement.cs b/Gigavolt/Block/Gate/BaseDelayGateGVElectricElement.cs
@@ -6,11 +6,12 @@ public abstract class BaseDelayGateGVElectricElement : RotateableGVElectricEleme
 
         public uint m_lastStoredVoltage;
 
-        public Dictionary<int, uint> m_voltagesHistory = new Dictionary<int, uint>();
+        public Dictionary<int, uint> m_voltagesHistory = new();
 
         public abstract int DelaySteps { get; }
 
         public BaseDelayGateGVElectricElement(SubsystemGVElectricity subsystemGVElectricity, CellFace cellFace) : base(subsystemGVElectricity, cellFace) { }
+        public BaseDelayGateGVElectricElement(SubsystemGVElectricity subsystemGVElectricity, GVCellFace cellFace) : base(subsystemGVElectricity, cellFace) { }
 
         public override uint GetOutputVoltage(int face) => m_voltage;
 

diff --git a/Gigavolt/Block/Gate/GVAdjustableDelayGateBlock.cs b/Gigavolt/Block/Gate/GVAdjustableDelayGateBlock.cs
@@ -137,7 +137,16 @@ public override void GenerateTerrainVertices(BlockGeometryGenerator generator, T
             }
         }
 
-        public override GVElectricElement CreateGVElectricElement(SubsystemGVElectricity subsystemGVElectricity, int value, int x, int y, int z) => new AdjustableDelayGateGVElectricElement(subsystemGVElectricity, new CellFace(x, y, z, GetFace(value)));
+        public override GVElectricElement CreateGVElectricElement(SubsystemGVElectricity subsystemGVElectricity, int value, int x, int y, int z) => new AdjustableDelayGateGVElectricElement(
+            subsystemGVElectricity,
+            new GVCellFace(
+                x,
+                y,
+                z,
+                GetFace(value),
+                GetConnectionMask(value)
+            )
+        );
 
         public override GVElectricConnectorType? GetGVConnectorType(SubsystemTerrain terrain, int value, int face, int connectorFace, int x, int y, int z) {
             int data = Terrain.ExtractData(value);