Simplify return statements.

Remove redundant ‘this’.
Remove unused using directives.
Simplify LINQ chains.
Add some trait property descriptions.
Add readonly where viable.
Add fullstops to some yaml descriptions.
This commit is contained in:
Taryn Hill
2015-04-01 11:16:04 -05:00
parent 14e9cfd433
commit 4ed53c5952
54 changed files with 59 additions and 109 deletions

View File

@@ -12,7 +12,6 @@ using System;
using System.Collections.Generic;
using System.Drawing;
using System.IO;
using System.Linq;
using OpenRA.Graphics;
namespace OpenRA.Mods.D2k.SpriteLoaders

View File

@@ -10,7 +10,6 @@
using System.Linq;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.D2k.Traits

View File

@@ -101,7 +101,7 @@ namespace OpenRA.Mods.D2k.Traits
.Where(p => p.Actor.Owner == self.Owner && !p.Trait.IsBusy && p.Actor.IsInWorld)
.Select(h => h.Actor);
return WorldUtils.ClosestTo(carriers, self);
return carriers.ClosestTo(self);
}
// This gets called by carrier after we touched down

View File

@@ -10,8 +10,6 @@
using OpenRA.Graphics;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA;
using OpenRA.Mods.RA.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.D2k.Traits

View File

@@ -10,7 +10,6 @@
using OpenRA.Graphics;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA;
using OpenRA.Traits;
namespace OpenRA.Mods.D2k.Traits

View File

@@ -11,7 +11,6 @@
using OpenRA.Effects;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.D2k.Traits

View File

@@ -11,7 +11,6 @@
using OpenRA.Effects;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.D2k.Traits

View File

@@ -12,7 +12,6 @@ using System;
using System.Collections.Generic;
using System.Linq;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.D2k.Traits

View File

@@ -61,9 +61,9 @@ namespace OpenRA.Mods.D2k.Traits
public Color GetRemappedColor(Color original, int index)
{
return Color.FromArgb(original.A,
(int)Exts.Clamp((int)(scale * original.R + offset), 0, 255),
(int)Exts.Clamp((int)(scale * original.G + offset), 0, 255),
(int)Exts.Clamp((int)(scale * original.B + offset), 0, 255));
(int)(scale * original.R + offset).Clamp(0, 255),
(int)(scale * original.G + offset).Clamp(0, 255),
(int)(scale * original.B + offset).Clamp(0, 255));
}
}
}

View File

@@ -10,9 +10,7 @@
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using OpenRA.Mods.Common.Traits;
using OpenRA.Primitives;
using OpenRA.Traits;

View File

@@ -10,7 +10,6 @@
using System;
using System.IO;
using System.Linq;
namespace OpenRA.Mods.D2k.UtilityCommands
{