Stomach kicks no longer have a probability of regurgitating the player. Instead,...

diff --git a/data/balanceVT.cfg b/data/balanceVT.cfg
index 8e8f5ad0b0fdd3e41f603bc35393760b9f722f27..29c0a5a7a37be41e0cc7f4cdab46fdf631264350 100644 (file)
--- a/data/balanceVT.cfg
+++ b/data/balanceVT.cfg
@@ -207,7 +207,7 @@ set g_balance_vore_kick_damage_min 15 "minimum amount of damage you can do with
 set g_balance_vore_kick_damage_max 30 "maximum amount of damage you can do with a stomach kick"\r
 set g_balance_vore_kick_delay 0.6 "how many seconds must pass before you can perform another stomach kick"\r
 set g_balance_vore_kick_force 140 "predators are pushed by this amount when stomach kicked, in the direction their prey is facing"\r
-set g_balance_vore_kick_escapeprobability 0.115 "probability of getting regurgitated while performing stomach kicks (0 = never, 1 = always)"\r
 set g_balance_vore_kick_predator_punchangle 3 "your view gets tilted by this amount when receiving stomach kicks"\r
 set g_balance_vore_kick_prey_punchangle 6 "your view gets tilted by this amount when dealing stomach kicks"\r
+set g_balance_vore_escapeprobability 0.115 "probability of getting regurgitated when the predator takes damage (0 = never, 1 = always)"\r
 // }}}\r

diff --git a/data/qcsrc/server/g_damage.qc b/data/qcsrc/server/g_damage.qc
index edc14f05f58320008bfb95013eb210f7be6540ff..35eb1f551468327c19093bfabc048034d77a9ba9 100644 (file)
--- a/data/qcsrc/server/g_damage.qc
+++ b/data/qcsrc/server/g_damage.qc
@@ -693,6 +693,18 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
                if (attacker.isbot)\r
                        damage = damage * bound(0.1, (skill + 5) * 0.1, 1);\r
 \r
+               // if a predator is taking damage, check if he should regurgitate any prey\r
+               if(cvar("g_balance_vore_escapeprobability"))\r
+               {\r
+                       entity e;\r
+                       FOR_EACH_PLAYER(e)\r
+                       {\r
+                               if(e.predator == targ)\r
+                               if(random() < cvar("g_balance_vore_escapeprobability"))\r
+                                       Vore_Regurgitate(e);\r
+                       }\r
+               }\r
+\r
                // nullify damage if teamplay is on\r
                if(deathtype != DEATH_TELEFRAG)\r
                if(attacker.classname == "player")\r

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index fff85c53ed6c6cafdb873302f8727fe43456b52b..8bb775d8c9c6f51d816f404312d3e21d9eb2db4d 100644 (file)
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -422,9 +422,6 @@ void Vore_StomachKick()
                self.predator.punchangle_x -= cvar("g_balance_vore_kick_predator_punchangle");\r
                self.punchangle_x += cvar("g_balance_vore_kick_prey_punchangle");\r
 \r
-               if(random() < cvar("g_balance_vore_kick_escapeprobability"))\r
-                       Vore_Regurgitate(self);\r
-\r
                self.stomachkick_delay = time + cvar("g_balance_vore_kick_delay");\r
        }\r
 }\r

diff --git a/data/qcsrc/server/vore.qh b/data/qcsrc/server/vore.qh
index 96eb5ed5ff71b31727b8a671d9867f8d2fefe297..30989cae044c869f3d259f1ede30595d65085efa 100644 (file)
--- a/data/qcsrc/server/vore.qh
+++ b/data/qcsrc/server/vore.qh
@@ -1,4 +1,5 @@
 void Vore();\r
+void Vore_Regurgitate(entity e);\r
 void Vore_Disconnect();\r
 void Vore_DeadPrey_Detach(entity e);\r
 \r