From 74be133e40b339569d64d6d4dd8fa396a9784720 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Maila=CC=88nder?= Date: Wed, 11 Jun 2014 11:25:17 +0200 Subject: [PATCH] Use Prerequisites: ~disabled for unbuildable actors. --- .../Lint/LintBuildablePrerequisites.cs | 5 +- mods/cnc/maps/gdi01/map.yaml | 45 ++++++++----- mods/cnc/maps/gdi02/map.yaml | 63 ++++++++++++------- mods/cnc/maps/gdi03/map.yaml | 48 +++++++++----- mods/cnc/rules/ships.yaml | 2 +- mods/cnc/rules/structures.yaml | 2 +- mods/cnc/rules/tech.yaml | 2 +- 7 files changed, 110 insertions(+), 57 deletions(-) diff --git a/OpenRA.Mods.RA/Lint/LintBuildablePrerequisites.cs b/OpenRA.Mods.RA/Lint/LintBuildablePrerequisites.cs index 39daeddd05..7f181be8ba 100644 --- a/OpenRA.Mods.RA/Lint/LintBuildablePrerequisites.cs +++ b/OpenRA.Mods.RA/Lint/LintBuildablePrerequisites.cs @@ -42,8 +42,9 @@ namespace OpenRA.Mods.RA var bi = i.Value.Traits.GetOrDefault(); if (bi != null) foreach (var prereq in bi.Prerequisites) - if (!providedPrereqs.Contains(prereq.Replace("!", "").Replace("~", ""))) - emitError("Buildable actor {0} has prereq {1} not provided by anything.".F(i.Key, prereq)); + if (!prereq.StartsWith("~disabled")) + if (!providedPrereqs.Contains(prereq.Replace("!", "").Replace("~", ""))) + emitError("Buildable actor {0} has prereq {1} not provided by anything.".F(i.Key, prereq)); } } } diff --git a/mods/cnc/maps/gdi01/map.yaml b/mods/cnc/maps/gdi01/map.yaml index fa60b3f7ae..bc8fffa2d7 100644 --- a/mods/cnc/maps/gdi01/map.yaml +++ b/mods/cnc/maps/gdi01/map.yaml @@ -464,36 +464,51 @@ Rules: ^Infantry: MustBeDestroyed: PROC: - -Buildable: + Buildable: + Prerequisites: ~disabled SILO: - -Buildable: + Buildable: + Prerequisites: ~disabled WEAP: - -Buildable: + Buildable: + Prerequisites: ~disabled HQ: - -Buildable: + Buildable: + Prerequisites: ~disabled NUK2: - -Buildable: + Buildable: + Prerequisites: ~disabled FIX: - -Buildable: + Buildable: + Prerequisites: ~disabled HPAD: - -Buildable: + Buildable: + Prerequisites: ~disabled EYE: - -Buildable: + Buildable: + Prerequisites: ~disabled GUN: - -Buildable: + Buildable: + Prerequisites: ~disabled MustBeDestroyed: GTWR: - -Buildable: + Buildable: + Prerequisites: ~disabled ATWR: - -Buildable: + Buildable: + Prerequisites: ~disabled E2: - -Buildable: + Buildable: + Prerequisites: ~disabled E3: - -Buildable: + Buildable: + Prerequisites: ~disabled E6: - -Buildable: + Buildable: + Prerequisites: ~disabled RMBO: - -Buildable: + Buildable: + Prerequisites: ~disabled BOAT: Health: HP: 1500 diff --git a/mods/cnc/maps/gdi02/map.yaml b/mods/cnc/maps/gdi02/map.yaml index a4e8489c03..08a82ce766 100644 --- a/mods/cnc/maps/gdi02/map.yaml +++ b/mods/cnc/maps/gdi02/map.yaml @@ -739,47 +739,68 @@ Rules: Player: -ConquestVictoryConditions: PROC: - -Buildable: + Buildable: + Prerequisites: ~disabled SILO: - -Buildable: + Buildable: + Prerequisites: ~disabled WEAP: - -Buildable: + Buildable: + Prerequisites: ~disabled HQ: - -Buildable: + Buildable: + Prerequisites: ~disabled NUK2: - -Buildable: + Buildable: + Prerequisites: ~disabled FIX: - -Buildable: + Buildable: + Prerequisites: ~disabled HPAD: - -Buildable: + Buildable: + Prerequisites: ~disabled EYE: - -Buildable: + Buildable: + Prerequisites: ~disabled GUN: - -Buildable: + Buildable: + Prerequisites: ~disabled GTWR: - -Buildable: + Buildable: + Prerequisites: ~disabled ATWR: - -Buildable: + Buildable: + Prerequisites: ~disabled E2: - -Buildable: + Buildable: + Prerequisites: ~disabled E3: - -Buildable: + Buildable: + Prerequisites: ~disabled E4: - -Buildable: + Buildable: + Prerequisites: ~disabled E5: - -Buildable: + Buildable: + Prerequisites: ~disabled E6: - -Buildable: + Buildable: + Prerequisites: ~disabled RMBO: - -Buildable: + Buildable: + Prerequisites: ~disabled AFLD: - -Buildable: + Buildable: + Prerequisites: ~disabled TMPL: - -Buildable: + Buildable: + Prerequisites: ~disabled OBLI: - -Buildable: + Buildable: + Prerequisites: ~disabled SAM: - -Buildable: + Buildable: + Prerequisites: ~disabled OLDLST: Inherits: LST -WithRoof: diff --git a/mods/cnc/maps/gdi03/map.yaml b/mods/cnc/maps/gdi03/map.yaml index 91790e2932..100683f0ef 100644 --- a/mods/cnc/maps/gdi03/map.yaml +++ b/mods/cnc/maps/gdi03/map.yaml @@ -902,39 +902,55 @@ Rules: ^Infantry: MustBeDestroyed: WEAP: - -Buildable: + Buildable: + Prerequisites: ~disabled NUK2: - -Buildable: + Buildable: + Prerequisites: ~disabled FIX: - -Buildable: + Buildable: + Prerequisites: ~disabled HPAD: - -Buildable: + Buildable: + Prerequisites: ~disabled EYE: - -Buildable: + Buildable: + Prerequisites: ~disabled GUN: - -Buildable: + Buildable: + Prerequisites: ~disabled ATWR: - -Buildable: + Buildable: + Prerequisites: ~disabled E3: - -Buildable: + Buildable: + Prerequisites: ~disabled E4: - -Buildable: + Buildable: + Prerequisites: ~disabled E5: - -Buildable: + Buildable: + Prerequisites: ~disabled RMBO: - -Buildable: + Buildable: + Prerequisites: ~disabled AFLD: - -Buildable: + Buildable: + Prerequisites: ~disabled TMPL: - -Buildable: + Buildable: + Prerequisites: ~disabled OBLI: - -Buildable: + Buildable: + Prerequisites: ~disabled SAM: - -Buildable: + Buildable: + Prerequisites: ~disabled Building: Power: -10 HQ: - -Buildable: + Buildable: + Prerequisites: ~disabled NOHQ: RequiresPower: CanPowerDown: diff --git a/mods/cnc/rules/ships.yaml b/mods/cnc/rules/ships.yaml index 313d992b2d..b52958b617 100644 --- a/mods/cnc/rules/ships.yaml +++ b/mods/cnc/rules/ships.yaml @@ -39,7 +39,7 @@ LST: Buildable: Queue: Vehicle BuildPaletteOrder: 1000 - Owner: None + Prerequisites: ~disabled Mobile: Crushes: crate TerrainSpeeds: diff --git a/mods/cnc/rules/structures.yaml b/mods/cnc/rules/structures.yaml index d91e718042..398a77d772 100644 --- a/mods/cnc/rules/structures.yaml +++ b/mods/cnc/rules/structures.yaml @@ -3,7 +3,7 @@ FACT: Buildable: Queue: Building BuildPaletteOrder: 1000 - Owner: None + Prerequisites: ~disabled Valued: Cost: 2000 Tooltip: diff --git a/mods/cnc/rules/tech.yaml b/mods/cnc/rules/tech.yaml index 0d9426096f..71b2c2c1c9 100644 --- a/mods/cnc/rules/tech.yaml +++ b/mods/cnc/rules/tech.yaml @@ -88,7 +88,7 @@ MISS: Buildable: Queue: Building BuildPaletteOrder: 1000 - Owner: None + Prerequisites: ~disabled Valued: Cost: 2000 Bib: