D2k sequence cleanups and gun turret muzzle fix

2015-03-29 12:23:20 +02:00
parent 975cb3101f
commit 05426562cd
4 changed files with 19 additions and 64 deletions
--- a/mods/d2k/sequences/infantry.yaml
+++ b/mods/d2k/sequences/infantry.yaml
@@ -77,7 +77,6 @@ bazooka:
 		Transpose: true
 	prone-stand: DATA.R8
 		Start: 562
-		Length: 1
 		Facings: -8
 		Transpose: true
 	prone-run: DATA.R8
@@ -88,7 +87,6 @@ bazooka:
 		Tick: 120
 	standup-0: DATA.R8
 		Start: 554
-		Length: 1
 		Facings: -8
 		Transpose: true
 	prone-shoot: DATA.R8
@@ -231,7 +229,6 @@ fremen:
 		Transpose: true
 	prone-stand: DATA.R8
 		Start: 798
-		Length: 1
 		Facings: -8
 		Transpose: true
 	prone-run: DATA.R8
@@ -242,7 +239,6 @@ fremen:
 		Tick: 120
 	standup-0: DATA.R8
 		Start: 790
-		Length: 1
 		Facings: -8
 		Transpose: true
 		Tick: 120
@@ -289,7 +285,6 @@ saboteur:
 		Tick: 120
 	prone-stand: DATA.R8
 		Start: 2253
-		Length: 1
 		Facings: -8
 		Transpose: true
 	prone-run: DATA.R8
@@ -300,7 +295,6 @@ saboteur:
 		Tick: 120
 	standup-0: DATA.R8
 		Start: 2245
-		Length: 1
 		Facings: -8
 		Transpose: true
 		Tick: 120
@@ -347,7 +341,6 @@ sardaukar:
 		Transpose: true
 	prone-stand: DATA.R8
 		Start: 1034
-		Length: 1
 		Facings: -8
 		Transpose: true
 	prone-run: DATA.R8
@@ -358,7 +351,6 @@ sardaukar:
 		Tick: 120
 	standup-0: DATA.R8
 		Start: 1026
-		Length: 1
 		Facings: -8
 		Transpose: true
 		Tick: 120
@@ -394,7 +386,6 @@ sardaukar:

 grenadier: # 2502 - 2749 in 1.06 DATA.R8
 	stand: grenadier.shp
-		Start: 0
 		Facings: 8
 	idle: grenadier.shp
 		Start: 203
@@ -440,8 +431,7 @@ grenadier: # 2502 - 2749 in 1.06 DATA.R8
 		Length: 5
 		Facings: 8
 		Tick: 120
-	icon: grenadiericon.shp
-		Start: 0 # 4281 in 1.06 DATA.R8
+	icon: grenadiericon.shp # 4281 in 1.06 DATA.R8

 sandworm:
 	mouth: DATA.R8
@@ -460,4 +450,3 @@ sandworm:
 	burrowed: DATA.R8
 		Start: 39
 	icon: wormicon.shp
-		Start: 0
--- a/mods/d2k/sequences/misc.yaml
+++ b/mods/d2k/sequences/misc.yaml
@@ -132,7 +132,6 @@ pips:

 clock:
 	idle: clock.shp
-		Start: 0
 		Length: *

 powerdown:
@@ -141,18 +140,15 @@ powerdown:

 poweroff:
 	offline: poweroff.shp
-		Start: 0
 		Length: *
 		Tick: 160

 rank:
 	rank: rank.shp
-		Start: 0
 		Length: *

 overlay:
 	build-valid-arrakis: DATA.R8
-		Start: 0
 		Offset: -16,-16
 	build-invalid: DATA.R8
 		Start: 1
@@ -161,7 +157,6 @@ overlay:
 		Start: 2
 		Offset: -16,-16
 	target-valid-arrakis: DATA.R8
-		Start: 0
 		Offset: -16,-16
 	target-invalid: DATA.R8
 		Start: 1
@@ -169,11 +164,9 @@ overlay:

 rallypoint:
 	flag: flagfly.shp
-		Start: 0
 		Length: *
 		Offset: 11,-5
 	circles: fpls.shp
-		Start: 0
 		Length: *

 beacon:
@@ -181,7 +174,6 @@ beacon:
 		Start: 148
 		Offset: -24,-24
 	circles: fpls.shp
-		Start: 0
 		Length: *

 rpg:
@@ -192,13 +184,11 @@ rpg:
 120mm:
 	idle: DATA.R8
 		Start: 3014
