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

Fix old shape scaling

Browse Source
This commit is contained in:
reaperrr
2017-06-16 00:34:57 +02:00
committed by Paul Chote
parent 7d3cf7894b
commit 6b3c04a584
1 changed files with 34 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -640,6 +640,9 @@ namespace OpenRA.Mods.Common.UtilityCommands
if (node.Key == "Offset" && parent.Key.StartsWith("WithHarvestOverlay", StringComparison.Ordinal)) if (node.Key == "Offset" && parent.Key.StartsWith("WithHarvestOverlay", StringComparison.Ordinal))
RenameNodeKey(node, "LocalOffset"); RenameNodeKey(node, "LocalOffset");
var gridType = modData.Manifest.Get<MapGrid>().Type;
if (gridType == MapGridType.RectangularIsometric)
{
if (node.Key == "LocalOffset") if (node.Key == "LocalOffset")
{ {
var orig = FieldLoader.GetValue<WVec[]>(node.Key, node.Value.Value); var orig = FieldLoader.GetValue<WVec[]>(node.Key, node.Value.Value);
@@ -649,6 +652,30 @@ namespace OpenRA.Mods.Common.UtilityCommands
(int)Math.Round(Math.Sqrt(2) * o.Z)))); (int)Math.Round(Math.Sqrt(2) * o.Z))));
node.Value.Value = scaled.JoinWith(", "); node.Value.Value = scaled.JoinWith(", ");
} }
if (node.Key == "Radius" && parent.Key == "Shape")
{
var orig = FieldLoader.GetValue<WDist>(node.Key, node.Value.Value);
var scaled = (int)Math.Round(Math.Sqrt(2) * orig.Length);
node.Value.Value = scaled.ToString();
}
if (node.Key == "TopLeft" || node.Key == "BottomRight" || node.Key == "PointA" || node.Key == "PointB")
{
var orig = FieldLoader.GetValue<int2>(node.Key, node.Value.Value);
var scaled = new int2(
(int)Math.Round(Math.Sqrt(2) * orig.X),
(int)Math.Round(Math.Sqrt(2) * orig.Y));
node.Value.Value = scaled.ToString();
}
if (node.Key == "VerticalTopOffset" || node.Key == "VerticalBottomOffset")
{
var orig = FieldLoader.GetValue<int>(node.Key, node.Value.Value);
var scaled = (int)Math.Round(Math.Sqrt(2) * orig);
node.Value.Value = scaled.ToString();
}
}
} }
// Refactor Rectangle shape RotateToIsometry bool into WAngle LocalYaw // Refactor Rectangle shape RotateToIsometry bool into WAngle LocalYaw