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

Remove TS Headshot DeathType

Browse Source 
Also fixed a couple of mistakes compared to the original (some weapons still applied the wrong death type).
This commit is contained in:
reaperrr
2016-06-05 20:51:28 +02:00
parent 0947e7bdd6
commit b84e27ef98
4 changed files with 19 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mods/ts/rules/defaults.yaml
View File

@@ -309,23 +309,22 @@
DeathTypes: DeathTypes:
BulletDeath: 1 BulletDeath: 1
SmallExplosionDeath: 2 SmallExplosionDeath: 2
HeadshotDeath: 3
WithDeathAnimation@explosion: WithDeathAnimation@explosion:
DeathSequencePalette: effect DeathSequencePalette: effect
DeathPaletteIsPlayerPalette: False DeathPaletteIsPlayerPalette: False
DeathTypes: DeathTypes:
ExplosionDeath: 4 ExplosionDeath: 3
WithDeathAnimation@energy: WithDeathAnimation@energy:
DeathSequencePalette: ra DeathSequencePalette: ra
DeathPaletteIsPlayerPalette: False DeathPaletteIsPlayerPalette: False
DeathTypes: DeathTypes:
EnergyDeath: 6 EnergyDeath: 5
WithDeathAnimation: WithDeathAnimation:
CrushedSequence: die-crushed CrushedSequence: die-crushed
CrushedSequencePalette: player CrushedSequencePalette: player
CrushedPaletteIsPlayerPalette: true CrushedPaletteIsPlayerPalette: true
DeathSounds@NORMAL: DeathSounds@NORMAL:
DeathTypes: BulletDeath, SmallExplosionDeath, ExplosionDeath, HeadshotDeath DeathTypes: BulletDeath, SmallExplosionDeath, ExplosionDeath
DeathSounds@BURNED: DeathSounds@BURNED:
Voice: Burned Voice: Burned
DeathTypes: FireDeath DeathTypes: FireDeath

40
mods/ts/sequences/infantry.yaml
View File

@@ -35,11 +35,7 @@
Start: 149 Start: 149
Length: 15 Length: 15
ShadowStart: 441 ShadowStart: 441
die3: die3: s_bang34
Start: 149
Length: 15
ShadowStart: 441
die4: s_bang34
Length: * Length: *
die-crushed: die-crushed:
Start: 159 Start: 159
@@ -52,7 +48,7 @@
Length: 2 Length: 2
Facings: 8 Facings: 8
ShadowStart: 552 ShadowStart: 552
die6: electro die5: electro
Length: * Length: *
^BasicInfantryAttack: ^BasicInfantryAttack:
@@ -308,11 +304,7 @@ medic:
Start: 149 Start: 149
Length: 15 Length: 15
ShadowStart: 455 ShadowStart: 455
die3: die3: s_bang34
Start: 149
Length: 15
ShadowStart: 455
die4: s_bang34
Length: * Length: *
die-crushed: die-crushed:
Start: 159 Start: 159
@@ -329,7 +321,7 @@ medic:
Start: 292 Start: 292
Length: 14 Length: 14
ShadowStart: 599 ShadowStart: 599
die6: electro die5: electro
Length: * Length: *
icon: mediicon icon: mediicon
@@ -368,11 +360,7 @@ jumpjet:
Start: 445 Start: 445
Length: 6 Length: 6
ShadowStart: 896 ShadowStart: 896
die3: # TODO: animation for falling from sky starts at 436 die3: s_bang34
Start: 445
Length: 6
ShadowStart: 896
die4: s_bang34
Length: * Length: *
die-crushed: die-crushed:
Start: 450 Start: 450
@@ -394,7 +382,7 @@ jumpjet:
Length: 2 Length: 2
Facings: 8 Facings: 8
ShadowStart: 711 ShadowStart: 711
die6: electro die5: electro
Length: * Length: *
icon: jjeticon icon: jjeticon
@@ -453,14 +441,10 @@ weedguy:
Length: 11 Length: 11
ShadowStart: 368 ShadowStart: 368
die4: die4:
Start: 197
Length: 5
ShadowStart: 399
die5:
Start: 177 Start: 177
Length: 20 Length: 20
ShadowStart: 379 ShadowStart: 379
die6: electro die5: electro
Length: * Length: *
die-crushed: die-crushed:
Start: 174 Start: 174
@@ -503,11 +487,7 @@ doggie:
Start: 99 Start: 99
Length: 10 Length: 10
ShadowStart: 218 ShadowStart: 218
die3: die3: s_bang34
Start: 99
Length: 10
ShadowStart: 218
die4: s_bang34
Length: * Length: *
die-crushed: die-crushed:
Start: 105 Start: 105
@@ -515,11 +495,11 @@ doggie:
ShadowStart: 224 ShadowStart: 224
Tick: 800 Tick: 800
ZOffset: -511 ZOffset: -511
die5: die4:
Start: 109 Start: 109
Length: 10 Length: 10
ShadowStart: 228 ShadowStart: 228
die6: die5:
Start: 109 Start: 109
Length: 10 Length: 10
ShadowStart: 228 ShadowStart: 228

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

@@ -23,7 +23,7 @@ LtRail:
Light: 150 Light: 150
Heavy: 110 Heavy: 110
Concrete: 5 Concrete: 5
DamageTypes: Prone100Percent, TriggerProne, SmallExplosionDeath DamageTypes: Prone100Percent, TriggerProne, ExplosionDeath
Warhead@2Dam: SpreadDamage Warhead@2Dam: SpreadDamage
Range: 0, 32 Range: 0, 32
Falloff: 50, 50 # Only does half damage to friendly units Falloff: 50, 50 # Only does half damage to friendly units
@@ -37,7 +37,7 @@ LtRail:
Light: 150 Light: 150
Heavy: 110 Heavy: 110
Concrete: 5 Concrete: 5
DamageTypes: Prone100Percent, TriggerProne, SmallExplosionDeath DamageTypes: Prone100Percent, TriggerProne, ExplosionDeath
MechRailgun: MechRailgun:
ReloadDelay: 60 ReloadDelay: 60
@@ -62,7 +62,7 @@ MechRailgun:
Light: 160 Light: 160
Heavy: 100 Heavy: 100
Concrete: 25 Concrete: 25
DamageTypes: Prone100Percent, TriggerProne, FireDeath DamageTypes: Prone100Percent, TriggerProne, ExplosionDeath
SonicZap: SonicZap:
ReloadDelay: 180 ReloadDelay: 180
@@ -87,7 +87,7 @@ SonicZap:
Versus: Versus:
Heavy: 80 Heavy: 80
Concrete: 60 Concrete: 60
DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
Warhead@2Dam: SpreadDamage Warhead@2Dam: SpreadDamage
Range: 0, 32 Range: 0, 32
Falloff: 50, 50 Falloff: 50, 50
@@ -98,7 +98,7 @@ SonicZap:
Versus: Versus:
Heavy: 80 Heavy: 80
Concrete: 60 Concrete: 60
DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
CyCannon: CyCannon:
ReloadDelay: 50 ReloadDelay: 50

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

@@ -274,4 +274,4 @@ Sniper:
Light: 5 Light: 5
Heavy: 5 Heavy: 5
Concrete: 5 Concrete: 5
DamageTypes: Prone100Percent, TriggerProne, HeadshotDeath DamageTypes: Prone100Percent, TriggerProne, BulletDeath