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

Move Smoke effect, ContrailFader effect, SmudgeLayer and LeaveSmudgeWarhead to Mods.Common

Browse Source
This commit is contained in:
reaperrr
2014-10-04 18:48:07 +02:00
parent b987ab15be
commit c741fcedec
10 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.RA/Effects/ContrailFader.cs → OpenRA.Mods.Common/Effects/ContrailFader.cs Executable file → Normal file
View File

@@ -13,9 +13,9 @@ using OpenRA.Effects;
using OpenRA.Graphics; using OpenRA.Graphics;
using OpenRA.Mods.Common.Graphics; using OpenRA.Mods.Common.Graphics;
namespace OpenRA.Mods.RA.Effects namespace OpenRA.Mods.Common.Effects
{ {
class ContrailFader : IEffect public class ContrailFader : IEffect
{ {
WPos pos; WPos pos;
ContrailRenderable trail; ContrailRenderable trail;

2
OpenRA.Mods.RA/Effects/Smoke.cs → OpenRA.Mods.Common/Effects/Smoke.cs
View File

@@ -12,7 +12,7 @@ using System.Collections.Generic;
using OpenRA.Effects; using OpenRA.Effects;
using OpenRA.Graphics; using OpenRA.Graphics;
namespace OpenRA.Mods.RA.Effects namespace OpenRA.Mods.Common.Effects
{ {
public class Smoke : IEffect public class Smoke : IEffect
{ {

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

@@ -42,8 +42,10 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="CommonTraitsInterfaces.cs" /> <Compile Include="CommonTraitsInterfaces.cs" />
<Compile Include="Effects\ContrailFader.cs" />
<Compile Include="Effects\Explosion.cs" /> <Compile Include="Effects\Explosion.cs" />
<Compile Include="Effects\FloatingText.cs" /> <Compile Include="Effects\FloatingText.cs" />
<Compile Include="Effects\Smoke.cs" />
<Compile Include="Console\ChatCommands.cs" /> <Compile Include="Console\ChatCommands.cs" />
<Compile Include="Console\DevCommands.cs" /> <Compile Include="Console\DevCommands.cs" />
<Compile Include="Console\HelpCommand.cs" /> <Compile Include="Console\HelpCommand.cs" />
@@ -78,6 +80,7 @@
<Compile Include="Graphics\TextRenderable.cs" /> <Compile Include="Graphics\TextRenderable.cs" />
<Compile Include="Graphics\VoxelActorPreview.cs" /> <Compile Include="Graphics\VoxelActorPreview.cs" />
<Compile Include="Graphics\VoxelRenderable.cs" /> <Compile Include="Graphics\VoxelRenderable.cs" />
<Compile Include="Warheads\LeaveSmudgeWarhead.cs" />
<Compile Include="Widgets\ConfirmationDialogs.cs" /> <Compile Include="Widgets\ConfirmationDialogs.cs" />
<Compile Include="Widgets\HueSliderWidget.cs" /> <Compile Include="Widgets\HueSliderWidget.cs" />
<Compile Include="Widgets\LabelWithTooltipWidget.cs" /> <Compile Include="Widgets\LabelWithTooltipWidget.cs" />
@@ -96,6 +99,7 @@
<Compile Include="Widgets\RadarWidget.cs" /> <Compile Include="Widgets\RadarWidget.cs" />
<Compile Include="Widgets\ResourceBarWidget.cs" /> <Compile Include="Widgets\ResourceBarWidget.cs" />
<Compile Include="World\RadarPings.cs" /> <Compile Include="World\RadarPings.cs" />
<Compile Include="World\SmudgeLayer.cs" />
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup> <PropertyGroup>

2
OpenRA.Mods.RA/Warheads/LeaveSmudgeWarhead.cs → OpenRA.Mods.Common/Warheads/LeaveSmudgeWarhead.cs
View File

@@ -15,7 +15,7 @@ using OpenRA.Effects;
using OpenRA.GameRules; using OpenRA.GameRules;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA namespace OpenRA.Mods.Common
{ {
public class LeaveSmudgeWarhead : Warhead public class LeaveSmudgeWarhead : Warhead
{ {

4
OpenRA.Mods.RA/World/SmudgeLayer.cs → OpenRA.Mods.Common/World/SmudgeLayer.cs
View File

@@ -11,10 +11,10 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using OpenRA.Graphics; using OpenRA.Graphics;
using OpenRA.Mods.RA.Effects; using OpenRA.Mods.Common.Effects;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA namespace OpenRA.Mods.Common
{ {
[Desc("Attach this to the world actor.", "Order of the layers defines the Z sorting.")] [Desc("Attach this to the world actor.", "Order of the layers defines the Z sorting.")]
public class SmudgeLayerInfo : ITraitInfo public class SmudgeLayerInfo : ITraitInfo

1
OpenRA.Mods.RA/Effects/Bullet.cs
View File

@@ -15,6 +15,7 @@ using System.Linq;
using OpenRA.Effects; using OpenRA.Effects;
using OpenRA.GameRules; using OpenRA.GameRules;
using OpenRA.Graphics; using OpenRA.Graphics;
using OpenRA.Mods.Common.Effects;
using OpenRA.Mods.Common.Graphics; using OpenRA.Mods.Common.Graphics;
using OpenRA.Traits; using OpenRA.Traits;

1
OpenRA.Mods.RA/Effects/Contrail.cs
View File

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

1
OpenRA.Mods.RA/Effects/Missile.cs
View File

@@ -14,6 +14,7 @@ using System.Linq;
using OpenRA.Effects; using OpenRA.Effects;
using OpenRA.GameRules; using OpenRA.GameRules;
using OpenRA.Graphics; using OpenRA.Graphics;
using OpenRA.Mods.Common.Effects;
using OpenRA.Mods.Common.Graphics; using OpenRA.Mods.Common.Graphics;
using OpenRA.Traits; using OpenRA.Traits;

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

@@ -225,7 +225,6 @@
<Compile Include="Effects\RallyPoint.cs" /> <Compile Include="Effects\RallyPoint.cs" />
<Compile Include="Effects\RepairIndicator.cs" /> <Compile Include="Effects\RepairIndicator.cs" />
<Compile Include="Effects\SatelliteLaunch.cs" /> <Compile Include="Effects\SatelliteLaunch.cs" />
<Compile Include="Effects\Smoke.cs" />
<Compile Include="Effects\TeslaZap.cs" /> <Compile Include="Effects\TeslaZap.cs" />
<Compile Include="EmitInfantryOnSell.cs" /> <Compile Include="EmitInfantryOnSell.cs" />
<Compile Include="EngineerRepair.cs" /> <Compile Include="EngineerRepair.cs" />
@@ -290,7 +289,6 @@
<Compile Include="Warheads\DestroyResourceWarhead.cs" /> <Compile Include="Warheads\DestroyResourceWarhead.cs" />
<Compile Include="Warheads\CreateEffectWarhead.cs" /> <Compile Include="Warheads\CreateEffectWarhead.cs" />
<Compile Include="Warheads\CreateResourceWarhead.cs" /> <Compile Include="Warheads\CreateResourceWarhead.cs" />
<Compile Include="Warheads\LeaveSmudgeWarhead.cs" />
<Compile Include="Widgets\Logic\TabCompletionLogic.cs" /> <Compile Include="Widgets\Logic\TabCompletionLogic.cs" />
<Compile Include="Player\TechTree.cs" /> <Compile Include="Player\TechTree.cs" />
<Compile Include="PrimaryBuilding.cs" /> <Compile Include="PrimaryBuilding.cs" />
@@ -401,7 +399,6 @@
<Compile Include="World\ResourceClaim.cs" /> <Compile Include="World\ResourceClaim.cs" />
<Compile Include="World\ResourceClaimLayer.cs" /> <Compile Include="World\ResourceClaimLayer.cs" />
<Compile Include="World\PlayMusicOnMapLoad.cs" /> <Compile Include="World\PlayMusicOnMapLoad.cs" />
<Compile Include="World\SmudgeLayer.cs" />
<Compile Include="Player\BaseAttackNotifier.cs" /> <Compile Include="Player\BaseAttackNotifier.cs" />
<Compile Include="Player\HarvesterAttackNotifier.cs" /> <Compile Include="Player\HarvesterAttackNotifier.cs" />
<Compile Include="Infiltration\InfiltrateForExploration.cs" /> <Compile Include="Infiltration\InfiltrateForExploration.cs" />
@@ -445,7 +442,6 @@
<Compile Include="Widgets\Logic\InstallLogic.cs" /> <Compile Include="Widgets\Logic\InstallLogic.cs" />
<Compile Include="CombatDebugOverlay.cs" /> <Compile Include="CombatDebugOverlay.cs" />
<Compile Include="World\PathfinderDebugOverlay.cs" /> <Compile Include="World\PathfinderDebugOverlay.cs" />
<Compile Include="Effects\ContrailFader.cs" />
<Compile Include="Widgets\Logic\SettingsLogic.cs" /> <Compile Include="Widgets\Logic\SettingsLogic.cs" />
<Compile Include="AttackBomber.cs" /> <Compile Include="AttackBomber.cs" />
<Compile Include="Effects\Rank.cs" /> <Compile Include="Effects\Rank.cs" />

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

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