Bot AI: Don't leave when gentle vore is enabled

[voretournament/voretournament.git] / data / qcsrc / server / bot / havocbot / vore_ai.qc

diff --git a/data/qcsrc/server/bot/havocbot/vore_ai.qc b/data/qcsrc/server/bot/havocbot/vore_ai.qc
index f50d1fc7c5929b440ed0745abba103877dfced09..4543dc2cad26b585e036e451b94e63b903bcd92a 100644 (file)
--- a/data/qcsrc/server/bot/havocbot/vore_ai.qc
+++ b/data/qcsrc/server/bot/havocbot/vore_ai.qc
@@ -77,7 +77,8 @@ void Vore_AI_Teamheal(entity prey)
        {
                if(time > self.decide_swallow)
                {
-                       if(skill >= random() * 10) // there are 10 bot skill steps
+                       // base the decision around HOW damaged the team mate is, centered around 100 health
+                       if(skill * (100 / prey.health) >= random() * 10) // there are 10 bot skill steps
                                self.hold_BUTTON_ATCK = TRUE; // swallow the team mate
                        self.decide_swallow = time + cvar("bot_ai_vore_decide_swallow") / self.bot_vorethinkpred; // this is needed to take a proper decision, otherwise the code would execute each frame and return TRUE quickly
                }
@@ -129,18 +130,22 @@ void Vore_AI()
                if(self.status_teamhealing > 1) // if we are teamhealing, there's nothing to do from here on
                        return;
 
-               if(prey.items & IT_STRENGTH) // avoid eating bots that have the Strenght powerup
-                       fear += cvar("bot_ai_vore_fear") * self.bot_vorefear;
-               if(prey.items & IT_INVINCIBLE) // avoid eating bots that have the Invincible powerup
-                       fear += cvar("bot_ai_vore_fear") * self.bot_vorefear;
-               fear += self.stomach_load; // the bigger our stomach, the less we want to put someone else in there
-               fear *= (prey.scale / self.scale); // predators fear larger prey and are courageous toward smaller prey
-               if(prey.stomach_load)
-                       fear *= prey.stomach_load; // predators fear prey that have a large stomach
-
-               // when a bot is being swallowed, he will try to swallow the enemy back in defense, forgetting about fear
-               if(self.swallow_progress_prey)
-                       fear /= self.swallow_progress_prey * skill;
+               if(!cvar("g_vore_reversescoring")) // when reverse scoring is on, it's in the interest of the prey to get eaten, so the predator has nothing to fear
+               {
+                       if(prey.items & IT_STRENGTH) // avoid eating bots that have the Strenght powerup
+                               fear += cvar("bot_ai_vore_fear") * self.bot_vorefear;
+                       if(prey.items & IT_INVINCIBLE) // avoid eating bots that have the Invincible powerup
+                               fear += cvar("bot_ai_vore_fear") * self.bot_vorefear;
+                       fear += self.stomach_load; // the bigger our stomach, the less we want to put someone else in there
+                       if(cvar("g_healthsize"))
+                               fear *= (prey.scale / self.scale); // predators fear larger prey and are courageous toward smaller prey
+                       if(prey.stomach_load)
+                               fear *= prey.stomach_load; // predators fear prey that have a large stomach
+
+                       // when a bot is being swallowed, he will try to swallow the enemy back in defense, forgetting about fear
+                       if(self.swallow_progress_prey)
+                               fear /= self.swallow_progress_prey * skill;
+               }
 
                decide_pred_time = cvar("bot_ai_vore_decide_pred") / skill / self.bot_vorethinkpred;
 
@@ -191,6 +196,9 @@ void Vore_AI()
 // Prey bot behavior:
 // --------------------------------
 
+       if(cvar("g_vore_reversescoring")) // if reverse scoring is on, it's in the interest of the prey to get eaten, so don't fight back
+               return;
+
        // while being swallowed, smart bots know to keep jumping to make it harder to be caught
        // TODO: Don't do this if the predator is a team mate
        if(self.swallow_progress_prey)
@@ -219,7 +227,7 @@ void Vore_AI()
                {
                        if(self.predator.digesting) // our predator is digesting, so get out of him regardless of who he is
                                self.BUTTON_JUMP = TRUE; // leave
-                       else if not(g_rpg && cvar("g_rpg_botattack") < 2)
+                       else if not((g_rpg && cvar("g_rpg_botattack") < 2) || !cvar("g_vore_digestion")) // don't leave when gentle vore is enabled
                        {
                                if not(teams_matter && self.team == self.predator.team && cvar("g_balance_vore_teamheal") && self.health < cvar("g_balance_vore_teamheal_stable")) // we are being team healed, don't leave
                                if not(teams_matter && self.team == self.predator.team && cvar("bot_ai_vore_stayinstomach")) // bots are not supposed to leave a team mate's stomach automatically