Merge pull request #3243 from ScottNZ/balance

RA Balance (destructible mines; badr and mamooth and cruiser buff)

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<MineImmune>() || self.Owner.Stances[crusher.Owner] == Stance.Ally)
+			if (crusher.HasTrait<MineImmune>() || (self.Owner.Stances[crusher.Owner] == Stance.Ally && info.AvoidFriendly))
 				return;
 
 			var mobile = crusher.TraitOrDefault<Mobile>();
 			if (mobile != null && !info.DetonateClasses.Intersect(mobile.Info.Crushes).Any())
 				return;
 
-			Combat.DoExplosion(self, info.Weapon, crusher.CenterLocation, 0);
+			self.Kill(crusher);
-			self.QueueActivity(new RemoveSelf());
 		}
 
 		public bool CrushableBy(string[] crushClasses, Player owner)

mods/ra/rules/aircraft.yaml

@@ -3,7 +3,7 @@ BADR:
 		LZRange: 4
 	Inherits: ^Plane
 	Health:
-		HP: 60
+		HP: 300
 	Armor:
 		Type: Light
 	Plane:
@@ -42,7 +42,7 @@ BADR.bomber:
 		Weapon: ParaBomb
 	Inherits: ^Plane
 	Health:
-		HP: 60
+		HP: 300
 	Armor:
 		Type: Light
 	Plane:

mods/ra/rules/ships.yaml

@@ -164,8 +164,8 @@ CA:
 	Armor:
 		Type: Heavy
 	Mobile:
-		ROT: 2
+		ROT: 3
-		Speed: 2
+		Speed: 3
 	RevealsShroud:
 		Range: 7
 	Turreted@PRIMARY:

mods/ra/rules/system.yaml

@@ -651,12 +651,15 @@ World:
 
 MINP:
 	Mine:
-		Weapon: APMine
 		CrushClasses: apmine,atmine
-		DetonateClasses: apmine
+		DetonateClasses: apmine,atmine
-		AvoidFriendly: yes
+		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:

mods/ra/weapons.yaml

@@ -462,7 +462,7 @@ Grenade:
 		WaterExplosion: small_splash
 		InfDeath: 4
 		SmudgeType: Crater
-		Damage: 50
+		Damage: 60
 
 TurretGun:
 	ROF: 30
@@ -491,7 +491,7 @@ MammothTusk:
 	Burst: 2
 	ValidTargets: Ground, Air
 	Projectile: Missile
-		Speed: 30
+		Speed: 40
 		Arm: 2
 		High: true
 		Shadow: false
@@ -500,7 +500,7 @@ MammothTusk:
 		ContrailLength: 10
 		Inaccuracy: 3
 		Image: DRAGON
-		ROT: 10
+		ROT: 15
 		RangeLimit: 40
 	Warhead:
 		Spread: 6
@@ -721,11 +721,11 @@ RedEye:
 		Speed: 12
 		High: true
 		Angle: .1
-		Inaccuracy: 80
+		Inaccuracy: 70
 		Image: 120MM
 		ContrailLength: 30
 	Warhead:
-		Spread: 3
+		Spread: 5
 		Versus: 
 			None: 60%
 			Wood: 75%
@@ -756,7 +756,7 @@ SubMissile:
 	Warhead:
 		Spread: 10
 		Versus: 
-			None: 40%,
+			None: 40%
 			Light: 30%
 			Heavy: 30%
 		Explosion: large_explosion
@@ -1161,11 +1161,11 @@ ATMine:
 
 APMine:
 	Warhead:
-		Damage: 700
+		Damage: 500
 		Versus: 
 			Wood: 0%
-			Light: 0%
+			Light: 10%
-			Heavy: 0%
+			Heavy: 10%
 			Concrete: 0%
 		ImpactSound: mine1
 		InfDeath: 3