Adapt official mods to ActionsOnIdle

Ran update rules on them first and then cleaned up.
OpenRA · Dec 2, 2018 · c420e8d · c420e8d
1 parent 1f95538
commit c420e8d
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 17 deletions.
diff --git a/mods/cnc/rules/aircraft.yaml b/mods/cnc/rules/aircraft.yaml
@@ -10,11 +10,11 @@ TRAN:
 		Queue: Aircraft.GDI, Aircraft.Nod
 		Description: Fast Infantry Transport Helicopter.\n  Unarmed
 	Aircraft:
-		LandWhenIdle: true
 		TurnSpeed: 5
 		Speed: 150
 		LandableTerrainTypes: Clear,Rough,Road,Ore,Beach,Tiberium,BlueTiberium
 		AltitudeVelocity: 0c100
+		ActionsOnIdle: Land, Hover
 	Health:
 		HP: 9000
 	Armor:

diff --git a/mods/cnc/rules/defaults.yaml b/mods/cnc/rules/defaults.yaml
@@ -310,13 +310,13 @@
 	Repairable:
 		RepairBuildings: hpad
 	Aircraft:
-		LandWhenIdle: false
 		AirborneCondition: airborne
 		CruisingCondition: cruising
 		CanHover: True
 		TakeOffOnResupply: true
 		VTOL: true
 		InitialFacing: 224
+		ActionsOnIdle: Hover
 	HiddenUnderFog:
 		Type: GroundPosition
 	ActorLostNotification:
@@ -640,10 +640,10 @@
 		Offset: 43, 128, 0
 		ZOffset: -129
 	WithFacingSpriteBody:
-	FlyAwayOnIdle:
 	RejectsOrders:
 	Aircraft:
 		CruiseAltitude: 2560
+		ActionsOnIdle: LeaveMap
 	MapEditorData:
 		Categories: Aircraft
 

diff --git a/mods/d2k/rules/aircraft.yaml b/mods/d2k/rules/aircraft.yaml
@@ -16,11 +16,11 @@ carryall.reinforce:
 		TurnSpeed: 4
 		LandableTerrainTypes: Sand, Rock, Transition, Spice, SpiceSand, Dune, Concrete
 		Repulsable: False
-		LandWhenIdle: False
 		AirborneCondition: airborne
 		CanHover: True
 		VTOL: true
 		IdleTurnSpeed: 1
+		ActionsOnIdle: Hover
 	Targetable@GROUND:
 		TargetTypes: Ground, Vehicle
 		RequiresCondition: !airborne
@@ -57,6 +57,7 @@ carryall:
 		LocalOffset: 0, 0, -128
 	Aircraft:
 		MinAirborneAltitude: 400
+		ActionsOnIdle: Circle
 	RevealsShroud@lifting_low:
 		Range: 2c512
 		Type: GroundPosition
@@ -82,11 +83,11 @@ frigate:
 		Repulsable: False
 		MaximumPitch: 20
 		CruiseAltitude: 2048
+		ActionsOnIdle: LeaveMap
 	-AppearsOnRadar:
 	Cargo:
 		MaxWeight: 20
 		PipCount: 10
-	FlyAwayOnIdle:
 	RejectsOrders:
 
 ornithopter:

diff --git a/mods/ra/rules/aircraft.yaml b/mods/ra/rules/aircraft.yaml
@@ -115,13 +115,13 @@ MIG:
 		Speed: 223
 		RepulsionSpeed: 40
 		MaximumPitch: 56
+		ActionsOnIdle: ReturnToBase
 	AutoTarget:
 		InitialStance: HoldFire
 		InitialStanceAI: HoldFire
 	AmmoPool:
 		Ammo: 8
 		AmmoCondition: ammo
-	ReturnOnIdle:
 	Selectable:
 		Bounds: 36,28,0,2
 		DecorationBounds: 40,29,0,1
@@ -182,6 +182,7 @@ YAK:
 		Speed: 178
 		RepulsionSpeed: 40
 		MaximumPitch: 56
+		ActionsOnIdle: ReturnToBase
 	AutoTarget:
 		InitialStance: HoldFire
 		InitialStanceAI: HoldFire
@@ -190,7 +191,6 @@ YAK:
 		PipCount: 6
 		ReloadDelay: 11
 		AmmoCondition: ammo
-	ReturnOnIdle:
 	SelectionDecorations:
 	WithMuzzleOverlay:
 	Contrail:
@@ -293,9 +293,9 @@ HELI:
 	AttackAircraft:
 		FacingTolerance: 20
 	Aircraft:
-		LandWhenIdle: false
 		TurnSpeed: 4
 		Speed: 149
+		ActionsOnIdle: Hover
 	AutoTarget:
 		InitialStance: HoldFire
 		InitialStanceAI: HoldFire
@@ -358,9 +358,9 @@ HIND:
 	AttackAircraft:
 		FacingTolerance: 20
 	Aircraft:
-		LandWhenIdle: false
 		TurnSpeed: 4
 		Speed: 112
+		ActionsOnIdle: Hover
 	AutoTarget:
 		InitialStance: HoldFire
 		InitialStanceAI: HoldFire

diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml
@@ -610,6 +610,7 @@
 		TakeOffOnResupply: true
 		VTOL: true
 		InitialFacing: 224
+		ActionsOnIdle: Land, Hover
 	GpsDot:
 		String: Helicopter
 	Hovers@CRUISING:

diff --git a/mods/ts/rules/aircraft.yaml b/mods/ts/rules/aircraft.yaml
@@ -6,7 +6,6 @@ DPOD:
 	Tooltip:
 		Name: Drop Pod
 	Aircraft:
-		LandWhenIdle: true
 		TurnSpeed: 5
 		Speed: 149
 		InitialFacing: 0
@@ -39,7 +38,6 @@ DSHP:
 	Tooltip:
 		Name: Dropship
 	Aircraft:
-		LandWhenIdle: true
 		TurnSpeed: 5
 		Speed: 168
 		InitialFacing: 0
@@ -85,6 +83,7 @@ ORCA:
 		MoveIntoShroud: false
 		TakeoffSounds: orcaup1.aud
 		LandingSounds: orcadwn1.aud
+		ActionsOnIdle: Hover
 	Health:
 		HP: 20000
 	Armor:
@@ -136,7 +135,7 @@ ORCAB:
 		MoveIntoShroud: false
 		TakeoffSounds: orcaup1.aud
 		LandingSounds: orcadwn1.aud
-	ReturnOnIdle:
+		ActionsOnIdle: ReturnToBase
 	Health:
 		HP: 26000
 	Armor:
@@ -179,7 +178,6 @@ ORCATRAN:
 		Prerequisites: ~disabled
 	RenderSprites:
 	Aircraft:
-		LandWhenIdle: true
 		TurnSpeed: 5
 		Speed: 84
 		InitialFacing: 0
@@ -215,7 +213,6 @@ TRNSPORT:
 		Prerequisites: ~gahpad, gadept
 		Description: VTOL aircraft capable of lifting\nand transporting vehicles.\n  Unarmed
 	Aircraft:
-		LandWhenIdle: true
 		TurnSpeed: 5
 		Speed: 149
 		InitialFacing: 0
@@ -267,7 +264,7 @@ SCRIN:
 		MoveIntoShroud: false
 		TakeoffSounds: dropup1.aud
 		LandingSounds: dropdwn1.aud
-	ReturnOnIdle:
+		ActionsOnIdle: ReturnToBase
 	Health:
 		HP: 28000
 	Armor:
@@ -316,6 +313,7 @@ APACHE:
 		TurnSpeed: 5
 		Speed: 130
 		MoveIntoShroud: false
+		ActionsOnIdle: Hover
 	Health:
 		HP: 22500
 	Armor:

diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml
@@ -844,9 +844,9 @@
 		Voice: Move
 	Aircraft:
 		AirborneCondition: airborne
-		LandWhenIdle: false
 		Voice: Move
 		IdealSeparation: 853
+		ActionsOnIdle: Hover, Circle
 	Voiced:
 		VoiceSet: Heli
 	HiddenUnderFog:
@@ -879,6 +879,7 @@
 		CruisingCondition: cruising
 		TakeOffOnResupply: true
 		VTOL: true
+		ActionsOnIdle: Land, Hover
 	Hovers@CRUISING:
 		RequiresCondition: cruising
 

diff --git a/mods/ts/rules/gdi-infantry.yaml b/mods/ts/rules/gdi-infantry.yaml
@@ -158,7 +158,6 @@ JUMPJET.Husk:
 	RenderSprites:
 	BodyOrientation:
 		QuantizedFacings: 1
-	Aircraft:
 	HiddenUnderFog:
 		Type: GroundPosition
 	ScriptTriggers: