epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #8903 from GraionDilach/ts-fixwatereffects

Browse Source 
Fix TS water effect palettes.
This commit is contained in:
Matthias Mailänder
2015-08-03 11:13:46 +02:00
parent 1eb46d4922 4521157901
commit e50f42672d
9 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
mods/ts/bits/w_piff.shp Executable file
View File

Binary file not shown.

BIN
mods/ts/bits/w_piffs.shp Executable file
View File

Binary file not shown.

3
mods/ts/weapons/bombsandgrenades.yaml
View File

@@ -24,6 +24,7 @@ Grenade:
InvalidImpactTypes: Water InvalidImpactTypes: Water
Warhead@3EffWater: CreateEffect Warhead@3EffWater: CreateEffect
Explosion: small_watersplash Explosion: small_watersplash
ExplosionPalette: player
ImpactSound: ssplash3.aud ImpactSound: ssplash3.aud
ValidImpactTypes: Water ValidImpactTypes: Water
Warhead@4Smu: LeaveSmudge Warhead@4Smu: LeaveSmudge
@@ -55,6 +56,7 @@ Bomb:
InvalidImpactTypes: Water InvalidImpactTypes: Water
Warhead@3EffWater: CreateEffect Warhead@3EffWater: CreateEffect
Explosion: small_watersplash Explosion: small_watersplash
ExplosionPalette: player
ImpactSound: ssplash3.aud ImpactSound: ssplash3.aud
ValidImpactTypes: Water ValidImpactTypes: Water
Warhead@4Smu: LeaveSmudge Warhead@4Smu: LeaveSmudge
@@ -87,6 +89,7 @@ RPGTower:
InvalidImpactTypes: Water InvalidImpactTypes: Water
Warhead@3EffWater: CreateEffect Warhead@3EffWater: CreateEffect
Explosion: small_watersplash Explosion: small_watersplash
ExplosionPalette: player
ImpactSound: ssplash2.aud ImpactSound: ssplash2.aud
ValidImpactTypes: Water ValidImpactTypes: Water
Warhead@4Smu: LeaveSmudge Warhead@4Smu: LeaveSmudge

2
mods/ts/weapons/energyweapons.yaml
View File

@@ -83,6 +83,7 @@ CyCannon:
InvalidImpactTypes: Water InvalidImpactTypes: Water
Warhead@3EffWater: CreateEffect Warhead@3EffWater: CreateEffect
Explosion: small_watersplash Explosion: small_watersplash
ExplosionPalette: player
ImpactSound: ssplash3.aud ImpactSound: ssplash3.aud
ValidImpactTypes: Water ValidImpactTypes: Water
Warhead@4Smu: LeaveSmudge Warhead@4Smu: LeaveSmudge
@@ -119,6 +120,7 @@ Proton:
InvalidImpactTypes: Water InvalidImpactTypes: Water
Warhead@3EffWater: CreateEffect Warhead@3EffWater: CreateEffect
Explosion: small_watersplash Explosion: small_watersplash
ExplosionPalette: player
ImpactSound: ssplash3.aud ImpactSound: ssplash3.aud
ValidImpactTypes: Water ValidImpactTypes: Water

4
mods/ts/weapons/largeguns.yaml
View File

@@ -24,6 +24,7 @@
InvalidImpactTypes: Water InvalidImpactTypes: Water
Warhead@3EffWater: CreateEffect Warhead@3EffWater: CreateEffect
Explosion: small_watersplash Explosion: small_watersplash
ExplosionPalette: player
ImpactSound: ssplash3.aud ImpactSound: ssplash3.aud
ValidImpactTypes: Water ValidImpactTypes: Water
Warhead@4Smu: LeaveSmudge Warhead@4Smu: LeaveSmudge
@@ -51,6 +52,7 @@
InvalidImpactTypes: Water InvalidImpactTypes: Water
Warhead@3EffWater: CreateEffect Warhead@3EffWater: CreateEffect
Explosion: small_watersplash Explosion: small_watersplash
ExplosionPalette: player
ImpactSound: ssplash3.aud ImpactSound: ssplash3.aud
ValidImpactTypes: Water ValidImpactTypes: Water
Warhead@4Smu: LeaveSmudge Warhead@4Smu: LeaveSmudge
@@ -84,6 +86,7 @@
InvalidImpactTypes: Water InvalidImpactTypes: Water
Warhead@3EffWater: CreateEffect Warhead@3EffWater: CreateEffect
Explosion: small_watersplash Explosion: small_watersplash
ExplosionPalette: player
ImpactSound: ssplash3.aud ImpactSound: ssplash3.aud
ValidImpactTypes: Water ValidImpactTypes: Water
Warhead@4Smu: LeaveSmudge Warhead@4Smu: LeaveSmudge
@@ -117,6 +120,7 @@
InvalidImpactTypes: Water InvalidImpactTypes: Water
Warhead@3EffWater: CreateEffect Warhead@3EffWater: CreateEffect
Explosion: small_watersplash Explosion: small_watersplash
ExplosionPalette: player
ImpactSound: ssplash2.aud ImpactSound: ssplash2.aud
ValidImpactTypes: Water ValidImpactTypes: Water
Warhead@4Smu: LeaveSmudge Warhead@4Smu: LeaveSmudge

6
mods/ts/weapons/missiles.yaml
View File

@@ -31,6 +31,7 @@ Bazooka:
InvalidImpactTypes: Water, Air, AirHit InvalidImpactTypes: Water, Air, AirHit
Warhead@3EffWater: CreateEffect Warhead@3EffWater: CreateEffect
Explosion: small_watersplash Explosion: small_watersplash
ExplosionPalette: player
ImpactSound: ssplash3.aud ImpactSound: ssplash3.aud
ValidImpactTypes: Water ValidImpactTypes: Water
Warhead@4EffAir: CreateEffect Warhead@4EffAir: CreateEffect
@@ -74,6 +75,7 @@ HoverMissile:
InvalidImpactTypes: Water, Air, AirHit InvalidImpactTypes: Water, Air, AirHit
Warhead@3EffWater: CreateEffect Warhead@3EffWater: CreateEffect
Explosion: small_watersplash Explosion: small_watersplash
ExplosionPalette: player
ImpactSound: ssplash3.aud ImpactSound: ssplash3.aud
ValidImpactTypes: Water ValidImpactTypes: Water
Warhead@4EffAir: CreateEffect Warhead@4EffAir: CreateEffect
@@ -116,6 +118,7 @@ MammothTusk:
InvalidImpactTypes: Water InvalidImpactTypes: Water
Warhead@3EffWater: CreateEffect Warhead@3EffWater: CreateEffect
Explosion: small_watersplash Explosion: small_watersplash
ExplosionPalette: player
ImpactSound: ssplash3.aud ImpactSound: ssplash3.aud
ValidImpactTypes: Water ValidImpactTypes: Water
@@ -154,6 +157,7 @@ BikeMissile:
InvalidImpactTypes: Water InvalidImpactTypes: Water
Warhead@3EffWater: CreateEffect Warhead@3EffWater: CreateEffect
Explosion: small_watersplash Explosion: small_watersplash
ExplosionPalette: player
ImpactSound: ssplash3.aud ImpactSound: ssplash3.aud
ValidImpactTypes: Water ValidImpactTypes: Water
Warhead@4Smu: LeaveSmudge Warhead@4Smu: LeaveSmudge
@@ -193,6 +197,7 @@ Dragon:
InvalidImpactTypes: Water, Air, AirHit InvalidImpactTypes: Water, Air, AirHit
Warhead@3EffWater: CreateEffect Warhead@3EffWater: CreateEffect
Explosion: small_watersplash Explosion: small_watersplash
ExplosionPalette: player
ImpactSound: ssplash3.aud ImpactSound: ssplash3.aud
ValidImpactTypes: Water ValidImpactTypes: Water
Warhead@4EffAir: CreateEffect Warhead@4EffAir: CreateEffect
@@ -236,6 +241,7 @@ Hellfire:
InvalidImpactTypes: Water, Air, AirHit InvalidImpactTypes: Water, Air, AirHit
Warhead@3EffWater: CreateEffect Warhead@3EffWater: CreateEffect
Explosion: small_watersplash Explosion: small_watersplash
ExplosionPalette: player
ImpactSound: ssplash3.aud ImpactSound: ssplash3.aud
ValidImpactTypes: Water ValidImpactTypes: Water
Warhead@4EffAir: CreateEffect Warhead@4EffAir: CreateEffect

1
mods/ts/weapons/otherweapons.yaml
View File

@@ -42,6 +42,7 @@ FiendShard:
DamageTypes: Prone100Percent, TriggerProne, BulletDeath DamageTypes: Prone100Percent, TriggerProne, BulletDeath
Warhead@3EffWater: CreateEffect Warhead@3EffWater: CreateEffect
Explosion: small_watersplash Explosion: small_watersplash
ExplosionPalette: player
ImpactSound: ssplash3.aud ImpactSound: ssplash3.aud
ValidImpactTypes: Water ValidImpactTypes: Water

11
mods/ts/weapons/smallguns.yaml
View File

@@ -18,6 +18,7 @@ Minigun:
InvalidImpactTypes: Water InvalidImpactTypes: Water
Warhead@3EffWater: CreateEffect Warhead@3EffWater: CreateEffect
Explosion: water_piffs Explosion: water_piffs
ExplosionPalette: ra
ValidImpactTypes: Water ValidImpactTypes: Water
M1Carbine: M1Carbine:
@@ -40,6 +41,7 @@ M1Carbine:
InvalidImpactTypes: Water InvalidImpactTypes: Water
Warhead@3EffWater: CreateEffect Warhead@3EffWater: CreateEffect
Explosion: water_piffs Explosion: water_piffs
ExplosionPalette: ra
ValidImpactTypes: Water ValidImpactTypes: Water
Vulcan: Vulcan:
@@ -62,6 +64,7 @@ Vulcan:
InvalidImpactTypes: Water InvalidImpactTypes: Water
Warhead@3EffWater: CreateEffect Warhead@3EffWater: CreateEffect
Explosion: water_piffs Explosion: water_piffs
ExplosionPalette: ra
ValidImpactTypes: Water ValidImpactTypes: Water
Vulcan2: Vulcan2:
@@ -86,6 +89,7 @@ Vulcan2:
InvalidImpactTypes: Water InvalidImpactTypes: Water
Warhead@3EffWater: CreateEffect Warhead@3EffWater: CreateEffect
Explosion: water_piffs Explosion: water_piffs
ExplosionPalette: ra
ValidImpactTypes: Water ValidImpactTypes: Water
Vulcan3: Vulcan3:
@@ -109,6 +113,7 @@ Vulcan3:
InvalidImpactTypes: Water InvalidImpactTypes: Water
Warhead@3EffWater: CreateEffect Warhead@3EffWater: CreateEffect
Explosion: water_piffs Explosion: water_piffs
ExplosionPalette: ra
ValidImpactTypes: Water ValidImpactTypes: Water
VulcanTower: VulcanTower:
@@ -131,6 +136,7 @@ VulcanTower:
InvalidImpactTypes: Water InvalidImpactTypes: Water
Warhead@3EffWater: CreateEffect Warhead@3EffWater: CreateEffect
Explosion: water_piffs Explosion: water_piffs
ExplosionPalette: ra
ValidImpactTypes: Water ValidImpactTypes: Water
JumpCannon: JumpCannon:
@@ -154,6 +160,7 @@ JumpCannon:
InvalidImpactTypes: Water InvalidImpactTypes: Water
Warhead@3EffWater: CreateEffect Warhead@3EffWater: CreateEffect
Explosion: water_piffs Explosion: water_piffs
ExplosionPalette: ra
ValidImpactTypes: Water ValidImpactTypes: Water
AssaultCannon: AssaultCannon:
@@ -176,6 +183,7 @@ AssaultCannon:
InvalidImpactTypes: Water InvalidImpactTypes: Water
Warhead@3EffWater: CreateEffect Warhead@3EffWater: CreateEffect
Explosion: water_piffs Explosion: water_piffs
ExplosionPalette: ra
ValidImpactTypes: Water ValidImpactTypes: Water
RaiderCannon: RaiderCannon:
@@ -200,6 +208,7 @@ RaiderCannon:
InvalidImpactTypes: Water InvalidImpactTypes: Water
Warhead@3EffWater: CreateEffect Warhead@3EffWater: CreateEffect
Explosion: water_piffs Explosion: water_piffs
ExplosionPalette: ra
ValidImpactTypes: Water ValidImpactTypes: Water
HarpyClaw: HarpyClaw:
@@ -224,6 +233,7 @@ HarpyClaw:
InvalidImpactTypes: Water InvalidImpactTypes: Water
Warhead@3EffWater: CreateEffect Warhead@3EffWater: CreateEffect
Explosion: water_piffs Explosion: water_piffs
ExplosionPalette: ra
ValidImpactTypes: Water ValidImpactTypes: Water
Pistola: Pistola:
@@ -246,6 +256,7 @@ Pistola:
InvalidImpactTypes: Water InvalidImpactTypes: Water
Warhead@3EffWater: CreateEffect Warhead@3EffWater: CreateEffect
Explosion: water_piff Explosion: water_piff
ExplosionPalette: ra
ValidImpactTypes: Water ValidImpactTypes: Water
Sniper: Sniper:

1
mods/ts/weapons/superweapons.yaml
View File

@@ -30,6 +30,7 @@ MultiCluster:
InvalidImpactTypes: Water InvalidImpactTypes: Water
Warhead@3EffWater: CreateEffect Warhead@3EffWater: CreateEffect
Explosion: small_watersplash Explosion: small_watersplash
ExplosionPalette: player
ImpactSound: ssplash2.aud ImpactSound: ssplash2.aud
ValidImpactTypes: Water ValidImpactTypes: Water
Warhead@4Smu: LeaveSmudge Warhead@4Smu: LeaveSmudge