From: MirceaKitsune Date: Tue, 11 Jun 2013 16:58:57 +0000 (+0300) Subject: A few fixes and some new effects X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=890c4ee7a8c814a6eb822120ee3dfcb8f4ff3048;p=voretournament%2Fvoretournament.git A few fixes and some new effects --- diff --git a/data/balanceVT.cfg b/data/balanceVT.cfg index 00c5942c..6180fffa 100644 --- 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" set g_balance_vore_swallow_prey_punchvector 25 "your view gets lifted by this amount when getting swallowed" set g_balance_vore_swallow_prey_orient 1 "prey has the same view origin as the the predator while being swallowed" -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" +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" set g_balance_vore_regurgitate_damage 10 "predators take this amount of damage whenever regurgitating someone (influenced by player scale difference)" 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)" 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)" 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)" set g_balance_vore_regurgitate_delay 0.5 "regurgitation delay" 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" +set g_balance_vore_regurgitate_predator_prepare_punchangle 25 "your view gets tilted by this amount when trying to regurgitate" set g_balance_vore_regurgitate_predator_punchangle 10 "your view gets tilted by this amount when regurgitating someone" set g_balance_vore_regurgitate_predator_punchangle_item 6 "your view gets tilted by this amount when regurgitating an item" set g_balance_vore_regurgitate_prey_punchvector 50 "your view gets lowered by this amount when getting regurgitated" diff --git a/data/defaultVT.cfg b/data/defaultVT.cfg index 3049efdb..7f65b008 100644 --- 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" seta cl_flash_vore_color_prey "1 0 0" "color of the vore flash for prey" seta cl_flash_vore_color_pred "0 1 0" "color of the vore flash for predators" +seta cl_flash_grab 0.25 "if enabled, the screen flashes by this amount when getting grabbed" +seta cl_flash_grab_color "0.5 0.5 0.5" "color of the grab flash" seta cl_flash_respawn 0.25 "if enabled, the screen flashes by this amount when picking up an item" seta cl_flash_respawn_color "1 1 1" "color of the pickup flash" seta cl_spawnfov 0.5 "the field of view starts zoomed out by this amount when you spawn" diff --git a/data/qcsrc/client/View.qc b/data/qcsrc/client/View.qc index 94e8f4cb..bd477120 100644 --- a/data/qcsrc/client/View.qc +++ b/data/qcsrc/client/View.qc @@ -248,7 +248,7 @@ float camera_mode; float reticle_type; float chase_active_old; float artwork_fade; -float pickup_crosshair_time, pickup_crosshair_size, pickup_flash_time, vore_flash_laststate; +float pickup_crosshair_time, pickup_crosshair_size, pickup_flash_time, vore_flash_laststate, grab_flash_laststate; float spawnfov_current; float myhealth, myhealth_prev, myhealth_flash; float contentavgalpha, liquidalpha_prev; @@ -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 vore_flash_laststate = vore_flash_state; } + if(cvar("cl_flash_grab")) + { + float grab_flash_state = getstatf(STAT_VORE_PROGRESS_PREY) > 0; + if(grab_flash_state > grab_flash_laststate) + localcmd(strcat("bf ", cvar_string("cl_flash_grab_color"), " ", cvar_string("cl_flash_grab"), "\n")); + + // always update the last grab state, or the flash can be triggered when switching spectated players one frame after + grab_flash_laststate = grab_flash_state; + } if(cvar("cl_flash_respawn")) if(respawned) localcmd(strcat("bf ", cvar_string("cl_flash_respawn_color"), " ", cvar_string("cl_flash_respawn"), "\n")); diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc index 9e71f036..67b5ebf9 100644 --- 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"); PlayerSound(self, playersound_regurgitate_prepare, CHAN_VOICE, VOICETYPE_PLAYERSOUND); setanim(self, self.anim_pain2, FALSE, TRUE, TRUE); // looks good for preparing regurgitation + self.punchangle_x = cvar("g_balance_vore_regurgitate_predator_prepare_punchangle"); self.regurgitate_button_delay_time = time + button_delay_time; } }