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

moved more traits from engine into mods

Browse Source
This commit is contained in:
Bob
2010-09-20 21:17:50 +12:00
parent aff6889995
commit afda1647fd
13 changed files with 57 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenRA.Game/OpenRA.Game.csproj
View File

@@ -153,19 +153,15 @@
<Compile Include="Graphics\TerrainRenderer.cs" />
<Compile Include="Traits\Activities\Move.cs" />
<Compile Include="Traits\Activities\Turn.cs" />
<Compile Include="Traits\Buildable.cs" />
<Compile Include="Traits\Building.cs" />
<Compile Include="Traits\World\BuildingInfluence.cs" />
<Compile Include="Traits\World\PlayerColorPalette.cs" />
<Compile Include="Traits\World\ResourceLayer.cs" />
<Compile Include="Traits\World\ResourceType.cs" />
<Compile Include="Traits\SupportPower.cs" />
<Compile Include="Traits\ProvidesRadar.cs" />
<Compile Include="Traits\Selectable.cs" />
<Compile Include="Traits\Mobile.cs" />
<Compile Include="Traits\Render\RenderSimple.cs" />
<Compile Include="Traits\TraitsInterfaces.cs" />
<Compile Include="Traits\Turreted.cs" />
<Compile Include="Traits\World\UnitInfluence.cs" />
<Compile Include="Network\UnitOrders.cs" />
<Compile Include="Traits\Util.cs" />
@@ -185,8 +181,6 @@
<Compile Include="Widgets\BackgroundWidget.cs" />
<Compile Include="Widgets\LabelWidget.cs" />
<Compile Include="Widgets\CheckboxWidget.cs" />
<Compile Include="Traits\World\BibLayer.cs" />
<Compile Include="Traits\World\SmudgeLayer.cs" />
<Compile Include="Widgets\Delegates\MusicPlayerDelegate.cs" />
<Compile Include="Widgets\PerfGraphWidget.cs" />
<Compile Include="Widgets\Delegates\PerfDebugDelegate.cs" />
@@ -194,7 +188,6 @@
<Compile Include="Widgets\ColorBlockWidget.cs" />
<Compile Include="GameRules\MusicInfo.cs" />
<Compile Include="Widgets\ImageWidget.cs" />
<Compile Include="Traits\SharesCell.cs" />
<Compile Include="Widgets\TextFieldWidget.cs" />
<Compile Include="Widgets\ChatDisplayWidget.cs" />
<Compile Include="Widgets\Delegates\MapChooserDelegate.cs" />
@@ -212,7 +205,6 @@
<Compile Include="Traits\Activities\Drag.cs" />
<Compile Include="Widgets\VqaPlayerWidget.cs" />
<Compile Include="Widgets\Delegates\VideoPlayerDelegate.cs" />
<Compile Include="Traits\MPStartLocations.cs" />
<Compile Include="GameRules\Settings.cs" />
<Compile Include="Support\Arguments.cs" />
<Compile Include="Traits\ActorStance.cs" />
@@ -234,6 +226,9 @@
<Compile Include="ObjectCreator.cs" />
<Compile Include="Network\SyncReport.cs" />
<Compile Include="TraitDictionary.cs" />
<Compile Include="Traits\SharesCell.cs" />
<Compile Include="Traits\Valued.cs" />
<Compile Include="Traits\World\BibLayer.cs" />
<Compile Include="Widgets\Delegates\DeveloperModeDelegate.cs" />
</ItemGroup>
<ItemGroup>

0
OpenRA.Game/Traits/SharesCell.cs Normal file → Executable file
View File

23
OpenRA.Game/Traits/Valued.cs Executable file
View File

@@ -0,0 +1,23 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace OpenRA.Traits
{
public class ValuedInfo : TraitInfo<Valued>
{
public readonly int Cost = 0;
}
public class TooltipInfo : TraitInfo<Tooltip>
{
public readonly string Description = "";
public readonly string Name = "";
public readonly string Icon = null;
public readonly string[] AlternateName = { };
}
public class Valued { }
public class Tooltip { }
}

0
OpenRA.Game/Traits/World/BibLayer.cs Normal file → Executable file
View File

1
OpenRA.Mods.Cnc/IonCannonPower.cs
View File

@@ -9,6 +9,7 @@
#endregion
using OpenRA.Mods.Cnc.Effects;
using OpenRA.Mods.RA;
using OpenRA.Orders;
using OpenRA.Traits;

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

