Prey / predator velocity when regurgitating / being regurgitated now depends on size...

diff --git a/data/balanceVT.cfg b/data/balanceVT.cfg
index 0c73eedececef48f1916dd698bbb041cfab374fe..324ae16b4789d65d509a29bd89b6b4236b891cbe 100644 (file)
--- 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"\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_force 600 "regurgitated players rocket out at this speed, in the direction the predator is facing (influenced by player scale difference)"\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 (influenced by player scale difference)"\r
 set g_balance_vore_regurgitate_delay 0.5 "regurgitation delay"\r
 set g_balance_vore_regurgitate_predator_punchangle 10 "your view gets tilted by this amount when regurgitating someone"\r
 set g_balance_vore_regurgitate_predator_punchangle_item 4 "your view gets tilted by this amount when regurgitating an item"\r

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index b043e43323b89e92224f8733f29f10e6becc94e5..0e7bf8933cbf8c171d1db05132325f83761186cb 100644 (file)
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -389,9 +389,11 @@ void Vore_Regurgitate(entity e)
        }\r
 \r
        // apply velocities\r
+       float scalediff;\r
+       scalediff = cvar("g_healthsize") ? e.scale / e.predator.scale : 1; // the tighter the gut, the greater the velocity\r
        makevectors(e.predator.v_angle);\r
-       e.velocity = v_forward * cvar("g_balance_vore_regurgitate_force");\r
-       e.predator.velocity += -v_forward * cvar("g_balance_vore_regurgitate_predatorforce");\r
+       e.velocity = v_forward * cvar("g_balance_vore_regurgitate_force") * scalediff;\r
+       e.predator.velocity += -v_forward * cvar("g_balance_vore_regurgitate_predatorforce") * scalediff;\r
        e.pusher = e.predator; // allows us to frag players by regurgitating them in deadly pits\r
        e.pushltime = time + cvar("g_maxpushtime");\r
 \r

diff --git a/docs/TODO.txt b/docs/TODO.txt
index 60f5883627cd00c2a714952af71ba52036fbb5c6..08f19a6933bc928911652bd20672ec69386398a3 100644 (file)
--- a/docs/TODO.txt
+++ b/docs/TODO.txt
@@ -140,14 +140,10 @@
 \r
 - 0.7: Move source branch to mediasource like Xonotic\r
 \r
-- 0.7 | 0.8 BUG: Bots can still senect no weapon when they have the grabber\r
+- 0.8 BUG: Bots can still senect no weapon when they have the grabber\r
 \r
 - 0.7 | 0.8: Maybe allow damage gained from digestion to go up to 250\r
 \r
-- 0.7 | 0.8: Don't rocket prey out when the predator is dead (use a cvar for this)\r
-\r
-- 0.7 | 0.8: Is predayor / prey rocketing speed influenced by healthsize?\r
-\r
 - +0.8: Maybe turn health items into creatures that run around?\r
 \r
 - 0.8: Maybe give a swallow progress to items as well, but by standing on them.\r