From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Wed, 16 Nov 2011 00:19:58 +0000 (+0200)
Subject: Two more visual effects, making the view get pushed higher or lower when getting... 
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9325f35bb7114cb5c6c9e1ba7628d4b59dca0031;p=voretournament%2Fvoretournament.git

Two more visual effects, making the view get pushed higher or lower when getting swallowed or regurgitated
---

diff --git a/data/balanceVT.cfg b/data/balanceVT.cfg
index 5b61f8d9..db28310b 100644
--- 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"
 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_swallow_predator_punchangle 12 "your view gets tilted by this amount when swallowing someone"
+set g_balance_vore_swallow_prey_punchvector 50 "your view gets lifted by this amount when getting swallowed"
 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"
 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.5 "regurgitation delay"
-set g_balance_vore_regurgitate_punchangle 12 "your view gets tilted by this amount when regurgitating someone"
+set g_balance_vore_regurgitate_predator_punchangle 12 "your view gets tilted by this amount when regurgitating someone"
+set g_balance_vore_regurgitate_prey_punchvector 50 "your view gets lowered by this amount when getting regurgitated"
 set g_balance_vore_digestion_damage 4 "amount of damage applied to victims during digestion"
 set g_balance_vore_digestion_damage_death 2 "amplify digestion damage by this amount when the prey is dead"
 set g_balance_vore_digestion_limit -100 "prey can be digested down to this amount of health"
diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index 5bc50c12..96f49a4c 100644
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -279,6 +279,7 @@ void Vore_Swallow(entity e)
 
 	e.vore_oldmovetype = e.movetype;
 	e.vore_oldsolid = e.solid;
+	e.punchvector_z = cvar("g_balance_vore_swallow_prey_punchvector");
 
 	e.predator = self;
 	setorigin(e, e.predator.origin);
@@ -305,7 +306,7 @@ void Vore_Swallow(entity e)
 
 	PlayerSound(e.predator, playersound_swallow, CHAN_VOICE, VOICETYPE_PLAYERSOUND);
 	setanim(e.predator, e.predator.anim_pain1, FALSE, TRUE, TRUE); // looks good for swallowing / regurgitating
-	e.predator.punchangle_x -= cvar("g_balance_vore_swallow_punchangle");
+	e.predator.punchangle_x -= cvar("g_balance_vore_swallow_predator_punchangle");
 	e.predator.regurgitate_prepare = 0;
 	e.predator.spawnshieldtime = 0; // lose spawn shield when we vore
 	e.predator.hitsound += 1; // play this for team mates too, as we could be swallowing them to heal them
@@ -359,6 +360,7 @@ void Vore_Regurgitate(entity e)
 	if(e.health > 0) // leave SOLID_NOT for dead bodies
 		e.solid = e.vore_oldsolid;
 	e.view_ofs_z = PL_VIEW_OFS_z;
+	e.punchvector_z = -cvar("g_balance_vore_regurgitate_prey_punchvector");
 
 	// if the prey has been fully digested, silently detach them
 	if(e.deadflag != DEAD_NO && e.health <= cvar("g_balance_vore_digestion_limit"))
@@ -407,7 +409,7 @@ void Vore_Regurgitate(entity e)
 	PlayerSound(e.predator, playersound_regurgitate, CHAN_VOICE, VOICETYPE_PLAYERSOUND);
 	setanim(e.predator, e.predator.anim_pain1, FALSE, TRUE, TRUE); // looks good for swallowing / regurgitating
 	pointparticles(particleeffectnum("vore_regurgitate"), e.predator.origin, '0 0 0', 1);
-	e.predator.punchangle_x += cvar("g_balance_vore_regurgitate_punchangle");
+	e.predator.punchangle_x += cvar("g_balance_vore_regurgitate_predator_punchangle");
 	e.predator.regurgitate_prepare = 0;
 	e.predator.action_delay = time + cvar("g_balance_vore_action_delay");
 	Vore_SetPreyPositions(e.predator);