From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Fri, 8 Jul 2011 01:46:39 +0000 (+0300)
Subject: New vore sounds for the vixens. Some people will love them. Others will not be able... 
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=bbebe079d1615adc1e1fb117556041c42b835247;p=voretournament%2Fvoretournament.git

New vore sounds for the vixens. Some people will love them. Others will not be able to eat and sleep for a few days ;)
---

diff --git a/data/models/player/vixen.zym.sounds b/data/models/player/vixen.zym.sounds
index 487fe73a..398a6bcd 100644
--- a/data/models/player/vixen.zym.sounds
+++ b/data/models/player/vixen.zym.sounds
@@ -28,9 +28,9 @@ fall sound/player/female/player/fall 1
 falling sound/player/female/player/falling 0
 gasp sound/player/female/player/gasp 0
 jump sound/player/female/player/jump 0
-swallow sound/player/female/player/swallow 0
+swallow sound/player/female/player/swallow 2
 digest sound/player/female/player/digest 0
-regurgitate sound/player/female/player/regurgitate 0
+regurgitate sound/player/female/player/regurgitate 2
 regurgitate_prepare sound/player/female/player/regurgitate_prepare 0
 gurgle sound/player/female/player/gurgle 0
 pain25 sound/player/female/player/pain25 0
diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index 498376c4..692776c6 100644
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -231,7 +231,7 @@ void Vore_Swallow(entity e)
 			centerprint(e.predator, "^3You have swallowed a team mate, don't digest!");
 	}
 
-	PlayerSound(e.predator, playersound_swallow, CHAN_PAIN, VOICETYPE_PLAYERSOUND);
+	PlayerSound(e.predator, playersound_swallow, CHAN_VOICE, VOICETYPE_PLAYERSOUND);
 	setanim(e.predator, e.predator.anim_pain1, FALSE, TRUE, TRUE); // looks good for swallowing / regurgitating
 	e.predator.punchangle_x -= cvar("g_balance_vore_swallow_punchangle");
 	e.predator.stomach_load += 1;
@@ -271,7 +271,7 @@ void Vore_Regurgitate(entity e)
 	e.pusher = e.predator; // allows us to frag players by regurgitating them in deadly pits
 	e.pushltime = time + cvar("g_maxpushtime");
 
-	PlayerSound(e.predator, playersound_regurgitate, CHAN_PAIN, VOICETYPE_PLAYERSOUND);
+	PlayerSound(e.predator, playersound_regurgitate, CHAN_VOICE, VOICETYPE_PLAYERSOUND);
 	setanim(e.predator, e.predator.anim_pain1, FALSE, TRUE, TRUE); // looks good for swallowing / regurgitating
 	pointparticles(particleeffectnum("regurgitate"), e.predator.origin, '0 0 0', 1);
 	e.predator.punchangle_x += cvar("g_balance_vore_regurgitate_punchangle");
diff --git a/data/sound/player/female/player/gurgle.ogg b/data/sound/player/female/player/gurgle.ogg
index e1ee710e..efdea7d4 100644
Binary files a/data/sound/player/female/player/gurgle.ogg and b/data/sound/player/female/player/gurgle.ogg differ
diff --git a/data/sound/player/female/player/regurgitate.ogg b/data/sound/player/female/player/regurgitate.ogg
deleted file mode 100644
index a02c864a..00000000
Binary files a/data/sound/player/female/player/regurgitate.ogg and /dev/null differ
diff --git a/data/sound/player/female/player/regurgitate1.ogg b/data/sound/player/female/player/regurgitate1.ogg
new file mode 100644
index 00000000..f198fd17
Binary files /dev/null and b/data/sound/player/female/player/regurgitate1.ogg differ
diff --git a/data/sound/player/female/player/regurgitate2.ogg b/data/sound/player/female/player/regurgitate2.ogg
new file mode 100644
index 00000000..3fa616c0
Binary files /dev/null and b/data/sound/player/female/player/regurgitate2.ogg differ
diff --git a/data/sound/player/female/player/swallow.ogg b/data/sound/player/female/player/swallow.ogg
deleted file mode 100644
index 9264917d..00000000
Binary files a/data/sound/player/female/player/swallow.ogg and /dev/null differ
diff --git a/data/sound/player/female/player/swallow1.ogg b/data/sound/player/female/player/swallow1.ogg
new file mode 100644
index 00000000..471fad38
Binary files /dev/null and b/data/sound/player/female/player/swallow1.ogg differ
diff --git a/data/sound/player/female/player/swallow2.ogg b/data/sound/player/female/player/swallow2.ogg
new file mode 100644
index 00000000..eb4848ba
Binary files /dev/null and b/data/sound/player/female/player/swallow2.ogg differ
diff --git a/data/voretournament-credits.txt b/data/voretournament-credits.txt
index 7d502df7..4a35f62f 100644
--- a/data/voretournament-credits.txt
+++ b/data/voretournament-credits.txt
@@ -188,6 +188,16 @@ http://opengameart.org/content/37-hitspunches
 Independent.nu
 N/A
 
+*Man Coughing
+http://www.pdsounds.org/sounds/man_coughing
+Stilgar
+http://www.pdsounds.org/users/stilgar
+
+*Water bubbles chortling
+http://www.pdsounds.org/sounds/water_bubbles_chortling
+Stephan
+http://www.pdsounds.org/audio/by/artist/stephan
+
 **---------------- Music: ----------------
 
 *Space Walk