Some changes to the punch angles in vore. No longer make them client options, but...

diff --git a/data/balanceVT.cfg b/data/balanceVT.cfg
index 9865e401a9357040050b1b5afd0be01fb80adf60..31f5133c7728a085ffd0edcccfe911e1d0e4411a 100644 (file)
--- 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\r
 set g_balance_grabber_reload_time 2\r
 // }}}\r
+\r
 // {{{ stomach\r
 set g_balance_vore_swallow_range 50 "distance below which you can swallow another player when facing them"\r
 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)"\r
 set g_balance_vore_swallow_delay 0.8 "how many seconds must pass before you can swallow again, after swallowing or regurgitating another player"\r
 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"\r
 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"\r
+set g_balance_vore_swallow_punchangle 12 "your view gets tilted by this amount when swallowing someone"\r
 set g_balance_vore_regurgitate_speedcap 1200 "when a predator is going faster than this, their prey is squeezed out of them"\r
 set g_balance_vore_regurgitate_force 600 "regurgitated players rocket out at this speed, in the direction the predator is facing"\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"\r
 set g_balance_vore_regurgitate_delay 0.135 "regurgitation delay"\r
+set g_balance_vore_regurgitate_punchangle 12 "your view gets tilted by this amount when regurgitating someone"\r
 set g_balance_vore_digestion_damage 5 "amount of damage applied to victims during digestion"\r
 set g_balance_vore_digestion_vampire 1 "amount of health you gain from digestion"\r
 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)"\r
@@ -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"\r
 set g_balance_vore_kick_force 140 "predators are pushed by this amount when stomach kicked, in the direction their prey is facing"\r
 set g_balance_vore_kick_escapeprobability 0.125 "probability of getting regurgitated while performing stomach kicks (0 = never, 1 = always)"\r
+set g_balance_vore_kick_predator_punchangle 3 "your view gets tilted by this amount when receiving stomach kicks"\r
+set g_balance_vore_kick_prey_punchangle 6 "your view gets tilted by this amount when dealing stomach kicks"\r
 // }}}\r

diff --git a/data/defaultVT.cfg b/data/defaultVT.cfg
index cd877f6f94faac185725c6c203fe273452278452..83ae35544c8d9c7f19505b606a83d8accc2eb8b3 100644 (file)
--- 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
 \r
 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"\r
 set cl_vore_cameraspeed 1.5 "speed at which you see yourself sliding down when swallowed, 0 disables"\r
-set cl_vore_punchangle 12 "your view gets tilted by this amount when swallowing or regurgitating someone"\r
-set cl_vore_kick_punchangle 3 "your view gets tilted by this amount when receiving stomach kicks"\r
 seta cl_vore_cutvolume_sound 0.75 "sound volume is reduced to this amount when you are in a stomach"\r
 seta cl_vore_cutvolume_music 0.5 "music volume is reduced to this amount when you are in a stomach"\r
 seta cl_vore_cutvolume_fade 0.1 "fading speed of the volume change"\r

diff --git a/data/qcsrc/server/defs.qh b/data/qcsrc/server/defs.qh
index 93f43ac403d637a76c846353e7402efcad842e4f..cbf049f3474f75317f32580fe467da3433f17169 100644 (file)
--- a/data/qcsrc/server/defs.qh
+++ b/data/qcsrc/server/defs.qh
@@ -336,7 +336,6 @@ float sv_clforceplayermodels;
 .float cvar_cl_noantilag;\r
 .float cvar_cl_vore_stomachmodel;\r
 .float cvar_cl_vore_cameraspeed;\r
-.float cvar_cl_vore_punchangle, cvar_cl_vore_kick_punchangle;\r
 .float cvar_cl_vore_autodigest;\r
 .float cvar_chase_active;\r
 \r

diff --git a/data/qcsrc/server/miscfunctions.qc b/data/qcsrc/server/miscfunctions.qc
index d6d54ed26b8484c98046348d88c75e4b3ccbc292..0e9cf6cb5fb1cf93090bcf41cc69d71b0a19b1ff 100644 (file)
--- 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");\r
        GetCvars_handleFloat(s, f, cvar_cl_vore_stomachmodel, "cl_vore_stomachmodel");\r
        GetCvars_handleFloat(s, f, cvar_cl_vore_cameraspeed, "cl_vore_cameraspeed");\r
-       GetCvars_handleFloat(s, f, cvar_cl_vore_punchangle, "cl_vore_punchangle");\r
-       GetCvars_handleFloat(s, f, cvar_cl_vore_kick_punchangle, "cl_vore_kick_punchangle");\r
        GetCvars_handleFloat(s, f, cvar_cl_vore_autodigest, "cl_vore_autodigest");\r
 \r
        self.cvar_cl_accuracy_data_share = boolean(self.cvar_cl_accuracy_data_share);\r

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index 554b6151971f15cfa3d3bdcdd3cafeec1ab2c680..c09667815ee55b5c2210c1198aed11aaa0fcc000 100644 (file)
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -209,7 +209,7 @@ void Vore_Swallow(entity e)
 \r
        PlayerSound(e.predator, playersound_swallow, CHAN_PAIN, VOICETYPE_PLAYERSOUND);\r
        setanim(e.predator, e.predator.anim_pain1, FALSE, TRUE, TRUE); // looks good for swallowing / regurgitating\r
-       e.predator.punchangle_x -= e.predator.cvar_cl_vore_punchangle;\r
+       e.predator.punchangle_x -= cvar("g_balance_vore_swallow_punchangle");\r
        e.predator.stomach_load += 1;\r
        e.predator.regurgitate_prepare = 0;\r
        e.predator.spawnshieldtime = 0; // lose spawn shield when we vore\r
@@ -250,7 +250,7 @@ void Vore_Regurgitate(entity e)
        PlayerSound(e.predator, playersound_regurgitate, CHAN_PAIN, VOICETYPE_PLAYERSOUND);\r
        setanim(e.predator, e.predator.anim_pain1, FALSE, TRUE, TRUE); // looks good for swallowing / regurgitating\r
        pointparticles(particleeffectnum("regurgitate"), e.predator.origin, '0 0 0', 1);\r
-       e.predator.punchangle_x += e.predator.cvar_cl_vore_punchangle;\r
+       e.predator.punchangle_x += cvar("g_balance_vore_regurgitate_punchangle");\r
        e.predator.stomach_load -= 1;\r
        e.predator.regurgitate_prepare = 0;\r
        e.predator.swallow_delay = time + cvar("g_balance_vore_swallow_delay");\r
@@ -397,7 +397,8 @@ void Vore_StomachKick()
 \r
                Damage(self.predator, self, self, damage, DEATH_STOMACHKICK, self.predator.origin, v_forward * cvar("g_balance_vore_kick_force"));\r
                sound(self.predator, CHAN_PROJECTILE, "weapons/stomachkick.wav", VOL_BASE, ATTN_NORM);\r
-               self.predator.punchangle_x -= self.predator.cvar_cl_vore_kick_punchangle;\r
+               self.predator.punchangle_x -= cvar("g_balance_vore_kick_predator_punchangle");\r
+               self.punchangle_x += cvar("g_balance_vore_kick_prey_punchangle");\r
 \r
                if(random() < cvar("g_balance_vore_kick_escapeprobability"))\r
                        Vore_Regurgitate(self);\r