diff --git a/OpenRA.Mods.RA/Mine.cs b/OpenRA.Mods.RA/Mine.cs index 33e406679d..1a945f8f49 100644 --- a/OpenRA.Mods.RA/Mine.cs +++ b/OpenRA.Mods.RA/Mine.cs @@ -28,9 +28,8 @@ namespace OpenRA.Mods.RA { class MineInfo : ITraitInfo { - public readonly int Damage = 0; public readonly UnitMovementType[] TriggeredBy = { }; - public readonly string Warhead = "ATMine"; + public readonly string Weapon = "ATMine"; public readonly bool AvoidFriendly = true; public object Create(Actor self) { return new Mine(self); } @@ -51,7 +50,7 @@ namespace OpenRA.Mods.RA return; var info = self.Info.Traits.Get(); - Combat.DoExplosion(self, info.Warhead, self.CenterLocation.ToInt2(), 0); + Combat.DoExplosion(self, info.Weapon, crusher.CenterLocation.ToInt2(), 0); self.QueueActivity(new RemoveSelf()); } diff --git a/mods/ra/rules.yaml b/mods/ra/rules.yaml index 00652c3171..bd37a9afcd 100755 --- a/mods/ra/rules.yaml +++ b/mods/ra/rules.yaml @@ -345,8 +345,7 @@ MRJ: MINP: Mine: - Damage: 1000 - Warhead: APMine + Weapon: APMine TriggeredBy: Foot, Wheel, Track AvoidFriendly: yes Unit: @@ -358,8 +357,7 @@ MINP: MINV: Mine: - Damage: 1200 - Warhead: ATMine + Weapon: ATMine TriggeredBy: Wheel, Track AvoidFriendly: yes Unit: diff --git a/mods/ra/weapons.yaml b/mods/ra/weapons.yaml index b6bef2dd79..9f34669826 100644 --- a/mods/ra/weapons.yaml +++ b/mods/ra/weapons.yaml @@ -657,12 +657,14 @@ Crush: ATMine: Warhead: + Damage: 1000 Verses: 0%,0%,100%,100%,0% ImpactSound: mineblo1 Explosion: 5 APMine: Warhead: + Damage: 1200 Verses: 100%,0%,0%,0%,0% ImpactSound: mine1 InfDeath: 2