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

Adds the RequiresPrerequisites field into ProvidesCustomPrerequisite and all the logic behind it.

Browse Source
This commit is contained in:
WolfGaming
2014-07-16 05:34:47 +00:00
parent 62820430de
commit 7b10da6bde
3 changed files with 36 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -61,6 +61,13 @@ namespace OpenRA.Mods.RA
watchers.RemoveAll(x => x.RegisteredBy == tte);
}
public bool HasPrerequisites(IEnumerable<string> prerequisites)
{
var ownedPrereqs = TechTree.GatherOwnedPrerequisites(player);
return prerequisites.All(p => !(p.Replace("~", "").StartsWith("!")
^ !ownedPrereqs.ContainsKey(p.Replace("!", "").Replace("~", ""))));
}
static Cache<string, List<Actor>> GatherOwnedPrerequisites(Player player)
{
var ret = new Cache<string, List<Actor>>(x => new List<Actor>());
@@ -69,7 +76,7 @@ namespace OpenRA.Mods.RA
// Add all actors that provide prerequisites
var prerequisites = player.World.ActorsWithTrait<ITechTreePrerequisite>()
.Where(a => a.Actor.Owner == player && !a.Actor.IsDead() && a.Actor.IsInWorld);
.Where(a => a.Actor.Owner == player && a.Actor.IsInWorld && !a.Actor.IsDead());
foreach (var b in prerequisites)
{