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>(); var bi = i.Value.Traits.GetOrDefault<BuildableInfo>();
if (bi != null) if (bi != null)
foreach (var prereq in bi.Prerequisites) foreach (var prereq in bi.Prerequisites)
if (!providedPrereqs.Contains(prereq.Replace("!", "").Replace("~", ""))) if (!prereq.StartsWith("~disabled"))
emitError("Buildable actor {0} has prereq {1} not provided by anything.".F(i.Key, prereq)); 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: ^Infantry:
MustBeDestroyed: MustBeDestroyed:
PROC: PROC:
-Buildable: Buildable:
Prerequisites: ~disabled
SILO: SILO:
-Buildable: Buildable:
Prerequisites: ~disabled
WEAP: WEAP:
-Buildable: Buildable:
Prerequisites: ~disabled
HQ: HQ:
-Buildable: Buildable:
Prerequisites: ~disabled
NUK2: NUK2:
-Buildable: Buildable:
Prerequisites: ~disabled
FIX: FIX:
-Buildable: Buildable:
Prerequisites: ~disabled
HPAD: HPAD:
-Buildable: Buildable:
Prerequisites: ~disabled
EYE: EYE:
-Buildable: Buildable:
Prerequisites: ~disabled
GUN: GUN:
-Buildable: Buildable:
Prerequisites: ~disabled
MustBeDestroyed: MustBeDestroyed:
GTWR: GTWR:
-Buildable: Buildable:
Prerequisites: ~disabled
ATWR: ATWR:
-Buildable: Buildable:
Prerequisites: ~disabled
E2: E2:
-Buildable: Buildable:
Prerequisites: ~disabled
E3: E3:
-Buildable: Buildable:
Prerequisites: ~disabled
E6: E6:
-Buildable: Buildable:
Prerequisites: ~disabled
RMBO: RMBO:
-Buildable: Buildable:
Prerequisites: ~disabled
BOAT: BOAT:
Health: Health:
HP: 1500 HP: 1500

View File

@@ -739,47 +739,68 @@ Rules:
Player: Player:
-ConquestVictoryConditions: -ConquestVictoryConditions:
PROC: PROC:
-Buildable: Buildable:
Prerequisites: ~disabled
SILO: SILO:
-Buildable: Buildable:
Prerequisites: ~disabled
WEAP: WEAP:
-Buildable: Buildable:
Prerequisites: ~disabled
HQ: HQ:
-Buildable: Buildable:
Prerequisites: ~disabled
NUK2: NUK2:
-Buildable: Buildable:
Prerequisites: ~disabled
FIX: FIX:
-Buildable: Buildable:
Prerequisites: ~disabled
HPAD: HPAD:
-Buildable: Buildable:
Prerequisites: ~disabled
EYE: EYE:
-Buildable: Buildable:
Prerequisites: ~disabled
GUN: GUN:
-Buildable: Buildable:
Prerequisites: ~disabled
GTWR: GTWR:
-Buildable: Buildable:
Prerequisites: ~disabled
ATWR: ATWR:
-Buildable: Buildable:
Prerequisites: ~disabled
E2: E2:
-Buildable: Buildable:
Prerequisites: ~disabled
E3: E3:
-Buildable: Buildable:
Prerequisites: ~disabled
E4: E4:
-Buildable: Buildable:
Prerequisites: ~disabled
E5: E5:
-Buildable: Buildable:
Prerequisites: ~disabled
E6: E6:
-Buildable: Buildable:
Prerequisites: ~disabled
RMBO: RMBO:
-Buildable: Buildable:
Prerequisites: ~disabled
AFLD: AFLD:
-Buildable: Buildable:
Prerequisites: ~disabled
TMPL: TMPL:
-Buildable: Buildable:
Prerequisites: ~disabled
OBLI: OBLI:
-Buildable: Buildable:
Prerequisites: ~disabled
SAM: SAM:
-Buildable: Buildable:
Prerequisites: ~disabled
OLDLST: OLDLST:
Inherits: LST Inherits: LST
-WithRoof: -WithRoof:

View File

@@ -902,39 +902,55 @@ Rules:
^Infantry: ^Infantry:
MustBeDestroyed: MustBeDestroyed:
WEAP: WEAP:
-Buildable: Buildable:
Prerequisites: ~disabled
NUK2: NUK2:
-Buildable: Buildable:
Prerequisites: ~disabled
FIX: FIX:
-Buildable: Buildable:
Prerequisites: ~disabled
HPAD: HPAD:
-Buildable: Buildable:
Prerequisites: ~disabled
EYE: EYE:
-Buildable: Buildable:
Prerequisites: ~disabled
GUN: GUN:
-Buildable: Buildable:
Prerequisites: ~disabled
ATWR: ATWR:
-Buildable: Buildable:
Prerequisites: ~disabled
E3: E3:
-Buildable: Buildable:
Prerequisites: ~disabled
E4: E4:
-Buildable: Buildable:
Prerequisites: ~disabled
E5: E5:
-Buildable: Buildable:
Prerequisites: ~disabled
RMBO: RMBO:
-Buildable: Buildable:
Prerequisites: ~disabled
AFLD: AFLD:
-Buildable: Buildable:
Prerequisites: ~disabled
TMPL: TMPL:
-Buildable: Buildable:
Prerequisites: ~disabled
OBLI: OBLI:
-Buildable: Buildable:
Prerequisites: ~disabled
SAM: SAM:
-Buildable: Buildable:
Prerequisites: ~disabled
Building: Building:
Power: -10 Power: -10
HQ: HQ:
-Buildable: Buildable:
Prerequisites: ~disabled
NOHQ: NOHQ:
RequiresPower: RequiresPower:
CanPowerDown: CanPowerDown:

View File

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

View File

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

View File

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