]> git.xonotic.org Git - voretournament/voretournament.git/commitdiff
Play a sound when the predator first starts capturing their prey, meant to sound...
authorMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Sat, 28 Jan 2012 23:30:17 +0000 (01:30 +0200)
committerMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Sat, 28 Jan 2012 23:30:17 +0000 (01:30 +0200)
data/models/player/vixen.iqm.sounds
data/qcsrc/server/defs.qh
data/qcsrc/server/vore.qc
data/sound/player/default.sounds
data/sound/player/female/player/grab.wav [new file with mode: 0644]

index 478f8c21860ea5b662472406799690d518c71d2d..09c08dd74660845b4fa5f876f472f9bfee1f9fc2 100644 (file)
@@ -28,6 +28,7 @@ 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
+grab sound/player/female/player/grab 0
 swallow sound/player/female/player/swallow 2
 digest sound/player/female/player/digest 0
 regurgitate sound/player/female/player/regurgitate 2
index 9862d2c2448027116ac514a25fb8295f3521b301..5c4685039b2865cba75162ca2d3f8634c888c046 100644 (file)
@@ -450,6 +450,7 @@ float next_pingtime;
                _VOICEMSG(fall) \\r
                _VOICEMSG(drown) \\r
                _VOICEMSG(gasp) \\r
+               _VOICEMSG(grab) \\r
                _VOICEMSG(swallow) \\r
                _VOICEMSG(digest) \\r
                _VOICEMSG(regurgitate) \\r
index b7a71a2a8b513f879d968cdaf471873586290713..c4480e4ddc54653a6b2f59486eeb9eaab1aa41dd 100644 (file)
@@ -641,6 +641,7 @@ void Vore_SetSbarRings()
 }\r
 \r
 .float regurgitatecolor_particles_tick;\r
+.float grabsound;\r
 void Vore()\r
 {\r
        // main vore code, this is where it all happens\r
@@ -758,7 +759,18 @@ void Vore()
                        self.stat_canswallow = 1;\r
 \r
                if(self.BUTTON_ATCK)\r
+               {\r
                        Vore_SwallowStep(prey);\r
+\r
+                       // when the predator starts swallowing, play the grab sound\r
+                       if(!self.grabsound)\r
+                       {\r
+                               PlayerSound(self, playersound_grab, CHAN_PAIN, VOICETYPE_PLAYERSOUND);\r
+                               self.grabsound = TRUE;\r
+                       }\r
+               }\r
+               else if(self.grabsound)\r
+                       self.grabsound = FALSE; // clear the grab sound\r
        }\r
        else if(prey != world)\r
                self.stat_canswallow = -1;\r
index 398a6bcd5feb8ffe8b6656451afc9adfa6adab00..c4f91e02e8d3c1b22193a69f356a40a40578ec6d 100644 (file)
@@ -28,6 +28,7 @@ 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
+grab sound/player/female/player/grab 0
 swallow sound/player/female/player/swallow 2
 digest sound/player/female/player/digest 0
 regurgitate sound/player/female/player/regurgitate 2
diff --git a/data/sound/player/female/player/grab.wav b/data/sound/player/female/player/grab.wav
new file mode 100644 (file)
index 0000000..8ff5931
Binary files /dev/null and b/data/sound/player/female/player/grab.wav differ