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

Merge pull request #11900 from abc013/DeflectionStances

Browse Source 
Replaced the AlliedMissiles boolean on JamsMissiles by a Stances field
This commit is contained in:
abcdefg30
2016-08-29 15:03:08 +02:00
committed by GitHub
parent f2b847607c ad108a0108
commit 9ddfe23e17
4 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Common/Projectiles/Missile.cs
View File

@@ -396,7 +396,7 @@ namespace OpenRA.Mods.Common.Projectiles
if ((tp.Actor.CenterPosition - pos).HorizontalLengthSquared > tp.Trait.Range.LengthSquared)
return false;
if (tp.Actor.Owner.Stances[args.SourceActor.Owner] == Stance.Ally && !tp.Trait.AlliedMissiles)
if (!tp.Actor.Owner.Stances[args.SourceActor.Owner].HasStance(tp.Trait.DeflectionStances))
return false;
return tp.Actor.World.SharedRandom.Next(100 / tp.Trait.Chance) == 0;

10
OpenRA.Mods.Common/Traits/JamsMissiles.cs
View File

@@ -13,10 +13,16 @@ using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits
{
[Desc("This actor deflects missiles.")]
public class JamsMissilesInfo : ITraitInfo
{
[Desc("Range of the deflection.")]
public readonly WDist Range = WDist.Zero;
public readonly bool AlliedMissiles = true;
[Desc("What diplomatic stances are affected.")]
public readonly Stance DeflectionStances = Stance.Ally | Stance.Neutral | Stance.Enemy;
[Desc("Chance of deflecting missiles.")]
public readonly int Chance = 100;
public object Create(ActorInitializer init) { return new JamsMissiles(this); }
@@ -27,7 +33,7 @@ namespace OpenRA.Mods.Common.Traits
readonly JamsMissilesInfo info;
public WDist Range { get { return info.Range; } }
public bool AlliedMissiles { get { return info.AlliedMissiles; } }
public Stance DeflectionStances { get { return info.DeflectionStances; } }
public int Chance { get { return info.Chance; } }
public JamsMissiles(JamsMissilesInfo info) { this.info = info; }

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

@@ -344,6 +344,20 @@ namespace OpenRA.Mods.Common.UtilityCommands
node.Value.Nodes.RemoveAll(n => n.Key == "PathfinderDebugOverlay");
}
// AlliedMissiles on JamsMissiles was changed from a boolean to a Stances field and renamed
if (engineVersion < 20160827)
{
if (node.Key == "JamsMissiles")
{
var alliedMissiles = node.Value.Nodes.FirstOrDefault(n => n.Key == "AlliedMissiles");
if (alliedMissiles != null)
{
alliedMissiles.Value.Value = FieldLoader.GetValue<bool>("AlliedMissiles", alliedMissiles.Value.Value) ? "Ally, Neutral, Enemy" : "Neutral, Enemy";
alliedMissiles.Key = "DeflectionStances";
}
}
}
UpgradeActorRules(modData, engineVersion, ref node.Value.Nodes, node, depth + 1);
}

2
mods/ra/rules/vehicles.yaml
View File

@@ -546,7 +546,7 @@ MRJ:
Range: 15c0
JamsMissiles:
Range: 4c0
AlliedMissiles: False
DeflectionStances: Neutral, Enemy
RenderJammerCircle:
DetectCloaked:
Range: 6c0