Merge pull request #4517 from Mailaender/reactivate-husks

Capturable husks for all mods

CHANGELOG

@@ -5,6 +5,7 @@ NEW:
 			Moved Create Game and Direct Connect facilities to the server browser.
 			Added skirmish mode to RA and D2k to complement TD's skirmish mode.
 			Added an Extras submenu for miscellaneous game extras.
+		Engineers can now regain control over husks.
 	Dune 2000:
 		Added the Atreides grenadier from the 1.06 patch.
 		Added randomized tiles for Sand and Rock terrain.

mods/cnc/rules/defaults.yaml

@@ -515,6 +515,10 @@
 	Burns:
 		Interval: 2
 	TargetableUnit:
+	Capturable:
+		Type: husk
+		AllowAllies: yes
+		CaptureThreshold: 1.0
 	TransformOnCapture:
 		ForceHealthPercentage: 25
 	BelowUnits:
@@ -530,6 +534,7 @@
 		Moves: False
 		Explosion: HeliCrash
 	-BelowUnits:
+	-Capturable:
 	-TransformOnCapture:
 	-TargetableUnit:
 

mods/cnc/rules/husks.yaml

@@ -5,6 +5,8 @@ MCV.Husk:
 		Icon: mcvicnh
 	RenderUnit:
 		Image: mcv
+	TransformOnCapture:
+		IntoActor: mcv
 
 HARV.Husk:
 	Inherits: ^Husk
@@ -13,6 +15,8 @@ HARV.Husk:
 		Icon: harvicnh
 	RenderUnit:
 		Image: harv
+	TransformOnCapture:
+		IntoActor: harv
 
 APC.Husk:
 	Inherits: ^Husk
@@ -21,6 +25,8 @@ APC.Husk:
 		Icon: apcicnh
 	RenderUnit:
 		Image: apc
+	TransformOnCapture:
+		IntoActor: apc
 
 FTNK.Husk:
 	Inherits: ^Husk
@@ -29,6 +35,8 @@ FTNK.Husk:
 		Icon: ftnkicnh
 	RenderUnit:
 		Image: ftnk
+	TransformOnCapture:
+		IntoActor: ftnk
 
 ARTY.Husk:
 	Inherits: ^Husk
@@ -37,6 +45,8 @@ ARTY.Husk:
 		Icon: artyicnh
 	RenderUnit:
 		Image: arty
+	TransformOnCapture:
+		IntoActor: arty
 
 BGGY.Husk:
 	Inherits: ^Husk
@@ -45,6 +55,8 @@ BGGY.Husk:
 		Icon: bggyicnh
 	RenderUnit:
 		Image: bggy
+	TransformOnCapture:
+		IntoActor: bggy
 
 BIKE.Husk:
 	Inherits: ^Husk
@@ -53,6 +65,8 @@ BIKE.Husk:
 		Icon: bikeicnh
 	RenderUnit:
 		Image: bike
+	TransformOnCapture:
+		IntoActor: bike
 
 JEEP.Husk:
 	Inherits: ^Husk
@@ -61,6 +75,8 @@ JEEP.Husk:
 		Icon: jeepicnh
 	RenderUnit:
 		Image: jeep
+	TransformOnCapture:
+		IntoActor: jeep
 
 LTNK.Husk:
 	Inherits: ^Husk
@@ -71,6 +87,8 @@ LTNK.Husk:
 		Image: ltnk
 	ThrowsParticle@turret:
 		Anim: turret
+	TransformOnCapture:
+		IntoActor: ltnk
 
 MTNK.Husk:
 	Inherits: ^Husk
@@ -81,6 +99,8 @@ MTNK.Husk:
 		Image: mtnk
 	ThrowsParticle@turret:
 		Anim: turret
+	TransformOnCapture:
+		IntoActor: mtnk
 
 HTNK.Husk:
 	Inherits: ^Husk
