From da2e9682c55077652352b85a3d26734cbae8d7cb Mon Sep 17 00:00:00 2001
From: Paul Chote <paul@chote.net>
Date: Sat, 2 Nov 2013 12:48:33 +1300
Subject: [PATCH 1/2] Prevent dogs from attacking non-infantry. Fixes #4039.

---
 mods/ra/rules/defaults.yaml | 2 +-
 mods/ra/weapons.yaml        | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml
index 5743e46b79..45b76c2bc8 100644
--- a/mods/ra/rules/defaults.yaml
+++ b/mods/ra/rules/defaults.yaml
@@ -110,7 +110,7 @@
 	Selectable:
 		Voice: GenericVoice
 	TargetableUnit:
-		TargetTypes: Ground, Disguise
+		TargetTypes: Ground, Infantry, Disguise
 	RenderInfantry:
 	AutoTarget:
 	AttackMove:
diff --git a/mods/ra/weapons.yaml b/mods/ra/weapons.yaml
index e6ef429de8..75d6e0e07a 100644
--- a/mods/ra/weapons.yaml
+++ b/mods/ra/weapons.yaml
@@ -920,6 +920,7 @@ ParaBomb:
 		WaterImpactSound: splash9.aud
 
 DogJaw:
+	ValidTargets: Infantry
 	ROF: 10
 	Range: 3
 	Report: DOGG5P.AUD

From e30d8cb81734d3a05b5ea8f8c38161f84363b339 Mon Sep 17 00:00:00 2001
From: Paul Chote <paul@chote.net>
Date: Sat, 2 Nov 2013 12:49:26 +1300
Subject: [PATCH 2/2] Remove redundant CanAttackGround flag.

---
 OpenRA.Mods.RA/Attack/AttackBase.cs | 4 +---
 mods/ra/rules/infantry.yaml         | 1 -
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/OpenRA.Mods.RA/Attack/AttackBase.cs b/OpenRA.Mods.RA/Attack/AttackBase.cs
index 45e2a8e248..2c18b1c542 100644
--- a/OpenRA.Mods.RA/Attack/AttackBase.cs
+++ b/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;
 			}
diff --git a/mods/ra/rules/infantry.yaml b/mods/ra/rules/infantry.yaml
index f0dd80ca5e..380bae9cc9 100644
--- a/mods/ra/rules/infantry.yaml
+++ b/mods/ra/rules/infantry.yaml
@@ -23,7 +23,6 @@ DOG:
 	Armament:
 		Weapon: DogJaw
 	AttackLeap:
-		CanAttackGround: no
 	RenderInfantry:
 		IdleAnimations: idle1,idle2
 	IgnoresDisguise: