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

Merge pull request #9808 from teees/cloak-fix

Browse Source 
Several fixes for cloak behavior
This commit is contained in:
abcdefg30
2016-01-07 17:34:33 +01:00
parent 9db974cfe9 3a83e0cb92
commit 9aca470a73
9 changed files with 149 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Common/Activities/Demolish.cs
View File

@@ -54,7 +54,7 @@ namespace OpenRA.Mods.Common.Activities
if (target.IsDead)
return;
if (cloak != null && cloak.Info.UncloakOnDemolish)
if (cloak != null && cloak.Info.UncloakOn.HasFlag(UncloakType.Demolish))
cloak.Uncloak();
for (var f = 0; f < flashes; f++)

2
OpenRA.Mods.Common/Activities/UnloadCargo.cs
View File

@@ -59,7 +59,7 @@ namespace OpenRA.Mods.Common.Activities
if (IsCanceled || cargo.IsEmpty(self))
return NextActivity;
if (cloak != null && cloak.Info.UncloakOnUnload)
if (cloak != null && cloak.Info.UncloakOn.HasFlag(UncloakType.Unload))
cloak.Uncloak();
var actor = cargo.Peek(self);

131
OpenRA.Mods.Common/Traits/Cloak.cs
View File

@@ -17,6 +17,18 @@ using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits
{
[Flags]
public enum UncloakType
{
None = 0,
Attack = 1,
Move = 2,
Unload = 4,
Infiltrate = 8,
Demolish = 16,
Damage = 32
}
[Desc("This unit can cloak and uncloak in specific situations.")]
public class CloakInfo : UpgradableTraitInfo
{
@@ -26,11 +38,9 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Measured in game ticks.")]
public readonly int CloakDelay = 30;
public readonly bool UncloakOnAttack = true;
public readonly bool UncloakOnMove = false;
public readonly bool UncloakOnUnload = true;
public readonly bool UncloakOnInfiltrate = true;
public readonly bool UncloakOnDemolish = true;
[Desc("Events leading to the actor getting uncloaked. Possible values are: Attack, Move, Unload, Infiltrate, Demolish and Damage")]
public readonly UncloakType UncloakOn = UncloakType.Attack
| UncloakType.Unload | UncloakType.Infiltrate | UncloakType.Demolish;
public readonly string CloakSound = null;
public readonly string UncloakSound = null;
@@ -44,70 +54,48 @@ namespace OpenRA.Mods.Common.Traits
[Desc("The upgrades to grant to self while cloaked.")]
public readonly string[] WhileCloakedUpgrades = { };
public override object Create(ActorInitializer init) { return new Cloak(init.Self, this); }
public override object Create(ActorInitializer init) { return new Cloak(this); }
}
public class Cloak : UpgradableTrait<CloakInfo>, IRenderModifier, INotifyDamageStateChanged, INotifyAttack, ITick, IVisibilityModifier, IRadarColorModifier, INotifyCreated
public class Cloak : UpgradableTrait<CloakInfo>, IRenderModifier, INotifyDamageStateChanged,
INotifyAttack, ITick, IVisibilityModifier, IRadarColorModifier, INotifyCreated
{
[Sync] int remainingTime;
[Sync] bool damageDisabled;
UpgradeManager upgradeManager;
Actor self;
CPos? lastPos;
bool wasCloaked = false;
public Cloak(Actor self, CloakInfo info)
public Cloak(CloakInfo info)
: base(info)
{
this.self = self;
remainingTime = info.InitialDelay;
}
public void Created(Actor self)
void INotifyCreated.Created(Actor self)
{
upgradeManager = self.TraitOrDefault<UpgradeManager>();
if (remainingTime == 0)
{
if (upgradeManager != null)
foreach (var u in Info.WhileCloakedUpgrades)
upgradeManager.GrantUpgrade(self, u, this);
}
}
protected override void UpgradeDisabled(Actor self)
{
Uncloak();
remainingTime = Info.InitialDelay;
}
public void Uncloak() { Uncloak(Info.CloakDelay); }
public void Uncloak(int time)
{
if (Cloaked)
{
Game.Sound.Play(Info.UncloakSound, self.CenterPosition);
if (upgradeManager != null)
foreach (var u in Info.WhileCloakedUpgrades)
upgradeManager.RevokeUpgrade(self, u, this);
}
remainingTime = Math.Max(remainingTime, time);
GrantUpgrades(self);
}
public void Attacking(Actor self, Target target, Armament a, Barrel barrel) { if (Info.UncloakOnAttack) Uncloak(); }
public bool Cloaked { get { return !IsTraitDisabled && remainingTime <= 0; } }
public void DamageStateChanged(Actor self, AttackInfo e)
public void Uncloak() { Uncloak(Info.CloakDelay); }
public void Uncloak(int time) { remainingTime = Math.Max(remainingTime, time); }
void INotifyAttack.Attacking(Actor self, Target target, Armament a, Barrel barrel) { if (Info.UncloakOn.HasFlag(UncloakType.Attack)) Uncloak(); }
void INotifyDamageStateChanged.DamageStateChanged(Actor self, AttackInfo e)
{
damageDisabled = e.DamageState >= DamageState.Critical;
if (damageDisabled)
if (damageDisabled || Info.UncloakOn.HasFlag(UncloakType.Damage))
Uncloak();
}
public IEnumerable<IRenderable> ModifyRender(Actor self, WorldRenderer wr, IEnumerable<IRenderable> r)
IEnumerable<IRenderable> IRenderModifier.ModifyRender(Actor self, WorldRenderer wr, IEnumerable<IRenderable> r)
{
if (remainingTime > 0 || IsTraitDisabled)
return r;
@@ -124,27 +112,38 @@ namespace OpenRA.Mods.Common.Traits
return SpriteRenderable.None;
}
public void Tick(Actor self)
void ITick.Tick(Actor self)
{
if (IsTraitDisabled)
return;
if (remainingTime > 0 && !IsTraitDisabled && !damageDisabled && --remainingTime <= 0)
if (!IsTraitDisabled)
{
Game.Sound.Play(Info.CloakSound, self.CenterPosition);
if (upgradeManager != null)
foreach (var u in Info.WhileCloakedUpgrades)
upgradeManager.GrantUpgrade(self, u, this);
if (remainingTime > 0 && !damageDisabled)
remainingTime--;
if (self.IsDisabled())
Uncloak();
if (Info.UncloakOn.HasFlag(UncloakType.Move) && (lastPos == null || lastPos.Value != self.Location))
{
Uncloak();
lastPos = self.Location;
}
}
if (self.IsDisabled())
Uncloak();
if (Info.UncloakOnMove && (lastPos == null || lastPos.Value != self.Location))
var isCloaked = Cloaked;
if (isCloaked && !wasCloaked)
{
Uncloak();
lastPos = self.Location;
GrantUpgrades(self);
if (!self.TraitsImplementing<Cloak>().Any(a => a != this && a.Cloaked))
Game.Sound.Play(Info.CloakSound, self.CenterPosition);
}
else if (!isCloaked && wasCloaked)
{
RevokeUpgrades(self);
if (!self.TraitsImplementing<Cloak>().Any(a => a != this && a.Cloaked))
Game.Sound.Play(Info.UncloakSound, self.CenterPosition);
}
wasCloaked = isCloaked;
}
public bool IsVisible(Actor self, Player viewer)
@@ -157,12 +156,26 @@ namespace OpenRA.Mods.Common.Traits
&& (self.CenterPosition - a.Actor.CenterPosition).LengthSquared <= a.Trait.Info.Range.LengthSquared);
}
public Color RadarColorOverride(Actor self)
Color IRadarColorModifier.RadarColorOverride(Actor self)
{
var c = self.Owner.Color.RGB;
if (self.Owner == self.World.LocalPlayer && Cloaked)
c = Color.FromArgb(128, c);
return c;
}
void GrantUpgrades(Actor self)
{
if (upgradeManager != null)
foreach (var u in Info.WhileCloakedUpgrades)
upgradeManager.GrantUpgrade(self, u, this);
}
void RevokeUpgrades(Actor self)
{
if (upgradeManager != null)
foreach (var u in Info.WhileCloakedUpgrades)
upgradeManager.RevokeUpgrade(self, u, this);
}
}
}

