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

Merge pull request #7337 from reaperrr/common29

Browse Source 
Moved Lint, UtilityCommands and Scripting properties to Mods.Common
This commit is contained in:
Matthias Mailänder
2015-01-17 14:53:48 +01:00
parent 878de65268 52dd8c922f
commit c1c1960b44
28 changed files with 58 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.RA/Lint/CheckActorReferences.cs → OpenRA.Mods.Common/Lint/CheckActorReferences.cs
View File

@@ -12,7 +12,7 @@ using System;
using System.Reflection;
using OpenRA.Traits;
namespace OpenRA.Mods.RA
namespace OpenRA.Mods.Common.Lint
{
public class CheckActorReferences : ILintPass
{

2
OpenRA.Mods.RA/Lint/CheckActors.cs → OpenRA.Mods.Common/Lint/CheckActors.cs
View File

@@ -12,7 +12,7 @@ using System;
using System.Linq;
using OpenRA.Traits;
namespace OpenRA.Mods.RA
namespace OpenRA.Mods.Common.Lint
{
public class CheckActors : ILintPass
{

2
OpenRA.Mods.RA/Lint/CheckMapCordon.cs → OpenRA.Mods.Common/Lint/CheckMapCordon.cs
View File

@@ -12,7 +12,7 @@ using System;
using System.Linq;
using OpenRA.Traits;
namespace OpenRA.Mods.RA
namespace OpenRA.Mods.Common.Lint
{
public class CheckMapCordon : ILintPass
{

2
OpenRA.Mods.RA/Lint/CheckMapRules.cs → OpenRA.Mods.Common/Lint/CheckMapRules.cs
View File

@@ -11,7 +11,7 @@
using System;
using OpenRA.Traits;
namespace OpenRA.Mods.RA
namespace OpenRA.Mods.Common.Lint
{
public class CheckMapRules : ILintPass
{

2
OpenRA.Mods.RA/Lint/CheckPlayers.cs → OpenRA.Mods.Common/Lint/CheckPlayers.cs
View File

@@ -12,7 +12,7 @@ using System;
using System.Linq;
using OpenRA.Traits;
namespace OpenRA.Mods.RA
namespace OpenRA.Mods.Common.Lint
{
public class CheckPlayers : ILintPass
{

2
OpenRA.Mods.RA/Lint/CheckSequences.cs → OpenRA.Mods.Common/Lint/CheckSequences.cs
View File

@@ -13,7 +13,7 @@ using System.Linq;
using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA
namespace OpenRA.Mods.Common.Lint
{
class CheckSequences : ILintPass
{

2
OpenRA.Mods.RA/Lint/CheckSyncAnnotations.cs → OpenRA.Mods.Common/Lint/CheckSyncAnnotations.cs
View File

@@ -13,7 +13,7 @@ using System.Linq;
using System.Reflection;
using OpenRA.Traits;
namespace OpenRA.Mods.RA
namespace OpenRA.Mods.Common.Lint
{
class CheckSyncAnnotations : ILintPass
{

2
OpenRA.Mods.RA/Lint/CheckTraitPrerequisites.cs → OpenRA.Mods.Common/Lint/CheckTraitPrerequisites.cs
View File

@@ -12,7 +12,7 @@ using System;
using System.Linq;
using OpenRA.Traits;
namespace OpenRA.Mods.RA
namespace OpenRA.Mods.Common.Lint
{
public class CheckTraitPrerequisites : ILintPass
{

3
OpenRA.Mods.RA/Lint/LintBuildablePrerequisites.cs → OpenRA.Mods.Common/Lint/LintBuildablePrerequisites.cs
View File

@@ -11,10 +11,9 @@
using System;
using System.Linq;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA
namespace OpenRA.Mods.Common.Lint
{
class LintBuildablePrerequisites : ILintPass
{

32
OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
View File

@@ -32,8 +32,12 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Drawing" />
<Reference Include="System.Core" />
<Reference Include="System.Drawing" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="Eluant">
<HintPath>..\thirdparty\Eluant.dll</HintPath>
<Private>False</Private>
@@ -126,6 +130,15 @@
<Compile Include="Graphics\TextRenderable.cs" />
<Compile Include="Graphics\VoxelActorPreview.cs" />
<Compile Include="Graphics\VoxelRenderable.cs" />
<Compile Include="Lint\CheckSequences.cs" />
<Compile Include="Lint\CheckPlayers.cs" />
<Compile Include="Lint\CheckActors.cs" />
<Compile Include="Lint\CheckMapCordon.cs" />
<Compile Include="Lint\CheckMapRules.cs" />
<Compile Include="Lint\CheckActorReferences.cs" />
<Compile Include="Lint\CheckSyncAnnotations.cs" />
<Compile Include="Lint\CheckTraitPrerequisites.cs" />
<Compile Include="Lint\LintBuildablePrerequisites.cs" />
<Compile Include="LoadScreens\ModChooserLoadScreen.cs" />
<Compile Include="Orders\BeaconOrderGenerator.cs" />
<Compile Include="Orders\DeployOrderTargeter.cs" />
@@ -151,6 +164,7 @@
<Compile Include="Scripting\Global\MapGlobal.cs" />
<Compile Include="Scripting\Global\MediaGlobal.cs" />
<Compile Include="Scripting\Global\PlayerGlobal.cs" />
<Compile Include="Scripting\Global\ReinforcementsGlobal.cs" />
<Compile Include="Scripting\Global\TriggerGlobal.cs" />
<Compile Include="Scripting\Global\UtilsGlobal.cs" />
<Compile Include="Scripting\Properties\DiplomacyProperties.cs" />
@@ -158,6 +172,18 @@
<Compile Include="Scripting\Properties\PowerProperties.cs" />
<Compile Include="Scripting\Properties\ResourceProperties.cs" />
<Compile Include="Scripting\Properties\UpgradeProperties.cs" />
<Compile Include="Scripting\Properties\AirstrikeProperties.cs" />
<Compile Include="Scripting\Properties\ProductionProperties.cs" />
<Compile Include="Scripting\Properties\MissionObjectiveProperties.cs" />
<Compile Include="Scripting\Properties\MobileProperties.cs" />
<Compile Include="Scripting\Properties\GeneralProperties.cs" />
<Compile Include="Scripting\Properties\CombatProperties.cs" />
<Compile Include="Scripting\Properties\PlayerProperties.cs" />
<Compile Include="Scripting\Properties\HelicopterProperties.cs" />
<Compile Include="Scripting\Properties\PlaneProperties.cs" />
<Compile Include="Scripting\Properties\TransformProperties.cs" />
<Compile Include="Scripting\Properties\RepairableBuildingProperties.cs" />
<Compile Include="Scripting\Properties\GuardProperties.cs" />
<Compile Include="TraitsInterfaces.cs" />
<Compile Include="Traits\Air\Aircraft.cs" />
<Compile Include="Traits\Air\AttackBomber.cs" />
@@ -254,6 +280,7 @@
<Compile Include="Traits\PaletteEffects\WaterPaletteRotation.cs" />
<Compile Include="Traits\Player\ActorGroupProxy.cs" />
<Compile Include="Traits\Player\AllyRepair.cs" />
<Compile Include="Traits\Player\BaseAttackNotifier.cs" />
<Compile Include="Traits\Player\ClassicProductionQueue.cs" />
<Compile Include="Traits\Player\ConquestVictoryConditions.cs" />
<Compile Include="Traits\Player\GlobalUpgradeManager.cs" />
@@ -374,8 +401,11 @@
<Compile Include="Traits\World\SpawnMPUnits.cs" />
<Compile Include="Traits\World\StartGameNotification.cs" />
<Compile Include="Traits\World\TerrainGeometryOverlay.cs" />
<Compile Include="UtilityCommands\ActorStatsExport.cs" />
<Compile Include="UtilityCommands\ConvertPngToShpCommand.cs" />
<Compile Include="UtilityCommands\ConvertSpriteToPngCommand.cs" />
<Compile Include="UtilityCommands\ExportCharacterSeparatedRules.cs" />
<Compile Include="UtilityCommands\Extensions.cs" />
<Compile Include="UtilityCommands\ExtractFilesCommand.cs" />
<Compile Include="UtilityCommands\ExtractLanguageStringsCommand.cs" />
<Compile Include="UtilityCommands\ExtractLuaDocsCommand.cs" />

5
OpenRA.Mods.RA/Scripting/Global/ReinforcementsGlobal.cs → OpenRA.Mods.Common/Scripting/Global/ReinforcementsGlobal.cs
View File

@@ -12,18 +12,15 @@ using System;
using System.Collections.Generic;
using System.Linq;
using Eluant;
using OpenRA;
using OpenRA.Activities;
using OpenRA.Effects;
using OpenRA.Mods.Common.Activities;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Activities;
using OpenRA.Mods.RA.Traits;
using OpenRA.Primitives;
using OpenRA.Scripting;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Scripting
namespace OpenRA.Mods.Common.Scripting
{
[ScriptGlobal("Reinforcements")]
public class ReinforcementsGlobal : ScriptGlobal

2
OpenRA.Mods.RA/Scripting/Properties/AirstrikeProperties.cs → OpenRA.Mods.Common/Scripting/Properties/AirstrikeProperties.cs
View File

@@ -14,7 +14,7 @@ using OpenRA.Mods.Common.Traits;
using OpenRA.Scripting;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Scripting
namespace OpenRA.Mods.Common.Scripting
{
[ScriptGlobal("Air Support Powers")]
public class AirstrikeProperties : ScriptActorProperties, Requires<AirstrikePowerInfo>

3
OpenRA.Mods.RA/Scripting/Properties/CombatProperties.cs → OpenRA.Mods.Common/Scripting/Properties/CombatProperties.cs
View File

@@ -14,11 +14,10 @@ using Eluant;
using OpenRA.Activities;
using OpenRA.Mods.Common.Activities;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Activities;
using OpenRA.Scripting;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Scripting
namespace OpenRA.Mods.Common.Scripting
{
[ScriptPropertyGroup("Combat")]
public class CombatProperties : ScriptActorProperties, Requires<AttackBaseInfo>, Requires<IMoveInfo>

4
OpenRA.Mods.RA/Scripting/Properties/GeneralProperties.cs → OpenRA.Mods.Common/Scripting/Properties/GeneralProperties.cs
View File

@@ -11,12 +11,10 @@
using Eluant;
using OpenRA.Mods.Common.Activities;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Activities;
using OpenRA.Mods.RA.Traits;
using OpenRA.Scripting;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Scripting
namespace OpenRA.Mods.Common.Scripting
{
[ExposedForDestroyedActors]
[ScriptPropertyGroup("General")]

2
OpenRA.Mods.RA/Scripting/Properties/GuardProperties.cs → OpenRA.Mods.Common/Scripting/Properties/GuardProperties.cs
View File

@@ -12,7 +12,7 @@ using OpenRA.Mods.Common.Traits;
using OpenRA.Scripting;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Scripting
namespace OpenRA.Mods.Common.Scripting
{
[ScriptPropertyGroup("Guard")]
public class GuardProperties : ScriptActorProperties, Requires<GuardInfo>, Requires<IMoveInfo>

3
OpenRA.Mods.RA/Scripting/Properties/HelicopterProperties.cs → OpenRA.Mods.Common/Scripting/Properties/HelicopterProperties.cs
View File

@@ -10,11 +10,10 @@
using OpenRA.Mods.Common.Activities;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Traits;
using OpenRA.Scripting;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Scripting
namespace OpenRA.Mods.Common.Scripting
{
[ScriptPropertyGroup("Movement")]
public class HelicopterProperties : ScriptActorProperties, Requires<HelicopterInfo>

3
OpenRA.Mods.RA/Scripting/Properties/MissionObjectiveProperties.cs → OpenRA.Mods.Common/Scripting/Properties/MissionObjectiveProperties.cs
View File

@@ -10,12 +10,11 @@
using System;
using Eluant;
using OpenRA.Mods.Common;
using OpenRA.Mods.Common.Traits;
using OpenRA.Scripting;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Scripting
namespace OpenRA.Mods.Common.Scripting
{
[ScriptPropertyGroup("MissionObjectives")]
public class MissionObjectiveProperties : ScriptPlayerProperties

4
OpenRA.Mods.RA/Scripting/Properties/MobileProperties.cs → OpenRA.Mods.Common/Scripting/Properties/MobileProperties.cs
View File

@@ -10,12 +10,10 @@
using OpenRA.Mods.Common.Activities;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Activities;
using OpenRA.Mods.RA.Traits;
using OpenRA.Scripting;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Scripting
namespace OpenRA.Mods.Common.Scripting
{
[ScriptPropertyGroup("Movement")]
public class MobileProperties : ScriptActorProperties, Requires<MobileInfo>

3
OpenRA.Mods.RA/Scripting/Properties/PlaneProperties.cs → OpenRA.Mods.Common/Scripting/Properties/PlaneProperties.cs
View File

@@ -10,11 +10,10 @@
using OpenRA.Mods.Common.Activities;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Traits;
using OpenRA.Scripting;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Scripting
namespace OpenRA.Mods.Common.Scripting
{
[ScriptPropertyGroup("Movement")]
public class PlaneProperties : ScriptActorProperties, Requires<PlaneInfo>

3
OpenRA.Mods.RA/Scripting/Properties/PlayerProperties.cs → OpenRA.Mods.Common/Scripting/Properties/PlayerProperties.cs
View File

@@ -12,10 +12,9 @@ using System;
using System.Linq;
using Eluant;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Traits;
using OpenRA.Scripting;
namespace OpenRA.Mods.RA.Scripting
namespace OpenRA.Mods.Common.Scripting
{
[ScriptPropertyGroup("Player")]
public class PlayerProperties : ScriptPlayerProperties

3
OpenRA.Mods.RA/Scripting/Properties/ProductionProperties.cs → OpenRA.Mods.Common/Scripting/Properties/ProductionProperties.cs
View File

@@ -15,11 +15,10 @@ using Eluant;
using OpenRA.Mods.Common.Activities;
using OpenRA.Mods.Common.Scripting;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Traits;
using OpenRA.Scripting;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Scripting
namespace OpenRA.Mods.Common.Scripting
{
[ScriptPropertyGroup("Production")]
public class ProductionProperties : ScriptActorProperties, Requires<ProductionInfo>

2
OpenRA.Mods.RA/Scripting/Properties/RepairableBuildingProperties.cs → OpenRA.Mods.Common/Scripting/Properties/RepairableBuildingProperties.cs
View File

@@ -12,7 +12,7 @@ using OpenRA.Mods.Common.Traits;
using OpenRA.Scripting;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Scripting
namespace OpenRA.Mods.Common.Scripting
{
[ScriptPropertyGroup("General")]
public class RepairableBuildingProperties : ScriptActorProperties, Requires<RepairableBuildingInfo>

3
OpenRA.Mods.RA/Scripting/Properties/TransformProperties.cs → OpenRA.Mods.Common/Scripting/Properties/TransformProperties.cs
View File

@@ -9,11 +9,10 @@
#endregion
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Traits;
using OpenRA.Scripting;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Scripting
namespace OpenRA.Mods.Common.Scripting
{
[ScriptPropertyGroup("Transform")]
public class TransformProperties : ScriptActorProperties, Requires<TransformsInfo>

3
OpenRA.Mods.RA/Player/BaseAttackNotifier.cs → OpenRA.Mods.Common/Traits/Player/BaseAttackNotifier.cs
View File

@@ -9,10 +9,9 @@
#endregion
using System.Drawing;
using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits
namespace OpenRA.Mods.Common.Traits
{
[Desc("Plays an audio notification and shows a radar ping when a building is attacked.",
"Attach this to the player actor.")]

3
OpenRA.Mods.RA/UtilityCommands/ActorStatsExport.cs → OpenRA.Mods.Common/UtilityCommands/ActorStatsExport.cs
View File

@@ -14,10 +14,9 @@ using System.Data;
using System.Linq;
using OpenRA.GameRules;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.UtilityCommands
namespace OpenRA.Mods.Common.UtilityCommands
{
public static class ActorStatsExport
{

2
OpenRA.Mods.RA/UtilityCommands/ExportCharacterSeparatedRules.cs → OpenRA.Mods.Common/UtilityCommands/ExportCharacterSeparatedRules.cs
View File

@@ -11,7 +11,7 @@
using System;
using System.IO;
namespace OpenRA.Mods.RA.UtilityCommands
namespace OpenRA.Mods.Common.UtilityCommands
{
class ExportCharacterSeparatedRules : IUtilityCommand
{

2
OpenRA.Mods.RA/UtilityCommands/Extensions.cs → OpenRA.Mods.Common/UtilityCommands/Extensions.cs
View File

@@ -12,7 +12,7 @@ using System;
using System.Data;
using System.Text;
namespace OpenRA.Mods.RA.UtilityCommands
namespace OpenRA.Mods.Common.UtilityCommands
{
public static class Extensions
{

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

@@ -100,7 +100,6 @@
<Compile Include="AI\RushFuzzy.cs" />
<Compile Include="AI\StateMachine.cs" />
<Compile Include="Traits\Attack\AttackLeap.cs" />
<Compile Include="Scripting\Properties\RepairableBuildingProperties.cs" />
<Compile Include="Traits\PaletteEffects\ChronoshiftPaletteEffect.cs" />
<Compile Include="Traits\Chronoshiftable.cs" />
<Compile Include="CrateSpawner.cs" />
@@ -120,16 +119,11 @@
<Compile Include="Traits\DemoTruck.cs" />
<Compile Include="Effects\GpsDot.cs" />
<Compile Include="Effects\Parachute.cs" />
<Compile Include="Lint\CheckActorReferences.cs" />
<Compile Include="Lint\CheckSyncAnnotations.cs" />
<Compile Include="Lint\CheckTraitPrerequisites.cs" />
<Compile Include="Lint\LintBuildablePrerequisites.cs" />
<Compile Include="Traits\MadTank.cs" />
<Compile Include="Traits\Mine.cs" />
<Compile Include="Traits\Minelayer.cs" />
<Compile Include="Traits\ParaDrop.cs" />
<Compile Include="Traits\PortableChrono.cs" />
<Compile Include="Scripting\Properties\GuardProperties.cs" />
<Compile Include="Widgets\Logic\TabCompletionLogic.cs" />
<Compile Include="Traits\Render\RenderJammerCircle.cs" />
<Compile Include="Traits\Render\RenderHarvester.cs" />
@@ -175,7 +169,6 @@
<Compile Include="Widgets\Logic\ServerCreationLogic.cs" />
<Compile Include="Widgets\ObserverProductionIconsWidget.cs" />
<Compile Include="Widgets\WorldCommandWidget.cs" />
<Compile Include="Player\BaseAttackNotifier.cs" />
<Compile Include="Player\HarvesterAttackNotifier.cs" />
<Compile Include="Traits\Render\RenderShroudCircle.cs" />
<Compile Include="Traits\Infiltration\InfiltrateForCash.cs" />
@@ -184,7 +177,6 @@
<Compile Include="Traits\Infiltration\InfiltrateForSupportPower.cs" />
<Compile Include="Traits\Infiltration\Infiltrates.cs" />
<Compile Include="Widgets\Logic\ObserverShroudSelectorLogic.cs" />
<Compile Include="Lint\CheckSequences.cs" />
<Compile Include="Widgets\Logic\SpawnSelectorTooltipLogic.cs" />
<Compile Include="Widgets\Logic\ClientTooltipLogic.cs" />
<Compile Include="Widgets\Logic\CreditsLogic.cs" />
@@ -202,19 +194,7 @@
<Compile Include="Traits\Attack\AttackGarrisoned.cs" />
<Compile Include="Widgets\Logic\LobbyMapPreviewLogic.cs" />
<Compile Include="Widgets\Logic\ControlGroupLogic.cs" />
<Compile Include="Scripting\Global\ReinforcementsGlobal.cs" />
<Compile Include="Scripting\Properties\AirstrikeProperties.cs" />
<Compile Include="Scripting\Properties\ProductionProperties.cs" />
<Compile Include="Scripting\Properties\MissionObjectiveProperties.cs" />
<Compile Include="Scripting\Properties\MobileProperties.cs" />
<Compile Include="Scripting\Properties\GeneralProperties.cs" />
<Compile Include="Scripting\Properties\CombatProperties.cs" />
<Compile Include="Scripting\Properties\PlayerProperties.cs" />
<Compile Include="Scripting\Properties\TransportProperties.cs" />
<Compile Include="Scripting\Properties\ChronosphereProperties.cs" />
<Compile Include="Lint\CheckPlayers.cs" />
<Compile Include="Lint\CheckActors.cs" />
<Compile Include="Lint\CheckMapCordon.cs" />
<Compile Include="Traits\Parachutable.cs" />
<Compile Include="Widgets\Logic\InstallFromCDLogic.cs" />
<Compile Include="Widgets\Logic\InstallMusicLogic.cs" />
@@ -229,14 +209,8 @@
<Compile Include="Widgets\Logic\DebugMenuLogic.cs" />
<Compile Include="Warheads\PerCellDamageWarhead.cs" />
<Compile Include="Scripting\Properties\HarvesterProperties.cs" />
<Compile Include="Scripting\Properties\HelicopterProperties.cs" />
<Compile Include="Scripting\Properties\PlaneProperties.cs" />
<Compile Include="Scripting\Properties\TransportProperties.cs" />
<Compile Include="Traits\InvulnerabilityUpgrade.cs" />
<Compile Include="Scripting\Properties\TransformProperties.cs" />
<Compile Include="UtilityCommands\ActorStatsExport.cs" />
<Compile Include="UtilityCommands\ExportCharacterSeparatedRules.cs" />
<Compile Include="UtilityCommands\Extensions.cs" />
<Compile Include="Lint\CheckMapRules.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\OpenRA.Game\OpenRA.Game.csproj">