Merge branch 'master' into mirceakitsune/per_character_sounds

diff --git a/models/player/carni.sounds b/models/player/carni.sounds
new file mode 100644 (file)
index 0000000..2ff25cb
--- /dev/null
+++ b/models/player/carni.sounds
@@ -0,0 +1,32 @@
+//TAG: carni-lycan\r
+//affirmative sound/player/carni-lycan/player/affirmative 0\r
+attack sound/player/carni-lycan/coms/attack 0\r
+//attacking sound/player/carni-lycan/player/attacking 0\r
+attackinfive sound/player/carni-lycan/coms/attackinfive 0\r
+coverme sound/player/carni-lycan/coms/coverme 0\r
+defend sound/player/carni-lycan/coms/defend 0\r
+//defending sound/player/carni-lycan/player/defending 0\r
+//droppedflag sound/player/carni-lycan/player/droppedflag 0\r
+//flagcarriertakingdamage sound/player/carni-lycan/player/flagcarriertakingdamage 0\r
+freelance sound/player/carni-lycan/coms/freelance 2\r
+//getflag sound/player/carni-lycan/player/getflag 0\r
+incoming sound/player/carni-lycan/coms/incoming 0\r
+meet sound/player/carni-lycan/coms/meet 0\r
+needhelp sound/player/carni-lycan/coms/needhelp 2\r
+//negative sound/player/carni-lycan/player/negative 0\r
+//onmyway sound/player/carni-lycan/player/onmyway 0\r
+//roaming sound/player/carni-lycan/player/roaming 0\r
+//seenenemy sound/player/carni-lycan/player/seenenemy 0\r
+seenflag sound/player/carni-lycan/coms/seenflag 0\r
+taunt sound/player/carni-lycan/coms/taunt 3\r
+teamshoot sound/player/carni-lycan/coms/teamshoot 3\r
+death sound/player/carni-lycan/player/death 3\r
+drown sound/player/carni-lycan/player/drown 0\r
+//fall sound/player/carni-lycan/player/fall 0\r
+falling sound/player/carni-lycan/player/falling 0\r
+gasp sound/player/carni-lycan/player/gasp 0\r
+jump sound/player/carni-lycan/player/jump 0\r
+pain25 sound/player/carni-lycan/player/pain25 0\r
+pain50 sound/player/carni-lycan/player/pain50 0\r
+pain75 sound/player/carni-lycan/player/pain75 0\r
+pain100 sound/player/carni-lycan/player/pain100 0\r

diff --git a/models/player/carni.zym.sounds b/models/player/carni.zym.sounds
deleted file mode 100644 (file)
index b691675..0000000
--- a/models/player/carni.zym.sounds
+++ /dev/null
@@ -1,32 +0,0 @@
-//TAG: carni-lycan
-//affirmative sound/player/carni-lycan/player/affirmative 0
-attack sound/player/carni-lycan/coms/attack 0
-//attacking sound/player/carni-lycan/player/attacking 0
-attackinfive sound/player/carni-lycan/coms/attackinfive 0
-coverme sound/player/carni-lycan/coms/coverme 0
-defend sound/player/carni-lycan/coms/defend 0
-//defending sound/player/carni-lycan/player/defending 0
-//droppedflag sound/player/carni-lycan/player/droppedflag 0
-//flagcarriertakingdamage sound/player/carni-lycan/player/flagcarriertakingdamage 0
-freelance sound/player/carni-lycan/coms/freelance 2
-//getflag sound/player/carni-lycan/player/getflag 0
-incoming sound/player/carni-lycan/coms/incoming 0
-meet sound/player/carni-lycan/coms/meet 0
-needhelp sound/player/carni-lycan/coms/needhelp 2
-//negative sound/player/carni-lycan/player/negative 0
-//onmyway sound/player/carni-lycan/player/onmyway 0
-//roaming sound/player/carni-lycan/player/roaming 0
-//seenenemy sound/player/carni-lycan/player/seenenemy 0
-seenflag sound/player/carni-lycan/coms/seenflag 0
-taunt sound/player/carni-lycan/coms/taunt 3
-teamshoot sound/player/carni-lycan/coms/teamshoot 3
-death sound/player/carni-lycan/player/death 3
-drown sound/player/carni-lycan/player/drown 0
-//fall sound/player/carni-lycan/player/fall 0
-falling sound/player/carni-lycan/player/falling 0
-gasp sound/player/carni-lycan/player/gasp 0
-jump sound/player/carni-lycan/player/jump 0
-pain25 sound/player/carni-lycan/player/pain25 0
-pain50 sound/player/carni-lycan/player/pain50 0
-pain75 sound/player/carni-lycan/player/pain75 0
-pain100 sound/player/carni-lycan/player/pain100 0

diff --git a/models/player/carniarmor.sounds b/models/player/carniarmor.sounds
new file mode 100644 (file)
index 0000000..2ff25cb
--- /dev/null
+++ b/models/player/carniarmor.sounds
@@ -0,0 +1,32 @@
+//TAG: carni-lycan\r
+//affirmative sound/player/carni-lycan/player/affirmative 0\r
+attack sound/player/carni-lycan/coms/attack 0\r
+//attacking sound/player/carni-lycan/player/attacking 0\r
+attackinfive sound/player/carni-lycan/coms/attackinfive 0\r
+coverme sound/player/carni-lycan/coms/coverme 0\r
+defend sound/player/carni-lycan/coms/defend 0\r
+//defending sound/player/carni-lycan/player/defending 0\r
+//droppedflag sound/player/carni-lycan/player/droppedflag 0\r
+//flagcarriertakingdamage sound/player/carni-lycan/player/flagcarriertakingdamage 0\r
+freelance sound/player/carni-lycan/coms/freelance 2\r
+//getflag sound/player/carni-lycan/player/getflag 0\r
+incoming sound/player/carni-lycan/coms/incoming 0\r
+meet sound/player/carni-lycan/coms/meet 0\r
+needhelp sound/player/carni-lycan/coms/needhelp 2\r
+//negative sound/player/carni-lycan/player/negative 0\r
+//onmyway sound/player/carni-lycan/player/onmyway 0\r
+//roaming sound/player/carni-lycan/player/roaming 0\r
+//seenenemy sound/player/carni-lycan/player/seenenemy 0\r
+seenflag sound/player/carni-lycan/coms/seenflag 0\r
+taunt sound/player/carni-lycan/coms/taunt 3\r
+teamshoot sound/player/carni-lycan/coms/teamshoot 3\r
+death sound/player/carni-lycan/player/death 3\r
+drown sound/player/carni-lycan/player/drown 0\r
+//fall sound/player/carni-lycan/player/fall 0\r
+falling sound/player/carni-lycan/player/falling 0\r
+gasp sound/player/carni-lycan/player/gasp 0\r
+jump sound/player/carni-lycan/player/jump 0\r
+pain25 sound/player/carni-lycan/player/pain25 0\r
+pain50 sound/player/carni-lycan/player/pain50 0\r
+pain75 sound/player/carni-lycan/player/pain75 0\r
+pain100 sound/player/carni-lycan/player/pain100 0\r

diff --git a/models/player/crash.zym.sounds b/models/player/crash.zym.sounds
deleted file mode 100644 (file)
index dd7be39..0000000
--- a/models/player/crash.zym.sounds
+++ /dev/null
@@ -1,32 +0,0 @@
-//TAG: soldier
-//affirmative sound/player/carni-lycan/player/affirmative 0
-attack sound/player/soldier/coms/attack 0
-//attacking sound/player/carni-lycan/player/attacking 0
-attackinfive sound/player/soldier/coms/attackinfive 0
-coverme sound/player/soldier/coms/coverme 0
-defend sound/player/soldier/coms/defend 0
-//defending sound/player/carni-lycan/player/defending 0
-//droppedflag sound/player/carni-lycan/player/droppedflag 0
-//flagcarriertakingdamage sound/player/carni-lycan/player/flagcarriertakingdamage 0
-freelance sound/player/soldier/coms/freelance 2
-//getflag sound/player/carni-lycan/player/getflag 0
-//incoming sound/player/soldier/coms/incoming 0
-meet sound/player/soldier/coms/meet 0
-needhelp sound/player/soldier/coms/needhelp 2
-//negative sound/player/carni-lycan/player/negative 0
-//onmyway sound/player/carni-lycan/player/onmyway 0
-//roaming sound/player/carni-lycan/player/roaming 0
-//seenenemy sound/player/carni-lycan/player/seenenemy 0
-seenflag sound/player/soldier/coms/seenflag 0
-taunt sound/player/soldier/coms/taunt 3
-teamshoot sound/player/soldier/coms/teamshoot 3
-death sound/player/soldier/player/death 3
-drown sound/player/soldier/player/drown 0
-//fall sound/player/carni-lycan/player/fall 0
-falling sound/player/soldier/player/falling 0
-gasp sound/player/soldier/player/gasp 0
-jump sound/player/soldier/player/jump 0
-pain25 sound/player/soldier/player/pain25 0
-pain50 sound/player/soldier/player/pain50 0
-pain75 sound/player/soldier/player/pain75 0
-pain100 sound/player/soldier/player/pain100 0

diff --git a/models/player/fricka.sounds b/models/player/fricka.sounds
new file mode 100644 (file)
index 0000000..278a3a0
--- /dev/null
+++ b/models/player/fricka.sounds
@@ -0,0 +1,32 @@
+//TAG: fricka\r
+//affirmative sound/player/carni-lycan/player/affirmative 0\r
+attack sound/player/fricka/coms/attack 0\r
+//attacking sound/player/carni-lycan/player/attacking 0\r
+attackinfive sound/player/fricka/coms/attackinfive 0\r
+//coverme sound/player/fricka/coms/coverme 0\r
+defend sound/player/fricka/coms/defend 0\r
+//defending sound/player/carni-lycan/player/defending 0\r
+//droppedflag sound/player/carni-lycan/player/droppedflag 0\r
+//flagcarriertakingdamage sound/player/carni-lycan/player/flagcarriertakingdamage 0\r
+freelance sound/player/fricka/coms/freelance 2\r
+//getflag sound/player/carni-lycan/player/getflag 0\r
+incoming sound/player/fricka/coms/incoming 0\r
+meet sound/player/fricka/coms/waypoint 0\r
+//needhelp sound/player/fricka/coms/needhelp 0\r
+//negative sound/player/carni-lycan/player/negative 0\r
+//onmyway sound/player/carni-lycan/player/onmyway 0\r
+//roaming sound/player/carni-lycan/player/roaming 0\r
+//seenenemy sound/player/carni-lycan/player/seenenemy 0\r
+seenflag sound/player/fricka/coms/flagseen 0\r
+taunt sound/player/fricka/coms/taunt 4\r
+teamshoot sound/player/fricka/coms/teamshoot 3\r
+death sound/player/fricka/player/death 3\r
+drown sound/player/fricka/player/drown 0\r
+//fall sound/player/carni-lycan/player/fall 0\r
+falling sound/player/fricka/player/falling 0\r
+gasp sound/player/fricka/player/gasp 0\r
+jump sound/player/fricka/player/jump 0\r
+pain25 sound/player/fricka/player/pain25 0\r
+pain50 sound/player/fricka/player/pain50 0\r
+pain75 sound/player/fricka/player/pain75 0\r
+pain100 sound/player/fricka/player/pain100 0\r

diff --git a/models/player/grunt.sounds b/models/player/grunt.sounds
new file mode 100644 (file)
index 0000000..2ff25cb
--- /dev/null
+++ b/models/player/grunt.sounds
@@ -0,0 +1,32 @@
+//TAG: carni-lycan\r
+//affirmative sound/player/carni-lycan/player/affirmative 0\r
+attack sound/player/carni-lycan/coms/attack 0\r
+//attacking sound/player/carni-lycan/player/attacking 0\r
+attackinfive sound/player/carni-lycan/coms/attackinfive 0\r
+coverme sound/player/carni-lycan/coms/coverme 0\r
+defend sound/player/carni-lycan/coms/defend 0\r
+//defending sound/player/carni-lycan/player/defending 0\r
+//droppedflag sound/player/carni-lycan/player/droppedflag 0\r
+//flagcarriertakingdamage sound/player/carni-lycan/player/flagcarriertakingdamage 0\r
+freelance sound/player/carni-lycan/coms/freelance 2\r
+//getflag sound/player/carni-lycan/player/getflag 0\r
+incoming sound/player/carni-lycan/coms/incoming 0\r
+meet sound/player/carni-lycan/coms/meet 0\r
+needhelp sound/player/carni-lycan/coms/needhelp 2\r
+//negative sound/player/carni-lycan/player/negative 0\r
+//onmyway sound/player/carni-lycan/player/onmyway 0\r
+//roaming sound/player/carni-lycan/player/roaming 0\r
+//seenenemy sound/player/carni-lycan/player/seenenemy 0\r
+seenflag sound/player/carni-lycan/coms/seenflag 0\r
+taunt sound/player/carni-lycan/coms/taunt 3\r
+teamshoot sound/player/carni-lycan/coms/teamshoot 3\r
+death sound/player/carni-lycan/player/death 3\r
+drown sound/player/carni-lycan/player/drown 0\r
+//fall sound/player/carni-lycan/player/fall 0\r
+falling sound/player/carni-lycan/player/falling 0\r
+gasp sound/player/carni-lycan/player/gasp 0\r
+jump sound/player/carni-lycan/player/jump 0\r
+pain25 sound/player/carni-lycan/player/pain25 0\r
+pain50 sound/player/carni-lycan/player/pain50 0\r
+pain75 sound/player/carni-lycan/player/pain75 0\r
+pain100 sound/player/carni-lycan/player/pain100 0\r

diff --git a/models/player/grunt.zym.sounds b/models/player/grunt.zym.sounds
deleted file mode 100644 (file)
index b691675..0000000
--- a/models/player/grunt.zym.sounds
+++ /dev/null
@@ -1,32 +0,0 @@
-//TAG: carni-lycan
-//affirmative sound/player/carni-lycan/player/affirmative 0
-attack sound/player/carni-lycan/coms/attack 0
-//attacking sound/player/carni-lycan/player/attacking 0
-attackinfive sound/player/carni-lycan/coms/attackinfive 0
-coverme sound/player/carni-lycan/coms/coverme 0
-defend sound/player/carni-lycan/coms/defend 0
-//defending sound/player/carni-lycan/player/defending 0
-//droppedflag sound/player/carni-lycan/player/droppedflag 0
-//flagcarriertakingdamage sound/player/carni-lycan/player/flagcarriertakingdamage 0
-freelance sound/player/carni-lycan/coms/freelance 2
-//getflag sound/player/carni-lycan/player/getflag 0
-incoming sound/player/carni-lycan/coms/incoming 0
-meet sound/player/carni-lycan/coms/meet 0
-needhelp sound/player/carni-lycan/coms/needhelp 2
-//negative sound/player/carni-lycan/player/negative 0
-//onmyway sound/player/carni-lycan/player/onmyway 0
-//roaming sound/player/carni-lycan/player/roaming 0
-//seenenemy sound/player/carni-lycan/player/seenenemy 0
-seenflag sound/player/carni-lycan/coms/seenflag 0
-taunt sound/player/carni-lycan/coms/taunt 3
-teamshoot sound/player/carni-lycan/coms/teamshoot 3
-death sound/player/carni-lycan/player/death 3
-drown sound/player/carni-lycan/player/drown 0
-//fall sound/player/carni-lycan/player/fall 0
-falling sound/player/carni-lycan/player/falling 0
-gasp sound/player/carni-lycan/player/gasp 0
-jump sound/player/carni-lycan/player/jump 0
-pain25 sound/player/carni-lycan/player/pain25 0
-pain50 sound/player/carni-lycan/player/pain50 0
-pain75 sound/player/carni-lycan/player/pain75 0
-pain100 sound/player/carni-lycan/player/pain100 0

diff --git a/models/player/headhunter.sounds b/models/player/headhunter.sounds
new file mode 100644 (file)
index 0000000..2ff25cb
--- /dev/null
+++ b/models/player/headhunter.sounds
@@ -0,0 +1,32 @@
+//TAG: carni-lycan\r
+//affirmative sound/player/carni-lycan/player/affirmative 0\r
+attack sound/player/carni-lycan/coms/attack 0\r
+//attacking sound/player/carni-lycan/player/attacking 0\r
+attackinfive sound/player/carni-lycan/coms/attackinfive 0\r
+coverme sound/player/carni-lycan/coms/coverme 0\r
+defend sound/player/carni-lycan/coms/defend 0\r
+//defending sound/player/carni-lycan/player/defending 0\r
+//droppedflag sound/player/carni-lycan/player/droppedflag 0\r
+//flagcarriertakingdamage sound/player/carni-lycan/player/flagcarriertakingdamage 0\r
+freelance sound/player/carni-lycan/coms/freelance 2\r
+//getflag sound/player/carni-lycan/player/getflag 0\r
+incoming sound/player/carni-lycan/coms/incoming 0\r
+meet sound/player/carni-lycan/coms/meet 0\r
+needhelp sound/player/carni-lycan/coms/needhelp 2\r
+//negative sound/player/carni-lycan/player/negative 0\r
+//onmyway sound/player/carni-lycan/player/onmyway 0\r
+//roaming sound/player/carni-lycan/player/roaming 0\r
+//seenenemy sound/player/carni-lycan/player/seenenemy 0\r
+seenflag sound/player/carni-lycan/coms/seenflag 0\r
+taunt sound/player/carni-lycan/coms/taunt 3\r
+teamshoot sound/player/carni-lycan/coms/teamshoot 3\r
+death sound/player/carni-lycan/player/death 3\r
+drown sound/player/carni-lycan/player/drown 0\r
+//fall sound/player/carni-lycan/player/fall 0\r
+falling sound/player/carni-lycan/player/falling 0\r
+gasp sound/player/carni-lycan/player/gasp 0\r
+jump sound/player/carni-lycan/player/jump 0\r
+pain25 sound/player/carni-lycan/player/pain25 0\r
+pain50 sound/player/carni-lycan/player/pain50 0\r
+pain75 sound/player/carni-lycan/player/pain75 0\r
+pain100 sound/player/carni-lycan/player/pain100 0\r

diff --git a/models/player/headhunter.zym.sounds b/models/player/headhunter.zym.sounds
deleted file mode 100644 (file)
index b691675..0000000
--- a/models/player/headhunter.zym.sounds
+++ /dev/null
@@ -1,32 +0,0 @@
-//TAG: carni-lycan
-//affirmative sound/player/carni-lycan/player/affirmative 0
-attack sound/player/carni-lycan/coms/attack 0
-//attacking sound/player/carni-lycan/player/attacking 0
-attackinfive sound/player/carni-lycan/coms/attackinfive 0
-coverme sound/player/carni-lycan/coms/coverme 0
-defend sound/player/carni-lycan/coms/defend 0
-//defending sound/player/carni-lycan/player/defending 0
-//droppedflag sound/player/carni-lycan/player/droppedflag 0
-//flagcarriertakingdamage sound/player/carni-lycan/player/flagcarriertakingdamage 0
-freelance sound/player/carni-lycan/coms/freelance 2
-//getflag sound/player/carni-lycan/player/getflag 0
-incoming sound/player/carni-lycan/coms/incoming 0
-meet sound/player/carni-lycan/coms/meet 0
-needhelp sound/player/carni-lycan/coms/needhelp 2
-//negative sound/player/carni-lycan/player/negative 0
-//onmyway sound/player/carni-lycan/player/onmyway 0
-//roaming sound/player/carni-lycan/player/roaming 0
-//seenenemy sound/player/carni-lycan/player/seenenemy 0
-seenflag sound/player/carni-lycan/coms/seenflag 0
-taunt sound/player/carni-lycan/coms/taunt 3
-teamshoot sound/player/carni-lycan/coms/teamshoot 3
-death sound/player/carni-lycan/player/death 3
-drown sound/player/carni-lycan/player/drown 0
-//fall sound/player/carni-lycan/player/fall 0
-falling sound/player/carni-lycan/player/falling 0
-gasp sound/player/carni-lycan/player/gasp 0
-jump sound/player/carni-lycan/player/jump 0
-pain25 sound/player/carni-lycan/player/pain25 0
-pain50 sound/player/carni-lycan/player/pain50 0
-pain75 sound/player/carni-lycan/player/pain75 0
-pain100 sound/player/carni-lycan/player/pain100 0

diff --git a/models/player/heroine.sounds b/models/player/heroine.sounds
new file mode 100644 (file)
index 0000000..d313aa5
--- /dev/null
+++ b/models/player/heroine.sounds
@@ -0,0 +1,32 @@
+//TAG: pyria-skadi\r
+//affirmative sound/player/carni-lycan/player/affirmative 0\r
+attack sound/player/pyria-skadi/coms/attack 2\r
+//attacking sound/player/carni-lycan/player/attacking 0\r
+attackinfive sound/player/pyria-skadi/coms/attackinfive 0\r
+//coverme sound/player/pyria-skadi/coms/coverme 0\r
+//defend sound/player/pyria-skadi/coms/defend 0\r
+//defending sound/player/carni-lycan/player/defending 0\r
+//droppedflag sound/player/carni-lycan/player/droppedflag 0\r
+//flagcarriertakingdamage sound/player/carni-lycan/player/flagcarriertakingdamage 0\r
+freelance sound/player/pyria-skadi/coms/freelance 2\r
+//getflag sound/player/carni-lycan/player/getflag 0\r
+//incoming sound/player/pyria-skadi/coms/incoming 0\r
+meet sound/player/pyria-skadi/coms/meet 0\r
+needhelp sound/player/pyria-skadi/coms/needhelp 2\r
+//negative sound/player/carni-lycan/player/negative 0\r
+//onmyway sound/player/carni-lycan/player/onmyway 0\r
+//roaming sound/player/carni-lycan/player/roaming 0\r
+//seenenemy sound/player/carni-lycan/player/seenenemy 0\r
+seenflag sound/player/pyria-skadi/coms/seenflag 0\r
+taunt sound/player/pyria-skadi/coms/taunt 5\r
+teamshoot sound/player/pyria-skadi/coms/teamshoot 4\r
+death sound/player/pyria-skadi/player/death 3\r
+drown sound/player/pyria-skadi/player/drown 0\r
+//fall sound/player/carni-lycan/player/fall 0\r
+falling sound/player/pyria-skadi/player/falling 0\r
+gasp sound/player/pyria-skadi/player/gasp 0\r
+jump sound/player/pyria-skadi/player/jump 0\r
+pain25 sound/player/pyria-skadi/player/pain25 0\r
+pain50 sound/player/pyria-skadi/player/pain50 0\r
+pain75 sound/player/pyria-skadi/player/pain75 0\r
+pain100 sound/player/pyria-skadi/player/pain100 0\r

diff --git a/models/player/insurrectionist.sounds b/models/player/insurrectionist.sounds
new file mode 100644 (file)
index 0000000..3b58cf1
--- /dev/null
+++ b/models/player/insurrectionist.sounds
@@ -0,0 +1,32 @@
+//TAG: insurrectionist\r
+//affirmative sound/player/carni-lycan/player/affirmative 0\r
+attack sound/player/insurrectionist/coms/attack 0\r
+//attacking sound/player/carni-lycan/player/attacking 0\r
+attackinfive sound/player/insurrectionist/coms/attackinfive 0\r
+coverme sound/player/insurrectionist/coms/coverme 0\r
+defend sound/player/insurrectionist/coms/defend 0\r
+//defending sound/player/carni-lycan/player/defending 0\r
+//droppedflag sound/player/carni-lycan/player/droppedflag 0\r
+//flagcarriertakingdamage sound/player/carni-lycan/player/flagcarriertakingdamage 0\r
+freelance sound/player/insurrectionist/coms/freelance 2\r
+//getflag sound/player/carni-lycan/player/getflag 0\r
+incoming sound/player/insurrectionist/coms/incoming 0\r
+meet sound/player/insurrectionist/coms/meet 0\r
+needhelp sound/player/insurrectionist/coms/needhelp 2\r
+//negative sound/player/carni-lycan/player/negative 0\r
+//onmyway sound/player/carni-lycan/player/onmyway 0\r
+//roaming sound/player/carni-lycan/player/roaming 0\r
+//seenenemy sound/player/carni-lycan/player/seenenemy 0\r
+seenflag sound/player/insurrectionist/coms/seenflag 0\r
+taunt sound/player/insurrectionist/coms/taunt 4\r
+teamshoot sound/player/insurrectionist/coms/teamshoot 3\r
+death sound/player/insurrectionist/player/death 3\r
+drown sound/player/insurrectionist/player/drown 0\r
+//fall sound/player/carni-lycan/player/fall 0\r
+falling sound/player/insurrectionist/player/falling 0\r
+gasp sound/player/insurrectionist/player/gasp 0\r
+jump sound/player/insurrectionist/player/jump 0\r
+pain25 sound/player/insurrectionist/player/pain25 0\r
+pain50 sound/player/insurrectionist/player/pain50 0\r
+pain75 sound/player/insurrectionist/player/pain75 0\r
+pain100 sound/player/insurrectionist/player/pain100 0\r

diff --git a/models/player/insurrectionist.zym.sounds b/models/player/insurrectionist.zym.sounds
deleted file mode 100644 (file)
index 24888d6..0000000
--- a/models/player/insurrectionist.zym.sounds
+++ /dev/null
@@ -1,32 +0,0 @@
-//TAG: insurrectionist
-//affirmative sound/player/carni-lycan/player/affirmative 0
-attack sound/player/insurrectionist/coms/attack 0
-//attacking sound/player/carni-lycan/player/attacking 0
-attackinfive sound/player/insurrectionist/coms/attackinfive 0
-coverme sound/player/insurrectionist/coms/coverme 0
-defend sound/player/insurrectionist/coms/defend 0
-//defending sound/player/carni-lycan/player/defending 0
-//droppedflag sound/player/carni-lycan/player/droppedflag 0
-//flagcarriertakingdamage sound/player/carni-lycan/player/flagcarriertakingdamage 0
-freelance sound/player/insurrectionist/coms/freelance 2
-//getflag sound/player/carni-lycan/player/getflag 0
-incoming sound/player/insurrectionist/coms/incoming 0
-meet sound/player/insurrectionist/coms/meet 0
-needhelp sound/player/insurrectionist/coms/needhelp 2
-//negative sound/player/carni-lycan/player/negative 0
-//onmyway sound/player/carni-lycan/player/onmyway 0
-//roaming sound/player/carni-lycan/player/roaming 0
-//seenenemy sound/player/carni-lycan/player/seenenemy 0
-seenflag sound/player/insurrectionist/coms/seenflag 0
-taunt sound/player/insurrectionist/coms/taunt 4
-teamshoot sound/player/insurrectionist/coms/teamshoot 3
-death sound/player/insurrectionist/player/death 3
-drown sound/player/insurrectionist/player/drown 0
-//fall sound/player/carni-lycan/player/fall 0
-falling sound/player/insurrectionist/player/falling 0
-gasp sound/player/insurrectionist/player/gasp 0
-jump sound/player/insurrectionist/player/jump 0
-pain25 sound/player/insurrectionist/player/pain25 0
-pain50 sound/player/insurrectionist/player/pain50 0
-pain75 sound/player/insurrectionist/player/pain75 0
-pain100 sound/player/insurrectionist/player/pain100 0

diff --git a/models/player/lurk.sounds b/models/player/lurk.sounds
new file mode 100644 (file)
index 0000000..8346c17
--- /dev/null
+++ b/models/player/lurk.sounds
@@ -0,0 +1,32 @@
+//TAG: reptilian\r
+//affirmative sound/player/carni-lycan/player/affirmative 0\r
+attack sound/player/reptilian/coms/attack 0\r
+//attacking sound/player/carni-lycan/player/attacking 0\r
+attackinfive sound/player/reptilian/coms/attackinfive 0\r
+coverme sound/player/reptilian/coms/coverme 0\r
+defend sound/player/reptilian/coms/defend 0\r
+//defending sound/player/carni-lycan/player/defending 0\r
+//droppedflag sound/player/carni-lycan/player/droppedflag 0\r
+//flagcarriertakingdamage sound/player/carni-lycan/player/flagcarriertakingdamage 0\r
+freelance sound/player/reptilian/coms/freelance 2\r
+//getflag sound/player/carni-lycan/player/getflag 0\r
+incoming sound/player/reptilian/coms/incoming 0\r
+meet sound/player/reptilian/coms/meet 0\r
+needhelp sound/player/reptilian/coms/needhelp 2\r
+//negative sound/player/carni-lycan/player/negative 0\r
+//onmyway sound/player/carni-lycan/player/onmyway 0\r
+//roaming sound/player/carni-lycan/player/roaming 0\r
+//seenenemy sound/player/carni-lycan/player/seenenemy 0\r
+seenflag sound/player/reptilian/coms/seenflag 0\r
+taunt sound/player/reptilian/coms/taunt 3\r
+teamshoot sound/player/reptilian/coms/teamshoot 3\r
+death sound/player/reptilian/player/death 3\r
+drown sound/player/reptilian/player/drown 0\r
+//fall sound/player/carni-lycan/player/fall 0\r
+falling sound/player/reptilian/player/falling 0\r
+gasp sound/player/reptilian/player/gasp 0\r
+jump sound/player/reptilian/player/jump 0\r
+pain25 sound/player/reptilian/player/pain25 0\r
+pain50 sound/player/reptilian/player/pain50 0\r
+pain75 sound/player/reptilian/player/pain75 0\r
+pain100 sound/player/reptilian/player/pain100 0\r

diff --git a/models/player/lurk.zym.sounds b/models/player/lurk.zym.sounds
deleted file mode 100644 (file)
index cc46b5b..0000000
--- a/models/player/lurk.zym.sounds
+++ /dev/null
@@ -1,32 +0,0 @@
-//TAG: reptilian
-//affirmative sound/player/carni-lycan/player/affirmative 0
-attack sound/player/reptilian/coms/attack 0
-//attacking sound/player/carni-lycan/player/attacking 0
-attackinfive sound/player/reptilian/coms/attackinfive 0
-coverme sound/player/reptilian/coms/coverme 0
-defend sound/player/reptilian/coms/defend 0
-//defending sound/player/carni-lycan/player/defending 0
-//droppedflag sound/player/carni-lycan/player/droppedflag 0
-//flagcarriertakingdamage sound/player/carni-lycan/player/flagcarriertakingdamage 0
-freelance sound/player/reptilian/coms/freelance 2
-//getflag sound/player/carni-lycan/player/getflag 0
-incoming sound/player/reptilian/coms/incoming 0
-meet sound/player/reptilian/coms/meet 0
-needhelp sound/player/reptilian/coms/needhelp 2
-//negative sound/player/carni-lycan/player/negative 0
-//onmyway sound/player/carni-lycan/player/onmyway 0
-//roaming sound/player/carni-lycan/player/roaming 0
-//seenenemy sound/player/carni-lycan/player/seenenemy 0
-seenflag sound/player/reptilian/coms/seenflag 0
-taunt sound/player/reptilian/coms/taunt 3
-teamshoot sound/player/reptilian/coms/teamshoot 3
-death sound/player/reptilian/player/death 3
-drown sound/player/reptilian/player/drown 0
-//fall sound/player/carni-lycan/player/fall 0
-falling sound/player/reptilian/player/falling 0
-gasp sound/player/reptilian/player/gasp 0
-jump sound/player/reptilian/player/jump 0
-pain25 sound/player/reptilian/player/pain25 0
-pain50 sound/player/reptilian/player/pain50 0
-pain75 sound/player/reptilian/player/pain75 0
-pain100 sound/player/reptilian/player/pain100 0

diff --git a/models/player/lycanthrope.sounds b/models/player/lycanthrope.sounds
new file mode 100644 (file)
index 0000000..2ff25cb
--- /dev/null
+++ b/models/player/lycanthrope.sounds
@@ -0,0 +1,32 @@
+//TAG: carni-lycan\r
+//affirmative sound/player/carni-lycan/player/affirmative 0\r
+attack sound/player/carni-lycan/coms/attack 0\r
+//attacking sound/player/carni-lycan/player/attacking 0\r
+attackinfive sound/player/carni-lycan/coms/attackinfive 0\r
+coverme sound/player/carni-lycan/coms/coverme 0\r
+defend sound/player/carni-lycan/coms/defend 0\r
+//defending sound/player/carni-lycan/player/defending 0\r
+//droppedflag sound/player/carni-lycan/player/droppedflag 0\r
+//flagcarriertakingdamage sound/player/carni-lycan/player/flagcarriertakingdamage 0\r
+freelance sound/player/carni-lycan/coms/freelance 2\r
+//getflag sound/player/carni-lycan/player/getflag 0\r
+incoming sound/player/carni-lycan/coms/incoming 0\r
+meet sound/player/carni-lycan/coms/meet 0\r
+needhelp sound/player/carni-lycan/coms/needhelp 2\r
+//negative sound/player/carni-lycan/player/negative 0\r
+//onmyway sound/player/carni-lycan/player/onmyway 0\r
+//roaming sound/player/carni-lycan/player/roaming 0\r
+//seenenemy sound/player/carni-lycan/player/seenenemy 0\r
+seenflag sound/player/carni-lycan/coms/seenflag 0\r
+taunt sound/player/carni-lycan/coms/taunt 3\r
+teamshoot sound/player/carni-lycan/coms/teamshoot 3\r
+death sound/player/carni-lycan/player/death 3\r
+drown sound/player/carni-lycan/player/drown 0\r
+//fall sound/player/carni-lycan/player/fall 0\r
+falling sound/player/carni-lycan/player/falling 0\r
+gasp sound/player/carni-lycan/player/gasp 0\r
+jump sound/player/carni-lycan/player/jump 0\r
+pain25 sound/player/carni-lycan/player/pain25 0\r
+pain50 sound/player/carni-lycan/player/pain50 0\r
+pain75 sound/player/carni-lycan/player/pain75 0\r
+pain100 sound/player/carni-lycan/player/pain100 0\r

diff --git a/models/player/lycanthrope.zym.sounds b/models/player/lycanthrope.zym.sounds
deleted file mode 100644 (file)
index b691675..0000000
--- a/models/player/lycanthrope.zym.sounds
+++ /dev/null
@@ -1,32 +0,0 @@
-//TAG: carni-lycan
-//affirmative sound/player/carni-lycan/player/affirmative 0
-attack sound/player/carni-lycan/coms/attack 0
-//attacking sound/player/carni-lycan/player/attacking 0
-attackinfive sound/player/carni-lycan/coms/attackinfive 0
-coverme sound/player/carni-lycan/coms/coverme 0
-defend sound/player/carni-lycan/coms/defend 0
-//defending sound/player/carni-lycan/player/defending 0
-//droppedflag sound/player/carni-lycan/player/droppedflag 0
-//flagcarriertakingdamage sound/player/carni-lycan/player/flagcarriertakingdamage 0
-freelance sound/player/carni-lycan/coms/freelance 2
-//getflag sound/player/carni-lycan/player/getflag 0
-incoming sound/player/carni-lycan/coms/incoming 0
-meet sound/player/carni-lycan/coms/meet 0
-needhelp sound/player/carni-lycan/coms/needhelp 2
-//negative sound/player/carni-lycan/player/negative 0
-//onmyway sound/player/carni-lycan/player/onmyway 0
-//roaming sound/player/carni-lycan/player/roaming 0
-//seenenemy sound/player/carni-lycan/player/seenenemy 0
-seenflag sound/player/carni-lycan/coms/seenflag 0
-taunt sound/player/carni-lycan/coms/taunt 3
-teamshoot sound/player/carni-lycan/coms/teamshoot 3
-death sound/player/carni-lycan/player/death 3
-drown sound/player/carni-lycan/player/drown 0
-//fall sound/player/carni-lycan/player/fall 0
-falling sound/player/carni-lycan/player/falling 0
-gasp sound/player/carni-lycan/player/gasp 0
-jump sound/player/carni-lycan/player/jump 0
-pain25 sound/player/carni-lycan/player/pain25 0
-pain50 sound/player/carni-lycan/player/pain50 0
-pain75 sound/player/carni-lycan/player/pain75 0
-pain100 sound/player/carni-lycan/player/pain100 0

diff --git a/models/player/marine.sounds b/models/player/marine.sounds
new file mode 100644 (file)
index 0000000..323b13c
--- /dev/null
+++ b/models/player/marine.sounds
@@ -0,0 +1,32 @@
+//TAG: marine\r
+//affirmative sound/player/carni-lycan/player/affirmative 0\r
+attack sound/player/marine/coms/attack 0\r
+//attacking sound/player/carni-lycan/player/attacking 0\r
+attackinfive sound/player/marine/coms/attackinfive 0\r
+coverme sound/player/marine/coms/coverme 0\r
+defend sound/player/marine/coms/defend 0\r
+//defending sound/player/carni-lycan/player/defending 0\r
+//droppedflag sound/player/carni-lycan/player/droppedflag 0\r
+//flagcarriertakingdamage sound/player/carni-lycan/player/flagcarriertakingdamage 0\r
+freelance sound/player/marine/coms/freelance 2\r
+//getflag sound/player/carni-lycan/player/getflag 0\r
+incoming sound/player/marine/coms/incoming 0\r
+meet sound/player/marine/coms/meet 0\r
+needhelp sound/player/marine/coms/needhelp 2\r
+//negative sound/player/carni-lycan/player/negative 0\r
+//onmyway sound/player/carni-lycan/player/onmyway 0\r
+//roaming sound/player/carni-lycan/player/roaming 0\r
+//seenenemy sound/player/carni-lycan/player/seenenemy 0\r
+seenflag sound/player/marine/coms/seenflag 0\r
+taunt sound/player/marine/coms/taunt 3\r
+teamshoot sound/player/marine/coms/teamshoot 4\r
+death sound/player/marine/player/death 3\r
+drown sound/player/marine/player/drown 0\r
+//fall sound/player/carni-lycan/player/fall 0\r
+falling sound/player/marine/player/fall 1\r
+gasp sound/player/marine/player/gasp 0\r
+jump sound/player/marine/player/jump 0\r
+pain25 sound/player/marine/player/pain25 0\r
+pain50 sound/player/marine/player/pain50 0\r
+pain75 sound/player/marine/player/pain75 0\r
+pain100 sound/player/marine/player/pain100 0\r

diff --git a/models/player/marine.zym.sounds b/models/player/marine.zym.sounds
deleted file mode 100644 (file)
index e868802..0000000
--- a/models/player/marine.zym.sounds
+++ /dev/null
@@ -1,32 +0,0 @@
-//TAG: marine
-//affirmative sound/player/carni-lycan/player/affirmative 0
-attack sound/player/marine/coms/attack 0
-//attacking sound/player/carni-lycan/player/attacking 0
-attackinfive sound/player/marine/coms/attackinfive 0
-coverme sound/player/marine/coms/coverme 0
-defend sound/player/marine/coms/defend 0
-//defending sound/player/carni-lycan/player/defending 0
-//droppedflag sound/player/carni-lycan/player/droppedflag 0
-//flagcarriertakingdamage sound/player/carni-lycan/player/flagcarriertakingdamage 0
-freelance sound/player/marine/coms/freelance 2
-//getflag sound/player/carni-lycan/player/getflag 0
-incoming sound/player/marine/coms/incoming 0
-meet sound/player/marine/coms/meet 0
-needhelp sound/player/marine/coms/needhelp 2
-//negative sound/player/carni-lycan/player/negative 0
-//onmyway sound/player/carni-lycan/player/onmyway 0
-//roaming sound/player/carni-lycan/player/roaming 0
-//seenenemy sound/player/carni-lycan/player/seenenemy 0
-seenflag sound/player/marine/coms/seenflag 0
-taunt sound/player/marine/coms/taunt 3
-teamshoot sound/player/marine/coms/teamshoot 4
-death sound/player/marine/player/death 3
-drown sound/player/marine/player/drown 0
-//fall sound/player/carni-lycan/player/fall 0
-falling sound/player/marine/player/fall 1
-gasp sound/player/marine/player/gasp 0
-jump sound/player/marine/player/jump 0
-pain25 sound/player/marine/player/pain25 0
-pain50 sound/player/marine/player/pain50 0
-pain75 sound/player/marine/player/pain75 0
-pain100 sound/player/marine/player/pain100 0

diff --git a/models/player/mulder.sounds b/models/player/mulder.sounds
new file mode 100644 (file)
index 0000000..51608c5
--- /dev/null
+++ b/models/player/mulder.sounds
@@ -0,0 +1,32 @@
+//TAG: soldier\r
+//affirmative sound/player/carni-lycan/player/affirmative 0\r
+attack sound/player/soldier/coms/attack 0\r
+//attacking sound/player/carni-lycan/player/attacking 0\r
+attackinfive sound/player/soldier/coms/attackinfive 0\r
+coverme sound/player/soldier/coms/coverme 0\r
+defend sound/player/soldier/coms/defend 0\r
+//defending sound/player/carni-lycan/player/defending 0\r
+//droppedflag sound/player/carni-lycan/player/droppedflag 0\r
+//flagcarriertakingdamage sound/player/carni-lycan/player/flagcarriertakingdamage 0\r
+freelance sound/player/soldier/coms/freelance 2\r
+//getflag sound/player/carni-lycan/player/getflag 0\r
+//incoming sound/player/soldier/coms/incoming 0\r
+meet sound/player/soldier/coms/meet 0\r
+needhelp sound/player/soldier/coms/needhelp 2\r
+//negative sound/player/carni-lycan/player/negative 0\r
+//onmyway sound/player/carni-lycan/player/onmyway 0\r
+//roaming sound/player/carni-lycan/player/roaming 0\r
+//seenenemy sound/player/carni-lycan/player/seenenemy 0\r
+seenflag sound/player/soldier/coms/seenflag 0\r
+taunt sound/player/soldier/coms/taunt 3\r
+teamshoot sound/player/soldier/coms/teamshoot 3\r
+death sound/player/soldier/player/death 3\r
+drown sound/player/soldier/player/drown 0\r
+//fall sound/player/carni-lycan/player/fall 0\r
+falling sound/player/soldier/player/falling 0\r
+gasp sound/player/soldier/player/gasp 0\r
+jump sound/player/soldier/player/jump 0\r
+pain25 sound/player/soldier/player/pain25 0\r
+pain50 sound/player/soldier/player/pain50 0\r
+pain75 sound/player/soldier/player/pain75 0\r
+pain100 sound/player/soldier/player/pain100 0\r

diff --git a/models/player/nexus.sounds b/models/player/nexus.sounds
new file mode 100644 (file)
index 0000000..51608c5
--- /dev/null
+++ b/models/player/nexus.sounds
@@ -0,0 +1,32 @@
+//TAG: soldier\r
+//affirmative sound/player/carni-lycan/player/affirmative 0\r
+attack sound/player/soldier/coms/attack 0\r
+//attacking sound/player/carni-lycan/player/attacking 0\r
+attackinfive sound/player/soldier/coms/attackinfive 0\r
+coverme sound/player/soldier/coms/coverme 0\r
+defend sound/player/soldier/coms/defend 0\r
+//defending sound/player/carni-lycan/player/defending 0\r
+//droppedflag sound/player/carni-lycan/player/droppedflag 0\r
+//flagcarriertakingdamage sound/player/carni-lycan/player/flagcarriertakingdamage 0\r
+freelance sound/player/soldier/coms/freelance 2\r
+//getflag sound/player/carni-lycan/player/getflag 0\r
+//incoming sound/player/soldier/coms/incoming 0\r
+meet sound/player/soldier/coms/meet 0\r
+needhelp sound/player/soldier/coms/needhelp 2\r
+//negative sound/player/carni-lycan/player/negative 0\r
+//onmyway sound/player/carni-lycan/player/onmyway 0\r
+//roaming sound/player/carni-lycan/player/roaming 0\r
+//seenenemy sound/player/carni-lycan/player/seenenemy 0\r
+seenflag sound/player/soldier/coms/seenflag 0\r
+taunt sound/player/soldier/coms/taunt 3\r
+teamshoot sound/player/soldier/coms/teamshoot 3\r
+death sound/player/soldier/player/death 3\r
+drown sound/player/soldier/player/drown 0\r
+//fall sound/player/carni-lycan/player/fall 0\r
+falling sound/player/soldier/player/falling 0\r
+gasp sound/player/soldier/player/gasp 0\r
+jump sound/player/soldier/player/jump 0\r
+pain25 sound/player/soldier/player/pain25 0\r
+pain50 sound/player/soldier/player/pain50 0\r
+pain75 sound/player/soldier/player/pain75 0\r
+pain100 sound/player/soldier/player/pain100 0\r

diff --git a/models/player/nexus.zym.sounds b/models/player/nexus.zym.sounds
deleted file mode 100644 (file)
index dd7be39..0000000
--- a/models/player/nexus.zym.sounds
+++ /dev/null
@@ -1,32 +0,0 @@
-//TAG: soldier
-//affirmative sound/player/carni-lycan/player/affirmative 0
-attack sound/player/soldier/coms/attack 0
-//attacking sound/player/carni-lycan/player/attacking 0
-attackinfive sound/player/soldier/coms/attackinfive 0
-coverme sound/player/soldier/coms/coverme 0
-defend sound/player/soldier/coms/defend 0
-//defending sound/player/carni-lycan/player/defending 0
-//droppedflag sound/player/carni-lycan/player/droppedflag 0
-//flagcarriertakingdamage sound/player/carni-lycan/player/flagcarriertakingdamage 0
-freelance sound/player/soldier/coms/freelance 2
-//getflag sound/player/carni-lycan/player/getflag 0
-//incoming sound/player/soldier/coms/incoming 0
-meet sound/player/soldier/coms/meet 0
-needhelp sound/player/soldier/coms/needhelp 2
-//negative sound/player/carni-lycan/player/negative 0
-//onmyway sound/player/carni-lycan/player/onmyway 0
-//roaming sound/player/carni-lycan/player/roaming 0
-//seenenemy sound/player/carni-lycan/player/seenenemy 0
-seenflag sound/player/soldier/coms/seenflag 0
-taunt sound/player/soldier/coms/taunt 3
-teamshoot sound/player/soldier/coms/teamshoot 3
-death sound/player/soldier/player/death 3
-drown sound/player/soldier/player/drown 0
-//fall sound/player/carni-lycan/player/fall 0
-falling sound/player/soldier/player/falling 0
-gasp sound/player/soldier/player/gasp 0
-jump sound/player/soldier/player/jump 0
-pain25 sound/player/soldier/player/pain25 0
-pain50 sound/player/soldier/player/pain50 0
-pain75 sound/player/soldier/player/pain75 0
-pain100 sound/player/soldier/player/pain100 0

diff --git a/models/player/pyria.sounds b/models/player/pyria.sounds
new file mode 100644 (file)
index 0000000..d313aa5
--- /dev/null
+++ b/models/player/pyria.sounds
@@ -0,0 +1,32 @@
+//TAG: pyria-skadi\r
+//affirmative sound/player/carni-lycan/player/affirmative 0\r
+attack sound/player/pyria-skadi/coms/attack 2\r
+//attacking sound/player/carni-lycan/player/attacking 0\r
+attackinfive sound/player/pyria-skadi/coms/attackinfive 0\r
+//coverme sound/player/pyria-skadi/coms/coverme 0\r
+//defend sound/player/pyria-skadi/coms/defend 0\r
+//defending sound/player/carni-lycan/player/defending 0\r
+//droppedflag sound/player/carni-lycan/player/droppedflag 0\r
+//flagcarriertakingdamage sound/player/carni-lycan/player/flagcarriertakingdamage 0\r
+freelance sound/player/pyria-skadi/coms/freelance 2\r
+//getflag sound/player/carni-lycan/player/getflag 0\r
+//incoming sound/player/pyria-skadi/coms/incoming 0\r
+meet sound/player/pyria-skadi/coms/meet 0\r
+needhelp sound/player/pyria-skadi/coms/needhelp 2\r
+//negative sound/player/carni-lycan/player/negative 0\r
+//onmyway sound/player/carni-lycan/player/onmyway 0\r
+//roaming sound/player/carni-lycan/player/roaming 0\r
+//seenenemy sound/player/carni-lycan/player/seenenemy 0\r
+seenflag sound/player/pyria-skadi/coms/seenflag 0\r
+taunt sound/player/pyria-skadi/coms/taunt 5\r
+teamshoot sound/player/pyria-skadi/coms/teamshoot 4\r
+death sound/player/pyria-skadi/player/death 3\r
+drown sound/player/pyria-skadi/player/drown 0\r
+//fall sound/player/carni-lycan/player/fall 0\r
+falling sound/player/pyria-skadi/player/falling 0\r
+gasp sound/player/pyria-skadi/player/gasp 0\r
+jump sound/player/pyria-skadi/player/jump 0\r
+pain25 sound/player/pyria-skadi/player/pain25 0\r
+pain50 sound/player/pyria-skadi/player/pain50 0\r
+pain75 sound/player/pyria-skadi/player/pain75 0\r
+pain100 sound/player/pyria-skadi/player/pain100 0\r

diff --git a/models/player/pyria.zym.sounds b/models/player/pyria.zym.sounds
deleted file mode 100644 (file)
index 691c58f..0000000
--- a/models/player/pyria.zym.sounds
+++ /dev/null
@@ -1,32 +0,0 @@
-//TAG: pyria-skadi
-//affirmative sound/player/carni-lycan/player/affirmative 0
-attack sound/player/pyria-skadi/coms/attack 2
-//attacking sound/player/carni-lycan/player/attacking 0
-attackinfive sound/player/pyria-skadi/coms/attackinfive 0
-//coverme sound/player/pyria-skadi/coms/coverme 0
-//defend sound/player/pyria-skadi/coms/defend 0
-//defending sound/player/carni-lycan/player/defending 0
-//droppedflag sound/player/carni-lycan/player/droppedflag 0
-//flagcarriertakingdamage sound/player/carni-lycan/player/flagcarriertakingdamage 0
-freelance sound/player/pyria-skadi/coms/freelance 2
-//getflag sound/player/carni-lycan/player/getflag 0
-//incoming sound/player/pyria-skadi/coms/incoming 0
-meet sound/player/pyria-skadi/coms/meet 0
-needhelp sound/player/pyria-skadi/coms/needhelp 2
-//negative sound/player/carni-lycan/player/negative 0
-//onmyway sound/player/carni-lycan/player/onmyway 0
-//roaming sound/player/carni-lycan/player/roaming 0
-//seenenemy sound/player/carni-lycan/player/seenenemy 0
-seenflag sound/player/pyria-skadi/coms/seenflag 0
-taunt sound/player/pyria-skadi/coms/taunt 5
-teamshoot sound/player/pyria-skadi/coms/teamshoot 4
-death sound/player/pyria-skadi/player/death 3
-drown sound/player/pyria-skadi/player/drown 0
-//fall sound/player/carni-lycan/player/fall 0
-falling sound/player/pyria-skadi/player/falling 0
-gasp sound/player/pyria-skadi/player/gasp 0
-jump sound/player/pyria-skadi/player/jump 0
-pain25 sound/player/pyria-skadi/player/pain25 0
-pain50 sound/player/pyria-skadi/player/pain50 0
-pain75 sound/player/pyria-skadi/player/pain75 0
-pain100 sound/player/pyria-skadi/player/pain100 0

diff --git a/models/player/quark.sounds b/models/player/quark.sounds
new file mode 100644 (file)
index 0000000..51608c5
--- /dev/null
+++ b/models/player/quark.sounds
@@ -0,0 +1,32 @@
+//TAG: soldier\r
+//affirmative sound/player/carni-lycan/player/affirmative 0\r
+attack sound/player/soldier/coms/attack 0\r
+//attacking sound/player/carni-lycan/player/attacking 0\r
+attackinfive sound/player/soldier/coms/attackinfive 0\r
+coverme sound/player/soldier/coms/coverme 0\r
+defend sound/player/soldier/coms/defend 0\r
+//defending sound/player/carni-lycan/player/defending 0\r
+//droppedflag sound/player/carni-lycan/player/droppedflag 0\r
+//flagcarriertakingdamage sound/player/carni-lycan/player/flagcarriertakingdamage 0\r
+freelance sound/player/soldier/coms/freelance 2\r
+//getflag sound/player/carni-lycan/player/getflag 0\r
+//incoming sound/player/soldier/coms/incoming 0\r
+meet sound/player/soldier/coms/meet 0\r
+needhelp sound/player/soldier/coms/needhelp 2\r
+//negative sound/player/carni-lycan/player/negative 0\r
+//onmyway sound/player/carni-lycan/player/onmyway 0\r
+//roaming sound/player/carni-lycan/player/roaming 0\r
+//seenenemy sound/player/carni-lycan/player/seenenemy 0\r
+seenflag sound/player/soldier/coms/seenflag 0\r
+taunt sound/player/soldier/coms/taunt 3\r
+teamshoot sound/player/soldier/coms/teamshoot 3\r
+death sound/player/soldier/player/death 3\r
+drown sound/player/soldier/player/drown 0\r
+//fall sound/player/carni-lycan/player/fall 0\r
+falling sound/player/soldier/player/falling 0\r
+gasp sound/player/soldier/player/gasp 0\r
+jump sound/player/soldier/player/jump 0\r
+pain25 sound/player/soldier/player/pain25 0\r
+pain50 sound/player/soldier/player/pain50 0\r
+pain75 sound/player/soldier/player/pain75 0\r
+pain100 sound/player/soldier/player/pain100 0\r

diff --git a/models/player/reptile.sounds b/models/player/reptile.sounds
new file mode 100644 (file)
index 0000000..8346c17
--- /dev/null
+++ b/models/player/reptile.sounds
@@ -0,0 +1,32 @@
+//TAG: reptilian\r
+//affirmative sound/player/carni-lycan/player/affirmative 0\r
+attack sound/player/reptilian/coms/attack 0\r
+//attacking sound/player/carni-lycan/player/attacking 0\r
+attackinfive sound/player/reptilian/coms/attackinfive 0\r
+coverme sound/player/reptilian/coms/coverme 0\r
+defend sound/player/reptilian/coms/defend 0\r
+//defending sound/player/carni-lycan/player/defending 0\r
+//droppedflag sound/player/carni-lycan/player/droppedflag 0\r
+//flagcarriertakingdamage sound/player/carni-lycan/player/flagcarriertakingdamage 0\r
+freelance sound/player/reptilian/coms/freelance 2\r
+//getflag sound/player/carni-lycan/player/getflag 0\r
+incoming sound/player/reptilian/coms/incoming 0\r
+meet sound/player/reptilian/coms/meet 0\r
+needhelp sound/player/reptilian/coms/needhelp 2\r
+//negative sound/player/carni-lycan/player/negative 0\r
+//onmyway sound/player/carni-lycan/player/onmyway 0\r
+//roaming sound/player/carni-lycan/player/roaming 0\r
+//seenenemy sound/player/carni-lycan/player/seenenemy 0\r
+seenflag sound/player/reptilian/coms/seenflag 0\r
+taunt sound/player/reptilian/coms/taunt 3\r
+teamshoot sound/player/reptilian/coms/teamshoot 3\r
+death sound/player/reptilian/player/death 3\r
+drown sound/player/reptilian/player/drown 0\r
+//fall sound/player/carni-lycan/player/fall 0\r
+falling sound/player/reptilian/player/falling 0\r
+gasp sound/player/reptilian/player/gasp 0\r
+jump sound/player/reptilian/player/jump 0\r
+pain25 sound/player/reptilian/player/pain25 0\r
+pain50 sound/player/reptilian/player/pain50 0\r
+pain75 sound/player/reptilian/player/pain75 0\r
+pain100 sound/player/reptilian/player/pain100 0\r

diff --git a/models/player/shock.sounds b/models/player/shock.sounds
new file mode 100644 (file)
index 0000000..323b13c
--- /dev/null
+++ b/models/player/shock.sounds
@@ -0,0 +1,32 @@
+//TAG: marine\r
+//affirmative sound/player/carni-lycan/player/affirmative 0\r
+attack sound/player/marine/coms/attack 0\r
+//attacking sound/player/carni-lycan/player/attacking 0\r
+attackinfive sound/player/marine/coms/attackinfive 0\r
+coverme sound/player/marine/coms/coverme 0\r
+defend sound/player/marine/coms/defend 0\r
+//defending sound/player/carni-lycan/player/defending 0\r
+//droppedflag sound/player/carni-lycan/player/droppedflag 0\r
+//flagcarriertakingdamage sound/player/carni-lycan/player/flagcarriertakingdamage 0\r
+freelance sound/player/marine/coms/freelance 2\r
+//getflag sound/player/carni-lycan/player/getflag 0\r
+incoming sound/player/marine/coms/incoming 0\r
+meet sound/player/marine/coms/meet 0\r
+needhelp sound/player/marine/coms/needhelp 2\r
+//negative sound/player/carni-lycan/player/negative 0\r
+//onmyway sound/player/carni-lycan/player/onmyway 0\r
+//roaming sound/player/carni-lycan/player/roaming 0\r
+//seenenemy sound/player/carni-lycan/player/seenenemy 0\r
+seenflag sound/player/marine/coms/seenflag 0\r
+taunt sound/player/marine/coms/taunt 3\r
+teamshoot sound/player/marine/coms/teamshoot 4\r
+death sound/player/marine/player/death 3\r
+drown sound/player/marine/player/drown 0\r
+//fall sound/player/carni-lycan/player/fall 0\r
+falling sound/player/marine/player/fall 1\r
+gasp sound/player/marine/player/gasp 0\r
+jump sound/player/marine/player/jump 0\r
+pain25 sound/player/marine/player/pain25 0\r
+pain50 sound/player/marine/player/pain50 0\r
+pain75 sound/player/marine/player/pain75 0\r
+pain100 sound/player/marine/player/pain100 0\r

