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

Improve TS map importer and reimport classic maps.

Browse Source
This commit is contained in:
Paul Chote
2020-07-09 17:57:42 +01:00
committed by abcdefg30
parent c5ea496c45
commit 70cb0d2924
43 changed files with 10611 additions and 8870 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
OpenRA.Mods.Cnc/UtilityCommands/ImportTSMapCommand.cs
View File

@@ -108,6 +108,7 @@ namespace OpenRA.Mods.Cnc.UtilityCommands
{ 0x7D, "lobrdg_r_sw" }, // lobrdg4
// Other
{ 0x1B, "bigblue" },
{ 0xA7, "veinhole" },
{ 0xA8, "srock01" },
{ 0xA9, "srock02" },
@@ -241,6 +242,14 @@ namespace OpenRA.Mods.Cnc.UtilityCommands
{ "gatick", "ttnk" }
};
static readonly string[] LampActors =
{
"GALITE", "INGALITE", "NEGLAMP", "REDLAMP", "NEGRED", "GRENLAMP", "BLUELAMP", "YELWLAMP",
"INYELWLAMP", "PURPLAMP", "INPURPLAMP", "INORANLAMP", "INGRNLMP", "INREDLMP", "INBLULMP"
};
static readonly string[] CreepActors = { "DOGGIE", "VISC_SML", "VISC_LRG", "JFISH" };
[Desc("FILENAME", "Convert a Tiberian Sun map to the OpenRA format.")]
void IUtilityCommand.Run(Utility utility, string[] args)
{
@@ -273,6 +282,7 @@ namespace OpenRA.Mods.Cnc.UtilityCommands
ReadWaypoints(map, file, fullSize);
ReadOverlay(map, file, fullSize);
ReadLighting(map, file);
ReadLamps(map, file);
var spawnCount = map.ActorDefinitions.Count(n => n.Value.Value == "mpspawn");
var mapPlayers = new MapPlayers(map.Rules, spawnCount);
@@ -526,7 +536,7 @@ namespace OpenRA.Mods.Cnc.UtilityCommands
var health = short.Parse(entries[2]);
var rx = int.Parse(entries[3]);
var ry = int.Parse(entries[4]);
var facing = (byte)(byte.Parse(entries[5]) + 96);
var facing = (byte)(224 - byte.Parse(entries[5]));
var dx = rx - ry + fullSize.X - 1;
var dy = rx + ry - fullSize.X - 1;
@@ -535,14 +545,13 @@ namespace OpenRA.Mods.Cnc.UtilityCommands
var ar = new ActorReference(name)
{
new LocationInit(cell),
new OwnerInit("Neutral")
new OwnerInit(CreepActors.Contains(entries[1]) ? "Creeps" : "Neutral")
};
if (health != 256)
ar.Add(new HealthInit(100 * health / 256));
if (facing != 96)
ar.Add(new FacingInit(WAngle.FromFacing(facing)));
ar.Add(new FacingInit(WAngle.FromFacing(facing)));
if (isDeployed)
ar.Add(new DeployStateInit(DeployState.Deployed));
@@ -556,29 +565,92 @@ namespace OpenRA.Mods.Cnc.UtilityCommands
static void ReadLighting(Map map, IniFile file)
{
var lightingTypes = new[] { "Red", "Green", "Blue", "Ambient" };
var lightingTypes = new Dictionary<string, string>()
{
{ "Red", "RedTint" },
{ "Green", "GreenTint" },
{ "Blue", "BlueTint" },
{ "Ambient", "Intensity" },
{ "Level", "HeightStep" },
{ "Ground", null }
};
var lightingSection = file.GetSection("Lighting");
var parsed = new Dictionary<string, float>();
var lightingNodes = new List<MiniYamlNode>();
foreach (var kv in lightingSection)
{
if (lightingTypes.Contains(kv.Key))
{
var val = FieldLoader.GetValue<float>(kv.Key, kv.Value);
if (val != 1.0f)
lightingNodes.Add(new MiniYamlNode(kv.Key, FieldSaver.FormatValue(val)));
}
if (lightingTypes.ContainsKey(kv.Key))
parsed[kv.Key] = FieldLoader.GetValue<float>(kv.Key, kv.Value);
else
Console.WriteLine("Ignoring unknown lighting type: `{0}`".F(kv.Key));
}
// Merge Ground into Ambient
float ground = 0;
if (parsed.TryGetValue("Ground", out ground))
{
if (!parsed.ContainsKey("Ambient"))
parsed["Ambient"] = 1f;
parsed["Ambient"] -= ground;
}
foreach (var node in lightingTypes)
{
float val;
if (node.Value != null && parsed.TryGetValue(node.Key, out val) && ((node.Key == "Level" && val != 0) || (node.Key != "Level" && val != 1.0f)))
lightingNodes.Add(new MiniYamlNode(node.Value, FieldSaver.FormatValue(val)));
}
if (lightingNodes.Any())
{
map.RuleDefinitions.Nodes.Add(new MiniYamlNode("World", new MiniYaml("", new List<MiniYamlNode>()
map.RuleDefinitions.Nodes.Add(new MiniYamlNode("^BaseWorld", new MiniYaml("", new List<MiniYamlNode>()
{
new MiniYamlNode("GlobalLightingPaletteEffect", new MiniYaml("", lightingNodes))
new MiniYamlNode("TerrainLighting", new MiniYaml("", lightingNodes))
})));
}
}
static void ReadLamps(Map map, IniFile file)
{
var lightingTypes = new Dictionary<string, string>()
{
{ "LightIntensity", "Intensity" },
{ "LightRedTint", "RedTint" },
{ "LightGreenTint", "GreenTint" },
{ "LightBlueTint", "BlueTint" },
};
foreach (var lamp in LampActors)
{
var lightingSection = file.GetSection(lamp, true);
var lightingNodes = new List<MiniYamlNode>();
foreach (var kv in lightingSection)
{
if (kv.Key == "LightVisibility")
{
// Convert leptons to WDist
var visibility = FieldLoader.GetValue<int>(kv.Key, kv.Value);
lightingNodes.Add(new MiniYamlNode("Range", FieldSaver.FormatValue(new WDist(visibility * 4))));
}
else if (lightingTypes.ContainsKey(kv.Key))
{
// Some maps use "," instead of "."!
var value = FieldLoader.GetValue<float>(kv.Key, kv.Value.Replace(',', '.'));
lightingNodes.Add(new MiniYamlNode(lightingTypes[kv.Key], FieldSaver.FormatValue(value)));
}
}
if (lightingNodes.Any())
{
map.RuleDefinitions.Nodes.Add(new MiniYamlNode(lamp, new MiniYaml("", new List<MiniYamlNode>()
{
new MiniYamlNode("TerrainLightSource", new MiniYaml("", lightingNodes))
})));
}
}
}
}
}