Merge pull request #11501 from pchote/tibsun-carryall

Add Carryall/Carryable traits, merging ts and d2k carryall behavior

mods/d2k/rules/aircraft.yaml

@@ -16,7 +16,6 @@ carryall.reinforce:
 		TurnSpeed: 4
 		LandableTerrainTypes: Sand, Rock, Transition, Spice, SpiceSand, Dune
 		Repulsable: False
-		LandAltitude: 100
 		LandWhenIdle: False
 		AirborneUpgrades: airborne
 		CanHover: True
@@ -31,7 +30,9 @@ carryall.reinforce:
 	SpawnActorOnDeath:
 		Actor: carryall.husk
 	Carryall:
-		Automatic: False
+		LoadingDelay: 10
+		UnloadingDelay: 15
+		LocalOffset: 0, 0, -128
 	RenderSprites:
 		Image: carryall
 	SelfHealing:
@@ -44,8 +45,11 @@ carryall.reinforce:
 
 carryall:
 	Inherits: carryall.reinforce
-	Carryall:
-		Automatic: True
+	-Carryall:
+	AutoCarryall:
+		LoadingDelay: 10
+		UnloadingDelay: 15
+		LocalOffset: 0, 0, -128
 	Buildable:
 		Queue: Aircraft
 		BuildPaletteOrder: 120

mods/d2k/rules/defaults.yaml

@@ -96,7 +96,7 @@
 	MustBeDestroyed:
 	Voiced:
 		VoiceSet: VehicleVoice
-	Carryable:
+	AutoCarryable:
 		CarryableUpgrades: notmobile
 	WithDecorationCarryable:
 		Image: pips

mods/ts/rules/aircraft.yaml

@@ -209,6 +209,9 @@ TRNSPORT:
 		LandingSound: dropdwn1.aud
 		AltitudeVelocity: 64
 		MoveIntoShroud: false
+	Carryall:
+		Voice: Move
+		LocalOffset: 0, 0, -224
 	Health:
 		HP: 175
 	Armor:

mods/ts/rules/defaults.yaml

@@ -488,6 +488,7 @@
 	SpeedMultiplier@CRITICAL:
 		UpgradeTypes: criticalspeed
 		Modifier: 60
+	Carryable:
 
 ^Tank:
 	Inherits: ^Vehicle

mods/ts/rules/gdi-vehicles.yaml

@@ -182,6 +182,8 @@ MMCH:
 	AutoTarget:
 	Selectable:
 		Bounds: 30, 42, 0, -8
+	Carryable:
+		LocalOffset: 0, 0, 408
 
 HMEC:
 	Inherits: ^VoxelTank
@@ -220,6 +222,8 @@ HMEC:
 		TickRate: 1
 	Selectable:
 		Bounds: 40, 40, 0, -8
+	Carryable:
+		LocalOffset: 0, 0, 360
 
 SONIC:
 	Inherits: ^VoxelTank