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

Moves traits from Common and Power namespaces to Common.Traits namespace

Browse Source
This commit is contained in:
reaperrr
2014-12-09 23:39:39 +01:00
parent 9a1e110481
commit ffca040c47
103 changed files with 113 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.RA/AI/BaseBuilder.cs
View File

@@ -11,7 +11,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using OpenRA.Mods.Common.Power;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Buildings;
using OpenRA.Mods.RA.Traits;
using OpenRA.Traits;

4
OpenRA.Mods.RA/AI/HackyAI.cs
View File

@@ -13,11 +13,11 @@ using System.Collections;
using System.Collections.Generic;
using System.Linq;
using OpenRA.Mods.Common;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Activities;
using OpenRA.Mods.RA.Traits;
using OpenRA.Mods.RA.Buildings;
using OpenRA.Mods.RA.Traits;
using OpenRA.Mods.RA.Move;
using OpenRA.Mods.Common.Power;
using OpenRA.Primitives;
using OpenRA.Support;
using OpenRA.Traits;

2
OpenRA.Mods.RA/AI/SupportPowerDecision.cs
View File

@@ -13,7 +13,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using OpenRA;
using OpenRA.Mods.Common;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.AI;
using OpenRA.Traits;

2
OpenRA.Mods.RA/Activities/Air/TakeOff.cs
View File

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

1
OpenRA.Mods.RA/Activities/FindResources.cs
View File

@@ -13,6 +13,7 @@ using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using OpenRA.Mods.Common;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Move;
using OpenRA.Mods.RA.Traits;
using OpenRA.Traits;

2
OpenRA.Mods.RA/Activities/Repair.cs
View File

@@ -9,7 +9,7 @@
#endregion
using System;
using OpenRA.Mods.Common;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Traits;
using OpenRA.Traits;

2
OpenRA.Mods.RA/Activities/Sell.cs
View File

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

1
OpenRA.Mods.RA/Activities/Transform.cs
View File

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

2
OpenRA.Mods.RA/Armament.cs
View File

@@ -12,7 +12,7 @@ using System;
using System.Collections.Generic;
using System.Linq;
using OpenRA.GameRules;
using OpenRA.Mods.Common;
using OpenRA.Mods.Common.Traits;
using OpenRA.Primitives;
using OpenRA.Traits;

2
OpenRA.Mods.RA/Attack/AttackPopupTurreted.cs
View File

@@ -10,7 +10,7 @@
using System.Linq;
using OpenRA.GameRules;
using OpenRA.Mods.Common;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Buildings;
using OpenRA.Mods.RA.Render;
using OpenRA.Traits;

5
OpenRA.Mods.RA/Buildings/Building.cs
View File

