Allow distributed digestion to be tweaked. Hopefully done properly

diff --git a/data/balanceVT.cfg b/data/balanceVT.cfg
index 55d1f071ce0e71dad040e44a6bbe8b1b885a3a82..fc4fce28943532e5deb249d047483c0d02f71b51 100644 (file)
--- a/data/balanceVT.cfg
+++ b/data/balanceVT.cfg
@@ -224,7 +224,7 @@ set g_balance_vore_digestion_limit_regurgitate 1 "the predator automatically reg
 set g_balance_vore_digestion_limit_blockrespawn 1 "dead prey cannot respawn if it's still being digested"\r
 set g_balance_vore_digestion_vampire 0.15 "amount of health you gain from digestion off the damage you deal"\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_distribute 0.1 "if enabled, digestion is reduced by the amount of stomach load you have by this amount"\r
 set g_balance_vore_digestion_scalediff 0.5 "if enabled, digestion damage is affected by the size of the predator compared to the size of the prey by this amount"\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)"

diff --git a/data/qcsrc/server/t_items.qc b/data/qcsrc/server/t_items.qc
index 4ec0ed2a59aa423d7e13cc42fa5ead131ebd8e5b..2e6a3f7ab476855c5d6293dde3cc69beb45afb38 100644 (file)
--- a/data/qcsrc/server/t_items.qc
+++ b/data/qcsrc/server/t_items.qc
@@ -256,8 +256,7 @@ void Item_Consumable_Think()
 \r
                        damage_offset = 1;\r
                        if(cvar("g_balance_vore_digestion_distribute")) // apply distributed digestion damage\r
-                               damage_offset *= self.predator.stomach_load / self.predator.stomach_maxload;\r
-                       damage_offset = ceil(damage_offset);\r
+                               damage_offset *= (self.predator.stomach_load / self.predator.stomach_maxload) / cvar("g_balance_vore_digestion_distribute");\r
                        damage = cvar("g_balance_vore_digestion_damage_item") / damage_offset;\r
 \r
                        self.health -= damage;\r

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index 300dfc738519484a138c72cd3e3720d215f66cc2..6c07ac1345d4f17c6a47ad8f6b8e2222dbd1d178 100644 (file)
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -459,10 +459,9 @@ void Vore_Digest()
 \r
                damage_offset = 1;\r
                if(cvar("g_balance_vore_digestion_distribute")) // apply distributed digestion damage\r
-                       damage_offset *= self.predator.stomach_load / self.predator.stomach_maxload;\r
+                       damage_offset *= (self.predator.stomach_load / self.predator.stomach_maxload) / cvar("g_balance_vore_digestion_distribute");\r
                if(cvar("g_healthsize") && cvar("g_balance_vore_digestion_scalediff")) // apply player scale to digestion damage\r
                        damage_offset *= pow(self.scale / self.predator.scale, cvar("g_balance_vore_digestion_scalediff"));\r
-               damage_offset = ceil(damage_offset);\r
 \r
                damage = cvar("g_balance_vore_digestion_damage") / damage_offset;\r
                if(cvar("g_balance_vore_digestion_damage_death") && self.deadflag != DEAD_NO) // amplify digestion damage for dead prey\r