Merge pull request #4478 from pchote/aircraft-follow

Add Guard and AttackMove to RA and C&C aircraft.
2014-02-01 00:38:21 -08:00
parent 1d8e785d0d e58053cb69
commit e4effd0125
46 changed files with 243 additions and 157 deletions
--- a/mods/d2k/rules/defaults.yaml
+++ b/mods/d2k/rules/defaults.yaml
@@ -207,6 +207,7 @@
 	BodyOrientation:
 	UpdatesPlayerStatistics:
 	Huntable:
+	AttackMove:
 	LuaScriptEvents:

 ^Helicopter:
--- a/mods/d2k/rules/infantry.yaml
+++ b/mods/d2k/rules/infantry.yaml
@@ -52,7 +52,6 @@ ENGINEER:
 	Captures:
 		CaptureTypes: husk
 	-AutoTarget:
-	AttackMove:

 BAZOOKA:
 	Inherits: ^Infantry
@@ -110,5 +109,3 @@ MEDIC:
 	Passenger:
 		PipType: Blue
 	-AutoTarget:
-	AttackMove:
-
--- a/mods/d2k/rules/ordos.yaml
+++ b/mods/d2k/rules/ordos.yaml
@@ -297,5 +297,3 @@ SABOTEUR:
 	C4Demolition:
 		C4Delay: 45
 	-AutoTarget:
-	AttackMove:
-
--- a/mods/d2k/rules/vehicles.yaml
+++ b/mods/d2k/rules/vehicles.yaml
@@ -24,7 +24,6 @@
 		Range: 8
 	MustBeDestroyed:
 	BaseBuilding:
-	-AttackMove:
 	Explodes:
 		Weapon: UnitExplodeScale
 		EmptyWeapon: UnitExplodeScale
@@ -80,7 +79,6 @@ HARVESTER:
 	Explodes:
 		Weapon: UnitExplodeScale
 		EmptyWeapon: UnitExplodeScale
-	-AttackMove:
 	LeavesHusk:
 		HuskActor: Harvester.Husk
 	WithHarvestAnimation: