add some voices to the supported player sounds; add a new default sound set of all...

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 14fe4fe61ad27a35f94003835e8a7f6ad99b803e..a616d1769264196d8b0a81b5a554d1c7efa13986 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -1966,6 +1966,7 @@ set speedmeter 0 "print landing speeds"
 set developer_shtest 0 "experimental speedhack detection"
 set waypoint_benchmark 0 "quit after waypoint loading to benchmark bot navigation code"
 set g_debug_bot_commands 0 "print scripted bot commands before executing"
+set g_debug_defaultsounds 0 "always use default sounds"
 
 // debug cvars for keyhunt attaching
 set _angles "0 0 0"

diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
index f7075b9b24ecbf5ca515150ed7c9f0ab01263447..512a9c6d9ad2449758335548ee8618eed62e7c78 100644 (file)
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@ -1186,3 +1186,4 @@ float autocvar_waypoint_benchmark;
 float autocvar_welcome_message_time;
 float autocvar_sv_gameplayfix_gravityunaffectedbyticrate;
 float autocvar_g_trueaim_minrange;
+float autocvar_g_debug_defaultsounds;

diff --git a/qcsrc/server/cl_player.qc b/qcsrc/server/cl_player.qc
index cd846b15bfadcf0efbf9f3ecc0f9c07d80b91ceb..abee5c9d713df44227d593a6060c06905742e459 100644 (file)
--- a/qcsrc/server/cl_player.qc
+++ b/qcsrc/server/cl_player.qc
@@ -1134,8 +1134,9 @@ void UpdatePlayerSounds()
        self.skinindex_for_playersound = self.skinindex;
        ClearPlayerSounds();
        LoadPlayerSounds("sound/player/default.sounds", 1);
-       if(!LoadPlayerSounds(get_model_datafilename(self.model, self.skinindex, "sounds"), 0))
-               LoadPlayerSounds(get_model_datafilename(self.model, 0, "sounds"), 0);
+       if(!autocvar_g_debug_defaultsounds)
+               if(!LoadPlayerSounds(get_model_datafilename(self.model, self.skinindex, "sounds"), 0))
+                       LoadPlayerSounds(get_model_datafilename(self.model, 0, "sounds"), 0);
 }
 
 void FakeGlobalSound(string sample, float chan, float voicetype)

diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh
index cb88d354e4087a13d40ddf5473b50bb9ecef754a..bb9c07594325b66fe21798fb6bb4962b94d1ca9d 100644 (file)
--- a/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@ -429,18 +429,26 @@ float next_pingtime;
 // TODO implemented fall and falling
 #define ALLPLAYERSOUNDS \
                _VOICEMSG(death) \
-               _VOICEMSG(fall) \
                _VOICEMSG(drown) \
+               _VOICEMSG(fall) \
+               _VOICEMSG(fall) \
+               _VOICEMSG(falling) \
                _VOICEMSG(gasp) \
                _VOICEMSG(jump) \
+               _VOICEMSG(pain100) \
                _VOICEMSG(pain25) \
                _VOICEMSG(pain50) \
-               _VOICEMSG(pain75) \
-               _VOICEMSG(pain100)
+               _VOICEMSG(pain75)
+
 #define ALLVOICEMSGS \
                _VOICEMSG(attack) \
                _VOICEMSG(attackinfive) \
+               _VOICEMSG(coverme) \
+               _VOICEMSG(defend) \
+               _VOICEMSG(freelance) \
+               _VOICEMSG(incoming) \
                _VOICEMSG(meet) \
+               _VOICEMSG(needhelp) \
                _VOICEMSG(seenflag) \
                _VOICEMSG(taunt) \
                _VOICEMSG(teamshoot)
@@ -450,24 +458,18 @@ ALLPLAYERSOUNDS
 ALLVOICEMSGS
 #undef _VOICEMSG
 
-// reserved sound names for the future (models lack sounds for them):
+// reserved sound names for the future (some models lack sounds for them):
+//             _VOICEMSG(flagcarriertakingdamage) \
+//             _VOICEMSG(getflag) \
+// reserved sound names for the future (ALL models lack sounds for them):
 //             _VOICEMSG(affirmative) \
 //             _VOICEMSG(attacking) \
 //             _VOICEMSG(defending) \
 //             _VOICEMSG(roaming) \
 //             _VOICEMSG(onmyway) \
 //             _VOICEMSG(droppedflag) \
-//             _VOICEMSG(flagcarriertakingdamage) \
 //             _VOICEMSG(negative) \
 //             _VOICEMSG(seenenemy) \
