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

Rules.NewUnitInfo rename -> ActorInfo

Browse Source
This commit is contained in:
Chris Forbes
2010-01-17 11:07:08 +13:00
parent 33ba3a58c5
commit d1ecfacd55
10 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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, ActorInfo> NewUnitInfo;
public static Dictionary<string, ActorInfo> ActorInfo;
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, ActorInfo>();
ActorInfo = new Dictionary<string, ActorInfo>();
foreach( var kv in yamlRules )
NewUnitInfo.Add(kv.Key.ToLowerInvariant(), new ActorInfo(kv.Key.ToLowerInvariant(), kv.Value, yamlRules));
ActorInfo.Add(kv.Key.ToLowerInvariant(), new ActorInfo(kv.Key.ToLowerInvariant(), kv.Value, yamlRules));
TechTree = new TechTree();
Map = new Map( AllRules );

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

@@ -11,7 +11,7 @@ namespace OpenRa.GameRules
public TechTree()
{
foreach( var info in Rules.NewUnitInfo.Values )
foreach( var info in Rules.ActorInfo.Values )
{
var pi = info.Traits.GetOrDefault<ProductionInfo>();
if (pi != null)
@@ -62,7 +62,7 @@ namespace OpenRa.GameRules
public IEnumerable<ActorInfo> AllBuildables(Player player, params string[] categories)
{
return Rules.NewUnitInfo.Values
return Rules.ActorInfo.Values
.Where( x => x.Name[ 0 ] != '^' )
.Where( x => categories.Contains( x.Category ) )
.Where( x => x.Traits.Contains<BuildableInfo>() );
@@ -72,7 +72,7 @@ namespace OpenRa.GameRules
{
var builtAt = info.Traits.Get<BuildableInfo>().BuiltAt;
if( builtAt.Length != 0 )
return builtAt.Select( x => Rules.NewUnitInfo[ x.ToLowerInvariant() ] );
return builtAt.Select( x => Rules.ActorInfo[ x.ToLowerInvariant() ] );
else
return producesIndex[ info.Category ];
}