]> de.git.xonotic.org Git - voretournament/voretournament.git/commitdiff
Change how stomach load influences swallow progress
authorMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Sat, 19 Nov 2011 16:50:46 +0000 (18:50 +0200)
committerMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Sat, 19 Nov 2011 16:50:46 +0000 (18:50 +0200)
data/balanceVT.cfg
data/qcsrc/server/vore.qc

index 5e3954759e55f6aaa11cb851977a0368a3817c5e..dca867b8b41f32927f478cc4c7c91a3a07fa4f71 100644 (file)
@@ -199,7 +199,7 @@ set g_balance_vore_load_prey_mass 30 "prey mass, influenced by player size"
 set g_balance_vore_swallow_range 140 "distance below which you can swallow another player when facing them"\r
 set g_balance_vore_swallow_speed_fill 2.5 "how long it takes to swallow a player, 0 is instant"\r
 set g_balance_vore_swallow_speed_fill_scalediff 0.5 "fill rate depends on predator size compared to prey size by this amount"\r
-set g_balance_vore_swallow_speed_fill_stomachload 1 "fill rate is influenced by the prey's stomach load"\r
+set g_balance_vore_swallow_speed_fill_stomachload 0.5 "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_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
index accf701d4c1ac7bf2ee75c10fedb05fb8c3f463c..b09036029aa82db7ff6f9776cbc15501119d3adb 100644 (file)
@@ -340,7 +340,7 @@ void Vore_SwallowStep(entity e)
                if(cvar("g_healthsize") && cvar("g_balance_vore_swallow_speed_fill_scalediff")) // fill rate depends on predator size compared to prey size\r
                        fill *= pow(self.scale / e.scale, cvar("g_balance_vore_swallow_speed_fill_scalediff"));\r
                if(cvar("g_balance_vore_swallow_speed_fill_stomachload") && e.stomach_load) // fill rate is influenced by the prey's stomach load\r
-                       fill /= e.stomach_load;\r
+                       fill *= (1 - ((e.stomach_load / e.stomach_maxload) * bound(0, cvar("g_balance_vore_swallow_speed_fill_stomachload"), 1)));\r
 \r
                e.swallow_progress_prey += fill;\r
        }\r