Merge pull request #9509 from penev92/upgradeTickTank

Convert Tick Tank to use DeployToUpgrade + some fixes

mods/ts/rules/nod-support.yaml

@@ -163,49 +163,6 @@ NASAM:
 	SelectionDecorations:
 		VisualBounds: 40, 36, -3, -8
 
-GATICK:
-	Inherits: ^DeployedVehicle
-	Valued:
-		Cost: 800
-	Tooltip:
-		Name: Tick Tank
-	Health:
-		HP: 350
-	Armor:
-		Type: Concrete
-	RevealsShroud:
-		Range: 5c0
-	Turreted:
-		ROT: 6
-		InitialFacing: 224
-		Offset: 0,96,224
-	Armament@PRIMARY:
-		Weapon: 90mm
-		LocalOffset: 448,0,348
-		UpgradeTypes: eliteweapon
-		UpgradeMaxEnabledLevel: 0
-		UpgradeMaxAcceptedLevel: 1
-		MuzzleSequence: muzzle
-	Armament@ELITE:
-		Weapon: 120mmx
-		LocalOffset: 448,0,348
-		UpgradeTypes: eliteweapon
-		UpgradeMinEnabledLevel: 1
-		MuzzleSequence: muzzle
-	BodyOrientation:
-		QuantizedFacings: 32
-	RenderVoxels:
-	WithVoxelBarrel:
-		LocalOffset: 128,0,348
-	WithVoxelTurret:
-	Transforms:
-		IntoActor: ttnk
-		Facing: 159
-		TransformSounds: place2.aud
-		NoTransformSounds:
-		Voice: Move
-	WithMuzzleOverlay:
-
 GAARTY:
 	Inherits@1: ^DeployedVehicle
 	Valued:

mods/ts/rules/nod-vehicles.yaml

@@ -82,8 +82,8 @@ TTNK:
 		HP: 350
 	Armor:
 		Type: Light
-	AttackFrontal:
-		Voice: Attack
+		UpgradeTypes: undeployed
+		UpgradeMinEnabledLevel: 1
 	Armament@PRIMARY:
 		Weapon: 90mm
 		LocalOffset: 256,0,256
@@ -100,12 +100,67 @@ TTNK:
 	WithMuzzleOverlay:
 	RevealsShroud:
 		Range: 5c0
-	Transforms:
-		IntoActor: gatick
-		Facing: 159
-		TransformSounds: place2.aud
-		NoTransformSounds:
-		Voice: Move
+	RenderSprites:
+		Image: ttnk
+	DeployToUpgrade:
+		DeployedUpgrades: deployed, notmobile
+		UndeployedUpgrades: undeployed
+		DeployAnimation: make
+		Facing: 160
+		AllowedTerrainTypes: Clear, Road, DirtRoad, Rough
+		DeploySound: place2.aud
+		UndeploySound: clicky1.aud
+	WithVoxelBody:
+		UpgradeTypes: undeployed
+		UpgradeMinEnabledLevel: 1
+	WithSpriteBody@deployed:
+		UpgradeTypes: undeployed
+		UpgradeMaxEnabledLevel: 0
+	AttackFrontal:
+		Voice: Attack
+		UpgradeTypes: undeployed
+		UpgradeMinEnabledLevel: 1
+		UpgradeMaxAcceptedLevel: 1
+	Turreted:
+		ROT: 6
+		Turret: deployed
+		InitialFacing: 128
+		Offset: -20, -130, 180
+	WithVoxelBarrel:
+		Armament: deployed
+		LocalOffset: 128, 0, 256
+		UpgradeTypes: deployed
+		UpgradeMinEnabledLevel: 1
+	WithVoxelTurret@deployed:
+		Turret: deployed
+		UpgradeTypes: deployed
+		UpgradeMinEnabledLevel: 1
+	AttackTurreted@deployed:
+		Voice: Attack
+		Armaments: deployed
+		UpgradeTypes: deployed
+		UpgradeMinEnabledLevel: 1
+	Armament@deployed:
+		Name: deployed
+		Turret: deployed
+		Weapon: 90mm
+		LocalOffset: 384,0,256
+		UpgradeTypes: eliteweapon
+		UpgradeMaxEnabledLevel: 0
+		UpgradeMaxAcceptedLevel: 1
+		MuzzleSequence: muzzle
+	Armament@deployedElite:
+		Name: deployed
+		Turret: deployed
+		Weapon: 120mmx
+		LocalOffset: 384,0,256
+		UpgradeTypes: eliteweapon
+		UpgradeMinEnabledLevel: 1
+		MuzzleSequence: muzzle
+	Armor@deployed:
+		Type: Concrete
+		UpgradeTypes: deployed
+		UpgradeMinEnabledLevel: 1
 
 ART2:
 	Inherits: ^VoxelTank

mods/ts/sequences/structures.yaml

@@ -735,29 +735,6 @@ nawall:
 		Offset: 0, 0
 		UseTilesetCode: false
 
-gatick:
-	Defaults:
-		Offset: 0, -13
-		UseTilesetCode: true
-	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
-		UseTilesetCode: false
-		ZOffset: 512
-		BlendMode: Additive
-	make: gatickmk
-		Length: 24
-		ShadowStart: 24
-
 gaicbm:
 	Defaults:
 		Offset: 0, -12

mods/ts/sequences/vehicles.yaml

@@ -135,6 +135,17 @@ sonic:
 	icon: soniicon
 
 ttnk:
+	idle: gatick
+		ShadowStart: 3
+		Offset: 0, -12
+	damaged-idle: gatick
+		Start: 1
+		ShadowStart: 4
+		Offset: 0, -12
+	make: gatickmk
+		Length: 24
+		ShadowStart: 24
+		Offset: 0, -12
 	muzzle: gunfire
 		Length: *
 	emp-overlay: emp_fx01

mods/ts/sequences/voxels.yaml

@@ -33,8 +33,6 @@ bike:
 
 ttnk:
 	idle:
-
-gatick:
 	turret: ttnktur
 	barrel: ttnkbarl