more harmless critters from events (#2518)

* more harmless critters from events * adjust it to be less extreme --------- Co-authored-by: deltanedas <@deltanedas:kde.org>
DeltaV-Station · Jan 2, 2025 · e2b7907 · e2b7907
1 parent 3adee14
commit e2b7907
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/Content.Server/StationEvents/Events/VentCrittersRule.cs b/Content.Server/StationEvents/Events/VentCrittersRule.cs
@@ -61,8 +61,8 @@ protected override void Ended(EntityUid uid, VentCrittersRuleComponent comp, Gam
             return;
 
         var players = _antag.GetTotalPlayerCount(_player.Sessions);
-        var min = comp.Min * players / comp.PlayerRatio;
-        var max = comp.Max * players / comp.PlayerRatio;
+        var min = Math.Max(comp.Min, comp.Min * players / comp.PlayerRatio);
+        var max = Math.Max(comp.Max, comp.Max * players / comp.PlayerRatio);
         var count = Math.Max(RobustRandom.Next(min, max), 1);
         Log.Info($"Spawning {count} critters for {ToPrettyString(uid):rule}");
         for (int i = 0; i < count; i++)

diff --git a/Resources/Prototypes/GameRules/pests.yml b/Resources/Prototypes/GameRules/pests.yml
@@ -31,6 +31,9 @@
   - type: PrecognitionResult # DeltaV - Precogniton
     message: psionic-power-precognition-mouse-migration-result-message
   - type: VentCrittersRule
+    min: 10 # DeltaV
+    max: 15 # DeltaV
+    playerRatio: 55 # DeltaV: Higher base values, less player scaling
     table: !type:GroupSelector # DeltaV: EntityTable instead of spawn entries
       children:
       - id: MobMouse
@@ -54,6 +57,9 @@
   - type: PrecognitionResult # DeltaV - Precogniton
     message: psionic-power-precognition-king-rat-migration-result-message
   - type: VentCrittersRule
+    min: 10 # DeltaV
+    max: 20 # DeltaV
+    playerRatio: 70 # DeltaV: Mostly ignore player scaling
     table: !type:GroupSelector # DeltaV: EntityTable instead of spawn entries
       children:
       - id: MobMouse
@@ -77,6 +83,9 @@
   - type: PrecognitionResult # DeltaV - Precogniton
     message: psionic-power-precognition-cockroach-migration-result-message
   - type: VentCrittersRule
+    min: 8 # DeltaV
+    max: 20 # DeltaV
+    playerRatio: 80 # DeltaV: Mostly ignore player scaling
     table: !type:GroupSelector # DeltaV: EntityTable instead of spawn entries
       children:
       - id: MobCockroach
@@ -97,6 +106,9 @@
   - type: PrecognitionResult # DeltaV - Precogniton
     message: psionic-power-precognition-snail-migration-result-message
   - type: VentCrittersRule
+    min: 4 # DeltaV
+    max: 8 # DeltaV
+    playerRatio: 60 # DeltaV: Somewhat ignore player scaling
     table: !type:GroupSelector # DeltaV: EntityTable instead of spawn entries
       children:
       - id: MobSnail
@@ -118,6 +130,7 @@
   - type: PrecognitionResult # DeltaV - Precogniton
     message: psionic-power-precognition-snail-migration-result-message
   - type: VentCrittersRule
+    playerRatio: 20 # DeltaV: Snails aren't dangerous, but they should be more special
     table: !type:GroupSelector # DeltaV: EntityTable instead of spawn entries
       children:
       - id: MobSnail

diff --git a/Resources/Prototypes/_DV/GameRules/events.yml b/Resources/Prototypes/_DV/GameRules/events.yml
@@ -49,7 +49,7 @@
   - type: PrecognitionResult
     message: psionic-power-precognition-xeno-vents-result-message
   - type: VentCrittersRule
-    table: !type:GroupSelector # DeltaV: EntityTable instead of spawn entries
+    table: !type:GroupSelector
       children:
       - id: MobXeno
         weight: 0.55
@@ -80,7 +80,10 @@
   - type: PrecognitionResult
     message: psionic-power-precognition-mothroach-spawn-result-message
   - type: VentCrittersRule
-    table: # DeltaV: EntityTable instead of spawn entries
+    min: 5
+    max: 10
+    playerRatio: 65 # mothroaches aren't dangerous, but don't need as many as mice
+    table:
       id: MobMothroach
 
 - type: entity