Two more visual effects, making the view get pushed higher or lower when getting...

diff --git a/data/balanceVT.cfg b/data/balanceVT.cfg
index 5b61f8d9448e70957bd2f0d83eaa48dcbb951e8b..db28310b2104f58ffdf36161f688a4e37bf5cf46 100644 (file)
--- a/data/balanceVT.cfg
+++ b/data/balanceVT.cfg
@@ -202,13 +202,15 @@ set g_balance_vore_swallow_speed_cutspd_pred 0.5 "predator movement slows down b
 set g_balance_vore_swallow_speed 1 "how long it takes to swallow a 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_swallow_predator_punchangle 12 "your view gets tilted by this amount when swallowing someone"\r
+set g_balance_vore_swallow_prey_punchvector 50 "your view gets lifted by this amount when getting swallowed"\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"\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.5 "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_regurgitate_predator_punchangle 12 "your view gets tilted by this amount when regurgitating someone"\r
+set g_balance_vore_regurgitate_prey_punchvector 50 "your view gets lowered by this amount when getting regurgitated"\r
 set g_balance_vore_digestion_damage 4 "amount of damage applied to victims during digestion"\r
 set g_balance_vore_digestion_damage_death 2 "amplify digestion damage by this amount when the prey is dead"\r
 set g_balance_vore_digestion_limit -100 "prey can be digested down to this amount of health"\r

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index 5bc50c1235b2f2c79d4b61ede0c9c3954e07b057..96f49a4c5ab2cf662e0ff63a681e22d0f349e576 100644 (file)
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -279,6 +279,7 @@ void Vore_Swallow(entity e)
 \r
        e.vore_oldmovetype = e.movetype;\r
        e.vore_oldsolid = e.solid;\r
+       e.punchvector_z = cvar("g_balance_vore_swallow_prey_punchvector");\r
 \r
        e.predator = self;\r
        setorigin(e, e.predator.origin);\r
@@ -305,7 +306,7 @@ void Vore_Swallow(entity e)
 \r
        PlayerSound(e.predator, playersound_swallow, CHAN_VOICE, VOICETYPE_PLAYERSOUND);\r
        setanim(e.predator, e.predator.anim_pain1, FALSE, TRUE, TRUE); // looks good for swallowing / regurgitating\r
-       e.predator.punchangle_x -= cvar("g_balance_vore_swallow_punchangle");\r
+       e.predator.punchangle_x -= cvar("g_balance_vore_swallow_predator_punchangle");\r
        e.predator.regurgitate_prepare = 0;\r
        e.predator.spawnshieldtime = 0; // lose spawn shield when we vore\r
        e.predator.hitsound += 1; // play this for team mates too, as we could be swallowing them to heal them\r
@@ -359,6 +360,7 @@ void Vore_Regurgitate(entity e)
        if(e.health > 0) // leave SOLID_NOT for dead bodies\r
                e.solid = e.vore_oldsolid;\r
        e.view_ofs_z = PL_VIEW_OFS_z;\r
+       e.punchvector_z = -cvar("g_balance_vore_regurgitate_prey_punchvector");\r
 \r
        // if the prey has been fully digested, silently detach them\r
        if(e.deadflag != DEAD_NO && e.health <= cvar("g_balance_vore_digestion_limit"))\r
@@ -407,7 +409,7 @@ void Vore_Regurgitate(entity e)
        PlayerSound(e.predator, playersound_regurgitate, CHAN_VOICE, VOICETYPE_PLAYERSOUND);\r
        setanim(e.predator, e.predator.anim_pain1, FALSE, TRUE, TRUE); // looks good for swallowing / regurgitating\r
        pointparticles(particleeffectnum("vore_regurgitate"), e.predator.origin, '0 0 0', 1);\r
-       e.predator.punchangle_x += cvar("g_balance_vore_regurgitate_punchangle");\r
+       e.predator.punchangle_x += cvar("g_balance_vore_regurgitate_predator_punchangle");\r
        e.predator.regurgitate_prepare = 0;\r
        e.predator.action_delay = time + cvar("g_balance_vore_action_delay");\r
        Vore_SetPreyPositions(e.predator);\r