Merge pull request #4042 from pchote/dog-fix

A simple fix for dogs vs barrels.

OpenRA.Mods.RA/Attack/AttackBase.cs

@@ -19,7 +19,6 @@ namespace OpenRA.Mods.RA
 {
 	public abstract class AttackBaseInfo : ITraitInfo
 	{
-		public readonly bool CanAttackGround = true;
 		public readonly string Cursor = "attack";
 
 		public abstract object Create(ActorInitializer init);
@@ -220,8 +219,7 @@ namespace OpenRA.Mods.RA
 					return false;
 
 				if (modifiers.HasModifier(TargetModifiers.ForceAttack))
-					if (self.Info.Traits.Get<AttackBaseInfo>().CanAttackGround)
-						return true;
+					return true;
 
 				return false;
 			}

mods/ra/rules/defaults.yaml

@@ -110,7 +110,7 @@
 	Selectable:
 		Voice: GenericVoice
 	TargetableUnit:
-		TargetTypes: Ground, Disguise
+		TargetTypes: Ground, Infantry, Disguise
 	RenderInfantry:
 	AutoTarget:
 	AttackMove:

mods/ra/rules/infantry.yaml

@@ -23,7 +23,6 @@ DOG:
 	Armament:
 		Weapon: DogJaw
 	AttackLeap:
-		CanAttackGround: no
 	RenderInfantry:
 		IdleAnimations: idle1,idle2
 	IgnoresDisguise:

mods/ra/weapons.yaml

@@ -920,6 +920,7 @@ ParaBomb:
 		WaterImpactSound: splash9.aud
 
 DogJaw:
+	ValidTargets: Infantry
 	ROF: 10
 	Range: 3
 	Report: DOGG5P.AUD