Merge branch 'feature-carry-capacity-modifier'

rpg-docs/.gitignore

@@ -1,5 +1,6 @@
 .meteor/local
 .meteor/meteorite
+settings.json
 public/components
 nohup.out
 dump

rpg-docs/.meteor/packages

@@ -27,3 +27,5 @@ fourseven:scss@2.1.1
 wolves:bourbon
 meteorhacks:subs-manager
 meteorhacks:kadira
+chuangbo:marked
+reywood:iron-router-ga

rpg-docs/.meteor/versions

@@ -14,6 +14,7 @@ blaze-tools@1.0.3
 boilerplate-generator@1.0.3
 callback-hook@1.0.3
 check@1.0.5
+chuangbo:marked@0.3.5
 coffeescript@1.0.6
 dburles:collection-helpers@1.0.3
 dburles:mongo-collection-instances@0.3.3
@@ -70,6 +71,7 @@ reactive-dict@1.1.0
 reactive-var@1.0.5
 reload@1.1.3
 retry@1.0.3
+reywood:iron-router-ga@0.6.0
 routepolicy@1.0.5
 service-configuration@1.0.4
 session@1.1.0

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/Routes/Routes.js

@@ -1,6 +1,7 @@
 Router.configure({
 	loadingTemplate: "loading",
 	layoutTemplate: "layout",
+	trackPageView: true,
 });
 
 Router.plugin("ensureSignedIn", {
@@ -56,6 +57,12 @@ Router.map(function() {
 				document.title = name;
 			}
 		},
+		//analytics
+		trackPageView: false,
+		onRun: function() {
+			window.ga && window.ga("send", "pageview", "/character");
+			this.next();
+		},
 	});
 
 	this.route("loading", {

rpg-docs/client/globalHelpers/GlobalUI.js

@@ -77,10 +77,10 @@ this.GlobalUI = (function() {
 
 	var throttleBack = _.throttle(function() {
 		history.back();
-	}, 800, {trailing: false});
+	}, 100, {trailing: false});
 
 	GlobalUI.closeDetail = function() {
-		if (!!(window.history && window.history.pushState)) {
+		if (window.history && history.pushState && history.state.detail === "opened") {
 			throttleBack();
 		} else {
 			Session.set("global.ui.detailShow", false);

rpg-docs/client/style/main.scss

@@ -29,6 +29,11 @@ core-header-panel[drawer] {
 	box-shadow: 2px 0px 5px 0px rgba(0,0,0,0.2);
 }
 
+//Paragraphs
+p {
+	margin-bottom: 8px;
+}
+
 //Horizontal rule
 hr {
 	background-color: #444;
@@ -37,7 +42,7 @@ hr {
 	color: #444;
 	height: 1px;
 	line-height: 0;
-	margin: 16px -16px;
+	margin: 16px 0;
 	text-align: center;
 }
 

rpg-docs/client/style/tables.scss

@@ -1,8 +1,5 @@
 td {
 	padding: 8px;
-	&:nth-child(1) {
-		min-width: 100px;
-	}
 }
 
 .strengthTable{

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

@@ -44,7 +44,8 @@
 				 label="Value" 
 				 floatinglabel 
 				 value={{effectValue}} 
-				 flex>
+				 flex
+				 style="flex-basis: 100px;">
 	</paper-input>
 </template>
 

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/features/featureDialog/featureDialog.html

@@ -32,7 +32,7 @@
 	{{/if}}
 
 	{{#if description}}
-		<div class="pre-wrap">{{evaluateString charId description}}</div>
+		<div>{{#markdown}}{{evaluateString charId description}}{{/markdown}}</div>
 	{{/if}}
 
 	{{> effectsViewList charId=charId parentId=_id}}

rpg-docs/client/views/character/features/features.html

@@ -102,8 +102,9 @@
 							{{/if}}
 						</div>
 						{{#if description}}
-							<div flex class="bottom text"
+							<div flex class="bottom">
-								 >{{evaluateString charId shortDescription}}</div>
+								{{#markdown}}{{evaluateString charId shortDescription}}{{/markdown}}
+							</div>
 						{{/if}}
 						{{#if hasUses}}
 							<div layout horizontal center end-justified>

rpg-docs/client/views/character/features/features.js

@@ -5,7 +5,7 @@ Template.features.helpers({
 	},
 	shortDescription: function() {
 		if (_.isString(this.description)){
-			return this.description.split(/[\n\r]{3,}/)[0];
+			return this.description.split(/^( *[-*_]){3,} *(?:\n+|$)/m)[0];
 		}
 	},
 	hasUses: function(){

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/inventory/containerDialog/containerDialog.html

@@ -41,6 +41,6 @@
 	</div>
 	{{#if description}}
 		<hr class="vertMargin">
-		<div class="pre-wrap">{{evaluateString charId description}}</div>
+		<div>{{#markdown}}{{evaluateString charId description}}{{/markdown}}</div>
 	{{/if}}
 </template>

rpg-docs/client/views/character/inventory/itemDialog/itemDialog.html

@@ -18,8 +18,8 @@
 		{{#if requiresAttunement}}<div class="vertMargin">Requires Attunement</div>{{/if}}
 	</div>
 	{{#if description}}
-		<hr class="vertMargin">
+		<hr style="margin: 16px 0 16px 0;">
-		<div class="pre-wrap">{{evaluateString charId description}}</div>
+		<div>{{#markdown}}{{evaluateString charId description}}{{/markdown}}</div>
 	{{/if}}
 	{{> effectsViewList charId=charId parentId=_id}}
 	{{> attacksViewList charId=charId parentId=_id}}

rpg-docs/client/views/character/journal/experienceDialog/experienceDialog.html

@@ -6,7 +6,7 @@
 			</div>
 			{{#if description}}
 				<hr class="vertMargin">
-				<div class="pre-wrap">{{description}}</div>
+				<div>{{#markdown}}{{description}}{{/markdown}}</div>
 			{{/if}}
 		{{else}}
 			{{> experienceEdit}}

rpg-docs/client/views/character/journal/journal.html

@@ -87,7 +87,7 @@
 							 layout horizontal center>
 							{{name}}
 						</div>
-						<div class="bottom text">{{description}}</div>
+						<div class="bottom">{{#markdown}}{{description}}{{/markdown}}</div>
 					</paper-shadow>
 				{{/each}}
 			</div>

rpg-docs/client/views/character/journal/noteDialog/noteDialog.html

@@ -1,7 +1,7 @@
 <template name="noteDialog">
 	{{#with note}}
 		{{#baseDialog title=name class=colorClass startEditing=../startEditing}}
-			<div class="pre-wrap">{{description}}</div>
+			<div>{{#markdown}}{{description}}{{/markdown}}</div>
 		{{else}}
 			{{> noteDialogEdit}}
 		{{/baseDialog}}

rpg-docs/client/views/character/persona/backgroundDialog/backgroundDialog.html

@@ -1,6 +1,6 @@
 <template name="backgroundDialog">
 	{{#baseDialog title=title class=colorClass hideColor="true" hideDelete="true"}}
-		<div class="pre-wrap">{{evaluateString charId value}}</div>
+		<div>{{#markdown}}{{evaluateString charId value}}{{/markdown}}</div>
 		{{> proficiencyViewList charId=charId parentId=charId parentGroup="background"}}
 	{{else}}
 		{{> textDialogEdit}}

rpg-docs/client/views/character/persona/persona.html

@@ -68,6 +68,6 @@
               {{title}}
           </div>
 		</div>
-		<div class="bottom text">{{> UI.contentBlock}}</div>
+		<div class="bottom">{{#markdown}}{{> UI.contentBlock}}{{/markdown}}</div>
 	</paper-shadow>
 </template>

rpg-docs/client/views/character/persona/textDialog/textDialog.html

@@ -1,6 +1,6 @@
 <template name="textDialog">
 	{{#baseDialog title=title class=colorClass hideColor="true" hideDelete="true" startEditing=startEditing}}
-		<div class="pre-wrap">{{evaluateString charId value}}</div>
+		<div>{{#markdown}}{{evaluateString charId value}}{{/markdown}}</div>
 	{{else}}
 		{{> textDialogEdit}}
 	{{/baseDialog}}

rpg-docs/client/views/character/spells/spellDialog/spellDialog.html

@@ -34,7 +34,7 @@
 		</div>
 		{{/if}}
 	</div>
-	<div class="pre-wrap">{{evaluateString charId description}}</div>
+	<div>{{#markdown}}{{evaluateString charId description}}{{/markdown}}</div>
 	{{> attacksViewList charId=charId parentId=_id}}
 </template>
 

rpg-docs/client/views/character/spells/spellListDialog/spellListDialog.html

@@ -20,7 +20,7 @@
 					{{/if}}
 				</div>
 				<hr class="vertMargin">
-				<div class="pre-wrap">{{evaluateString charId description}}</div>
+				<div>{{#markdown}}{{evaluateString charId description}}{{/markdown}}</div>
 			</div>
 		{{else}}
 			<!--Name-->

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,27 +2,27 @@
 	<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>
-</template>
+</template>

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

@@ -1,14 +1,14 @@
 <template name="healthCard">
-	<paper-shadow class="card container healthCard" 
+	<paper-shadow class="card container healthCard"
-				  hero-id="main" {{detailHero "hitPoints" _id}} 
+				  hero-id="main" {{detailHero "hitPoints" _id}}
 				  layout horizontal wrap>
-		<div class="green white-text subhead left" 
+		<div class="green white-text subhead left"
 			 hero-id="toolbar" {{detailHero "hitPoints" _id}}
 			 layout vertical center center-justified>
 			<div class="hitPointTitle clickable">Hit Points</div>
-			<paper-icon-button class="white54" 
+			<paper-icon-button class="white54"
-							   id="addTempHP" 
+							   id="addTempHP"
-							   icon="add" 
+							   icon="add"
 							   disabled={{#unless canEditCharacter _id}}true{{/unless}}>
 			</paper-icon-button>
 		</div>
@@ -33,14 +33,14 @@
 							  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}}
 			<div class="caption">
-				{{#if multipliers.immunities.length}} 
+				{{#if multipliers.immunities.length}}
 					<div>
 						Immune:     {{#each multipliers.immunities}}  {{name}} {{/each}}
 					</div>

rpg-docs/client/views/home/intro/intro.html

@@ -45,6 +45,15 @@
 						</div>
 						<div class="bottom text">Lawful Good Human</div>
 					</paper-shadow>
+					<paper-shadow class="card characterCard ssWizard clickable"
+								  z="2">
+						<div class="top subhead deep-purple white-text">
+							<div class="subhead" flex>
+								Starter Set Wizard
+							</div>
+						</div>
+						<div class="bottom text">Chaotic Good High Elf</div>
+					</paper-shadow>
 				</div>
 			</div>
 		</div>

rpg-docs/client/views/home/intro/intro.js

@@ -8,6 +8,9 @@ Template.intro.events({
 	"tap .ssArcher": function() {
 		Router.go("/character/yBWwt5XQTTHZiRQxq");
 	},
+	"tap .ssWizard": function() {
+		Router.go("/character/KxHKskm22fS2Xogah");
+	},
 	"tap .guideButton": function() {
 		Router.go("/guide");
 	},

rpg-docs/client/views/loading/loading.html

@@ -4,6 +4,9 @@
 	</core-toolbar>
     <div fit layout vertical center center-justified>
 		<paper-spinner class="bigSpinner" active></paper-spinner>
-		<div class="subhead">{{randomHint}}</div>
+		<div class="subhead" 
+			 style="margin-left: 16px;
+					margin-right: 16px;
+					text-align: center;">{{randomHint}}</div>
 	</div>
 </template>

rpg-docs/client/views/notFound/notFound.html

@@ -1,10 +1,14 @@
 <template name="notFound">
-	<div layout vertical center center-justified fit>
+	<core-toolbar class="app-grey white-text">
-		<h2>The data for the page you requested could not be found.</h2>
+		<core-icon-button icon="menu" core-drawer-toggle></core-icon-button>
+	</core-toolbar>
+	<div layout vertical center center-justified fit 
+		 style="padding: 16px; text-align: center;">
+		<h2 style="margin-bottom: 12px;">The data for the page you requested could not be found.</h2>
 		{{#if currentUser}}
-			<h2>It might not exist, or you might not have permission to view it.</h2>
+			<h3>It might not exist, or you might not have permission to view it.</h3>
 		{{else}}
-			<h2>Perhaps you need to sign in first:</h2>
+			<h3>Perhaps you need to sign in first:</h3>
 			{{atForm}}
 		{{/if}}
 	</div>

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

@@ -225,6 +225,38 @@ ChangeLogs.insert({
 	changes: [
 		"Net worth now takes container values into account",
 		"Added support for character pictures",
-		"Disabled edit buttons for reada-only viewers",
+		"Disabled edit buttons for read-only viewers",
+	],
+});
+
+ChangeLogs.insert({
+	version: "0.6.6",
+	changes: [
+		"Text fields now accept github-flavor markdown formatting",
+	],
+});
+
+ChangeLogs.insert({
+	version: "0.6.7",
+	changes: [
+		"Fixed effect values not being visible on small screens",
+		"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;
+	},
+});