-//             _VOICEMSG(fall) \
-//             _VOICEMSG(getflag) \
-//             _VOICEMSG(incoming) \
-//             _VOICEMSG(coverme) \
-//             _VOICEMSG(needhelp) \
-//             _VOICEMSG(defend) \
-//             _VOICEMSG(freelance) \
-//             _VOICEMSG(falling) \
 
 string globalsound_fall;
 string globalsound_metalfall;

diff --git a/sound/player/default.sounds b/sound/player/default.sounds
index cf93bb6a4a622b17d398ee70a03204741c161d4d..6800c2f663d71f815bd9081bff40a6d8e60ac9f9 100644 (file)
--- a/sound/player/default.sounds
+++ b/sound/player/default.sounds
@@ -1,31 +1,31 @@
-//affirmative sound/player/torus/coms/affirmative 0
-attack sound/player/torus/coms/attack 0
-//attacking sound/player/torus/coms/attacking 0
-attackinfive sound/player/torus/coms/letsgo 0
-coverme sound/player/torus/coms/coverme 0
-//defend sound/player/torus/coms/defend 1
-//defending sound/player/torus/coms/defending 0
-//droppedflag sound/player/torus/coms/droppedflag 0
-//flagcarriertakingdamage sound/player/torus/coms/flagcarriertakingdamage 0
-//freelance sound/player/torus/coms/freelance 1
-//getflag sound/player/torus/coms/getflag 0
-incoming sound/player/torus/coms/incoming 0
-meet sound/player/torus/coms/waypoint 0
-needhelp sound/player/torus/coms/needhelp 0
-//negative sound/player/torus/coms/negative 0
-//onmyway sound/player/torus/coms/onmyway 0
-//roaming sound/player/torus/coms/roaming 0
-//seenenemy sound/player/torus/coms/seenenemy 0
-seenflag sound/player/torus/coms/seenflag 0
-taunt sound/player/torus/coms/taunt 2
-teamshoot sound/player/torus/coms/teamshoot 0
-death sound/player/torus/player/death 0
-drown sound/player/torus/player/drown 0
-//fall sound/player/torus/player/fall 0
-//falling sound/debug/v_falling 0
-gasp sound/player/torus/player/gasp 0
-jump sound/player/torus/player/fall 0
-pain25 sound/player/torus/player/pain25 0
-pain50 sound/player/torus/player/pain50 0
-pain75 sound/player/torus/player/pain75 0
-pain100 sound/player/torus/player/pain100 0
+affirmative sound/player/espeak/coms/affirmative 0
+attack sound/player/espeak/coms/attack 0
+attacking sound/player/espeak/coms/attacking 0
+attackinfive sound/player/espeak/coms/attackinfive 0
+coverme sound/player/espeak/coms/coverme 0
+defend sound/player/espeak/coms/defend 0
+defending sound/player/espeak/coms/defending 0
+droppedflag sound/player/espeak/coms/droppedflag 0
+flagcarriertakingdamage sound/player/espeak/coms/flagcarriertakingdamage 0
+freelance sound/player/espeak/coms/freelance 0
+getflag sound/player/espeak/coms/getflag 0
+incoming sound/player/espeak/coms/incoming 0
+meet sound/player/espeak/coms/meet 0
+needhelp sound/player/espeak/coms/needhelp 0
+negative sound/player/espeak/coms/negative 0
+onmyway sound/player/espeak/coms/onmyway 0
+roaming sound/player/espeak/coms/roaming 0
+seenenemy sound/player/espeak/coms/seenenemy 0
+seenflag sound/player/espeak/coms/seenflag 0
+taunt sound/player/espeak/coms/taunt 0
+teamshoot sound/player/espeak/coms/teamshoot 0
+death sound/player/espeak/player/death 0
+drown sound/player/espeak/player/drown 0
+fall sound/player/espeak/player/fall 0
+falling sound/player/espeak/player/falling 0
+gasp sound/player/espeak/player/gasp 0
+jump sound/player/espeak/player/jump 0
+pain25 sound/player/espeak/player/pain25 0
+pain50 sound/player/espeak/player/pain50 0
+pain75 sound/player/espeak/player/pain75 0
+pain100 sound/player/espeak/player/pain100 0

diff --git a/sound/player/espeak/coms/affirmative.ogg b/sound/player/espeak/coms/affirmative.ogg
new file mode 100644 (file)
index 0000000..310fe84
Binary files /dev/null and b/sound/player/espeak/coms/affirmative.ogg differ

diff --git a/sound/player/espeak/coms/attack.ogg b/sound/player/espeak/coms/attack.ogg
new file mode 100644 (file)
index 0000000..535bed8
Binary files /dev/null and b/sound/player/espeak/coms/attack.ogg differ

diff --git a/sound/player/espeak/coms/attackinfive.ogg b/sound/player/espeak/coms/attackinfive.ogg
new file mode 100644 (file)
index 0000000..998848f
Binary files /dev/null and b/sound/player/espeak/coms/attackinfive.ogg differ

