Merge pull request #5242 from reaperrr/deathsounds-followup

Made DeathSounds and their InfDeath relation fully customizable
This commit is contained in:
Paul Chote
2014-05-17 23:24:44 +12:00
27 changed files with 210 additions and 92 deletions

BIN
mods/ts/bits/22-n104.aud Normal file

Binary file not shown.

BIN
mods/ts/bits/22-n106.aud Normal file

Binary file not shown.

BIN
mods/ts/bits/22-n108.aud Normal file

Binary file not shown.

View File

@@ -134,8 +134,14 @@
Huntable:
LuaScriptEvents:
ScriptTriggers:
DeathSounds:
Zapped: electro1.aud
DeathSounds@NORMAL:
InfDeaths: 1, 2, 3
DeathSounds@BURNED:
DeathSound: Burned
InfDeaths: 5
DeathSounds@ZAPPED:
DeathSound: Zapped
InfDeaths: 6
^CivilianInfantry:
Inherits: ^Infantry

View File

@@ -402,7 +402,7 @@ MWMN:
Description: General-purpose infantry.\n Strong vs Infantry\n Weak vs Vehicles
Selectable:
Bounds: 12,17,0,-9
Voice: Mutant
Voice: CivilianFemale
Health:
HP: 50
Mobile:

View File

@@ -240,13 +240,13 @@ weedguy:
Facings: 8
Stride: 6
ShadowStart: 288
die1: weed
die2: weed
Start: 160
Length: 6
ShadowStart: 336
die2: weed
ShadowStart: 362
die1: weed
Start: 149
Length: 14
Length: 11
ShadowStart: 351
die3: weed
Start: 166
@@ -309,7 +309,7 @@ medic:
ShadowStart: 455
die3: # TODO: copy-paste of die2
Start: 149
Length: 14
Length: 15
ShadowStart: 455
shoot:
Start: 164
@@ -576,7 +576,7 @@ jumpjet: # TODO: ShadowStart:
Start: 149
Length: 15
ShadowStart: 600
die3:
die3: #TODO: animation doesn't fit this InfDeath
Start: 436
Length: 15
ShadowStart: 887
@@ -1442,11 +1442,11 @@ civ2:
ShadowStart: 426
die2:
Start: 149
Length: 14
Length: 15
ShadowStart: 441
die3: # TODO: copy-paste of die2
Start: 149
Length: 14
Length: 15
ShadowStart: 441
die5: flameguy # TODO: walking animation unused
Start: 42
@@ -1489,11 +1489,11 @@ civ3:
ShadowStart: 426
die2:
Start: 149
Length: 14
Length: 15
ShadowStart: 441
die3: # TODO: copy-paste of die2
Start: 149
Length: 14
Length: 15
ShadowStart: 441
die5: flameguy # TODO: walking animation unused
Start: 42

View File

@@ -4,7 +4,9 @@ Infantry:
Move: 15-I018, 15-I024, 15-I044
Attack: 15-I044, 15-I050, 15-I044, 15-I046
# Feedback: 15-I058, 15-I064 # TODO
Die: DEDMAN1, DEDMAN2, DEDMAN3, DEDMAN4, DEDMAN5, DEDMAN6
Die: DEDMAN1, DEDMAN3, DEDMAN4, DEDMAN5, DEDMAN6
Burned: DEDMAN2
Zapped: ELECTRO1
Rocket:
Voices:
@@ -12,35 +14,45 @@ Rocket:
Move: 15-I008, 15-I014, 15-I026
Attack: 15-I008, 15-I014, 15-I026, 15-I050, 15-I060
# Feedback: 15-I058, 15-I064 #TODO
Die: DEDMAN1, DEDMAN2, DEDMAN3, DEDMAN4, DEDMAN5, DEDMAN6
Die: DEDMAN1, DEDMAN3, DEDMAN4, DEDMAN5, DEDMAN6
Burned: DEDMAN2
Zapped: ELECTRO1
Umagon:
Voices:
Select: 10-I000, 10-I002, 10-I004, 10-I006
Move: 10-I016, 10-I020, 10-I022
Attack: 10-I024, 10-I026, 10-I028, 10-I030
Die: DEDGIRL1, DEDGIRL2, DEDGIRL3, DEDGIRL4
Die: DEDGIRL1, DEDGIRL2, DEDGIRL4
Burned: DEDGIRL3
Zapped: ELECTRO1
Ghost:
Voices:
Select: 14-I000, 14-I002, 14-I004
Move: 14-I008, 14-I010, 14-I012, 14-I014
Attack: 14-I008, 14-I010, 14-I014, 14-I016
Die: DEDMAN1, DEDMAN2, DEDMAN3, DEDMAN4, DEDMAN5, DEDMAN6
Die: DEDMAN1, DEDMAN3, DEDMAN4, DEDMAN5, DEDMAN6
Burned: DEDMAN2
Zapped: ELECTRO1
Medic:
Voices:
Select: 20-I000, 20-I004, 20-I006
Move: 20-I008, 20-I010, 20-I012
Attack: 20-I016, 20-I018, 20-I020
Die: DEDMAN1, DEDMAN2, DEDMAN3, DEDMAN4, DEDMAN5, DEDMAN6
Die: DEDMAN1, DEDMAN3, DEDMAN4, DEDMAN5, DEDMAN6
Burned: DEDMAN2
Zapped: ELECTRO1
Engineer:
Voices:
Select: 19-I000, 19-I002, 19-I006
Move: 19-I010, 19-I016
Attack: 19-I018, 19-I016
Die: DEDMAN1, DEDMAN2, DEDMAN3, DEDMAN4, DEDMAN5, DEDMAN6
Die: DEDMAN1, DEDMAN3, DEDMAN4, DEDMAN5, DEDMAN6
Burned: DEDMAN2
Zapped: ELECTRO1
JumpJet:
Voices:
@@ -48,7 +60,9 @@ JumpJet:
Move: 15-I018, 15-I024, 15-I044
Attack: 15-I044, 15-I050, 15-I044, 15-I046
# Feedback: 15-I058, 15-I064
Die: DEDMAN1, DEDMAN2, DEDMAN3, DEDMAN4, DEDMAN5, DEDMAN6
Die: DEDMAN1, DEDMAN3, DEDMAN4, DEDMAN5, DEDMAN6
Burned: DEDMAN2
Zapped: ELECTRO1
Weed:
Voices:
@@ -56,7 +70,9 @@ Weed:
Move: 15-I024, 15-I044
Attack: 15-I006, 15-I046
# Feedback: 15-I058, 15-I064 # TODO
Die: DEDMAN1, DEDMAN2, DEDMAN3, DEDMAN4, DEDMAN5, DEDMAN6
Die: DEDMAN1, DEDMAN3, DEDMAN4, DEDMAN5, DEDMAN6
Burned: DEDMAN2
Zapped: ELECTRO1
Spy:
Voices:
@@ -64,56 +80,72 @@ Spy:
Move: 21-I010, 21-I012, 21-I016
Attack: 21-I010, 21-I012, 21-I022
# Feedback: 21-I000, 21-I002 # TODO
Die: DEDMAN1, DEDMAN2, DEDMAN3, DEDMAN4, DEDMAN5, DEDMAN6
Die: DEDMAN1, DEDMAN3, DEDMAN4, DEDMAN5, DEDMAN6
Burned: DEDMAN2
Zapped: ELECTRO1
Hijacker:
Voices:
Select: 24-I000, 24-I002, 24-I004, 24-I006
Move: 24-I008, 24-I010, 24-I012, 24-I014
Attack: 24-I016, 24-I018, 24-I020, 24-I022, 24-I024
Die: DEDMAN1, DEDMAN2, DEDMAN3, DEDMAN4, DEDMAN5, DEDMAN6
Die: DEDMAN1, DEDMAN3, DEDMAN4, DEDMAN5, DEDMAN6
Burned: DEDMAN2
Zapped: ELECTRO1
Cyborg:
Voices:
Select: 22-I000, 22-I002, 22-I006
Move: 22-I008, 22-I010, 22-I014, 22-I016, 22-I020
Attack: 22-I008, 22-I010, 22-I012, 22-I018
Die: 22-N104, 22-N106, 22-N108
Die: 22-n104, 22-n108
Burned: 22-n106
Zapped: ELECTRO1
CyborgCommando:
Voices:
Select: 23-I000, 23-I002, 23-I004, 23-I006
Move: 23-I008, 23-I010, 23-I012, 23-I016
Attack: 23-I014, 23-I018, 23-I020, 23-I022
Die: 22-N104, 22-N106, 22-N108
Die: 22-n104, 22-n108
Burned: 22-n106
Zapped: ELECTRO1
Mutant:
Voices:
Select: 15-I032, 15-I048
Move: 15-I008,15-I014,15-I026
Attack: 15-I008,15-I014,15-I026,15-I050,15-I060
Die: DEDMAN1, DEDMAN2, DEDMAN3, DEDMAN4, DEDMAN5, DEDMAN6
Die: DEDMAN1, DEDMAN3, DEDMAN4, DEDMAN5, DEDMAN6
Burned: DEDMAN2
Zapped: ELECTRO1
Tratos:
Voices:
Select: 13-I000, 13-I002, 13-I004, 13-I006
Move: 13-I008, 13-I010, 13-I012, 13-I014
Attack: 13-I016, 13-I018, 13-I020
Die: DEDMAN1, DEDMAN2, DEDMAN3, DEDMAN4, DEDMAN5, DEDMAN6
Die: DEDMAN1, DEDMAN3, DEDMAN4, DEDMAN5, DEDMAN6
Burned: DEDMAN2
Zapped: ELECTRO1
Oxanna:
Voices:
Select: 11-I000, 11-I002, 11-I004, 11-I006
Move: 10-I016, 10-I020, 10-I022
Attack: 10-I024, 10-I026, 10-I028, 10-I030
Die: DEDGIRL1, DEDGIRL2, DEDGIRL3, DEDGIRL4
Move: 11-I008, 11-I010, 11-I012
Attack: 11-I014, 11-I016, 11-I018
Die: DEDGIRL1, DEDGIRL2, DEDGIRL4
Burned: DEDGIRL3
Zapped: ELECTRO1
Slavick:
Voices:
Select: 12-I000, 12-I002, 12-I004
Move: 12-I006, 12-I008, 12-I010
Attack: 12-I012, 12-I014, 12-I016
Die: DEDMAN1, DEDMAN2, DEDMAN3, DEDMAN4, DEDMAN5, DEDMAN6
Die: DEDMAN1, DEDMAN3, DEDMAN4, DEDMAN5, DEDMAN6
Burned: DEDMAN2
Zapped: ELECTRO1
Fiend:
Voices:
@@ -121,6 +153,8 @@ Fiend:
Move:
Attack:
Die: FIEND1
Burned: FIEND1
Zapped: FIEND1
Vehicle:
Voices:
@@ -145,4 +179,15 @@ Civilian:
Select:
Move:
Attack:
Die: DEDMAN1, DEDMAN2, DEDMAN3, DEDMAN4, DEDMAN5, DEDMAN6
Die: DEDMAN1, DEDMAN3, DEDMAN4, DEDMAN5, DEDMAN6
Burned: DEDMAN2
Zapped: ELECTRO1
CivilianFemale: #can be used for female mutant as well
Voices:
Select:
Move:
Attack:
Die: DEDGIRL1, DEDGIRL2, DEDGIRL4
Burned: DEDGIRL3
Zapped: ELECTRO1

View File

@@ -1,7 +1,7 @@
Minigun:
ROF: 21
Range: 4c0
Report: INFGUN2.AUD
Report: INFGUN3.AUD
Projectile: Bullet
Speed: 1c682
Warhead: