From: MirceaKitsune Date: Sun, 17 Apr 2011 11:30:04 +0000 (+0300) Subject: Some changes to the punch angles in vore. No longer make them client options, but... X-Git-Url: https://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=commitdiff_plain;h=3f30d978961d40fd393c9dc9c1a0311acf3fe510 Some changes to the punch angles in vore. No longer make them client options, but part of the server balance, as done for weapon recoil. Also tilt the prey's view when dealing stomach kicks. --- diff --git a/data/balanceVT.cfg b/data/balanceVT.cfg index 9865e401..31f5133c 100644 --- a/data/balanceVT.cfg +++ b/data/balanceVT.cfg @@ -183,16 +183,19 @@ set g_balance_grabber_secondary_recoil 4; set g_balance_grabber_reload_ammo 35 set g_balance_grabber_reload_time 2 // }}} + // {{{ stomach set g_balance_vore_swallow_range 50 "distance below which you can swallow another player when facing them" set g_balance_vore_swallow_limit 3 "how many players can fit inside a stomach (should not be greater than 3 due to the number of stomach state models for players)" set g_balance_vore_swallow_delay 0.8 "how many seconds must pass before you can swallow again, after swallowing or regurgitating another player" set g_balance_vore_swallow_stealprey 0.7 "probability of stealing someone's prey when eating them (when true their prey joins your stomach rather than popping out). 0 = never, 1 = always" set g_balance_vore_swallow_dropweapon 0.6 "probability of dropping your weapon when swallowed. 0 = never and 1 = always, does not apply to team mates" +set g_balance_vore_swallow_punchangle 12 "your view gets tilted by this amount when swallowing someone" set g_balance_vore_regurgitate_speedcap 1200 "when a predator is going faster than this, their prey is squeezed out of them" set g_balance_vore_regurgitate_force 600 "regurgitated players rocket out at this speed, in the direction the predator is facing" set g_balance_vore_regurgitate_predatorforce 450 "players are pushed back by this amount when regurgitating someone, opposite of the direction they are facing" set g_balance_vore_regurgitate_delay 0.135 "regurgitation delay" +set g_balance_vore_regurgitate_punchangle 12 "your view gets tilted by this amount when regurgitating someone" set g_balance_vore_digestion_damage 5 "amount of damage applied to victims during digestion" set g_balance_vore_digestion_vampire 1 "amount of health you gain from digestion" set g_balance_vore_digestion_vampire_stable 150 "maximum amount of health you can gain from digestion (best kept equal or less than g_balance_health_rotstable)" @@ -205,4 +208,6 @@ set g_balance_vore_kick_damage_max 25 "maximum amount of damage you can do with set g_balance_vore_kick_delay 0.6 "how many seconds must pass before you can perform another stomach kick" set g_balance_vore_kick_force 140 "predators are pushed by this amount when stomach kicked, in the direction their prey is facing" set g_balance_vore_kick_escapeprobability 0.125 "probability of getting regurgitated while performing stomach kicks (0 = never, 1 = always)" +set g_balance_vore_kick_predator_punchangle 3 "your view gets tilted by this amount when receiving stomach kicks" +set g_balance_vore_kick_prey_punchangle 6 "your view gets tilted by this amount when dealing stomach kicks" // }}} diff --git a/data/defaultVT.cfg b/data/defaultVT.cfg index cd877f6f..83ae3554 100644 --- a/data/defaultVT.cfg +++ b/data/defaultVT.cfg @@ -1523,8 +1523,6 @@ seta g_ghost_items_color "-1 -1 -1" "color of ghosted items, 0 0 0 leaves the co set cl_vore_stomachmodel 1 "when enabled, we see the stomach model around us when eaten. -1 = disabled, 1 = enabled, anything between 0 and 1 = alpha" set cl_vore_cameraspeed 1.5 "speed at which you see yourself sliding down when swallowed, 0 disables" -set cl_vore_punchangle 12 "your view gets tilted by this amount when swallowing or regurgitating someone" -set cl_vore_kick_punchangle 3 "your view gets tilted by this amount when receiving stomach kicks" seta cl_vore_cutvolume_sound 0.75 "sound volume is reduced to this amount when you are in a stomach" seta cl_vore_cutvolume_music 0.5 "music volume is reduced to this amount when you are in a stomach" seta cl_vore_cutvolume_fade 0.1 "fading speed of the volume change" diff --git a/data/qcsrc/server/defs.qh b/data/qcsrc/server/defs.qh index 93f43ac4..cbf049f3 100644 --- a/data/qcsrc/server/defs.qh +++ b/data/qcsrc/server/defs.qh @@ -336,7 +336,6 @@ float sv_clforceplayermodels; .float cvar_cl_noantilag; .float cvar_cl_vore_stomachmodel; .float cvar_cl_vore_cameraspeed; -.float cvar_cl_vore_punchangle, cvar_cl_vore_kick_punchangle; .float cvar_cl_vore_autodigest; .float cvar_chase_active; diff --git a/data/qcsrc/server/miscfunctions.qc b/data/qcsrc/server/miscfunctions.qc index d6d54ed2..0e9cf6cb 100644 --- a/data/qcsrc/server/miscfunctions.qc +++ b/data/qcsrc/server/miscfunctions.qc @@ -617,8 +617,6 @@ void GetCvars(float f) GetCvars_handleFloat(s, f, cvar_chase_active, "chase_active"); GetCvars_handleFloat(s, f, cvar_cl_vore_stomachmodel, "cl_vore_stomachmodel"); GetCvars_handleFloat(s, f, cvar_cl_vore_cameraspeed, "cl_vore_cameraspeed"); - GetCvars_handleFloat(s, f, cvar_cl_vore_punchangle, "cl_vore_punchangle"); - GetCvars_handleFloat(s, f, cvar_cl_vore_kick_punchangle, "cl_vore_kick_punchangle"); GetCvars_handleFloat(s, f, cvar_cl_vore_autodigest, "cl_vore_autodigest"); self.cvar_cl_accuracy_data_share = boolean(self.cvar_cl_accuracy_data_share); diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc index 554b6151..c0966781 100644 --- a/data/qcsrc/server/vore.qc +++ b/data/qcsrc/server/vore.qc @@ -209,7 +209,7 @@ void Vore_Swallow(entity e) PlayerSound(e.predator, playersound_swallow, CHAN_PAIN, VOICETYPE_PLAYERSOUND); setanim(e.predator, e.predator.anim_pain1, FALSE, TRUE, TRUE); // looks good for swallowing / regurgitating - e.predator.punchangle_x -= e.predator.cvar_cl_vore_punchangle; + e.predator.punchangle_x -= cvar("g_balance_vore_swallow_punchangle"); e.predator.stomach_load += 1; e.predator.regurgitate_prepare = 0; e.predator.spawnshieldtime = 0; // lose spawn shield when we vore @@ -250,7 +250,7 @@ void Vore_Regurgitate(entity e) PlayerSound(e.predator, playersound_regurgitate, CHAN_PAIN, 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 += e.predator.cvar_cl_vore_punchangle; + e.predator.punchangle_x += cvar("g_balance_vore_regurgitate_punchangle"); e.predator.stomach_load -= 1; e.predator.regurgitate_prepare = 0; e.predator.swallow_delay = time + cvar("g_balance_vore_swallow_delay"); @@ -397,7 +397,8 @@ void Vore_StomachKick() Damage(self.predator, self, self, damage, DEATH_STOMACHKICK, self.predator.origin, v_forward * cvar("g_balance_vore_kick_force")); sound(self.predator, CHAN_PROJECTILE, "weapons/stomachkick.wav", VOL_BASE, ATTN_NORM); - self.predator.punchangle_x -= self.predator.cvar_cl_vore_kick_punchangle; + self.predator.punchangle_x -= cvar("g_balance_vore_kick_predator_punchangle"); + self.punchangle_x += cvar("g_balance_vore_kick_prey_punchangle"); if(random() < cvar("g_balance_vore_kick_escapeprobability")) Vore_Regurgitate(self);