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

Remove some crap from Cloak.

Browse Source
This commit is contained in:
Paul Chote
2011-06-30 23:54:42 +12:00
parent fc10b79e1d
commit f360559869
5 changed files with 25 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
OpenRA.Mods.RA/Cloak.cs
View File

@@ -18,21 +18,10 @@ namespace OpenRA.Mods.RA
{
public class CloakInfo : ITraitInfo
{
public readonly float InitialDelay = .4f; // seconds
public readonly float CloakDelay = 1.2f; // Seconds
public readonly string CloakSound = "subshow1.aud";
public readonly string UncloakSound = "subshow1.aud";
public CloakInfo() { } /* only because we have other ctors */
/* for CloakCrateAction */
public CloakInfo(float initialDelay, float cloakDelay, string cloakSound, string uncloakSound)
{
InitialDelay = initialDelay;
CloakDelay = cloakDelay;
CloakSound = cloakSound;
UncloakSound = uncloakSound;
}
public int InitialDelay = 10; // Ticks
public int CloakDelay = 30; // Ticks
public string CloakSound = "subshow1.aud";
public string UncloakSound = "subshow1.aud";
public object Create(ActorInitializer init) { return new Cloak(init.self, this); }
}
@@ -51,7 +40,7 @@ namespace OpenRA.Mods.RA
this.info = info;
this.self = self;
remainingTime = (int)(info.InitialDelay * 25);
remainingTime = info.InitialDelay;
}
void DoUncloak()
@@ -59,7 +48,7 @@ namespace OpenRA.Mods.RA
if (remainingTime <= 0)
OnCloak();
remainingTime = Math.Max(remainingTime, (int)(info.CloakDelay * 25));
remainingTime = Math.Max(remainingTime, info.CloakDelay);
}
public void Attacking(Actor self, Target target) { DoUncloak(); }

21
OpenRA.Mods.RA/Crates/CloakCrateAction.cs
View File

@@ -10,20 +10,21 @@
using OpenRA.FileFormats;
using OpenRA.Mods.RA;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Crates
{
class CloakCrateActionInfo : CrateActionInfo
public class CloakCrateActionInfo : CrateActionInfo
{
public readonly float InitialDelay = .4f;
public readonly float CloakDelay = 1.2f;
public readonly int InitialDelay = 10;
public readonly int CloakDelay = 30;
public readonly string CloakSound = "subshow1.aud";
public readonly string UncloakSound = "subshow1.aud";
public override object Create(ActorInitializer init) { return new CloakCrateAction(init.self, this); }
}
class CloakCrateAction : CrateAction
public class CloakCrateAction : CrateAction
{
CloakCrateActionInfo Info;
public CloakCrateAction(Actor self, CloakCrateActionInfo info)
@@ -37,10 +38,14 @@ namespace OpenRA.Mods.RA.Crates
public override void Activate(Actor collector)
{
var cloakInfo = new CloakInfo(Info.InitialDelay, Info.CloakDelay,
Info.CloakSound, Info.UncloakSound);
var cloak = cloakInfo.Create(new ActorInitializer(collector, new TypeDictionary() ));
var cloakInfo = new CloakInfo()
{
InitialDelay = Info.InitialDelay,
CloakDelay = Info.CloakDelay,
CloakSound = Info.CloakSound,
UncloakSound = Info.UncloakSound
};
var cloak = new Cloak(collector, cloakInfo);
collector.World.AddFrameEndTask(w =>
{