Попытки починить фалбек

space-sunrise · Nov 29, 2024 · 7eef8db · 7eef8db
1 parent 2359434
commit 7eef8db
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 26 deletions.
diff --git a/Content.Server/GameTicking/Commands/SetGamePresetCommand.cs b/Content.Server/GameTicking/Commands/SetGamePresetCommand.cs
@@ -33,14 +33,6 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
                 return;
             }
 
-            // Sunrise-Start
-            if (preset.Hide)
-            {
-                shell.WriteError(Loc.GetString("set-game-preset-preset-error", ("preset", args[0])));
-                return;
-            }
-            // Sunrise-End
-
             ticker.SetGamePreset(preset);
             shell.WriteLine(Loc.GetString("set-game-preset-preset-set", ("preset", preset.ID)));
         }
@@ -54,11 +46,6 @@ public CompletionResult GetCompletion(IConsoleShell shell, string[] args)
                 var options = new List<string>();
                 foreach (var preset in gamePresets)
                 {
-                    // Sunrise-Start
-                    if (preset.Hide)
-                        continue;
-                    // Sunrise-End
-
                     options.Add(preset.ID);
                     options.AddRange(preset.Alias);
                 }

diff --git a/Resources/Prototypes/GameRules/midround.yml b/Resources/Prototypes/GameRules/midround.yml
@@ -35,6 +35,8 @@
   parent: BaseGameRule
   id: Changeling
   components:
+  - type: GameRule
+    minPlayers: 5
   - type: ChangelingRule
   - type: AntagSelection
     agentName: changeling-roundend-name
@@ -50,6 +52,8 @@
   parent: BaseGameRule
   id: Vampire
   components:
+  - type: GameRule
+    minPlayers: 5
   - type: VampireRule
   - type: AntagSelection
     agentName: vampire-roundend-name

diff --git a/Resources/Prototypes/GameRules/roundstart.yml b/Resources/Prototypes/GameRules/roundstart.yml
@@ -16,16 +16,24 @@
 
 - type: entity
   parent: BaseGameRule
-  id: SubGamemodesRule
+  id: LiteSubGamemodesRule
   components:
   - type: SubGamemodes
     rules:
     - id: Thief
       prob: 1.0 # Воры будут всегда
+
+
+- type: entity
+  parent: BaseGameRule
+  id: MiddleSubGamemodesRule
+  components:
+  - type: SubGamemodes
+    rules:
     - id: Changeling
-      prob: 0.20 # Слишком любители поубивать
+      prob: 0.25
     - id: Vampire
-      prob: 0.30 # Не самые рдмные
+      prob: 0.25
 
 
 - type: entity
@@ -102,6 +110,8 @@
   parent: BaseNukeopsRule
   id: Nukeops
   components:
+  - type: GameRule
+    minPlayers: 20 # Sunrise-Edit
   - type: LoadMapRule
     mapPath: /Maps/Nonstations/nukieplanet.yml
   - type: AntagSelection
@@ -327,6 +337,8 @@
   id: RampingStationEventScheduler
   parent: BaseGameRule
   components:
+  - type: GameRule
+    minPlayers: 50 # Слишком тяжело для меньшего количества игроков.
   - type: RampingStationEventScheduler
     scheduledGameRules: !type:NestedSelector
       tableId: BasicGameRulesTable

diff --git a/Resources/Prototypes/_Sunrise/secret_weights.yml b/Resources/Prototypes/_Sunrise/secret_weights.yml
@@ -1,10 +1,9 @@
 - type: weightedRandom
   id: SunriseSecret
   weights:
-    Traitor: 0.40
+    Traitor: 0.50
     Nukeops: 0.15
-    Vampire: 0.15
-    Extra: 0.15
+    Extra: 0.20
     Greenshift: 0.10
     Revolutionary: 0.05
     Survival: 0.05
@@ -15,8 +14,7 @@
   weights:
     Extra: 0.55
     Greenshift: 0.20
-    Traitor: 0.15
-    Vampire: 0.07
-    Nukeops: 0.01
+    Traitor: 0.20
+    Nukeops: 0.03
     Revolutionary: 0.01
     Zombie: 0.01
diff --git a/Resources/Prototypes/game_presets.yml b/Resources/Prototypes/game_presets.yml
@@ -6,6 +6,7 @@
   showInVote: true # Sunrise-Edit
   hide: true # Sunrise-Edit
   description: survival-description
+  minPlayers: 50 # Sunrise-Edit
   rules:
     - MeteorSwarmScheduler
     - RampingStationEventScheduler
@@ -162,7 +163,8 @@
   minPlayers: 5 # Sunrise-Edit: 5 players for TRAITORS
   rules:
     - Traitor
-    - SubGamemodesRule
+    - LiteSubGamemodesRule
+    - MiddleSubGamemodesRule
     - BasicStationEventScheduler
     - MeteorSwarmScheduler
     - SpaceTrafficControlEventScheduler
@@ -192,7 +194,7 @@
   minPlayers: 20 # Sunrise-Edit: 20 players for NUKEOPS
   rules:
     - Nukeops
-    - SubGamemodesRule
+    - LiteSubGamemodesRule # Только лайтовые под-антаги, чтобы не было кооперации станции с генокрадами против ЯО.
     - BasicStationEventScheduler
     - MeteorSwarmScheduler
     - SpaceTrafficControlEventScheduler
@@ -211,7 +213,7 @@
   minPlayers: 15 # Sunrise-Edit: 15 players for REVOLUTIONARY
   rules:
     - Revolutionary
-    - SubGamemodesRule
+    - LiteSubGamemodesRule # Только лайтовые под-антаги.
     - BasicStationEventScheduler
     - MeteorSwarmScheduler
     - SpaceTrafficControlEventScheduler
@@ -268,7 +270,7 @@
   minPlayers: 20 # Sunrise-Edit: 20 players for VAMPIRES
   rules:
   - Vampire
-  - SubGamemodesRule
+  - LiteSubGamemodesRule # Только лайтовые под-антаги.
   - BasicStationEventScheduler
   - MeteorSwarmScheduler
   - BasicRoundstartVariation