diff --git a/sound/player/espeak/coms/attacking.ogg b/sound/player/espeak/coms/attacking.ogg
new file mode 100644 (file)
index 0000000..9ba2394
Binary files /dev/null and b/sound/player/espeak/coms/attacking.ogg differ

diff --git a/sound/player/espeak/coms/coverme.ogg b/sound/player/espeak/coms/coverme.ogg
new file mode 100644 (file)
index 0000000..079595b
Binary files /dev/null and b/sound/player/espeak/coms/coverme.ogg differ

diff --git a/sound/player/espeak/coms/defend.ogg b/sound/player/espeak/coms/defend.ogg
new file mode 100644 (file)
index 0000000..8a3a92c
Binary files /dev/null and b/sound/player/espeak/coms/defend.ogg differ

diff --git a/sound/player/espeak/coms/defending.ogg b/sound/player/espeak/coms/defending.ogg
new file mode 100644 (file)
index 0000000..32808d3
Binary files /dev/null and b/sound/player/espeak/coms/defending.ogg differ

diff --git a/sound/player/espeak/coms/droppedflag.ogg b/sound/player/espeak/coms/droppedflag.ogg
new file mode 100644 (file)
index 0000000..fc2f009
Binary files /dev/null and b/sound/player/espeak/coms/droppedflag.ogg differ

diff --git a/sound/player/espeak/coms/flagcarriertakingdamage.ogg b/sound/player/espeak/coms/flagcarriertakingdamage.ogg
new file mode 100644 (file)
index 0000000..8f27d15
Binary files /dev/null and b/sound/player/espeak/coms/flagcarriertakingdamage.ogg differ

diff --git a/sound/player/espeak/coms/freelance.ogg b/sound/player/espeak/coms/freelance.ogg
new file mode 100644 (file)
index 0000000..ac023a0
Binary files /dev/null and b/sound/player/espeak/coms/freelance.ogg differ

diff --git a/sound/player/espeak/coms/getflag.ogg b/sound/player/espeak/coms/getflag.ogg
new file mode 100644 (file)
index 0000000..958296d
Binary files /dev/null and b/sound/player/espeak/coms/getflag.ogg differ

diff --git a/sound/player/espeak/coms/incoming.ogg b/sound/player/espeak/coms/incoming.ogg
new file mode 100644 (file)
index 0000000..526f09f
Binary files /dev/null and b/sound/player/espeak/coms/incoming.ogg differ

diff --git a/sound/player/espeak/coms/meet.ogg b/sound/player/espeak/coms/meet.ogg
new file mode 100644 (file)
index 0000000..ff4aa6c
Binary files /dev/null and b/sound/player/espeak/coms/meet.ogg differ

diff --git a/sound/player/espeak/coms/needhelp.ogg b/sound/player/espeak/coms/needhelp.ogg
new file mode 100644 (file)
index 0000000..ef84985
Binary files /dev/null and b/sound/player/espeak/coms/needhelp.ogg differ

diff --git a/sound/player/espeak/coms/negative.ogg b/sound/player/espeak/coms/negative.ogg
new file mode 100644 (file)
index 0000000..1f63a57
Binary files /dev/null and b/sound/player/espeak/coms/negative.ogg differ

diff --git a/sound/player/espeak/coms/onmyway.ogg b/sound/player/espeak/coms/onmyway.ogg
new file mode 100644 (file)
index 0000000..ce8d203
Binary files /dev/null and b/sound/player/espeak/coms/onmyway.ogg differ

diff --git a/sound/player/espeak/coms/roaming.ogg b/sound/player/espeak/coms/roaming.ogg
new file mode 100644 (file)
index 0000000..5fee542
Binary files /dev/null and b/sound/player/espeak/coms/roaming.ogg differ

diff --git a/sound/player/espeak/coms/seenenemy.ogg b/sound/player/espeak/coms/seenenemy.ogg
new file mode 100644 (file)
index 0000000..da21bcf
Binary files /dev/null and b/sound/player/espeak/coms/seenenemy.ogg differ

diff --git a/sound/player/espeak/coms/seenflag.ogg b/sound/player/espeak/coms/seenflag.ogg
new file mode 100644 (file)
index 0000000..a6a78fb
Binary files /dev/null and b/sound/player/espeak/coms/seenflag.ogg differ

diff --git a/sound/player/espeak/coms/taunt.ogg b/sound/player/espeak/coms/taunt.ogg
new file mode 100644 (file)
index 0000000..03bf24c
Binary files /dev/null and b/sound/player/espeak/coms/taunt.ogg differ

