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

Convert weapon plumbing to use integer damage modifiers.

Browse Source
This commit is contained in:
Paul Chote
2014-08-17 17:33:50 +12:00
parent 8e8e02dae8
commit 57ba1b54b4
27 changed files with 75 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -65,7 +65,7 @@ namespace OpenRA.Mods.D2k
if (health.HP <= damageThreshold || --damageTicks > 0)
return;
weapon.Impact(self.CenterPosition, self.World.WorldActor, 1f);
weapon.Impact(self.CenterPosition, self.World.WorldActor, Enumerable.Empty<int>());
damageTicks = weapon.ReloadDelay;
}
}

6
OpenRA.Mods.D2k/ThrowsShrapnel.cs
View File

@@ -49,10 +49,8 @@ namespace OpenRA.Mods.D2k
Weapon = wep,
Facing = self.World.SharedRandom.Next(-1, 255),
// TODO: Convert to ints
FirepowerModifier = self.TraitsImplementing<IFirepowerModifier>()
.Select(a => a.GetFirepowerModifier() / 100f)
.Product(),
DamageModifiers = self.TraitsImplementing<IFirepowerModifier>()
.Select(a => a.GetFirepowerModifier()),
Source = self.CenterPosition,
SourceActor = self,