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

Merge pull request #9007 from reaperrr/armor-upgradable

Browse Source 
Made Armor upgradable
This commit is contained in:
Pavel Penev
2015-09-02 14:19:30 +03:00
parent 8e2fca6f46 7f7031d5c8
commit 800b77e137
3 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,10 +13,16 @@ using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits
{
[Desc("Used to define weapon efficiency modifiers with different percentages per Type.")]
public class ArmorInfo : TraitInfo<Armor>
public class ArmorInfo : UpgradableTraitInfo
{
public readonly string Type = null;
public override object Create(ActorInitializer init) { return new Armor(init.Self, this); }
}
public class Armor { }
public class Armor : UpgradableTrait<ArmorInfo>
{
public Armor(Actor self, ArmorInfo info)
: base(info) { }
}
}

19
OpenRA.Mods.Common/Warheads/DamageWarhead.cs
View File

@@ -9,6 +9,7 @@
#endregion
using System.Collections.Generic;
using System.Linq;
using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
@@ -23,7 +24,7 @@ namespace OpenRA.Mods.Common.Warheads
public readonly string[] DamageTypes = new string[0];
[FieldLoader.LoadUsing("LoadVersus")]
[Desc("Damage percentage versus each armortype. 0% = can't target.")]
[Desc("Damage percentage versus each armortype.")]
public readonly Dictionary<string, int> Versus;
public static object LoadVersus(MiniYaml yaml)
@@ -34,17 +35,13 @@ namespace OpenRA.Mods.Common.Warheads
: new Dictionary<string, int>();
}
public int DamageVersus(ActorInfo victim)
public int DamageVersus(Actor victim)
{
var armor = victim.Traits.GetOrDefault<ArmorInfo>();
if (armor != null && armor.Type != null)
{
int versus;
if (Versus.TryGetValue(armor.Type, out versus))
return versus;
}
var armor = victim.TraitsImplementing<Armor>()
.Where(a => !a.IsTraitDisabled && a.Info.Type != null && Versus.ContainsKey(a.Info.Type))
.Select(a => Versus[a.Info.Type]);
return 100;
return Util.ApplyPercentageModifiers(100, armor);
}
public override void DoImpact(Target target, Actor firedBy, IEnumerable<int> damageModifiers)
@@ -60,7 +57,7 @@ namespace OpenRA.Mods.Common.Warheads
public virtual void DoImpact(Actor victim, Actor firedBy, IEnumerable<int> damageModifiers)
{
var damage = Util.ApplyPercentageModifiers(Damage, damageModifiers.Append(DamageVersus(victim.Info)));
var damage = Util.ApplyPercentageModifiers(Damage, damageModifiers.Append(DamageVersus(victim)));
victim.InflictDamage(firedBy, damage, this);
}
}

2
OpenRA.Mods.Common/Warheads/HealthPercentageDamageWarhead.cs
View File

@@ -38,7 +38,7 @@ namespace OpenRA.Mods.Common.Warheads
return;
// Damage is measured as a percentage of the target health
var damage = Util.ApplyPercentageModifiers(healthInfo.HP, damageModifiers.Append(Damage, DamageVersus(victim.Info)));
var damage = Util.ApplyPercentageModifiers(healthInfo.HP, damageModifiers.Append(Damage, DamageVersus(victim)));
victim.InflictDamage(firedBy, damage, this);
}
}