@@ -10,8 +10,8 @@
using System.Collections.Generic;
using System.Linq;
using OpenRA.Traits;
using OpenRA.FileFormats;
using OpenRA.Traits;
namespace OpenRA.Mods.RA
{

21
OpenRA.Game/Traits/Buildable.cs → OpenRA.Mods.RA/Buildable.cs
View File

@@ -8,23 +8,10 @@
*/
#endregion
namespace OpenRA.Traits
using OpenRA.Traits;
namespace OpenRA.Mods.RA
{
public class ValuedInfo : ITraitInfo
{
public readonly int Cost = 0;
public object Create(ActorInitializer init) { return new Valued(); }
}
public class TooltipInfo : ITraitInfo
{
public readonly string Description = "";
public readonly string Name = "";
public readonly string Icon = null;
public readonly string[] AlternateName = { };
public object Create(ActorInitializer init) { return new Tooltip(); }
}
public class BuildableInfo : ITraitInfo
{
[ActorReference]
@@ -43,7 +30,5 @@ namespace OpenRA.Traits
public object Create(ActorInitializer init) { return new Buildable(); }
}
class Valued { }
class Buildable { }
class Tooltip { }
}

5
OpenRA.Game/Traits/MPStartLocations.cs → OpenRA.Mods.RA/MPStartLocations.cs Normal file → Executable file
View File

@@ -8,13 +8,14 @@
*/
#endregion
using System;
using System.Collections.Generic;
using System.Linq;
using System;
using OpenRA.FileFormats;
using OpenRA.Network;
using OpenRA.Traits;
namespace OpenRA.Traits
namespace OpenRA.Mods.RA
{
public class MPStartLocationsInfo : TraitInfo<MPStartLocations>
{

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

@@ -77,6 +77,7 @@
<Compile Include="Activities\UnloadCargo.cs" />
<Compile Include="Activities\Wait.cs" />
<Compile Include="AttackBase.cs" />
<Compile Include="Buildable.cs" />
<Compile Include="Combat.cs" />
<Compile Include="Crates\CloakCrateAction.cs" />
<Compile Include="Crates\GiveMcvCrateAction.cs" />
@@ -91,6 +92,7 @@
<Compile Include="Effects\Smoke.cs" />
<Compile Include="Effects\TeslaZap.cs" />
<Compile Include="LimitedAmmo.cs" />
<Compile Include="MPStartLocations.cs" />
<Compile Include="Orders\PlaceBuildingOrderGenerator.cs" />
<Compile Include="Player\ActorGroupProxy.cs" />
<Compile Include="Aircraft.cs" />
@@ -99,6 +101,7 @@
<Compile Include="Player\ProductionQueue.cs" />
<Compile Include="PrimaryBuilding.cs" />
<Compile Include="Production.cs" />
<Compile Include="ProvidesRadar.cs" />
<Compile Include="RallyPoint.cs" />
<Compile Include="RenderDetectionCircle.cs" />
<Compile Include="RenderRangeCircle.cs" />
@@ -198,12 +201,14 @@
<Compile Include="Spy.cs" />
<Compile Include="SupportPowers\SpyPlanePower.cs" />
<Compile Include="SupportPowers\NukePower.cs" />
<Compile Include="SupportPowers\SupportPower.cs" />
<Compile Include="TakeCover.cs" />
<Compile Include="TeslaInstantKills.cs" />
<Compile Include="Crates\ResetRadarCrateAction.cs" />
<Compile Include="ThrowsParticles.cs" />
<Compile Include="TraitsInterfaces.cs" />
<Compile Include="DefaultShellmapScript.cs" />
<Compile Include="Turreted.cs" />
<Compile Include="Wall.cs" />
<Compile Include="WaterPaletteRotation.cs" />
<Compile Include="Weapon.cs" />
@@ -250,6 +255,7 @@
<Compile Include="NullLoadScreen.cs" />
<Compile Include="Activities\IdleAnimation.cs" />
<Compile Include="IdleAnimation.cs" />
<Compile Include="World\SmudgeLayer.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\OpenRA.FileFormats\OpenRA.FileFormats.csproj">

3
OpenRA.Game/Traits/ProvidesRadar.cs → OpenRA.Mods.RA/ProvidesRadar.cs Normal file → Executable file
View File

@@ -9,8 +9,9 @@
#endregion
using System.Linq;
using OpenRA.Traits;
namespace OpenRA.Traits
namespace OpenRA.Mods.RA
{
public class ProvidesRadarInfo : TraitInfo<ProvidesRadar> { }

3
OpenRA.Game/Traits/SupportPower.cs → OpenRA.Mods.RA/SupportPowers/SupportPower.cs Normal file → Executable file
View File

@@ -9,8 +9,9 @@
#endregion
using System.Linq;
using OpenRA.Traits;
namespace OpenRA.Traits
namespace OpenRA.Mods.RA
{
public abstract class SupportPowerInfo : ITraitInfo, ITraitPrerequisite<TechTreeInfo>, ITraitPrerequisite<PowerManagerInfo>
{

4
OpenRA.Game/Traits/Turreted.cs → OpenRA.Mods.RA/Turreted.cs Normal file → Executable file
View File

@@ -8,7 +8,9 @@
*/
#endregion
namespace OpenRA.Traits
using OpenRA.Traits;
namespace OpenRA.Mods.RA
{
public class TurretedInfo : ITraitInfo
{

5
OpenRA.Game/Traits/World/SmudgeLayer.cs → OpenRA.Mods.RA/World/SmudgeLayer.cs Normal file → Executable file
View File

@@ -9,13 +9,14 @@
#endregion
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using OpenRA.FileFormats;
using OpenRA.Graphics;
using System.Collections.Generic;
using OpenRA.Traits;
namespace OpenRA.Traits
namespace OpenRA.Mods.RA
{
public class SmudgeLayerInfo : ITraitInfo
{