diff --git a/models/player/shock.zym.sounds b/models/player/shock.zym.sounds
deleted file mode 100644 (file)
index e868802..0000000
--- a/models/player/shock.zym.sounds
+++ /dev/null
@@ -1,32 +0,0 @@
-//TAG: marine
-//affirmative sound/player/carni-lycan/player/affirmative 0
-attack sound/player/marine/coms/attack 0
-//attacking sound/player/carni-lycan/player/attacking 0
-attackinfive sound/player/marine/coms/attackinfive 0
-coverme sound/player/marine/coms/coverme 0
-defend sound/player/marine/coms/defend 0
-//defending sound/player/carni-lycan/player/defending 0
-//droppedflag sound/player/carni-lycan/player/droppedflag 0
-//flagcarriertakingdamage sound/player/carni-lycan/player/flagcarriertakingdamage 0
-freelance sound/player/marine/coms/freelance 2
-//getflag sound/player/carni-lycan/player/getflag 0
-incoming sound/player/marine/coms/incoming 0
-meet sound/player/marine/coms/meet 0
-needhelp sound/player/marine/coms/needhelp 2
-//negative sound/player/carni-lycan/player/negative 0
-//onmyway sound/player/carni-lycan/player/onmyway 0
-//roaming sound/player/carni-lycan/player/roaming 0
-//seenenemy sound/player/carni-lycan/player/seenenemy 0
-seenflag sound/player/marine/coms/seenflag 0
-taunt sound/player/marine/coms/taunt 3
-teamshoot sound/player/marine/coms/teamshoot 4
-death sound/player/marine/player/death 3
-drown sound/player/marine/player/drown 0
-//fall sound/player/carni-lycan/player/fall 0
-falling sound/player/marine/player/fall 1
-gasp sound/player/marine/player/gasp 0
-jump sound/player/marine/player/jump 0
-pain25 sound/player/marine/player/pain25 0
-pain50 sound/player/marine/player/pain50 0
-pain75 sound/player/marine/player/pain75 0
-pain100 sound/player/marine/player/pain100 0

diff --git a/models/player/skadi.sounds b/models/player/skadi.sounds
new file mode 100644 (file)
index 0000000..d313aa5
--- /dev/null
+++ b/models/player/skadi.sounds
@@ -0,0 +1,32 @@
+//TAG: pyria-skadi\r
+//affirmative sound/player/carni-lycan/player/affirmative 0\r
+attack sound/player/pyria-skadi/coms/attack 2\r
+//attacking sound/player/carni-lycan/player/attacking 0\r
+attackinfive sound/player/pyria-skadi/coms/attackinfive 0\r
+//coverme sound/player/pyria-skadi/coms/coverme 0\r
+//defend sound/player/pyria-skadi/coms/defend 0\r
+//defending sound/player/carni-lycan/player/defending 0\r
+//droppedflag sound/player/carni-lycan/player/droppedflag 0\r
+//flagcarriertakingdamage sound/player/carni-lycan/player/flagcarriertakingdamage 0\r
+freelance sound/player/pyria-skadi/coms/freelance 2\r
+//getflag sound/player/carni-lycan/player/getflag 0\r
+//incoming sound/player/pyria-skadi/coms/incoming 0\r
+meet sound/player/pyria-skadi/coms/meet 0\r
+needhelp sound/player/pyria-skadi/coms/needhelp 2\r
+//negative sound/player/carni-lycan/player/negative 0\r
+//onmyway sound/player/carni-lycan/player/onmyway 0\r
+//roaming sound/player/carni-lycan/player/roaming 0\r
+//seenenemy sound/player/carni-lycan/player/seenenemy 0\r
+seenflag sound/player/pyria-skadi/coms/seenflag 0\r
+taunt sound/player/pyria-skadi/coms/taunt 5\r
+teamshoot sound/player/pyria-skadi/coms/teamshoot 4\r
+death sound/player/pyria-skadi/player/death 3\r
+drown sound/player/pyria-skadi/player/drown 0\r
+//fall sound/player/carni-lycan/player/fall 0\r
+falling sound/player/pyria-skadi/player/falling 0\r
+gasp sound/player/pyria-skadi/player/gasp 0\r
+jump sound/player/pyria-skadi/player/jump 0\r
+pain25 sound/player/pyria-skadi/player/pain25 0\r
+pain50 sound/player/pyria-skadi/player/pain50 0\r
+pain75 sound/player/pyria-skadi/player/pain75 0\r
+pain100 sound/player/pyria-skadi/player/pain100 0\r

diff --git a/models/player/skadi.zym.sounds b/models/player/skadi.zym.sounds
deleted file mode 100644 (file)
index 691c58f..0000000
--- a/models/player/skadi.zym.sounds
+++ /dev/null
@@ -1,32 +0,0 @@
-//TAG: pyria-skadi
-//affirmative sound/player/carni-lycan/player/affirmative 0
-attack sound/player/pyria-skadi/coms/attack 2
-//attacking sound/player/carni-lycan/player/attacking 0
-attackinfive sound/player/pyria-skadi/coms/attackinfive 0
-//coverme sound/player/pyria-skadi/coms/coverme 0
-//defend sound/player/pyria-skadi/coms/defend 0
-//defending sound/player/carni-lycan/player/defending 0
-//droppedflag sound/player/carni-lycan/player/droppedflag 0
-//flagcarriertakingdamage sound/player/carni-lycan/player/flagcarriertakingdamage 0
-freelance sound/player/pyria-skadi/coms/freelance 2
-//getflag sound/player/carni-lycan/player/getflag 0
-//incoming sound/player/pyria-skadi/coms/incoming 0
-meet sound/player/pyria-skadi/coms/meet 0
-needhelp sound/player/pyria-skadi/coms/needhelp 2
-//negative sound/player/carni-lycan/player/negative 0
-//onmyway sound/player/carni-lycan/player/onmyway 0
-//roaming sound/player/carni-lycan/player/roaming 0
-//seenenemy sound/player/carni-lycan/player/seenenemy 0
-seenflag sound/player/pyria-skadi/coms/seenflag 0
-taunt sound/player/pyria-skadi/coms/taunt 5
-teamshoot sound/player/pyria-skadi/coms/teamshoot 4
-death sound/player/pyria-skadi/player/death 3
-drown sound/player/pyria-skadi/player/drown 0
-//fall sound/player/carni-lycan/player/fall 0
-falling sound/player/pyria-skadi/player/falling 0
-gasp sound/player/pyria-skadi/player/gasp 0
-jump sound/player/pyria-skadi/player/jump 0
-pain25 sound/player/pyria-skadi/player/pain25 0
-pain50 sound/player/pyria-skadi/player/pain50 0
-pain75 sound/player/pyria-skadi/player/pain75 0
-pain100 sound/player/pyria-skadi/player/pain100 0

diff --git a/models/player/specop.sounds b/models/player/specop.sounds
new file mode 100644 (file)
index 0000000..cdd8542
--- /dev/null
+++ b/models/player/specop.sounds
@@ -0,0 +1,32 @@
+//TAG: specop\r
+//affirmative sound/player/carni-lycan/player/affirmative 0\r
+attack sound/player/specop/coms/attack 0\r
+//attacking sound/player/carni-lycan/player/attacking 0\r
+attackinfive sound/player/specop/coms/attackinfive 0\r
+coverme sound/player/specop/coms/coverme 0\r
+defend sound/player/specop/coms/defend 0\r
+//defending sound/player/carni-lycan/player/defending 0\r
+//droppedflag sound/player/carni-lycan/player/droppedflag 0\r
+//flagcarriertakingdamage sound/player/carni-lycan/player/flagcarriertakingdamage 0\r
+freelance sound/player/specop/coms/freelance 2\r
+//getflag sound/player/carni-lycan/player/getflag 0\r
+incoming sound/player/specop/coms/incoming 0\r
+meet sound/player/specop/coms/meet 0\r
+needhelp sound/player/specop/coms/needhelp 1\r
+//negative sound/player/carni-lycan/player/negative 0\r
+//onmyway sound/player/carni-lycan/player/onmyway 0\r
+//roaming sound/player/carni-lycan/player/roaming 0\r
+//seenenemy sound/player/carni-lycan/player/seenenemy 0\r
+seenflag sound/player/specop/coms/seenflag 0\r
+taunt sound/player/specop/coms/taunt 4\r
+teamshoot sound/player/specop/coms/teamshoot 4\r
+death sound/player/specop/player/death 3\r
+drown sound/player/specop/player/drown 0\r
+//fall sound/player/carni-lycan/player/fall 0\r
+falling sound/player/specop/player/falling 0\r
+gasp sound/player/specop/player/gasp 0\r
+jump sound/player/specop/player/jump 0\r
+pain25 sound/player/specop/player/pain25 0\r
+pain50 sound/player/specop/player/pain50 0\r
+pain75 sound/player/specop/player/pain75 0\r
+pain100 sound/player/specop/player/pain100 0\r

diff --git a/models/player/specop.zym.sounds b/models/player/specop.zym.sounds
deleted file mode 100644 (file)
index 3d0ea27..0000000
--- a/models/player/specop.zym.sounds
+++ /dev/null
@@ -1,32 +0,0 @@
-//TAG: specop
-//affirmative sound/player/carni-lycan/player/affirmative 0
-attack sound/player/specop/coms/attack 0
-//attacking sound/player/carni-lycan/player/attacking 0
-attackinfive sound/player/specop/coms/attackinfive 0
-coverme sound/player/specop/coms/coverme 0
-defend sound/player/specop/coms/defend 0
-//defending sound/player/carni-lycan/player/defending 0
-//droppedflag sound/player/carni-lycan/player/droppedflag 0
-//flagcarriertakingdamage sound/player/carni-lycan/player/flagcarriertakingdamage 0
-freelance sound/player/specop/coms/freelance 2
-//getflag sound/player/carni-lycan/player/getflag 0
-incoming sound/player/specop/coms/incoming 0
-meet sound/player/specop/coms/meet 0
-needhelp sound/player/specop/coms/needhelp 1
-//negative sound/player/carni-lycan/player/negative 0
-//onmyway sound/player/carni-lycan/player/onmyway 0
-//roaming sound/player/carni-lycan/player/roaming 0
-//seenenemy sound/player/carni-lycan/player/seenenemy 0
-seenflag sound/player/specop/coms/seenflag 0
-taunt sound/player/specop/coms/taunt 4
-teamshoot sound/player/specop/coms/teamshoot 4
-death sound/player/specop/player/death 3
-drown sound/player/specop/player/drown 0
-//fall sound/player/carni-lycan/player/fall 0
-falling sound/player/specop/player/falling 0
-gasp sound/player/specop/player/gasp 0
-jump sound/player/specop/player/jump 0
-pain25 sound/player/specop/player/pain25 0
-pain50 sound/player/specop/player/pain50 0
-pain75 sound/player/specop/player/pain75 0
-pain100 sound/player/specop/player/pain100 0

