Use Prerequisites: ~disabled for unbuildable actors.

This commit is contained in:
Matthias Mailänder
2014-06-11 11:25:17 +02:00
committed by Paul Chote
parent ca082e3cec
commit 74be133e40
7 changed files with 110 additions and 57 deletions

View File

@@ -42,8 +42,9 @@ namespace OpenRA.Mods.RA
var bi = i.Value.Traits.GetOrDefault<BuildableInfo>();
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));
}
}
}

View File

@@ -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

View File

@@ -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:

View File

@@ -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:

View File

@@ -39,7 +39,7 @@ LST:
Buildable:
Queue: Vehicle
BuildPaletteOrder: 1000
Owner: None
Prerequisites: ~disabled
Mobile:
Crushes: crate
TerrainSpeeds:

View File

@@ -3,7 +3,7 @@ FACT:
Buildable:
Queue: Building
BuildPaletteOrder: 1000
Owner: None
Prerequisites: ~disabled
Valued:
Cost: 2000
Tooltip:

View File

@@ -88,7 +88,7 @@ MISS:
Buildable:
Queue: Building
BuildPaletteOrder: 1000
Owner: None
Prerequisites: ~disabled
Valued:
Cost: 2000
Bib: