Merge pull request #4464 from pchote/attackmove

Add AttackMove to C&C helicopters
2014-01-16 12:12:27 -08:00
parent 8217a1c161 d2d29269d6
commit 151f7dc9c6
38 changed files with 35 additions and 83 deletions
--- a/mods/cnc/rules/civilian.yaml
+++ b/mods/cnc/rules/civilian.yaml
@@ -455,3 +455,4 @@ VICE:
 		QuantizedFacings: 8
 	PoisonedByTiberium:
 		Weapon: Heal
+
--- a/mods/cnc/rules/defaults.yaml
+++ b/mods/cnc/rules/defaults.yaml
@@ -115,6 +115,7 @@
 		Weapon: HeliExplode
 		EmptyWeapon: HeliExplode
 	CombatDebugOverlay:
+	AttackMove:
 	BodyOrientation:
 	UpdatesPlayerStatistics:
 	Huntable:
@@ -209,7 +210,6 @@
 	ScaredyCat:
 	RenderInfantryPanic:
 	AttackMove:
-		JustMove: yes
 	CrushableInfantry:

 ^DINO:
--- a/mods/cnc/rules/infantry.yaml
+++ b/mods/cnc/rules/infantry.yaml
@@ -172,7 +172,6 @@ E6:
 		CaptureTypes: building, husk
 	-AutoTarget:
 	AttackMove:
-		JustMove: true
 	RenderInfantryProne:
 		IdleAnimations: idle1,idle2
 		StandAnimations: stand, stand2
--- a/mods/cnc/rules/ships.yaml
+++ b/mods/cnc/rules/ships.yaml
@@ -67,6 +67,5 @@ LST:
 		MaxWeight: 5
 		PipCount: 5
 	AttackMove:
-		JustMove: true
 	RejectsOrders:

--- a/mods/cnc/rules/system-ai.yaml
+++ b/mods/cnc/rules/system-ai.yaml
@@ -187,3 +187,4 @@ Player:
 			htnk: 50%
 			orca: 10%
 		SquadSize: 8
+
--- a/mods/cnc/rules/system-player.yaml
+++ b/mods/cnc/rules/system-player.yaml
@@ -16,3 +16,4 @@ Player:
 	Shroud:
 	PlayerStatistics:
 	FrozenActorLayer:
+
--- a/mods/cnc/rules/system-world.yaml
+++ b/mods/cnc/rules/system-world.yaml
@@ -175,3 +175,4 @@ World:
 	DebugPauseState:
 	ConquestObjectivesPanel:
 		ObjectivesPanel: CONQUEST_OBJECTIVES
+
--- a/mods/cnc/rules/vehicles.yaml
+++ b/mods/cnc/rules/vehicles.yaml
@@ -28,7 +28,6 @@ MCV:
 	RenderUnit:
 	MustBeDestroyed:
 	AttackMove:
-		JustMove: true
 	BaseBuilding:
 	LeavesHusk:
 		HuskActor: MCV.Husk
@@ -69,7 +68,6 @@ HARV:
 	RevealsShroud:
 		Range: 4
 	AttackMove:
-		JustMove: true
 	LeavesHusk:
 		HuskActor: HARV.Husk
 	-GainsExperience:
@@ -559,7 +557,6 @@ MHQ:
 		Sequence: spinner
 		Offset: -256,0,256
 	AttackMove:
-		JustMove: yes
 	Explodes:
 		Weapon: UnitExplodeSmall
 		EmptyWeapon: UnitExplodeSmall
--- a/mods/cnc/weapons.yaml
+++ b/mods/cnc/weapons.yaml
@@ -1030,4 +1030,5 @@ Claw:
 Demolish:
 	Warhead:
 		ImpactSound: xplobig6.aud
-		Explosion: building
+		Explosion: building
+
--- a/mods/d2k/rules/defaults.yaml
+++ b/mods/d2k/rules/defaults.yaml
@@ -249,3 +249,4 @@
 	Huntable:
 	LuaScriptEvents:
 	Demolishable:
+
--- a/mods/d2k/rules/infantry.yaml
+++ b/mods/d2k/rules/infantry.yaml
@@ -50,7 +50,6 @@ ENGINEER:
 	ExternalCaptures:
 	-AutoTarget:
 	AttackMove:
-		JustMove: true

 BAZOOKA:
 	Inherits: ^Infantry
@@ -109,5 +108,4 @@ MEDIC:
 		PipType: Blue
 	-AutoTarget:
 	AttackMove:
-		JustMove: true

--- a/mods/d2k/rules/ordos.yaml
+++ b/mods/d2k/rules/ordos.yaml
@@ -294,5 +294,4 @@ SABOTEUR:
 		C4Delay: 45
 	-AutoTarget:
 	AttackMove:
-		JustMove: true

--- a/mods/d2k/rules/system-ai.yaml
+++ b/mods/d2k/rules/system-ai.yaml
@@ -303,3 +303,4 @@ Player:
 			combath: 100%
 			combato: 100%
 		SquadSize: 10
+
--- a/mods/d2k/rules/system-player.yaml
+++ b/mods/d2k/rules/system-player.yaml
@@ -51,3 +51,4 @@ Player:
 	FrozenActorLayer:
 	HarvesterAttackNotifier:
 	PlayerStatistics:
+
--- a/mods/d2k/rules/system-world.yaml
+++ b/mods/d2k/rules/system-world.yaml
@@ -126,3 +126,4 @@ World:
 	PathFinder:
 	ValidateOrder:
 	DebugPauseState:
+
--- a/mods/ra/maps/Fort-Lonestar/map.yaml
+++ b/mods/ra/maps/Fort-Lonestar/map.yaml
@@ -849,7 +849,6 @@ Rules:
 		Spy:
 		-AutoTarget:
 		AttackMove:
-			JustMove: true
 		-RenderInfantry:
 		RenderSpy:
 			IdleAnimations: idle1,idle2
--- a/mods/ra/maps/bomber-john/map.yaml
+++ b/mods/ra/maps/bomber-john/map.yaml
@@ -833,7 +833,6 @@ Rules:
 		RenderUnit:
 			Image: MNLY
 		AttackMove:
-			JustMove: true
 		MustBeDestroyed:
 		Transforms:
 			IntoActor: ftur
--- a/mods/ra/rules/infantry.yaml
+++ b/mods/ra/rules/infantry.yaml
@@ -175,7 +175,6 @@ E6:
 	TakeCover:
 	-AutoTarget:
 	AttackMove:
-		JustMove: true
 	-RenderInfantry:
 	RenderInfantryProne:
 		IdleAnimations: idle1,idle2
@@ -211,7 +210,6 @@ SPY:
 		Types: Cash, SupportPower, Exploration
 	-AutoTarget:
 	AttackMove:
-		JustMove: true
 	-RenderInfantry:
 	RenderSpy:
 		IdleAnimations: idle1,idle2
@@ -289,7 +287,6 @@ MEDI:
 	TakeCover:
 	-AutoTarget:
 	AttackMove:
-		JustMove: true
 	-RenderInfantry:
 	RenderInfantryProne:
 		IdleAnimations: idle1,idle2
@@ -326,7 +323,6 @@ MECH:
 	TakeCover:
 	-AutoTarget:
 	AttackMove:
-		JustMove: true
 	-RenderInfantry:
 	RenderInfantryProne:
 		IdleAnimations: idle1,idle2
@@ -348,7 +344,6 @@ EINSTEIN:
 		Range: 2
 	-AutoTarget:
 	AttackMove:
-		JustMove: true
 	ProximityCaptor:
 		Types: CivilianInfantry
 	-RenderInfantry:
@@ -372,7 +367,6 @@ DELPHI:
 		Range: 2
 	-AutoTarget:
 	AttackMove:
-		JustMove: true
 	ProximityCaptor:
 		Types: CivilianInfantry
 	-RenderInfantry:
@@ -414,7 +408,6 @@ THF:
 	TakeCover:
 	-AutoTarget:
 	AttackMove:
-		JustMove: true

 SHOK:
 	Inherits: ^Infantry
--- a/mods/ra/rules/ships.yaml
+++ b/mods/ra/rules/ships.yaml
@@ -226,7 +226,6 @@ LST:
 	IronCurtainable:
 	RepairableNear:
 	AttackMove:
-		JustMove: true

 PT:
 	Inherits: ^Ship
--- a/mods/ra/rules/system-actors.yaml
+++ b/mods/ra/rules/system-actors.yaml
@@ -173,3 +173,4 @@ waypoint:
 	Waypoint:
 	RenderEditorOnly:
 	BodyOrientation:
+
--- a/mods/ra/rules/system-ai.yaml
+++ b/mods/ra/rules/system-ai.yaml
@@ -477,3 +477,4 @@ Player:
 			arty: 15%
 			harv: 10%
 		SquadSize: 7
+
--- a/mods/ra/rules/system-player.yaml
+++ b/mods/ra/rules/system-player.yaml
@@ -56,3 +56,4 @@ Player:
 	FrozenActorLayer:
 	BaseAttackNotifier:
 	PlayerStatistics:
+
--- a/mods/ra/rules/system-world.yaml
+++ b/mods/ra/rules/system-world.yaml
@@ -164,3 +164,4 @@ World:
 	PathFinder:
 	ValidateOrder:
 	DebugPauseState:
+
--- a/mods/ra/rules/vehicles.yaml
+++ b/mods/ra/rules/vehicles.yaml
@@ -419,7 +419,6 @@ MNLY.AP:
 	LimitedAmmo:
 		Ammo: 5
 	AttackMove:
-		JustMove: true
 	DetectCloaked:
 		Range: 5
 	RenderDetectionCircle:
@@ -453,7 +452,6 @@ MNLY.AT:
 	LimitedAmmo:
 		Ammo: 3
 	AttackMove:
-		JustMove: true
 	DetectCloaked:
 		Range: 5
 	RenderDetectionCircle:
@@ -483,7 +481,6 @@ TRUK:
 	SupplyTruck:
 		Payload: 500
 	AttackMove:
-		JustMove: yes

 MGG:
 	Inherits: ^Vehicle
@@ -509,7 +506,6 @@ MGG:
 		Offset: -299,0,171
 		Sequence: spinner
 	AttackMove:
-		JustMove: yes
 	RevealsShroud:
 		Range: 6
 	CreatesShroud:
@@ -557,7 +553,6 @@ MRJ:
 		Sequence: spinner
 		Offset: -256,0,256
 	AttackMove:
-		JustMove: yes
 	Explodes:
 		Weapon: UnitExplodeSmall
 		EmptyWeapon: UnitExplodeSmall
@@ -719,7 +714,6 @@ DTRK:
 		Range: 3
 	RenderUnit:
 	AttackMove:
-		JustMove: yes
 	Explodes:
 		Weapon: MiniNuke
 		EmptyWeapon: MiniNuke
@@ -791,7 +785,6 @@ QTNK:
 		Bounds: 44,38,0,-4
 	RenderUnit:
 	AttackMove:
-		JustMove: True
 	Explodes:
 		Weapon: UnitExplodeSmall
 	MadTank:
--- a/mods/ts/rules/infantry.yaml
+++ b/mods/ts/rules/infantry.yaml
@@ -166,7 +166,6 @@ ENGINEER:
 		CaptureTypes: building
 	-AutoTarget:
 	AttackMove:
-		JustMove: true
 	-RenderInfantry:
 	RenderInfantryProne:
 		IdleAnimations: idle1,idle2
@@ -294,7 +293,6 @@ CHAMSPY:
 		Types: Cash, SupportPower, Exploration
 	-AutoTarget:
 	AttackMove:
-		JustMove: true
 	-RenderInfantry:
 	RenderSpy:
 		IdleAnimations: idle1,idle2
--- a/mods/ts/rules/system-actors.yaml
+++ b/mods/ts/rules/system-actors.yaml
@@ -7,3 +7,4 @@ waypoint:
 	Waypoint:
 	RenderEditorOnly:
 	BodyOrientation:
+
--- a/mods/ts/rules/system-ai.yaml
+++ b/mods/ts/rules/system-ai.yaml
@@ -1 +1,2 @@
 Player:
+
--- a/mods/ts/rules/system-player.yaml
+++ b/mods/ts/rules/system-player.yaml
@@ -40,3 +40,4 @@ Player:
 	Shroud:
 	BaseAttackNotifier:
 	PlayerStatistics:
+
--- a/mods/ts/rules/system-world.yaml
+++ b/mods/ts/rules/system-world.yaml
@@ -96,3 +96,4 @@ World:
 	ValidateOrder:
 	DebugPauseState:
 	ScreenShaker:
+
--- a/mods/ts/rules/vehicles.yaml
+++ b/mods/ts/rules/vehicles.yaml
@@ -94,7 +94,6 @@ HARV:
 	RevealsShroud:
 		Range: 4
 	AttackMove:
-		JustMove: yes
 	-GainsExperience:
 	RenderSprites:
 	RenderVoxels:
@@ -190,7 +189,6 @@ TRUCKB:
 	SupplyTruck:
 		Payload: 500
 	AttackMove:
-		JustMove: yes
 	RenderSprites:
 	RenderVoxels:
 	WithVoxelBody:
@@ -215,7 +213,6 @@ LPST:
 	RevealsShroud:
 		Range: 10
 	AttackMove:
-		JustMove: yes
 	RenderSprites:
 	RenderVoxels:
 	WithVoxelBody:
@@ -246,7 +243,6 @@ ICBM:
 	RevealsShroud:
 		Range: 7
 	AttackMove:
-		JustMove: yes
 	RenderSprites:
 	RenderVoxels:
 	WithVoxelBody:
@@ -280,7 +276,6 @@ REPAIR:
 	AttackMedic:
 		Cursor: repair
 	AttackMove:
-		JustMove: true
 	RenderSprites:
 	RenderVoxels:
 	WithVoxelBody:
@@ -305,7 +300,6 @@ ART2:
 	RevealsShroud:
 		Range: 9
 	AttackMove:
-		JustMove: yes
 	RenderSprites:
 	RenderVoxels:
 	WithVoxelBody:
@@ -337,7 +331,6 @@ WEED:
 	RevealsShroud:
 		Range: 4
 	AttackMove:
-		JustMove: yes
 	-GainsExperience:
 	RenderSprites:
 	RenderVoxels:
@@ -451,7 +444,6 @@ GGHUNT:
 		Range: 7
 	RenderUnit:
 	AttackMove:
-		JustMove: yes
 	DemoTruck:
 	Explodes:
 		Weapon: SuicideBomb