From 72ad1b7eb5d491deecdda92451dbea7c24a1c639 Mon Sep 17 00:00:00 2001 From: MirceaKitsune Date: Thu, 15 Mar 2012 21:42:26 +0200 Subject: [PATCH] Don't regurgitate fully digested prey silently by default --- data/balanceVT.cfg | 1 + data/qcsrc/server/vore.qc | 1 + data/qcsrc/server/w_common.qc | 6 +++--- docs/TODO.txt | 4 +++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/data/balanceVT.cfg b/data/balanceVT.cfg index 324ae16b..08f66d50 100644 --- 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)" 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_death_silent 0 "when dead prey is digested to the maximum amount, remove them silently rather than throwing up the gibs" 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" set g_balance_vore_regurgitate_prey_punchvector 50 "your view gets lowered by this amount when getting regurgitated" diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc index 0e7bf893..668eb9f3 100644 --- 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"); // if the prey has been fully digested, silently detach them + if(cvar("g_balance_vore_regurgitate_death_silent")) if(e.deadflag != DEAD_NO && e.health <= cvar("g_balance_vore_digestion_limit")) { e.predator = world; diff --git a/data/qcsrc/server/w_common.qc b/data/qcsrc/server/w_common.qc index 7998dfb3..80240485 100644 --- 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) { if(e.stat_eaten) - return; // you can't gib outside of the stomach + return; // you can't gib inside the stomach float gib_health; gib_health = cvar("sv_gibhealth"); if(gib_health > 0) // someone is being stupid gib_health = 0; - if(cvar("g_healthsize")) // smaller bodies are more likely to gib, and vice versa + if(cvar("g_healthsize")) // smaller bodies are more likely to gib and vice versa gib_health *= e.scale; - +dprint(strcat(ftos(e.modelindex), " ----------------\n")); if (e.health <= gib_health && e.modelindex != 0) { // don't use any animations as a gib diff --git a/docs/TODO.txt b/docs/TODO.txt index 2f30f19a..29fc6db2 100644 --- a/docs/TODO.txt +++ b/docs/TODO.txt @@ -152,4 +152,6 @@ - 0.8: Turn the Grabber into an organic weapon, but keep metal parts like the fuel cases and weapon display -- 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) + +- 0.8: Colormod gibs when regurgitating them, although they are client side and the color cvars are server \ No newline at end of file -- 2.39.2