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

Move advanced map yaml to their own files.

Browse Source
This commit is contained in:
Paul Chote
2016-02-22 20:59:14 +00:00
parent e313ce62f0
commit b969d61466
9 changed files with 108 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
OpenRA.Mods.Common/UtilityCommands/ImportLegacyMapCommand.cs
View File

@@ -33,6 +33,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
public ModData ModData;
public Map Map;
public IReadWritePackage Package;
public List<string> Players = new List<string>();
public MapPlayers MapPlayers;
public MiniYaml Rules = new MiniYaml("");
@@ -51,6 +52,8 @@ namespace OpenRA.Mods.Common.UtilityCommands
Game.ModData = modData;
var filename = args[1];
var dest = Path.GetFileNameWithoutExtension(args[1]) + ".oramap";
Package = new ZipFile(modData.ModFiles, dest, true);
using (var stream = modData.DefaultFileSystem.Open(filename))
{
var file = new IniFile(stream);
@@ -79,7 +82,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
ReadActors(file);
LoadSmudges(file, "SMUDGE", MapSize, Map);
LoadSmudges(file, "SMUDGE");
var waypoints = file.GetSection("Waypoints");
LoadWaypoints(Map, waypoints, MapSize);
@@ -93,11 +96,16 @@ namespace OpenRA.Mods.Common.UtilityCommands
Map.FixOpenAreas();
Map.RuleDefinitions = Rules.Nodes;
if (Rules.Nodes.Any())
{
// HACK: bypassing the readonly modifier here is still better than leaving this mutable by everyone
typeof(Map).GetField("RuleDefinitions").SetValue(Map, new[] { "rules.yaml" });
var dest = Path.GetFileNameWithoutExtension(args[1]) + ".oramap";
var package = new ZipFile(modData.ModFiles, dest, true);
Map.Save(package);
var rulesText = Rules.Nodes.ToLines(false).JoinWith("\n");
Package.Update("rules.yaml", System.Text.Encoding.ASCII.GetBytes(rulesText));
}
Map.Save(Package);
Console.WriteLine(dest + " saved.");
}
@@ -271,7 +279,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
}
}
static void LoadSmudges(IniFile file, string section, int mapSize, Map map)
void LoadSmudges(IniFile file, string section)
{
var scorches = new List<MiniYamlNode>();
var craters = new List<MiniYamlNode>();
@@ -281,7 +289,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
var parts = s.Value.Split(',');
var loc = Exts.ParseIntegerInvariant(parts[1]);
var type = parts[0].ToLowerInvariant();
var key = "{0},{1}".F(loc % mapSize, loc / mapSize);
var key = "{0},{1}".F(loc % MapSize, loc / MapSize);
var value = "{0},{1}".F(type, parts[2]);
var node = new MiniYamlNode(key, value);
if (type.StartsWith("sc"))
@@ -290,7 +298,10 @@ namespace OpenRA.Mods.Common.UtilityCommands
craters.Add(node);
}
var worldNode = new MiniYamlNode("World", new MiniYaml("", new List<MiniYamlNode>()));
var worldNode = Rules.Nodes.FirstOrDefault(n => n.Key == "World");
if (worldNode == null)
worldNode = new MiniYamlNode("World", new MiniYaml("", new List<MiniYamlNode>()));
if (scorches.Any())
{
var initialScorches = new MiniYamlNode("InitialSmudges", new MiniYaml("", scorches));
@@ -305,8 +316,8 @@ namespace OpenRA.Mods.Common.UtilityCommands
worldNode.Value.Nodes.Add(smudgeLayer);
}
if (worldNode.Value.Nodes.Any())
map.RuleDefinitions.Add(worldNode);
if (worldNode.Value.Nodes.Any() && !Rules.Nodes.Contains(worldNode))
Rules.Nodes.Add(worldNode);
}
// TODO: fix this -- will have bitrotted pretty badly.