tent works, gun is a bit broken

This commit is contained in:
Chris Forbes
2009-10-09 23:34:20 +13:00
parent a08bcd9a17
commit 9f0600efe4
3 changed files with 13 additions and 3 deletions

View File

@@ -4,6 +4,7 @@ using OpenRa.FileFormats;
using System.Linq;
using OpenRa.Game.Graphics;
using OpenRa.TechTree;
namespace OpenRa.Game
{
@@ -33,7 +34,7 @@ namespace OpenRa.Game
Rules.LoadRules();
for( int i = 0 ; i < 8 ; i++ )
players.Add(i, new Player(i, string.Format("Multi{0}", i), OpenRa.TechTree.Race.Soviet));
players.Add(i, new Player(i, string.Format("Multi{0}", i), Race.Allies));
map = new Map(new IniFile(FileSystem.Open(mapName)));
FileSystem.Mount(new Package(map.Theater + ".mix"));
@@ -51,7 +52,7 @@ namespace OpenRa.Game
network = new Network();
var buildings = new[] { "fact", "powr", "apwr", "barr", "atek", "stek", "dome" };
var buildings = new[] { "fact", "powr", "apwr", "barr", "atek", "stek", "dome", "tent", "gun" };
buildingCreation = buildings.ToDictionary(s => s,
s => (Func<int2, Player, PlayerOwned>)(
(l, o) => new Building(s, l, o, this)));

View File

@@ -4,6 +4,7 @@ using System.Linq;
using System.IO;
using OpenRa.FileFormats;
using OpenRa.Game.Graphics;
using IjwFramework.Types;
namespace OpenRa.Game.GameRules
{
@@ -98,7 +99,7 @@ namespace OpenRa.Game.GameRules
field.SetValue( this, x.Value );
else if( field.FieldType == typeof( ArmorType ) )
field.SetValue( this, Enum.Parse( typeof( ArmorType ), x.Value ) );
field.SetValue( this, Enum<ArmorType>.Parse(x.Value) );
else if( field.FieldType == typeof( bool ) )
field.SetValue( this, ParseYesNo( x.Value ) );

View File

@@ -72,6 +72,14 @@
<sequence name="make" start="0" length="*" src="barrmake" />
</unit>
<!-- allied barracks -->
<unit name="tent">
<sequence name="idle" start="0" length="10"/>
<sequence name="damaged-idle" start="10" length="10"/>
<sequence name="make" start="0" length="*" src="tentmake" />
</unit>
<!-- radar dome -->
<unit name="dome">