Merge pull request #3717 from Mailaender/atreides-tech
Fixed unbuildable units in the Dune 2000 tech tree
This commit is contained in:
@@ -20,17 +20,18 @@ namespace OpenRA.Mods.RA
|
|||||||
public void Run(Action<string> emitError, Action<string> emitWarning)
|
public void Run(Action<string> emitError, Action<string> emitWarning)
|
||||||
{
|
{
|
||||||
var providedPrereqs = Rules.Info.Keys.Concat(
|
var providedPrereqs = Rules.Info.Keys.Concat(
|
||||||
Rules.Info.SelectMany( a => a.Value.Traits
|
Rules.Info.SelectMany(a => a.Value.Traits
|
||||||
.WithInterface<ProvidesCustomPrerequisiteInfo>()
|
.WithInterface<ProvidesCustomPrerequisiteInfo>()
|
||||||
.Select( p => p.Prerequisite ))).ToArray();
|
.Select(p => p.Prerequisite))).ToArray();
|
||||||
|
|
||||||
foreach( var i in Rules.Info )
|
// TODO: this check is case insensitive while the real check in-game is not
|
||||||
|
foreach (var i in Rules.Info)
|
||||||
{
|
{
|
||||||
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("!","")) )
|
if (!providedPrereqs.Contains(prereq.Replace("!", "")))
|
||||||
emitError( "Buildable actor {0} has prereq {1} not provided by anything.".F( i.Key, prereq ) );
|
emitError("Buildable actor {0} has prereq {1} not provided by anything.".F(i.Key, prereq));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -154,7 +154,7 @@ SONICTANK:
|
|||||||
Buildable:
|
Buildable:
|
||||||
Queue: Armor
|
Queue: Armor
|
||||||
BuildPaletteOrder: 100
|
BuildPaletteOrder: 100
|
||||||
Prerequisites: heavya,research
|
Prerequisites: heavya, researcha
|
||||||
Owner: atreides
|
Owner: atreides
|
||||||
Hotkey: o
|
Hotkey: o
|
||||||
Valued:
|
Valued:
|
||||||
|
|||||||
@@ -83,8 +83,8 @@ MEDIC:
|
|||||||
Buildable:
|
Buildable:
|
||||||
Queue: Infantry
|
Queue: Infantry
|
||||||
BuildPaletteOrder: 60
|
BuildPaletteOrder: 60
|
||||||
Owner: atreides,ordos
|
Owner: atreides, ordos
|
||||||
Prerequisites: research
|
Prerequisites: Research
|
||||||
Hotkey: m
|
Hotkey: m
|
||||||
Valued:
|
Valued:
|
||||||
Cost: 500
|
Cost: 500
|
||||||
|
|||||||
@@ -231,7 +231,7 @@ DEVIATORTANK:
|
|||||||
Buildable:
|
Buildable:
|
||||||
Queue: Armor
|
Queue: Armor
|
||||||
BuildPaletteOrder: 50
|
BuildPaletteOrder: 50
|
||||||
Prerequisites: heavyo,research
|
Prerequisites: heavyo, researcho
|
||||||
# Owner: ordos
|
# Owner: ordos
|
||||||
Hotkey: d
|
Hotkey: d
|
||||||
Mobile:
|
Mobile:
|
||||||
|
|||||||
Reference in New Issue
Block a user