Merge branch 'port-station-goals' of https://github.com/VMSolidus/Ein…

…stein-Engines into port-station-goals
Simple-Station · Jun 16, 2024 · a372209 · a372209
2 parents 8b07729 + 1ce9243
commit a372209
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 24 deletions.
diff --git a/Content.Server/Fax/FaxMachineComponent.cs b/Content.Server/Fax/FaxMachineComponent.cs
@@ -52,10 +52,9 @@ public sealed partial class FaxMachineComponent : Component
     public bool ReceiveNukeCodes { get; set; } = false;
 
     /// <summary>
-    /// Should that fax receive station goal info
+    /// 	Should this fax receive station goals
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
-    [DataField("receiveStationGoal")]
+    [DataField]
     public bool ReceiveStationGoal { get; set; } = false;
 
     /// <summary>

diff --git a/Content.Server/StationGoal/StationGoalPaperComponent.cs b/Content.Server/StationGoal/StationGoalPaperComponent.cs
@@ -4,8 +4,6 @@ namespace Content.Server.StationGoal
     ///     Paper with a written station goal in it.
     /// </summary>
     [RegisterComponent]
-    public sealed partial class StationGoalPaperComponent : Component
-    {
-    }
+    public sealed partial class StationGoalPaperComponent : Component { }
 }
 
diff --git a/Content.Server/StationGoal/StationGoalPaperSystem.cs b/Content.Server/StationGoal/StationGoalPaperSystem.cs
@@ -39,22 +39,16 @@ public override void Initialize()
 
     private void OnRoundStarted(RoundStartedEvent ev)
     {
-        if (_config.GetCVar(CCVars.StationGoalsEnabled))
-        {
-            if (_config.GetCVar(CCVars.StationGoalsRandomNoGoal) && _random.Prob(0.1f))
-            {
-                if (_random.Prob(0.1f))
-                    SendRandomGoal();
-            }
-            else SendRandomGoal();
-        }
+        if (_config.GetCVar(CCVars.StationGoalsEnabled)
+        	&& _random.Prob(_config.GetCVar(CCVars.StationGoalsChance)))
+            SendRandomGoal();
     }
 
     /// <summary>
     ///     Send a random station goal to all faxes which are authorized to receive it
     /// </summary>
     /// <returns>If the fax was successful</returns>
-    /// <exception cref="ConstraintException">Raised when station goal types in the prototype is invalid</exception>
+    /// <exception cref="Exception">Raised when station goal types in the prototype is invalid</exception>
     public bool SendRandomGoal()
     {
         // Get the random station goal list
@@ -81,7 +75,7 @@ private StationGoalPrototype RecursiveRandom(WeightedRandomPrototype random)
         if (_prototype.TryIndex<WeightedRandomPrototype>(goal, out var goalRandom))
             return RecursiveRandom(goalRandom);
 
-        throw new Exception($"StationGoalPaperSystem: Random station goal could not be found from origin prototype {RandomPrototype}");
+        throw new Exception($"StationGoalPaperSystem: Random station goal could not be found from prototypes {RandomPrototype} and {random.ID}");
     }
 
     /// <summary>
@@ -95,8 +89,8 @@ public bool SendStationGoal(StationGoalPrototype goal)
 
         while (enumerator.MoveNext(out var uid, out var fax))
         {
-            if (!fax.ReceiveStationGoal ||
-                !TryComp<MetaDataComponent>(_station.GetOwningStation(uid), out var meta))
+            if (!fax.ReceiveStationGoal
+                || !TryComp<MetaDataComponent>(_station.GetOwningStation(uid), out var meta))
                 continue;
 
             var stationId = StationIdRegex.Match(meta.EntityName).Groups[1].Value;

diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
@@ -2114,9 +2114,9 @@ public static readonly CVarDef<float>
             CVarDef.Create("game.station_goals", true, CVar.SERVERONLY);
 
         /// <summary>
-        ///     If enabled, station goals have a 10% chance to not generate
+        ///     Chance for a station goal to be sent
         /// </summary>
-        public static readonly CVarDef<bool> StationGoalsRandomNoGoal =
-            CVarDef.Create("game.station_goals_random_none", false, CVar.SERVERONLY);
+        public static readonly CVarDef<float> StationGoalsChance =
+            CVarDef.Create("game.station_goals_chance", 0.1f, CVar.SERVERONLY);
     }
 }
diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
@@ -258,8 +258,8 @@
 - type: entity
   parent: Paper
   id: StationGoalPaper
-  name: station goal centcomm message
-  description: 'It looks like you have a lot of work to do.'
+  name: station goal
+  description: It looks like you have a lot of work to do.
   components:
     - type: Paper
       stampState: paper_stamp-centcom

diff --git a/Resources/Prototypes/Objectives/goals.yml b/Resources/Prototypes/Objectives/goals.yml
@@ -40,6 +40,7 @@
 - type: stationGoal
   id: Zoo
 
+
 - type: weightedRandom
   id: StationGoals
   weights: