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

Revert format upgrader and map importers saving rules to external file.

Browse Source
This commit is contained in:
Paul Chote
2016-03-09 22:29:53 +00:00
parent dd677ae916
commit b0c0bf3151
4 changed files with 27 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,10 +33,8 @@ 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("");
public bool ValidateArguments(string[] args)
{
@@ -52,8 +50,6 @@ 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);
@@ -67,7 +63,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
Map = new Map(modData, modData.DefaultRules.TileSets[tileset], MapSize, MapSize)
{
Title = basic.GetValue("Name", Path.GetFileNameWithoutExtension(filename)),
Author = "Westwood Studios"
Author = "Westwood Studios",
};
Map.RequiresMod = modData.Manifest.Mod.Id;
@@ -96,16 +92,10 @@ namespace OpenRA.Mods.Common.UtilityCommands
Map.FixOpenAreas();
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);
var rulesText = Rules.Nodes.ToLines(false).JoinWith("\n");
Package.Update("rules.yaml", System.Text.Encoding.ASCII.GetBytes(rulesText));
}
Map.Save(Package);
Map.Save(package);
Console.WriteLine(dest + " saved.");
}
@@ -140,11 +130,11 @@ namespace OpenRA.Mods.Common.UtilityCommands
if (briefing.Length == 0)
return;
var worldNode = Rules.Nodes.FirstOrDefault(n => n.Key == "World");
var worldNode = Map.RuleDefinitions.Nodes.FirstOrDefault(n => n.Key == "World");
if (worldNode == null)
{
worldNode = new MiniYamlNode("World", new MiniYaml("", new List<MiniYamlNode>()));
Rules.Nodes.Add(worldNode);
Map.RuleDefinitions.Nodes.Add(worldNode);
}
var missionData = worldNode.Value.Nodes.FirstOrDefault(n => n.Key == "MissionData");
@@ -201,11 +191,11 @@ namespace OpenRA.Mods.Common.UtilityCommands
if (videos.Any())
{
var worldNode = Rules.Nodes.FirstOrDefault(n => n.Key == "World");
var worldNode = Map.RuleDefinitions.Nodes.FirstOrDefault(n => n.Key == "World");
if (worldNode == null)
{
worldNode = new MiniYamlNode("World", new MiniYaml("", new List<MiniYamlNode>()));
Rules.Nodes.Add(worldNode);
Map.RuleDefinitions.Nodes.Add(worldNode);
}
var missionData = worldNode.Value.Nodes.FirstOrDefault(n => n.Key == "MissionData");
@@ -298,7 +288,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
craters.Add(node);
}
var worldNode = Rules.Nodes.FirstOrDefault(n => n.Key == "World");
var worldNode = Map.RuleDefinitions.Nodes.FirstOrDefault(n => n.Key == "World");
if (worldNode == null)
worldNode = new MiniYamlNode("World", new MiniYaml("", new List<MiniYamlNode>()));
@@ -316,8 +306,8 @@ namespace OpenRA.Mods.Common.UtilityCommands
worldNode.Value.Nodes.Add(smudgeLayer);
}
if (worldNode.Value.Nodes.Any() && !Rules.Nodes.Contains(worldNode))
Rules.Nodes.Add(worldNode);
if (worldNode.Value.Nodes.Any() && !Map.RuleDefinitions.Nodes.Contains(worldNode))
Map.RuleDefinitions.Nodes.Add(worldNode);
}
// TODO: fix this -- will have bitrotted pretty badly.

29
OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs
View File

@@ -948,20 +948,10 @@ namespace OpenRA.Mods.Common.UtilityCommands
rules.Value.Nodes.Add(playerNode);
}
// Format 9 -> 10 extracted map rules, sequences, voxelsequences, weapons, voices, music, notifications,
// and translations to external files, moved smudges to SmudgeLayer, and uses map.png for all maps
// Format 9 -> 10 moved smudges to SmudgeLayer, and uses map.png for all maps
if (mapFormat < 10)
{
ExtractSmudges(yaml);
ExtractOrRemoveRules(package, yaml, "Rules", "rules.yaml");
ExtractOrRemoveRules(package, yaml, "Sequences", "sequences.yaml");
ExtractOrRemoveRules(package, yaml, "VoxelSequences", "voxels.yaml");
ExtractOrRemoveRules(package, yaml, "Weapons", "weapons.yaml");
ExtractOrRemoveRules(package, yaml, "Voices", "voices.yaml");
ExtractOrRemoveRules(package, yaml, "Music", "music.yaml");
ExtractOrRemoveRules(package, yaml, "Notifications", "notifications.yaml");
ExtractOrRemoveRules(package, yaml, "Translations", "translations.yaml");
if (package.Contains("map.png"))
yaml.Nodes.Add(new MiniYamlNode("LockPreview", new MiniYaml("True")));
}
@@ -1023,22 +1013,5 @@ namespace OpenRA.Mods.Common.UtilityCommands
worldNode.Value.Nodes.Add(smudgeLayer);
}
}
static void ExtractOrRemoveRules(IReadWritePackage package, MiniYaml yaml, string key, string filename)
{
var node = yaml.Nodes.FirstOrDefault(n => n.Key == key);
if (node == null)
return;
if (node.Value.Nodes.Any())
{
var rulesText = node.Value.Nodes.ToLines(false).JoinWith("\n");
package.Update(filename, System.Text.Encoding.ASCII.GetBytes(rulesText));
node.Value.Value = filename;
node.Value.Nodes.Clear();
}
else
yaml.Nodes.Remove(node);
}
}
}