Merge pull request #2848 from Mailaender/int-damage-modifier

Witch hunting against desyncs...
This commit is contained in:
Matthias Mailänder
2013-03-26 14:30:27 -07:00
2 changed files with 2 additions and 2 deletions

View File

@@ -75,7 +75,7 @@ namespace OpenRA.Traits
var oldState = this.DamageState;
/* apply the damage modifiers, if we have any. */
var modifier = (float)self.TraitsImplementing<IDamageModifier>()
var modifier = self.TraitsImplementing<IDamageModifier>()
.Concat(self.Owner.PlayerActor.TraitsImplementing<IDamageModifier>())
.Select(t => t.GetDamageModifier(attacker, warhead)).Product();

View File

@@ -31,7 +31,7 @@ namespace OpenRA.Mods.RA.Activities
var capturesInfo = self.Info.Traits.Get<CapturesInfo>();
var health = target.Trait<Health>();
int damage = (int)(0.25 * health.MaxHP);
int damage = health.MaxHP / 4;
// Need to be next to building, TODO: stop capture when going away
var mobile = self.Trait<Mobile>();