Don't regurgitate fully digested prey silently by default

diff --git a/data/balanceVT.cfg b/data/balanceVT.cfg
index 324ae16b4789d65d509a29bd89b6b4236b891cbe..08f66d50bce67d3f0fc49b7d8437665a169e7605 100644 (file)
--- a/data/balanceVT.cfg
+++ b/data/balanceVT.cfg
@@ -217,6 +217,7 @@ set g_balance_vore_regurgitate_swallowprogress 0.5 "regurgitated prey is given t
 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_death_silent 0 "when dead prey is digested to the maximum amount, remove them silently rather than throwing up the gibs"\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
 set g_balance_vore_regurgitate_prey_punchvector 50 "your view gets lowered by this amount when getting regurgitated"\r

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index 0e7bf8933cbf8c171d1db05132325f83761186cb..668eb9f3ebe79307c084274e4d4013ce74349097 100644 (file)
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -381,6 +381,7 @@ void Vore_Regurgitate(entity e)
        e.punchvector_z = -cvar("g_balance_vore_regurgitate_prey_punchvector");\r
 \r
        // if the prey has been fully digested, silently detach them\r
+       if(cvar("g_balance_vore_regurgitate_death_silent"))\r
        if(e.deadflag != DEAD_NO && e.health <= cvar("g_balance_vore_digestion_limit"))\r
        {\r
                e.predator = world;\r

diff --git a/data/qcsrc/server/w_common.qc b/data/qcsrc/server/w_common.qc
index 7998dfb3722fa3f77fc8c868e8effb132d7d08dc..80240485596e9706066d473d741ec1b080dfe074 100644 (file)
--- a/data/qcsrc/server/w_common.qc
+++ b/data/qcsrc/server/w_common.qc
@@ -483,15 +483,15 @@ void W_PrepareExplosionByDamage(entity attacker, void() explode)
 void PlayerGib(entity e, entity attacker)\r
 {\r
        if(e.stat_eaten)\r
-               return; // you can't gib outside of the stomach\r
+               return; // you can't gib inside the stomach\r
 \r
        float gib_health;\r
        gib_health = cvar("sv_gibhealth");\r
        if(gib_health > 0) // someone is being stupid\r
                gib_health = 0;\r
-       if(cvar("g_healthsize")) // smaller bodies are more likely to gib, and vice versa\r
+       if(cvar("g_healthsize")) // smaller bodies are more likely to gib and vice versa\r
                gib_health *= e.scale;\r
-\r
+dprint(strcat(ftos(e.modelindex), " ----------------\n"));\r
        if (e.health <= gib_health && e.modelindex != 0)\r
        {\r
                // don't use any animations as a gib\r

diff --git a/docs/TODO.txt b/docs/TODO.txt
index 2f30f19aad0fbd9a36756dadcb874094bbddf640..29fc6db235f8f18a061b4792d849e499bfe9a85f 100644 (file)
--- a/docs/TODO.txt
+++ b/docs/TODO.txt
@@ -152,4 +152,6 @@
 \r
 - 0.8: Turn the Grabber into an organic weapon, but keep metal parts like the fuel cases and weapon display\r
 \r
-- 0.7: Regurgitate a player after he's been digested to minimum amount, rather than making him disappear (use a cvar)
\ No newline at end of file
+- 0.7: Regurgitate a player after he's been digested to minimum amount, rather than making him disappear (use a cvar)\r
+\r
+- 0.8: Colormod gibs when regurgitating them, although they are client side and the color cvars are server
\ No newline at end of file