Merge pull request #13164 from reaperrr/ts-arty-deploy

Migrate TS artillery deployment to condition system

mods/ts/rules/nod-support.yaml

@@ -162,68 +162,6 @@ NASAM:
 	SelectionDecorations:
 		VisualBounds: 40, 36, -3, -8
 
-GAARTY:
-	Inherits@1: ^GainsExperience
-	Inherits@2: ^ExistsInWorld
-	Inherits@3: ^SpriteActor
-	Huntable:
-	Voiced:
-		VoiceSet: Vehicle
-	AttackTurreted:
-		Voice: Attack
-	AutoTarget:
-	RenderRangeCircle:
-	DrawLineToTarget:
-	Building:
-		Dimensions: 1,1
-		Footprint: x
-		TerrainTypes: Clear, Road, DirtRoad, Rough
-	WithSpriteBody:
-	WithMakeAnimation:
-	WithTextControlGroupDecoration:
-	SelectionDecorations:
-		Palette: pips
-	Selectable:
-	Targetable:
-		TargetTypes: Ground, Building, Repair
-	Guardable:
-	HiddenUnderFog:
-	ActorLostNotification:
-	Valued:
-		Cost: 975
-	Tooltip:
-		Name: Deployed Artillery
-	Health:
-		HP: 300
-	Armor:
-		Type: Light
-	RevealsShroud:
-		Range: 9c0
-	Turreted:
-		TurnSpeed: 5
-		InitialFacing: 96
-		Offset: 0,0,256
-	Armament:
-		Weapon: 155mm
-		LocalOffset: 811,0,0
-		MuzzleSequence: muzzle
-		MuzzlePalette: effect-ignore-lighting
-	BodyOrientation:
-		QuantizedFacings: 32
-	RenderVoxels:
-		LightAmbientColor: 0.4, 0.4, 0.4
-	WithVoxelBarrel:
-		LocalOffset: 0,0,-256
-	WithVoxelTurret:
-	Transforms:
-		IntoActor: art2
-		Facing: 96
-		TransformSounds: place2.aud
-		NoTransformSounds:
-		Voice: Move
-	WithMuzzleOverlay:
-	RevealOnFire:
-
 NASTLH:
 	Inherits: ^Building
 	Valued:

mods/ts/rules/nod-vehicles.yaml

@@ -139,6 +139,7 @@ TTNK:
 		Turret: deployed
 		InitialFacing: 160
 		Offset: -20, -130, 180
+		RealignDelay: -1
 	WithVoxelBarrel:
 		Armament: deployed
 		LocalOffset: 128, 0, 256
@@ -183,6 +184,10 @@ ART2:
 		Cost: 975
 	Tooltip:
 		Name: Artillery
+		RequiresCondition: !deployed
+	Tooltip@DEPLOYED:
+		Name: Artillery (deployed)
+		RequiresCondition: deployed
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 100
@@ -195,18 +200,60 @@ ART2:
 	Mobile:
 		Speed: 71
 		TurnSpeed: 2
+		RequiresCondition: !empdisable && undeployed
 	RevealsShroud:
 		RequiresCondition: !inside-tunnel
 		Range: 9c0
 		MaxHeightDelta: 3
 	RenderVoxels:
 		LightAmbientColor: 0.4, 0.4, 0.4
-	Transforms:
-		IntoActor: gaarty
+	RenderSprites:
+		Image: art2
+	GrantConditionOnDeploy:
+		DeployedCondition: deployed
+		UndeployedCondition: undeployed
+		DeployAnimation: make
 		Facing: 96
-		TransformSounds:
-		NoTransformSounds:
-		Voice: Move
+		AllowedTerrainTypes: Clear, Road, DirtRoad, Rough
+		DeploySound: place2.aud
+		UndeploySound: clicky1.aud
+	GrantCondition@PREVIEWWORKAROUND:
+		Condition: real-actor
+	WithVoxelBody:
+		RequiresCondition: undeployed
+	WithSpriteBody@deployed:
+		RequiresCondition: !undeployed && real-actor
+	Turreted:
+		Turret: deployed
+		TurnSpeed: 5
+		InitialFacing: 96
+		Offset: 0,0,256
+		RealignDelay: -1
+	WithVoxelBarrel:
+		Armament: deployed
+		LocalOffset: 0,0,-256
+		RequiresCondition: deployed
+	WithVoxelTurret@deployed:
+		Turret: deployed
+		RequiresCondition: deployed
+	AttackTurreted@deployed:
+		Voice: Attack
+		Armaments: deployed
+		RequiresCondition: deployed
+	Armament@deployed:
+		Name: deployed
+		Turret: deployed
+		Weapon: 155mm
+		LocalOffset: 811,0,0
+		RequiresCondition: deployed
+		MuzzleSequence: muzzle
+		MuzzlePalette: effect-ignore-lighting
+	WithMuzzleOverlay:
+	AutoTarget:
+	Carryable:
+		RequiresCondition: undeployed
+	RevealOnFire:
+		ArmamentNames: deployed
 
 REPAIR:
 	Inherits: ^Tank

mods/ts/sequences/structures.yaml

@@ -902,31 +902,6 @@ gaicbm:
 		Length: 30
 		ShadowStart: 30
 
-gaarty:
-	Defaults:
-		Offset: 0, -12, 12
-		UseTilesetCode: true
-		DepthSprite: isodepth.shp
-	idle:
-		ShadowStart: 3
-	damaged-idle:
-		Start: 1
-		ShadowStart: 4
-	muzzle: gunfire
-		Length: *
-		Offset: 0, 0
-		UseTilesetCode: false
-	emp-overlay: emp_fx01
-		Length: *
-		Offset: 0, 0, 13
-		UseTilesetCode: false
-		ZOffset: 512
-		BlendMode: Additive
-		-DepthSprite:
-	make: gaartymk
-		Length: 16
-		ShadowStart: 16
-
 naobel:
 	Defaults:
 		Offset: 0, -24, 24

mods/ts/sequences/vehicles.yaml

@@ -67,6 +67,26 @@ repair:
 art2:
 	Inherits: ^VehicleOverlays
 	icon: artyicon
+	idle: gaarty
+		ShadowStart: 3
+		Offset: 0, -12, 12
+		UseTilesetCode: true
+		DepthSprite: isodepth.shp
+	damaged-idle: gaarty
+		Start: 1
+		ShadowStart: 4
+		Offset: 0, -12, 12
+		UseTilesetCode: true
+		DepthSprite: isodepth.shp
+	make: gaartymk
+		Length: 16
+		ShadowStart: 16
+		Offset: 0, -12, 12
+		UseTilesetCode: true
+		DepthSprite: isodepth.shp
+	muzzle: gunfire
+		Length: *
+		Offset: 0, 0, 24
 
 weed:
 	Inherits: ^VehicleOverlays

mods/ts/sequences/voxels.yaml

@@ -11,8 +11,6 @@ apc:
 
 art2:
 	idle:
-
-gaarty:
 	turret: art2tur
 	barrel: art2barl