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

Fix a collection of whitespace-style issues in Mods.Common.

Browse Source
This commit is contained in:
Paul Chote
2014-12-14 17:04:37 +13:00
parent 299a933dac
commit ecd3809bc2
51 changed files with 142 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Common/UtilityCommands/ExtractLuaDocsCommand.cs
View File

@@ -64,6 +64,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
var desc = m.HasAttribute<DescAttribute>() ? m.GetCustomAttributes<DescAttribute>(true).First().Lines.JoinWith("\n") : "";
Console.WriteLine("<tr><td align=\"right\" width=\"50%\"><strong>{0}</strong></td><td>{1}</td></tr>".F(m.LuaDocString(), desc));
}
Console.WriteLine("</table>");
}
@@ -108,6 +109,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
Console.WriteLine("</td></tr>");
}
Console.WriteLine("</table>");
}

1
OpenRA.Mods.Common/UtilityCommands/ExtractTraitDocsCommand.cs
View File

@@ -84,6 +84,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
doc.Append(line + " ");
doc.AppendLine("</td></tr>");
}
doc.AppendLine("</table>");
}

2
OpenRA.Mods.Common/UtilityCommands/GenerateMinimapCommand.cs
View File

@@ -13,8 +13,8 @@ using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text;
using OpenRA.Graphics;
using OpenRA.FileSystem;
using OpenRA.Graphics;
namespace OpenRA.Mods.Common.UtilityCommands
{

1
OpenRA.Mods.Common/UtilityCommands/LegacyMapImporter.cs
View File

@@ -269,7 +269,6 @@ namespace OpenRA.Mods.Common.UtilityCommands
for (var j = 0; j < mapSize; j++)
for (var i = 0; i < mapSize; i++)
map.MapTiles.Value[new CPos(i, j)] = new TerrainTile(types[i, j], ms.ReadUInt8());
}
void UnpackRAOverlayData(MemoryStream ms)

4
OpenRA.Mods.Common/UtilityCommands/RemapShpCommand.cs
View File

