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

Merge pull request #6344 from reaperrr/accuracy-modifier

Browse Source 
Added InaccuracyModifier
This commit is contained in:
obrakmann
2014-09-04 22:43:01 +02:00
parent 3f23930121 9bb9f870d7
commit efcf66206e
5 changed files with 29 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -178,6 +178,7 @@ namespace OpenRA.Traits
public interface ISpeedModifier { int GetSpeedModifier(); } public interface ISpeedModifier { int GetSpeedModifier(); }
public interface IFirepowerModifier { int GetFirepowerModifier(); } public interface IFirepowerModifier { int GetFirepowerModifier(); }
public interface IReloadModifier { int GetReloadModifier(); } public interface IReloadModifier { int GetReloadModifier(); }
public interface IInaccuracyModifier { int GetInaccuracyModifier(); }
public interface IPowerModifier { int GetPowerModifier(); } public interface IPowerModifier { int GetPowerModifier(); }
public interface ILoadsPalettes { void LoadPalettes(WorldRenderer wr); } public interface ILoadsPalettes { void LoadPalettes(WorldRenderer wr); }
public interface IPaletteModifier { void AdjustPalette(IReadOnlyDictionary<string, MutablePalette> b); } public interface IPaletteModifier { void AdjustPalette(IReadOnlyDictionary<string, MutablePalette> b); }

5
OpenRA.Mods.RA/Effects/Bullet.cs
View File

@@ -82,7 +82,10 @@ namespace OpenRA.Mods.RA.Effects
target = args.PassiveTarget; target = args.PassiveTarget;
if (info.Inaccuracy.Range > 0) if (info.Inaccuracy.Range > 0)
{ {
var maxOffset = info.Inaccuracy.Range * (target - pos).Length / args.Weapon.Range.Range; var modifiers = args.SourceActor.TraitsImplementing<IInaccuracyModifier>()
.Select(m => m.GetInaccuracyModifier());
var inaccuracy = Traits.Util.ApplyPercentageModifiers(info.Inaccuracy.Range, modifiers);
var maxOffset = inaccuracy * (target - pos).Length / args.Weapon.Range.Range;
target += WVec.FromPDF(args.SourceActor.World.SharedRandom, 2) * maxOffset / 1024; target += WVec.FromPDF(args.SourceActor.World.SharedRandom, 2) * maxOffset / 1024;
} }

7
OpenRA.Mods.RA/Effects/Missile.cs
View File

@@ -85,7 +85,12 @@ namespace OpenRA.Mods.RA.Effects
targetPosition = args.PassiveTarget; targetPosition = args.PassiveTarget;
if (info.Inaccuracy.Range > 0) if (info.Inaccuracy.Range > 0)
offset = WVec.FromPDF(args.SourceActor.World.SharedRandom, 2) * info.Inaccuracy.Range / 1024; {
var modifiers = args.SourceActor.TraitsImplementing<IInaccuracyModifier>()
.Select(m => m.GetInaccuracyModifier());
var inaccuracy = Traits.Util.ApplyPercentageModifiers(info.Inaccuracy.Range, modifiers);
offset = WVec.FromPDF(args.SourceActor.World.SharedRandom, 2) * inaccuracy / 1024;
}
if (info.Image != null) if (info.Image != null)
{ {

8
OpenRA.Mods.RA/GainsExperience.cs
View File

@@ -43,10 +43,10 @@ namespace OpenRA.Mods.RA
{ {
return new Dictionary<int, string[]>() return new Dictionary<int, string[]>()
{ {
{ 200, new[] { "firepower", "armor", "speed", "reload" } }, { 200, new[] { "firepower", "armor", "speed", "reload", "inaccuracy" } },
{ 400, new[] { "firepower", "armor", "speed", "reload" } }, { 400, new[] { "firepower", "armor", "speed", "reload", "inaccuracy" } },
{ 800, new[] { "firepower", "armor", "speed", "reload" } }, { 800, new[] { "firepower", "armor", "speed", "reload", "inaccuracy" } },
{ 1600, new[] { "firepower", "armor", "speed", "reload" } } { 1600, new[] { "firepower", "armor", "speed", "reload", "inaccuracy" } }
}; };
} }

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

@@ -30,16 +30,20 @@ namespace OpenRA.Mods.RA
public readonly string ReloadUpgrade = "reload"; public readonly string ReloadUpgrade = "reload";
public readonly int[] ReloadModifier = { 95, 90, 85, 75 }; public readonly int[] ReloadModifier = { 95, 90, 85, 75 };
public readonly string InaccuracyUpgrade = "inaccuracy";
public readonly int[] InaccuracyModifier = { 90, 80, 70, 50 };
public object Create(ActorInitializer init) { return new GainsStatUpgrades(this); } public object Create(ActorInitializer init) { return new GainsStatUpgrades(this); }
} }
public class GainsStatUpgrades : IUpgradable, IFirepowerModifier, IDamageModifier, ISpeedModifier, IReloadModifier public class GainsStatUpgrades : IUpgradable, IFirepowerModifier, IDamageModifier, ISpeedModifier, IReloadModifier, IInaccuracyModifier
{ {
readonly GainsStatUpgradesInfo info; readonly GainsStatUpgradesInfo info;
[Sync] int firepowerLevel = 0; [Sync] int firepowerLevel = 0;
[Sync] int speedLevel = 0; [Sync] int speedLevel = 0;
[Sync] int damageLevel = 0; [Sync] int damageLevel = 0;
[Sync] int reloadLevel = 0; [Sync] int reloadLevel = 0;
[Sync] int inaccuracyLevel = 0;
public GainsStatUpgrades(GainsStatUpgradesInfo info) public GainsStatUpgrades(GainsStatUpgradesInfo info)
{ {
@@ -51,7 +55,8 @@ namespace OpenRA.Mods.RA
return (type == info.FirepowerUpgrade && firepowerLevel < info.FirepowerModifier.Length) return (type == info.FirepowerUpgrade && firepowerLevel < info.FirepowerModifier.Length)
|| (type == info.DamageUpgrade && damageLevel < info.DamageModifier.Length) || (type == info.DamageUpgrade && damageLevel < info.DamageModifier.Length)
|| (type == info.SpeedUpgrade && speedLevel < info.SpeedModifier.Length) || (type == info.SpeedUpgrade && speedLevel < info.SpeedModifier.Length)
|| (type == info.ReloadUpgrade && reloadLevel < info.ReloadModifier.Length); || (type == info.ReloadUpgrade && reloadLevel < info.ReloadModifier.Length)
|| (type == info.InaccuracyUpgrade && inaccuracyLevel < info.InaccuracyModifier.Length);
} }
public void UpgradeAvailable(Actor self, string type, bool available) public void UpgradeAvailable(Actor self, string type, bool available)
@@ -65,6 +70,8 @@ namespace OpenRA.Mods.RA
speedLevel = (speedLevel + mod).Clamp(0, info.SpeedModifier.Length); speedLevel = (speedLevel + mod).Clamp(0, info.SpeedModifier.Length);
else if (type == info.ReloadUpgrade) else if (type == info.ReloadUpgrade)
reloadLevel = (reloadLevel + mod).Clamp(0, info.ReloadModifier.Length); reloadLevel = (reloadLevel + mod).Clamp(0, info.ReloadModifier.Length);
else if (type == info.InaccuracyUpgrade)
inaccuracyLevel = (inaccuracyLevel + mod).Clamp(0, info.InaccuracyModifier.Length);
} }
public int GetDamageModifier(Actor attacker, DamageWarhead warhead) public int GetDamageModifier(Actor attacker, DamageWarhead warhead)
@@ -86,5 +93,10 @@ namespace OpenRA.Mods.RA
{ {
return reloadLevel > 0 ? info.ReloadModifier[reloadLevel - 1] : 100; return reloadLevel > 0 ? info.ReloadModifier[reloadLevel - 1] : 100;
} }
public int GetInaccuracyModifier()
{
return inaccuracyLevel > 0 ? info.InaccuracyModifier[inaccuracyLevel - 1] : 100;
}
} }
} }