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

Aftermath support, and spinners (on MGG, MRJ, TTNK) work (again?).

Browse Source
This commit is contained in:
Bob
2009-11-25 22:55:40 +13:00
parent 7c1c0835e1
commit ea096361bb
14 changed files with 732 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,14 +21,24 @@ namespace OpenRa.Game
public static Map Map;
public static TileSet TileSet;
public static void LoadRules(string mapFileName)
public static void LoadRules(string mapFileName, bool useAftermath)
{
AllRules = new IniFile(
FileSystem.Open("session.ini"),
FileSystem.Open(mapFileName),
FileSystem.Open("rules.ini"),
FileSystem.Open("units.ini"),
FileSystem.Open("campaignUnits.ini"));
if( useAftermath )
AllRules = new IniFile(
FileSystem.Open( "session.ini" ),
FileSystem.Open( mapFileName ),
FileSystem.Open( "aftrmath.ini" ),
FileSystem.Open( "rules.ini" ),
FileSystem.Open( "aftermathUnits.ini" ),
FileSystem.Open( "units.ini" ),
FileSystem.Open( "campaignUnits.ini" ) );
else
AllRules = new IniFile(
FileSystem.Open("session.ini"),
FileSystem.Open(mapFileName),
FileSystem.Open("rules.ini"),
FileSystem.Open("units.ini"),
FileSystem.Open("campaignUnits.ini"));
General = new GeneralInfo();
FieldLoader.Load(General, AllRules.GetSection("General"));

3
OpenRa.Game/GameRules/UnitInfo.cs
View File

@@ -59,12 +59,14 @@ namespace OpenRa.Game.GameRules
{
public readonly int Passengers = 0;
public readonly int Speed = 0;
public readonly bool NoMovingFire = false;
public MobileInfo(string name) : base(name) { }
}
public class InfantryInfo : MobileInfo
{
public readonly bool Crushable = true; // also on VehicleInfo, but with a different default
public readonly bool C4 = false;
public readonly bool FraidyCat = false;
public readonly bool Infiltrate = false;
@@ -78,7 +80,6 @@ namespace OpenRa.Game.GameRules
{
public readonly bool Crushable = false;
public readonly bool Tracked = false;
public readonly bool NoMovingFire = false;
public VehicleInfo(string name) : base(name) { }
}