From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sat, 19 Nov 2011 15:00:00 +0000 (+0200)
Subject: Fix an issue with distributed digestion working in reverse
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ad5148a42eaaf57dc5e7e938ef9311672e2c1eec;p=voretournament%2Fvoretournament.git

Fix an issue with distributed digestion working in reverse
---

diff --git a/data/qcsrc/server/t_items.qc b/data/qcsrc/server/t_items.qc
index d351beeb..092b287d 100644
--- a/data/qcsrc/server/t_items.qc
+++ b/data/qcsrc/server/t_items.qc
@@ -256,9 +256,8 @@ void Item_Consumable_Think()
 
 			damage_offset = 1;
 			if(cvar("g_balance_vore_digestion_distribute")) // apply distributed digestion damage
-				damage_offset *= self.predator.stomach_load / self.predator.stomach_maxload;
-			damage_offset = ceil(damage_offset);
-			damage = cvar("g_balance_vore_digestion_damage_item") / damage_offset;
+				damage_offset /= self.predator.stomach_load / self.predator.stomach_maxload;
+			damage = ceil(cvar("g_balance_vore_digestion_damage_item") / damage_offset);
 
 			self.health -= damage;
 			self.predator.health += damage;
diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index d7f55b96..c2f1ee31 100644
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -454,12 +454,11 @@ void Vore_Digest()
 
 		damage_offset = 1;
 		if(cvar("g_balance_vore_digestion_distribute")) // apply distributed digestion damage
-			damage_offset *= self.predator.stomach_load / self.predator.stomach_maxload;
+			damage_offset /= self.predator.stomach_load / self.predator.stomach_maxload;
 		if(cvar("g_healthsize") && cvar("g_balance_vore_digestion_scalediff")) // apply player scale to digestion damage
 			damage_offset *= pow(self.scale / self.predator.scale, cvar("g_balance_vore_digestion_scalediff"));
-		damage_offset = ceil(damage_offset);
 
-		damage = cvar("g_balance_vore_digestion_damage") / damage_offset;
+		damage = ceil(cvar("g_balance_vore_digestion_damage") / damage_offset);
 		if(cvar("g_balance_vore_digestion_damage_death") && self.deadflag != DEAD_NO) // amplify digestion damage for dead prey
 			damage *= cvar("g_balance_vore_digestion_damage_death");
 
diff --git a/docs/Release notes.txt b/docs/Release notes.txt
index f4245ae2..666131da 100644
--- a/docs/Release notes.txt	
+++ b/docs/Release notes.txt	
@@ -266,6 +266,8 @@ Bug fixes:
 
 - Prevent bots switching to weapons they don't own in order to reload them, causing weird animations.
 
+- Correct a bug that caused distributed digestion to work in reverse, and amplify instead of reducing.
+
 Features:
 
 - There is no longer a player swallow limit. Players have a stomach capacity (for predators) and a mass (for prey), both based on player scale. As long as your mass is not exceeded, you can keep swallowing players. This affects your weight and overall player capacity based on player size as well. eg: You might be able to eat only one large player, three tiny players, or two normal sized players at the same time. Stomach size will also reflect your capacity, not the player count, being bigger or smaller based on the prey inside and their size compared to yours. By default, a macro can swallow up to 15 mircos and a micro up to 1 macro.