tweak: AI rewie

WWhiteDreamProject · Dec 9, 2024 · 43d990f · 43d990f
1 parent 955a51d
commit 43d990f
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 26 deletions.
diff --git a/Content.Server/_White/Atmos/Reactions/ZaukerProductionReaction.cs b/Content.Server/_White/Atmos/Reactions/ZaukerProductionReaction.cs
@@ -15,13 +15,12 @@ public ReactionResult React(GasMixture mixture, IGasMixtureHolder? holder, Atmos
         if (initialHyperNoblium >= 5.0f && mixture.Temperature > 20f)
             return ReactionResult.NoReaction;
 
-        var initialHypernoblium = mixture.GetMoles(Gas.HyperNoblium);
         var initialNitrium = mixture.GetMoles(Gas.Nitrium);
 
         var temperature = mixture.Temperature;
-        var heatEfficiency = Math.Min(temperature * Atmospherics.ZaukerFormationTemperatureScale, Math.Min(initialHypernoblium * 0.01f, initialNitrium * 0.5f));
+        var heatEfficiency = Math.Min(temperature * Atmospherics.ZaukerFormationTemperatureScale, Math.Min(initialHyperNoblium * 0.01f, initialNitrium * 0.5f));
 
-        if (heatEfficiency <= 0 || initialHypernoblium - heatEfficiency * 0.01f < 0 || initialNitrium - heatEfficiency * 0.5f < 0)
+        if (heatEfficiency <= 0 || initialHyperNoblium - heatEfficiency * 0.01f < 0 || initialNitrium - heatEfficiency * 0.5f < 0)
             return ReactionResult.NoReaction;
 
         var oldHeatCapacity = atmosphereSystem.GetHeatCapacity(mixture, true);

diff --git a/...es/Locale/ru-RU/_white/prototypes/entities/structures/storage/canisters/gas-canisters.ftl b/...es/Locale/ru-RU/_white/prototypes/entities/structures/storage/canisters/gas-canisters.ftl
@@ -21,35 +21,35 @@ ent-HeliumCanister = канистра гелия
 ent-AntiNobliumCanister = канистра анти-ноблия
     .desc = Канистра, в которой может содержаться газ любого вида. В этой, предположительно, содержится анти-ноблий. Можно прикрепить к порту коннектора с помощью гаечного ключа.
 ent-BZCanisterBroken = { ent-BZCanister }
-    .desc = { ent-BZCanister.desc }
+    .desc = Сломанная канистра, в котором ранее ,предположительно, содержался бз. В текущем состоянии он не может быть подключен к разъемам коннектора.
     .suffix = сломанная
 ent-PluoxiumCanisterBroken = { ent-PluoxiumCanister }
-    .desc = { ent-PluoxiumCanister.desc }
+    .desc = Сломанная канистра, в котором ранее ,предположительно, содержался плюоксиум. В текущем состоянии он не может быть подключен к разъемам коннектора.
     .suffix = сломанная
 ent-HydrogenCanisterBroken = { ent-HydrogenCanister }
-    .desc = { ent-HydrogenCanister.desc }
+    .desc = Сломанная канистра, в котором ранее ,предположительно, содержался водород. В текущем состоянии он не может быть подключен к разъемам коннектора.
     .suffix = сломанная
 ent-NitriumCanisterBroken = { ent-NitriumCanister }
-    .desc = { ent-NitriumCanister.desc }
+    .desc = Сломанная канистра, в котором ранее ,предположительно, содержался нитриум. В текущем состоянии он не может быть подключен к разъемам коннектора.
     .suffix = сломанная
 ent-HealiumCanisterBroken = { ent-HealiumCanister }
-    .desc = { ent-HealiumCanister.desc }
+    .desc = Сломанная канистра, в котором ранее ,предположительно, содержался хилиум. В текущем состоянии он не может быть подключен к разъемам коннектора.
     .suffix = сломанная
 ent-HyperNobliumCanisterBroken = { ent-HyperNobliumCanister }
-    .desc = { ent-HyperNobliumCanister.desc }
+    .desc = Сломанная канистра, в котором ранее ,предположительно, содержался гипер-ноблий. В текущем состоянии он не может быть подключен к разъемам коннектора.
     .suffix = сломанная
 ent-ProtoNitrateCanisterBroken = { ent-ProtoNitrateCanister }
-    .desc = { ent-ProtoNitrateCanister.desc }
+    .desc = Сломанная канистра, в котором ранее ,предположительно, содержался прото-нитрат. В текущем состоянии он не может быть подключен к разъемам коннектора.
     .suffix = сломанная
 ent-ZaukerCanisterBroken = { ent-ZaukerCanister }
-    .desc = { ent-ZaukerCanister.desc }
+    .desc = Сломанная канистра, в котором ранее ,предположительно, содержался заукер. В текущем состоянии он не может быть подключен к разъемам коннектора.
     .suffix = сломанная
 ent-HalonCanisterBroken = { ent-HalonCanister }
-    .desc = { ent-HalonCanister.desc }
+    .desc = Сломанная канистра, в котором ранее ,предположительно, содержался галон. В текущем состоянии он не может быть подключен к разъемам коннектора.
     .suffix = сломанная
 ent-HeliumCanisterBroken = { ent-HeliumCanister }
-    .desc = { ent-HeliumCanister.desc }
+    .desc = Сломанная канистра, в котором ранее ,предположительно, содержался гелий. В текущем состоянии он не может быть подключен к разъемам коннектора.
     .suffix = сломанная
 ent-AntiNobliumCanisterBroken = { ent-AntiNobliumCanister }
-    .desc = { ent-AntiNobliumCanister.desc }
+    .desc = Сломанная канистра, в котором ранее ,предположительно, содержался анти-ноблий. В текущем состоянии он не может быть подключен к разъемам коннектора.
     .suffix = сломанная
diff --git a/Resources/Prototypes/_White/Entities/Structures/Storage/Canisters/gas_canisters.yml b/Resources/Prototypes/_White/Entities/Structures/Storage/Canisters/gas_canisters.yml
@@ -632,7 +632,7 @@
   parent: GasCanisterBrokenBase
   id: BZCanisterBroken
   name: BZ canister
-  description: A canister that can contain any type of gas. This one is supposed to contain BZ. It can be attached to connector ports using a wrench.
+  description: A broken canister that previously supposedly contained BZ. It cannot be connected to the connectors in its current state.
   suffix: broken
   components:
   - type: Sprite
@@ -642,7 +642,7 @@
   parent: GasCanisterBrokenBase
   id: PluoxiumCanisterBroken
   name: Pluoxium canister
-  description: A canister that can contain any type of gas. This one is supposed to contain pluoxium. It can be attached to connector ports using a wrench.
+  description: A broken canister that previously supposedly contained pluoxium. It cannot be connected to the connectors in its current state.
   suffix: broken
   components:
   - type: Sprite
@@ -652,7 +652,7 @@
   parent: GasCanisterBrokenBase
   id: HydrogenCanisterBroken
   name: Hydrogen canister
-  description: A canister that can contain any type of gas. This one is supposed to contain hydrogen. It can be attached to connector ports using a wrench.
+  description: A broken canister that previously supposedly contained hydrogen. It cannot be connected to the connectors in its current state.
   suffix: broken
   components:
   - type: Sprite
@@ -662,7 +662,7 @@
   parent: GasCanisterBrokenBase
   id: NitriumCanisterBroken
   name: Nitrium canister
-  description: A canister that can contain any type of gas. This one is supposed to contain nitrium. It can be attached to connector ports using a wrench.
+  description: A broken canister that previously supposedly contained nitrium. It cannot be connected to the connectors in its current state.
   suffix: broken
   components:
   - type: Sprite
@@ -672,7 +672,7 @@
   parent: GasCanisterBrokenBase
   id: HealiumCanisterBroken
   name: Healium canister
-  description: A canister that can contain any type of gas. This one is supposed to contain healium. It can be attached to connector ports using a wrench.
+  description: A broken canister that previously supposedly contained healium. It cannot be connected to the connectors in its current state.
   suffix: broken
   components:
   - type: Sprite
@@ -682,7 +682,7 @@
   parent: GasCanisterBrokenBase
   id: HyperNobliumCanisterBroken
   name: Hyper-Noblium canister
-  description: A canister that can contain any type of gas. This one is supposed to contain hyper-noblium. It can be attached to connector ports using a wrench.
+  description: A broken canister that previously supposedly contained hyper-noblium. It cannot be connected to the connectors in its current state.
   suffix: broken
   components:
   - type: Sprite
@@ -692,7 +692,7 @@
   parent: GasCanisterBrokenBase
   id: ProtoNitrateCanisterBroken
   name: Proto-Nitrate canister
-  description: A canister that can contain any type of gas. This one is supposed to contain proto-nitrate. It can be attached to connector ports using a wrench.
+  description: A broken canister that previously supposedly contained proto-nitrate. It cannot be connected to the connectors in its current state.
   suffix: broken
   components:
   - type: Sprite
@@ -702,7 +702,7 @@
   parent: GasCanisterBrokenBase
   id: ZaukerCanisterBroken
   name: Zauker canister
-  description: A canister that can contain any type of gas. This one is supposed to contain zauker. It can be attached to connector ports using a wrench.
+  description: A broken canister that previously supposedly contained zauker. It cannot be connected to the connectors in its current state.
   suffix: broken
   components:
   - type: Sprite
@@ -712,7 +712,7 @@
   parent: GasCanisterBrokenBase
   id: HalonCanisterBroken
   name: Halon canister
-  description: A canister that can contain any type of gas. This one is supposed to contain halon. It can be attached to connector ports using a wrench.
+  description: A broken canister that previously supposedly contained halon. It cannot be connected to the connectors in its current state.
   suffix: broken
   components:
   - type: Sprite
@@ -722,7 +722,7 @@
   parent: GasCanisterBrokenBase
   id: HeliumCanisterBroken
   name: Helium canister
-  description: A canister that can contain any type of gas. This one is supposed to contain helium. It can be attached to connector ports using a wrench.
+  description: A broken canister that previously supposedly contained helium. It cannot be connected to the connectors in its current state.
   suffix: broken
   components:
   - type: Sprite
@@ -732,7 +732,7 @@
   parent: GasCanisterBrokenBase
   id: AntiNobliumCanisterBroken
   name: Anti-Noblium canister
-  description: A canister that can contain any type of gas. This one is supposed to contain anti-noblium. It can be attached to connector ports using a wrench.
+  description: A broken canister that previously supposedly contained anti-noblium. It cannot be connected to the connectors in its current state.
   suffix: broken
   components:
   - type: Sprite

diff --git a/RobustToolbox b/RobustToolbox
+1 −1		MSBuild/Robust.Engine.Version.props
+1 −1		NetSerializer
+34 −0		RELEASE-NOTES.md
+9 −0		Resources/Locale/en-US/_engine_lib.ftl
+2 −1		Robust.Client/Audio/AudioSystem.cs
+0 −1		Robust.Client/GameStates/NetGraphOverlay.cs
+11 −2		Robust.Client/Graphics/Clyde/GLContext/GLContextWindow.cs
+5 −4		Robust.Client/Placement/Modes/AlignTileAny.cs
+5 −6		Robust.Client/Placement/Modes/AlignTileEmpty.cs
+3 −3		Robust.Client/Placement/PlacementManager.cs
+3 −2		Robust.Client/Placement/PlacementMode.cs
+5 −3		Robust.Client/UserInterface/Controls/BoxContainer.cs
+2 −2		Robust.Client/UserInterface/Controls/SpinBox.cs
+8 −5		Robust.Client/UserInterface/Controls/SplitContainer.cs
+0 −5		Robust.Client/UserInterface/CustomControls/TextEditRopeViz.cs
+1 −0		Robust.Client/UserInterface/UserInterfaceManager.Input.cs
+11 −4		Robust.Client/ViewVariables/Traits/ViewVariablesTraitMembers.cs
+3 −1		Robust.Server/Console/SystemConsoleManager.cs
+4 −4		Robust.Server/GameStates/PvsSystem.Chunks.cs
+18 −2		Robust.Server/Program.cs
+8 −0		Robust.Shared/CVars.cs
+6 −5		Robust.Shared/ContentPack/Sandbox.yml
+3 −7		Robust.Shared/GameObjects/Systems/SharedEyeSystem.cs
+2 −2		Robust.Shared/GameObjects/Systems/SharedUserInterfaceSystem.cs
+11 −0		Robust.Shared/Localization/LocalizationManager.Functions.cs
+3 −2		Robust.Shared/Toolshed/Attributes.cs
+11 −0		Robust.Shared/Toolshed/Commands/Entities/WithCommand.cs
+5 −1		Robust.Shared/Toolshed/Commands/Generic/AsCommand.cs
+19 −21		Robust.Shared/Toolshed/ReflectionExtensions.cs
+5 −2		Robust.Shared/Toolshed/ToolshedCommand.Implementations.cs
+25 −0		Robust.Shared/Utility/FormattedMessage.cs
+2 −2		Robust.Shared/Utility/UniqueIndex.cs
+3 −6		Robust.Shared/Utility/UniqueIndexHkm.cs
+4 −3		Robust.UnitTesting/Shared/GameState/DeletionNetworkingTests.cs
+3 −2		Robust.UnitTesting/Shared/Map/GridCollision_Test.cs
+6 −4		Robust.UnitTesting/Shared/Map/GridContraction_Test.cs
+4 −3		Robust.UnitTesting/Shared/Map/GridFixtures_Tests.cs
+9 −9		Robust.UnitTesting/Shared/Map/GridRotation_Tests.cs
+5 −4		Robust.UnitTesting/Shared/Physics/BroadphaseNetworkingTest.cs
+6 −3		Robust.UnitTesting/Shared/Physics/CollisionWake_Test.cs
+4 −2		Robust.UnitTesting/Shared/Physics/GridMovement_Test.cs
+5 −3		Robust.UnitTesting/Shared/Physics/RecursiveUpdateTest.cs
+17 −9		Tools/package_client_build.py