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

Fix StyleCop nits in Mods.TS.

Browse Source
This commit is contained in:
Paul Chote
2014-12-14 17:13:23 +13:00
parent 4504df1de9
commit 0f332472f1
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.TS/Traits/Render/WithVoxelUnloadBody.cs
View File

@@ -32,7 +32,7 @@ namespace OpenRA.Mods.RA.Render
var body = init.Actor.Traits.Get<BodyOrientationInfo>(); var body = init.Actor.Traits.Get<BodyOrientationInfo>();
var voxel = VoxelProvider.GetVoxel(image, "idle"); var voxel = VoxelProvider.GetVoxel(image, "idle");
yield return new VoxelAnimation(voxel, () => WVec.Zero, yield return new VoxelAnimation(voxel, () => WVec.Zero,
() => new[]{ body.QuantizeOrientation(orientation, facings) }, () => new[] { body.QuantizeOrientation(orientation, facings) },
() => false, () => 0); () => false, () => 0);
} }
@@ -52,7 +52,7 @@ namespace OpenRA.Mods.RA.Render
var idleVoxel = VoxelProvider.GetVoxel(rv.Image, info.IdleSequence); var idleVoxel = VoxelProvider.GetVoxel(rv.Image, info.IdleSequence);
rv.Add(new VoxelAnimation(idleVoxel, () => WVec.Zero, rv.Add(new VoxelAnimation(idleVoxel, () => WVec.Zero,
() => new[]{ body.QuantizeOrientation(self, self.Orientation) }, () => new[] { body.QuantizeOrientation(self, self.Orientation) },
() => Docked, () => Docked,
() => 0)); () => 0));
@@ -63,7 +63,7 @@ namespace OpenRA.Mods.RA.Render
var unloadVoxel = VoxelProvider.GetVoxel(rv.Image, info.UnloadSequence); var unloadVoxel = VoxelProvider.GetVoxel(rv.Image, info.UnloadSequence);
rv.Add(new VoxelAnimation(unloadVoxel, () => WVec.Zero, rv.Add(new VoxelAnimation(unloadVoxel, () => WVec.Zero,
() => new[]{ body.QuantizeOrientation(self, self.Orientation) }, () => new[] { body.QuantizeOrientation(self, self.Orientation) },
() => !Docked, () => !Docked,
() => 0)); () => 0));
} }

4
OpenRA.Mods.TS/Traits/Render/WithVoxelWalkerBody.cs
View File

@@ -41,12 +41,12 @@ namespace OpenRA.Mods.RA.Render
var voxel = VoxelProvider.GetVoxel(rv.Image, "idle"); var voxel = VoxelProvider.GetVoxel(rv.Image, "idle");
frames = voxel.Frames; frames = voxel.Frames;
rv.Add(new VoxelAnimation(voxel, () => WVec.Zero, rv.Add(new VoxelAnimation(voxel, () => WVec.Zero,
() => new[]{ body.QuantizeOrientation(self, self.Orientation) }, () => new[] { body.QuantizeOrientation(self, self.Orientation) },
() => false, () => frame)); () => false, () => frame));
// Selection size // Selection size
var rvi = self.Info.Traits.Get<RenderVoxelsInfo>(); var rvi = self.Info.Traits.Get<RenderVoxelsInfo>();
var s = (int)(rvi.Scale*voxel.Size.Aggregate(Math.Max)); var s = (int)(rvi.Scale * voxel.Size.Aggregate(Math.Max));
size = new int2(s, s); size = new int2(s, s);
} }

14
OpenRA.Mods.TS/UtilityCommands/LegacyTilesetImporter.cs
View File

@@ -8,10 +8,10 @@
*/ */
#endregion #endregion
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Drawing; using System.Drawing;
using System.IO; using System.IO;
using System;
using OpenRA.FileFormats; using OpenRA.FileFormats;
using OpenRA.FileSystem; using OpenRA.FileSystem;
@@ -36,11 +36,11 @@ namespace OpenRA.Mods.TS.UtilityCommands
var terrainTypes = new Dictionary<int, string>() var terrainTypes = new Dictionary<int, string>()
{ {
{ 1, "Clear" }, // Desert sand(?) { 1, "Clear" }, // Desert sand(?)
{ 5, "Road" }, // Paved road { 5, "Road" }, // Paved road
{ 6, "Rail" }, // Monorail track { 6, "Rail" }, // Monorail track
{ 7, "Impassable" }, // Building { 7, "Impassable" }, // Building
{ 9, "Water" }, // Deep water(?) { 9, "Water" }, // Deep water(?)
{ 10, "Water" }, // Shallow water { 10, "Water" }, // Shallow water
{ 11, "Road" }, // Paved road (again?) { 11, "Road" }, // Paved road (again?)
{ 12, "DirtRoad" }, // Dirt road { 12, "DirtRoad" }, // Dirt road
@@ -52,7 +52,7 @@ namespace OpenRA.Mods.TS.UtilityCommands
// Loop over template sets // Loop over template sets
try try
{ {
for (var tilesetGroupIndex = 0; ; tilesetGroupIndex++) for (var tilesetGroupIndex = 0;; tilesetGroupIndex++)
{ {
var section = file.GetSection("TileSet{0:D4}".F(tilesetGroupIndex)); var section = file.GetSection("TileSet{0:D4}".F(tilesetGroupIndex));