Раундстартовые газы (#184)

* AutoPipes * AutoPipesFix * Update Content.Server/Atmos/Piping/Binary/EntitySystems/GasVolumePumpSystem.cs Co-authored-by: FN <[email protected]> --------- Co-authored-by: FN <[email protected]>
space-syndicate · Dec 23, 2024 · 9af89d3 · 9af89d3
1 parent 80eb8ac
commit 9af89d3
Show file tree

Hide file tree

Showing 10 changed files with 123 additions and 0 deletions.
diff --git a/Content.Server/Atmos/Piping/Binary/Components/GasPressurePumpComponent.cs b/Content.Server/Atmos/Piping/Binary/Components/GasPressurePumpComponent.cs
@@ -27,5 +27,10 @@ public sealed partial class GasPressurePumpComponent : Component
         [ViewVariables(VVAccess.ReadWrite)]
         [DataField("maxTargetPressure")]
         public float MaxTargetPressure = Atmospherics.MaxOutputPressure;
+
+        /// Corvax-Next-AutoPipes-Start
+        [DataField]
+        public bool StartOnMapInit { get; set; } = false;
+        /// Corvax-Next-AutoPipes-End
     }
 }
diff --git a/Content.Server/Atmos/Piping/Binary/Components/GasVolumePumpComponent.cs b/Content.Server/Atmos/Piping/Binary/Components/GasVolumePumpComponent.cs
@@ -46,5 +46,10 @@ public sealed partial class GasVolumePumpComponent : Component
 
         [DataField("lastMolesTransferred")]
         public float LastMolesTransferred;
+
+        /// Corvax-Next-AutoPipes-Start
+        [DataField]
+        public bool StartOnMapInit { get; set; } = false;
+        /// Corvax-Next-AutoPipes-End
     }
 }
diff --git a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPressurePumpSystem.cs b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPressurePumpSystem.cs
@@ -44,6 +44,8 @@ public override void Initialize()
             // Bound UI subscriptions
             SubscribeLocalEvent<GasPressurePumpComponent, GasPressurePumpChangeOutputPressureMessage>(OnOutputPressureChangeMessage);
             SubscribeLocalEvent<GasPressurePumpComponent, GasPressurePumpToggleStatusMessage>(OnToggleStatusMessage);
+
+            SubscribeLocalEvent<GasPressurePumpComponent, MapInitEvent>(OnMapInit); // Corvax-Next-AutoPipes
         }
 
         private void OnInit(EntityUid uid, GasPressurePumpComponent pump, ComponentInit args)
@@ -165,5 +167,19 @@ private void UpdateAppearance(EntityUid uid, GasPressurePumpComponent? pump = nu
             bool pumpOn = pump.Enabled && (TryComp<ApcPowerReceiverComponent>(uid, out var power) && power.Powered);
             _appearance.SetData(uid, PumpVisuals.Enabled, pumpOn, appearance);
         }
+
+        /// Corvax-Next-AutoPipes-Start
+        private void OnMapInit(EntityUid uid, GasPressurePumpComponent pump, MapInitEvent args)
+        {
+            if (pump.StartOnMapInit)
+            {
+                pump.Enabled = true;
+                UpdateAppearance(uid, pump);
+
+                DirtyUI(uid, pump);
+                _userInterfaceSystem.CloseUi(uid, GasPressurePumpUiKey.Key);
+            }
+        }
+		/// Corvax-Next-AutoPipes-End
     }
 }
diff --git a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasVolumePumpSystem.cs b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasVolumePumpSystem.cs
@@ -52,6 +52,8 @@ public override void Initialize()
             SubscribeLocalEvent<GasVolumePumpComponent, GasVolumePumpToggleStatusMessage>(OnToggleStatusMessage);
 
             SubscribeLocalEvent<GasVolumePumpComponent, DeviceNetworkPacketEvent>(OnPacketRecv);
+
+			SubscribeLocalEvent<GasVolumePumpComponent, MapInitEvent>(OnMapInit); // Corvax-Next-AutoPipes
         }
 
         private void OnInit(EntityUid uid, GasVolumePumpComponent pump, ComponentInit args)
@@ -218,5 +220,19 @@ private void OnPacketRecv(EntityUid uid, GasVolumePumpComponent component, Devic
                     return;
             }
         }
+
+		/// Corvax-Next-AutoPipes-Start
+        private void OnMapInit(EntityUid uid, GasVolumePumpComponent pump, MapInitEvent args)
+        {
+            if (pump.StartOnMapInit)
+            {
+                pump.Enabled = true;
+                UpdateAppearance(uid, pump);
+
+                DirtyUI(uid, pump);
+                _userInterfaceSystem.CloseUi(uid, GasVolumePumpUiKey.Key);
+            }
+        }
+		/// Corvax-Next-AutoPipes-End
     }
 }
diff --git a/Content.Server/Atmos/Piping/Trinary/Components/GasMixerComponent.cs b/Content.Server/Atmos/Piping/Trinary/Components/GasMixerComponent.cs
@@ -38,5 +38,10 @@ public sealed partial class GasMixerComponent : Component
         [ViewVariables(VVAccess.ReadWrite)]
         [DataField("inletTwoConcentration")]
         public float InletTwoConcentration = 0.5f;
+
+		/// Corvax-Next-AutoPipes-Start
+        [DataField]
+        public bool StartOnMapInit { get; set; } = false;
+		/// Corvax-Next-AutoPipes-Start
     }
 }
diff --git a/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasMixerSystem.cs b/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasMixerSystem.cs
@@ -43,6 +43,8 @@ public override void Initialize()
             SubscribeLocalEvent<GasMixerComponent, GasMixerToggleStatusMessage>(OnToggleStatusMessage);
 
             SubscribeLocalEvent<GasMixerComponent, AtmosDeviceDisabledEvent>(OnMixerLeaveAtmosphere);
+
+			SubscribeLocalEvent<GasMixerComponent, MapInitEvent>(OnMapInit); // Corvax-Next-AutoPipes
         }
 
         private void OnInit(EntityUid uid, GasMixerComponent mixer, ComponentInit args)
@@ -235,5 +237,19 @@ private void OnMixerAnalyzed(EntityUid uid, GasMixerComponent component, GasAnal
 
             args.DeviceFlipped = inletOne != null && inletTwo != null && inletOne.CurrentPipeDirection.ToDirection() == inletTwo.CurrentPipeDirection.ToDirection().GetClockwise90Degrees();
         }
+
+        // Corvax-Next-AutoPipes-Start
+        private void OnMapInit(EntityUid uid, GasMixerComponent mixer, MapInitEvent args) // Frontier - Init on map
+        {
+            if (mixer.StartOnMapInit)
+            {
+                mixer.Enabled = true;
+                DirtyUI(uid, mixer);
+
+                UpdateAppearance(uid, mixer);
+                _userInterfaceSystem.CloseUi(uid, GasFilterUiKey.Key);
+            }
+        }
+		// Corvax-Next-AutoPipes-End
     }
 }
diff --git a/...e/ru-RU/ss14-ru/prototypes/_corvaxnext/entities/structures/piping/atmospherics/binary.ftl b/...e/ru-RU/ss14-ru/prototypes/_corvaxnext/entities/structures/piping/atmospherics/binary.ftl
@@ -0,0 +1,9 @@
+ent-GasPressurePumpOn = { ent-GasPressurePump }
+    .desc = { ent-GasPressurePump.desc }
+    .suffix = ВКЛ
+ent-GasPressurePumpOnMax = { ent-GasPressurePump }
+    .desc = { ent-GasPressurePump.desc }
+    .suffix = ВКЛ, 4500
+ent-GasVolumePumpOn = { ent-GasVolumePump }
+    .desc = { ent-GasVolumePump.desc }
+    .suffix = ВКЛ
diff --git a/.../ru-RU/ss14-ru/prototypes/_corvaxnext/entities/structures/piping/atmospherics/trinary.ftl b/.../ru-RU/ss14-ru/prototypes/_corvaxnext/entities/structures/piping/atmospherics/trinary.ftl
@@ -0,0 +1,6 @@
+ent-GasMixerOn = { ent-GasMixer }
+    .desc = { ent-GasMixer.desc }
+    .suffix = ВКЛ
+ent-GasMixerOnFlipped = { ent-GasMixerFlipped }
+    .desc = { ent-GasMixerFlipped.desc }
+    .suffix = ВКЛ, Перевёрнутый
diff --git a/Resources/Prototypes/_CorvaxNext/Entities/Structures/Piping/Atmospherics/binary.yml b/Resources/Prototypes/_CorvaxNext/Entities/Structures/Piping/Atmospherics/binary.yml
@@ -0,0 +1,29 @@
+- type: entity
+  parent: GasPressurePump
+  id: GasPressurePumpOn
+  suffix: On
+  placement:
+    mode: SnapgridCenter
+  components:
+  - type: GasPressurePump
+    startOnMapInit: true
+
+- type: entity
+  parent: GasPressurePumpOn
+  id: GasPressurePumpOnMax
+  suffix: On, Max
+  placement:
+    mode: SnapgridCenter
+  components:
+  - type: GasPressurePump
+    targetPressure: 4500
+
+- type: entity
+  parent: GasVolumePump
+  id: GasVolumePumpOn
+  suffix: On
+  placement:
+    mode: SnapgridCenter
+  components:
+  - type: GasVolumePump
+    startOnMapInit: true
diff --git a/Resources/Prototypes/_CorvaxNext/Entities/Structures/Piping/Atmospherics/trinary.yml b/Resources/Prototypes/_CorvaxNext/Entities/Structures/Piping/Atmospherics/trinary.yml
@@ -0,0 +1,16 @@
+- type: entity
+  parent: GasMixer
+  id: GasMixerOn
+  suffix: On
+  placement:
+    mode: SnapgridCenter
+  components:
+    - type: GasMixer
+      startOnMapInit: true
+
+- type: entity
+  parent: [GasMixerFlipped, GasMixerOn]
+  id: GasMixerOnFlipped
+  suffix: On, Flipped
+  placement:
+    mode: SnapgridCenter