From ad174a8cdb3382c9635412607fde6ced17521f7f Mon Sep 17 00:00:00 2001 From: MirceaKitsune Date: Sun, 5 Sep 2010 19:12:58 +0300 Subject: [PATCH] Add some more important vore checks and change a cvar description --- data/defaultVoretournament.cfg | 2 +- data/qcsrc/server/bot/havocbot/vore_ai.qc | 2 +- data/qcsrc/server/vore.qc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/data/defaultVoretournament.cfg b/data/defaultVoretournament.cfg index 1a98e09b..642e5336 100644 --- a/data/defaultVoretournament.cfg +++ b/data/defaultVoretournament.cfg @@ -1499,7 +1499,7 @@ seta g_ghost_items_color "-1 -1 -1" "color of ghosted items, 0 0 0 leaves the co set g_vore_regurgitatecolor_released "0.75 1 0.5" "the color players will have when released from the stomach alive" set g_vore_regurgitatecolor_digested "-0.125 0.25 0" "the color players will have when released from the stomach digested" -set g_vore_gurglesound 1 "allow the ambient gurgle sound to play when there's someone in your stomach" +set g_vore_gurglesound 1 "predators make an ambient gurgling sound" set g_vore_biggergut 1 "when enabled, a player can't swallow someone with more players in their stomach than them" set g_vore_dropweapon 0.75 "probability of dropping your weapon when being swallowed. 0 = never and 1 = always, does not apply to team mates" set g_vore_showpreyhealth 1 "when enabled, a predator can see their prey's health on the stomach board" diff --git a/data/qcsrc/server/bot/havocbot/vore_ai.qc b/data/qcsrc/server/bot/havocbot/vore_ai.qc index 0e51b841..cdded9fd 100644 --- a/data/qcsrc/server/bot/havocbot/vore_ai.qc +++ b/data/qcsrc/server/bot/havocbot/vore_ai.qc @@ -16,7 +16,7 @@ float Swallow_condition_check_bot(entity prey) { // checks the necessary conditions for a bot to swallow another player if(prey != self && prey.classname == "player" && prey.eater.classname != "player" && prey.deadflag == DEAD_NO && !prey.BUTTON_CHAT) // we can't swallow someone who's already in someone else's stomach - if(self.eater.classname != "player" && self.stomach_load < cvar("g_balance_vore_swallow_limit")) // we can't swallow players while inside someone's stomach ourselves + if(self.eater.classname != "player" && self.stomach_load < cvar("g_balance_vore_swallow_limit") && self.deadflag == DEAD_NO) // we can't swallow players while inside someone's stomach ourselves if not(cvar("g_vore_biggergut") && prey.stomach_load > self.stomach_load) if(self.health > cvar("g_balance_vore_kick_damage_max")) // explained below if not(prey.team == self.team && teamplay) diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc index f78e6bfe..74801e4c 100644 --- a/data/qcsrc/server/vore.qc +++ b/data/qcsrc/server/vore.qc @@ -26,8 +26,8 @@ float Swallow_condition_check(entity prey) { // checks the necessary conditions for swallowing another player if(prey.classname == "player" && prey.eater.classname != "player" && prey.deadflag == DEAD_NO) // we can't swallow someone who's already in someone else's stomach + if(self.classname == "player" && self.eater.classname != "player" && self.deadflag == DEAD_NO) // we can't swallow players while inside someone's stomach ourselves if not(vlen(self.velocity) > cvar("g_balance_vore_regurgitate_velocitylimit")) - if(self.eater.classname != "player") // we can't swallow players while inside someone's stomach ourselves { if(self.stomach_load >= cvar("g_balance_vore_swallow_limit")) { -- 2.39.2