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

chronotank in aftermath mod dll

Browse Source
This commit is contained in:
Chris Forbes
2010-01-17 10:31:48 +13:00
parent 9c78406f08
commit b290d46ddc
12 changed files with 35 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRa.Game/Game.cs
View File

@@ -3,13 +3,13 @@ using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using System.Net.Sockets;
using IjwFramework.Types;
using OpenRa.FileFormats;
using OpenRa.GameRules;
using OpenRa.Graphics;
using OpenRa.Orders;
using OpenRa.Support;
using OpenRa.Traits;
using IjwFramework.Types;
namespace OpenRa
{
@@ -20,7 +20,7 @@ namespace OpenRa
public static World world;
internal static Viewport viewport;
public static PathFinder PathFinder;
internal static WorldRenderer worldRenderer;
public static WorldRenderer worldRenderer;
public static Controller controller;
internal static Chrome chrome;
public static UserSettings Settings;

23
OpenRa.Game/Graphics/WorldRenderer.cs
View File

@@ -1,26 +1,21 @@
using System.Drawing;
using System;
using System.Linq;
using System.Windows.Forms;
using IjwFramework.Types;
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using OpenRa.Traits;
using OpenRa.Support;
using OpenRa.Effects;
namespace OpenRa.Graphics
{
class WorldRenderer
public class WorldRenderer
{
public readonly TerrainRenderer terrainRenderer;
public readonly SpriteRenderer spriteRenderer;
public readonly LineRenderer lineRenderer;
public readonly UiOverlay uiOverlay;
public readonly Renderer renderer;
internal readonly TerrainRenderer terrainRenderer;
internal readonly SpriteRenderer spriteRenderer;
internal readonly LineRenderer lineRenderer;
internal readonly UiOverlay uiOverlay;
internal readonly Renderer renderer;
public static bool ShowUnitPaths = false;
public WorldRenderer(Renderer renderer)
internal WorldRenderer(Renderer renderer)
{
terrainRenderer = new TerrainRenderer(renderer, Rules.Map);

2
OpenRa.Game/OpenRa.Game.csproj
View File

@@ -103,7 +103,6 @@
<Compile Include="Effects\IEffect.cs" />
<Compile Include="Graphics\MappedImage.cs" />
<Compile Include="Graphics\Minimap.cs" />
<Compile Include="Orders\ChronoshiftSelfDestinationOrderGenerator.cs" />
<Compile Include="Orders\ChronosphereSelectOrderGenerator.cs" />
<Compile Include="Orders\IOrderSource.cs" />
<Compile Include="Orders\IronCurtainOrderGenerator.cs" />
@@ -224,7 +223,6 @@
<Compile Include="Traits\Chronosphere.cs" />
<Compile Include="Traits\EngineerCapture.cs" />
<Compile Include="Traits\Explodes.cs" />
<Compile Include="Traits\ChronoshiftDeploy.cs" />
<Compile Include="Traits\Fake.cs" />
<Compile Include="Traits\GeneratesGap.cs" />
<Compile Include="Traits\GpsLaunchSite.cs" />

3
OpenRa.Game/Sound.cs
View File

@@ -1,12 +1,11 @@
using IjwFramework.Collections;
using IrrKlang;
using OpenRa.FileFormats;
using OpenRa.GameRules;
using OpenRa.Traits;
namespace OpenRa
{
static class Sound
public static class Sound
{
static ISoundEngine soundEngine;
static Cache<string, ISoundSource> sounds;

2
OpenRa.Game/Sync.cs
View File

@@ -7,7 +7,7 @@ using OpenRa.FileFormats;
namespace OpenRa
{
class SyncAttribute : Attribute { }
public class SyncAttribute : Attribute { }
static class Sync
{

9
OpenRa.Game/Traits/Activities/Teleport.cs
View File

@@ -1,12 +1,7 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using OpenRa.GameRules;

namespace OpenRa.Traits.Activities
{
class Teleport : IActivity
public class Teleport : IActivity
{
public IActivity NextActivity { get; set; }

2
OpenRa.Game/Traits/ChronoshiftPaletteEffect.cs
View File

@@ -5,7 +5,7 @@ namespace OpenRa.Traits
{
class ChronoshiftPaletteEffectInfo : StatelessTraitInfo<ChronoshiftPaletteEffect> { }
class ChronoshiftPaletteEffect : IPaletteModifier, ITick
public class ChronoshiftPaletteEffect : IPaletteModifier, ITick
{
const int chronoEffectLength = 20;
int remainingFrames;

10
OpenRa.Game/Traits/DemoTruck.cs
View File

@@ -1,10 +0,0 @@
using OpenRa.Effects;
using OpenRa.Traits;
using System.Collections.Generic;
using System.Linq;
using OpenRa.Orders;
namespace OpenRa.Traits
{
}

18
OpenRa.Game/Traits/ChronoshiftDeploy.cs → OpenRa.Mods.Aftermath/ChronoshiftDeploy.cs
View File

@@ -1,15 +1,17 @@
using System.Collections.Generic;
using System.Linq;
using OpenRa.Orders;
using OpenRa.Mods.Aftermath.Orders;
using OpenRa.Traits;
using OpenRa.Traits.Activities;
namespace OpenRa.Traits
namespace OpenRa.Mods.Aftermath
{
class ChronoshiftDeployInfo : ITraitInfo
{
public object Create(Actor self) { return new ChronoshiftDeploy(self); }
}
class ChronoshiftDeploy : IIssueOrder, IResolveOrder, ISpeedModifier, ITick, IPips
class ChronoshiftDeploy : IIssueOrder, IResolveOrder, ITick, IPips
{
// Recharge logic
[Sync]
@@ -36,7 +38,7 @@ namespace OpenRa.Traits
{
if (order.OrderString == "Deploy")
{
Game.controller.orderGenerator = new ChronoshiftSelfDestinationOrderGenerator(self);
Game.controller.orderGenerator = new SetChronoTankDestination(self);
return;
}
@@ -49,7 +51,7 @@ namespace OpenRa.Traits
Game.controller.CancelInputMode();
self.CancelActivity();
self.QueueActivity(new Activities.Teleport(order.TargetLocation));
self.QueueActivity(new Teleport(order.TargetLocation));
Sound.Play("chrotnk1.aud");
chargeTick = chargeLength;
@@ -58,12 +60,6 @@ namespace OpenRa.Traits
}
}
public float GetSpeedModifier()
{
// ARGH! You must not do this, it will desync!
return (Game.controller.orderGenerator is ChronoshiftDestinationOrderGenerator) ? 0f : 1f;
}
// Display 5 pips indicating the current charge status
public IEnumerable<PipType> GetPips(Actor self)
{

3
OpenRa.Mods.Aftermath/OpenRa.Mods.Aftermath.csproj
View File

@@ -35,6 +35,7 @@
<Reference Include="System.Core">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="System.Drawing" />
<Reference Include="System.Xml.Linq">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
@@ -45,6 +46,8 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="ChronoshiftDeploy.cs" />
<Compile Include="Orders\SetChronoTankDestination.cs" />
<Compile Include="DemoTruck.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>

11
OpenRa.Game/Orders/ChronoshiftSelfDestinationOrderGenerator.cs → OpenRa.Mods.Aftermath/Orders/SetChronoTankDestination.cs
View File

@@ -1,17 +1,14 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Collections.Generic;
using System.Drawing;
using OpenRa.Traits;
namespace OpenRa.Orders
namespace OpenRa.Mods.Aftermath.Orders
{
class ChronoshiftSelfDestinationOrderGenerator : IOrderGenerator
class SetChronoTankDestination : IOrderGenerator
{
public readonly Actor self;
public ChronoshiftSelfDestinationOrderGenerator(Actor self)
public SetChronoTankDestination(Actor self)
{
this.self = self;
}

1
OpenRa.Mods.RA/OpenRa.Mods.RA.csproj
View File

@@ -35,6 +35,7 @@
<Reference Include="System.Core">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="System.Drawing" />
<Reference Include="System.Xml.Linq">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>