diff --git a/sound/player/espeak/coms/teamshoot.ogg b/sound/player/espeak/coms/teamshoot.ogg
new file mode 100644 (file)
index 0000000..040db89
Binary files /dev/null and b/sound/player/espeak/coms/teamshoot.ogg differ

diff --git a/sound/player/espeak/make.sh b/sound/player/espeak/make.sh
new file mode 100644 (file)
index 0000000..a93c2cc
--- /dev/null
+++ b/sound/player/espeak/make.sh
@@ -0,0 +1,40 @@
+v()
+{
+       espeak -w "$1.wav" "$2"
+       normalize "$1.wav"
+       oggenc -q1 "$1.wav" -o "$1.ogg"
+       rm -f "$1.wav"
+}
+
+v player/death                 "Mine Leyben!"
+v player/fall                  "Ooh!"
+v player/drown                 "Gloog gloog gloog!"
+v player/gasp                  "Ha!"
+v player/jump                  "Hem!"
+v player/pain25                "Owowowow!"
+v player/pain50                "Owow!"
+v player/pain75                "Ouuu!"
+v player/pain100               "Ouch!"
+v player/fall                  "Arh!"
+v player/falling               "Aaaaaaaaaaaaaaaaaaaaa!"
+v coms/attack                  "Attack!"
+v coms/attackinfive            "Attack in 5! In 4! In 3! In 2! In 1! Attack NOW!"
+v coms/meet                    "Let's meet at the waypoint."
+v coms/seenflag                "I've seen the flag!"
+v coms/taunt                   "Double facepalm!"
+v coms/teamshoot               "I'm on your team!"
+v coms/incoming                "Incoming!"
+v coms/coverme                 "Cover me!"
+v coms/needhelp                "I need help!"
+v coms/defend                  "Defend the base!"
+v coms/freelance               "Do whatever you want."
+v coms/flagcarriertakingdamage "Our flag carrier is taking damage!"
+v coms/getflag                 "Somebody get our flag back!"
+v coms/affirmative             "Affirmative."
+v coms/attacking               "I'm attacking."
+v coms/defending               "I'm defending."
+v coms/roaming                 "I'm roaming around."
+v coms/onmyway                 "I'm on my way."
+v coms/droppedflag             "I dropped the flag!"
+v coms/negative                "Negative."
+v coms/seenenemy               "I've seen an enemy."

diff --git a/sound/player/espeak/player/death.ogg b/sound/player/espeak/player/death.ogg
new file mode 100644 (file)
index 0000000..b382da7
Binary files /dev/null and b/sound/player/espeak/player/death.ogg differ

diff --git a/sound/player/espeak/player/drown.ogg b/sound/player/espeak/player/drown.ogg
new file mode 100644 (file)
index 0000000..55db0c8
Binary files /dev/null and b/sound/player/espeak/player/drown.ogg differ

diff --git a/sound/player/espeak/player/fall.ogg b/sound/player/espeak/player/fall.ogg
new file mode 100644 (file)
index 0000000..b5ca319
Binary files /dev/null and b/sound/player/espeak/player/fall.ogg differ

diff --git a/sound/player/espeak/player/falling.ogg b/sound/player/espeak/player/falling.ogg
new file mode 100644 (file)
index 0000000..7e1d44a
Binary files /dev/null and b/sound/player/espeak/player/falling.ogg differ

diff --git a/sound/player/espeak/player/gasp.ogg b/sound/player/espeak/player/gasp.ogg
new file mode 100644 (file)
index 0000000..cf126b1
Binary files /dev/null and b/sound/player/espeak/player/gasp.ogg differ

diff --git a/sound/player/espeak/player/jump.ogg b/sound/player/espeak/player/jump.ogg
new file mode 100644 (file)
index 0000000..0da2706
Binary files /dev/null and b/sound/player/espeak/player/jump.ogg differ

diff --git a/sound/player/espeak/player/pain100.ogg b/sound/player/espeak/player/pain100.ogg
new file mode 100644 (file)
index 0000000..ca32d93
Binary files /dev/null and b/sound/player/espeak/player/pain100.ogg differ

diff --git a/sound/player/espeak/player/pain25.ogg b/sound/player/espeak/player/pain25.ogg
new file mode 100644 (file)
index 0000000..e39bc68
Binary files /dev/null and b/sound/player/espeak/player/pain25.ogg differ

diff --git a/sound/player/espeak/player/pain50.ogg b/sound/player/espeak/player/pain50.ogg
new file mode 100644 (file)
index 0000000..2755a9d
Binary files /dev/null and b/sound/player/espeak/player/pain50.ogg differ

diff --git a/sound/player/espeak/player/pain75.ogg b/sound/player/espeak/player/pain75.ogg
new file mode 100644 (file)
index 0000000..60d61f9
Binary files /dev/null and b/sound/player/espeak/player/pain75.ogg differ