Add some more important vore checks and change a cvar description

diff --git a/data/defaultVoretournament.cfg b/data/defaultVoretournament.cfg
index 1a98e09baed7272e0c1cf6e9cd20b992d0b6722d..642e53361c6fd12d13b2c3e6b31f9283db3ee6fb 100644 (file)
--- 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
 \r
 set g_vore_regurgitatecolor_released "0.75 1 0.5" "the color players will have when released from the stomach alive"\r
 set g_vore_regurgitatecolor_digested "-0.125 0.25 0" "the color players will have when released from the stomach digested"\r
-set g_vore_gurglesound 1 "allow the ambient gurgle sound to play when there's someone in your stomach"\r
+set g_vore_gurglesound 1 "predators make an ambient gurgling sound"\r
 set g_vore_biggergut 1 "when enabled, a player can't swallow someone with more players in their stomach than them"\r
 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"\r
 set g_vore_showpreyhealth 1 "when enabled, a predator can see their prey's health on the stomach board"\r

diff --git a/data/qcsrc/server/bot/havocbot/vore_ai.qc b/data/qcsrc/server/bot/havocbot/vore_ai.qc
index 0e51b841c08da0c7e046aa34803fa70f6754630c..cdded9fdff51a7ca4c6b5c23dd83a3f2ba30fd41 100644 (file)
--- 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 f78e6bfe589bec4e09f3c5d92b0f63f417da97a5..74801e4ca96ae01103596dae18461a0cac6ace02 100644 (file)
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -26,8 +26,8 @@ float Swallow_condition_check(entity prey)
 {\r
        // checks the necessary conditions for swallowing another player\r
        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\r
+       if(self.classname == "player" && self.eater.classname != "player" && self.deadflag == DEAD_NO) // we can't swallow players while inside someone's stomach ourselves\r
        if not(vlen(self.velocity) > cvar("g_balance_vore_regurgitate_velocitylimit"))\r
-       if(self.eater.classname != "player") // we can't swallow players while inside someone's stomach ourselves\r
        {\r
                if(self.stomach_load >= cvar("g_balance_vore_swallow_limit"))\r
                {\r