Two new RPg settings. The first one allows anyone to leave their predator in the...

diff --git a/data/defaultVoretournament.cfg b/data/defaultVoretournament.cfg
index 050f8d305c1c93327be598a0fd88dc5f193c8c23..4d5a73fd21df28e5a23c9999035c815c7a155346 100644 (file)
--- a/data/defaultVoretournament.cfg
+++ b/data/defaultVoretournament.cfg
@@ -608,6 +608,8 @@ seta g_cts 0 "CTS: complete the stage"
 \r
 // rpg\r
 seta g_rpg 0 "RPG: RolePlay / Free Roam gametype"\r
+set g_rpg_canleave 1 "when enabled, anyone can leave a predator's stomach in RPG (like leaving a team mate in team games)"\r
+set g_rpg_botattack 0 "when disabled, bots won't attack anyone in RPG (but will still swallow them harmlessly)"\r
 \r
 // server game balance settings\r
 // powerup balance settings\r

diff --git a/data/qcsrc/server/bot/havocbot/vore_ai.qc b/data/qcsrc/server/bot/havocbot/vore_ai.qc
index 89800689f577ac4712791af967a9a368e8722702..ea03a965db5d92be9cf25250771af4244eab5b0e 100644 (file)
--- a/data/qcsrc/server/bot/havocbot/vore_ai.qc
+++ b/data/qcsrc/server/bot/havocbot/vore_ai.qc
@@ -138,6 +138,7 @@ void Vore_AI()
                else if(!self.digesting)
                {
                        // the higher the skill, the faster bots will start to digest you
+                       if not(g_rpg && !cvar("g_rpg_botattack"))
                        if(skill >= randomtry_pred)
                                self.BUTTON_DIGEST = TRUE; // digest
 
@@ -153,6 +154,7 @@ void Vore_AI()
 
        if(self.predator.classname == "player" && time > self.decide_prey)
        {
+               if not(g_rpg && !cvar("g_rpg_botattack"))
                if not(teams_matter && self.team == self.predator.team)
                {
                        // the higher the skill, the more the bot will kick in your stomack
@@ -167,7 +169,10 @@ 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(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
-                               self.BUTTON_JUMP = TRUE; // leave
+                       {
+                               if not(g_rpg && !cvar("g_rpg_botattack"))
+                                       self.BUTTON_JUMP = TRUE; // leave
+                       }
                }
 
                self.decide_prey = time + decide_prey_time; // time before the bot decides what to do with their predator

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index 826cd34c9f083d2e812a176b0a75861d92ff0cc2..63a7bb1c75e63d4ebcaa823911443982a35766a0 100644 (file)
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -62,8 +62,13 @@ float Swallow_condition_check(entity prey)
 \r
 float Vore_CanLeave()\r
 {\r
-       if(teams_matter && self.team == self.predator.team)\r
-               return TRUE;\r
+       if(self.predator.classname == "player")\r
+       {\r
+               if(teams_matter && self.team == self.predator.team)\r
+                       return TRUE;\r
+               if(g_rpg && cvar("g_rpg_canleave"))\r
+                       return TRUE;\r
+       }\r
        return FALSE;\r
 }\r
 \r