From 275100938d89db75ea764764a11e5e6bb1c8e0b8 Mon Sep 17 00:00:00 2001 From: Bob Date: Tue, 12 Jan 2010 15:25:27 +1300 Subject: [PATCH] fixes the build palette, and a few silly errors. --- OpenRa.DataStructures/TypeDictionary.cs | 2 +- RulesConverter/Program.cs | 3 ++- ra.yaml | 9 ++++++++- regen-yaml.cmd | 0 units.ini | 6 +++--- 5 files changed, 14 insertions(+), 6 deletions(-) mode change 100644 => 100755 regen-yaml.cmd diff --git a/OpenRa.DataStructures/TypeDictionary.cs b/OpenRa.DataStructures/TypeDictionary.cs index e4309999bd..81fedaf549 100755 --- a/OpenRa.DataStructures/TypeDictionary.cs +++ b/OpenRa.DataStructures/TypeDictionary.cs @@ -22,7 +22,7 @@ namespace OpenRa public bool Contains() { - return innerInherit.Keys.Contains( typeof( T ) ); + return innerInherit[ typeof( T ) ].Count != 0; } public T Get() diff --git a/RulesConverter/Program.cs b/RulesConverter/Program.cs index 29c2a8ae03..3a850745fc 100644 --- a/RulesConverter/Program.cs +++ b/RulesConverter/Program.cs @@ -143,7 +143,8 @@ namespace RulesConverter }, { "Production", new PL { - { "SpawnOffset", "SpawnOffset" } } + { "SpawnOffset", "SpawnOffset" }, + { "Produces", "Produces" } } }, }; diff --git a/ra.yaml b/ra.yaml index 47c9ae40db..0ea0dce87c 100644 --- a/ra.yaml +++ b/ra.yaml @@ -1052,10 +1052,11 @@ WEAP: Armor: light Crewed: yes Sight: 4 - RenderWarFactory: RenderBuilding: + RenderWarFactory: RallyPoint: Production: + Produces: Vehicle IronCurtainable: SYRD: @@ -1127,6 +1128,8 @@ FACT: Crewed: yes Sight: 5 RenderBuilding: + Production: + Produces: Building,Defense ConstructionYard: IronCurtainable: @@ -1210,6 +1213,7 @@ HPAD: RenderBuilding: Production: SpawnOffset: 0,-4 + Produces: Plane BelowUnits: Reservable: IronCurtainable: @@ -1264,6 +1268,7 @@ AFLD: Sight: 7 RenderBuilding: Production: + Produces: Plane BelowUnits: Reservable: IronCurtainable: @@ -1368,6 +1373,7 @@ BARR: RenderBuilding: RallyPoint: Production: + Produces: Infantry IronCurtainable: TENT: @@ -1395,6 +1401,7 @@ TENT: RenderBuilding: RallyPoint: Production: + Produces: Infantry IronCurtainable: KENN: diff --git a/regen-yaml.cmd b/regen-yaml.cmd old mode 100644 new mode 100755 diff --git a/units.ini b/units.ini index 4e22c79415..0386e52630 100644 --- a/units.ini +++ b/units.ini @@ -355,7 +355,7 @@ SelectionPriority=3 LongDesc=Provides Allied advanced technologies.\n Special Ability: GPS Satellite [WEAP] Description=War Factory -Traits=Building, RenderWarFactory, RenderBuilding, RallyPoint, Production, IronCurtainable +Traits=Building, RenderBuilding, RenderWarFactory, RallyPoint, Production, IronCurtainable Dimensions=3,2 Footprint=xxx xxx Produces=Vehicle @@ -380,7 +380,7 @@ SelectionPriority=3 LongDesc=Produces and repairs submarines and \ntransports [FACT] Description=Construction Yard -Traits=Building, RenderBuilding, ConstructionYard, IronCurtainable +Traits=Building, RenderBuilding, Production, ConstructionYard, IronCurtainable Dimensions=3,3 Footprint=xxx xxx xxx Produces=Building,Defense @@ -898,4 +898,4 @@ LongDesc=Makes a single unit invulnerable for a \nshort time. Image=infxicon Prerequisite=IRON TechLevel=12 -Impl=IronCurtainPower +Impl=IronCurtainPower