From: MirceaKitsune Date: Thu, 15 Mar 2012 10:35:35 +0000 (+0200) Subject: Prey / predator velocity when regurgitating / being regurgitated now depends on size... X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=617d115bc669e28fe8d51f7eb6192381f85fe6bc;p=voretournament%2Fvoretournament.git Prey / predator velocity when regurgitating / being regurgitated now depends on size difference between players. The larger the prey compared to the predator, the greater the force. --- diff --git a/data/balanceVT.cfg b/data/balanceVT.cfg index 0c73eede..324ae16b 100644 --- a/data/balanceVT.cfg +++ b/data/balanceVT.cfg @@ -214,8 +214,8 @@ set g_balance_vore_swallow_predator_punchangle_item 6 "your view gets tilted by set g_balance_vore_swallow_prey_punchvector 25 "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_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_predator_punchangle 10 "your view gets tilted by this amount when regurgitating someone" set g_balance_vore_regurgitate_predator_punchangle_item 4 "your view gets tilted by this amount when regurgitating an item" diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc index b043e433..0e7bf893 100644 --- a/data/qcsrc/server/vore.qc +++ b/data/qcsrc/server/vore.qc @@ -389,9 +389,11 @@ void Vore_Regurgitate(entity e) } // apply velocities + float scalediff; + scalediff = cvar("g_healthsize") ? e.scale / e.predator.scale : 1; // the tighter the gut, the greater the velocity makevectors(e.predator.v_angle); - e.velocity = v_forward * cvar("g_balance_vore_regurgitate_force"); - e.predator.velocity += -v_forward * cvar("g_balance_vore_regurgitate_predatorforce"); + e.velocity = v_forward * cvar("g_balance_vore_regurgitate_force") * scalediff; + e.predator.velocity += -v_forward * cvar("g_balance_vore_regurgitate_predatorforce") * scalediff; e.pusher = e.predator; // allows us to frag players by regurgitating them in deadly pits e.pushltime = time + cvar("g_maxpushtime"); diff --git a/docs/TODO.txt b/docs/TODO.txt index 60f58836..08f19a69 100644 --- a/docs/TODO.txt +++ b/docs/TODO.txt @@ -140,14 +140,10 @@ - 0.7: Move source branch to mediasource like Xonotic -- 0.7 | 0.8 BUG: Bots can still senect no weapon when they have the grabber +- 0.8 BUG: Bots can still senect no weapon when they have the grabber - 0.7 | 0.8: Maybe allow damage gained from digestion to go up to 250 -- 0.7 | 0.8: Don't rocket prey out when the predator is dead (use a cvar for this) - -- 0.7 | 0.8: Is predayor / prey rocketing speed influenced by healthsize? - - +0.8: Maybe turn health items into creatures that run around? - 0.8: Maybe give a swallow progress to items as well, but by standing on them.