Separate and fix some cvars

diff --git a/data/balanceVT.cfg b/data/balanceVT.cfg
index 620adc93dedefadf65c22be340d829832379c6a4..cfa8e93ecb001b1504b1b41eb73babd5c867ab37 100644 (file)
--- a/data/balanceVT.cfg
+++ b/data/balanceVT.cfg
@@ -206,7 +206,8 @@ 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_player 2 "how long it takes to swallow a player, 0 is instant"\r
 set g_balance_vore_swallow_speed_fill_item 0.01 "how long it takes to swallow a health item, 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, and player health compared to item health for items"\r
+set g_balance_vore_swallow_speed_fill_scalediff_player 0.5 "fill rate depends on predator size compared to prey size by this amount"\r
+set g_balance_vore_swallow_speed_fill_scalediff_item 0.75 "fill rate depends on predator health compared to item health"\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_cutspd_prey 1 "prey movement slows down by this amount the closer they are to being swallowed"\r

diff --git a/data/qcsrc/server/t_items.qc b/data/qcsrc/server/t_items.qc
index a382d710169531aad61f1df3149400a8453a112d..4f24cec237cc351c93408fa4bb0dd52916a62fd9 100644 (file)
--- a/data/qcsrc/server/t_items.qc
+++ b/data/qcsrc/server/t_items.qc
@@ -430,7 +430,7 @@ float Item_Swallow(entity item, entity player)
 \r
        // since map items don't have a scale, calculate one based on player size center and the item's health, in order to determine swallowing speed\r
        float scalediff;\r
-       scalediff = pow((item.health / cvar("g_healthsize_center")) / player.scale, cvar("g_balance_vore_swallow_speed_fill_scalediff"));\r
+       scalediff = pow((item.health / cvar("g_healthsize_center")) / player.scale, cvar("g_balance_vore_swallow_speed_fill_scalediff_item"));\r
 \r
        item.swallow_progress_prey += cvar("g_balance_vore_swallow_speed_fill_item") / scalediff;\r
        player.swallow_progress_pred = item.swallow_progress_prey;\r

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index 12c0dbe67152f4c192ec7cdab90fd25b1847d6f4..54faf616cc670a5a7ca604a38bfbb8364e1fbc56 100644 (file)
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -358,8 +358,8 @@ void Vore_SwallowStep(entity e)
        {\r
                float fill;\r
                fill = cvar("g_balance_vore_swallow_speed_fill_player") * frametime;\r
-               if(cvar("g_healthsize") && cvar("g_balance_vore_swallow_speed_fill_player_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_player_scalediff"));\r
+               if(cvar("g_healthsize") && cvar("g_balance_vore_swallow_speed_fill_scalediff_player")) // 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_player"));\r
                if(cvar("g_balance_vore_swallow_speed_fill_player_stomachload") && e.stomach_load) // fill rate is influenced by the prey's stomach load\r
                        fill *= (1 - ((e.stomach_load / e.stomach_maxload) * bound(0, cvar("g_balance_vore_swallow_speed_fill_player_stomachload"), 1)));\r
 \r