From e80785b59b67513d98fcd55333e3719c6964b11e Mon Sep 17 00:00:00 2001 From: reaperrr Date: Thu, 8 Aug 2013 22:22:46 +0200 Subject: [PATCH 1/6] Adds water piff(s) animations to machine gun/pistol/rifle weapons. --- mods/ra/bits/wpiff.shp | Bin 0 -> 225 bytes mods/ra/bits/wpifpif.shp | Bin 0 -> 673 bytes mods/ra/sequences/animations.yaml | 6 ++++++ mods/ra/weapons.yaml | 16 +++++++++++++--- 4 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 mods/ra/bits/wpiff.shp create mode 100644 mods/ra/bits/wpifpif.shp diff --git a/mods/ra/bits/wpiff.shp b/mods/ra/bits/wpiff.shp new file mode 100644 index 0000000000000000000000000000000000000000..7c26dd146a16f39969483453aa09a3c2d97de58a GIT binary patch literal 225 zcmZQ&009XGWiai=z|a6<#6#&WD7_I%pM%m5!Kx9&zivi`#s&Yx7#NzLG`E20#tr{^ z7#SM=X@e!ifdY&EfylBTzk1 zx^-c5>*9qV*5z)fGKf_o3=Hjy7BehiSiI;TklnZ#V%-8phL$A^42u=mF7+|~>jD}J E0KOkX^#A|> literal 0 HcmV?d00001 diff --git a/mods/ra/bits/wpifpif.shp b/mods/ra/bits/wpifpif.shp new file mode 100644 index 0000000000000000000000000000000000000000..8496a4849d226d585f470474093d7aef87010b8e GIT binary patch literal 673 zcmY*WF-Tic6g@YUh=?}OYB~u1HV$o}O+cZz1wp8b2!cxoC#5Zdfs(PbFWrte!g|+Scg*G0@CT~yZ^sN`-gWv=bd}b;l3Wo_W+p)7lDuR^TFb- z#XA)9^A^8be3*#&Hx@T6Ruhq3=inwmRd^6^&)gM3Rp*z+gqNd>v?09kEh)uav8FXo zs_uWGaG6}?mU+M^rdz*>M`h~S%@oV5Iv+H%%_2Dyq7D{FP5ax1YE4qP>Xvnt?~B1< zlfok1>d+@{WB--AD}J0bXZ>u1O3IV$*d%yIPOh;|hdY#ipL$f*s6o#>ZtRfKh3rX@ zN}Z;e1phV5pB%NVHZ|J`4i z*;5(|O8dPeuYfJ?mF;BAb`(oMrSY7&8~7Y|^pHgt_nQkXdb?+{EPs}G&CoUH8pM`vFR>pPo4%Z_&~y5cSOM)MbtHhP3lbm literal 0 HcmV?d00001 diff --git a/mods/ra/sequences/animations.yaml b/mods/ra/sequences/animations.yaml index 18467df3ae..15110611f6 100644 --- a/mods/ra/sequences/animations.yaml +++ b/mods/ra/sequences/animations.yaml @@ -22,6 +22,12 @@ explosion: piffs: piffpiff Start: 0 Length: * + water_piff: wpiff + Start: 0 + Length: * + water_piffs: wpifpif + Start: 0 + Length: * small_explosion: veh-hit3 Start: 0 Length: * diff --git a/mods/ra/weapons.yaml b/mods/ra/weapons.yaml index 3050646ba3..e7c09ad9d8 100644 --- a/mods/ra/weapons.yaml +++ b/mods/ra/weapons.yaml @@ -12,6 +12,7 @@ Colt45: Heavy: 5% Concrete: 0% Explosion: piff + WaterExplosion: water_piff InfDeath: 2 Damage: 50 @@ -47,6 +48,7 @@ Vulcan: Heavy: 25% Concrete: 25% Explosion: piffs + WaterExplosion: water_piffs InfDeath: 2 Damage: 10 Warhead@2: @@ -57,6 +59,7 @@ Vulcan: Heavy: 25% Concrete: 25% Explosion: piffs + WaterExplosion: water_piffs InfDeath: 2 Damage: 10 Delay: 2 @@ -68,6 +71,7 @@ Vulcan: Heavy: 25% Concrete: 25% Explosion: piffs + WaterExplosion: water_piffs InfDeath: 2 Damage: 10 Delay: 4 @@ -79,6 +83,7 @@ Vulcan: Heavy: 25% Concrete: 25% Explosion: piffs + WaterExplosion: water_piffs InfDeath: 2 Damage: 10 Delay: 6 @@ -90,6 +95,7 @@ Vulcan: Heavy: 25% Concrete: 25% Explosion: piffs + WaterExplosion: water_piffs InfDeath: 2 Damage: 10 Delay: 8 @@ -101,6 +107,7 @@ Vulcan: Heavy: 25% Concrete: 25% Explosion: piffs + WaterExplosion: water_piffs InfDeath: 2 Damage: 10 Delay: 10 @@ -203,7 +210,7 @@ ChainGun: Heavy: 25% Concrete: 25% Explosion: piffs - WaterExplosion: small_splash + WaterExplosion: water_piffs InfDeath: 2 Damage: 20 @@ -223,7 +230,7 @@ ChainGun.Yak: Heavy: 25% Concrete: 25% Explosion: piffs - WaterExplosion: small_splash + WaterExplosion: water_piffs InfDeath: 2 Damage: 40 @@ -241,6 +248,7 @@ Pistol: Heavy: 25% Concrete: 25% Explosion: piff + WaterExplosion: water_piff InfDeath: 2 Damage: 1 @@ -258,6 +266,7 @@ M1Carbine: Heavy: 10% Concrete: 10% Explosion: piffs + WaterExplosion: water_piffs InfDeath: 2 Damage: 15 @@ -552,7 +561,7 @@ M60mg: Heavy: 10% Concrete: 10% Explosion: piffs - WaterExplosion: small_splash + WaterExplosion: water_piffs InfDeath: 2 Damage: 15 @@ -940,6 +949,7 @@ SilencedPPK: Heavy: 0% Concrete: 0% Explosion: piffs + WaterExplosion: water_piffs InfDeath: 2 Damage: 150 From b56b0075e464fccd42f6908ba62adc78b1af7e3f Mon Sep 17 00:00:00 2001 From: reaperrr Date: Thu, 8 Aug 2013 22:24:29 +0200 Subject: [PATCH 2/6] Adds explosion sequences for flak.shp and veh-hit1.shp, labeled small_explosion_air and med_explosion_air, respectively. --- mods/ra/sequences/animations.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/mods/ra/sequences/animations.yaml b/mods/ra/sequences/animations.yaml index 15110611f6..15a784eaec 100644 --- a/mods/ra/sequences/animations.yaml +++ b/mods/ra/sequences/animations.yaml @@ -34,6 +34,12 @@ explosion: med_explosion: veh-hit2 Start: 0 Length: * + small_explosion_air: flak + Start: 0 + Length: * + med_explosion_air: veh-hit1 + Start: 0 + Length: * large_splash: h2o_exp1 Start: 0 Length: * From d47912a58f6601c2f019e74aa576482747dfbf69 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Thu, 8 Aug 2013 22:28:53 +0200 Subject: [PATCH 3/6] Changes Explosion from med_explosion to either small_explosion_air or med_explosion_air for several weapons that are (mostly) anti-air, for more animation variety. --- mods/ra/weapons.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mods/ra/weapons.yaml b/mods/ra/weapons.yaml index e7c09ad9d8..241244b93c 100644 --- a/mods/ra/weapons.yaml +++ b/mods/ra/weapons.yaml @@ -31,7 +31,7 @@ ZSU-23: Wood: 75% Light: 75% Concrete: 50% - Explosion: med_explosion + Explosion: small_explosion_air Damage: 25 Vulcan: @@ -357,7 +357,7 @@ HellfireAA: Wood: 75% Light: 75% Concrete: 50% - Explosion: med_explosion + Explosion: med_explosion_air WaterExplosion: med_splash InfDeath: 4 SmudgeType: Crater @@ -514,7 +514,7 @@ MammothTusk: Wood: 75% Light: 60% Heavy: 25% - Explosion: med_explosion + Explosion: med_explosion_air WaterExplosion: med_splash InfDeath: 3 SmudgeType: Crater @@ -680,7 +680,7 @@ Nike: Light: 90% Heavy: 50% Concrete: 0% - Explosion: med_explosion + Explosion: med_explosion_air InfDeath: 3 SmudgeType: Crater Damage: 100 @@ -707,7 +707,7 @@ RedEye: Wood: 75% Light: 60% Heavy: 25% - Explosion: med_explosion + Explosion: med_explosion_air InfDeath: 3 SmudgeType: Crater Damage: 40 @@ -1215,7 +1215,7 @@ FLAK-23: Light: 60% Heavy: 10% Concrete: 20% - Explosion: med_explosion + Explosion: small_explosion_air Damage: 20 Sniper: From f8a2290cb7b39eb875374053e68da9f950468495 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Thu, 8 Aug 2013 22:32:52 +0200 Subject: [PATCH 4/6] Changes explosion animations for artillery, cruiser and missile sub weapons from large_explosion to artillery_explosion. --- mods/ra/weapons.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mods/ra/weapons.yaml b/mods/ra/weapons.yaml index 241244b93c..e40244ba82 100644 --- a/mods/ra/weapons.yaml +++ b/mods/ra/weapons.yaml @@ -540,7 +540,7 @@ MammothTusk: Light: 60% Heavy: 25% Concrete: 50% - Explosion: large_explosion + Explosion: artillery_explosion WaterExplosion: med_splash InfDeath: 3 SmudgeType: Crater @@ -731,7 +731,7 @@ RedEye: Wood: 75% Light: 60% Heavy: 25% - Explosion: large_explosion + Explosion: artillery_explosion WaterExplosion: large_splash InfDeath: 3 SmudgeType: Crater @@ -758,7 +758,7 @@ SubMissile: None: 40% Light: 30% Heavy: 30% - Explosion: large_explosion + Explosion: artillery_explosion WaterExplosion: large_splash InfDeath: 3 SmudgeType: Crater From be2fd7b9df7d3be30b7b64f0aaceef4a897aac5a Mon Sep 17 00:00:00 2001 From: reaperrr Date: Thu, 8 Aug 2013 22:42:38 +0200 Subject: [PATCH 5/6] WaterImpactSound overhaul. Nearly all ballistic or missile weapons now have a splash sound when hitting water. --- mods/ra/weapons.yaml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/mods/ra/weapons.yaml b/mods/ra/weapons.yaml index e40244ba82..e45f17d2a0 100644 --- a/mods/ra/weapons.yaml +++ b/mods/ra/weapons.yaml @@ -140,6 +140,7 @@ Maverick: Concrete: 50% Explosion: med_explosion WaterExplosion: med_splash + WaterImpactSound: splash9.aud InfDeath: 4 SmudgeType: Crater Damage: 70 @@ -300,6 +301,7 @@ Dragon: SmudgeType: Crater Damage: 50 ImpactSound: kaboom12.aud + WaterImpactSound: splash9.aud HellfireAG: ROF: 60 @@ -331,6 +333,7 @@ HellfireAG: InfDeath: 4 SmudgeType: Crater Damage: 40 + WaterImpactSound: splash9.aud HellfireAA: ROF: 60 @@ -386,6 +389,7 @@ Grenade: SmudgeType: Crater Damage: 60 ImpactSound: kaboom12.aud + WaterImpactSound: splash9.aud 25mm: ROF: 13 @@ -423,6 +427,7 @@ Grenade: Concrete: 50% Explosion: small_explosion WaterExplosion: small_splash + WaterImpactSound: splash9.aud InfDeath: 4 SmudgeType: Crater Damage: 40 @@ -445,6 +450,7 @@ Grenade: Concrete: 50% Explosion: small_explosion WaterExplosion: small_splash + WaterImpactSound: splash9.aud InfDeath: 4 SmudgeType: Crater Damage: 40 @@ -466,6 +472,7 @@ Grenade: Concrete: 50% Explosion: small_explosion WaterExplosion: small_splash + WaterImpactSound: splash9.aud InfDeath: 4 SmudgeType: Crater Damage: 60 @@ -486,6 +493,7 @@ TurretGun: Concrete: 50% Explosion: small_explosion WaterExplosion: small_splash + WaterImpactSound: splash9.aud InfDeath: 4 SmudgeType: Crater Damage: 60 @@ -516,6 +524,7 @@ MammothTusk: Heavy: 25% Explosion: med_explosion_air WaterExplosion: med_splash + WaterImpactSound: splash9.aud InfDeath: 3 SmudgeType: Crater Damage: 45 @@ -542,6 +551,7 @@ MammothTusk: Concrete: 50% Explosion: artillery_explosion WaterExplosion: med_splash + WaterImpactSound: splash9.aud InfDeath: 3 SmudgeType: Crater Damage: 220 @@ -584,6 +594,7 @@ Napalm: InfDeath: 5 SmudgeType: Scorch ImpactSound: firebl3.aud + WaterImpactSound: splash9.aud Damage: 100 CrateNapalm: @@ -793,6 +804,7 @@ Stinger: Concrete: 50% Explosion: med_explosion WaterExplosion: med_splash + WaterImpactSound: splash9.aud InfDeath: 4 SmudgeType: Crater Damage: 30 @@ -820,6 +832,7 @@ TorpTube: Light: 75% Concrete: 50% WaterExplosion: large_splash + WaterImpactSound: splash9.aud InfDeath: 4 SmudgeType: Crater Damage: 180 @@ -840,6 +853,7 @@ TorpTube: Concrete: 50% Explosion: small_explosion WaterExplosion: med_splash + WaterImpactSound: splash9.aud InfDeath: 4 SmudgeType: Crater Damage: 25 @@ -862,6 +876,7 @@ DepthCharge: Light: 75% Concrete: 50% WaterExplosion: large_splash + WaterImpactSound: splash9.aud InfDeath: 4 SmudgeType: Crater Damage: 80 @@ -887,6 +902,7 @@ ParaBomb: SmudgeType: Crater Damage: 500 ImpactSound: kaboom15.aud + WaterImpactSound: splash9.aud DogJaw: ROF: 10 @@ -1261,6 +1277,7 @@ ChronoTusk: Concrete: 50% Explosion: med_explosion WaterExplosion: med_splash + WaterImpactSound: splash9.aud InfDeath: 4 SmudgeType: Crater Damage: 30 From f55ed62ebf77b542c95cb3ecdcbf41c36f4ef7d0 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Thu, 8 Aug 2013 22:43:48 +0200 Subject: [PATCH 6/6] ImpactSound overhaul. Nearly all cannons and missiles now have ImpactSounds. Rule of thumb: kaboom12 for cannons (tanks, gun turret), kaboom15 for artillery weapons (cruiser, missile sub, artillery), kaboom25 for missiles. Exceptions are the Flak Truck and Light Tank, due to their high rate of fire. --- mods/ra/weapons.yaml | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/mods/ra/weapons.yaml b/mods/ra/weapons.yaml index e45f17d2a0..7f4d8dc431 100644 --- a/mods/ra/weapons.yaml +++ b/mods/ra/weapons.yaml @@ -140,6 +140,7 @@ Maverick: Concrete: 50% Explosion: med_explosion WaterExplosion: med_splash + ImpactSound: kaboom25.aud WaterImpactSound: splash9.aud InfDeath: 4 SmudgeType: Crater @@ -300,7 +301,7 @@ Dragon: InfDeath: 4 SmudgeType: Crater Damage: 50 - ImpactSound: kaboom12.aud + ImpactSound: kaboom25.aud WaterImpactSound: splash9.aud HellfireAG: @@ -333,6 +334,7 @@ HellfireAG: InfDeath: 4 SmudgeType: Crater Damage: 40 + ImpactSound: kaboom25.aud WaterImpactSound: splash9.aud HellfireAA: @@ -388,7 +390,7 @@ Grenade: InfDeath: 3 SmudgeType: Crater Damage: 60 - ImpactSound: kaboom12.aud + ImpactSound: kaboom25.aud WaterImpactSound: splash9.aud 25mm: @@ -427,6 +429,7 @@ Grenade: Concrete: 50% Explosion: small_explosion WaterExplosion: small_splash + ImpactSound: kaboom12.aud WaterImpactSound: splash9.aud InfDeath: 4 SmudgeType: Crater @@ -450,6 +453,7 @@ Grenade: Concrete: 50% Explosion: small_explosion WaterExplosion: small_splash + ImpactSound: kaboom12.aud WaterImpactSound: splash9.aud InfDeath: 4 SmudgeType: Crater @@ -472,6 +476,7 @@ Grenade: Concrete: 50% Explosion: small_explosion WaterExplosion: small_splash + ImpactSound: kaboom12.aud WaterImpactSound: splash9.aud InfDeath: 4 SmudgeType: Crater @@ -493,6 +498,7 @@ TurretGun: Concrete: 50% Explosion: small_explosion WaterExplosion: small_splash + ImpactSound: kaboom12.aud WaterImpactSound: splash9.aud InfDeath: 4 SmudgeType: Crater @@ -524,6 +530,7 @@ MammothTusk: Heavy: 25% Explosion: med_explosion_air WaterExplosion: med_splash + ImpactSound: kaboom25.aud WaterImpactSound: splash9.aud InfDeath: 3 SmudgeType: Crater @@ -551,6 +558,7 @@ MammothTusk: Concrete: 50% Explosion: artillery_explosion WaterExplosion: med_splash + ImpactSound: kaboom15.aud WaterImpactSound: splash9.aud InfDeath: 3 SmudgeType: Crater @@ -692,6 +700,7 @@ Nike: Heavy: 50% Concrete: 0% Explosion: med_explosion_air + ImpactSound: kaboom25.aud InfDeath: 3 SmudgeType: Crater Damage: 100 @@ -719,6 +728,7 @@ RedEye: Light: 60% Heavy: 25% Explosion: med_explosion_air + ImpactSound: kaboom25.aud InfDeath: 3 SmudgeType: Crater Damage: 40 @@ -747,7 +757,7 @@ RedEye: InfDeath: 3 SmudgeType: Crater Damage: 250 - ImpactSound: kaboom12.aud + ImpactSound: kaboom15.aud WaterImpactSound: splash9.aud SubMissile: @@ -774,7 +784,7 @@ SubMissile: InfDeath: 3 SmudgeType: Crater Damage: 300 - ImpactSound: kaboom12.aud + ImpactSound: kaboom15.aud WaterImpactSound: splash9.aud Stinger: @@ -804,6 +814,7 @@ Stinger: Concrete: 50% Explosion: med_explosion WaterExplosion: med_splash + ImpactSound: kaboom25.aud WaterImpactSound: splash9.aud InfDeath: 4 SmudgeType: Crater @@ -853,6 +864,7 @@ TorpTube: Concrete: 50% Explosion: small_explosion WaterExplosion: med_splash + ImpactSound: kaboom12.aud WaterImpactSound: splash9.aud InfDeath: 4 SmudgeType: Crater @@ -1277,6 +1289,7 @@ ChronoTusk: Concrete: 50% Explosion: med_explosion WaterExplosion: med_splash + ImpactSound: kaboom25.aud WaterImpactSound: splash9.aud InfDeath: 4 SmudgeType: Crater