-		Length: 1
 		BlendMode: Additive

 155mm:
 	idle: DATA.R8
 		Start: 3081
-		Length: 1

 crate-effects:
 	dollar: DATA.R8
@@ -211,7 +201,6 @@ crate-effects:
 		Frames: 3965, 3964, 3963, 3962, 3961, 3960, 3959, 3958, 3957, 3956, 3955, 3954, 3953, 3952, 3951, 3950, 3949, 3948
 		Length: 18
 	levelup: levelup.shp
-		Start: 0
 		Length: *
 		Tick: 200
 	cloak: DATA.R8
@@ -238,10 +227,8 @@ missile2:
 atomic:
 	up: DATA.R8
 		Start: 2147
-		Length: 1
 	down: DATA.R8
 		Start: 2148
-		Length: 1

 fire:
 	1: DATA.R8
@@ -293,17 +280,14 @@ bombs:

 mpspawn:
 	idle: mpspawn.shp
-		Start: 0
 		Length: *

 waypoint:
 	idle: waypoint.shp
-		Start: 0
 		Length: *

 wormspawner:
 	idle: wormspawner.shp
-		Start: 0
 		Length: *

 sietch:
@@ -352,7 +336,6 @@ spicebloom:
 		Offset: -16,-16
 	active: DATA.R8
 		Start: 109
-		Length: 1
 		ZOffset: -511
 		Offset: -16,-16
 	idle: DATA.R8
--- a/mods/d2k/sequences/structures.yaml
+++ b/mods/d2k/sequences/structures.yaml
@@ -35,9 +35,9 @@ guntower:
 		Facings: -32
 		Offset: -24,16
 	muzzle: DATA.R8
-		Frames: 3839, 3839, 3840, 3840, 3841, 3841, 3842, 3842, 3843, 3843, 3844, 3844, 3845, 3845, 3846, 3846, 3847, 3847, 3848, 3848, 3849, 3849, 3850, 3850, 3851, 3851, 3852, 3852, 3853, 3853, 3854, 3854, 3855, 3855, 3856, 3856, 3857, 3857, 3858, 3858, 3859, 3859, 3860, 3860, 3861, 3861, 3862, 3862, 3863, 3863, 3864, 3864, 3865, 3865, 3866, 3866, 3867, 3867, 3868, 3868, 3869, 3869, 3870, 3870
+		Start: 3839
+		Tick: 60
 		Facings: -32
-		Length: 2
 		Offset: 0,-12
 		BlendMode: Additive
 	icon: DATA.R8
@@ -349,7 +349,6 @@ radar.atreides:
 refinery.atreides:
 	idle: DATA.R8
 		Start: 2561
-		Length: 1
 		Offset: -48,64
 	make: DATA.R8
 		Start: 4231
@@ -394,7 +393,6 @@ silo.atreides:
 		Offset: -16,16
 	damaged-idle: DATA.R8
 		Start: 2569
-		Length: 1
 		Offset: -16,16
 	make: DATA.R8
 		Start: 4313
@@ -573,7 +571,6 @@ palace.atreides:
 light.atreides:
 	idle: DATA.R8
 		Start: 2673
-		Length: 1
 		Offset: -48,64
 	make: DATA.R8
 		Start: 4295
@@ -615,7 +612,6 @@ light.atreides:
 heavy.atreides:
 	idle: DATA.R8
 		Start: 2518
-		Length: 1
 		Offset: -48,80
 	make: DATA.R8
 		Start: 4328
@@ -838,7 +834,6 @@ radar.harkonnen:
 refinery.harkonnen:
 	idle: DATA.R8
 		Start: 2721
-		Length: 1
 		Offset: -48,64
 	make: DATA.R8
 		Start: 4231
@@ -883,7 +878,6 @@ silo.harkonnen:
 		Offset: -16,16
 	damaged-idle: DATA.R8
 		Start: 2730
-		Length: 1
 		Offset: -16,16
 	make: DATA.R8
 		Start: 4313
@@ -971,7 +965,6 @@ palace.harkonnen:
 light.harkonnen:
 	idle: DATA.R8
 		Start: 2833
-		Length: 1
 		Offset: -48,64
 	make: DATA.R8
 		Start: 4295
@@ -1013,7 +1006,6 @@ light.harkonnen:
 heavy.harkonnen:
 	idle: DATA.R8
 		Start: 2678
-		Length: 1
 		Offset: -48,80
 	make: DATA.R8
 		Start: 4328
