Merge branch 'feature-carry-capacity-modifier'

rpg-docs/Model/Character/Characters.js

@@ -33,6 +33,7 @@ Schemas.Character = new SimpleSchema({
 	age:              {type: Schemas.Attribute},
 	ageRate:          {type: Schemas.Attribute},
 	armor:            {type: Schemas.Attribute},
+	carryMultiplier:  {type: Schemas.Attribute},
 
 	//resources
 	level1SpellSlots: {type: Schemas.Attribute},

rpg-docs/Model/Character/Effects.js

@@ -107,6 +107,18 @@ if (Meteor.isServer) Characters.after.insert(function(userId, char) {
 			group: "Inate",
 		},
 	});
+	Effects.insert({
+		charId: char._id,
+		name: "Natural Carrying Capacity",
+		stat: "carryMultiplier",
+		operation: "base",
+		value: "1",
+		parent: {
+			id: char._id,
+			collection: "Characters",
+			group: "Inate",
+		},
+	});
 });
 
 Effects.attachBehaviour("softRemovable");

rpg-docs/Model/Character/Proficiencies.js

@@ -30,7 +30,7 @@ Schemas.Proficiency = new SimpleSchema({
 Proficiencies.attachSchema(Schemas.Proficiency);
 
 Proficiencies.attachBehaviour("softRemovable");
-makeChild(Proficiencies);
+makeChild(Proficiencies, ["enabled"]);
 
 Proficiencies.allow(CHARACTER_SUBSCHEMA_ALLOW);
 Proficiencies.deny(CHARACTER_SUBSCHEMA_DENY);

rpg-docs/Model/Character/TemporaryHitPoints.js

@@ -3,8 +3,8 @@ TemporaryHitPoints = new Mongo.Collection("temporaryHitPoints");
 Schemas.TemporaryHitPoints = new SimpleSchema({
 	charId:      {type: String, regEx: SimpleSchema.RegEx.Id},
 	name:        {type: String, optional: true},
-	maximum:     {type: Number, defaultValue: 0},
+	maximum:     {type: Number, defaultValue: 0, min: 0, max: 500},
-	used:        {type: Number, defaultValue: 0},
+	used:        {type: Number, defaultValue: 0, min: 0, max: 500},
 	deleteOnZero:{type: Boolean, defaultValue: false},
 	dateAdded:   {
 		type: Date,

rpg-docs/client/views/character/effects/effectEdit/effectEdit.js

@@ -42,6 +42,7 @@ var stats = [
 	{stat: "rageDamage", name: "Rage Damage", group: "Stats"},
 	{stat: "expertiseDice", name: "Expertise Dice", group: "Stats"},
 	{stat: "superiorityDice", name: "Superiority Dice", group: "Stats"},
+	{stat: "carryMultiplier", name: "Carry Capacity Multiplier", group: "Stats"},
 	{stat: "level1SpellSlots", name: "level 1", group: "Spell Slots"},
 	{stat: "level2SpellSlots", name: "level 2", group: "Spell Slots"},
 	{stat: "level3SpellSlots", name: "level 3", group: "Spell Slots"},

rpg-docs/client/views/character/inventory/carryCapacityBar/carryCapacityBar.js

@@ -14,7 +14,9 @@ var getFractionCarried = function(char) {
 	});
 	//get strength
 	var strength = Characters.calculate.attributeValue(char._id, "strength");
-	var capacity = strength * 15;
+	var carryMultiplier = Characters.calculate
+		.attributeValue(char._id, "carryMultiplier");
+	var capacity = strength * 15 * carryMultiplier;
 	return weight / capacity;
 };
 

rpg-docs/client/views/character/stats/addTHPDialog/addTHPDialog.js

@@ -1,9 +1,11 @@
 Template.addTHPDialog.events({
 	"tap #addButton": function(event, instance){
+		var max = +instance.find("#quantityInput").value;
+		if (!max || max < 0) max = 0;
 		TemporaryHitPoints.insert({
 			charId: this.charId,
 			name: instance.find("#nameInput").value,
-			maximum: +instance.find("#quantityInput").value,
+			maximum: max,
 			deleteOnZero: !!instance.find("#deleteWhenZeroCheckbox").checked,
 		});
 	}

rpg-docs/client/views/character/stats/carryCapacityTable/carryCapacityTable.html

@@ -2,26 +2,26 @@
 	<table class="carryCapacityTable strengthTable">
 		<tr>
 			<td>Encumbered</td>
-			<td>&gt;{{evaluate charId "strength * 5"}}lbs</td>
+			<td>&gt;{{evaluate charId "strength * 5 * carryMultiplier"}}lbs</td>
 			<td class="caption">Variant rule, encumbered characters move 10 feet slower</td>
 		</tr>
 		<tr>
 			<td>Heavily encumbered</td>
-			<td>&gt;{{evaluate charId "strength * 10"}}lbs</td>
+			<td>&gt;{{evaluate charId "strength * 10 * carryMultiplier"}}lbs</td>
 			<td class="caption">
 				Variant rule, heavily encumbered characters move 20 feet slower and have disadvantage on ability checks, attack rolls, and saving thows that use Strength, Dexterity, or Constitution
 			</td>
 		</tr>
 		<tr>
 			<td>Over Encumbered</td>
-			<td>&gt;{{evaluate charId "strength * 15"}}lbs</td>
+			<td>&gt;{{evaluate charId "strength * 15 * carryMultiplier"}}lbs</td>
 			<td class="caption">
 				Characters that can only just lift, push or drag their current load can only move at 5 feet.
 			</td>
 		</tr>
 		<tr>
 			<td>Push, drag or lift maximum</td>
-			<td>{{evaluate charId "strength * 30"}}lbs</td>
+			<td>{{evaluate charId "strength * 30 * carryMultiplier"}}lbs</td>
 			<td class="caption"></td>
 		</tr>
 	</table>

rpg-docs/client/views/character/stats/healthCard/healthCard.html

@@ -33,9 +33,9 @@
 							  role="slider"
 							  flex
 							  ></paper-diff-slider>
-					{{#unless left}}{{#unless deleteOnZero}}
+					{{#unless left}}
 						<paper-icon-button class="deleteTHP" icon="delete"></paper-icon-button>
-					{{/unless}}{{/unless}}
+					{{/unless}}
 				</div>
 			</div>
 			{{/each}}

rpg-docs/lib/functions/shareCharacter.js

@@ -1,8 +1,13 @@
 Meteor.methods({
 	"getUserId": function(username){
 		if (!username) return;
+		regex = new RegExp("^" + username + "$", "i")
 		var user = Meteor.users.findOne(
-			{$or: [{username: username}, {"emails.address": username}]}
+			{$or: [
+				{username: username},
+				{"emails.address": regex},
+				{"services.google.email": regex},
+				]}
 		);
 		return user && user._id;
 	}

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");

rpg-docs/private/changeLogs/changeLogs.js

@@ -243,3 +243,20 @@ ChangeLogs.insert({
 		"Added basic analytics",
 	],
 });
+
+ChangeLogs.insert({
+	version: "0.6.8",
+	changes: [
+		"Fixed share dialog not finding user names",
+		"Fixed temporary hitpoint sliders allowing negative values",
+		"Fixed proficiencies not being disabled with their features",
+	],
+});
+
+ChangeLogs.insert({
+	version: "0.7.0",
+	changes: [
+		"Added carry capacity multiplier as a stat with a default value of 1",
+		"Improved loading times by vulcanizing polymer imports",
+	],
+});

rpg-docs/server/migrations/migrations.js

@@ -108,3 +108,45 @@ Migrations.add({
 		);
 	},
 });
+
+Migrations.add({
+	version: 4,
+	name: "Adds an effect to give characters a base carry capacity",
+	up: function() {
+		//update characters
+
+		Characters.find({}).forEach(function(char){
+			Characters.update(char._id, {
+				$set: {
+					carryMultiplier: {
+						adjustment: 0,
+						reset: "longRest",
+					}
+				}
+			});
+			var effect = Effects.findOne({
+				charId: char._id, name: "Natural Carrying Capacity"
+			});
+			if (effect) return;
+			Effects.insert({
+				charId: char._id,
+				name: "Natural Carrying Capacity",
+				stat: "carryMultiplier",
+				operation: "base",
+				value: "1",
+				parent: {
+					id: char._id,
+					collection: "Characters",
+					group: "Inate",
+				},
+			});
+			effect = Effects.findOne({
+				charId: char._id, name: "Natural Carrying Capacity"
+			});
+			if (!effect) throw "Carry capacity effect should be set by now."
+		});
+	},
+	down: function(){
+		return;
+	},
+});