Fix an epic failure in a recent commit. Digestion damage working properly again

diff --git a/data/balanceVT.cfg b/data/balanceVT.cfg
index 31140e9b8b9cc5ea44e227a6ae11c0e36719e07e..55d1f071ce0e71dad040e44a6bbe8b1b885a3a82 100644 (file)
--- a/data/balanceVT.cfg
+++ b/data/balanceVT.cfg
@@ -218,7 +218,7 @@ set g_balance_vore_regurgitate_predator_punchangle_item 6 "your view gets tilted
 set g_balance_vore_regurgitate_prey_punchvector 50 "your view gets lowered by this amount when getting regurgitated"\r
 set g_balance_vore_digestion_damage 4 "amount of damage applied to victims during digestion"\r
 set g_balance_vore_digestion_damage_death 2 "amplify digestion damage by this amount when the prey is dead"\r
-set g_balance_vore_digestion_damage_item 2 "amount of damage applied to items during digestion"\r
+set g_balance_vore_digestion_damage_item 1 "amount of damage applied to items during digestion"\r
 set g_balance_vore_digestion_limit -100 "prey can be digested down to this amount of health"\r
 set g_balance_vore_digestion_limit_regurgitate 1 "the predator automatically regurgitates prey that has reached the digestion limit"\r
 set g_balance_vore_digestion_limit_blockrespawn 1 "dead prey cannot respawn if it's still being digested"\r

diff --git a/data/qcsrc/server/t_items.qc b/data/qcsrc/server/t_items.qc
index 559fa5728297b54f371d8c54855ff3ad9fa666c4..4ec0ed2a59aa423d7e13cc42fa5ead131ebd8e5b 100644 (file)
--- a/data/qcsrc/server/t_items.qc
+++ b/data/qcsrc/server/t_items.qc
@@ -256,8 +256,9 @@ 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 = ceil(cvar("g_balance_vore_digestion_damage_item") / damage_offset);\r
+                               damage_offset *= self.predator.stomach_load / self.predator.stomach_maxload;\r
+                       damage_offset = ceil(damage_offset);\r
+                       damage = cvar("g_balance_vore_digestion_damage_item") / damage_offset;\r
 \r
                        self.health -= damage;\r
                        if(self.predator.health + damage <= self.max_health)\r

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index 2a5e7387c1097162b40b6c8d9ac235906bcbf8b4..300dfc738519484a138c72cd3e3720d215f66cc2 100644 (file)
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -459,11 +459,12 @@ 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;\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 = ceil(cvar("g_balance_vore_digestion_damage") / damage_offset);\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
                        damage *= cvar("g_balance_vore_digestion_damage_death");\r
 \r

diff --git a/docs/Release notes.txt b/docs/Release notes.txt
index 617d5f01aa50f182c85cd01873f077b90315ed65..5e839cad90ab085a4104b5b2edcd1afd1cd83324 100644 (file)
--- a/docs/Release notes.txt
+++ b/docs/Release notes.txt
@@ -266,8 +266,6 @@ Bug fixes:
 \r
 - Prevent bots switching to weapons they don't own in order to reload them, causing weird animations.\r
 \r
-- Correct a bug that caused distributed digestion to work in reverse, and amplify instead of reducing.\r
-\r
 - Fix health rot not pausing when gaining health from digestion.\r
 \r
 Features:\r