@@ -1138,7 +1130,6 @@ starport.ordos:
 power.ordos:
 	idle: DATA.R8
 		Start: 2843
-		Length: 1
 		Offset: -32,64
 	make: DATA.R8
 		Start: 4151
@@ -1237,7 +1228,6 @@ radar.ordos:
 refinery.ordos:
 	idle: DATA.R8
 		Start: 2881
-		Length: 1
 		Offset: -48,64
 	make: DATA.R8
 		Start: 4231
@@ -1282,7 +1272,6 @@ silo.ordos:
 		Offset: -16,16
 	damaged-idle: DATA.R8
 		Start: 2890
-		Length: 1
 		Offset: -16,16
 	make: DATA.R8
 		Start: 4313
@@ -1362,7 +1351,6 @@ palace.ordos:
 light.ordos:
 	idle: DATA.R8
 		Start: 2993
-		Length: 1
 		Offset: -48,64
 	make: DATA.R8
 		Start: 4295
@@ -1404,7 +1392,6 @@ light.ordos:
 heavy.ordos:
 	idle: DATA.R8
 		Start: 2838
-		Length: 1
 		Offset: -48,80
 	make: DATA.R8
 		Start: 4328
@@ -1460,7 +1447,6 @@ palace.corrino:
 		Length: 3
 		Offset: -16,-16
 	icon: palacecicon.shp
-		Start: 0
 	make: DATA.R8
 		Start: 4413
 		Length: 11
@@ -1518,7 +1504,6 @@ starport.corrino:
 heavy.corrino:
 	idle: DATA.R8
 		Start: 3001
-		Length: 1
 		Offset: -48,64
 	make: DATA.R8
 		Start: 4328
--- a/mods/d2k/sequences/vehicles.yaml
+++ b/mods/d2k/sequences/vehicles.yaml
@@ -27,7 +27,6 @@ harvester:
 		Length: 10
 	dock-loop: DATA.R8
 		Start: 3380
-		Length: 1
 	icon: DATA.R8
 		Start: 4019
 		Offset: -30,-24
@@ -46,9 +45,9 @@ trike:
 		Start: 1635
 		Facings: -32
 	muzzle: DATA.R8
-		Frames: 3839, 3839, 3840, 3840, 3841, 3841, 3842, 3842, 3843, 3843, 3844, 3844, 3845, 3845, 3846, 3846, 3847, 3847, 3848, 3848, 3849, 3849, 3850, 3850, 3851, 3851, 3852, 3852, 3853, 3853, 3854, 3854, 3855, 3855, 3856, 3856, 3857, 3857, 3858, 3858, 3859, 3859, 3860, 3860, 3861, 3861, 3862, 3862, 3863, 3863, 3864, 3864, 3865, 3865, 3866, 3866, 3867, 3867, 3868, 3868, 3869, 3869, 3870, 3870
+		Start: 3839
+		Tick: 50
 		Facings: -32
-		Length: 2
 		BlendMode: Additive
 	icon: DATA.R8
 		Start: 4041
@@ -126,9 +125,9 @@ combata:
 		Start: 1859
 		Facings: -32
 	muzzle: DATA.R8
-		Frames: 3775, 3775, 3776, 3776, 3777, 3777, 3778, 3778, 3779, 3779, 3780, 3780, 3781, 3781, 3782, 3782, 3783, 3783, 3784, 3784, 3785, 3785, 3786, 3786, 3787, 3787, 3788, 3788, 3789, 3789, 3790, 3790, 3791, 3791, 3792, 3792, 3793, 3793, 3794, 3794, 3795, 3795, 3796, 3796, 3797, 3797, 3798, 3798, 3799, 3799, 3800, 3800, 3801, 3801, 3802, 3802, 3803, 3803, 3804, 3804, 3805, 3805, 3806, 3806
+		Start: 3775
+		Tick: 60
 		Facings: -32
-		Length: 2
 		BlendMode: Additive
 	icon: DATA.R8
 		Start: 4020
@@ -152,9 +151,9 @@ combath:
 		Start: 2115
 		Facings: -32
 	muzzle: DATA.R8
-		Frames: 3775, 3775, 3776, 3776, 3777, 3777, 3778, 3778, 3779, 3779, 3780, 3780, 3781, 3781, 3782, 3782, 3783, 3783, 3784, 3784, 3785, 3785, 3786, 3786, 3787, 3787, 3788, 3788, 3789, 3789, 3790, 3790, 3791, 3791, 3792, 3792, 3793, 3793, 3794, 3794, 3795, 3795, 3796, 3796, 3797, 3797, 3798, 3798, 3799, 3799, 3800, 3800, 3801, 3801, 3802, 3802, 3803, 3803, 3804, 3804, 3805, 3805, 3806, 3806
+		Start: 3775
+		Tick: 60
 		Facings: -32