diff --git a/models/player/visitant.zym.sounds b/models/player/visitant.zym.sounds
deleted file mode 100644 (file)
index f5f9ee2..0000000
--- a/models/player/visitant.zym.sounds
+++ /dev/null
@@ -1,32 +0,0 @@
-//TAG: fricka
-//affirmative sound/player/carni-lycan/player/affirmative 0
-attack sound/player/fricka/coms/attack 0
-//attacking sound/player/carni-lycan/player/attacking 0
-attackinfive sound/player/fricka/coms/attackinfive 0
-//coverme sound/player/fricka/coms/coverme 0
-defend sound/player/fricka/coms/defend 0
-//defending sound/player/carni-lycan/player/defending 0
-//droppedflag sound/player/carni-lycan/player/droppedflag 0
-//flagcarriertakingdamage sound/player/carni-lycan/player/flagcarriertakingdamage 0
-freelance sound/player/fricka/coms/freelance 2
-//getflag sound/player/carni-lycan/player/getflag 0
-incoming sound/player/fricka/coms/incoming 0
-meet sound/player/fricka/coms/waypoint 0
-//needhelp sound/player/fricka/coms/needhelp 0
-//negative sound/player/carni-lycan/player/negative 0
-//onmyway sound/player/carni-lycan/player/onmyway 0
-//roaming sound/player/carni-lycan/player/roaming 0
-//seenenemy sound/player/carni-lycan/player/seenenemy 0
-seenflag sound/player/fricka/coms/flagseen 0
-taunt sound/player/fricka/coms/taunt 4
-teamshoot sound/player/fricka/coms/teamshoot 3
-death sound/player/fricka/player/death 3
-drown sound/player/fricka/player/drown 0
-//fall sound/player/carni-lycan/player/fall 0
-falling sound/player/fricka/player/falling 0
-gasp sound/player/fricka/player/gasp 0
-jump sound/player/fricka/player/jump 0
-pain25 sound/player/fricka/player/pain25 0
-pain50 sound/player/fricka/player/pain50 0
-pain75 sound/player/fricka/player/pain75 0
-pain100 sound/player/fricka/player/pain100 0

diff --git a/models/player/xolar.sounds b/models/player/xolar.sounds
new file mode 100644 (file)
index 0000000..51608c5
--- /dev/null
+++ b/models/player/xolar.sounds
@@ -0,0 +1,32 @@
+//TAG: soldier\r
+//affirmative sound/player/carni-lycan/player/affirmative 0\r
+attack sound/player/soldier/coms/attack 0\r
+//attacking sound/player/carni-lycan/player/attacking 0\r
+attackinfive sound/player/soldier/coms/attackinfive 0\r
+coverme sound/player/soldier/coms/coverme 0\r
+defend sound/player/soldier/coms/defend 0\r
+//defending sound/player/carni-lycan/player/defending 0\r
+//droppedflag sound/player/carni-lycan/player/droppedflag 0\r
+//flagcarriertakingdamage sound/player/carni-lycan/player/flagcarriertakingdamage 0\r
+freelance sound/player/soldier/coms/freelance 2\r
+//getflag sound/player/carni-lycan/player/getflag 0\r
+//incoming sound/player/soldier/coms/incoming 0\r
+meet sound/player/soldier/coms/meet 0\r
+needhelp sound/player/soldier/coms/needhelp 2\r
+//negative sound/player/carni-lycan/player/negative 0\r
+//onmyway sound/player/carni-lycan/player/onmyway 0\r
+//roaming sound/player/carni-lycan/player/roaming 0\r
+//seenenemy sound/player/carni-lycan/player/seenenemy 0\r
+seenflag sound/player/soldier/coms/seenflag 0\r
+taunt sound/player/soldier/coms/taunt 3\r
+teamshoot sound/player/soldier/coms/teamshoot 3\r
+death sound/player/soldier/player/death 3\r
+drown sound/player/soldier/player/drown 0\r
+//fall sound/player/carni-lycan/player/fall 0\r
+falling sound/player/soldier/player/falling 0\r
+gasp sound/player/soldier/player/gasp 0\r
+jump sound/player/soldier/player/jump 0\r
+pain25 sound/player/soldier/player/pain25 0\r
+pain50 sound/player/soldier/player/pain50 0\r
+pain75 sound/player/soldier/player/pain75 0\r
+pain100 sound/player/soldier/player/pain100 0\r

diff --git a/models/player/xolar.zym.sounds b/models/player/xolar.zym.sounds
deleted file mode 100644 (file)
index dd7be39..0000000
--- a/models/player/xolar.zym.sounds
+++ /dev/null
@@ -1,32 +0,0 @@
-//TAG: soldier
-//affirmative sound/player/carni-lycan/player/affirmative 0
-attack sound/player/soldier/coms/attack 0
-//attacking sound/player/carni-lycan/player/attacking 0
-attackinfive sound/player/soldier/coms/attackinfive 0
-coverme sound/player/soldier/coms/coverme 0
-defend sound/player/soldier/coms/defend 0
-//defending sound/player/carni-lycan/player/defending 0
-//droppedflag sound/player/carni-lycan/player/droppedflag 0
-//flagcarriertakingdamage sound/player/carni-lycan/player/flagcarriertakingdamage 0
-freelance sound/player/soldier/coms/freelance 2
-//getflag sound/player/carni-lycan/player/getflag 0
-//incoming sound/player/soldier/coms/incoming 0
-meet sound/player/soldier/coms/meet 0
-needhelp sound/player/soldier/coms/needhelp 2
-//negative sound/player/carni-lycan/player/negative 0
-//onmyway sound/player/carni-lycan/player/onmyway 0
-//roaming sound/player/carni-lycan/player/roaming 0
-//seenenemy sound/player/carni-lycan/player/seenenemy 0
-seenflag sound/player/soldier/coms/seenflag 0
-taunt sound/player/soldier/coms/taunt 3
-teamshoot sound/player/soldier/coms/teamshoot 3
-death sound/player/soldier/player/death 3
-drown sound/player/soldier/player/drown 0
-//fall sound/player/carni-lycan/player/fall 0
-falling sound/player/soldier/player/falling 0
-gasp sound/player/soldier/player/gasp 0
-jump sound/player/soldier/player/jump 0
-pain25 sound/player/soldier/player/pain25 0
-pain50 sound/player/soldier/player/pain50 0
-pain75 sound/player/soldier/player/pain75 0
-pain100 sound/player/soldier/player/pain100 0

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index ef83ef63543c7dc1a77c1633be408fb5ba45a0c1..c7e83800671566b5034365484e52678354b6822e 100644 (file)
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -508,7 +508,6 @@ float Client_customizeentityforclient()
        return TRUE;
 }
 
-void UpdatePlayerSounds();
 void setmodel_lod(entity e, string modelname)
 {
        string s;
@@ -556,7 +555,6 @@ void setmodel_lod(entity e, string modelname)
        self.modelindex_lod0_from_xonotic = ((s == "") || (substring(s, 0, 4) == "data"));
 
        player_setupanimsformodel();
-       UpdatePlayerSounds();
 }
 
 /*

diff --git a/qcsrc/server/cl_player.qc b/qcsrc/server/cl_player.qc
index 8925f171340d0de0cbab5feb0076a9b3370aaa65..c5d85b793bf86606333242c17265922df91a0626 100644 (file)
--- a/qcsrc/server/cl_player.qc
+++ b/qcsrc/server/cl_player.qc
@@ -167,6 +167,7 @@ float player_getspecies()
 {
        local float glob, i, j, fh, len, s, sk;
        local string fn, l;
+       local float tokens;
 
        s = -1;
 
@@ -186,6 +187,9 @@ float player_getspecies()
                        if(sk == (j ? 0 : self.skinindex)) // 2nd pass skips the skin test
                        if(fgets(fh) == self.model)
                        {
+                               tokens = tokenizebyseparator(fn, ".");
+                               UpdatePlayerSounds(argv(0));
+
                                l = fgets(fh);
                                len = tokenize_console(l);
                                if (len != 2)
@@ -1264,14 +1268,17 @@ void LoadPlayerSounds(string f, float first)
 }
 
 .float modelindex_for_playersound;
-void UpdatePlayerSounds()
+void UpdatePlayerSounds(string filename)
 {
        if(self.modelindex == self.modelindex_for_playersound)
                return;
        self.modelindex_for_playersound = self.modelindex;
        ClearPlayerSounds();
        LoadPlayerSounds("sound/player/default.sounds", 1);
-       LoadPlayerSounds(strcat(self.model, ".sounds"), 0);
+       if(filename != "")
+               LoadPlayerSounds(strcat(filename, ".sounds"), 0);
+       else
+               LoadPlayerSounds(strcat(self.model, ".sounds"), 0); // backwards compatibility
 }
 
 void FakeGlobalSound(string sample, float chan, float voicetype)

diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh
index b487e3de77aa81cf455c54a68248f393cdc0aea1..5e7c83cf2378db7e02c47b428e6c97afe0138164 100644 (file)
--- a/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@ -501,7 +501,7 @@ string globalsound_metalstep;
 
 void PrecachePlayerSounds(string f);
 void PrecacheGlobalSound(string samplestring);
-void UpdatePlayerSounds();
+void UpdatePlayerSounds(string filename);
 void ClearPlayerSounds();
 void PlayerSound(.string samplefield, float channel, float voicetype);
 void GlobalSound(string samplestring, float channel, float voicetype);