@@ -91,6 +111,8 @@ HTNK.Husk:
 		Image: htnk
 	ThrowsParticle@turret:
 		Anim: turret
+	TransformOnCapture:
+		IntoActor: htnk
 
 MSAM.Husk:
 	Inherits: ^Husk
@@ -101,6 +123,8 @@ MSAM.Husk:
 		Image: msam
 	ThrowsParticle@turret:
 		Anim: turret
+	TransformOnCapture:
+		IntoActor: msam
 
 MLRS.Husk:
 	Inherits: ^Husk
@@ -111,6 +135,8 @@ MLRS.Husk:
 		Image: mlrs
 	ThrowsParticle@turret:
 		Anim: turret
+	TransformOnCapture:
+		IntoActor: mlrs
 
 STNK.Husk:
 	Inherits: ^Husk
@@ -119,4 +145,5 @@ STNK.Husk:
 		Icon: stnkicnh
 	RenderUnit:
 		Image: stnk
-
+	TransformOnCapture:
+		IntoActor: stnk

mods/d2k/rules/atreides.yaml

@@ -146,6 +146,8 @@ COMBATA.Husk:
 	Inherits: ^COMBAT.Husk
 	RenderUnit:
 		Image: COMBATA
+	TransformOnCapture:
+		IntoActor: combata
 
 COMBATA.starport:
 	Inherits: COMBATA
@@ -195,6 +197,8 @@ SONICTANK.Husk:
 	Inherits: ^Husk
 	RenderUnit:
 		Image: SONICTANK
+	TransformOnCapture:
+		IntoActor: sonictank
 
 FREMEN:
 	Inherits: ^Infantry

mods/d2k/rules/defaults.yaml

@@ -92,9 +92,16 @@
 	ProximityCaptor:
 		Types: Husk
 	Tooltip:
-		Name: Destroyed Tank
+		Name: Wreck
 	BodyOrientation:
 	LuaScriptEvents:
+	TargetableUnit:
+	Capturable:
+		Type: husk
+		AllowAllies: yes
+		CaptureThreshold: 1.0
+	TransformOnCapture:
+		ForceHealthPercentage: 25
 
 ^TowerHusk:
 	Health:
@@ -119,6 +126,9 @@
 	Inherits: ^Husk
 	-Husk:
 	-Burns:
+	-Capturable:
+	-TransformOnCapture:
+	-TargetableUnit:
 	FallsToEarth:
 		Spins: False
 		Moves: True

mods/d2k/rules/harkonnen.yaml

@@ -150,6 +150,8 @@ COMBATH.Husk:
 	Inherits: ^COMBAT.Husk
 	RenderUnit:
 		Image: COMBATH
+	TransformOnCapture:
+		IntoActor: combath
 
 COMBATH.starport:
 	Inherits: COMBATH
@@ -202,6 +204,8 @@ DEVAST.Husk:
 		HP: 125
 	RenderUnit:
 		Image: DEVAST
+	TransformOnCapture:
+		IntoActor: devast
 
 SARDAUKAR:
 	Inherits: ^Infantry

mods/d2k/rules/infantry.yaml

@@ -48,6 +48,9 @@ ENGINEER:
 		PipType: Yellow
 	EngineerRepair:
 	ExternalCaptures:
+		Type: building
+	Captures:
+		CaptureTypes: husk
 	-AutoTarget:
 	AttackMove:
 

mods/d2k/rules/ordos.yaml

@@ -134,6 +134,8 @@ COMBATO.Husk:
 	Inherits: ^COMBAT.Husk
 	RenderUnit:
 		Image: COMBATO
+	TransformOnCapture:
+		IntoActor: combato
 
 COMBATO.starport:
 	Inherits: COMBATO
@@ -267,6 +269,8 @@ DEVIATORTANK.Husk:
 	Inherits: ^Husk
 	RenderUnit:
 		Image: DEVIATORTANK
+	TransformOnCapture:
+		IntoActor: deviatortank
 
 SABOTEUR:
 	Inherits: ^Infantry

mods/d2k/rules/vehicles.yaml

@@ -93,6 +93,8 @@ HARVESTER.Husk:
 		Name: Destroyed Spice Harvester
 	RenderUnit:
 		Image: HARVESTER
+	TransformOnCapture:
+		IntoActor: harvester
 
 HARVESTER.starport:
 	Inherits: HARVESTER
@@ -289,6 +291,8 @@ SIEGETANK.Husk:
 		Anim: turret
 	RenderUnit:
 		Image: SIEGETANK
+	TransformOnCapture:
+		IntoActor: siegetank
 
 SIEGETANK.starport:
 	Inherits: SIEGETANK
@@ -340,6 +344,8 @@ MISSILETANK.Husk:
 	Inherits: ^Husk
 	RenderUnit:
 		Image: MISSILETANK
+	TransformOnCapture:
+		IntoActor: missiletank
 
 MISSILETANK.starport:
 	Inherits: MISSILETANK

mods/ra/mod.yaml

@@ -40,6 +40,7 @@ Rules:
 	mods/ra/rules/system-world.yaml
 	mods/ra/rules/defaults.yaml
 	mods/ra/rules/vehicles.yaml
+	mods/ra/rules/husks.yaml
 	mods/ra/rules/structures.yaml
 	mods/ra/rules/infantry.yaml
 	mods/ra/rules/civilian.yaml

mods/ra/rules/aircraft.yaml

@@ -214,20 +214,6 @@ TRAN:
 	LeavesHusk:
 		HuskActor: TRAN.Husk
 
-TRAN.Husk1:
-	Inherits: ^Husk
-	Tooltip:
-		Name: Husk (Transport Helicopter)
-	RenderUnit:
-		Image: tran1husk
-
-TRAN.Husk2:
-	Inherits: ^Husk
-	Tooltip:
-		Name: Husk (Transport Helicopter)
-	RenderUnit:
-		Image: tran2husk
-
 HELI:
 	Inherits: ^Helicopter
 	Buildable:
@@ -349,135 +335,3 @@ U2:
 		Offset: -1c43,0,0
 		Interval: 2
 	RejectsOrders:
-
-BADR.Husk:
-	Inherits: ^PlaneHusk
-	Tooltip:
-		Name: Badger
-	RenderUnit:
-		Image: badr
-	WithShadow:
-	Plane:
-		ROT: 5
-		Speed: 149
-	SmokeTrailWhenDamaged@0:
-		Offset: -432,560,0
-		Interval: 2
-		MinDamage: Undamaged
-	SmokeTrailWhenDamaged@1:
-		Offset: -432,-560,0
-		Interval: 2
-		MinDamage: Undamaged
-
-MIG.Husk:
-	Inherits: ^PlaneHusk
-	Tooltip:
-		Name: Mig Attack Plane
-	RenderUnit:
-		CameraPitch: 99
-		Image: mig
-	WithShadow:
-	Contrail@1:
-		Offset: -598,-683,0
-	Contrail@2:
-		Offset: -598,683,0
-	Plane:
-		ROT: 5
-		Speed: 186
-	SmokeTrailWhenDamaged:
-		Offset: -853,0,171
-		Interval: 2
-		MinDamage: Undamaged
-	RevealsShroud:
-		Range: 12
-
-YAK.Husk:
-	Inherits: ^PlaneHusk
-	Tooltip:
-		Name: Yak Attack Plane
-	RenderUnit:
-		CameraPitch: 99
-		Image: yak
-	WithShadow:
-	Contrail:
-		Offset: -853,0,0
-	Plane:
-		ROT: 5
-		Speed: 149
-	SmokeTrailWhenDamaged:
-		Offset: -853,0,0
-		Interval: 2
-		MinDamage: Undamaged
-	RevealsShroud:
-		Range: 10
-
-TRAN.Husk:
-	Inherits: ^HelicopterHusk
-	Tooltip:
-		Name: Transport Helicopter
-	RenderUnit:
-		Image: tran
-	WithShadow:
-	Helicopter:
-		ROT: 4
-		Speed: 149
-	WithRotor@PRIMARY:
-		Offset: -597,0,341
-	WithRotor@SECONDARY:
-		Id: rotor_2
-		Offset: 597,0,213
-	RevealsShroud:
-		Range: 12
-
-HELI.Husk:
-	Inherits: ^HelicopterHusk
-	Tooltip:
-		Name: Longbow
-	RenderUnit:
-		Image: heli
-	WithShadow:
-	Helicopter:
-		ROT: 4
-		Speed: 149
-	WithRotor:
-		Offset: 0,0,85
-	SmokeTrailWhenDamaged:
-		Offset: -427,0,0
-		MinDamage: Undamaged
-	RevealsShroud:
-		Range: 12
-
-HIND.Husk:
-	Inherits: ^HelicopterHusk
-	Tooltip:
-		Name: Hind
-	RenderUnit:
-		Image: hind
-	WithShadow:
-	Helicopter:
-		ROT: 4
-		Speed: 112
-	WithRotor:
-	SmokeTrailWhenDamaged:
-		Offset: -427,0,0
-		MinDamage: Undamaged
-	RevealsShroud:
-		Range: 10
-
-U2.Husk:
-	Inherits: ^PlaneHusk
-	RenderUnit:
-		Image: u2
-	WithShadow:
-	Plane:
-		ROT: 7
-		Speed: 373
-	Contrail@1:
-		Offset: -725,683,0
-	Contrail@2:
-		Offset: -725,-683,0
-	SmokeTrailWhenDamaged:
-		Offset: -1c43,0,0
-		Interval: 2
-		MinDamage: Undamaged
-

mods/ra/rules/defaults.yaml

@@ -430,6 +430,13 @@
 	BodyOrientation:
 	Chronoshiftable:
 	LuaScriptEvents:
+	TargetableUnit:
+	Capturable:
+		Type: husk
+		AllowAllies: yes
+		CaptureThreshold: 1.0
+	TransformOnCapture:
+		ForceHealthPercentage: 25
 
 ^HelicopterHusk:
 	Inherits: ^Husk
@@ -439,6 +446,9 @@
 		Spins: True
 		Moves: False
 	-BelowUnits:
+	-TargetableUnit:
+	-Capturable:
+	-TransformOnCapture:
 
 ^PlaneHusk:
 	Inherits: ^Husk
@@ -448,6 +458,9 @@
 		Spins: False
 		Moves: True
 	-BelowUnits:
+	-TargetableUnit:
+	-Capturable:
+	-TransformOnCapture:
 
 ^Bridge:
 	Tooltip:

mods/ra/rules/husks.yaml

@@ -0,0 +1,234 @@
+1TNK.Husk:
+	Inherits: ^Husk
+	Tooltip:
+		Name: Husk (Light Tank)
+	RenderUnit:
+		Image: 1tnk
+	ThrowsParticle@turret:
+		Anim: turret
+	TransformOnCapture:
+		IntoActor: 1tnk
+
+2TNK.Husk:
+	Inherits: ^Husk
+	Tooltip:
+		Name: Husk (Medium Tank)
+	RenderUnit:
+		Image: 2tnk
+	ThrowsParticle@turret:
+		Anim: turret
+	TransformOnCapture:
+		IntoActor: 2tnk
+
+3TNK.Husk:
+	Inherits: ^Husk
+	Tooltip:
+		Name: Husk (Heavy Tank)
+	RenderUnit:
+		Image: 3tnk
+	ThrowsParticle@turret:
+		Anim: turret
+	TransformOnCapture:
+		IntoActor: 3tnk
+
+4TNK.Husk:
+	Inherits: ^Husk
+	Tooltip:
+		Name: Husk (Mammoth Tank)
+	RenderUnit:
+		Image: 4tnk
+	ThrowsParticle@turret:
+		Anim: turret
+	TransformOnCapture:
+		IntoActor: 4tnk
+
+HARV.FullHusk:
+	Inherits: ^Husk
+	Tooltip:
+		Name: Husk (Harvester)
+	RenderUnit:
+		Image: hhusk
+	TransformOnCapture:
+		IntoActor: harv
+
+HARV.EmptyHusk:
+	Inherits: ^Husk
+	Tooltip:
+		Name: Husk (Harvester)
+	RenderUnit:
+		Image: hhusk2
+	TransformOnCapture:
+		IntoActor: harv
+
+MCV.Husk:
+	Inherits: ^Husk
+	Tooltip:
+		Name: Husk (MCV)
+	RenderUnit:
+		Image: mcvhusk
+	TransformOnCapture:
+		IntoActor: mcv
+
+MGG.Husk:
+	Inherits: ^Husk
+	Tooltip:
+		Name: Husk (Mobile Gap Generator)
+	RenderUnit:
+		Image: mgg
+	ThrowsParticle@spinner:
+		Anim: spinner-idle
+		Offset: -299,0,171
+	TransformOnCapture:
+		IntoActor: mgg
+
+TRAN.Husk:
+	Inherits: ^HelicopterHusk
+	Tooltip:
+		Name: Transport Helicopter
+	RenderUnit:
+		Image: tran
+	WithShadow:
+	Helicopter:
+		ROT: 4
+		Speed: 149
+	WithRotor@PRIMARY:
+		Offset: -597,0,341
+	WithRotor@SECONDARY:
+		Id: rotor_2
+		Offset: 597,0,213
+	RevealsShroud:
+		Range: 12
+
+TRAN.Husk1:
+	Inherits: ^Husk
+	Tooltip:
+		Name: Husk (Transport Helicopter)
+	RenderUnit:
+		Image: tran1husk
+	-TargetableUnit:
+	-Capturable:
+	-TransformOnCapture:
+
+TRAN.Husk2:
+	Inherits: ^Husk
+	Tooltip:
+		Name: Husk (Transport Helicopter)
+	RenderUnit:
+		Image: tran2husk
+	-TargetableUnit:
+	-Capturable:
+	-TransformOnCapture:
+
+BADR.Husk:
+	Inherits: ^PlaneHusk
+	Tooltip:
+		Name: Badger
+	RenderUnit:
+		Image: badr
+	WithShadow:
+	Plane:
+		ROT: 5
+		Speed: 149
+	SmokeTrailWhenDamaged@0:
+		Offset: -432,560,0
+		Interval: 2
+		MinDamage: Undamaged
+	SmokeTrailWhenDamaged@1:
+		Offset: -432,-560,0
+		Interval: 2
+		MinDamage: Undamaged
+
+MIG.Husk:
+	Inherits: ^PlaneHusk
+	Tooltip:
+		Name: Mig Attack Plane
+	RenderUnit:
+		CameraPitch: 99
+		Image: mig
+	WithShadow:
+	Contrail@1:
+		Offset: -598,-683,0
+	Contrail@2:
+		Offset: -598,683,0
+	Plane:
+		ROT: 5
+		Speed: 186
+	SmokeTrailWhenDamaged:
+		Offset: -853,0,171
+		Interval: 2
+		MinDamage: Undamaged
+	RevealsShroud:
+		Range: 12
+
+YAK.Husk:
+	Inherits: ^PlaneHusk
+	Tooltip:
+		Name: Yak Attack Plane
+	RenderUnit:
+		CameraPitch: 99
+		Image: yak
+	WithShadow:
+	Contrail:
+		Offset: -853,0,0
+	Plane:
+		ROT: 5
+		Speed: 149
+	SmokeTrailWhenDamaged:
+		Offset: -853,0,0
+		Interval: 2
+		MinDamage: Undamaged
+	RevealsShroud:
+		Range: 10
+
+HELI.Husk:
+	Inherits: ^HelicopterHusk
+	Tooltip:
+		Name: Longbow
+	RenderUnit:
+		Image: heli
+	WithShadow:
+	Helicopter:
+		ROT: 4
+		Speed: 149
+	WithRotor:
+		Offset: 0,0,85
+	SmokeTrailWhenDamaged:
+		Offset: -427,0,0
+		MinDamage: Undamaged
+	RevealsShroud:
+		Range: 12
+
+HIND.Husk:
+	Inherits: ^HelicopterHusk
+	Tooltip:
+		Name: Hind
+	RenderUnit:
+		Image: hind
+	WithShadow:
+	Helicopter:
+		ROT: 4
+		Speed: 112
+	WithRotor:
+	SmokeTrailWhenDamaged:
+		Offset: -427,0,0
+		MinDamage: Undamaged
+	RevealsShroud:
+		Range: 10
+
+U2.Husk:
+	Inherits: ^PlaneHusk
+	RenderUnit:
+		Image: u2
+	WithShadow:
+	Plane:
+		ROT: 7
+		Speed: 373
+	Contrail@1:
+		Offset: -725,683,0
+	Contrail@2:
+		Offset: -725,-683,0
+	SmokeTrailWhenDamaged:
+		Offset: -1c43,0,0
+		Interval: 2
+		MinDamage: Undamaged
+

mods/ra/rules/infantry.yaml

@@ -172,6 +172,9 @@ E6:
 	EngineerRepair:
 	RepairsBridges:
 	ExternalCaptures:
+		Type: building
+	Captures:
+		CaptureTypes: husk
 	TakeCover:
 	-AutoTarget:
 	AttackMove:

mods/ra/rules/vehicles.yaml

@@ -517,16 +517,6 @@ MGG:
 	LeavesHusk:
 		HuskActor: MGG.Husk
 
-MGG.Husk:
-	Inherits: ^Husk
-	Tooltip:
-		Name: Husk (Mobile Gap Generator)
-	RenderUnit:
-		Image: mgg
-	ThrowsParticle@spinner:
-		Anim: spinner-idle
-		Offset: -299,0,171
-
 MRJ:
 	Inherits: ^Vehicle
 	Valued:
@@ -562,63 +552,6 @@ MRJ:
 		Range: 4
 	RenderJammerCircle:
 
-1TNK.Husk:
-	Inherits: ^Husk
-	Tooltip:
-		Name: Husk (Light Tank)
-	RenderUnit:
-		Image: 1tnk
-	ThrowsParticle@turret:
-		Anim: turret
-
-2TNK.Husk:
-	Inherits: ^Husk
-	Tooltip:
-		Name: Husk (Medium Tank)
-	RenderUnit:
-		Image: 2tnk
-	ThrowsParticle@turret:
-		Anim: turret
-
-3TNK.Husk:
-	Inherits: ^Husk
-	Tooltip:
-		Name: Husk (Heavy Tank)
-	RenderUnit:
-		Image: 3tnk
-	ThrowsParticle@turret:
-		Anim: turret
-
-4TNK.Husk:
-	Inherits: ^Husk
-	Tooltip:
-		Name: Husk (Mammoth Tank)
-	RenderUnit:
-		Image: 4tnk
-	ThrowsParticle@turret:
-		Anim: turret
-
-HARV.FullHusk:
-	Inherits: ^Husk
-	Tooltip:
-		Name: Husk (Harvester)
-	RenderUnit:
-		Image: hhusk
-
-HARV.EmptyHusk:
-	Inherits: ^Husk
-	Tooltip:
-		Name: Husk (Harvester)
-	RenderUnit:
-		Image: hhusk2
-
-MCV.Husk:
-	Inherits: ^Husk
-	Tooltip:
-		Name: Husk (MCV)
-	RenderUnit:
-		Image: mcvhusk
-
 TTNK:
 	Inherits: ^Tank
 	Buildable: