From 903d6f9ad1f6f5e654d651c3510147dec2feb02c Mon Sep 17 00:00:00 2001 From: MirceaKitsune Date: Tue, 5 Oct 2010 01:35:42 +0300 Subject: [PATCH] Add a request made by several players; A way to disable digestion, for gentle vore games. I added cvars to disable both digestion and stomach kicking if wanted. 0.4 has been delayed, so this is a pre-0.4 change. --- data/defaultVoretournament.cfg | 2 ++ data/qcsrc/server/bot/havocbot/vore_ai.qc | 5 +++-- data/qcsrc/server/vore.qc | 6 ++++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/data/defaultVoretournament.cfg b/data/defaultVoretournament.cfg index e80f290d..fd6ffe9f 100644 --- a/data/defaultVoretournament.cfg +++ b/data/defaultVoretournament.cfg @@ -1462,6 +1462,8 @@ set cl_vore_stomachmodel 1 "when enabled, we see the stomach model around us whe set cl_vore_cameraspeed 1.5 "speed at which you see yourself sliding down when swallowed, 0 disables" set cl_vore_punchangle 10 "your view gets tilted by this amount when swallowing or regurgitating someone" set g_vore 1 "enables the vore system, you want this on!" +set g_vore_digestion 1 "enables digestion system, you want this on!" +set g_vore_kick 1 "enables stomach kick system, you want this on!" set g_vore_reversescoring 0 "reverses vore scoring, and gives digested prey a frag rather than the predator (offer yourself gameplay), does not affect suicides, weapon kills and team kills" set g_vore_teamvore 1 "allow players to swallow their team mates" set g_vore_biggergut 1 "when enabled, a player can't swallow someone with more players in their stomach than them" diff --git a/data/qcsrc/server/bot/havocbot/vore_ai.qc b/data/qcsrc/server/bot/havocbot/vore_ai.qc index 51a3ed39..7d99813c 100644 --- a/data/qcsrc/server/bot/havocbot/vore_ai.qc +++ b/data/qcsrc/server/bot/havocbot/vore_ai.qc @@ -126,7 +126,7 @@ void Vore_AI() decide_pred_time = cvar("bot_ai_vore_decide_pred") / skill / self.bot_vorethinkpred; decide_prey_time = cvar("bot_ai_vore_decide_prey") / skill / self.bot_vorethinkprey; - if(time > self.decide_swallow) + if(time > self.decide_swallow && cvar("g_vore_digestion")) if(Swallow_condition_check_bot(prey)) { // the greater the skill, the higher the chance bots will swallow someone each attempt @@ -148,7 +148,7 @@ void Vore_AI() if(self.health <= cvar("g_balance_vore_kick_damage_max")) self.BUTTON_REGURGITATE = TRUE; - else if(!self.digesting) + else if(!self.digesting && cvar("g_vore_digestion")) { // the higher the skill, the faster bots will start to digest you if not(g_rpg && cvar("g_rpg_botattack") < 2) @@ -168,6 +168,7 @@ void Vore_AI() { // all we can do in the stomach is kick and do some damage / try to escape, or leave if the circumstances allow it and we should + if(cvar("g_vore_kick")) if not(g_rpg && cvar("g_rpg_botattack") < 2) if not(teams_matter && self.team == self.predator.team) { diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc index ac0da273..61330cd4 100644 --- a/data/qcsrc/server/vore.qc +++ b/data/qcsrc/server/vore.qc @@ -253,6 +253,9 @@ void Vore_Digest() { // apply digestion to prey + if(!cvar("g_vore_digestion")) + return; + if(time > self.predator.digestion_step) { Damage(self, self.predator, self.predator, cvar("g_balance_vore_digestion_damage"), DEATH_DIGESTION, self.origin, '0 0 0'); @@ -290,6 +293,9 @@ void Vore_StomachKick() { // allows prey to kick the predator's stomach and do some damage or attempt to escape + if(!cvar("g_vore_kick")) + return; + if(time > self.stomachkick_delay) { float damage; -- 2.39.2