Merge pull request #3639 from reaperrr/muzzles

Offsets and muzzle flashes
2013-08-04 13:55:14 -07:00
parent f10e4a562e 6da236d47f
commit a582efcca0
7 changed files with 86 additions and 26 deletions
--- a/mods/ra/bits/gunfire2.shp
+++ b/mods/ra/bits/gunfire2.shp
--- a/mods/ra/rules/ships.yaml
+++ b/mods/ra/rules/ships.yaml
@@ -79,6 +79,7 @@ MSUB:
 		UncloakSound: subshow1.aud
 	Armament:
 		Weapon: SubMissile
+		LocalOffset: 0,-171,0, 0,171,0
 		FireDelay: 2
 	AttackFrontal:
 	Selectable:
@@ -118,11 +119,11 @@ DD:
 		Offset: 341,0,128
 	Armament@PRIMARY:
 		Weapon: Stinger
-		LocalOffset: 0,-171,0, 0,171,0
-		LocalYaw: 80, -80
+		LocalOffset: 0,-100,0, 0,100,0
+		LocalYaw: 64, -64
 	Armament@SECONDARY:
 		Weapon: DepthCharge
-		LocalOffset: 0,-171,0, 0,171,0
+		LocalOffset: 0,-100,0, 0,100,0
 		LocalYaw: 80, -80
 	AttackTurreted:
 	Selectable:
@@ -161,25 +162,29 @@ CA:
 		Range: 7
 	Turreted@PRIMARY:
 		Turret: primary
-		Offset: -725,0,85
+		Offset: -864,0,128
 		ROT: 3
 	Turreted@SECONDARY:
 		Turret: secondary
-		Offset: 725,0,85
+		Offset: 768,0,128
 		ROT: 3
 	Armament@PRIMARY:
 		Turret: primary
 		Weapon: 8Inch
-		LocalOffset: 213,-171,0, 213,171,0
+		LocalOffset: 480,-100,40, 480,100,40
 		Recoil: 171
 		RecoilRecovery: 34
 	Armament@SECONDARY:
+		Name: secondary
 		Turret: secondary
 		Weapon: 8Inch
-		LocalOffset: 213,-171,0, 213,171,0
+		LocalOffset: 480,-100,40, 480,100,40
 		Recoil: 171
 		RecoilRecovery: 34
 	AttackTurreted:
+	WithMuzzleFlash@PRIMARY:
+	WithMuzzleFlash@SECONDARY:
+		Armament: secondary
 	Selectable:
 		Bounds: 44,44
 	RenderUnit:
@@ -247,12 +252,15 @@ PT:
 		Range: 7
 	Turreted:
 		ROT: 7
-		Offset: 256,0,43
+		Offset: 512,0,0
 	Armament@PRIMARY:
 		Weapon: 2Inch
+		LocalOffset: 208,0,48
 	Armament@SECONDARY:
+		Name: secondary
 		Weapon: DepthCharge
 	AttackTurreted:
+	WithMuzzleFlash@PRIMARY:
 	Selectable:
 		Bounds: 32,32
 	RenderUnit:
--- a/mods/ra/rules/structures.yaml
+++ b/mods/ra/rules/structures.yaml
@@ -335,9 +335,15 @@ AGUN:
 	RenderBuildingTurreted:
 	Armament@PRIMARY:
 		Weapon: ZSU-23
+		LocalOffset: 432,80,-30
 	Armament@SECONDARY:
+		Name: secondary
 		Weapon: ZSU-23
+		LocalOffset: 432,-80,-30
 	AttackTurreted:
+	WithMuzzleFlash@PRIMARY:
+	WithMuzzleFlash@SECONDARY:
+		Armament: secondary
 	AutoTarget:
 	IronCurtainable:
 	-RenderBuilding:
@@ -398,7 +404,7 @@ PBOX:
 	-AcceptsSupplies:
 	Turreted:
 		ROT: 255
-	RenderBuilding:
+	BodyOrientation:
 		QuantizedFacings: 8
 	Cargo:
 		Types: Infantry
@@ -461,7 +467,7 @@ PBOX.E1:
 	AutoTarget:
 	Armament:
 		Weapon: Vulcan
-		LocalOffset: 469,0,0
+		LocalOffset: 384,0,88
 	AttackTurreted:
 	WithMuzzleFlash:
 	Cargo:
@@ -484,7 +490,7 @@ PBOX.E3:
 	AutoTarget:
 	Armament:
 		Weapon: Dragon
-		LocalOffset: 469,0,0
+		LocalOffset: 384,0,88
 	AttackTurreted:

 PBOX.E4:
@@ -497,7 +503,7 @@ PBOX.E4:
 	AutoTarget:
 	Armament:
 		Weapon: Flamer
-		LocalOffset: 469,0,0
+		LocalOffset: 384,0,88
 	AttackTurreted:

 PBOX.E7:
@@ -510,7 +516,7 @@ PBOX.E7:
 	AutoTarget:
 	Armament:
 		Weapon: Colt45
-		LocalOffset: 469,0,0
+		LocalOffset: 384,0,88
 	AttackTurreted:

 PBOX.SHOK:
@@ -523,7 +529,7 @@ PBOX.SHOK:
 	AutoTarget:
 	Armament:
 		Weapon: PortaTesla
-		LocalOffset: 469,0,0
+		LocalOffset: 384,0,88
 	AttackTurreted:

 PBOX.SNIPER:
@@ -536,7 +542,7 @@ PBOX.SNIPER:
 	AutoTarget:
 	Armament:
 		Weapon: Sniper
-		LocalOffset: 469,0,0
+		LocalOffset: 384,0,88
 	AttackTurreted:

 HBOX:
@@ -563,7 +569,7 @@ HBOX:
 	-AcceptsSupplies:
 	Turreted:
 		ROT: 255
-	RenderBuilding:
+	BodyOrientation:
 		QuantizedFacings: 8
 	Cargo:
 		Types: Infantry
@@ -626,7 +632,7 @@ HBOX.E1:
 	AutoTarget:
 	Armament:
 		Weapon: Vulcan
-		LocalOffset: 469,0,0
+		LocalOffset: 400,0,48
 	AttackTurreted:
 	WithMuzzleFlash:
 	Cargo:
@@ -649,7 +655,7 @@ HBOX.E3:
 	AutoTarget:
 	Armament:
 		Weapon: Dragon
-		LocalOffset: 469,0,0
+		LocalOffset: 400,0,48
 	AttackTurreted:

 HBOX.E4:
@@ -662,7 +668,7 @@ HBOX.E4:
 	AutoTarget:
 	Armament:
 		Weapon: Flamer
-		LocalOffset: 469,0,0
+		LocalOffset: 400,0,48
 	AttackTurreted:

 HBOX.E7:
@@ -675,7 +681,7 @@ HBOX.E7:
 	AutoTarget:
 	Armament:
 		Weapon: Colt45
-		LocalOffset: 469,0,0
+		LocalOffset: 400,0,48
 	AttackTurreted:

 HBOX.SHOK:
@@ -688,7 +694,7 @@ HBOX.SHOK:
 	AutoTarget:
 	Armament:
 		Weapon: PortaTesla
-		LocalOffset: 469,0,0
+		LocalOffset: 400,0,48
 	AttackTurreted:

 HBOX.SNIPER:
@@ -701,7 +707,7 @@ HBOX.SNIPER:
 	AutoTarget:
 	Armament:
 		Weapon: Sniper
-		LocalOffset: 469,0,0
+		LocalOffset: 400,0,48
 	AttackTurreted:

 GUN:
@@ -732,7 +738,9 @@ GUN:
 	RenderBuildingTurreted:
 	Armament:
 		Weapon: TurretGun
+		LocalOffset: 512,0,112
 	AttackTurreted:
+	WithMuzzleFlash:
 	AutoTarget:
 	IronCurtainable:
 	-RenderBuilding:
@@ -764,12 +772,12 @@ FTUR:
 		Range: 6
 	Turreted:
 		ROT: 255
-		Offset: 0,0,85
+		Offset: 0,0,112
 	Armament:
 		Weapon: FireballLauncher
 		LocalOffset: 512,0,0
 	AttackTurreted:
-	RenderBuilding:
+	BodyOrientation:
 		QuantizedFacings: 8
 	AutoTarget:
 	IronCurtainable:
--- a/mods/ra/rules/vehicles.yaml
+++ b/mods/ra/rules/vehicles.yaml
@@ -54,7 +54,9 @@ V2RL:
 		Weapon: 25mm
 		Recoil: 85
 		RecoilRecovery: 25
+		LocalOffset: 768,0,90
 	AttackTurreted:
+	WithMuzzleFlash:
 	RenderUnit:
 	WithTurret:
 	AutoTarget:
@@ -92,7 +94,9 @@ V2RL:
 		Weapon: 90mm
 		Recoil: 128
 		RecoilRecovery: 38
+		LocalOffset: 720,0,80
 	AttackTurreted:
+	WithMuzzleFlash:
 	RenderUnit:
 	WithTurret:
 	AutoTarget:
@@ -132,8 +136,9 @@ V2RL:
 		Weapon: 105mm
 		Recoil: 128
 		RecoilRecovery: 38
-		LocalOffset: 0,85,0, 0,-85,0
+		LocalOffset: 768,85,90, 768,-85,90
 	AttackTurreted:
+	WithMuzzleFlash:
 	RenderUnit:
 	WithTurret:
 	AutoTarget:
@@ -173,15 +178,17 @@ V2RL:
 		ROT: 2
 	Armament@PRIMARY:
 		Weapon: 120mm
-		LocalOffset: 800,180,340, 800,-180,340
+		LocalOffset: 900,180,340, 900,-180,340
 		Recoil: 171
 		RecoilRecovery: 30
 	Armament@SECONDARY:
+		Name: secondary
 		Weapon: MammothTusk
 		LocalOffset: -85,384,340, -85,-384,340
 		LocalYaw: -100,100
 		Recoil: 43
 	AttackTurreted:
+	WithMuzzleFlash@PRIMARY:
 	RenderUnit:
 	WithTurret:
 	AutoTarget:
@@ -222,7 +229,9 @@ ARTY:
 		Range: 5
 	Armament:
 		Weapon: 155mm
+		LocalOffset: 624,0,208
 	AttackFrontal:
+	WithMuzzleFlash:
 	RenderUnit:
 	Explodes:
 		Weapon: UnitExplode
@@ -674,7 +683,9 @@ FTRK:
 	Armament:
 		Weapon: FLAK-23
 		Recoil: 85
+		LocalOffset: 512,0,192
 	AttackTurreted:
+	WithMuzzleFlash:
 	RenderUnit:
 	WithTurret:
 	AutoTarget:
--- a/mods/ra/sequences/ships.yaml
+++ b/mods/ra/sequences/ships.yaml
@@ -10,6 +10,9 @@ ca:
 	turret: turr
 		Start: 0
 		Facings: 32
+	muzzle: gunfire2
+		Start: 0
+		Length: 5

 dd:
 	idle:
@@ -26,6 +29,9 @@ pt:
 	turret: mgun
 		Start: 0
 		Facings: 32
+	muzzle: gunfire2
+		Start: 0
+		Length: 5

 lst:
 	idle:
--- a/mods/ra/sequences/structures.yaml
+++ b/mods/ra/sequences/structures.yaml
@@ -263,6 +263,9 @@ gun:
 	damaged-recoil:
 		Start: 96
 		Facings: 32
+	muzzle: gunfire2
+		Start: 0
+		Length: 5

 agun:
 	idle:
@@ -280,6 +283,9 @@ agun:
 	damaged-recoil:
 		Start: 96
 		Facings: 32
+	muzzle: gunfire2
+		Start: 1
+		Length: 4

 sam:
 	idle:
--- a/mods/ra/sequences/vehicles.yaml
+++ b/mods/ra/sequences/vehicles.yaml
@@ -75,6 +75,9 @@ hhusk2:
 	turret:
 		Start: 32
 		Facings: 32
+	muzzle: gunfire2
+		Start: 0
+		Length: 2

 2tnk:
 	idle:
@@ -83,6 +86,9 @@ hhusk2:
 	turret:
 		Start: 32
 		Facings: 32
+	muzzle: gunfire2
+		Start: 0
+		Length: 5

 3tnk:
 	idle:
@@ -91,6 +97,9 @@ hhusk2:
 	turret:
 		Start: 32
 		Facings: 32
+	muzzle: gunfire2
+		Start: 0
+		Length: 5

 4tnk:
 	idle:
@@ -99,6 +108,9 @@ hhusk2:
 	turret:
 		Start: 32
 		Facings: 32
+	muzzle: gunfire2
+		Start: 0
+		Length: 5

 v2rl:
 	idle:
@@ -118,6 +130,9 @@ arty:
 	idle:
 		Start: 0
 		Facings: 32
+	muzzle: gunfire2
+		Start: 0
+		Length: 5

 jeep:
 	idle:
@@ -187,6 +202,9 @@ ftrk:
 	turret:
 		Start: 32
 		Facings: 32
+	muzzle: gunfire2
+		Start: 0
+		Length: 2

 dtrk:
 	idle:
@@ -197,3 +215,6 @@ ctnk:
 	idle:
 		Start: 0
 		Facings: 32
+	muzzle: gunfire2
+		Start: 0
+		Length: 5