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

Convert firepower modifiers to integer percentages.

Browse Source
This commit is contained in:
Paul Chote
2014-08-09 22:04:20 +12:00
parent 84d3497e96
commit 01cd6efbd0
5 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -153,8 +153,10 @@ namespace OpenRA.Mods.RA
{
Weapon = Weapon,
Facing = legacyFacing,
// TODO: Convert to ints
FirepowerModifier = self.TraitsImplementing<IFirepowerModifier>()
.Select(a => a.GetFirepowerModifier())
.Select(a => a.GetFirepowerModifier() / 100f)
.Product(),
Source = muzzlePosition,

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

@@ -19,7 +19,7 @@ namespace OpenRA.Mods.RA
public class GainsStatUpgradesInfo : ITraitInfo
{
public readonly string FirepowerUpgrade = "firepower";
public readonly float[] FirepowerModifier = { 1.1f, 1.15f, 1.2f, 1.5f };
public readonly int[] FirepowerModifier = { 110, 115, 120, 150 };
public readonly string ArmorUpgrade = "armor";
public readonly int[] ArmorModifier = { 110, 120, 130, 150 };
@@ -65,9 +65,9 @@ namespace OpenRA.Mods.RA
return armorLevel > 0 ? 1 / info.ArmorModifier[armorLevel - 1] : 100;
}
public float GetFirepowerModifier()
public int GetFirepowerModifier()
{
return firepowerLevel > 0 ? info.FirepowerModifier[firepowerLevel - 1] : 1;
return firepowerLevel > 0 ? info.FirepowerModifier[firepowerLevel - 1] : 100;
}
public int GetSpeedModifier()