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

Merge pull request #10542 from RoosterDragon/simplify

Browse Source 
General Cleanup
This commit is contained in:
abcdefg30
2016-01-18 11:37:30 +01:00
parent 40debbde28 8e89a6a696
commit d416138cec
304 changed files with 218 additions and 639 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenRA.Mods.Common/Traits/AffectsShroud.cs
View File

@@ -8,7 +8,6 @@
*/
#endregion
using System;
using System.Linq;
using OpenRA.Traits;

1
OpenRA.Mods.Common/Traits/Air/FallsToEarth.cs
View File

@@ -8,7 +8,6 @@
*/
#endregion
using System.Linq;
using OpenRA.GameRules;
using OpenRA.Mods.Common.Activities;
using OpenRA.Traits;

2
OpenRA.Mods.Common/Traits/Armor.cs
View File

@@ -8,8 +8,6 @@
*/
#endregion
using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits
{
[Desc("Used to define weapon efficiency modifiers with different percentages per Type.")]

4
OpenRA.Mods.Common/Traits/Attack/AttackBase.cs
View File

@@ -305,8 +305,8 @@ namespace OpenRA.Mods.Common.Traits
public AttackOrderTargeter(AttackBase ab, int priority, bool negativeDamage)
{
this.ab = ab;
this.OrderID = ab.attackOrderName;
this.OrderPriority = priority;
OrderID = ab.attackOrderName;
OrderPriority = priority;
}
public string OrderID { get; private set; }

3
OpenRA.Mods.Common/Traits/Attack/AttackGarrisoned.cs
View File

@@ -11,7 +11,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using OpenRA.Activities;
using OpenRA.Graphics;
using OpenRA.Traits;
@@ -82,7 +81,7 @@ namespace OpenRA.Mods.Common.Traits
public AttackGarrisoned(Actor self, AttackGarrisonedInfo info)
: base(self, info)
{
this.Info = info;
Info = info;
coords = Exts.Lazy(() => self.Trait<BodyOrientation>());
armaments = new List<Armament>();
muzzles = new List<AnimationWithOffset>();

2
OpenRA.Mods.Common/Traits/Attack/AttackSuicides.cs
View File

@@ -11,8 +11,6 @@
using System.Collections.Generic;
using System.Drawing;
using OpenRA.Activities;
using OpenRA.Mods.Common;
using OpenRA.Mods.Common.Activities;
using OpenRA.Mods.Common.Orders;
using OpenRA.Traits;

2
OpenRA.Mods.Common/Traits/Attack/AttackTurreted.cs
View File

@@ -8,9 +8,7 @@
*/
#endregion
using System.Collections.Generic;
using System.Linq;
using OpenRA.Activities;
using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits

1
OpenRA.Mods.Common/Traits/AttackMove.cs
View File

@@ -8,7 +8,6 @@
*/
#endregion
using System.Collections.Generic;
using System.Drawing;
using OpenRA.Mods.Common.Activities;
using OpenRA.Traits;

1
OpenRA.Mods.Common/Traits/BlocksProjectiles.cs
View File

@@ -9,7 +9,6 @@
#endregion
using System.Linq;
using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits
{

2
OpenRA.Mods.Common/Traits/BodyOrientation.cs
View File

@@ -9,8 +9,6 @@
#endregion
using System;
using System.Collections.Generic;
using System.Linq;
using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits

6
OpenRA.Mods.Common/Traits/Buildings/Building.cs
View File

@@ -154,9 +154,9 @@ namespace OpenRA.Mods.Common.Traits
public Building(ActorInitializer init, BuildingInfo info)
{
this.self = init.Self;
this.topLeft = init.Get<LocationInit, CPos>();
this.Info = info;
self = init.Self;
topLeft = init.Get<LocationInit, CPos>();
Info = info;
occupiedCells = FootprintUtils.UnpathableTiles(self.Info.Name, Info, TopLeft)
.Select(c => Pair.New(c, SubCell.FullCell)).ToArray();

1
OpenRA.Mods.Common/Traits/Buildings/BuildingUtils.cs
View File

@@ -10,7 +10,6 @@
using System.Collections.Generic;
using System.Linq;
using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits
{

2
OpenRA.Mods.Common/Traits/Buildings/Exit.cs
View File

@@ -8,8 +8,6 @@
*/
#endregion
using System.Collections.Generic;
using OpenRA.Mods.Common.Effects;
using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits

4
OpenRA.Mods.Common/Traits/Buildings/FootprintUtils.cs
View File

@@ -18,7 +18,7 @@ namespace OpenRA.Mods.Common.Traits
{
public static IEnumerable<CPos> Tiles(Ruleset rules, string name, BuildingInfo buildingInfo, CPos topLeft)
{
var dim = (CVec)buildingInfo.Dimensions;
var dim = buildingInfo.Dimensions;
var footprint = buildingInfo.Footprint.Where(x => !char.IsWhiteSpace(x));
@@ -40,7 +40,7 @@ namespace OpenRA.Mods.Common.Traits
public static IEnumerable<CPos> UnpathableTiles(string name, BuildingInfo buildingInfo, CPos position)
{
var footprint = buildingInfo.Footprint.Where(x => !char.IsWhiteSpace(x)).ToArray();
foreach (var tile in TilesWhere(name, (CVec)buildingInfo.Dimensions, footprint, a => a == 'x'))
foreach (var tile in TilesWhere(name, buildingInfo.Dimensions, footprint, a => a == 'x'))
yield return tile + position;
}

1
OpenRA.Mods.Common/Traits/Capturable.cs
View File

@@ -8,7 +8,6 @@
*/
#endregion
using System.Linq;
using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits

2
OpenRA.Mods.Common/Traits/Crates/Crate.cs
View File

@@ -49,7 +49,7 @@ namespace OpenRA.Mods.Common.Traits
public Crate(ActorInitializer init, CrateInfo info)
{
this.self = init.Self;
self = init.Self;
this.info = info;
if (init.Contains<LocationInit>())

1
OpenRA.Mods.Common/Traits/Crates/HealUnitsCrateAction.cs
View File

@@ -9,7 +9,6 @@
#endregion
using System.Linq;
using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits
{

2
OpenRA.Mods.Common/Traits/Crates/LevelUpCrateAction.cs
View File

@@ -73,7 +73,7 @@ namespace OpenRA.Mods.Common.Traits
{
var gainsExperience = recipient.TraitOrDefault<GainsExperience>();
if (gainsExperience != null)
gainsExperience.GiveLevels(((LevelUpCrateActionInfo)info).Levels);
gainsExperience.GiveLevels(info.Levels);
});
}

1
OpenRA.Mods.Common/Traits/CustomSelectionSize.cs
View File

@@ -8,7 +8,6 @@
*/
#endregion
using System;
using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits

1
OpenRA.Mods.Common/Traits/Explodes.cs
View File

@@ -8,7 +8,6 @@
*/
#endregion
using System;
using System.Collections.Generic;
using System.Linq;
using OpenRA.GameRules;

1
OpenRA.Mods.Common/Traits/ExternalCapturable.cs
View File

@@ -8,7 +8,6 @@
*/
#endregion
using System.Linq;
using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits

1
OpenRA.Mods.Common/Traits/GivesBounty.cs
View File

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

5
OpenRA.Mods.Common/Traits/Guard.cs
View File

@@ -8,13 +8,8 @@
*/
#endregion
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using OpenRA.Graphics;
using OpenRA.Mods.Common;
using OpenRA.Mods.Common.Activities;
using OpenRA.Orders;
using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits

1
OpenRA.Mods.Common/Traits/Health.cs
View File

@@ -8,7 +8,6 @@
*/
#endregion
using System;
using System.Linq;
using OpenRA.Mods.Common.HitShapes;
using OpenRA.Traits;

2
OpenRA.Mods.Common/Traits/Husk.cs
View File

@@ -51,7 +51,7 @@ namespace OpenRA.Mods.Common.Traits
public Husk(ActorInitializer init, HuskInfo info)
{
this.info = info;
this.self = init.Self;
self = init.Self;
TopLeft = init.Get<LocationInit, CPos>();
CenterPosition = init.Contains<CenterPositionInit>() ? init.Get<CenterPositionInit, WPos>() : init.World.Map.CenterOfCell(TopLeft);

7
OpenRA.Mods.Common/Traits/Mobile.cs
View File

@@ -13,7 +13,6 @@ using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using OpenRA.Activities;
using OpenRA.Mods.Common;
using OpenRA.Mods.Common.Activities;
using OpenRA.Primitives;
using OpenRA.Traits;
@@ -84,7 +83,7 @@ namespace OpenRA.Mods.Common.Traits
var nodesDict = t.Value.ToDictionary();
var cost = nodesDict.ContainsKey("PathingCost")
? FieldLoader.GetValue<int>("cost", nodesDict["PathingCost"].Value)
: (int)(10000 / speed);
: 10000 / speed;
ret.Add(t.Key, new TerrainInfo(speed, cost));
}
@@ -369,7 +368,7 @@ namespace OpenRA.Mods.Common.Traits
SetVisualPosition(self, init.World.Map.CenterOfSubCell(FromCell, FromSubCell));
}
this.Facing = init.Contains<FacingInit>() ? init.Get<FacingInit, int>() : info.InitialFacing;
Facing = init.Contains<FacingInit>() ? init.Get<FacingInit, int>() : info.InitialFacing;
// Sets the visual position to WPos accuracy
// Use LocationInit if you want to insert the actor into the ActorMap!
@@ -704,7 +703,7 @@ namespace OpenRA.Mods.Common.Traits
public MoveOrderTargeter(Actor self, Mobile unit)
{
this.mobile = unit;
mobile = unit;
rejectMove = !self.AcceptsOrder("Move");
}

1
OpenRA.Mods.Common/Traits/Modifiers/FrozenUnderFog.cs
View File

@@ -8,7 +8,6 @@
*/
#endregion
using System;
using System.Collections.Generic;
using System.Linq;
using OpenRA.Graphics;

5
OpenRA.Mods.Common/Traits/Modifiers/HiddenUnderFog.cs
View File

@@ -8,11 +8,6 @@
*/
#endregion
using System.Collections.Generic;
using System.Linq;
using OpenRA.Graphics;
using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits
{
[Desc("The actor stays invisible under fog of war.")]

1
OpenRA.Mods.Common/Traits/Modifiers/HiddenUnderShroud.cs
View File

@@ -9,7 +9,6 @@
#endregion
using System.Collections.Generic;
using System.Linq;
using OpenRA.Graphics;
using OpenRA.Traits;

1
OpenRA.Mods.Common/Traits/Multipliers/DamageMultiplier.cs
View File

@@ -8,7 +8,6 @@
*/
#endregion
using OpenRA.GameRules;
using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits

4
OpenRA.Mods.Common/Traits/Multipliers/RangeMultiplier.cs
View File

@@ -8,10 +8,6 @@
*/
#endregion
using System;
using System.Linq;
using OpenRA;
using OpenRA.GameRules;
using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits

1
OpenRA.Mods.Common/Traits/PaletteEffects/CloakPaletteEffect.cs
View File

@@ -8,7 +8,6 @@
*/
#endregion
using System.Collections.Generic;
using System.Drawing;
using OpenRA.Graphics;
using OpenRA.Traits;

1
OpenRA.Mods.Common/Traits/PaletteEffects/MenuPaletteEffect.cs
View File

@@ -8,7 +8,6 @@
*/
#endregion
using System.Collections.Generic;
using System.Drawing;
using OpenRA.Graphics;
using OpenRA.Traits;

2
OpenRA.Mods.Common/Traits/Parachutable.cs
View File

@@ -47,7 +47,7 @@ namespace OpenRA.Mods.Common.Traits
public Parachutable(ActorInitializer init, ParachutableInfo info)
{
this.self = init.Self;
self = init.Self;
this.info = info;
positionable = self.TraitOrDefault<IPositionable>();

1
OpenRA.Mods.Common/Traits/Passenger.cs
View File

@@ -11,7 +11,6 @@
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using OpenRA.Mods.Common.Activities;
using OpenRA.Mods.Common.Orders;
using OpenRA.Traits;

2
OpenRA.Mods.Common/Traits/Player/ClassicProductionQueue.cs
View File

@@ -40,7 +40,7 @@ namespace OpenRA.Mods.Common.Traits
public ClassicProductionQueue(ActorInitializer init, ClassicProductionQueueInfo info)
: base(init, init.Self, info)
{
this.self = init.Self;
self = init.Self;
this.info = info;
}

1
OpenRA.Mods.Common/Traits/Player/MissionObjectives.cs
View File

@@ -11,7 +11,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using OpenRA.Primitives;
using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits

1
OpenRA.Mods.Common/Traits/Player/PlaceBuilding.cs
View File

@@ -8,7 +8,6 @@
*/
#endregion
using System.Collections.Generic;
using System.Linq;
using OpenRA.Effects;
using OpenRA.Primitives;

1
OpenRA.Mods.Common/Traits/Player/PlayerStatistics.cs
View File

@@ -9,7 +9,6 @@
#endregion
using System.Collections.Generic;
using System.Linq;
using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits

3
OpenRA.Mods.Common/Traits/Player/ProvidesTechPrerequisite.cs
View File

@@ -9,7 +9,6 @@
#endregion
using System.Collections.Generic;
using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits
{
@@ -41,7 +40,7 @@ namespace OpenRA.Mods.Common.Traits
{
this.info = info;
var tech = init.World.Map.Options.TechLevel ?? init.World.LobbyInfo.GlobalSettings.TechLevel;
this.enabled = info.Name == tech;
enabled = info.Name == tech;
}
}
}

8
OpenRA.Mods.Common/Traits/Player/TechTree.cs
View File

@@ -64,7 +64,7 @@ namespace OpenRA.Mods.Common.Traits
public bool HasPrerequisites(IEnumerable<string> prerequisites)
{
var ownedPrereqs = TechTree.GatherOwnedPrerequisites(player);
var ownedPrereqs = GatherOwnedPrerequisites(player);
return prerequisites.All(p => !(p.Replace("~", "").StartsWith("!")
^ !ownedPrereqs.ContainsKey(p.Replace("!", "").Replace("~", ""))));
}
@@ -119,12 +119,12 @@ namespace OpenRA.Mods.Common.Traits
public Watcher(string key, string[] prerequisites, int limit, ITechTreeElement watcher)
{
this.Key = key;
Key = key;
this.prerequisites = prerequisites;
this.watcher = watcher;
this.hasPrerequisites = false;
hasPrerequisites = false;
this.limit = limit;
this.hidden = false;
hidden = false;
}
bool HasPrerequisites(Cache<string, List<Actor>> ownedPrerequisites)

2
OpenRA.Mods.Common/Traits/Plug.cs
View File

@@ -8,8 +8,6 @@
*/
#endregion
using System.Collections.Generic;
using System.Linq;
using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits

1
OpenRA.Mods.Common/Traits/Production.cs
View File

@@ -11,7 +11,6 @@
using System;
using System.Drawing;
using System.Linq;
using OpenRA.Activities;
using OpenRA.Mods.Common.Activities;
using OpenRA.Primitives;
using OpenRA.Traits;

1
OpenRA.Mods.Common/Traits/ProximityCaptor.cs
View File

@@ -9,7 +9,6 @@
#endregion
using System.Collections.Generic;
using System.Linq;
using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits

3
OpenRA.Mods.Common/Traits/QuantizeFacingsFromSequence.cs
View File

@@ -9,10 +9,7 @@
#endregion
using System;
using System.Collections.Generic;
using System.Linq;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Graphics;
using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits

1
OpenRA.Mods.Common/Traits/Render/AutoSelectionSize.cs
View File

@@ -8,7 +8,6 @@
*/
#endregion
using System;
using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits

1
OpenRA.Mods.Common/Traits/Render/Hovers.cs
View File

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

1
OpenRA.Mods.Common/Traits/Render/LeavesTrails.cs
View File

@@ -9,7 +9,6 @@
#endregion
using System.Collections.Generic;
using System.Linq;
using OpenRA.Effects;
using OpenRA.Traits;

2
OpenRA.Mods.Common/Traits/Render/RenderUtils.cs
View File

@@ -8,8 +8,6 @@
*/
#endregion
using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits
{
public class RenderUtils

2
OpenRA.Mods.Common/Traits/Render/TimedUpgradeBar.cs
View File

@@ -8,9 +8,7 @@
*/
#endregion
using System;
using System.Drawing;
using System.Linq;
using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits

1
OpenRA.Mods.Common/Traits/Render/WithDeathAnimation.cs
View File

@@ -8,7 +8,6 @@
*/
#endregion
using System;
using System.Collections.Generic;
using System.Linq;
using OpenRA.Mods.Common.Effects;

1
OpenRA.Mods.Common/Traits/Render/WithDecoration.cs
View File

@@ -10,7 +10,6 @@
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using OpenRA.Graphics;
using OpenRA.Traits;

1
OpenRA.Mods.Common/Traits/Render/WithFacingSpriteBody.cs
View File

@@ -8,7 +8,6 @@
*/
#endregion
using System;
using System.Collections.Generic;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Graphics;

3
OpenRA.Mods.Common/Traits/Render/WithIdleAnimation.cs
View File

@@ -8,9 +8,6 @@
*/
#endregion
using System.Collections.Generic;
using System.Linq;
using OpenRA.Graphics;
using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits

1
OpenRA.Mods.Common/Traits/Render/WithIdleOverlay.cs
View File

@@ -9,7 +9,6 @@
#endregion
using System.Collections.Generic;
using System.Linq;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Graphics;
using OpenRA.Traits;

4
OpenRA.Mods.Common/Traits/Render/WithMakeAnimation.cs
View File

@@ -8,11 +8,7 @@
*/
#endregion
using System;
using System.Linq;
using OpenRA.Activities;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Activities;
using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits

1
OpenRA.Mods.Common/Traits/Render/WithMoveAnimation.cs
View File

@@ -8,7 +8,6 @@
*/
#endregion
using System.Linq;
using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits

2
OpenRA.Mods.Common/Traits/Render/WithMuzzleOverlay.cs
View File

@@ -59,7 +59,7 @@ namespace OpenRA.Mods.Common.Traits
if (turreted != null)
getFacing = () => turreted.TurretFacing;
else if (facing != null)
getFacing = (Func<int>)(() => facing.Facing);
getFacing = () => facing.Facing;
else
getFacing = () => 0;

2
OpenRA.Mods.Common/Traits/Render/WithRepairAnimation.cs
View File

@@ -8,8 +8,6 @@
*/
#endregion
using System.Collections.Generic;
using System.Linq;
using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits

1
OpenRA.Mods.Common/Traits/Render/WithRepairOverlay.cs
View File

@@ -8,7 +8,6 @@
*/
#endregion
using System.Linq;
using OpenRA.Effects;
using OpenRA.Graphics;
using OpenRA.Traits;

1
OpenRA.Mods.Common/Traits/Render/WithShadow.cs
View File

@@ -8,7 +8,6 @@
*/
#endregion
using System;
using System.Collections.Generic;
using System.Linq;
using OpenRA.Graphics;

3
OpenRA.Mods.Common/Traits/Render/WithSiloAnimation.cs
View File

@@ -8,9 +8,6 @@
*/
#endregion
using System.Collections.Generic;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Graphics;
using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits

1
OpenRA.Mods.Common/Traits/Render/WithSpriteRotorOverlay.cs
View File

@@ -8,7 +8,6 @@
*/
#endregion
using System;
using System.Collections.Generic;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Graphics;

1
OpenRA.Mods.Common/Traits/RepairableNear.cs
View File

@@ -10,7 +10,6 @@
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using OpenRA.Mods.Common.Activities;
using OpenRA.Mods.Common.Orders;
using OpenRA.Traits;

2
OpenRA.Mods.Common/Traits/SeedsResource.cs
View File

@@ -9,9 +9,7 @@
#endregion
using System;
using System.Collections.Generic;
using System.Linq;
using OpenRA.Support;
using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits

2
OpenRA.Mods.Common/Traits/SelfHealing.cs
View File

@@ -8,8 +8,6 @@
*/
#endregion
using System;
using System.Linq;
using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits

1
OpenRA.Mods.Common/Traits/Sellable.cs
View File

@@ -9,7 +9,6 @@
#endregion
using System;
using System.Linq;
using OpenRA.Mods.Common.Activities;
using OpenRA.Mods.Common.Orders;
using OpenRA.Traits;

1
OpenRA.Mods.Common/Traits/Sound/DeathSounds.cs
View File

@@ -9,7 +9,6 @@
#endregion
using System.Collections.Generic;
using System.Linq;
using OpenRA.Mods.Common.Warheads;
using OpenRA.Traits;

1
OpenRA.Mods.Common/Traits/Sound/SoundOnDamageTransition.cs
View File

@@ -8,7 +8,6 @@
*/
#endregion
using OpenRA.Support;
using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits

1
OpenRA.Mods.Common/Traits/SpawnActorOnDeath.cs
View File

@@ -8,7 +8,6 @@
*/
#endregion
using System.Collections.Generic;
using System.Linq;
using OpenRA.Mods.Common.Warheads;
using OpenRA.Primitives;

1
OpenRA.Mods.Common/Traits/StoresResources.cs
View File

@@ -8,7 +8,6 @@
*/
#endregion
using System;
using System.Collections.Generic;
using System.Linq;
using OpenRA.Traits;

1
OpenRA.Mods.Common/Traits/SupportPowers/AirstrikePower.cs
View File

@@ -13,7 +13,6 @@ using System.Collections.Generic;
using System.Linq;
using OpenRA.Mods.Common.Activities;
using OpenRA.Mods.Common.Effects;
using OpenRA.Mods.Common.Traits;
using OpenRA.Primitives;
using OpenRA.Traits;

2
OpenRA.Mods.Common/Traits/SupportPowers/GrantUpgradePower.cs
View File

@@ -121,7 +121,7 @@ namespace OpenRA.Mods.Common.Traits
this.manager = manager;
this.order = order;
this.power = power;
this.range = power.info.Range;
range = power.info.Range;
tile = world.Map.SequenceProvider.GetSequence("overlay", "target-select").GetSprite(0);
}

1
OpenRA.Mods.Common/Traits/SupportPowers/SpawnActorPower.cs
View File

@@ -10,7 +10,6 @@
using OpenRA.Effects;
using OpenRA.Mods.Common.Activities;
using OpenRA.Mods.Common.Effects;
using OpenRA.Primitives;
using OpenRA.Traits;

1
OpenRA.Mods.Common/Traits/Turreted.cs
View File

@@ -8,7 +8,6 @@
*/
#endregion
using System;
using System.Collections.Generic;
using OpenRA.Primitives;
using OpenRA.Traits;

2
OpenRA.Mods.Common/Traits/Upgrades/DeployToUpgrade.cs
View File

@@ -70,7 +70,7 @@ namespace OpenRA.Mods.Common.Traits
public DeployToUpgrade(ActorInitializer init, DeployToUpgradeInfo info)
{
this.self = init.Self;
self = init.Self;
this.info = info;
manager = self.Trait<UpgradeManager>();
checkTerrainType = info.AllowedTerrainTypes.Count > 0;

1
OpenRA.Mods.Common/Traits/Upgrades/UpgradableTrait.cs
View File

@@ -9,7 +9,6 @@
#endregion
using System.Collections.Generic;
using System.Linq;
using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits

3
OpenRA.Mods.Common/Traits/Upgrades/UpgradeActorsNear.cs
View File

@@ -8,9 +8,6 @@
*/
#endregion
using System;
using System.Collections.Generic;
using OpenRA.GameRules;
using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits

3
OpenRA.Mods.Common/Traits/Upgrades/UpgradeManager.cs
View File

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

3
OpenRA.Mods.Common/Traits/Voiced.cs
View File

@@ -8,9 +8,6 @@
*/
#endregion
using System.Collections.Generic;
using System.Linq;
using OpenRA.GameRules;
using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits

2
OpenRA.Mods.Common/Traits/World/EditorActorLayer.cs
View File

@@ -11,10 +11,8 @@
using System;
using System.Collections.Generic;
using System.Drawing;
using System.IO;
using System.Linq;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Graphics;
using OpenRA.Primitives;
using OpenRA.Traits;

2
OpenRA.Mods.Common/Traits/World/EditorActorPreview.cs
View File

@@ -40,7 +40,7 @@ namespace OpenRA.Mods.Common.Traits
{
ID = id;
this.actor = actor;
this.Owner = owner;
Owner = owner;
this.worldRenderer = worldRenderer;
if (!actor.InitDict.Contains<FactionInit>())

3
OpenRA.Mods.Common/Traits/World/EditorResourceLayer.cs
View File

@@ -10,12 +10,9 @@
using System;
using System.Collections.Generic;
using System.Drawing;
using System.IO;
using System.Linq;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Graphics;
using OpenRA.Primitives;
using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits

7
OpenRA.Mods.Common/Traits/World/EditorSelectionLayer.cs
View File

@@ -8,14 +8,7 @@
*/
#endregion
using System;
using System.Collections.Generic;
using System.Drawing;
using System.IO;
using System.Linq;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Graphics;
using OpenRA.Primitives;
using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits

1
OpenRA.Mods.Common/Traits/World/LoadWidgetAtGameStart.cs
View File

@@ -9,7 +9,6 @@
#endregion
using OpenRA.Graphics;
using OpenRA.Mods.Common.Widgets;
using OpenRA.Traits;
using OpenRA.Widgets;

1
OpenRA.Mods.Common/Traits/World/PaletteFromPaletteWithAlpha.cs
View File

@@ -11,7 +11,6 @@
using System.Collections.Generic;
using System.Drawing;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits

3
OpenRA.Mods.Common/Traits/World/PaletteFromPlayerPaletteWithAlpha.cs
View File

@@ -8,10 +8,7 @@
*/
#endregion
using System.Collections.Generic;
using System.Drawing;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits

3
OpenRA.Mods.Common/Traits/World/ShroudRenderer.cs
View File

@@ -10,12 +10,9 @@
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Drawing.Imaging;
using System.IO;
using System.Linq;
using OpenRA.Graphics;
using OpenRA.Primitives;
using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits

4
OpenRA.Mods.Common/Traits/World/TerrainGeometryOverlay.cs
View File

@@ -8,8 +8,6 @@
*/
#endregion
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using OpenRA.Graphics;
@@ -65,7 +63,7 @@ namespace OpenRA.Mods.Common.Traits
var height = (int)map.MapHeight.Value[uv];
var tile = map.MapTiles.Value[uv];
var ti = tileSet.GetTileInfo(tile);
var ramp = ti != null ? (int)ti.RampType : 0;
var ramp = ti != null ? ti.RampType : 0;
var corners = map.CellCorners[ramp];
var color = corners.Select(c => colors[height + c.Z / 512]).ToArray();

2
OpenRA.Mods.Common/Traits/World/WeatherOverlay.cs
View File

@@ -8,10 +8,8 @@
*/
#endregion
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using OpenRA.Graphics;
using OpenRA.Traits;