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

Convert damage modifiers to integer percentages.

Browse Source
This commit is contained in:
Paul Chote
2014-08-09 21:27:37 +12:00
parent c5519a7f3b
commit 0425416ce2
11 changed files with 59 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
OpenRA.Game/Traits/Health.cs
View File

@@ -100,16 +100,21 @@ namespace OpenRA.Traits
public void InflictDamage(Actor self, Actor attacker, int damage, DamageWarhead warhead, bool ignoreModifiers)
{
if (IsDead) return; /* overkill! don't count extra hits as more kills! */
// Overkill! don't count extra hits as more kills!
if (IsDead)
return;
var oldState = this.DamageState;
/* apply the damage modifiers, if we have any. */
var modifier = self.TraitsImplementing<IDamageModifier>()
.Concat(self.Owner.PlayerActor.TraitsImplementing<IDamageModifier>())
.Select(t => t.GetDamageModifier(attacker, warhead)).Product();
if (!ignoreModifiers)
damage = damage > 0 ? (int)(damage * modifier) : damage;
// Apply any damage modifiers
if (!ignoreModifiers && damage > 0)
{
var modifiers = self.TraitsImplementing<IDamageModifier>()
.Concat(self.Owner.PlayerActor.TraitsImplementing<IDamageModifier>())
.Select(t => t.GetDamageModifier(attacker, warhead));
damage = Util.ApplyPercentageModifiers(damage, modifiers);
}
hp = Exts.Clamp(hp - damage, 0, MaxHP);

2
OpenRA.Game/Traits/TraitsInterfaces.cs
View File

@@ -155,7 +155,7 @@ namespace OpenRA.Traits
}
public interface IRenderModifier { IEnumerable<IRenderable> ModifyRender(Actor self, WorldRenderer wr, IEnumerable<IRenderable> r); }
public interface IDamageModifier { float GetDamageModifier(Actor attacker, DamageWarhead warhead); }
public interface IDamageModifier { int GetDamageModifier(Actor attacker, DamageWarhead warhead); }
public interface ISpeedModifier { decimal GetSpeedModifier(); }
public interface IFirepowerModifier { float GetFirepowerModifier(); }
public interface ILoadsPalettes { void LoadPalettes(WorldRenderer wr); }

10
OpenRA.Game/Traits/Util.cs
View File

@@ -138,5 +138,15 @@ namespace OpenRA.Traits
var cells = target.Positions.Select(p => w.Map.CellContaining(p)).Distinct();
return ExpandFootprint(cells, true);
}
public static int ApplyPercentageModifiers(int number, IEnumerable<int> percentages)
{
// See the comments of PR#6079 for a faster algorithm if this becomes a performance bottleneck
var a = (decimal)number;
foreach (var p in percentages)
a *= p / 100m;
return (int)a;
}
}
}

11
OpenRA.Mods.RA/Activities/Demolish.cs
View File

@@ -50,16 +50,17 @@ namespace OpenRA.Mods.RA.Activities
if (target.Type != TargetType.Actor)
return;
// Invulnerable actors can't be demolished
var modifier = (float)target.Actor.TraitsImplementing<IDamageModifier>()
.Concat(self.Owner.PlayerActor.TraitsImplementing<IDamageModifier>())
.Select(t => t.GetDamageModifier(self, null)).Product();
var demolishable = target.Actor.TraitOrDefault<IDemolishable>();
if (demolishable == null || !demolishable.IsValidTarget(target.Actor, self))
return;
if (modifier > 0)
var modifiers = target.Actor.TraitsImplementing<IDamageModifier>()
.Concat(self.Owner.PlayerActor.TraitsImplementing<IDamageModifier>())
.Select(t => t.GetDamageModifier(self, null));
if (Util.ApplyPercentageModifiers(100, modifiers) > 0)
demolishable.Demolish(target.Actor, self);
}));
});

8
OpenRA.Mods.RA/Attack/AttackPopupTurreted.cs
View File

@@ -23,8 +23,8 @@ namespace OpenRA.Mods.RA
public int CloseDelay = 125;
public int DefaultFacing = 0;
[Desc("The factor damage received is multiplied by while this actor is closed.")]
public float ClosedDamageMultiplier = 0.5f;
[Desc("The percentage of damage that is received while this actor is closed.")]
public int ClosedDamageMultiplier = 50;
public override object Create(ActorInitializer init) { return new AttackPopupTurreted(init, this); }
}
@@ -105,9 +105,9 @@ namespace OpenRA.Mods.RA
}
}
public float GetDamageModifier(Actor attacker, DamageWarhead warhead)
public int GetDamageModifier(Actor attacker, DamageWarhead warhead)
{
return state == PopupState.Closed ? info.ClosedDamageMultiplier : 1f;
return state == PopupState.Closed ? info.ClosedDamageMultiplier : 100;
}
}
}

6
OpenRA.Mods.RA/GainsStatUpgrades.cs
View File

@@ -22,7 +22,7 @@ namespace OpenRA.Mods.RA
public readonly float[] FirepowerModifier = { 1.1f, 1.15f, 1.2f, 1.5f };
public readonly string ArmorUpgrade = "armor";
public readonly float[] ArmorModifier = { 1.1f, 1.2f, 1.3f, 1.5f };
public readonly int[] ArmorModifier = { 110, 120, 130, 150 };
public readonly string SpeedUpgrade = "speed";
public readonly decimal[] SpeedModifier = { 1.1m, 1.15m, 1.2m, 1.5m };
@@ -60,9 +60,9 @@ namespace OpenRA.Mods.RA
speedLevel = (speedLevel + mod).Clamp(0, info.SpeedModifier.Length);
}
public float GetDamageModifier(Actor attacker, DamageWarhead warhead)
public int GetDamageModifier(Actor attacker, DamageWarhead warhead)
{
return armorLevel > 0 ? 1 / info.ArmorModifier[armorLevel - 1] : 1;
return armorLevel > 0 ? 1 / info.ArmorModifier[armorLevel - 1] : 100;
}
public float GetFirepowerModifier()

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

@@ -18,6 +18,6 @@ namespace OpenRA.Mods.RA
class Invulnerable : IDamageModifier
{
public float GetDamageModifier(Actor attacker, DamageWarhead warhead) { return 0.0f; }
public int GetDamageModifier(Actor attacker, DamageWarhead warhead) { return 0; }
}
}

4
OpenRA.Mods.RA/IronCurtainable.cs
View File

@@ -28,9 +28,9 @@ namespace OpenRA.Mods.RA
RemainingTicks--;
}
public float GetDamageModifier(Actor attacker, DamageWarhead warhead)
public int GetDamageModifier(Actor attacker, DamageWarhead warhead)
{
return (RemainingTicks > 0) ? 0.0f : 1.0f;
return RemainingTicks > 0 ? 0 : 100;
}
public void Activate(Actor self, int duration)

4
OpenRA.Mods.RA/Scripting/ScriptInvulnerable.cs
View File

@@ -20,9 +20,9 @@ namespace OpenRA.Mods.RA
{
public bool Invulnerable = false;
public float GetDamageModifier(Actor attacker, DamageWarhead warhead)
public int GetDamageModifier(Actor attacker, DamageWarhead warhead)
{
return Invulnerable ? 0.0f : 1.0f;
return Invulnerable ? 0 : 100;
}
}
}

4
OpenRA.Mods.RA/TakeCover.cs
View File

@@ -61,9 +61,9 @@ namespace OpenRA.Mods.RA
LocalOffset = WVec.Zero;
}
public float GetDamageModifier(Actor attacker, DamageWarhead warhead)
public int GetDamageModifier(Actor attacker, DamageWarhead warhead)
{
return IsProne && warhead != null ? warhead.ProneModifier / 100f : 1f;
return IsProne && warhead != null ? warhead.ProneModifier : 100;
}
public decimal GetSpeedModifier()

16
OpenRA.Utility/UpgradeRules.cs
View File

@@ -26,6 +26,12 @@ namespace OpenRA.Utility
input = "{0}c{1}".F(cells, subcells);
}
static void ConvertFloatArrayToPercentArray(ref string input)
{
input = string.Join(", ", input.Split(',')
.Select(s => ((int)(float.Parse(s) * 100)).ToString()));
}
static void ConvertPxToRange(ref string input)
{
ConvertPxToRange(ref input, 1, 1);
@@ -402,6 +408,16 @@ namespace OpenRA.Utility
}
}
// Modifiers were changed to integer percentages
if (engineVersion < 20140809)
{
if (depth == 2 && node.Key == "ClosedDamageMultiplier" && parentKey == "AttackPopupTurreted")
ConvertFloatArrayToPercentArray(ref node.Value.Value);
if (depth == 2 && node.Key == "ArmorModifier" && parentKey == "GainsStatUpgrades")
ConvertFloatArrayToPercentArray(ref node.Value.Value);
}
UpgradeActorRules(engineVersion, ref node.Value.Nodes, node, depth + 1);
}
}