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

rename NewUnitInfo -> ActorInfo

Browse Source
This commit is contained in:
Chris Forbes
2010-01-17 10:00:46 +13:00
parent a2e1fe3d4f
commit a3ab1d77e7
9 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRa.Game/GameRules/NewUnitInfo.cs → OpenRa.Game/GameRules/ActorInfo.cs Executable file → Normal file
View File

@@ -9,13 +9,13 @@ using System.IO;
namespace OpenRa.GameRules
{
public class NewUnitInfo
public class ActorInfo
{
public readonly string Name;
public readonly string Category;
public readonly TypeDictionary Traits = new TypeDictionary();
public NewUnitInfo( string name, MiniYaml node, Dictionary<string, MiniYaml> allUnits )
public ActorInfo( string name, MiniYaml node, Dictionary<string, MiniYaml> allUnits )
{
var mergedNode = MergeWithParent( node, allUnits ).Nodes;

6
OpenRa.Game/GameRules/Rules.cs
View File

@@ -22,7 +22,7 @@ namespace OpenRa
public static Map Map;
public static TileSet TileSet;
public static Dictionary<string, NewUnitInfo> NewUnitInfo;
public static Dictionary<string, ActorInfo> NewUnitInfo;
public static void LoadRules(string mapFileName, bool useAftermath)
{
@@ -70,9 +70,9 @@ namespace OpenRa
yamlRules = MiniYaml.Merge( MiniYaml.FromFile( "[mod]Separate buildqueue for defense.yaml" ), yamlRules );
NewUnitInfo = new Dictionary<string, NewUnitInfo>();
NewUnitInfo = new Dictionary<string, ActorInfo>();
foreach( var kv in yamlRules )
NewUnitInfo.Add(kv.Key.ToLowerInvariant(), new NewUnitInfo(kv.Key.ToLowerInvariant(), kv.Value, yamlRules));
NewUnitInfo.Add(kv.Key.ToLowerInvariant(), new ActorInfo(kv.Key.ToLowerInvariant(), kv.Value, yamlRules));
TechTree = new TechTree();
Map = new Map( AllRules );

8
OpenRa.Game/GameRules/TechTree.cs
View File

@@ -7,7 +7,7 @@ namespace OpenRa.GameRules
{
public class TechTree
{
readonly Cache<string, List<NewUnitInfo>> producesIndex = new Cache<string, List<NewUnitInfo>>(x => new List<NewUnitInfo>());
readonly Cache<string, List<ActorInfo>> producesIndex = new Cache<string, List<ActorInfo>>(x => new List<ActorInfo>());
public TechTree()
{
@@ -34,7 +34,7 @@ namespace OpenRa.GameRules
return ret;
}
public bool CanBuild( NewUnitInfo info, Player player, Cache<string, List<Actor>> playerBuildings )
public bool CanBuild( ActorInfo info, Player player, Cache<string, List<Actor>> playerBuildings )
{
var bi = info.Traits.GetOrDefault<BuildableInfo>();
if( bi == null ) return false;
@@ -60,7 +60,7 @@ namespace OpenRa.GameRules
yield return unit.Name;
}
public IEnumerable<NewUnitInfo> AllBuildables(Player player, params string[] categories)
public IEnumerable<ActorInfo> AllBuildables(Player player, params string[] categories)
{
return Rules.NewUnitInfo.Values
.Where( x => x.Name[ 0 ] != '^' )
@@ -68,7 +68,7 @@ namespace OpenRa.GameRules
.Where( x => x.Traits.Contains<BuildableInfo>() );
}
public IEnumerable<NewUnitInfo> UnitBuiltAt( NewUnitInfo info )
public IEnumerable<ActorInfo> UnitBuiltAt( ActorInfo info )
{
var builtAt = info.Traits.Get<BuildableInfo>().BuiltAt;
if( builtAt.Length != 0 )