46
OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs
View File

@@ -2830,6 +2830,52 @@ namespace OpenRA.Mods.Common.UtilityCommands
}
}
if (engineVersion < 20160701 && depth == 1 && node.Key.StartsWith("Cloak"))
{
var defaultCloakType = Traits.UncloakType.Attack
| Traits.UncloakType.Unload | Traits.UncloakType.Infiltrate | Traits.UncloakType.Demolish;
// Merge Uncloak types
var t = defaultCloakType;
for (var i = node.Value.Nodes.Count - 1; i >= 0; i--)
{
var n = node.Value.Nodes[i];
var v = string.Compare(n.Value.Value, "true", true) == 0;
Traits.UncloakType flag;
if (n.Key == "UncloakOnAttack")
flag = Traits.UncloakType.Attack;
else if (n.Key == "UncloakOnMove")
flag = Traits.UncloakType.Move;
else if (n.Key == "UncloakOnUnload")
flag = Traits.UncloakType.Unload;
else if (n.Key == "UncloakOnInfiltrate")
flag = Traits.UncloakType.Infiltrate;
else if (n.Key == "UncloakOnDemolish")
flag = Traits.UncloakType.Demolish;
else
continue;
t = v ? t | flag : t & ~flag;
node.Value.Nodes.Remove(n);
}
if (t != defaultCloakType)
{
Console.WriteLine("\t\tCloak type: " + t.ToString());
var ts = new List<string>();
if (t.HasFlag(Traits.UncloakType.Attack))
ts.Add("Attack");
if (t.HasFlag(Traits.UncloakType.Unload))
ts.Add("Unload");
if (t.HasFlag(Traits.UncloakType.Infiltrate))
ts.Add("Infiltrate");
if (t.HasFlag(Traits.UncloakType.Demolish))
ts.Add("Demolish");
if (t.HasFlag(Traits.UncloakType.Move))
ts.Add("Move");
node.Value.Nodes.Add(new MiniYamlNode("UncloakOn", ts.JoinWith(", ")));
}
}
UpgradeActorRules(engineVersion, ref node.Value.Nodes, node, depth + 1);
}
}

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

