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

Merge pull request #12757 from reaperrr/merge-ra-into-cnc

Browse Source 
Merge Mods.RA into Mods.Cnc
This commit is contained in:
abcdefg30
2017-02-12 17:47:41 +01:00
committed by GitHub
parent c09fa25257 0c3a786d10
commit a3aab6f051
51 changed files with 105 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile
View File

@@ -146,15 +146,6 @@ test_dll: $(test_dll_TARGET)
STD_MOD_LIBS = $(game_TARGET)
STD_MOD_DEPS = $(STD_MOD_LIBS)
# Red Alert
mod_ra_SRCS := $(shell find OpenRA.Mods.RA/ -iname '*.cs')
mod_ra_TARGET = mods/ra/OpenRA.Mods.RA.dll
mod_ra_KIND = library
mod_ra_DEPS = $(STD_MOD_DEPS) $(mod_common_TARGET)
mod_ra_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS) $(mod_common_TARGET)
PROGRAMS += mod_ra
mod_ra: $(mod_ra_TARGET)
# Command and Conquer
mod_cnc_SRCS := $(shell find OpenRA.Mods.Cnc/ -iname '*.cs')
mod_cnc_TARGET = mods/cnc/OpenRA.Mods.Cnc.dll
@@ -196,9 +187,6 @@ check: utility mods
@echo "Checking for code style violations in OpenRA.Mods.Common..."
@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Mods.Common
@echo
@echo "Checking for code style violations in OpenRA.Mods.RA..."
@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Mods.RA
@echo
@echo "Checking for code style violations in OpenRA.Mods.Cnc..."
@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Mods.Cnc
@echo
@@ -313,7 +301,7 @@ tools: gamemonitor
package: all-dependencies core tools docs version
mods: mod_common mod_ra mod_cnc mod_d2k
mods: mod_common mod_cnc mod_d2k
all: dependencies core tools
@@ -378,8 +366,6 @@ install-core: default
@$(INSTALL_PROGRAM) $(mod_common_TARGET) "$(DATA_INSTALL_DIR)/mods/common"
@$(CP_R) mods/cnc "$(DATA_INSTALL_DIR)/mods/"
@$(INSTALL_PROGRAM) $(mod_cnc_TARGET) "$(DATA_INSTALL_DIR)/mods/cnc"
@$(CP_R) mods/ra "$(DATA_INSTALL_DIR)/mods/"
@$(INSTALL_PROGRAM) $(mod_ra_TARGET) "$(DATA_INSTALL_DIR)/mods/ra"
@$(CP_R) mods/d2k "$(DATA_INSTALL_DIR)/mods/"
@$(INSTALL_PROGRAM) $(mod_d2k_TARGET) "$(DATA_INSTALL_DIR)/mods/d2k"
@$(CP_R) mods/modchooser "$(DATA_INSTALL_DIR)/mods/"

2
OpenRA.Mods.RA/Activities/Infiltrate.cs → OpenRA.Mods.Cnc/Activities/Infiltrate.cs
View File

