A few fixes and some new effects

diff --git a/data/balanceVT.cfg b/data/balanceVT.cfg
index 00c5942c96f25f18ac81f4aac8f779d1701216ca..6180fffa414e81ef0bf43836f1c25d5693552d17 100644 (file)
--- a/data/balanceVT.cfg
+++ b/data/balanceVT.cfg
@@ -218,13 +218,14 @@ set g_balance_vore_swallow_predator_punchangle 10 "your view gets tilted by this
 set g_balance_vore_swallow_predator_punchangle_item 8 "your view gets tilted by this amount when swallowing an item"\r
 set g_balance_vore_swallow_prey_punchvector 25 "your view gets lifted by this amount when getting swallowed"\r
 set g_balance_vore_swallow_prey_orient 1 "prey has the same view origin as the the predator while being swallowed"\r
-set g_balance_vore_swallow_prey_orient_speed 10 "speed at which the view returns to normal once as are no longer eaten by your predayor"\r
+set g_balance_vore_swallow_prey_orient_speed 15 "speed at which the view returns to normal once as are no longer eaten by your predayor"\r
 set g_balance_vore_regurgitate_damage 10 "predators take this amount of damage whenever regurgitating someone (influenced by player scale difference)"\r
 set g_balance_vore_regurgitate_swallowprogress 0.5 "regurgitated prey is given this amount of swallow progress, to simulate being more vulnerable (if slow swallowing is enabled)"\r
 set g_balance_vore_regurgitate_force 600 "regurgitated players rocket out at this speed, in the direction the predator is facing (influenced by player scale difference)"\r
 set g_balance_vore_regurgitate_predatorforce 450 "players are pushed back by this amount when regurgitating someone, opposite of the direction they are facing (influenced by player scale difference)"\r
 set g_balance_vore_regurgitate_delay 0.5 "regurgitation delay"\r
 set g_balance_vore_regurgitate_death_silent 0 "when dead prey is digested to the maximum amount, remove them silently rather than throwing up the gibs"\r
+set g_balance_vore_regurgitate_predator_prepare_punchangle 25 "your view gets tilted by this amount when trying to regurgitate"\r
 set g_balance_vore_regurgitate_predator_punchangle 10 "your view gets tilted by this amount when regurgitating someone"\r
 set g_balance_vore_regurgitate_predator_punchangle_item 6 "your view gets tilted by this amount when regurgitating an item"\r
 set g_balance_vore_regurgitate_prey_punchvector 50 "your view gets lowered by this amount when getting regurgitated"\r

diff --git a/data/defaultVT.cfg b/data/defaultVT.cfg
index 3049efdb00c1b79ca8ddd33aa3da14f7e18e19e2..7f65b00813ba966fd02705616fc13ed6f6c9218c 100644 (file)
--- a/data/defaultVT.cfg
+++ b/data/defaultVT.cfg
@@ -144,6 +144,8 @@ seta cl_flash_pickup_color "0 0 1" "color of the pickup flash"
 seta cl_flash_vore 0.25 "if enabled, the screen flashes by this amount when eating or getting eaten"\r
 seta cl_flash_vore_color_prey "1 0 0" "color of the vore flash for prey"\r
 seta cl_flash_vore_color_pred "0 1 0" "color of the vore flash for predators"\r
+seta cl_flash_grab 0.25 "if enabled, the screen flashes by this amount when getting grabbed"\r
+seta cl_flash_grab_color "0.5 0.5 0.5" "color of the grab flash"\r
 seta cl_flash_respawn 0.25 "if enabled, the screen flashes by this amount when picking up an item"\r
 seta cl_flash_respawn_color "1 1 1" "color of the pickup flash"\r
 seta cl_spawnfov 0.5 "the field of view starts zoomed out by this amount when you spawn"\r

diff --git a/data/qcsrc/client/View.qc b/data/qcsrc/client/View.qc
index 94e8f4cbe2cd40d0d9119bdabe52a1aee9bb08d6..bd47712070c7091674e5f565b9da4397e1617d6b 100644 (file)
--- a/data/qcsrc/client/View.qc
+++ b/data/qcsrc/client/View.qc
@@ -248,7 +248,7 @@ float camera_mode;
 float reticle_type;\r
 float chase_active_old;\r
 float artwork_fade;\r
-float pickup_crosshair_time, pickup_crosshair_size, pickup_flash_time, vore_flash_laststate;\r
+float pickup_crosshair_time, pickup_crosshair_size, pickup_flash_time, vore_flash_laststate, grab_flash_laststate;\r
 float spawnfov_current;\r
 float myhealth, myhealth_prev, myhealth_flash;\r
 float contentavgalpha, liquidalpha_prev;\r
@@ -1191,6 +1191,15 @@ void CSQC_UpdateView(float w, float h)
                        // always update the last vore state, or the flash can be triggered when switching spectated players one frame after\r
                        vore_flash_laststate = vore_flash_state;\r
                }\r
+               if(cvar("cl_flash_grab"))\r
+               {\r
+                       float grab_flash_state = getstatf(STAT_VORE_PROGRESS_PREY) > 0;\r
+                       if(grab_flash_state > grab_flash_laststate)\r
+                               localcmd(strcat("bf ", cvar_string("cl_flash_grab_color"), " ", cvar_string("cl_flash_grab"), "\n"));\r
+\r
+                       // always update the last grab state, or the flash can be triggered when switching spectated players one frame after\r
+                       grab_flash_laststate = grab_flash_state;\r
+               }\r
                if(cvar("cl_flash_respawn"))\r
                if(respawned)\r
                        localcmd(strcat("bf ", cvar_string("cl_flash_respawn_color"), " ", cvar_string("cl_flash_respawn"), "\n"));\r

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index 9e71f036aab10161cda9e93cdc29c33647de87c6..67b5ebf90eba4486bff076d6a775b05e68b33b4b 100644 (file)
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -866,6 +866,7 @@ void Vore()
                                self.regurgitate_prepare = time + cvar("g_balance_vore_regurgitate_delay");\r
                                PlayerSound(self, playersound_regurgitate_prepare, CHAN_VOICE, VOICETYPE_PLAYERSOUND);\r
                                setanim(self, self.anim_pain2, FALSE, TRUE, TRUE); // looks good for preparing regurgitation\r
+                               self.punchangle_x = cvar("g_balance_vore_regurgitate_predator_prepare_punchangle");\r
                                self.regurgitate_button_delay_time = time + button_delay_time;\r
                        }\r
                }\r