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

Migrated Minelayer.MinefieldDepth to use WDist instead of float

Browse Source
This commit is contained in:
reaperrr
2016-03-24 18:41:42 +01:00
parent 251b1b44d4
commit ade49ba1be
2 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -676,6 +676,22 @@ namespace OpenRA.Mods.Common.UtilityCommands
} }
} }
// Migrated Minelayer.MinefieldDepth to use WDist instead of float
if (engineVersion < 20160325)
{
if (node.Key.StartsWith("Minelayer"))
{
var depthNode = node.Value.Nodes.FirstOrDefault(x => x.Key == "MinefieldDepth");
if (depthNode != null)
{
// The MinefieldDepth value is now a WDist, so multiply the float value with 1024.
var oldValue = FieldLoader.GetValue<float>("MinefieldDepth", depthNode.Value.Value);
var newValue = (int)(oldValue * 1024);
depthNode.Value.Value = newValue.ToString();
}
}
}
UpgradeActorRules(engineVersion, ref node.Value.Nodes, node, depth + 1); UpgradeActorRules(engineVersion, ref node.Value.Nodes, node, depth + 1);
} }
} }

6
OpenRA.Mods.RA/Traits/Minelayer.cs
View File

@@ -26,7 +26,7 @@ namespace OpenRA.Mods.RA.Traits
public readonly string AmmoPoolName = "primary"; public readonly string AmmoPoolName = "primary";
public readonly float MinefieldDepth = 1.5f; public readonly WDist MinefieldDepth = new WDist(1536);
public object Create(ActorInitializer init) { return new Minelayer(init.Self); } public object Create(ActorInitializer init) { return new Minelayer(init.Self); }
} }
@@ -97,7 +97,7 @@ namespace OpenRA.Mods.RA.Traits
} }
} }
static IEnumerable<CPos> GetMinefieldCells(CPos start, CPos end, float depth) static IEnumerable<CPos> GetMinefieldCells(CPos start, CPos end, WDist depth)
{ {
var mins = CPos.Min(start, end); var mins = CPos.Min(start, end);
var maxs = CPos.Max(start, end); var maxs = CPos.Max(start, end);
@@ -113,7 +113,7 @@ namespace OpenRA.Mods.RA.Traits
for (var i = mins.X; i <= maxs.X; i++) for (var i = mins.X; i <= maxs.X; i++)
for (var j = mins.Y; j <= maxs.Y; j++) for (var j = mins.Y; j <= maxs.Y; j++)
if (Math.Abs(q.X * i + q.Y * j + c) < depth) if (Math.Abs(q.X * i + q.Y * j + c) * 1024 < depth.Length)
yield return new CPos(i, j); yield return new CPos(i, j);
} }