diff --git a/OpenRA.Mods.TS/Traits/Render/WithVoxelUnloadBody.cs b/OpenRA.Mods.TS/Traits/Render/WithVoxelUnloadBody.cs index 26c23c0900..d5cfef8ba2 100644 --- a/OpenRA.Mods.TS/Traits/Render/WithVoxelUnloadBody.cs +++ b/OpenRA.Mods.TS/Traits/Render/WithVoxelUnloadBody.cs @@ -32,7 +32,7 @@ namespace OpenRA.Mods.RA.Render var body = init.Actor.Traits.Get(); var voxel = VoxelProvider.GetVoxel(image, "idle"); yield return new VoxelAnimation(voxel, () => WVec.Zero, - () => new[]{ body.QuantizeOrientation(orientation, facings) }, + () => new[] { body.QuantizeOrientation(orientation, facings) }, () => false, () => 0); } @@ -52,7 +52,7 @@ namespace OpenRA.Mods.RA.Render var idleVoxel = VoxelProvider.GetVoxel(rv.Image, info.IdleSequence); rv.Add(new VoxelAnimation(idleVoxel, () => WVec.Zero, - () => new[]{ body.QuantizeOrientation(self, self.Orientation) }, + () => new[] { body.QuantizeOrientation(self, self.Orientation) }, () => Docked, () => 0)); @@ -63,7 +63,7 @@ namespace OpenRA.Mods.RA.Render var unloadVoxel = VoxelProvider.GetVoxel(rv.Image, info.UnloadSequence); rv.Add(new VoxelAnimation(unloadVoxel, () => WVec.Zero, - () => new[]{ body.QuantizeOrientation(self, self.Orientation) }, + () => new[] { body.QuantizeOrientation(self, self.Orientation) }, () => !Docked, () => 0)); } diff --git a/OpenRA.Mods.TS/Traits/Render/WithVoxelWalkerBody.cs b/OpenRA.Mods.TS/Traits/Render/WithVoxelWalkerBody.cs index 8210f7f8d9..e448fc0d0e 100644 --- a/OpenRA.Mods.TS/Traits/Render/WithVoxelWalkerBody.cs +++ b/OpenRA.Mods.TS/Traits/Render/WithVoxelWalkerBody.cs @@ -41,12 +41,12 @@ namespace OpenRA.Mods.RA.Render var voxel = VoxelProvider.GetVoxel(rv.Image, "idle"); frames = voxel.Frames; rv.Add(new VoxelAnimation(voxel, () => WVec.Zero, - () => new[]{ body.QuantizeOrientation(self, self.Orientation) }, + () => new[] { body.QuantizeOrientation(self, self.Orientation) }, () => false, () => frame)); // Selection size var rvi = self.Info.Traits.Get(); - 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); } diff --git a/OpenRA.Mods.TS/UtilityCommands/LegacyTilesetImporter.cs b/OpenRA.Mods.TS/UtilityCommands/LegacyTilesetImporter.cs index a2fda5dda5..0e3319f924 100644 --- a/OpenRA.Mods.TS/UtilityCommands/LegacyTilesetImporter.cs +++ b/OpenRA.Mods.TS/UtilityCommands/LegacyTilesetImporter.cs @@ -8,10 +8,10 @@ */ #endregion +using System; using System.Collections.Generic; using System.Drawing; using System.IO; -using System; using OpenRA.FileFormats; using OpenRA.FileSystem; @@ -36,11 +36,11 @@ namespace OpenRA.Mods.TS.UtilityCommands var terrainTypes = new Dictionary() { - { 1, "Clear" }, // Desert sand(?) - { 5, "Road" }, // Paved road - { 6, "Rail" }, // Monorail track - { 7, "Impassable" }, // Building - { 9, "Water" }, // Deep water(?) + { 1, "Clear" }, // Desert sand(?) + { 5, "Road" }, // Paved road + { 6, "Rail" }, // Monorail track + { 7, "Impassable" }, // Building + { 9, "Water" }, // Deep water(?) { 10, "Water" }, // Shallow water { 11, "Road" }, // Paved road (again?) { 12, "DirtRoad" }, // Dirt road @@ -52,7 +52,7 @@ namespace OpenRA.Mods.TS.UtilityCommands // Loop over template sets try { - for (var tilesetGroupIndex = 0; ; tilesetGroupIndex++) + for (var tilesetGroupIndex = 0;; tilesetGroupIndex++) { var section = file.GetSection("TileSet{0:D4}".F(tilesetGroupIndex));