epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add support for negative prerequisites (#1323)

Browse Source
This commit is contained in:
Chris Forbes
2012-02-11 11:13:39 +13:00
parent 1f8859f26b
commit 3cf09e656f
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.RA/Lint/LintBuildablePrerequisites.cs
View File

@@ -29,7 +29,7 @@ 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) ) 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 ) );
} }
} }

17
OpenRA.Mods.RA/Player/TechTree.cs
View File

@@ -86,15 +86,18 @@ namespace OpenRA.Mods.RA
this.hasPrerequisites = false; this.hasPrerequisites = false;
} }
bool HasPrerequisites(Cache<string, List<Actor>> buildings)
{
foreach (var p in prerequisites)
if (p.StartsWith("!") ^
!buildings.Keys.Contains(p.Replace("!","")))
return false;
return true;
}
public void Update(Cache<string, List<Actor>> buildings) public void Update(Cache<string, List<Actor>> buildings)
{ {
var nowHasPrerequisites = true; var nowHasPrerequisites = HasPrerequisites(buildings);
foreach (var p in prerequisites)
if (!buildings.Keys.Contains(p))
{
nowHasPrerequisites = false;
break;
}
if( nowHasPrerequisites && !hasPrerequisites ) if( nowHasPrerequisites && !hasPrerequisites )
watcher.PrerequisitesAvailable(key); watcher.PrerequisitesAvailable(key);