Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Фиксы метеоров (#410)

Browse Source 
* Missing meteor presets (#29044)

* add meteors into missing game presets

* changes for real

* implement code

* this too

* Revert "Missing meteor presets (#29044)"

This reverts commit d6554159b30d395b2ab0a1e47b67efcf895be903.

* add: more meteors

* add: less meteors

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
This commit is contained in:
ThereDrD0
2024-07-02 12:55:38 +03:00
committed by GitHub
parent a0d346096d
commit 104ffcb0e3
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/StationEvents/Components/MeteorSwarmComponent.cs
View File

@@ -48,11 +48,11 @@ public sealed partial class MeteorSwarmComponent : Component
public Dictionary<EntProtoId, float> Meteors = new(); public Dictionary<EntProtoId, float> Meteors = new();
[DataField] [DataField]
public MinMax Waves = new(3, 3); public MinMax Waves = new(2, 4);
[DataField] [DataField]
public MinMax MeteorsPerWave = new(3, 4); public MinMax MeteorsPerWave = new(3, 4);
[DataField] [DataField]
public MinMax WaveCooldown = new (10, 60); public MinMax WaveCooldown = new (30, 60);
} }

4
Content.Shared/CCVar/CCVars.cs
View File

@@ -125,13 +125,13 @@ namespace Content.Shared.CCVar
/// Minimum time between meteor swarms in minutes. /// Minimum time between meteor swarms in minutes.
/// </summary> /// </summary>
public static readonly CVarDef<float> public static readonly CVarDef<float>
MeteorSwarmMinTime = CVarDef.Create("events.meteor_swarm_min_time", 12.5f, CVar.ARCHIVE | CVar.SERVERONLY); MeteorSwarmMinTime = CVarDef.Create("events.meteor_swarm_min_time", 20f, CVar.ARCHIVE | CVar.SERVERONLY);
/// <summary> /// <summary>
/// Maximum time between meteor swarms in minutes. /// Maximum time between meteor swarms in minutes.
/// </summary> /// </summary>
public static readonly CVarDef<float> public static readonly CVarDef<float>
MeteorSwarmMaxTime = CVarDef.Create("events.meteor_swarm_max_time", 17.5f, CVar.ARCHIVE | CVar.SERVERONLY); MeteorSwarmMaxTime = CVarDef.Create("events.meteor_swarm_max_time", 30f, CVar.ARCHIVE | CVar.SERVERONLY);
/* /*
* Game * Game

6
Resources/Prototypes/game_presets.yml
View File

@@ -8,6 +8,7 @@
rules: rules:
- RampingStationEventScheduler - RampingStationEventScheduler
- BasicRoundstartVariation - BasicRoundstartVariation
- GameRuleMeteorScheduler
- type: gamePreset - type: gamePreset
id: AllAtOnce id: AllAtOnce
@@ -24,6 +25,7 @@
- Cult - Cult
- Wizard - Wizard
- BasicRoundstartVariation - BasicRoundstartVariation
- GameRuleMeteorScheduler
- type: gamePreset - type: gamePreset
id: Extended id: Extended
@@ -175,6 +177,7 @@
- Pirates - Pirates
- BasicStationEventScheduler - BasicStationEventScheduler
- BasicRoundstartVariation - BasicRoundstartVariation
- GameRuleMeteorScheduler
#WD EDIT START #WD EDIT START
- type: gamePreset - type: gamePreset
@@ -190,6 +193,7 @@
- SubGamemodesRule - SubGamemodesRule
- BasicStationEventScheduler - BasicStationEventScheduler
- BasicRoundstartVariation - BasicRoundstartVariation
- GameRuleMeteorScheduler
- type: gamePreset - type: gamePreset
id: Changeling id: Changeling
@@ -204,6 +208,7 @@
- SubGamemodesRule - SubGamemodesRule
- BasicStationEventScheduler - BasicStationEventScheduler
- BasicRoundstartVariation - BasicRoundstartVariation
- GameRuleMeteorScheduler
- type: gamePreset - type: gamePreset
id: Wizard id: Wizard
@@ -219,4 +224,5 @@
- SubGamemodesRule - SubGamemodesRule
- BasicStationEventScheduler - BasicStationEventScheduler
- BasicRoundstartVariation - BasicRoundstartVariation
- GameRuleMeteorScheduler
#WD EDIT END #WD EDIT END