]> git.xonotic.org Git - voretournament/voretournament.git/commitdiff
Predator progress causes your prey progress to drop more quickly and the other way...
authorMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Tue, 11 Jun 2013 13:49:33 +0000 (16:49 +0300)
committerMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Tue, 11 Jun 2013 13:49:33 +0000 (16:49 +0300)
data/balanceVT.cfg
data/qcsrc/server/vore.qc

index a608a42f4ba0065d29ea7cc74137f365c59b4b0b..00c5942c96f25f18ac81f4aac8f779d1701216ca 100644 (file)
@@ -210,6 +210,7 @@ set g_balance_vore_swallow_speed_fill_scalediff_player 0.5 "fill rate depends on
 set g_balance_vore_swallow_speed_fill_scalediff_item 0.75 "fill rate depends on predator health compared to item health by this amount"\r
 set g_balance_vore_swallow_speed_fill_stomachload 1 "fill rate is influenced by the prey's stomach load by this amount"\r
 set g_balance_vore_swallow_speed_decrease 0.5 "how fast the swallow progress decreases, when the predator is no longer swallowing"\r
+set g_balance_vore_swallow_speed_decrease_even 0.5 "predator progress causes your prey progress to drop more quickly and the other way around"\r
 set g_balance_vore_swallow_speed_cutspd_prey 1 "prey movement slows down by this amount the closer they are to being swallowed"\r
 set g_balance_vore_swallow_speed_cutspd_pred 0.5 "predator movement slows down by this amount the closer they are to finishing swallowing"\r
 set g_balance_vore_swallow_dropweapon 0.6 "probability of dropping your weapon when swallowed. 0 = never and 1 = always, does not apply to team mates"\r
index 195b5ce1964d09a0d4e2c1482b815e37bdedec58..9e71f036aab10161cda9e93cdc29c33647de87c6 100644 (file)
@@ -777,9 +777,19 @@ void Vore()
        if(cvar("g_balance_vore_swallow_speed_decrease"))\r
        {\r
                if(self.swallow_progress_pred)\r
-                       self.swallow_progress_pred = max(0, self.swallow_progress_pred - cvar("g_balance_vore_swallow_speed_decrease") * frametime);\r
+               {\r
+                       float speed = cvar("g_balance_vore_swallow_speed_decrease");\r
+                       if(cvar("g_balance_vore_swallow_speed_decrease_even"))\r
+                               speed += self.swallow_progress_prey * cvar("g_balance_vore_swallow_speed_decrease_even");\r
+                       self.swallow_progress_pred = max(0, self.swallow_progress_pred - speed * frametime);\r
+               }\r
                if(self.swallow_progress_prey)\r
+               {\r
+                       float speed = cvar("g_balance_vore_swallow_speed_decrease");\r
+                       if(cvar("g_balance_vore_swallow_speed_decrease_even"))\r
+                               speed += self.swallow_progress_pred * cvar("g_balance_vore_swallow_speed_decrease_even");\r
                        self.swallow_progress_prey = max(0, self.swallow_progress_prey - cvar("g_balance_vore_swallow_speed_decrease") * frametime);\r
+               }\r
        }\r
 \r
        // set the predator's stomach load and capacity\r