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

Introduces ReloadModifier

Browse Source 
and renames ROF -> ReloadDelay
This commit is contained in:
reaperrr
2014-07-26 21:41:56 +02:00
parent fce732b060
commit 4469b5f5ca
7 changed files with 27 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Game/GameRules/WeaponInfo.cs
View File

@@ -37,8 +37,8 @@ namespace OpenRA.GameRules
[Desc("The sound played when the weapon is fired.")] [Desc("The sound played when the weapon is fired.")]
public readonly string[] Report = null; public readonly string[] Report = null;
[Desc("Rate of Fire = Delay in ticks between reloading ammo magazines.")] [Desc("Delay in ticks between reloading ammo magazines.")]
public readonly int ROF = 1; public readonly int ReloadDelay = 1;
[Desc("Number of shots in a single ammo magazine.")] [Desc("Number of shots in a single ammo magazine.")]
public readonly int Burst = 1; public readonly int Burst = 1;

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

@@ -170,6 +170,7 @@ namespace OpenRA.Traits
public interface IDamageModifier { int GetDamageModifier(Actor attacker, DamageWarhead warhead); } public interface IDamageModifier { int GetDamageModifier(Actor attacker, DamageWarhead warhead); }
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 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); }
public interface IPips { IEnumerable<PipType> GetPips(Actor self); } public interface IPips { IEnumerable<PipType> GetPips(Actor self); }

2
OpenRA.Mods.Cnc/PoisonedByTiberium.cs
View File

@@ -44,7 +44,7 @@ namespace OpenRA.Mods.Cnc
var weapon = self.World.Map.Rules.Weapons[info.Weapon.ToLowerInvariant()]; var weapon = self.World.Map.Rules.Weapons[info.Weapon.ToLowerInvariant()];
weapon.Impact(self.CenterPosition, self.World.WorldActor, 1f); weapon.Impact(self.CenterPosition, self.World.WorldActor, 1f);
poisonTicks = weapon.ROF; poisonTicks = weapon.ReloadDelay;
} }
} }
} }

2
OpenRA.Mods.D2k/DamagedWithoutFoundation.cs
View File

@@ -66,7 +66,7 @@ namespace OpenRA.Mods.D2k
return; return;
weapon.Impact(self.CenterPosition, self.World.WorldActor, 1f); weapon.Impact(self.CenterPosition, self.World.WorldActor, 1f);
damageTicks = weapon.ROF; damageTicks = weapon.ReloadDelay;
} }
} }
} }

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

@@ -187,7 +187,9 @@ namespace OpenRA.Mods.RA
FireDelay = Weapon.BurstDelay; FireDelay = Weapon.BurstDelay;
else else
{ {
FireDelay = Weapon.ROF; var modifiers = self.TraitsImplementing<IReloadModifier>()
.Select(m => m.GetReloadModifier());
FireDelay = Util.ApplyPercentageModifiers(Weapon.ReloadDelay, modifiers);
Burst = Weapon.Burst; Burst = Weapon.Burst;
} }

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" } }, { 200, new[] { "firepower", "armor", "speed", "reload" } },
{ 400, new[] { "firepower", "armor", "speed" } }, { 400, new[] { "firepower", "armor", "speed", "reload" } },
{ 800, new[] { "firepower", "armor", "speed" } }, { 800, new[] { "firepower", "armor", "speed", "reload" } },
{ 1600, new[] { "firepower", "armor", "speed" } } { 1600, new[] { "firepower", "armor", "speed", "reload" } }
}; };
} }

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

@@ -19,7 +19,7 @@ namespace OpenRA.Mods.RA
public class GainsStatUpgradesInfo : ITraitInfo public class GainsStatUpgradesInfo : ITraitInfo
{ {
public readonly string FirepowerUpgrade = "firepower"; public readonly string FirepowerUpgrade = "firepower";
public readonly int[] FirepowerModifier = { 110, 115, 120, 150 }; public readonly int[] FirepowerModifier = { 110, 115, 120, 130 };
public readonly string ArmorUpgrade = "armor"; public readonly string ArmorUpgrade = "armor";
public readonly int[] ArmorModifier = { 110, 120, 130, 150 }; public readonly int[] ArmorModifier = { 110, 120, 130, 150 };
@@ -27,15 +27,19 @@ namespace OpenRA.Mods.RA
public readonly string SpeedUpgrade = "speed"; public readonly string SpeedUpgrade = "speed";
public readonly int[] SpeedModifier = { 110, 115, 120, 150 }; public readonly int[] SpeedModifier = { 110, 115, 120, 150 };
public readonly string ReloadUpgrade = "reload";
public readonly int[] ReloadModifier = { 95, 90, 85, 75 };
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 public class GainsStatUpgrades : IUpgradable, IFirepowerModifier, IDamageModifier, ISpeedModifier, IReloadModifier
{ {
readonly GainsStatUpgradesInfo info; readonly GainsStatUpgradesInfo info;
[Sync] int firepowerLevel = 0; [Sync] int firepowerLevel = 0;
[Sync] int speedLevel = 0; [Sync] int speedLevel = 0;
[Sync] int armorLevel = 0; [Sync] int armorLevel = 0;
[Sync] int reloadLevel = 0;
public GainsStatUpgrades(GainsStatUpgradesInfo info) public GainsStatUpgrades(GainsStatUpgradesInfo info)
{ {
@@ -46,7 +50,8 @@ namespace OpenRA.Mods.RA
{ {
return (type == info.FirepowerUpgrade && firepowerLevel < info.FirepowerModifier.Length) return (type == info.FirepowerUpgrade && firepowerLevel < info.FirepowerModifier.Length)
|| (type == info.ArmorUpgrade && armorLevel < info.ArmorModifier.Length) || (type == info.ArmorUpgrade && armorLevel < info.ArmorModifier.Length)
|| (type == info.SpeedUpgrade && speedLevel < info.SpeedModifier.Length); || (type == info.SpeedUpgrade && speedLevel < info.SpeedModifier.Length)
|| (type == info.ReloadUpgrade && reloadLevel < info.ReloadModifier.Length);
} }
public void UpgradeAvailable(Actor self, string type, bool available) public void UpgradeAvailable(Actor self, string type, bool available)
@@ -58,6 +63,8 @@ namespace OpenRA.Mods.RA
armorLevel = (armorLevel + mod).Clamp(0, info.ArmorModifier.Length); armorLevel = (armorLevel + mod).Clamp(0, info.ArmorModifier.Length);
else if (type == info.SpeedUpgrade) else if (type == info.SpeedUpgrade)
speedLevel = (speedLevel + mod).Clamp(0, info.SpeedModifier.Length); speedLevel = (speedLevel + mod).Clamp(0, info.SpeedModifier.Length);
else if (type == info.ReloadUpgrade)
reloadLevel = (reloadLevel + mod).Clamp(0, info.ReloadModifier.Length);
} }
public int GetDamageModifier(Actor attacker, DamageWarhead warhead) public int GetDamageModifier(Actor attacker, DamageWarhead warhead)
@@ -74,5 +81,10 @@ namespace OpenRA.Mods.RA
{ {
return speedLevel > 0 ? info.SpeedModifier[speedLevel - 1] : 100; return speedLevel > 0 ? info.SpeedModifier[speedLevel - 1] : 100;
} }
public int GetReloadModifier()
{
return reloadLevel > 0 ? info.ReloadModifier[reloadLevel - 1] : 100;
}
} }
} }