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

Merge pull request #7435 from penev92/bleed_moveFiles

Browse Source 
Moving more files to Mods.Common
This commit is contained in:
Oliver Brakmann
2015-02-07 10:10:32 +01:00
parent 0af8d6902b 64887cb8c8
commit 32243122be
18 changed files with 35 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Cnc/Widgets/Logic/CncMainMenuLogic.cs
View File

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

4
OpenRA.Mods.RA/Activities/DeliverResources.cs → OpenRA.Mods.Common/Activities/DeliverResources.cs Executable file → Normal file
View File

@@ -10,12 +10,10 @@
using System.Drawing;
using OpenRA.Activities;
using OpenRA.Mods.Common.Activities;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Activities
namespace OpenRA.Mods.Common.Activities
{
public class DeliverResources : Activity
{

4
OpenRA.Mods.RA/Activities/FindResources.cs → OpenRA.Mods.Common/Activities/FindResources.cs Executable file → Normal file
View File

@@ -12,12 +12,10 @@ using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using OpenRA.Activities;
using OpenRA.Mods.Common.Activities;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Activities
namespace OpenRA.Mods.Common.Activities
{
public class FindResources : Activity
{

5
OpenRA.Mods.RA/Activities/HarvesterDockSequence.cs → OpenRA.Mods.Common/Activities/HarvesterDockSequence.cs
View File

@@ -11,11 +11,10 @@
using System;
using System.Collections.Generic;
using OpenRA.Activities;
using OpenRA.Mods.Common.Activities;
using OpenRA.Mods.RA.Traits;
using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Activities
namespace OpenRA.Mods.Common.Activities
{
public class HarvesterDockSequence : Activity
{

2
OpenRA.Mods.RA/Activities/SpriteHarvesterDockSequence.cs → OpenRA.Mods.Common/Activities/SpriteHarvesterDockSequence.cs
View File

@@ -11,7 +11,7 @@
using OpenRA.Activities;
using OpenRA.Mods.Common.Traits;
namespace OpenRA.Mods.RA.Activities
namespace OpenRA.Mods.Common.Activities
{
public class SpriteHarvesterDockSequence : HarvesterDockSequence
{

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

@@ -85,10 +85,13 @@
<Compile Include="Activities\Air\TakeOff.cs" />
<Compile Include="Activities\Attack.cs" />
<Compile Include="Activities\CaptureActor.cs" />
<Compile Include="Activities\DeliverResources.cs" />
<Compile Include="Activities\Demolish.cs" />
<Compile Include="Activities\Enter.cs" />
<Compile Include="Activities\EnterTransport.cs" />
<Compile Include="Activities\ExternalCaptureActor.cs" />
<Compile Include="Activities\FindResources.cs" />
<Compile Include="Activities\HarvesterDockSequence.cs" />
<Compile Include="Activities\Heal.cs" />
<Compile Include="Activities\Hunt.cs" />
<Compile Include="Activities\Move\AttackMoveActivity.cs" />
@@ -104,6 +107,7 @@
<Compile Include="Activities\RepairBuilding.cs" />
<Compile Include="Activities\Sell.cs" />
<Compile Include="Activities\SimpleTeleport.cs" />
<Compile Include="Activities\SpriteHarvesterDockSequence.cs" />
<Compile Include="Activities\Transform.cs" />
<Compile Include="Activities\Turn.cs" />
<Compile Include="Activities\UnloadCargo.cs" />
@@ -235,6 +239,7 @@
<Compile Include="Traits\Buildings\LineBuildNode.cs" />
<Compile Include="Traits\Buildings\PrimaryBuilding.cs" />
<Compile Include="Traits\Buildings\RallyPoint.cs" />
<Compile Include="Traits\Buildings\Refinery.cs" />
<Compile Include="Traits\Buildings\RepairableBuilding.cs" />
<Compile Include="Traits\Buildings\RepairsUnits.cs" />
<Compile Include="Traits\Buildings\Reservable.cs" />
@@ -265,6 +270,7 @@
<Compile Include="Traits\ExternalCapturable.cs" />
<Compile Include="Traits\ExternalCapturableBar.cs" />
<Compile Include="Traits\ExternalCaptures.cs" />
<Compile Include="Traits\Harvester.cs" />
<Compile Include="Traits\IgnoresCloak.cs" />
<Compile Include="Traits\IgnoresDisguise.cs" />
<Compile Include="Traits\DetectCloaked.cs" />
@@ -310,6 +316,7 @@
<Compile Include="Traits\Player\ConquestVictoryConditions.cs" />
<Compile Include="Traits\Player\EnemyWatcher.cs" />
<Compile Include="Traits\Player\GlobalUpgradeManager.cs" />
<Compile Include="Traits\Player\HarvesterAttackNotifier.cs" />
<Compile Include="Traits\Player\MissionObjectives.cs" />
<Compile Include="Traits\Player\PlaceBeacon.cs" />
<Compile Include="Traits\Player\PlaceBuilding.cs" />
@@ -339,6 +346,7 @@
<Compile Include="Traits\Render\RenderBuildingWarFactory.cs" />
<Compile Include="Traits\Render\RenderEditorOnly.cs" />
<Compile Include="Traits\Render\RenderFlare.cs" />
<Compile Include="Traits\Render\RenderHarvester.cs" />
<Compile Include="Traits\Render\RenderInfantry.cs" />
<Compile Include="Traits\Render\RenderNameTag.cs" />
<Compile Include="Traits\Render\ProductionBar.cs" />
@@ -476,6 +484,7 @@
<Compile Include="Widgets\Logic\Lobby\LobbyLogic.cs" />
<Compile Include="Widgets\Logic\Lobby\LobbyMapPreviewLogic.cs" />
<Compile Include="Widgets\Logic\Lobby\LobbyUtils.cs" />
<Compile Include="Widgets\Logic\MainMenuLogic.cs" />
<Compile Include="Widgets\Logic\MapChooserLogic.cs" />
<Compile Include="Widgets\Logic\ModBrowserLogic.cs" />
<Compile Include="Widgets\Logic\ProductionTooltipLogic.cs" />

5
OpenRA.Mods.RA/Traits/Buildings/Refinery.cs → OpenRA.Mods.Common/Traits/Buildings/Refinery.cs
View File

@@ -11,12 +11,11 @@
using System.Collections.Generic;
using System.Linq;
using OpenRA.Activities;
using OpenRA.Mods.Common.Activities;
using OpenRA.Mods.Common.Effects;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Activities;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits
namespace OpenRA.Mods.Common.Traits
{
public class RefineryInfo : ITraitInfo
{

4
OpenRA.Mods.RA/Traits/Harvester.cs → OpenRA.Mods.Common/Traits/Harvester.cs
View File

@@ -14,11 +14,9 @@ using System.Linq;
using OpenRA.Activities;
using OpenRA.Mods.Common.Activities;
using OpenRA.Mods.Common.Orders;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Activities;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits
namespace OpenRA.Mods.Common.Traits
{
public class HarvesterInfo : ITraitInfo
{

3
OpenRA.Mods.RA/Player/HarvesterAttackNotifier.cs → OpenRA.Mods.Common/Traits/Player/HarvesterAttackNotifier.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 harvester is attacked.",
"Attach this to the player actor.")]

3
OpenRA.Mods.RA/Traits/Render/RenderHarvester.cs → OpenRA.Mods.Common/Traits/Render/RenderHarvester.cs
View File

@@ -10,10 +10,9 @@
using OpenRA.Activities;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits
namespace OpenRA.Mods.Common.Traits
{
class RenderHarvesterInfo : RenderUnitInfo, Requires<HarvesterInfo>
{

10
OpenRA.Mods.Common/TraitsInterfaces.cs
View File

@@ -11,6 +11,7 @@
using System.Collections.Generic;
using OpenRA.Activities;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Activities;
using OpenRA.Mods.Common.Graphics;
using OpenRA.Traits;
@@ -61,4 +62,13 @@ namespace OpenRA.Mods.Common.Traits
}
public interface INotifyTransform { void BeforeTransform(Actor self); void OnTransform(Actor self); void AfterTransform(Actor toActor); }
public interface IAcceptResources
{
void OnDock(Actor harv, DeliverResources dockOrder);
void GiveResource(int amount);
bool CanGiveResource(int amount);
CVec DeliveryOffset { get; }
bool AllowDocking { get; }
}
}

3
OpenRA.Mods.RA/Widgets/Logic/MainMenuLogic.cs → OpenRA.Mods.Common/Widgets/Logic/MainMenuLogic.cs
View File

@@ -15,10 +15,9 @@ using System.IO;
using System.Linq;
using System.Net;
using System.Text;
using OpenRA.Mods.Common.Widgets.Logic;
using OpenRA.Widgets;
namespace OpenRA.Mods.RA.Widgets.Logic
namespace OpenRA.Mods.Common.Widgets.Logic
{
public class MainMenuLogic
{

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

@@ -70,18 +70,14 @@
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Activities\SpriteHarvesterDockSequence.cs" />
<Compile Include="AI\AttackOrFleeFuzzy.cs" />
<Compile Include="AI\BaseBuilder.cs" />
<Compile Include="AI\HackyAI.cs" />
<Compile Include="Traits\AcceptsSupplies.cs" />
<Compile Include="Activities\DeliverResources.cs" />
<Compile Include="Activities\DonateSupplies.cs" />
<Compile Include="Activities\FindResources.cs" />
<Compile Include="Activities\Infiltrate.cs" />
<Compile Include="Activities\LayMines.cs" />
<Compile Include="Activities\Leap.cs" />
<Compile Include="Activities\HarvesterDockSequence.cs" />
<Compile Include="Activities\Teleport.cs" />
<Compile Include="AI\SupportPowerDecision.cs" />
<Compile Include="Effects\GpsSatellite.cs" />
@@ -102,7 +98,6 @@
<Compile Include="Traits\Minelayer.cs" />
<Compile Include="Traits\PortableChrono.cs" />
<Compile Include="Traits\Render\RenderJammerCircle.cs" />
<Compile Include="Traits\Render\RenderHarvester.cs" />
<Compile Include="Traits\Render\RenderDisguise.cs" />
<Compile Include="Traits\Render\RenderLandingCraft.cs" />
<Compile Include="Traits\Disguise.cs" />
@@ -110,10 +105,7 @@
<Compile Include="Traits\SupportPowers\ChronoshiftPower.cs" />
<Compile Include="Traits\SupportPowers\GpsPower.cs" />
<Compile Include="Traits\SupportPowers\ParatroopersPower.cs" />
<Compile Include="TraitsInterfaces.cs" />
<Compile Include="Traits\Buildings\Fake.cs" />
<Compile Include="Traits\Buildings\Refinery.cs" />
<Compile Include="Traits\Harvester.cs" />
<Compile Include="Traits\HarvesterHuskModifier.cs" />
<Compile Include="Traits\LeavesHusk.cs" />
<Compile Include="Traits\TargetableSubmarine.cs" />
@@ -127,14 +119,12 @@
<Compile Include="Widgets\Logic\IngameMenuLogic.cs" />
<Compile Include="Widgets\Logic\Ingame\LeaveMapLogic.cs" />
<Compile Include="Widgets\Logic\DownloadPackagesLogic.cs" />
<Compile Include="Widgets\Logic\MainMenuLogic.cs" />
<Compile Include="Widgets\Logic\MusicPlayerLogic.cs" />
<Compile Include="Widgets\Logic\ObserverStatsLogic.cs" />
<Compile Include="Widgets\Logic\OrderButtonsChromeLogic.cs" />
<Compile Include="Widgets\Logic\PerfDebugLogic.cs" />
<Compile Include="Widgets\ObserverProductionIconsWidget.cs" />
<Compile Include="Widgets\WorldCommandWidget.cs" />
<Compile Include="Player\HarvesterAttackNotifier.cs" />
<Compile Include="Traits\Render\RenderShroudCircle.cs" />
<Compile Include="Traits\Infiltration\InfiltrateForCash.cs" />
<Compile Include="Traits\Infiltration\InfiltrateForExploration.cs" />

2
OpenRA.Mods.RA/Scripting/Properties/HarvesterProperties.cs
View File

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

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

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

28
OpenRA.Mods.RA/TraitsInterfaces.cs
View File

@@ -1,28 +0,0 @@
#region Copyright & License Information
/*
* Copyright 2007-2015 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 OpenRA.Mods.RA.Activities;
namespace OpenRA.Mods.RA
{
public interface IAcceptResources
{
void OnDock(Actor harv, DeliverResources dockOrder);
void GiveResource(int amount);
bool CanGiveResource(int amount);
CVec DeliveryOffset { get; }
bool AllowDocking { get; }
}
public interface IAcceptOreDockAction
{
void OnDock(Actor self, Actor harv, DeliverResources dockOrder);
}
}

2
OpenRA.Mods.TS/Activities/VoxelHarvesterDockSequence.cs
View File

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

2
OpenRA.Mods.TS/Traits/Buildings/TiberianSunRefinery.cs
View File

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