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

Misc (style) improvements in the upgrade rule code

Browse Source
This commit is contained in:
abcdefg30
2015-11-28 14:54:17 +01:00
parent 5c6c44ba7b
commit a10ea0350e
1 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2547,8 +2547,8 @@ namespace OpenRA.Mods.Common.UtilityCommands
oldNodeAtName = "_" + curNode.Key.Split('@')[1]; oldNodeAtName = "_" + curNode.Key.Split('@')[1];
// Per Cell Damage Model // Per Cell Damage Model
if (curNode.Value.Nodes.Where(n => n.Key.Contains("DamageModel") && if (curNode.Value.Nodes.Any(n => n.Key.Contains("DamageModel") &&
n.Value.Value.Contains("PerCell")).Any()) n.Value.Value.Contains("PerCell")))
{ {
warheadCounter++; warheadCounter++;
@@ -2583,14 +2583,15 @@ namespace OpenRA.Mods.Common.UtilityCommands
} }
// HealthPercentage damage model // HealthPercentage damage model
if (curNode.Value.Nodes.Where(n => n.Key.Contains("DamageModel") && if (curNode.Value.Nodes.Any(n => n.Key.Contains("DamageModel") &&
n.Value.Value.Contains("HealthPercentage")).Any()) n.Value.Value.Contains("HealthPercentage")))
{ {
warheadCounter++; warheadCounter++;
var newYaml = new List<MiniYamlNode>(); var newYaml = new List<MiniYamlNode>();
var temp = curNode.Value.Nodes.FirstOrDefault(n => n.Key == "Size"); // New HealthPercentage warhead allows 2 spreads, as opposed to 1 size // New HealthPercentage warhead allows 2 spreads, as opposed to 1 size
var temp = curNode.Value.Nodes.FirstOrDefault(n => n.Key == "Size");
if (temp != null) if (temp != null)
{ {
var newValue = temp.Value.Value.Split(',').First() + "c0"; var newValue = temp.Value.Value.Split(',').First() + "c0";
@@ -2619,7 +2620,8 @@ namespace OpenRA.Mods.Common.UtilityCommands
} }
// SpreadDamage // SpreadDamage
{ // Always occurs, since by definition all warheads were SpreadDamage warheads before // Always occurs, since by definition all warheads were SpreadDamage warheads before
{
warheadCounter++; warheadCounter++;
var newYaml = new List<MiniYamlNode>(); var newYaml = new List<MiniYamlNode>();
@@ -2646,8 +2648,8 @@ namespace OpenRA.Mods.Common.UtilityCommands
} }
// DestroyResource // DestroyResource
if (curNode.Value.Nodes.Where(n => n.Key.Contains("DestroyResources") || if (curNode.Value.Nodes.Any(n => n.Key.Contains("DestroyResources") ||
n.Key.Contains("Ore")).Any()) n.Key.Contains("Ore")))
{ {
warheadCounter++; warheadCounter++;
@@ -2665,7 +2667,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
} }
// CreateResource // CreateResource
if (curNode.Value.Nodes.Where(n => n.Key.Contains("AddsResourceType")).Any()) if (curNode.Value.Nodes.Any(n => n.Key.Contains("AddsResourceType")))
{ {
warheadCounter++; warheadCounter++;
@@ -2684,7 +2686,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
} }
// LeaveSmudge // LeaveSmudge
if (curNode.Value.Nodes.Where(n => n.Key.Contains("SmudgeType")).Any()) if (curNode.Value.Nodes.Any(n => n.Key.Contains("SmudgeType")))
{ {
warheadCounter++; warheadCounter++;
@@ -2703,8 +2705,8 @@ namespace OpenRA.Mods.Common.UtilityCommands
} }
// CreateEffect - Explosion // CreateEffect - Explosion
if (curNode.Value.Nodes.Where(n => n.Key.Contains("Explosion") || if (curNode.Value.Nodes.Any(n => n.Key.Contains("Explosion") ||
n.Key.Contains("ImpactSound")).Any()) n.Key.Contains("ImpactSound")))
{ {
warheadCounter++; warheadCounter++;
@@ -2725,8 +2727,8 @@ namespace OpenRA.Mods.Common.UtilityCommands
} }
// CreateEffect - Water Explosion // CreateEffect - Water Explosion
if (curNode.Value.Nodes.Where(n => n.Key.Contains("WaterExplosion") || if (curNode.Value.Nodes.Any(n => n.Key.Contains("WaterExplosion") ||
n.Key.Contains("WaterImpactSound")).Any()) n.Key.Contains("WaterImpactSound")))
{ {
warheadCounter++; warheadCounter++;