Update map inits in RA/TD/D2k.

This commit is contained in:
Paul Chote
2020-07-07 20:06:26 +01:00
committed by abcdefg30
parent a2269e7ee7
commit 6d6822ca15
123 changed files with 2389 additions and 2424 deletions

View File

@@ -0,0 +1,72 @@
#region Copyright & License Information
/*
* Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation, either version 3 of
* the License, or (at your option) any later version. For more
* information, see COPYING.
*/
#endregion
using System.Collections.Generic;
namespace OpenRA.Mods.Common.UpdateRules.Rules
{
class UpdateMapInits : UpdateRule
{
public override string Name { get { return "Update map actor definitions"; } }
public override string Description
{
get
{
return "Several changes have been made to initial actor state in maps:\n" +
UpdateUtils.FormatMessageList(new[]
{
"Facing is now defined as a world angle",
"TurretFacing is now defined as a world angle relative to Facing",
"Plugs has been removed (use Plug instead)",
"TurretFacings has been removed (use TurretFacing instead)"
}) +
"\nMaps are automatically updated to keep the previous actor facings.";
}
}
public override IEnumerable<string> UpdateMapActorNode(ModData modData, MiniYamlNode actorNode)
{
if (actorNode.RemoveNodes("Plugs") > 0)
yield return "Initial plugs for actor {0} will need to be reconfigured using the map editor.".F(actorNode.Key);
if (actorNode.RemoveNodes("TurretFacings") > 0)
yield return "Initial turret facings for actor {0} will need to be reconfigured using the map editor.".F(actorNode.Key);
var bodyFacing = WAngle.Zero;
foreach (var facing in actorNode.ChildrenMatching("Facing"))
{
bodyFacing = WAngle.FromFacing(facing.NodeValue<int>());
facing.ReplaceValue(FieldSaver.FormatValue(bodyFacing));
}
var removeNodes = new List<MiniYamlNode>();
foreach (var facing in actorNode.ChildrenMatching("TurretFacing"))
{
var turretFacing = WAngle.FromFacing(facing.NodeValue<int>()) - bodyFacing;
if (turretFacing == WAngle.Zero)
removeNodes.Add(facing);
else
facing.ReplaceValue(FieldSaver.FormatValue(turretFacing));
}
foreach (var node in removeNodes)
actorNode.Value.Nodes.Remove(node);
}
public override IEnumerable<string> UpdateActorNode(ModData modData, MiniYamlNode actorNode)
{
foreach (var turret in actorNode.ChildrenMatching("Turreted"))
turret.RemoveNodes("PreviewFacing");
yield break;
}
}
}

View File

@@ -66,6 +66,7 @@ namespace OpenRA.Mods.Common.UpdateRules
new RemoveConditionManager(),
new ConvertSupportPowerRangesToFootprint(),
new UpdateTilesetColors(),
new UpdateMapInits(),
})
};

View File

@@ -32,6 +32,7 @@ namespace OpenRA.Mods.Common.UpdateRules
public virtual IEnumerable<string> UpdateChromeNode(ModData modData, MiniYamlNode chromeNode) { yield break; }
public virtual IEnumerable<string> UpdateTilesetNode(ModData modData, MiniYamlNode tilesetNode) { yield break; }
public virtual IEnumerable<string> UpdateChromeProviderNode(ModData modData, MiniYamlNode chromeProviderNode) { yield break; }
public virtual IEnumerable<string> UpdateMapActorNode(ModData modData, MiniYamlNode actorNode) { yield break; }
public virtual IEnumerable<string> BeforeUpdate(ModData modData) { yield break; }
public virtual IEnumerable<string> AfterUpdate(ModData modData) { yield break; }

View File

@@ -101,6 +101,18 @@ namespace OpenRA.Mods.Common.UpdateRules
manualSteps.AddRange(rule.BeforeUpdate(modData));
var mapActorsNode = yaml.Nodes.FirstOrDefault(n => n.Key == "Actors");
if (mapActorsNode != null)
{
var mapActors = new YamlFileSet()
{
Tuple.Create<IReadWritePackage, string, List<MiniYamlNode>>(null, "map.yaml", mapActorsNode.Value.Nodes)
};
manualSteps.AddRange(ApplyTopLevelTransform(modData, mapActors, rule.UpdateMapActorNode));
files.AddRange(mapActors);
}
var mapRulesNode = yaml.Nodes.FirstOrDefault(n => n.Key == "Rules");
if (mapRulesNode != null)
{