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

Merge pull request #11629 from abcdefg30/reqPlayer

Browse Source 
Filter the lua PlayerProperties on Requires
This commit is contained in:
Oliver Brakmann
2016-07-13 15:23:21 +02:00
committed by GitHub
parent 8233857be1 d2c5aec08d
commit 43f406ad68
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenRA.Game/Scripting/ScriptContext.cs
View File

@@ -155,9 +155,11 @@ namespace OpenRA.Scripting
.ToArray(); .ToArray();
ActorCommands = new Cache<ActorInfo, Type[]>(FilterActorCommands); ActorCommands = new Cache<ActorInfo, Type[]>(FilterActorCommands);
PlayerCommands = Game.ModData.ObjectCreator
var knownPlayerCommands = Game.ModData.ObjectCreator
.GetTypesImplementing<ScriptPlayerProperties>() .GetTypesImplementing<ScriptPlayerProperties>()
.ToArray(); .ToArray();
PlayerCommands = FilterCommands(world.Map.Rules.Actors["player"], knownPlayerCommands);
runtime.Globals["GameDir"] = Platform.GameDir; runtime.Globals["GameDir"] = Platform.GameDir;
runtime.DoBuffer(File.Open(Platform.ResolvePath(".", "lua", "scriptwrapper.lua"), FileMode.Open, FileAccess.Read).ReadAllText(), "scriptwrapper.lua").Dispose(); runtime.DoBuffer(File.Open(Platform.ResolvePath(".", "lua", "scriptwrapper.lua"), FileMode.Open, FileAccess.Read).ReadAllText(), "scriptwrapper.lua").Dispose();
@@ -280,9 +282,14 @@ namespace OpenRA.Scripting
static readonly object[] NoArguments = new object[0]; static readonly object[] NoArguments = new object[0];
Type[] FilterActorCommands(ActorInfo ai) Type[] FilterActorCommands(ActorInfo ai)
{
return FilterCommands(ai, knownActorCommands);
}
Type[] FilterCommands(ActorInfo ai, Type[] knownCommands)
{ {
var method = typeof(ActorInfo).GetMethod("HasTraitInfo"); var method = typeof(ActorInfo).GetMethod("HasTraitInfo");
return knownActorCommands.Where(c => ExtractRequiredTypes(c) return knownCommands.Where(c => ExtractRequiredTypes(c)
.All(t => (bool)method.MakeGenericMethod(t).Invoke(ai, NoArguments))) .All(t => (bool)method.MakeGenericMethod(t).Invoke(ai, NoArguments)))
.ToArray(); .ToArray();
} }