-		Length: 2
 		BlendMode: Additive
 	icon: DATA.R8
 		Start: 4021
@@ -178,9 +177,9 @@ combato:
 		Start: 2485
 		Facings: -32
 	muzzle: DATA.R8
-		Frames: 3775, 3775, 3776, 3776, 3777, 3777, 3778, 3778, 3779, 3779, 3780, 3780, 3781, 3781, 3782, 3782, 3783, 3783, 3784, 3784, 3785, 3785, 3786, 3786, 3787, 3787, 3788, 3788, 3789, 3789, 3790, 3790, 3791, 3791, 3792, 3792, 3793, 3793, 3794, 3794, 3795, 3795, 3796, 3796, 3797, 3797, 3798, 3798, 3799, 3799, 3800, 3800, 3801, 3801, 3802, 3802, 3803, 3803, 3804, 3804, 3805, 3805, 3806, 3806
+		Start: 3775
+		Tick: 60
 		Facings: -32
-		Length: 2
 		BlendMode: Additive
 	icon: DATA.R8
 		Start: 4022
@@ -201,9 +200,9 @@ devast:
 		Start: 2083
 		Facings: -32
 	muzzle: DATA.R8
-		Frames: 3807, 3807, 3808, 3808, 3809, 3809, 3810, 3810, 3810, 3811, 3811, 3812, 3812, 3813, 3813, 3814, 3814, 3815, 3816, 3816, 3817, 3817, 3818, 3819, 3819, 3820, 3820, 3821, 3821, 3822, 3822, 3823, 3823, 3824, 3824, 3825, 3825, 3826, 3826, 3827, 3827, 3828, 3828, 3829, 3829, 3830, 3830, 3831, 3831, 3832, 3832, 3832, 3833, 3833, 3834, 3834, 3835, 3835, 3836, 3836, 3837, 3837, 3838, 3838
+		Start: 3807
+		Tick: 80
 		Facings: -32
-		Length: 2
 		BlendMode: Additive
 	icon: DATA.R8
 		Start: 4028
@@ -223,9 +222,9 @@ raider:
 		Start: 2421
 		Facings: -32
 	muzzle: DATA.R8
-		Frames: 3743, 3743, 3744, 3744, 3745, 3745, 3746, 3746, 3747, 3747, 3748, 3748, 3749, 3749, 3750, 3750, 3751, 3751, 3752, 3752, 3753, 3753, 3754, 3754, 3755, 3755, 3756, 3756, 3757, 3757, 3758, 3758, 3759, 3759, 3760, 3760, 3761, 3761, 3762, 3762, 3763, 3763, 3764, 3764, 3765, 3765, 3766, 3766, 3767, 3767, 3768, 3768, 3769, 3769, 3770, 3770, 3771, 3771, 3772, 3772, 3773, 3773, 3774, 3774
+		Start: 3743
+		Tick: 50
 		Facings: -32
-		Length: 2
 		BlendMode: Additive
 	icon: DATA.R8
 		Start: 4017
@@ -239,12 +238,11 @@ stealthraider:
 		Start: 2421
 		Facings: -32
 	muzzle: DATA.R8
-		Frames: 3743, 3743, 3744, 3744, 3745, 3745, 3746, 3746, 3747, 3747, 3748, 3748, 3749, 3749, 3750, 3750, 3751, 3751, 3752, 3752, 3753, 3753, 3754, 3754, 3755, 3755, 3756, 3756, 3757, 3757, 3758, 3758, 3759, 3759, 3760, 3760, 3761, 3761, 3762, 3762, 3763, 3763, 3764, 3764, 3765, 3765, 3766, 3766, 3767, 3767, 3768, 3768, 3769, 3769, 3770, 3770, 3771, 3771, 3772, 3772, 3773, 3773, 3774, 3774
+		Start: 3743
+		Tick: 50
 		Facings: -32
-		Length: 2
 		BlendMode: Additive
-	icon: raidersicon.shp
-		Start: 0 # 4282 in 1.06 DATA.R8
+	icon: raidersicon.shp # 4282 in 1.06 DATA.R8

 deviatortank:
 	idle: DATA.R8