@@ -11,10 +11,11 @@
using System;
using System.Collections.Generic;
using System.Linq;
using OpenRA.Mods.Common;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Render;
using OpenRA.Primitives;
using OpenRA.Traits;
using OpenRA.Mods.Common;
using OpenRA.Mods.RA.Render;
namespace OpenRA.Mods.RA.Buildings
{

1
OpenRA.Mods.RA/Buildings/RepairableBuilding.cs
View File

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

5
OpenRA.Mods.RA/Cargo.cs
View File

@@ -13,10 +13,11 @@ using System.Linq;
using System.Collections.Generic;
using OpenRA.Traits;
using OpenRA.Primitives;
using OpenRA.Mods.Common.Orders;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Activities;
using OpenRA.Mods.RA.Traits;
using OpenRA.Mods.Common;
using OpenRA.Mods.Common.Orders;
namespace OpenRA.Mods.RA
{

2
OpenRA.Mods.RA/Crates/DuplicateUnitCrateAction.cs
View File

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

2
OpenRA.Mods.RA/Crates/GrantUpgradeCrateAction.cs
View File

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

2
OpenRA.Mods.RA/DisableUpgrade.cs
View File

@@ -11,7 +11,7 @@
using System;
using System.Collections.Generic;
using OpenRA.GameRules;
using OpenRA.Mods.Common;
using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA

2
OpenRA.Mods.RA/EmitInfantryOnSell.cs
View File

@@ -9,7 +9,7 @@
#endregion
using System.Linq;
using OpenRA.Mods.Common;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Buildings;
using OpenRA.Primitives;
using OpenRA.Traits;

2
OpenRA.Mods.RA/GainsExperience.cs
View File

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

2
OpenRA.Mods.RA/GivesBounty.cs
View File

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

2
OpenRA.Mods.RA/GivesExperience.cs
View File

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

2
OpenRA.Mods.RA/Infiltration/InfiltrateForPowerOutage.cs
View File

@@ -9,7 +9,7 @@
#endregion
using System.Linq;
using OpenRA.Mods.Common.Power;
using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Infiltration

2
OpenRA.Mods.RA/InvulnerabilityUpgrade.cs
View File

@@ -11,7 +11,7 @@
using System;
using System.Collections.Generic;
using OpenRA.GameRules;
using OpenRA.Mods.Common;
using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA

52
OpenRA.Mods.RA/KillsSelf.cs
View File

@@ -1,52 +0,0 @@
#region Copyright & License Information
/*
* Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information,
* see COPYING.
*/
#endregion
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using OpenRA.Effects;
using OpenRA.Mods.Common;
using OpenRA.Primitives;
using OpenRA.Traits;
namespace OpenRA.Mods.RA
{
class KillsSelfInfo : UpgradableTraitInfo, ITraitInfo
{
[Desc("Remove the actor from the world (and destroy it) instead of killing it.")]
public readonly bool RemoveInstead = false;
public object Create(ActorInitializer init) { return new KillsSelf(this); }
}
class KillsSelf : UpgradableTrait<KillsSelfInfo>, INotifyAddedToWorld
{
public KillsSelf(KillsSelfInfo info)
: base(info) { }
public void AddedToWorld(Actor self)
{
if (!IsTraitDisabled)
UpgradeEnabled(self);
}
protected override void UpgradeEnabled(Actor self)
{
if (self.IsDead)
return;
if (Info.RemoveInstead || !self.HasTrait<Health>())
self.Destroy();
else
self.Kill(self);
}
}
}

3
OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
View File

@@ -431,7 +431,6 @@
<Compile Include="SupportPowers\GrantUpgradePower.cs" />
<Compile Include="InvulnerabilityUpgrade.cs" />
<Compile Include="DisableUpgrade.cs" />
<Compile Include="KillsSelf.cs" />
<Compile Include="Warheads\GrantUpgradeWarhead.cs" />
<Compile Include="Crates\GrantUpgradeCrateAction.cs" />
<Compile Include="UpgradeActorsNear.cs" />
@@ -490,4 +489,4 @@ copy "FuzzyLogicLibrary.dll" "$(SolutionDir)"
cd "$(SolutionDir)"</PostBuildEvent>
</PropertyGroup>
<ItemGroup />
</Project>
</Project>

2
OpenRA.Mods.RA/Orders/GlobalButtonOrderGenerator.cs
View File

@@ -11,7 +11,7 @@
using System.Collections.Generic;
using System.Linq;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Power;
using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Orders

2
OpenRA.Mods.RA/Player/BaseAttackNotifier.cs
View File

@@ -9,7 +9,7 @@
#endregion
using System.Drawing;
using OpenRA.Mods.Common;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Buildings;
using OpenRA.Traits;

2
OpenRA.Mods.RA/Player/ClassicProductionQueue.cs
View File

@@ -10,8 +10,6 @@
using System.Collections.Generic;
using System.Linq;
using OpenRA.Mods.Common;
using OpenRA.Mods.Common.Power;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Buildings;
using OpenRA.Mods.RA.Traits;

2
OpenRA.Mods.RA/Player/HarvesterAttackNotifier.cs
View File

@@ -9,7 +9,7 @@
#endregion
using System.Drawing;
using OpenRA.Mods.Common;
using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits

2
OpenRA.Mods.RA/Player/PlaceBeacon.cs
View File

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

2
OpenRA.Mods.RA/Player/PlayerStatistics.cs
View File

@@ -10,7 +10,7 @@
using System.Collections.Generic;
using System.Linq;
using OpenRA.Mods.Common;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Buildings;
using OpenRA.Traits;

1
OpenRA.Mods.RA/Player/ProductionQueue.cs
View File

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

1
OpenRA.Mods.RA/Production.cs
View File

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

3
OpenRA.Mods.RA/Repairable.cs
View File

@@ -11,11 +11,12 @@
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using OpenRA.Mods.Common;
using OpenRA.Mods.Common.Orders;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Activities;
using OpenRA.Mods.RA.Buildings;
using OpenRA.Traits;
using OpenRA.Mods.Common;
namespace OpenRA.Mods.RA
{

1
OpenRA.Mods.RA/Scripting/Properties/ProductionProperties.cs
View File

@@ -12,7 +12,6 @@ using Eluant;
using System;
using System.Collections.Generic;
using System.Linq;
using OpenRA.Mods.Common;
using OpenRA.Mods.Common.Scripting;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Activities;

2
OpenRA.Mods.RA/SelfHealing.cs
View File

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

2
OpenRA.Mods.RA/Sellable.cs
View File

@@ -9,7 +9,7 @@
#endregion
using System.Linq;
using OpenRA.Mods.Common;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Activities;
using OpenRA.Mods.RA.Buildings;
using OpenRA.Mods.RA.Render;

2
OpenRA.Mods.RA/SpawnMPUnits.cs
View File

@@ -11,7 +11,7 @@
using System;
using System.Linq;
using OpenRA.Graphics;
using OpenRA.Mods.Common;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Move;
using OpenRA.Primitives;
using OpenRA.Traits;

2
OpenRA.Mods.RA/SupportPowers/GrantUpgradePower.cs
View File

@@ -12,7 +12,7 @@ using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using OpenRA.Graphics;
using OpenRA.Mods.Common;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Render;
using OpenRA.Traits;

2
OpenRA.Mods.RA/SupportPowers/SupportPower.cs
View File

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

2
OpenRA.Mods.RA/Traits/Cloak.cs
View File

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

1
OpenRA.Mods.RA/Traits/Harvester.cs
View File

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

1
OpenRA.Mods.RA/Traits/LeavesHusk.cs
View File

@@ -9,7 +9,6 @@
#endregion
using System.Linq;
using OpenRA.Mods.Common;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Move;
using OpenRA.Primitives;

2
OpenRA.Mods.RA/UpgradeActorsNear.cs
View File

@@ -11,7 +11,7 @@
using System;
using System.Collections.Generic;
using OpenRA.GameRules;
using OpenRA.Mods.Common;
using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA

1
OpenRA.Mods.RA/UtilityCommands/ActorStatsExport.cs
View File

@@ -13,7 +13,6 @@ using System.Collections.Generic;
using System.Data;
using System.Linq;
using OpenRA.GameRules;
using OpenRA.Mods.Common;
using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;

2
OpenRA.Mods.RA/Warheads/GrantUpgradeWarhead.cs
View File

@@ -13,7 +13,7 @@ using System.Linq;
using OpenRA.Effects;
using OpenRA.GameRules;
using OpenRA.Traits;
using OpenRA.Mods.Common;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Effects;
namespace OpenRA.Mods.RA

2
OpenRA.Mods.RA/Widgets/Logic/Ingame/IngamePowerBarLogic.cs
View File

@@ -10,7 +10,7 @@
using System.Drawing;
using OpenRA.Mods.Common.Widgets;
using OpenRA.Mods.Common.Power;
using OpenRA.Mods.Common.Traits;
using OpenRA.Widgets;
namespace OpenRA.Mods.RA.Widgets.Logic

2
OpenRA.Mods.RA/Widgets/Logic/Ingame/IngamePowerCounterLogic.cs
View File

@@ -10,7 +10,7 @@
using System.Drawing;
using OpenRA.Mods.Common.Widgets;
using OpenRA.Mods.Common.Power;
using OpenRA.Mods.Common.Traits;
using OpenRA.Widgets;
namespace OpenRA.Mods.RA.Widgets.Logic

1
OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs
View File

@@ -14,7 +14,6 @@ using System.Drawing;
using System.Linq;
using System.Threading;
using OpenRA.Graphics;
using OpenRA.Mods.Common;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.Common.Widgets;
using OpenRA.Network;

2
OpenRA.Mods.RA/Widgets/Logic/ObserverStatsLogic.cs
View File

@@ -14,7 +14,7 @@ using System.Drawing;
using System.Linq;
using OpenRA.Graphics;
using OpenRA.Mods.Common;
using OpenRA.Mods.Common.Power;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Traits;
using OpenRA.Network;
using OpenRA.Traits;

1
OpenRA.Mods.RA/Widgets/Logic/ProductionTooltipLogic.cs
View File

@@ -12,7 +12,6 @@ using System;
using System.Drawing;
using System.Linq;
using OpenRA.Mods.Common;
using OpenRA.Mods.Common.Power;
using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
using OpenRA.Widgets;

2
OpenRA.Mods.RA/Widgets/WorldCommandWidget.cs
View File

@@ -12,7 +12,7 @@ using System;
using System.Drawing;
using System.Linq;
using OpenRA.Graphics;
using OpenRA.Mods.Common;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Traits;
using OpenRA.Orders;
using OpenRA.Primitives;