From 78b4f17bafbd04d598a587706db058b70a66f8f1 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sun, 4 Aug 2013 18:27:10 +0200 Subject: [PATCH 1/3] Adds muzzle flash to all vehicles and ships with cannons. Muzzle animation is a customized version of the original gunfire.shp. Not using all frames for light tank, flak truck and flak cannon is intentional. --- mods/ra/bits/gunfire2.shp | Bin 0 -> 460 bytes mods/ra/rules/ships.yaml | 5 +++++ mods/ra/rules/structures.yaml | 5 +++++ mods/ra/rules/vehicles.yaml | 7 +++++++ mods/ra/sequences/ships.yaml | 6 ++++++ mods/ra/sequences/structures.yaml | 6 ++++++ mods/ra/sequences/vehicles.yaml | 21 +++++++++++++++++++++ 7 files changed, 50 insertions(+) create mode 100644 mods/ra/bits/gunfire2.shp diff --git a/mods/ra/bits/gunfire2.shp b/mods/ra/bits/gunfire2.shp new file mode 100644 index 0000000000000000000000000000000000000000..11387444caa723509bffbdfe2eb4babc1966fda4 GIT binary patch literal 460 zcmYLGJ5R$f5WWg3@l;ZF#LNZ@5(1%4NQeOhtVofN5HMwBYmzpBrJ0fZgJ@y!qmJ#w zlz(Dz?n9i1&v(B2zPoc9yoGqYodfhdzAms@;8|-PFBkaT@>&1p9sx2!x!VF5FcMJe zHUSdqRv<{o=M$uaK$x)c3yeR&T_UYRtyCMgjTK5vq;eYoMKwVdCfz!~o0t(X?ba|; z&bTtdg?FID7Fsfb712QsN(w3Cz@2*XBP^-sZj*AImiUPX;Az#T7j8uPUenbwV;zNn40 zb)%!b#A3ZpjgC75tEH@9C%zgeEwqkQyObOOl` e6U+41#$ob<{g$I=NT&XRF3!?7&9Lzw(E9@f$j(Rr literal 0 HcmV?d00001 diff --git a/mods/ra/rules/ships.yaml b/mods/ra/rules/ships.yaml index 347e014d10..71c5c02ecc 100644 --- a/mods/ra/rules/ships.yaml +++ b/mods/ra/rules/ships.yaml @@ -174,12 +174,16 @@ CA: Recoil: 171 RecoilRecovery: 34 Armament@SECONDARY: + Name: secondary Turret: secondary Weapon: 8Inch LocalOffset: 213,-171,0, 213,171,0 Recoil: 171 RecoilRecovery: 34 AttackTurreted: + WithMuzzleFlash@PRIMARY: + WithMuzzleFlash@SECONDARY: + Armament: secondary Selectable: Bounds: 44,44 RenderUnit: @@ -253,6 +257,7 @@ PT: Armament@SECONDARY: Weapon: DepthCharge AttackTurreted: + WithMuzzleFlash@PRIMARY: Selectable: Bounds: 32,32 RenderUnit: diff --git a/mods/ra/rules/structures.yaml b/mods/ra/rules/structures.yaml index b1e3476f22..061e31f8a1 100644 --- a/mods/ra/rules/structures.yaml +++ b/mods/ra/rules/structures.yaml @@ -336,8 +336,12 @@ AGUN: Armament@PRIMARY: Weapon: ZSU-23 Armament@SECONDARY: + Name: secondary Weapon: ZSU-23 AttackTurreted: + WithMuzzleFlash@PRIMARY: + WithMuzzleFlash@SECONDARY: + Armament: secondary AutoTarget: IronCurtainable: -RenderBuilding: @@ -733,6 +737,7 @@ GUN: Armament: Weapon: TurretGun AttackTurreted: + WithMuzzleFlash: AutoTarget: IronCurtainable: -RenderBuilding: diff --git a/mods/ra/rules/vehicles.yaml b/mods/ra/rules/vehicles.yaml index 178104d04e..dabedbdc6c 100644 --- a/mods/ra/rules/vehicles.yaml +++ b/mods/ra/rules/vehicles.yaml @@ -55,6 +55,7 @@ V2RL: Recoil: 85 RecoilRecovery: 25 AttackTurreted: + WithMuzzleFlash: RenderUnit: WithTurret: AutoTarget: @@ -93,6 +94,7 @@ V2RL: Recoil: 128 RecoilRecovery: 38 AttackTurreted: + WithMuzzleFlash: RenderUnit: WithTurret: AutoTarget: @@ -134,6 +136,7 @@ V2RL: RecoilRecovery: 38 LocalOffset: 0,85,0, 0,-85,0 AttackTurreted: + WithMuzzleFlash: RenderUnit: WithTurret: AutoTarget: @@ -177,11 +180,13 @@ V2RL: 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: @@ -223,6 +228,7 @@ ARTY: Armament: Weapon: 155mm AttackFrontal: + WithMuzzleFlash: RenderUnit: Explodes: Weapon: UnitExplode @@ -675,6 +681,7 @@ FTRK: Weapon: FLAK-23 Recoil: 85 AttackTurreted: + WithMuzzleFlash: RenderUnit: WithTurret: AutoTarget: diff --git a/mods/ra/sequences/ships.yaml b/mods/ra/sequences/ships.yaml index 2ec8b40825..49cc5f4f39 100644 --- 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: diff --git a/mods/ra/sequences/structures.yaml b/mods/ra/sequences/structures.yaml index 77e6f55e6b..1d5131e4d1 100644 --- 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: diff --git a/mods/ra/sequences/vehicles.yaml b/mods/ra/sequences/vehicles.yaml index 74ed83840b..f9797882c1 100644 --- 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 From 3dc73d286dbcab030cf4999df1b891e2dc6d3dcf Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sun, 4 Aug 2013 18:29:27 +0200 Subject: [PATCH 2/3] Apply GTWR fix to RA defenses (pillboxes, flame turret) as well. --- mods/ra/rules/structures.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mods/ra/rules/structures.yaml b/mods/ra/rules/structures.yaml index 061e31f8a1..7d899a247f 100644 --- a/mods/ra/rules/structures.yaml +++ b/mods/ra/rules/structures.yaml @@ -402,7 +402,7 @@ PBOX: -AcceptsSupplies: Turreted: ROT: 255 - RenderBuilding: + BodyOrientation: QuantizedFacings: 8 Cargo: Types: Infantry @@ -567,7 +567,7 @@ HBOX: -AcceptsSupplies: Turreted: ROT: 255 - RenderBuilding: + BodyOrientation: QuantizedFacings: 8 Cargo: Types: Infantry @@ -774,7 +774,7 @@ FTUR: Weapon: FireballLauncher LocalOffset: 512,0,0 AttackTurreted: - RenderBuilding: + BodyOrientation: QuantizedFacings: 8 AutoTarget: IronCurtainable: From 6da236d47f51b3d89411f6bb75873d5140f794fe Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sun, 4 Aug 2013 18:33:09 +0200 Subject: [PATCH 3/3] Set/fix LocalOffsets for all units and structures with muzzle flashes in RA mod. Offsets that haven't been touched were either forgotten or deemed good enough. --- mods/ra/rules/ships.yaml | 19 +++++++++++-------- mods/ra/rules/structures.yaml | 29 ++++++++++++++++------------- mods/ra/rules/vehicles.yaml | 8 ++++++-- 3 files changed, 33 insertions(+), 23 deletions(-) diff --git a/mods/ra/rules/ships.yaml b/mods/ra/rules/ships.yaml index 71c5c02ecc..34ea0d7607 100644 --- 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,23 +162,23 @@ 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: @@ -251,10 +252,12 @@ 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: diff --git a/mods/ra/rules/structures.yaml b/mods/ra/rules/structures.yaml index 7d899a247f..5466a579c8 100644 --- a/mods/ra/rules/structures.yaml +++ b/mods/ra/rules/structures.yaml @@ -335,9 +335,11 @@ 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: @@ -465,7 +467,7 @@ PBOX.E1: AutoTarget: Armament: Weapon: Vulcan - LocalOffset: 469,0,0 + LocalOffset: 384,0,88 AttackTurreted: WithMuzzleFlash: Cargo: @@ -488,7 +490,7 @@ PBOX.E3: AutoTarget: Armament: Weapon: Dragon - LocalOffset: 469,0,0 + LocalOffset: 384,0,88 AttackTurreted: PBOX.E4: @@ -501,7 +503,7 @@ PBOX.E4: AutoTarget: Armament: Weapon: Flamer - LocalOffset: 469,0,0 + LocalOffset: 384,0,88 AttackTurreted: PBOX.E7: @@ -514,7 +516,7 @@ PBOX.E7: AutoTarget: Armament: Weapon: Colt45 - LocalOffset: 469,0,0 + LocalOffset: 384,0,88 AttackTurreted: PBOX.SHOK: @@ -527,7 +529,7 @@ PBOX.SHOK: AutoTarget: Armament: Weapon: PortaTesla - LocalOffset: 469,0,0 + LocalOffset: 384,0,88 AttackTurreted: PBOX.SNIPER: @@ -540,7 +542,7 @@ PBOX.SNIPER: AutoTarget: Armament: Weapon: Sniper - LocalOffset: 469,0,0 + LocalOffset: 384,0,88 AttackTurreted: HBOX: @@ -630,7 +632,7 @@ HBOX.E1: AutoTarget: Armament: Weapon: Vulcan - LocalOffset: 469,0,0 + LocalOffset: 400,0,48 AttackTurreted: WithMuzzleFlash: Cargo: @@ -653,7 +655,7 @@ HBOX.E3: AutoTarget: Armament: Weapon: Dragon - LocalOffset: 469,0,0 + LocalOffset: 400,0,48 AttackTurreted: HBOX.E4: @@ -666,7 +668,7 @@ HBOX.E4: AutoTarget: Armament: Weapon: Flamer - LocalOffset: 469,0,0 + LocalOffset: 400,0,48 AttackTurreted: HBOX.E7: @@ -679,7 +681,7 @@ HBOX.E7: AutoTarget: Armament: Weapon: Colt45 - LocalOffset: 469,0,0 + LocalOffset: 400,0,48 AttackTurreted: HBOX.SHOK: @@ -692,7 +694,7 @@ HBOX.SHOK: AutoTarget: Armament: Weapon: PortaTesla - LocalOffset: 469,0,0 + LocalOffset: 400,0,48 AttackTurreted: HBOX.SNIPER: @@ -705,7 +707,7 @@ HBOX.SNIPER: AutoTarget: Armament: Weapon: Sniper - LocalOffset: 469,0,0 + LocalOffset: 400,0,48 AttackTurreted: GUN: @@ -736,6 +738,7 @@ GUN: RenderBuildingTurreted: Armament: Weapon: TurretGun + LocalOffset: 512,0,112 AttackTurreted: WithMuzzleFlash: AutoTarget: @@ -769,7 +772,7 @@ FTUR: Range: 6 Turreted: ROT: 255 - Offset: 0,0,85 + Offset: 0,0,112 Armament: Weapon: FireballLauncher LocalOffset: 512,0,0 diff --git a/mods/ra/rules/vehicles.yaml b/mods/ra/rules/vehicles.yaml index dabedbdc6c..89f8e773b7 100644 --- a/mods/ra/rules/vehicles.yaml +++ b/mods/ra/rules/vehicles.yaml @@ -54,6 +54,7 @@ V2RL: Weapon: 25mm Recoil: 85 RecoilRecovery: 25 + LocalOffset: 768,0,90 AttackTurreted: WithMuzzleFlash: RenderUnit: @@ -93,6 +94,7 @@ V2RL: Weapon: 90mm Recoil: 128 RecoilRecovery: 38 + LocalOffset: 720,0,80 AttackTurreted: WithMuzzleFlash: RenderUnit: @@ -134,7 +136,7 @@ V2RL: Weapon: 105mm Recoil: 128 RecoilRecovery: 38 - LocalOffset: 0,85,0, 0,-85,0 + LocalOffset: 768,85,90, 768,-85,90 AttackTurreted: WithMuzzleFlash: RenderUnit: @@ -176,7 +178,7 @@ 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: @@ -227,6 +229,7 @@ ARTY: Range: 5 Armament: Weapon: 155mm + LocalOffset: 624,0,208 AttackFrontal: WithMuzzleFlash: RenderUnit: @@ -680,6 +683,7 @@ FTRK: Armament: Weapon: FLAK-23 Recoil: 85 + LocalOffset: 512,0,192 AttackTurreted: WithMuzzleFlash: RenderUnit: