From c62784894b9cb08e59fc7a12f5aac97a1533c50e Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Thu, 3 Sep 2015 13:53:00 +0200
Subject: [PATCH] Made sure encumbered conditions respect carry capacity

---
 rpg-docs/lib/methods/conditions.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/rpg-docs/lib/methods/conditions.js b/rpg-docs/lib/methods/conditions.js
index f0ecddb0..4e42bdcc 100644
--- a/rpg-docs/lib/methods/conditions.js
+++ b/rpg-docs/lib/methods/conditions.js
@@ -101,6 +101,8 @@ trackEncumbranceConditions = function(charId, templateInstance) {
 			{fields: {"settings": 1}}
 		);
 		var strength = Characters.calculate.attributeValue(charId, "strength");
+		var carryMultiplier = Characters.calculate
+			.attributeValue(charId, "carryMultiplier");
 		var give = function(condition) {
 			Meteor.call("giveCondition", charId, condition);
 		};
@@ -108,11 +110,11 @@ trackEncumbranceConditions = function(charId, templateInstance) {
 			Meteor.call("removeCondition", charId, condition);
 		};
 		//variant encumbrance rules
-		if (weight > strength * 10 &&
+		if (weight > strength * 10 * carryMultiplier &&
 			character.settings.useVariantEncumbrance) {
 			give("encumbered2");
 			remove("encumbered");
-		} else if (weight > strength * 5 &&
+		} else if (weight > strength * 5 * carryMultiplier &&
 				   character.settings.useVariantEncumbrance){
 			give("encumbered");
 			remove("encumbered2");
@@ -121,11 +123,11 @@ trackEncumbranceConditions = function(charId, templateInstance) {
 			remove("encumbered2");
 		}
 		//normal encumbrance rules
-		if (weight > strength * 30 &&
+		if (weight > strength * 30 * carryMultiplier &&
 			character.settings.useStandardEncumbrance){
 			give("encumbered4");
 			remove("encumbered3");
-		} else if (weight > strength * 15 &&
+		} else if (weight > strength * 15 * carryMultiplier &&
 				   character.settings.useStandardEncumbrance) {
 			give("encumbered3");
 			remove("encumbered4");