Swallow speed, digestion damage, and stomach kick damage, now depend on the size...

diff --git a/data/balanceVT.cfg b/data/balanceVT.cfg
index 3c87d12e30258e6e5b3a9e0b0bfcab516b3bf59e..bd32fa7f4a60f89a912fd454059f90db07881e29 100644 (file)
--- a/data/balanceVT.cfg
+++ b/data/balanceVT.cfg
@@ -188,7 +188,7 @@ set g_balance_grabber_reload_time 2
 set g_balance_vore_swallow_range 100 "distance below which you can swallow another player when facing them"\r
 set g_balance_vore_swallow_limit 3 "how many players can fit in the stomach at a time, may range between 1 and 9"\r
 set g_balance_vore_swallow_speed_fill 3 "how long it takes to swallow a player, 0 is instant"\r
-set g_balance_vore_swallow_speed_fill_healthsize 1 "fill rate depends on predator size"\r
+set g_balance_vore_swallow_speed_fill_playerscale 1 "fill rate depends on predator size compared to prey size"\r
 set g_balance_vore_swallow_speed_decrease 0.2 "how fast the swallow progress decreases, when the predator is no longer swallowing"\r
 set g_balance_vore_swallow_speed_cutspd 0.5 "prey movement slows down by this amount the closer they are to being swallowed"\r
 set g_balance_vore_swallow_speed 1 "how long it takes to swallow a player"\r
@@ -206,7 +206,7 @@ set g_balance_vore_digestion_damage 4 "amount of damage applied to victims durin
 set g_balance_vore_digestion_vampire 1 "amount of health you gain from digestion"\r
 set g_balance_vore_digestion_vampire_stable 150 "maximum amount of health you can gain from digestion (best kept equal or less than g_balance_health_rotstable)"\r
 set g_balance_vore_digestion_distribute 1 "if enabled, digestion is reduced by the amount of prey you have. eg: having 2 prey will reduce digestion strength by 2"\r
-set g_balance_vore_digestion_playerscale 1 "if enabled, digestion damage is affected by the size of the player"\r
+set g_balance_vore_digestion_playerscale 1 "if enabled, digestion damage is affected by the size of the predator compared to the size of the prey"\r
 set g_balance_vore_teamheal 1 "when enabled, having a team mate in your stomach will keep healing them by this amount"\r
 set g_balance_vore_teamheal_stable 150 "maximum amount of health you can gain from a teamheal (best kept equal or less than g_balance_health_rotstable)"\r
 set g_balance_vore_weight_gravity 1 "you get this heavier the more you eat, at 1 each meal makes you two times heavier"\r
@@ -215,7 +215,7 @@ set g_balance_vore_kick_damage_min 30 "minimum amount of damage you can do with
 set g_balance_vore_kick_damage_max 45 "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 420 "predators are pushed by this amount when stomach kicked, in the direction their prey is facing"\r
-set g_balance_vore_kick_playerscale 1 "if enabled, the damage / force of stomach kicks is affected by the size of the player"\r
+set g_balance_vore_kick_playerscale 1 "if enabled, the damage / force of stomach kicks is affected by the size of the prey compared to the size of the predator"\r
 set g_balance_vore_kick_predator_punchangle 6 "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_kick_cutregurgitate 0.75 "probability that a stomach kick will cause the predator to lose a scheduled regurgitation"\r

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index 511af9c5b658c925c800d857fc19cdca245af3b9..f3967b45ec7d257597205df900c05c3feb2d1e86 100644 (file)
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -260,8 +260,8 @@ void Vore_SwallowStep(entity e)
        {\r
                float fill;\r
                fill = cvar("g_balance_vore_swallow_speed_fill") * frametime;\r
-               if(cvar("g_balance_vore_swallow_speed_fill_healthsize")) // fill rate depends on predator size\r
-                       fill *= self.scale;\r
+               if(cvar("g_balance_vore_swallow_speed_fill_playerscale")) // fill rate depends on predator size compared to prey size\r
+                       fill *= (self.scale / e.scale);\r
 \r
                e.swallow_progress_prey += fill;\r
        }\r
@@ -415,7 +415,7 @@ void Vore_Digest()
 \r
                // apply player scale to digestion damage\r
                if(cvar("g_balance_vore_digestion_playerscale"))\r
-                       damage *= self.predator.scale;\r
+                       damage *= (self.predator.scale / self.scale);\r
 \r
                Damage(self, self.predator, self.predator, damage, DEATH_DIGESTION, self.origin, '0 0 0');\r
                if(cvar("g_balance_vore_digestion_vampire") && self.predator.health < cvar("g_balance_vore_digestion_vampire_stable"))\r
@@ -468,8 +468,8 @@ void Vore_StomachKick()
                // apply player scale to the damage / force of the kick\r
                if(cvar("g_balance_vore_kick_playerscale"))\r
                {\r
-                       damage *= self.scale;\r
-                       force *= self.scale;\r
+                       damage *= (self.scale / self.predator.scale);\r
+                       force *= (self.scale / self.predator.scale);\r
                }\r
 \r
                Damage(self.predator, self, self, damage, DEATH_STOMACHKICK, self.predator.origin, force);\r