@@ -13,7 +13,7 @@ using OpenRA.Mods.Common.Activities;
using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Activities
namespace OpenRA.Mods.Cnc.Activities
{
class Infiltrate : Enter
{

4
OpenRA.Mods.RA/Activities/LayMines.cs → OpenRA.Mods.Cnc/Activities/LayMines.cs
View File

@@ -12,13 +12,13 @@
using System.Collections.Generic;
using System.Linq;
using OpenRA.Activities;
using OpenRA.Mods.Cnc.Traits;
using OpenRA.Mods.Common.Activities;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Traits;
using OpenRA.Primitives;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Activities
namespace OpenRA.Mods.Cnc.Activities
{
// Assumes you have Minelayer on that unit
public class LayMines : Activity

2
OpenRA.Mods.RA/Activities/Leap.cs → OpenRA.Mods.Cnc/Activities/Leap.cs
View File

@@ -17,7 +17,7 @@ using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.Common.Traits.Render;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Activities
namespace OpenRA.Mods.Cnc.Activities
{
class Leap : Activity
{

4
OpenRA.Mods.RA/Activities/Teleport.cs → OpenRA.Mods.Cnc/Activities/Teleport.cs
View File

@@ -12,12 +12,12 @@
using System;
using System.Linq;
using OpenRA.Activities;
using OpenRA.Mods.Cnc.Traits;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.Common.Traits.Render;
using OpenRA.Mods.RA.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Activities
namespace OpenRA.Mods.Cnc.Activities
{
public interface IPreventsTeleport { bool PreventsTeleport(Actor self); }

4
OpenRA.Mods.RA/Effects/GpsDot.cs → OpenRA.Mods.Cnc/Effects/GpsDot.cs
View File

@@ -13,12 +13,12 @@ using System;
using System.Collections.Generic;
using OpenRA.Effects;
using OpenRA.Graphics;
using OpenRA.Mods.Cnc.Traits;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Traits;
using OpenRA.Primitives;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Effects
namespace OpenRA.Mods.Cnc.Effects
{
[Desc("Attach this to actors to render pictograms while hidden.")]
class GpsDotInfo : ITraitInfo

4
OpenRA.Mods.RA/Effects/GpsSatellite.cs → OpenRA.Mods.Cnc/Effects/GpsSatellite.cs
View File

@@ -12,9 +12,9 @@
using System.Collections.Generic;
using OpenRA.Effects;
using OpenRA.Graphics;
using OpenRA.Mods.RA.Traits;
using OpenRA.Mods.Cnc.Traits;
namespace OpenRA.Mods.RA.Effects
namespace OpenRA.Mods.Cnc.Effects
{
class GpsSatellite : IEffect
{

4
OpenRA.Mods.RA/Effects/SatelliteLaunch.cs → OpenRA.Mods.Cnc/Effects/SatelliteLaunch.cs
View File

@@ -12,9 +12,9 @@
using System.Collections.Generic;
using OpenRA.Effects;
using OpenRA.Graphics;
using OpenRA.Mods.RA.Traits;
using OpenRA.Mods.Cnc.Traits;
namespace OpenRA.Mods.RA.Effects
namespace OpenRA.Mods.Cnc.Effects
{
class SatelliteLaunch : IEffect
{

2
OpenRA.Mods.RA/Graphics/TeslaZapRenderable.cs → OpenRA.Mods.Cnc/Graphics/TeslaZapRenderable.cs
View File

@@ -15,7 +15,7 @@ using System.Drawing;
using System.Linq;
using OpenRA.Graphics;
namespace OpenRA.Mods.RA.Graphics
namespace OpenRA.Mods.Cnc.Graphics
{
struct TeslaZapRenderable : IRenderable, IFinalizedRenderable
{

2
OpenRA.Mods.RA/ImportRedAlertLegacyMapCommand.cs → OpenRA.Mods.Cnc/ImportRedAlertLegacyMapCommand.cs
View File

@@ -18,7 +18,7 @@ using OpenRA.Mods.Common.FileFormats;
using OpenRA.Mods.Common.UtilityCommands;
using OpenRA.Primitives;
namespace OpenRA.Mods.RA.UtilityCommands
namespace OpenRA.Mods.Cnc.UtilityCommands
{
class ImportRedAlertLegacyMapCommand : ImportLegacyMapCommand, IUtilityCommand
{

39
OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj
View File

@@ -93,6 +93,45 @@
<Compile Include="Traits\Attack\AttackTesla.cs" />
<Compile Include="Traits\Render\WithTeslaChargeAnimation.cs" />
<Compile Include="Traits\Render\WithTeslaChargeOverlay.cs" />
<Compile Include="Activities\Infiltrate.cs" />
<Compile Include="Activities\LayMines.cs" />
<Compile Include="Activities\Leap.cs" />
<Compile Include="Activities\Teleport.cs" />
<Compile Include="Effects\GpsDot.cs" />
<Compile Include="Effects\GpsSatellite.cs" />
<Compile Include="Effects\SatelliteLaunch.cs" />
<Compile Include="Projectiles\TeslaZap.cs" />
<Compile Include="Graphics\TeslaZapRenderable.cs" />
<Compile Include="Scripting\Properties\InfiltrateProperties.cs" />
<Compile Include="Scripting\Properties\DisguiseProperties.cs" />
<Compile Include="Traits\Attack\AttackLeap.cs" />
<Compile Include="Traits\Buildings\ClonesProducedUnits.cs" />
<Compile Include="Traits\Chronoshiftable.cs" />
<Compile Include="Traits\Cloneable.cs" />
<Compile Include="Traits\Disguise.cs" />
<Compile Include="Traits\FrozenUnderFogUpdatedByGps.cs" />
<Compile Include="Traits\HarvesterHuskModifier.cs" />
<Compile Include="Traits\Infiltration\InfiltrateForCash.cs" />
<Compile Include="Traits\Infiltration\InfiltrateForExploration.cs" />
<Compile Include="Traits\Infiltration\InfiltrateForPowerOutage.cs" />
<Compile Include="Traits\Infiltration\InfiltrateForSupportPower.cs" />
<Compile Include="Traits\Infiltration\Infiltrates.cs" />
<Compile Include="Traits\MadTank.cs" />
<Compile Include="Traits\Mine.cs" />
<Compile Include="Traits\Minelayer.cs" />
<Compile Include="Traits\PaletteEffects\ChronoshiftPaletteEffect.cs" />
<Compile Include="Traits\PaletteEffects\LightPaletteRotator.cs" />
<Compile Include="Traits\PortableChrono.cs" />
<Compile Include="Traits\Render\RenderJammerCircle.cs" />
<Compile Include="Traits\Render\WithLandingCraftAnimation.cs" />
<Compile Include="Traits\Render\RenderShroudCircle.cs" />
<Compile Include="Traits\SupportPowers\ChronoshiftPower.cs" />
<Compile Include="Traits\SupportPowers\GpsPower.cs" />
<Compile Include="Traits\GpsWatcher.cs" />
<Compile Include="Scripting\Properties\ChronosphereProperties.cs" />
<Compile Include="Traits\Render\WithDisguisingInfantryBody.cs" />
<Compile Include="ImportRedAlertLegacyMapCommand.cs" />
<Compile Include="Traits\Infiltration\InfiltrateForDecoration.cs" />
<Compile Include="TraitsInterfaces.cs" />
</ItemGroup>
<ItemGroup>

4
OpenRA.Mods.RA/Projectiles/TeslaZap.cs → OpenRA.Mods.Cnc/Projectiles/TeslaZap.cs
View File

@@ -13,10 +13,10 @@ using System.Collections.Generic;
using OpenRA.Effects;
using OpenRA.GameRules;
using OpenRA.Graphics;
using OpenRA.Mods.RA.Graphics;
using OpenRA.Mods.Cnc.Graphics;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Projectiles
namespace OpenRA.Mods.Cnc.Projectiles
{
public class TeslaZapInfo : IProjectileInfo
{

4
OpenRA.Mods.RA/Scripting/Properties/ChronosphereProperties.cs → OpenRA.Mods.Cnc/Scripting/Properties/ChronosphereProperties.cs
View File

@@ -10,11 +10,11 @@
#endregion
using Eluant;
using OpenRA.Mods.RA.Traits;
using OpenRA.Mods.Cnc.Traits;
using OpenRA.Scripting;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Scripting
namespace OpenRA.Mods.Cnc.Scripting
{
[ScriptPropertyGroup("Support Powers")]
public class ChronsphereProperties : ScriptActorProperties, Requires<ChronoshiftPowerInfo>

4
OpenRA.Mods.RA/Scripting/Properties/DisguiseProperties.cs → OpenRA.Mods.Cnc/Scripting/Properties/DisguiseProperties.cs
View File

@@ -9,11 +9,11 @@
*/
#endregion
using OpenRA.Mods.RA.Traits;
using OpenRA.Mods.Cnc.Traits;
using OpenRA.Scripting;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Scripting
namespace OpenRA.Mods.Cnc.Scripting
{
[ScriptPropertyGroup("Ability")]
public class DisguiseProperties : ScriptActorProperties, Requires<DisguiseInfo>

6
OpenRA.Mods.RA/Scripting/Properties/InfiltrateProperties.cs → OpenRA.Mods.Cnc/Scripting/Properties/InfiltrateProperties.cs
View File

@@ -9,12 +9,12 @@
*/
#endregion
using OpenRA.Mods.RA.Activities;
using OpenRA.Mods.RA.Traits;
using OpenRA.Mods.Cnc.Activities;
using OpenRA.Mods.Cnc.Traits;
using OpenRA.Scripting;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Scripting
namespace OpenRA.Mods.Cnc.Scripting
{
[ScriptPropertyGroup("Ability")]
public class InfiltrateProperties : ScriptActorProperties, Requires<InfiltratesInfo>

4
OpenRA.Mods.RA/Traits/Attack/AttackLeap.cs → OpenRA.Mods.Cnc/Traits/Attack/AttackLeap.cs
View File

@@ -11,11 +11,11 @@
using System.Collections.Generic;
using System.Linq;
using OpenRA.Mods.Cnc.Activities;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Activities;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits
namespace OpenRA.Mods.Cnc.Traits
{
[Desc("Dogs use this attack model.")]
class AttackLeapInfo : AttackFrontalInfo

2
OpenRA.Mods.RA/Traits/Buildings/ClonesProducedUnits.cs → OpenRA.Mods.Cnc/Traits/Buildings/ClonesProducedUnits.cs
View File

@@ -14,7 +14,7 @@ using OpenRA.Mods.Common;
using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits
namespace OpenRA.Mods.Cnc.Traits
{
[Desc("Creates a free duplicate of produced units.")]
public class ClonesProducedUnitsInfo : ITraitInfo, Requires<ProductionInfo>, Requires<ExitInfo>

4
OpenRA.Mods.RA/Traits/Chronoshiftable.cs → OpenRA.Mods.Cnc/Traits/Chronoshiftable.cs
View File

@@ -10,12 +10,12 @@
#endregion
using System.Drawing;
using OpenRA.Mods.Cnc.Activities;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Activities;
using OpenRA.Primitives;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits
namespace OpenRA.Mods.Cnc.Traits
{
[Desc("Can be teleported via Chronoshift power.")]
public class ChronoshiftableInfo : ITraitInfo

2
OpenRA.Mods.RA/Traits/Cloneable.cs → OpenRA.Mods.Cnc/Traits/Cloneable.cs
View File

@@ -12,7 +12,7 @@
using System.Collections.Generic;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits
namespace OpenRA.Mods.Cnc.Traits
{
[Desc("Actors with the \"ClonesProducedUnits\" trait will produce a free duplicate of me.")]
public class CloneableInfo : TraitInfo<Cloneable>

2
OpenRA.Mods.RA/Traits/Disguise.cs → OpenRA.Mods.Cnc/Traits/Disguise.cs
View File

@@ -18,7 +18,7 @@ using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.Common.Traits.Render;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits
namespace OpenRA.Mods.Cnc.Traits
{
[Desc("Overrides the default ToolTip when this actor is disguised (aids in deceiving enemy players).")]
class DisguiseToolTipInfo : TooltipInfo, Requires<DisguiseInfo>

2
OpenRA.Mods.RA/Traits/FrozenUnderFogUpdatedByGps.cs → OpenRA.Mods.Cnc/Traits/FrozenUnderFogUpdatedByGps.cs
View File

@@ -14,7 +14,7 @@ using OpenRA.Mods.Common.Traits;
using OpenRA.Primitives;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits
namespace OpenRA.Mods.Cnc.Traits
{
using FrozenActorAction = Action<FrozenUnderFogUpdatedByGps, FrozenActorLayer, GpsWatcher, FrozenActor>;

4
OpenRA.Mods.RA/Traits/GpsWatcher.cs → OpenRA.Mods.Cnc/Traits/GpsWatcher.cs
View File

@@ -12,11 +12,11 @@
using System.Collections.Generic;
using System.Linq;
using OpenRA.Effects;
using OpenRA.Mods.Cnc.Effects;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Effects;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits
namespace OpenRA.Mods.Cnc.Traits
{
[Desc("Required for `GpsPower`. Attach this to the player actor.")]
class GpsWatcherInfo : ITraitInfo

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

@@ -12,7 +12,7 @@
using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits
namespace OpenRA.Mods.Cnc.Traits
{
public class HarvesterHuskModifierInfo : ITraitInfo, Requires<HarvesterInfo>
{

2
OpenRA.Mods.RA/Traits/Infiltration/InfiltrateForCash.cs → OpenRA.Mods.Cnc/Traits/Infiltration/InfiltrateForCash.cs
View File

@@ -14,7 +14,7 @@ using OpenRA.Mods.Common.Effects;
using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits
namespace OpenRA.Mods.Cnc.Traits
{
[Desc("This structure can be infiltrated causing funds to be stolen.")]
class InfiltrateForCashInfo : ITraitInfo

2
OpenRA.Mods.RA/Traits/Infiltration/InfiltrateForDecoration.cs → OpenRA.Mods.Cnc/Traits/Infiltration/InfiltrateForDecoration.cs
View File

@@ -15,7 +15,7 @@ using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.Common.Traits.Render;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits
namespace OpenRA.Mods.Cnc.Traits
{
[Desc("Reveals a decoration sprite to the indicated players when infiltrated.")]
class InfiltrateForDecorationInfo : WithDecorationInfo

2
OpenRA.Mods.RA/Traits/Infiltration/InfiltrateForExploration.cs → OpenRA.Mods.Cnc/Traits/Infiltration/InfiltrateForExploration.cs
View File

@@ -12,7 +12,7 @@
using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits
namespace OpenRA.Mods.Cnc.Traits
{
[Desc("Steal and reset the owner's exploration.")]
class InfiltrateForExplorationInfo : TraitInfo<InfiltrateForExploration> { }

2
OpenRA.Mods.RA/Traits/Infiltration/InfiltrateForPowerOutage.cs → OpenRA.Mods.Cnc/Traits/Infiltration/InfiltrateForPowerOutage.cs
View File

@@ -12,7 +12,7 @@
using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits
namespace OpenRA.Mods.Cnc.Traits
{
class InfiltrateForPowerOutageInfo : ITraitInfo
{

2
OpenRA.Mods.RA/Traits/Infiltration/InfiltrateForSupportPower.cs → OpenRA.Mods.Cnc/Traits/Infiltration/InfiltrateForSupportPower.cs
View File

@@ -13,7 +13,7 @@ using OpenRA.Mods.Common.Traits;
using OpenRA.Primitives;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits
namespace OpenRA.Mods.Cnc.Traits
{
class InfiltrateForSupportPowerInfo : ITraitInfo
{

4
OpenRA.Mods.RA/Traits/Infiltration/Infiltrates.cs → OpenRA.Mods.Cnc/Traits/Infiltration/Infiltrates.cs
View File

@@ -12,14 +12,14 @@
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using OpenRA.Mods.Cnc.Activities;
using OpenRA.Mods.Common;
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.Cnc.Traits
{
class InfiltratesInfo : ITraitInfo
{

4
OpenRA.Mods.RA/Traits/MadTank.cs → OpenRA.Mods.Cnc/Traits/MadTank.cs
View File

@@ -14,16 +14,16 @@ using System.Drawing;
using System.Linq;
using OpenRA.Activities;
using OpenRA.GameRules;
using OpenRA.Mods.Cnc.Activities;
using OpenRA.Mods.Common;
using OpenRA.Mods.Common.Activities;
using OpenRA.Mods.Common.Orders;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.Common.Traits.Render;
using OpenRA.Mods.RA.Activities;
using OpenRA.Primitives;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits
namespace OpenRA.Mods.Cnc.Traits
{
class MadTankInfo : ITraitInfo, IRulesetLoaded, Requires<ExplodesInfo>, Requires<WithFacingSpriteBodyInfo>
{

2
OpenRA.Mods.RA/Traits/Mine.cs → OpenRA.Mods.Cnc/Traits/Mine.cs
View File

@@ -13,7 +13,7 @@ using System.Collections.Generic;
using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits
namespace OpenRA.Mods.Cnc.Traits
{
class MineInfo : ITraitInfo
{

4
OpenRA.Mods.RA/Traits/Minelayer.cs → OpenRA.Mods.Cnc/Traits/Minelayer.cs
View File

@@ -13,11 +13,11 @@ using System;
using System.Collections.Generic;
using System.Linq;
using OpenRA.Graphics;
using OpenRA.Mods.Cnc.Activities;
using OpenRA.Mods.Common.Orders;
using OpenRA.Mods.RA.Activities;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits
namespace OpenRA.Mods.Cnc.Traits
{
public class MinelayerInfo : ITraitInfo
{

2
OpenRA.Mods.RA/Traits/PaletteEffects/ChronoshiftPaletteEffect.cs → OpenRA.Mods.Cnc/Traits/PaletteEffects/ChronoshiftPaletteEffect.cs
View File

@@ -13,7 +13,7 @@ using System.Drawing;
using OpenRA.Graphics;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits
namespace OpenRA.Mods.Cnc.Traits
{
[Desc("Apply palette full screen rotations during chronoshifts. Add this to the world actor.")]
public class ChronoshiftPaletteEffectInfo : ITraitInfo

2
OpenRA.Mods.RA/Traits/PaletteEffects/LightPaletteRotator.cs → OpenRA.Mods.Cnc/Traits/PaletteEffects/LightPaletteRotator.cs
View File

@@ -13,7 +13,7 @@ using System.Collections.Generic;
using OpenRA.Graphics;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits
namespace OpenRA.Mods.Cnc.Traits
{
[Desc("Palette effect used for blinking \"animations\" on actors.")]
class LightPaletteRotatorInfo : ITraitInfo

4
OpenRA.Mods.RA/Traits/PortableChrono.cs → OpenRA.Mods.Cnc/Traits/PortableChrono.cs
View File

@@ -12,12 +12,12 @@
using System.Collections.Generic;
using System.Drawing;
using OpenRA.Graphics;
using OpenRA.Mods.Cnc.Activities;
using OpenRA.Mods.Common.Graphics;
using OpenRA.Mods.Common.Orders;
using OpenRA.Mods.RA.Activities;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits
namespace OpenRA.Mods.Cnc.Traits
{
class PortableChronoInfo : ITraitInfo
{

2
OpenRA.Mods.RA/Traits/Render/RenderJammerCircle.cs → OpenRA.Mods.Cnc/Traits/Render/RenderJammerCircle.cs
View File

@@ -17,7 +17,7 @@ using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.Common.Traits.Radar;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits
namespace OpenRA.Mods.Cnc.Traits
{
// TODO: remove all the Render*Circle duplication
class RenderJammerCircleInfo : TraitInfo<RenderJammerCircle>, IPlaceBuildingDecorationInfo

2
OpenRA.Mods.RA/Traits/Render/RenderShroudCircle.cs → OpenRA.Mods.Cnc/Traits/Render/RenderShroudCircle.cs
View File

@@ -17,7 +17,7 @@ using OpenRA.Mods.Common.Graphics;
using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits
namespace OpenRA.Mods.Cnc.Traits
{
class RenderShroudCircleInfo : TraitInfo<RenderShroudCircle>, IPlaceBuildingDecorationInfo
{

2
OpenRA.Mods.RA/Traits/Render/WithDisguisingInfantryBody.cs → OpenRA.Mods.Cnc/Traits/Render/WithDisguisingInfantryBody.cs
View File

@@ -13,7 +13,7 @@ using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.Common.Traits.Render;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits.Render
namespace OpenRA.Mods.Cnc.Traits.Render
{
class WithDisguisingInfantryBodyInfo : WithInfantryBodyInfo, Requires<DisguiseInfo>
{

2
OpenRA.Mods.RA/Traits/Render/WithLandingCraftAnimation.cs → OpenRA.Mods.Cnc/Traits/Render/WithLandingCraftAnimation.cs
View File

@@ -15,7 +15,7 @@ using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.Common.Traits.Render;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits.Render
namespace OpenRA.Mods.Cnc.Traits.Render
{
public class WithLandingCraftAnimationInfo : ITraitInfo, Requires<IMoveInfo>, Requires<WithSpriteBodyInfo>, Requires<CargoInfo>
{

4
OpenRA.Mods.RA/Traits/SupportPowers/ChronoshiftPower.cs → OpenRA.Mods.Cnc/Traits/SupportPowers/ChronoshiftPower.cs
View File

@@ -13,12 +13,12 @@ using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using OpenRA.Graphics;
using OpenRA.Mods.Cnc.Activities;
using OpenRA.Mods.Common.Graphics;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Activities;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits
namespace OpenRA.Mods.Cnc.Traits
{
class ChronoshiftPowerInfo : SupportPowerInfo
{

4
OpenRA.Mods.RA/Traits/SupportPowers/GpsPower.cs → OpenRA.Mods.Cnc/Traits/SupportPowers/GpsPower.cs
View File

@@ -12,12 +12,12 @@
using System.Collections.Generic;
using System.Linq;
using OpenRA.Effects;
using OpenRA.Mods.Cnc.Effects;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.Common.Traits.Radar;
using OpenRA.Mods.RA.Effects;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits
namespace OpenRA.Mods.Cnc.Traits
{
[Desc("Requires `GpsWatcher` on the player actor.")]
class GpsPowerInfo : SupportPowerInfo

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

@@ -245,6 +245,8 @@
<Compile Include="Scripting\Properties\TransformProperties.cs" />
<Compile Include="Scripting\Properties\TransportProperties.cs" />
<Compile Include="Scripting\Properties\ConditionProperties.cs" />
<Compile Include="Scripting\Properties\ParadropProperties.cs" />
<Compile Include="Scripting\Properties\ParatroopersProperties.cs" />
<Compile Include="TraitsInterfaces.cs" />
<Compile Include="Traits\AcceptsSupplies.cs" />
<Compile Include="Traits\Air\Aircraft.cs" />
@@ -480,6 +482,7 @@
<Compile Include="Traits\SupportPowers\AirstrikePower.cs" />
<Compile Include="Traits\SupportPowers\GrantExternalConditionPower.cs" />
<Compile Include="Traits\SupportPowers\NukePower.cs" />
<Compile Include="Traits\SupportPowers\ParatroopersPower.cs" />
<Compile Include="Traits\SupportPowers\SupportPower.cs" />
<Compile Include="Traits\SupportPowers\SupportPowerManager.cs" />
<Compile Include="Traits\SupportPowers\SpawnActorPower.cs" />

2
OpenRA.Mods.RA/Scripting/Properties/ParadropProperties.cs → OpenRA.Mods.Common/Scripting/Properties/ParadropProperties.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
{
[ScriptPropertyGroup("Transports")]
public class ParadropProperties : ScriptActorProperties, Requires<CargoInfo>, Requires<ParaDropInfo>

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

@@ -10,11 +10,11 @@
#endregion
using System.Linq;
using OpenRA.Mods.RA.Traits;
using OpenRA.Mods.Common.Traits;
using OpenRA.Scripting;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Scripting
namespace OpenRA.Mods.Common.Scripting
{
[ScriptPropertyGroup("Support Powers")]
public class ParatroopersProperties : ScriptActorProperties, Requires<ParatroopersPowerInfo>

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

@@ -12,14 +12,12 @@
using System;
using System.Collections.Generic;
using System.Linq;
using OpenRA.Mods.Common;
using OpenRA.Mods.Common.Activities;
using OpenRA.Mods.Common.Effects;
using OpenRA.Mods.Common.Traits;
using OpenRA.Primitives;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits
namespace OpenRA.Mods.Common.Traits
{
public class ParatroopersPowerInfo : SupportPowerInfo
{

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

@@ -1,164 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{4A8A43B5-A9EF-4ED0-99DD-4BAB10A0DB6E}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>OpenRA.Mods.RA</RootNamespace>
<AssemblyName>OpenRA.Mods.RA</AssemblyName>
<FileAlignment>512</FileAlignment>
<FileUpgradeFlags>
</FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation />
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
<UpdateEnabled>false</UpdateEnabled>
<UpdateMode>Foreground</UpdateMode>
<UpdateInterval>7</UpdateInterval>
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
<UpdatePeriodically>false</UpdatePeriodically>
<UpdateRequired>false</UpdateRequired>
<MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<Optimize>true</Optimize>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Drawing" />
<Reference Include="Eluant">
<HintPath>..\thirdparty\download\Eluant.dll</HintPath>
<Private>False</Private>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Activities\Infiltrate.cs" />
<Compile Include="Activities\LayMines.cs" />
<Compile Include="Activities\Leap.cs" />
<Compile Include="Activities\Teleport.cs" />
<Compile Include="Effects\GpsDot.cs" />
<Compile Include="Effects\GpsSatellite.cs" />
<Compile Include="Effects\SatelliteLaunch.cs" />
<Compile Include="Projectiles\TeslaZap.cs" />
<Compile Include="Graphics\TeslaZapRenderable.cs" />
<Compile Include="Scripting\Properties\InfiltrateProperties.cs" />
<Compile Include="Scripting\Properties\DisguiseProperties.cs" />
<Compile Include="Traits\Attack\AttackLeap.cs" />
<Compile Include="Traits\Buildings\ClonesProducedUnits.cs" />
<Compile Include="Traits\Chronoshiftable.cs" />
<Compile Include="Traits\Cloneable.cs" />
<Compile Include="Traits\Disguise.cs" />
<Compile Include="Traits\FrozenUnderFogUpdatedByGps.cs" />
<Compile Include="Traits\HarvesterHuskModifier.cs" />
<Compile Include="Traits\Infiltration\InfiltrateForCash.cs" />
<Compile Include="Traits\Infiltration\InfiltrateForExploration.cs" />
<Compile Include="Traits\Infiltration\InfiltrateForPowerOutage.cs" />
<Compile Include="Traits\Infiltration\InfiltrateForSupportPower.cs" />
<Compile Include="Traits\Infiltration\Infiltrates.cs" />
<Compile Include="Traits\MadTank.cs" />
<Compile Include="Traits\Mine.cs" />
<Compile Include="Traits\Minelayer.cs" />
<Compile Include="Traits\PaletteEffects\ChronoshiftPaletteEffect.cs" />
<Compile Include="Traits\PaletteEffects\LightPaletteRotator.cs" />
<Compile Include="Traits\PortableChrono.cs" />
<Compile Include="Traits\Render\RenderJammerCircle.cs" />
<Compile Include="Traits\Render\WithLandingCraftAnimation.cs" />
<Compile Include="Traits\Render\RenderShroudCircle.cs" />
<Compile Include="Traits\SupportPowers\ChronoshiftPower.cs" />
<Compile Include="Traits\SupportPowers\GpsPower.cs" />
<Compile Include="Traits\GpsWatcher.cs" />
<Compile Include="Traits\SupportPowers\ParatroopersPower.cs" />
<Compile Include="Scripting\Properties\ChronosphereProperties.cs" />
<Compile Include="Scripting\Properties\ParadropProperties.cs" />
<Compile Include="Scripting\Properties\ParatroopersProperties.cs" />
<Compile Include="Traits\Render\WithDisguisingInfantryBody.cs" />
<Compile Include="ImportRedAlertLegacyMapCommand.cs" />
<Compile Include="Traits\Infiltration\InfiltrateForDecoration.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\OpenRA.Game\OpenRA.Game.csproj">
<Project>{0DFB103F-2962-400F-8C6D-E2C28CCBA633}</Project>
<Name>OpenRA.Game</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\OpenRA.Mods.Common\OpenRA.Mods.Common.csproj">
<Project>{fe6c8cc0-2f07-442a-b29f-17617b3b7fc6}</Project>
<Name>OpenRA.Mods.Common</Name>
<Private>False</Private>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
<Install>false</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1</ProductName>
<Install>true</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
<Visible>False</Visible>
<ProductName>Windows Installer 3.1</ProductName>
<Install>true</Install>
</BootstrapperPackage>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Target Name="AfterBuild">
<MakeDir Directories="$(SolutionDir)mods/ra/"/>
<Copy
SourceFiles="$(TargetPath)"
DestinationFolder="$(SolutionDir)mods/ra/"/>
<!--
We need to copy OpenRA.Mods.RA.pdb (not `.dll.pdb`). This is only necessary on Windows.
Mono outputs a `.dll.mdb` so we can just append `.mdb` directly.
-->
<Copy
SourceFiles="$(TargetDir)$(TargetName).pdb"
DestinationFolder="$(SolutionDir)mods/ra/"
Condition="'$(OS)' == 'Windows_NT'"/>
<Copy
SourceFiles="$(TargetPath).mdb"
DestinationFolder="$(SolutionDir)mods/ra/"
Condition="'$(OS)' == 'Unix'"/>
<!-- Uncomment these lines when debugging or adding to this target
<Message Text="DEBUG OS: $(OS)"/>
<Message Text="DEBUG SolutionDir: $(SolutionDir)"/>
<Message Text="DEBUG TargetPath: $(TargetPath)"/>
<Message Text="DEBUG TargetDir: $(TargetDir)"/>
<Message Text="DEBUG TargetName: $(TargetName)"/>
-->
</Target>
</Project>

6
OpenRA.sln
View File

@@ -5,8 +5,6 @@ VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRA.Game", "OpenRA.Game\OpenRA.Game.csproj", "{0DFB103F-2962-400F-8C6D-E2C28CCBA633}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRA.Mods.RA", "OpenRA.Mods.RA\OpenRA.Mods.RA.csproj", "{4A8A43B5-A9EF-4ED0-99DD-4BAB10A0DB6E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRA.Mods.Cnc", "OpenRA.Mods.Cnc\OpenRA.Mods.Cnc.csproj", "{2881135D-4D62-493E-8F83-5EEE92CCC6BE}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRA.Utility", "OpenRA.Utility\OpenRA.Utility.csproj", "{F33337BE-CB69-4B24-850F-07D23E408DDF}"
@@ -138,10 +136,6 @@ Global
{0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Debug|x86.Build.0 = Debug|x86
{0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Release|x86.ActiveCfg = Release|x86
{0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Release|x86.Build.0 = Release|x86
{4A8A43B5-A9EF-4ED0-99DD-4BAB10A0DB6E}.Debug|x86.ActiveCfg = Debug|x86
{4A8A43B5-A9EF-4ED0-99DD-4BAB10A0DB6E}.Debug|x86.Build.0 = Debug|x86
{4A8A43B5-A9EF-4ED0-99DD-4BAB10A0DB6E}.Release|x86.ActiveCfg = Release|x86
{4A8A43B5-A9EF-4ED0-99DD-4BAB10A0DB6E}.Release|x86.Build.0 = Release|x86
{2881135D-4D62-493E-8F83-5EEE92CCC6BE}.Debug|x86.ActiveCfg = Debug|x86
{2881135D-4D62-493E-8F83-5EEE92CCC6BE}.Debug|x86.Build.0 = Debug|x86
{2881135D-4D62-493E-8F83-5EEE92CCC6BE}.Release|x86.ActiveCfg = Release|x86

2
make.ps1
View File

@@ -137,8 +137,6 @@ function Check-Command {
./OpenRA.Utility.exe ra --check-code-style OpenRA.Game
echo "Checking for code style violations in OpenRA.Mods.Common..."
./OpenRA.Utility.exe ra --check-code-style OpenRA.Mods.Common
echo "Checking for code style violations in OpenRA.Mods.RA..."
./OpenRA.Utility.exe ra --check-code-style OpenRA.Mods.RA
echo "Checking for code style violations in OpenRA.Mods.Cnc..."
./OpenRA.Utility.exe cnc --check-code-style OpenRA.Mods.Cnc
echo "Checking for code style violations in OpenRA.Mods.D2k..."

1
mods/all/mod.yaml
View File

@@ -16,7 +16,6 @@ Chrome:
Assemblies:
./mods/common/OpenRA.Mods.Common.dll
./mods/ra/OpenRA.Mods.RA.dll
./mods/d2k/OpenRA.Mods.D2k.dll
./mods/cnc/OpenRA.Mods.Cnc.dll

1
mods/ra/mod.yaml
View File

@@ -80,7 +80,6 @@ Chrome:
Assemblies:
common|OpenRA.Mods.Common.dll
ra|OpenRA.Mods.RA.dll
cnc|OpenRA.Mods.Cnc.dll
ChromeLayout:

1
mods/ts/mod.yaml
View File

@@ -126,7 +126,6 @@ Chrome:
Assemblies:
common|OpenRA.Mods.Common.dll
ra|OpenRA.Mods.RA.dll
cnc|OpenRA.Mods.Cnc.dll
ChromeLayout: