Merge pull request #6606 from reaperrr/mine-investigation

Fixes mines doing no damage to crusher
This commit is contained in:
Paul Chote
2014-09-29 21:08:03 +13:00
4 changed files with 11 additions and 1 deletions

View File

@@ -50,7 +50,7 @@ namespace OpenRA.Mods.RA
var weapon = e.Attacker.World.Map.Rules.Weapons[weaponName.ToLowerInvariant()];
if (weapon.Report != null && weapon.Report.Any())
Sound.Play(weapon.Report.Random(e.Attacker.World.SharedRandom), self.CenterPosition);
// Use .FromPos since this actor is killed. Cannot use Target.FromActor
weapon.Impact(Target.FromPos(self.CenterPosition), e.Attacker, Enumerable.Empty<int>());
}

View File

@@ -900,6 +900,7 @@ Napalm.Crate:
Wood: 100
Light: 60
Heavy: 25
AffectsParent: true
Warhead@2Smu: LeaveSmudge
SmudgeType: Scorch
Warhead@3Eff: CreateEffect

View File

@@ -571,6 +571,7 @@ CrateNuke:
Light: 25
Heavy: 25
Concrete: 50
AffectsParent: true
Warhead@2Eff: CreateEffect
Explosion: nuke
ImpactSound: EXPLLG2.WAV
@@ -586,6 +587,7 @@ CrateExplosion:
Wood: 75
Light: 60
Heavy: 25
AffectsParent: true
Warhead@2Eff: CreateEffect
Explosion: building
ImpactSound: EXPLSML4.WAV

View File

@@ -750,6 +750,7 @@ CrateNapalm:
Light: 60
Heavy: 25
Concrete: 50
AffectsParent: true
Warhead@2Smu: LeaveSmudge
SmudgeType: Scorch
Warhead@3Eff: CreateEffect
@@ -767,6 +768,7 @@ CrateExplosion:
Wood: 75
Light: 60
Heavy: 25
AffectsParent: true
Warhead@2Eff: CreateEffect
Explosion: self_destruct
ImpactSound: kaboom15.aud
@@ -782,6 +784,7 @@ CrateNuke:
Light: 60
Heavy: 25
Concrete: 50
AffectsParent: true
Warhead@2Res_impact: DestroyResource
Warhead@3Eff_impact: CreateEffect
Explosion: nuke
@@ -796,6 +799,7 @@ CrateNuke:
Light: 60
Heavy: 25
Concrete: 50
AffectsParent: true
Warhead@5Dam_areanuke: SpreadDamage
Damage: 250
DeathType: 5
@@ -805,6 +809,7 @@ CrateNuke:
Light: 60
Heavy: 25
Concrete: 50
AffectsParent: true
Warhead@6Res_areanuke: DestroyResource
Size: 5,4
Delay: 4
@@ -1475,6 +1480,7 @@ ATMine:
Warhead@1Dam: SpreadDamage
Spread: 256
Damage: 400
AffectsParent: true
Warhead@2Eff: CreateEffect
Explosion: large_explosion
ImpactSound: mineblo1.aud
@@ -1483,6 +1489,7 @@ APMine:
Warhead@1Dam: SpreadDamage
Spread: 256
Damage: 400
AffectsParent: true
DeathType: 3
Warhead@2Eff: CreateEffect
Explosion: napalm