From 762425600125f0cabd2f061c53dc5ebef6e27e5e Mon Sep 17 00:00:00 2001 From: abcdefg30 Date: Fri, 16 Oct 2015 14:42:11 +0200 Subject: [PATCH 1/2] Set InitialSpawnDelay to 0 and set the value to 1500 in the default mods. --- OpenRA.Mods.Common/Traits/World/CrateSpawner.cs | 2 +- mods/cnc/rules/world.yaml | 1 + mods/d2k/rules/world.yaml | 1 + mods/ra/rules/world.yaml | 1 + mods/ts/rules/world.yaml | 1 + 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/OpenRA.Mods.Common/Traits/World/CrateSpawner.cs b/OpenRA.Mods.Common/Traits/World/CrateSpawner.cs index 5335b13ad4..c7e2716761 100644 --- a/OpenRA.Mods.Common/Traits/World/CrateSpawner.cs +++ b/OpenRA.Mods.Common/Traits/World/CrateSpawner.cs @@ -29,7 +29,7 @@ namespace OpenRA.Mods.Common.Traits public readonly int SpawnInterval = 180 * 25; [Desc("Delay (in ticks) before the first crate spawns.")] - public readonly int InitialSpawnDelay = 300 * 25; + public readonly int InitialSpawnDelay = 0; [Desc("Which terrain types can we drop on?")] public readonly HashSet ValidGround = new HashSet { "Clear", "Rough", "Road", "Ore", "Beach" }; diff --git a/mods/cnc/rules/world.yaml b/mods/cnc/rules/world.yaml index a5f21d441b..eccf635409 100644 --- a/mods/cnc/rules/world.yaml +++ b/mods/cnc/rules/world.yaml @@ -142,6 +142,7 @@ World: Maximum: 6 SpawnInterval: 3000 WaterChance: 0 + InitialSpawnDelay: 1500 PathFinder: ValidateOrder: DebugPauseState: diff --git a/mods/d2k/rules/world.yaml b/mods/d2k/rules/world.yaml index acc693d261..989c5ddc26 100644 --- a/mods/d2k/rules/world.yaml +++ b/mods/d2k/rules/world.yaml @@ -65,6 +65,7 @@ World: SpawnInterval: 1500 WaterChance: 0 ValidGround: Sand, Dune, Rock + InitialSpawnDelay: 1500 DomainIndex: PathfinderDebugOverlay: WarheadDebugOverlay: diff --git a/mods/ra/rules/world.yaml b/mods/ra/rules/world.yaml index 0e49d5848f..2cd36b7412 100644 --- a/mods/ra/rules/world.yaml +++ b/mods/ra/rules/world.yaml @@ -107,6 +107,7 @@ World: Maximum: 3 SpawnInterval: 3000 WaterChance: 20 + InitialSpawnDelay: 1500 DomainIndex: SmudgeLayer@SCORCH: Type: Scorch diff --git a/mods/ts/rules/world.yaml b/mods/ts/rules/world.yaml index 90d349c0a4..66e56be0b2 100644 --- a/mods/ts/rules/world.yaml +++ b/mods/ts/rules/world.yaml @@ -161,6 +161,7 @@ World: SpawnInterval: 3000 WaterChance: 0 ValidGround: Clear, Rough, Road, DirtRoad, Tiberium, BlueTiberium + InitialSpawnDelay: 1500 PathFinder: ValidateOrder: DebugPauseState: From d5a6d9949c072bb0d07e6411de76e988985c264f Mon Sep 17 00:00:00 2001 From: abcdefg30 Date: Fri, 16 Oct 2015 14:44:48 +0200 Subject: [PATCH 2/2] Remove the now unnecessary InitialSpawnDelay: 0 from the dropzone maps --- mods/cnc/maps/the-hot-box/map.yaml | 1 - mods/ra/maps/drop-zone-battle-of-tikiaki/map.yaml | 1 - mods/ra/maps/drop-zone-w/map.yaml | 1 - mods/ra/maps/drop-zone/map.yaml | 1 - 4 files changed, 4 deletions(-) diff --git a/mods/cnc/maps/the-hot-box/map.yaml b/mods/cnc/maps/the-hot-box/map.yaml index b20c52dcc4..c7dd149d35 100644 --- a/mods/cnc/maps/the-hot-box/map.yaml +++ b/mods/cnc/maps/the-hot-box/map.yaml @@ -215,7 +215,6 @@ Rules: Maximum: 4 SpawnInterval: 125 CrateActors: unitcrate - InitialSpawnDelay: 0 -SpawnMPUnits: -MPStartLocations: UNITCRATE: diff --git a/mods/ra/maps/drop-zone-battle-of-tikiaki/map.yaml b/mods/ra/maps/drop-zone-battle-of-tikiaki/map.yaml index eb59e24aa5..6bdc27f52a 100644 --- a/mods/ra/maps/drop-zone-battle-of-tikiaki/map.yaml +++ b/mods/ra/maps/drop-zone-battle-of-tikiaki/map.yaml @@ -296,7 +296,6 @@ Rules: Maximum: 3 SpawnInterval: 125 CrateActors: unitcrate - InitialSpawnDelay: 0 -SpawnMPUnits: -MPStartLocations: UNITCRATE: diff --git a/mods/ra/maps/drop-zone-w/map.yaml b/mods/ra/maps/drop-zone-w/map.yaml index 13fc0a9e79..b6dd90a5ab 100644 --- a/mods/ra/maps/drop-zone-w/map.yaml +++ b/mods/ra/maps/drop-zone-w/map.yaml @@ -202,7 +202,6 @@ Rules: SpawnInterval: 125 WaterChance: 100 CrateActors: unitcrate - InitialSpawnDelay: 0 -SpawnMPUnits: -MPStartLocations: UNITCRATE: diff --git a/mods/ra/maps/drop-zone/map.yaml b/mods/ra/maps/drop-zone/map.yaml index 4bbbdd1734..5e9147b045 100644 --- a/mods/ra/maps/drop-zone/map.yaml +++ b/mods/ra/maps/drop-zone/map.yaml @@ -191,7 +191,6 @@ Rules: Maximum: 3 SpawnInterval: 125 CrateActors: unitcrate - InitialSpawnDelay: 0 -SpawnMPUnits: -MPStartLocations: UNITCRATE: