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

Make the TS map importer aware of deployable actors who use upgrades instead of transforming

Browse Source
This commit is contained in:
Pavel Penev
2016-02-22 02:39:59 +02:00
parent 17ef6efefc
commit 118d015e4d
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
OpenRA.Mods.TS/UtilityCommands/ImportTSMapCommand.cs
View File

@@ -149,6 +149,12 @@ namespace OpenRA.Mods.TS.UtilityCommands
{ 0x03, new byte[] { 0x7E } } { 0x03, new byte[] { 0x7E } }
}; };
private static readonly Dictionary<string, string> DeployableActors = new Dictionary<string, string>()
{
{ "gadpsa", "lpst" },
{ "gatick", "ttnk" }
};
[Desc("FILENAME", "Convert a Tiberian Sun map to the OpenRA format.")] [Desc("FILENAME", "Convert a Tiberian Sun map to the OpenRA format.")]
public void Run(ModData modData, string[] args) public void Run(ModData modData, string[] args)
{ {
@@ -387,9 +393,17 @@ namespace OpenRA.Mods.TS.UtilityCommands
var structuresSection = file.GetSection(type, true); var structuresSection = file.GetSection(type, true);
foreach (var kv in structuresSection) foreach (var kv in structuresSection)
{ {
var isDeployed = false;
var entries = kv.Value.Split(','); var entries = kv.Value.Split(',');
var name = entries[1].ToLowerInvariant(); var name = entries[1].ToLowerInvariant();
if (DeployableActors.ContainsKey(name))
{
name = DeployableActors[name];
isDeployed = true;
}
var health = short.Parse(entries[2]); var health = short.Parse(entries[2]);
var rx = int.Parse(entries[3]); var rx = int.Parse(entries[3]);
var ry = int.Parse(entries[4]); var ry = int.Parse(entries[4]);
@@ -407,6 +421,9 @@ namespace OpenRA.Mods.TS.UtilityCommands
new FacingInit(facing), new FacingInit(facing),
}; };
if (isDeployed)
ar.Add(new DeployStateInit(DeployState.Deployed));
if (!map.Rules.Actors.ContainsKey(name)) if (!map.Rules.Actors.ContainsKey(name))
Console.WriteLine("Ignoring unknown actor type: `{0}`".F(name)); Console.WriteLine("Ignoring unknown actor type: `{0}`".F(name));
else else