@@ -40,7 +40,7 @@ namespace OpenRA.Mods.RA.Activities
if (!validStances.HasStance(stance))
return;
if (cloak != null && cloak.Info.UncloakOnInfiltrate)
if (cloak != null && cloak.Info.UncloakOn.HasFlag(UncloakType.Infiltrate))
cloak.Uncloak();
foreach (var t in target.TraitsImplementing<INotifyInfiltrated>())

2
mods/d2k/rules/infantry.yaml
View File

@@ -251,7 +251,7 @@ saboteur:
CloakDelay: 85
CloakSound: STEALTH1.WAV
UncloakSound: STEALTH2.WAV
UncloakOnMove: true
UncloakOn: Attack, Unload, Infiltrate, Demolish, Move
IsPlayerPalette: true
Voiced:
VoiceSet: SaboteurVoice

4
mods/ra/rules/infantry.yaml
View File

@@ -458,7 +458,7 @@ HIJACKER:
Cloak:
InitialDelay: 250
CloakDelay: 120
UncloakOnMove: true
UncloakOn: Attack, Unload, Infiltrate, Demolish, Move
CloakTypes: Cloak, Hijacker
IsPlayerPalette: true
Mobile:
@@ -538,7 +538,7 @@ SNIPER:
CloakDelay: 120
CloakSound:
UncloakSound:
UncloakOnMove: true
UncloakOn: Attack, Unload, Infiltrate, Demolish, Move
IsPlayerPalette: true
DetectCloaked:
CloakTypes: Cloak, Hijacker

24
mods/ts/rules/defaults.yaml
View File

@@ -111,6 +111,9 @@
InitialDelay: 0
CloakDelay: 90
IsPlayerPalette: true
CloakSound: cloak5.aud
UncloakSound: cloak5.aud
UncloakOn: Attack, Unload, Infiltrate, Demolish, Damage
^Building:
Inherits@1: ^BasicBuilding
@@ -216,6 +219,9 @@
InitialDelay: 0
CloakDelay: 90
IsPlayerPalette: true
CloakSound: cloak5.aud
UncloakSound: cloak5.aud
UncloakOn: Attack, Unload, Infiltrate, Demolish, Damage
Health:
Shape: Circle
Radius: 363
@@ -319,6 +325,9 @@
InitialDelay: 0
CloakDelay: 90
IsPlayerPalette: true
CloakSound: cloak5.aud
UncloakSound: cloak5.aud
UncloakOn: Attack, Unload, Infiltrate, Demolish, Damage
^Soldier:
Inherits: ^Infantry
@@ -420,6 +429,9 @@
InitialDelay: 0
CloakDelay: 90
IsPlayerPalette: true
CloakSound: cloak5.aud
UncloakSound: cloak5.aud
UncloakOn: Attack, Unload, Infiltrate, Demolish, Damage
MustBeDestroyed:
RenderSprites:
ThrowsShrapnel:
@@ -499,6 +511,15 @@
MustBeDestroyed:
RenderVoxels:
WithVoxelBody:
Cloak@CLOAKGENERATOR:
UpgradeTypes: cloakgenerator
UpgradeMinEnabledLevel: 1
InitialDelay: 0
CloakDelay: 90
IsPlayerPalette: true
CloakSound: cloak5.aud
UncloakSound: cloak5.aud
UncloakOn: Attack, Unload, Infiltrate, Demolish, Damage
^Helicopter:
Inherits: ^Aircraft
@@ -712,6 +733,9 @@
InitialDelay: 0
CloakDelay: 90
IsPlayerPalette: true
CloakSound: cloak5.aud
UncloakSound: cloak5.aud
UncloakOn: Attack, Unload, Infiltrate, Demolish, Damage
ThrowsShrapnel:
Weapons: SmallDebris
Pieces: 3, 7

1
mods/ts/rules/nod-vehicles.yaml
View File

@@ -282,6 +282,7 @@ STNK:
CloakSound: cloak5.aud
UncloakSound: cloak5.aud
IsPlayerPalette: true
UncloakOn: Attack, Unload, Infiltrate, Demolish, Damage
Armament:
Weapon: Dragon
LocalOffset: 213,43,128, 213,-43,128