Merge pull request #9406 from reaperrr/d2k-weapon-offsets

Fixed D2k armament offsets and some cleanup

mods/d2k/rules/infantry.yaml

@@ -65,7 +65,7 @@ trooper:
 		Speed: 31
 	Armament:
 		Weapon: Bazooka
-		LocalOffset: 0,0,555
+		LocalOffset: 128,0,256
 	AttackFrontal:
 	WithInfantryBody:
 		AttackSequence: shoot
@@ -156,8 +156,8 @@ grenadier:
 	Mobile:
 		Speed: 43
 	Armament:
-		LocalOffset: 0,0,555
 		Weapon: grenade
+		LocalOffset: 0,0,320
 		FireDelay: 15
 	AttackFrontal:
 	WithInfantryBody:

mods/d2k/rules/vehicles.yaml

@@ -207,7 +207,7 @@ missile_tank:
 		Cost: 1000
 	Tooltip:
 		Name: Missile Tank
-		Description: Rocket Artillery\n  Strong vs Vehicles, Buildings\n  Weak vs Infantry, Aircraft
+		Description: Rocket Artillery\n  Strong vs Vehicles, Buildings, Aircraft\n  Weak vs Infantry
 	Buildable:
 		Queue: Armor
 		Prerequisites: ~heavy.missiletank, upgrade.heavy, research_centre, ~techlevel.high
@@ -223,8 +223,7 @@ missile_tank:
 		Range: 9c0
 	Armament:
 		Weapon: mtank_pri
-		LocalOffset: -213,128,171, -213,-256,171
+		LocalOffset: -128,128,171, -128,-128,171
-		FireDelay: 15
 	AttackFrontal:
 	AutoTarget:
 		InitialStance: Defend
@@ -260,7 +259,7 @@ sonic_tank:
 		Range: 6c0
 	Armament:
 		Weapon: Sound
-		LocalOffset: 640,0,427
+		LocalOffset: 600,0,427
 	AttackFrontal:
 	AutoTarget:
 	Explodes:

mods/d2k/sequences/misc.yaml

@@ -1,13 +1,13 @@
 explosion:
 	Defaults:
 		BlendMode: Additive
+		Tick: 80
 	piff: DATA.R8
 		Start: 3626
 		Length: 5
 	piffs: DATA.R8
 		Start: 3429
 		Length: 4
-		Tick: 80
 	small_explosion: DATA.R8
 		Start: 3403
 		Length: 15
@@ -17,15 +17,9 @@ explosion:
 	tiny_explosion: DATA.R8
 		Start: 3386
 		Length: 4
-		Tick: 80
 	nuke: DATA.R8
 		Start: 3965
 		Length: 14
-		Tick: 60
-	mini_explosion: DATA.R8
-		Start: 3403
-		Length: 15
-		Tick: 60
 	self_destruct: DATA.R8
 		Start: 3433
 		Length: 15
@@ -35,20 +29,12 @@ explosion:
 	large_explosion: DATA.R8
 		Start: 3988
 		Length: 22
-	artillery: DATA.R8
-		Start: 3988
-		Length: 22
-	small_artillery: DATA.R8
-		Start: 3390
-		Length: 12
-		Tick: 60
 	small_napalm: DATA.R8
 		Start: 3421
 		Length: 8
 	rocket_explosion: DATA.R8
 		Start: 3381
 		Length: 5
-		Tick: 80
 		BlendMode: Alpha
 	shockwave: DATA.R8
 		Start: 3687
@@ -58,7 +44,8 @@ explosion:
 		Start: 3512
 		Length: 23
 		BlendMode: Alpha
-		Tick: 80
+		Offset: 12, -10
+		Tick: 120
 	corpse: DATA.R8
 		Start: 430
 		Length: 12

mods/d2k/weapons.yaml

@@ -57,7 +57,7 @@ Bazooka:
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: SandCrater, RockCrater
 	Warhead@3Eff: CreateEffect
-		Explosion: small_explosion
+		Explosion: tiny_explosion
 		ImpactSound: EXPLSML1.WAV
 
 Fremen_S:
@@ -232,7 +232,7 @@ Rocket:
 	ReloadDelay: 30
 	Range: 3c512
 	Report: ROCKET1.WAV
-	ValidTargets: Ground, Air
+	ValidTargets: Ground
 	Projectile: Missile
 		Inaccuracy: 64
 		Image: RPG
@@ -246,7 +246,7 @@ Rocket:
 		Spread: 250
 		Falloff: 100, 95, 70, 50, 25, 5, 0
 		Damage: 250
-		ValidTargets: Ground, Air
+		ValidTargets: Ground
 		Versus:
 			none: 25
 			wall: 100
@@ -300,13 +300,15 @@ Rocket:
 
 TowerMissile:
 	ReloadDelay: 60
+	Burst: 2
+	BurstDelay: 60
 	Range: 5c512
 	MinRange: 1c0
 	Report: ROCKET1.WAV
 	ValidTargets: Ground, Air
 	Projectile: Missile
 		Blockable: false
-		Shadow: yes
+		Shadow: true
 		RateOfTurn: 1
 		Inaccuracy: 384
 		Image: MISSILE2
@@ -333,8 +335,8 @@ TowerMissile:
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: SandCrater, RockCrater
 	Warhead@3Eff: CreateEffect
-		Explosion: med_explosion
+		Explosion: small_explosion
-		ImpactSound: EXPLSML4.WAV
+		ImpactSound: EXPLSML1.WAV
 
 80mm_A:
 	ReloadDelay: 50
@@ -455,8 +457,10 @@ DevBullet:
 
 mtank_pri:
 	ReloadDelay: 115
+	Burst: 2
+	BurstDelay: 115
 	Range: 6c0
-	Report: MISSLE1.WAV
+	Report: ROCKET1.WAV
 	ValidTargets: Ground, Air
 	Projectile: Missile
 		Speed: 281
@@ -487,8 +491,8 @@ mtank_pri:
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: SandCrater, RockCrater
 	Warhead@3Eff: CreateEffect
-		Explosion: med_explosion
+		Explosion: small_explosion
-		ImpactSound: EXPLSML4.WAV
+		ImpactSound: EXPLSML1.WAV
 
 DeviatorMissile:
 	ReloadDelay: 160
@@ -565,8 +569,8 @@ DeviatorMissile:
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: SandCrater, RockCrater
 	Warhead@3Eff: CreateEffect
-		Explosion: small_artillery
+		Explosion: med_explosion
-		ImpactSound: EXPLLG3.WAV
+		ImpactSound: EXPLMD2.WAV
 
 Sound:
 	ReloadDelay: 90
@@ -645,7 +649,7 @@ OrniBomb:
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: Crater
 	Warhead@3Eff: CreateEffect
-		Explosion: artillery
+		Explosion: large_explosion
 		ImpactSound: NAPALM1.WAV
 
 Crush:
@@ -723,7 +727,7 @@ CrateExplosion:
 		AffectsParent: true
 		DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: artillery
+		Explosion: large_explosion
 		ImpactSound: EXPLSML4.WAV
 
 UnitExplodeSmall:
@@ -738,7 +742,7 @@ UnitExplodeMed:
 
 UnitExplodeLarge:
 	Warhead@1Eff: CreateEffect
-		Explosion: artillery
+		Explosion: large_explosion
 		ImpactSound: EXPLLG2.WAV, EXPLLG3.WAV, EXPLLG5.WAV
 
 grenade: