From 4521157901f8df8c65f445c28fd3df6d268a0ee4 Mon Sep 17 00:00:00 2001 From: Zimmermann Gyula Date: Sun, 2 Aug 2015 23:30:51 +0200 Subject: [PATCH] Fix TS water effect palettes. Also copied over the waterpiffs from RA because TS equvivalent has no fitting palette/only singular piff exists - w_piffs didn't. --- mods/ts/bits/w_piff.shp | Bin 0 -> 238 bytes mods/ts/bits/w_piffs.shp | Bin 0 -> 958 bytes mods/ts/weapons/bombsandgrenades.yaml | 3 +++ mods/ts/weapons/energyweapons.yaml | 2 ++ mods/ts/weapons/largeguns.yaml | 4 ++++ mods/ts/weapons/missiles.yaml | 6 ++++++ mods/ts/weapons/otherweapons.yaml | 1 + mods/ts/weapons/smallguns.yaml | 11 +++++++++++ mods/ts/weapons/superweapons.yaml | 1 + 9 files changed, 28 insertions(+) create mode 100755 mods/ts/bits/w_piff.shp create mode 100755 mods/ts/bits/w_piffs.shp diff --git a/mods/ts/bits/w_piff.shp b/mods/ts/bits/w_piff.shp new file mode 100755 index 0000000000000000000000000000000000000000..5d3f807e5423b066cc30e3a602d6955c99a93890 GIT binary patch literal 238 zcmZQzkYG?|U}fN95MW>iLI_|7Qw>0pi-89y3gI(A=?Oq_P6j@pE>^HQnD`1Hj{|59 zJDNEsz~X{HaV8Y?4?w&H3{RR{7&b7-J6zHFB@f~=EMj121Th+csJYdzl|fq?s1PUw ymSt!J$}engUAz#il7oTafN=3usNAB(3`-am0~IhV2I2z;t}X$yfFw|yfdK$$AR&tY literal 0 HcmV?d00001 diff --git a/mods/ts/bits/w_piffs.shp b/mods/ts/bits/w_piffs.shp new file mode 100755 index 0000000000000000000000000000000000000000..3657958ed613152129b058329560b6229d6c7a63 GIT binary patch literal 958 zcmZ9Ky>in~5QUHae{5N@>`b7`5MY?R0zGB&3=|Z!JOLVGYHF$*Nd=`_cn^9C8af^! z-`<-LYTiH8zub0Rrv6WXRelPai0nJU+_#zGRq_URV1Zg{R#dB zJXWc#x}*9sHoVrER!6u4kLYoJ(&xh4YjB(%)qnJOi%W?93O)~pJN@2$(m~(fJ^lLr z12u}AikdJgbBgRVD5c0wPT4_Gu7R3D!)~uU*Y)21sC3FLj3Epm0G3h#Az$)3v@%w< z;Ovw_wRAL$T2{K3ThBdCRO-MD%8wmOt%JyN$Pd`pxcjLtsg=Fq-+h( zJgniFeWw;8hz)mblRJ2StAfOrJ2M0Rb(AFaQ7m literal 0 HcmV?d00001 diff --git a/mods/ts/weapons/bombsandgrenades.yaml b/mods/ts/weapons/bombsandgrenades.yaml index b4d854a7fa..7e6ac23eef 100644 --- a/mods/ts/weapons/bombsandgrenades.yaml +++ b/mods/ts/weapons/bombsandgrenades.yaml @@ -24,6 +24,7 @@ Grenade: InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect Explosion: small_watersplash + ExplosionPalette: player ImpactSound: ssplash3.aud ValidImpactTypes: Water Warhead@4Smu: LeaveSmudge @@ -55,6 +56,7 @@ Bomb: InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect Explosion: small_watersplash + ExplosionPalette: player ImpactSound: ssplash3.aud ValidImpactTypes: Water Warhead@4Smu: LeaveSmudge @@ -87,6 +89,7 @@ RPGTower: InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect Explosion: small_watersplash + ExplosionPalette: player ImpactSound: ssplash2.aud ValidImpactTypes: Water Warhead@4Smu: LeaveSmudge diff --git a/mods/ts/weapons/energyweapons.yaml b/mods/ts/weapons/energyweapons.yaml index c5a1c3d732..489a883005 100644 --- a/mods/ts/weapons/energyweapons.yaml +++ b/mods/ts/weapons/energyweapons.yaml @@ -83,6 +83,7 @@ CyCannon: InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect Explosion: small_watersplash + ExplosionPalette: player ImpactSound: ssplash3.aud ValidImpactTypes: Water Warhead@4Smu: LeaveSmudge @@ -119,6 +120,7 @@ Proton: InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect Explosion: small_watersplash + ExplosionPalette: player ImpactSound: ssplash3.aud ValidImpactTypes: Water diff --git a/mods/ts/weapons/largeguns.yaml b/mods/ts/weapons/largeguns.yaml index 1c7cf0ab2c..1d8f92cbaf 100644 --- a/mods/ts/weapons/largeguns.yaml +++ b/mods/ts/weapons/largeguns.yaml @@ -24,6 +24,7 @@ InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect Explosion: small_watersplash + ExplosionPalette: player ImpactSound: ssplash3.aud ValidImpactTypes: Water Warhead@4Smu: LeaveSmudge @@ -51,6 +52,7 @@ InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect Explosion: small_watersplash + ExplosionPalette: player ImpactSound: ssplash3.aud ValidImpactTypes: Water Warhead@4Smu: LeaveSmudge @@ -84,6 +86,7 @@ InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect Explosion: small_watersplash + ExplosionPalette: player ImpactSound: ssplash3.aud ValidImpactTypes: Water Warhead@4Smu: LeaveSmudge @@ -117,6 +120,7 @@ InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect Explosion: small_watersplash + ExplosionPalette: player ImpactSound: ssplash2.aud ValidImpactTypes: Water Warhead@4Smu: LeaveSmudge diff --git a/mods/ts/weapons/missiles.yaml b/mods/ts/weapons/missiles.yaml index 3bdb548555..c3090c58bb 100644 --- a/mods/ts/weapons/missiles.yaml +++ b/mods/ts/weapons/missiles.yaml @@ -31,6 +31,7 @@ Bazooka: InvalidImpactTypes: Water, Air, AirHit Warhead@3EffWater: CreateEffect Explosion: small_watersplash + ExplosionPalette: player ImpactSound: ssplash3.aud ValidImpactTypes: Water Warhead@4EffAir: CreateEffect @@ -74,6 +75,7 @@ HoverMissile: InvalidImpactTypes: Water, Air, AirHit Warhead@3EffWater: CreateEffect Explosion: small_watersplash + ExplosionPalette: player ImpactSound: ssplash3.aud ValidImpactTypes: Water Warhead@4EffAir: CreateEffect @@ -116,6 +118,7 @@ MammothTusk: InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect Explosion: small_watersplash + ExplosionPalette: player ImpactSound: ssplash3.aud ValidImpactTypes: Water @@ -154,6 +157,7 @@ BikeMissile: InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect Explosion: small_watersplash + ExplosionPalette: player ImpactSound: ssplash3.aud ValidImpactTypes: Water Warhead@4Smu: LeaveSmudge @@ -193,6 +197,7 @@ Dragon: InvalidImpactTypes: Water, Air, AirHit Warhead@3EffWater: CreateEffect Explosion: small_watersplash + ExplosionPalette: player ImpactSound: ssplash3.aud ValidImpactTypes: Water Warhead@4EffAir: CreateEffect @@ -236,6 +241,7 @@ Hellfire: InvalidImpactTypes: Water, Air, AirHit Warhead@3EffWater: CreateEffect Explosion: small_watersplash + ExplosionPalette: player ImpactSound: ssplash3.aud ValidImpactTypes: Water Warhead@4EffAir: CreateEffect diff --git a/mods/ts/weapons/otherweapons.yaml b/mods/ts/weapons/otherweapons.yaml index 9bb856daf6..03d2a95c15 100644 --- a/mods/ts/weapons/otherweapons.yaml +++ b/mods/ts/weapons/otherweapons.yaml @@ -42,6 +42,7 @@ FiendShard: DamageTypes: Prone100Percent, TriggerProne, BulletDeath Warhead@3EffWater: CreateEffect Explosion: small_watersplash + ExplosionPalette: player ImpactSound: ssplash3.aud ValidImpactTypes: Water diff --git a/mods/ts/weapons/smallguns.yaml b/mods/ts/weapons/smallguns.yaml index a720f1a7b6..fa5388836d 100644 --- a/mods/ts/weapons/smallguns.yaml +++ b/mods/ts/weapons/smallguns.yaml @@ -18,6 +18,7 @@ Minigun: InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect Explosion: water_piffs + ExplosionPalette: ra ValidImpactTypes: Water M1Carbine: @@ -40,6 +41,7 @@ M1Carbine: InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect Explosion: water_piffs + ExplosionPalette: ra ValidImpactTypes: Water Vulcan: @@ -62,6 +64,7 @@ Vulcan: InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect Explosion: water_piffs + ExplosionPalette: ra ValidImpactTypes: Water Vulcan2: @@ -86,6 +89,7 @@ Vulcan2: InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect Explosion: water_piffs + ExplosionPalette: ra ValidImpactTypes: Water Vulcan3: @@ -109,6 +113,7 @@ Vulcan3: InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect Explosion: water_piffs + ExplosionPalette: ra ValidImpactTypes: Water VulcanTower: @@ -131,6 +136,7 @@ VulcanTower: InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect Explosion: water_piffs + ExplosionPalette: ra ValidImpactTypes: Water JumpCannon: @@ -154,6 +160,7 @@ JumpCannon: InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect Explosion: water_piffs + ExplosionPalette: ra ValidImpactTypes: Water AssaultCannon: @@ -176,6 +183,7 @@ AssaultCannon: InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect Explosion: water_piffs + ExplosionPalette: ra ValidImpactTypes: Water RaiderCannon: @@ -200,6 +208,7 @@ RaiderCannon: InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect Explosion: water_piffs + ExplosionPalette: ra ValidImpactTypes: Water HarpyClaw: @@ -224,6 +233,7 @@ HarpyClaw: InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect Explosion: water_piffs + ExplosionPalette: ra ValidImpactTypes: Water Pistola: @@ -246,6 +256,7 @@ Pistola: InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect Explosion: water_piff + ExplosionPalette: ra ValidImpactTypes: Water Sniper: diff --git a/mods/ts/weapons/superweapons.yaml b/mods/ts/weapons/superweapons.yaml index ad9647b4a2..24e75d7bd6 100644 --- a/mods/ts/weapons/superweapons.yaml +++ b/mods/ts/weapons/superweapons.yaml @@ -30,6 +30,7 @@ MultiCluster: InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect Explosion: small_watersplash + ExplosionPalette: player ImpactSound: ssplash2.aud ValidImpactTypes: Water Warhead@4Smu: LeaveSmudge