GiftsGamma event fix

SerbiaStrong-220 · Aug 11, 2024 · 70ec3ca · 70ec3ca
1 parent 77b6152
commit 70ec3ca
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 10 deletions.
diff --git a/Content.Server/StationEvents/Components/StationEventComponent.cs b/Content.Server/StationEvents/Components/StationEventComponent.cs
@@ -87,4 +87,12 @@ public sealed partial class StationEventComponent : Component
     /// </summary>
     [DataField]
     public bool OccursDuringRoundEnd = true;
+
+    //SS220 GiftsGamma event fix begin
+    /// <summary>
+    /// If true, the event isn't triggered randomly in round
+    /// </summary>
+    [DataField]
+    public bool CannotStartRandomly = false;
+    //SS220 GiftsGamma event fix end
 }
diff --git a/Content.Server/StationEvents/EventManagerSystem.cs b/Content.Server/StationEvents/EventManagerSystem.cs
@@ -180,6 +180,11 @@ private bool CanRun(EntityPrototype prototype, StationEventComponent stationEven
         if (GameTicker.IsGameRuleActive(prototype.ID))
             return false;
 
+        //SS220 GiftsGamma event fix begin
+        if (stationEvent.CannotStartRandomly)
+            return false;
+        //SS220 GiftsGamma event fix end
+
         if (stationEvent.MaxOccurrences.HasValue && GetOccurrences(prototype) >= stationEvent.MaxOccurrences.Value)
         {
             return false;

diff --git a/Resources/Prototypes/GameRules/cargo_gifts.yml b/Resources/Prototypes/GameRules/cargo_gifts.yml
@@ -198,16 +198,20 @@
 #ss220-gamma
 - type: entity
   id: GiftsGamma
-  parent: BaseGameRule
+  parent: CargoGiftsBase #SS220 GiftsGamma event fix
   categories: [ GameRules ]
   components:
-    - type: CargoGiftsRule
-      description: cargo-gift-dest-gamma
-      sender: cargo-gift-default-sender
-      dest: cargo-gift-dest-all
-      gifts:
-        SecurityArmor: 2
-        SecurityHelmet: 2
-        ArmorySmg: 3
-        ArmoryShotgun: 3
+  #SS220 GiftsGamma event fix begin
+  - type: StationEvent
+    cannotStartRandomly: true
+  #SS220 GiftsGamma event fix end
+  - type: CargoGiftsRule
+    description: cargo-gift-dest-gamma
+    sender: cargo-gift-default-sender
+    dest: cargo-gift-dest-all
+    gifts:
+      SecurityArmor: 2
+      SecurityHelmet: 2
+      ArmorySmg: 3
+      ArmoryShotgun: 3
 #ss220-gammaend