diff --git a/OpenRA.Mods.RA/Mine.cs b/OpenRA.Mods.RA/Mine.cs index ab91a66ece..8d57909240 100644 --- a/OpenRA.Mods.RA/Mine.cs +++ b/OpenRA.Mods.RA/Mine.cs @@ -20,7 +20,6 @@ namespace OpenRA.Mods.RA class MineInfo : ITraitInfo { public readonly string[] CrushClasses = { }; - [WeaponReference] public readonly string Weapon = "ATMine"; public readonly bool AvoidFriendly = true; public readonly string[] DetonateClasses = { }; @@ -44,15 +43,14 @@ namespace OpenRA.Mods.RA public void OnCrush(Actor crusher) { - if (crusher.HasTrait() || self.Owner.Stances[crusher.Owner] == Stance.Ally) + if (crusher.HasTrait() || (self.Owner.Stances[crusher.Owner] == Stance.Ally && info.AvoidFriendly)) return; var mobile = crusher.TraitOrDefault(); if (mobile != null && !info.DetonateClasses.Intersect(mobile.Info.Crushes).Any()) return; - Combat.DoExplosion(self, info.Weapon, crusher.CenterLocation, 0); - self.QueueActivity(new RemoveSelf()); + self.Kill(crusher); } public bool CrushableBy(string[] crushClasses, Player owner) diff --git a/mods/ra/rules/system.yaml b/mods/ra/rules/system.yaml index 811112857c..57566ce5dc 100644 --- a/mods/ra/rules/system.yaml +++ b/mods/ra/rules/system.yaml @@ -651,12 +651,15 @@ World: MINP: Mine: - Weapon: APMine CrushClasses: apmine,atmine - DetonateClasses: apmine - AvoidFriendly: yes + DetonateClasses: apmine,atmine + AvoidFriendly: no + Explodes: + Weapon: APMine Health: - HP: 1 + HP: 50 + Armor: + Type: Light RenderSimple: BelowUnits: Cloak: @@ -667,16 +670,21 @@ MINP: Name: Anti-Personnel Mine Icon: jmin ProximityCaptor: - Types:Mine + Types: Mine + TargetableUnit: + TargetTypes: Ground MINV: Mine: - Weapon: ATMine CrushClasses: atmine,apmine DetonateClasses: atmine - AvoidFriendly: yes + AvoidFriendly: no + Explodes: + Weapon: ATMine Health: - HP: 1 + HP: 50 + Armor: + Type: Light RenderSimple: BelowUnits: Cloak: @@ -687,7 +695,9 @@ MINV: Name: Anti-Tank Mine Icon: jmin ProximityCaptor: - Types:Mine + Types: Mine + TargetableUnit: + TargetTypes: Ground CRATE: Tooltip: diff --git a/mods/ra/weapons.yaml b/mods/ra/weapons.yaml index 912222d05c..1058e4b757 100644 --- a/mods/ra/weapons.yaml +++ b/mods/ra/weapons.yaml @@ -1161,11 +1161,11 @@ ATMine: APMine: Warhead: - Damage: 700 + Damage: 500 Versus: Wood: 0% - Light: 0% - Heavy: 0% + Light: 10% + Heavy: 10% Concrete: 0% ImpactSound: mine1 InfDeath: 3