@@ -14,11 +14,11 @@ using System.Drawing;
using System.IO;
using System.Linq;
using System.Text;
using OpenRA.Traits;
using OpenRA.Graphics;
using OpenRA.FileFormats;
using OpenRA.FileSystem;
using OpenRA.Graphics;
using OpenRA.Mods.Common.SpriteLoaders;
using OpenRA.Traits;
namespace OpenRA.Mods.Common.UtilityCommands
{

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

@@ -261,7 +261,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
// make animation is now its own trait
if (engineVersion < 20140621)
{
if (depth == 1 && (node.Key.StartsWith("RenderBuilding")))
if (depth == 1 && node.Key.StartsWith("RenderBuilding"))
node.Value.Nodes.RemoveAll(n => n.Key == "HasMakeAnimation");
if (node.Value.Nodes.Any(n => n.Key.StartsWith("RenderBuilding"))
@@ -382,7 +382,6 @@ namespace OpenRA.Mods.Common.UtilityCommands
node.Value.Nodes.RemoveAll(_ => true);
node.Value.Nodes.Add(new MiniYamlNode("PanelName", new MiniYaml("SKIRMISH_STATS")));
}
}
// Veterancy was changed to use the upgrades system
@@ -459,6 +458,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
node.Value.Value = string.Join(", ", node.Value.Value.Split(',')
.Select(s => ((int)(100 * 100 / float.Parse(s))).ToString()));
}
if (depth == 3 && parentKey == "Upgrades")
node.Value.Value = node.Value.Value.Replace("armor", "damage");
}
@@ -477,7 +477,6 @@ namespace OpenRA.Mods.Common.UtilityCommands
// InfDeath was renamed to DeathType
if (engineVersion < 20140830)
{
if (depth == 2 && parentKey.StartsWith("DeathSounds") && node.Key == "InfDeaths")
node.Key = "DeathTypes";
@@ -735,6 +734,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
ConvertPxToRange(ref node.Value.Value, 2, 5);
break;
}
default:
break;
}
@@ -768,7 +768,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
var invalidTargets = node.Value.Nodes.FirstOrDefault(n => n.Key == "InvalidTargets"); // Weapon's InvalidTargets need to be copied to the warheads, so find it
var warheadCounter = 0;
foreach(var curNode in node.Value.Nodes.ToArray())
foreach (var curNode in node.Value.Nodes.ToArray())
{
if (curNode.Key.Contains("Warhead") && curNode.Value.Value == null)
{
@@ -794,7 +794,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
var keywords = new List<string> { "Damage", "InfDeath", "PreventProne", "ProneModifier", "Delay" };
foreach(var keyword in keywords)
foreach (var keyword in keywords)
{
var temp2 = curNode.Value.Nodes.FirstOrDefault(n => n.Key == keyword);
if (temp2 != null)
@@ -830,7 +830,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
var keywords = new List<string> { "Damage", "InfDeath", "PreventProne", "ProneModifier", "Delay" };
foreach(var keyword in keywords)
foreach (var keyword in keywords)
{
var temp2 = curNode.Value.Nodes.FirstOrDefault(n => n.Key == keyword);
if (temp2 != null)
@@ -857,7 +857,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
var keywords = new List<string> { "Spread", "Damage", "InfDeath", "PreventProne", "ProneModifier", "Delay" };
foreach(var keyword in keywords)
foreach (var keyword in keywords)
{
var temp = curNode.Value.Nodes.FirstOrDefault(n => n.Key == keyword);
if (temp != null)
@@ -885,7 +885,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
var newYaml = new List<MiniYamlNode>();
var keywords = new List<string> { "Size", "Delay", "ValidTargets", "InvalidTargets" };
foreach(var keyword in keywords)
foreach (var keyword in keywords)
{
var temp = curNode.Value.Nodes.FirstOrDefault(n => n.Key == keyword);
if (temp != null)
@@ -904,7 +904,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
var keywords = new List<string> { "AddsResourceType", "Size", "Delay", "ValidTargets", "InvalidTargets" };
foreach(var keyword in keywords)
foreach (var keyword in keywords)
{
var temp = curNode.Value.Nodes.FirstOrDefault(n => n.Key == keyword);
if (temp != null)
@@ -923,7 +923,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
var keywords = new List<string> { "SmudgeType", "Size", "Delay", "ValidTargets", "InvalidTargets" };
foreach(var keyword in keywords)
foreach (var keyword in keywords)
{
var temp = curNode.Value.Nodes.FirstOrDefault(n => n.Key == keyword);
if (temp != null)
@@ -943,14 +943,14 @@ namespace OpenRA.Mods.Common.UtilityCommands
var keywords = new List<string> { "Explosion", "ImpactSound", "Delay", "ValidTargets", "InvalidTargets", "ValidImpactTypes", "InvalidImpactTypes" };
foreach(var keyword in keywords)
foreach (var keyword in keywords)
{
var temp = curNode.Value.Nodes.FirstOrDefault(n => n.Key == keyword);
if (temp != null)
newYaml.Add(new MiniYamlNode(keyword, temp.Value.Value));
}
newYaml.Add(new MiniYamlNode("InvalidImpactTypes", "Water"));
newYaml.Add(new MiniYamlNode("InvalidImpactTypes", "Water"));
newNodes.Add(new MiniYamlNode("Warhead@" + warheadCounter.ToString() + "Eff" + oldNodeAtName, "CreateEffect", newYaml));
}
@@ -964,7 +964,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
var keywords = new List<string> { "WaterExplosion", "WaterImpactSound", "Delay", "ValidTargets", "InvalidTargets", "ValidImpactTypes", "InvalidImpactTypes" };
foreach(var keyword in keywords)
foreach (var keyword in keywords)
{
var temp = curNode.Value.Nodes.FirstOrDefault(n => n.Key == keyword);
if (temp != null)
@@ -976,11 +976,13 @@ namespace OpenRA.Mods.Common.UtilityCommands
newYaml.Add(new MiniYamlNode(temp.Key, temp.Value.Value));
}
}
newYaml.Add(new MiniYamlNode("ValidImpactTypes", "Water"));
newNodes.Add(new MiniYamlNode("Warhead@" + warheadCounter.ToString() + "Eff" + oldNodeAtName, "CreateEffect", newYaml));
}
node.Value.Nodes.InsertRange(node.Value.Nodes.IndexOf(curNode),newNodes);
node.Value.Nodes.InsertRange(node.Value.Nodes.IndexOf(curNode), newNodes);
node.Value.Nodes.Remove(curNode);
}
}
@@ -1028,11 +1030,11 @@ namespace OpenRA.Mods.Common.UtilityCommands
if (depth == 2 && parentKey == "TerrainType" && node.Key.Split('@').First() == "Type")
addNodes.Add(new MiniYamlNode("TargetTypes", node.Value.Value == "Water" ? "Water" : "Ground"));
}
UpgradeTileset(engineVersion, ref node.Value.Nodes, node, depth + 1);
}
nodes.AddRange(addNodes);
}
}
}