Bumped version

Spell child attacks now set their enabled state to match the parent spell prepared state

README.md

@@ -1,58 +1,4 @@
-TODO
-====
+RPG Docs
+========
 
-* Get Polymer installed using bower.
-* Install Vulcanize package listed below
-* Copy the differential polymer demo to get polymer implemented nicely
-* Update Meteor
-* Install and use LESS
-
-Packages used
-=============
-
-* meteor-platform  
-    * Base Meteor. 
-    * [Docs](http://docs.meteor.com/#/full/)
-* autopublish
-    * Publishes everything to the client. 
-    * Must be removed before release
-* insecure
-    * Allows the client the freedom to modify any colleciton.
-    * Must be removed before release
-* iron:router
-    * Enables pagination and URL's to direct to specific templates.
-    * [Tutorial](http://www.manuel-schoebel.com/blog/iron-router-tutorial)
-* accounts-password
-    * Lets users create accounts with a simple password
-* accounts-ui
-    * Adds simple UI for logging in
-* random
-    * Somewhat decent cryptographically strong psuedo random number generation.
-    * [readme](https://atmospherejs.com/meteor/random)
-* dburles:collection-helpers
-    * Adds template-style helpers to collections. [github page](https://github.com/dburles/meteor-collection-helpers)
-* reactive-var
-    * Friendly reactive variables
-    * [Meteor Docs](http://docs.meteor.com/#/full/reactivevar_pkg)
-* cw4gn3r:jquery-event-drag
-    * Adds jquery drag events
-* underscore
-    * Handy javascript utilities
-    * [Docs](http://underscorejs.org/)
-* aldeed:collection2
-    * Extends collections with Schemas 
-    * [(gitHub page)](https://github.com/aldeed/meteor-collection2) 
-    * uses [SimpleSchema](https://github.com/aldeed/meteor-simple-schema)
-* aldeed:autoform
-    * Automatically generates bootstrap forms for collection2 Schemas.
-    * [github](https://github.com/aldeed/meteor-autoform)
-* differential:vulcanize
-	* Bakes all the polymer imports into one file
-	* [github](https://github.com/Differential/meteor-vulcanize)
-
-************
-
-Resources
-=========
-
-[differential's polymer demo](https://github.com/Differential/polymer-demo)
+This is the repo for [DiceCloud](dicecloud.com). The currently deployed version should always be the head of the master branch.

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

@@ -69,5 +69,17 @@ Attacks.attachSchema(Schemas.Attack);
 Attacks.attachBehaviour("softRemovable");
 makeChild(Attacks, ["name", "enabled"]); //children of lots of things
 
+Attacks.after.insert(function (userId, attack) {
+	//Check to see if this attack's parent is a spell, if so, mirror prepared state to enabled
+	if (attack.parent.collection === "Spells") {
+		var parentSpell = Spells.findOne(attack.parent.id);
+		if (parentSpell.prepared === "unprepared") {
+			Attacks.update(attack._id, {$set: {enabled: false}});
+		} else if (parentSpell.prepared === "prepared" || "always") {
+			Attacks.update(attack._id, {$set: {enabled: true}});
+		}
+	}
+});
+
 Attacks.allow(CHARACTER_SUBSCHEMA_ALLOW);
 Attacks.deny(CHARACTER_SUBSCHEMA_DENY);

rpg-docs/Model/Character/Characters.js

@@ -7,6 +7,7 @@ Schemas.Character = new SimpleSchema({
 	alignment:    {type: String, defaultValue: "", trim: false, optional: true},
 	gender:       {type: String, defaultValue: "", trim: false, optional: true},
 	race:         {type: String, defaultValue: "", trim: false, optional: true},
+	picture:      {type: String, defaultValue: "", trim: true,  optional: true},
 	description:  {type: String, defaultValue: "", trim: false, optional: true},
 	personality:  {type: String, defaultValue: "", trim: false, optional: true},
 	ideals:       {type: String, defaultValue: "", trim: false, optional: true},
@@ -32,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},
@@ -345,8 +347,8 @@ Characters.calculate = {
 		var value;
 		var add = 0;
 		var mul = 1;
-		var min = Math.NEGATIVE_INFINITY;
-		var max = Math.POSITIVE_INFINITY;
+		var min = Number.NEGATIVE_INFINITY;
+		var max = Number.POSITIVE_INFINITY;
 
 		Effects.find({
 			charId: charId,

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

@@ -62,6 +62,23 @@ Spells.attachSchema(Schemas.Spell);
 
 Spells.attachBehaviour("softRemovable");
 makeChild(Spells); //children of spell lists
+makeParent(Spells, ["name", "enabled"]); //parents of attacks
+
+Spells.after.update(function (userId, spell, fieldNames) {
+	//Update prepared state of spell and child attacks to be enabled or not
+	if (_.contains(fieldNames, "prepared")) {
+		var childAttacks = Attacks.find({"parent.id": spell._id}).fetch();
+		if (spell.prepared === "unprepared") {
+			_.each(childAttacks, function(attack){
+				Attacks.update(attack._id, {$set: {enabled: false}});
+			});
+		} else if (spell.prepared === "prepared" || "always") {
+			_.each(childAttacks, function(attack){
+				Attacks.update(attack._id, {$set: {enabled: true}});
+			});
+		}
+	}
+});
 
 Spells.allow(CHARACTER_SUBSCHEMA_ALLOW);
 Spells.deny(CHARACTER_SUBSCHEMA_DENY);

rpg-docs/Model/Character/TemporaryHitPoints.js

@@ -3,9 +3,9 @@ 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},
-	used:        {type: Number, defaultValue: 0},
-	deleteOnZero:{type: Boolean, defaultValue: true},
+	maximum:     {type: Number, defaultValue: 0, min: 0, max: 500},
+	used:        {type: Number, defaultValue: 0, min: 0, max: 500},
+	deleteOnZero:{type: Boolean, defaultValue: false},
 	dateAdded:   {
 		type: Date,
 		autoValue: function() {

rpg-docs/Routes/Routes.js

@@ -1,6 +1,7 @@
 Router.configure({
 	loadingTemplate: "loading",
 	layoutTemplate: "layout",
+	trackPageView: true,
 });
 
 Router.plugin("ensureSignedIn", {
@@ -27,7 +28,7 @@ Router.map(function() {
 		},
 		data: {
 			characters: function(){
-				return Characters.find({}, {fields: {_id: 1}});
+				return Characters.find({}, {fields: {_id: 1}, sort: {name: 1}});
 			}
 		},
 		onAfterAction: function() {
@@ -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/globalHelpers/canEditCharacter.js

@@ -1,6 +1,10 @@
 Template.registerHelper("canEditCharacter", function(charId) {
+	return canEditCharacter(charId);
+});
+
+canEditCharacter = function(charId) {
 	var char = Characters.findOne(charId)
 	var userId = Meteor.userId();
 	return char.owner === userId ||
 		_.contains(char.writers, userId);
-});
+};

rpg-docs/client/style/cards.scss

@@ -3,17 +3,24 @@
 $thickColumnWidth: 304px;
 $thinColumnWidth: 240px;
 
-//Column layouts of cards
+//Column layout
 .column-container {
 	@include column-fill(balance);
-	@include column-gap(8px);
+	@include column-gap(0px);
 	@include column-width($thickColumnWidth);
-	padding: 8px;
+	padding: 4px;
 
 	&.thin-columns {
 		@include column-count(4);
 		@include column-width($thinColumnWidth);
 	}
+	& > div {
+		padding: 4px;
+		//stop divs breaking over multiple columns
+		-webkit-column-break-inside: avoid;
+		page-break-inside: avoid;
+		break-inside: avoid;
+	}
 }
 
 //Cards
@@ -21,20 +28,6 @@ $thinColumnWidth: 240px;
 	background: white;
 	border-radius: 2px;
 
-	.column-container & {
-		margin-bottom: 8px;
-		width: 100%;
-		//hack to stop flickering
-		-webkit-backface-visibility: hidden;
-		-webkit-transform: translateX(0);
-		//stop breaking over column divide
-		-webkit-column-break-inside: avoid;
-		page-break-inside: avoid;
-		break-inside: avoid;
-		//Fixes extra margin at top of columns
-		display: inline-block;
-	}
-
 	.top {
 		cursor: pointer;
 		padding: 16px;

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/attacks/attackEdit/attackEdit.html

@@ -3,26 +3,26 @@
 		<div layout vertical flex>
 			<div layout horizontal>
 				<!--attackBonus-->
-				<paper-input id="attackBonusInput" 
+				<paper-input class="attackBonusInput" 
 							 label="Attack Bonus"
 							 floatinglabel
 							 value={{attackBonus}}
 							 flex></paper-input>
 				<!--details-->
-				<paper-input id="detailInput"
+				<paper-input class="detailInput"
 							 label="Details"
 							 floatinglabel
 							 value={{details}}></paper-input>
 			</div>
 			<div layout horizontal>
 				<!--damageBonus-->
-				<paper-input id="damageInput"
+				<paper-input class="damageInput"
 							 label="Damage"
 							 floatinglabel
 							 value={{damage}}
 							 flex></paper-input>
 				<!--DamageType-->
-				<paper-dropdown-menu id="damageTypeDropdown" label="Damage Type">
+				<paper-dropdown-menu class="damageTypeDropdown" label="Damage Type">
 					<paper-dropdown layered class="dropdown">
 						<core-menu class="menu"  selected={{damageType}}>
 							{{#each damageTypes}}
@@ -34,6 +34,6 @@
 			</div>
 		</div>
 		<!--Delete Button-->
-		<paper-icon-button id="deleteAttack" role="button" tabindex="0" icon="delete" aria-label="Delete"></paper-icon-button>
+		<paper-icon-button class="deleteAttack" role="button" tabindex="0" icon="delete" aria-label="Delete"></paper-icon-button>
 	</div>
 </template>

rpg-docs/client/views/character/attacks/attackEdit/attackEdit.js

@@ -15,23 +15,23 @@ var damageTypes = [
 ];
 
 Template.attackEdit.events({
-	"tap #deleteAttack": function(event, instance) {
+	"tap .deleteAttack": function(event, instance) {
 		Attacks.softRemoveNode(this._id);
 		GlobalUI.deletedToast(this._id, "Attacks", "Attack");
 	},
-	"change #attackBonusInput": function(event) {
+	"change .attackBonusInput": function(event) {
 		var value = event.currentTarget.value;
 		Attacks.update(this._id, {$set: {attackBonus: value}});
 	},
-	"change #damageInput": function(event) {
+	"change .damageInput": function(event) {
 		var value = event.currentTarget.value;
 		Attacks.update(this._id, {$set: {damage: value}});
 	},
-	"change #detailInput": function(event) {
+	"change .detailInput": function(event) {
 		var value = event.currentTarget.value;
 		Attacks.update(this._id, {$set: {details: value}});
 	},
-	"core-select #damageTypeDropdown": function(event) {
+	"core-select .damageTypeDropdown": function(event) {
 		var detail = event.originalEvent.detail;
 		if (!detail.isSelected) return;
 		var value = detail.item.getAttribute("name");

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/effects/effectView/effectView.js

@@ -42,6 +42,7 @@ var stats = {
 	"rageDamage":{"name":"Rage Damage"},
 	"expertiseDice":{"name":"Expertise Dice"},
 	"superiorityDice":{"name":"Superiority Dice"},
+	"carryMultiplier": {"name": "Carry Capacity Multiplier"},
 	"level1SpellSlots":{"name":"level 1 Spell Slots"},
 	"level2SpellSlots":{"name":"level 2 Spell Slots"},
 	"level3SpellSlots":{"name":"level 3 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

@@ -12,8 +12,9 @@
 				{{>resource name="sorceryPoints" title="Sorcery Points" color="teal" char=this}}
 				<!--superiorityDice-->
 				{{>resource name="superiorityDice" title="Superiority Dice" color="teal" char=this}}
-				
+
 				<!--Attacks-->
+				<div>
 				<paper-shadow class="card">
 					<div class="top white">
 						Attacks
@@ -48,8 +49,10 @@
 						{{/each}}
 					</div>
 				</paper-shadow>
+				</div>
 
 				<!--Proficiencies-->
+				<div>
 				<paper-shadow class="card">
 					<div class="white top">
 						Proficiencies
@@ -75,13 +78,15 @@
 						{{/each}}
 					</div>
 				</paper-shadow>
+				</div>
 
 				<!--features-->
 				{{#each features}}
+					<div>
 					<paper-shadow class="card featureCard"
 								  hero-id="main" {{detailHero}}>
-						<div class="top {{colorClass}} subhead" 
-							 layout horizontal 
+						<div class="top {{colorClass}} subhead"
+							 layout horizontal
 							 hero-id="toolbar" {{detailHero}}>
 							<div flex hero-id="title" {{detailHero}}>
 								{{name}}
@@ -94,41 +99,44 @@
 							{{#if canEnable}}
 								<core-tooltip label="Feature enabled"
 											  position="left">
-									<paper-checkbox class="enabledCheckbox" 
-													checked={{enabled}}>
+									<paper-checkbox class="enabledCheckbox"
+													checked={{enabled}}
+													disabled={{#unless canEditCharacter charId}}true{{/unless}}>
 									</paper-checkbox>
 								</core-tooltip>
 							{{/if}}
 						</div>
 						{{#if description}}
-							<div flex class="bottom text"
-								 >{{evaluateString charId description}}</div>
+							<div flex class="bottom">
+								{{#markdown}}{{evaluateString charId shortDescription}}{{/markdown}}
+							</div>
 						{{/if}}
 						{{#if hasUses}}
 							<div layout horizontal center end-justified>
-								<paper-button class="useFeature" 
+								<paper-button class="useFeature"
 											  disabled={{noUsesLeft}}>
 									Use
 								</paper-button>
-								<paper-button class="resetFeature" 
+								<paper-button class="resetFeature"
 											  disabled={{usesFull}}>
 									Reset
 								</paper-button>
 							</div>
 						{{/if}}
 					</paper-shadow>
+					</div>
 				{{/each}}
 			</div>
 			<div class="fab-buffer"></div>
 		</div>
 		{{#if canEditCharacter _id}}
-			<paper-fab id="addFeature" 
-					   class="floatyButton" 
-					   icon="add" 
-					   title="Add" 
-					   role="button" 
-					   tabindex="0" 
-					   aria-label="Add" 
+			<paper-fab id="addFeature"
+					   class="floatyButton"
+					   icon="add"
+					   title="Add"
+					   role="button"
+					   tabindex="0"
+					   aria-label="Add"
 					   hero-id="main"></paper-fab>
 		{{/if}}
 	</div>
@@ -136,15 +144,16 @@
 
 <template name="resource">
 	{{#if characterCalculate "attributeBase" char._id name}}
-		<paper-shadow class="card" 
+	<div>
+		<paper-shadow class="card"
 					  hero-id="main" {{detailHero name char._id}}
 					  layout horizontal>
-			<div class="left {{getColor}} display1 white-text" 
+			<div class="left {{getColor}} display1 white-text"
 				 hero-id="toolbar" {{detailHero name char._id}}
 				 layout horizontal center>
 				<div style="margin-right: 8px;">
-					<paper-icon-button class="resourceUp" 
-									   icon="arrow-drop-up" 
+					<paper-icon-button class="resourceUp"
+									   icon="arrow-drop-up"
 									   disabled={{cantIncrement}}>
 					</paper-icon-button>
 					<paper-icon-button class="resourceDown"
@@ -155,10 +164,11 @@
 				<div>{{characterCalculate "attributeValue" char._id name}}</div>
 				<!--<div>/{{char.attributeBase name}}</div>-->
 			</div>
-			<div class="right clickable" 
+			<div class="right clickable"
 				 flex layout horizontal center>
 				{{title}}
 			</div>
 		</paper-shadow>
+	</div>
 	{{/if}}
 </template>

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

@@ -3,14 +3,19 @@ Template.features.helpers({
 		var features = Features.find({charId: this._id}, {sort: {color: 1, name: 1}});
 		return features;
 	},
+	shortDescription: function() {
+		if (_.isString(this.description)){
+			return this.description.split(/^( *[-*_]){3,} *(?:\n+|$)/m)[0];
+		}
+	},
 	hasUses: function(){
 		return this.usesValue() > 0;
 	},
 	noUsesLeft: function(){
-		return this.usesLeft() <= 0;
+		return this.usesLeft() <= 0 || !canEditCharacter(this.charId);
 	},
 	usesFull: function(){
-		return this.usesLeft() >= this.usesValue();
+		return this.usesLeft() >= this.usesValue() || !canEditCharacter(this.charId);
 	},
 	colorClass: function(){
 		return getColorClass(this.color);
@@ -99,15 +104,16 @@ Template.resource.helpers({
 		var value = Characters.calculate.attributeValue(this.char._id, this.name);
 		var base = Characters.calculate.attributeBase(this.char._id, this.name);
 		var baseBigger = value < base;
-		return !baseBigger;
+		return !baseBigger || !canEditCharacter(this.char._id);
 	},
 	cantDecrement: function(){
 		var value = Characters.calculate.attributeValue(this.char._id, this.name);
 		var valuePositive = value > 0;
-		return !valuePositive;
+		return !valuePositive || !canEditCharacter(this.char._id);
 	},
 	getColor: function(){
-		if (this.char.attributeValue(this.name) > 0){
+		var value = Characters.calculate.attributeValue(this.char._id, this.name);
+		if (value > 0){
 			return this.color;
 		} else {
 			return "grey";

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

@@ -3,6 +3,7 @@
 		<div id="inventory" class="scroll-y" fit>
 			<div class="column-container">
 				<!--Net Worth-->
+				<div>
 				<paper-shadow class="card">
 					<div class="white top" layout horizontal center>
 						<div class="subhead" flex>
@@ -13,7 +14,9 @@
 						</div>
 					</div>
 				</paper-shadow>
+				</div>
 				<!--Weight Carried-->
+				<div>
 				<paper-shadow class="card"
 							  hero-id="main" {{detailHero "weightCarried" _id}}>
 					<div class="top green white-text weightCarried"
@@ -35,8 +38,7 @@
 						<div class="item-slot">
 							<div class="item buff"
 								 hero-id="main" {{detailHero}}
-								 layout horizontal center
-								 draggable="true">
+								 layout horizontal center>
 								<div flex>
 									<core-icon icon="work"
 											   style="margin-right: 16px">
@@ -49,7 +51,9 @@
 					</div>
 					{{/if}}
 				</paper-shadow>
+				</div>
 				<!--Equipment-->
+				<div>
 				<paper-shadow class="card equipmentContainer">
 					<div class="white top" layout horizontal center>
 						<div class="subhead" flex>
@@ -77,7 +81,9 @@
 						{{/each}}
 					</div>
 				</paper-shadow>
+				</div>
 				<!--Carried Items-->
+				<div>
 				<paper-shadow class="card carriedContainer">
 					<div class="white top" layout horizontal center>
 						<div class="subhead" flex>
@@ -96,8 +102,10 @@
 						{{/each}}
 					</div>
 				</paper-shadow>
+				</div>
 				{{#each containers}}
-					<paper-shadow class="card itemContainer" 
+					<div>
+					<paper-shadow class="card itemContainer"
 								  hero-id="main" {{detailHero}}>
 						<div class="top {{colorClass}}"
 							 hero-id="toolbar" {{detailHero}}
@@ -114,6 +122,7 @@
 							</div>
 							<core-tooltip label="Container carried" position="left">
 								<paper-checkbox class="carriedCheckbox"
+												disabled={{#unless canEditCharacter charId}}true{{/unless}}
 												checked={{isCarried}}>
 								</paper-checkbox>
 							</core-tooltip>
@@ -124,6 +133,7 @@
 							{{/each}}
 						</div>
 					</paper-shadow>
+					</div>
 				{{/each}}
 			</div>
 			<div class="fab-buffer"></div>
@@ -152,11 +162,11 @@
 		<div class="item {{hidden}} inventoryItem"
 					hero-id="main" {{detailHero}}
 					layout horizontal center
-					draggable="true">
+			 		draggable={{canEditCharacter charId}}>
 			<div flex class="itemName">
 				{{#if ne1 quantity}}{{quantity}}&nbsp;{{/if}}{{pluralName}}
 			</div>
-			{{#if settings.showIncrement}}
+			{{#if settings.showIncrement}}{{#if canEditCharacter charId}}
 			<div class="incrementButtons">
 				<paper-icon-button class="addItemQuantity"
 								   icon="add"
@@ -166,7 +176,7 @@
 								   icon="remove"
 								   style="margin-right: -8px"></paper-icon-button>
 			</div>
-			{{/if}}
+			{{/if}}{{/if}}
 		</div>
 	</div>
 </template>

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

@@ -44,6 +44,12 @@ Template.inventory.helpers({
 		).forEach(function(item){
 			worth += item.totalValue();
 		});
+		Containers.find(
+			{charId: this._id},
+			{fields: {value : 1}}
+		).forEach(function(container) {
+			if (container.value) worth += container.value;
+		});
 		return worth;
 	},
 	weightCarried: function(){

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">
-		<div class="pre-wrap">{{evaluateString charId description}}</div>
+		<hr style="margin: 16px 0 16px 0;">
+		<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

@@ -3,14 +3,15 @@
 		<div id="journal" class="scroll-y" fit>
 			<div class="column-container">
 				<!--Experience Table-->
-				<paper-shadow class="card experiencesCard"
+				<div><paper-shadow class="card experiencesCard"
 							  hero-id="main" {{detailHero}}>
 					<div class="top white subhead"
 						 hero-id="toolbar" {{detailHero}}
 						 layout horizontal center>
 						<div flex>Experience</div>
 						<div >{{characterCalculate "experience" _id}} XP</div>
-						<paper-icon-button class="black54" id="addXP" icon="add"></paper-icon-button>
+						<paper-icon-button class="black54" id="addXP" icon="add"
+										   disabled={{#unless canEditCharacter _id}}true{{/unless}}></paper-icon-button>
 					</div>
 					<div class="bottom list">
 						{{#each experiences}}
@@ -36,9 +37,9 @@
 							</paper-button>
 						</div>
 					{{/if}}
-				</paper-shadow>
+				</paper-shadow></div>
 				<!--Class Table-->
-				<paper-shadow class="card"
+				<div><paper-shadow class="card"
 							  hero-id="main" {{detailHero}}>
 					<div class="white top"
 						 hero-id="toolbar" {{detailHero}}
@@ -55,7 +56,8 @@
 						</div>
 						<paper-icon-button class="black54"
 										   id="addClassButton"
-										   icon="add">
+										   icon="add"
+										   disabled={{#unless canEditCharacter _id}}true{{/unless}}>
 						</paper-icon-button>
 					</div>
 					<div class="bottom list">
@@ -76,29 +78,31 @@
 							</div>
 						{{/each}}
 					</div>
-				</paper-shadow>
+				</paper-shadow></div>
 				<!--Notes-->
 				{{#each notes}}
+				<div>
 					<paper-shadow class="card"  hero-id="main" {{detailHero}}>
 						<div class="top {{colorClass}} noteTop subhead"
 							 hero-id="toolbar" {{detailHero}}
 							 layout horizontal center>
 							{{name}}
 						</div>
-						<div class="bottom text">{{description}}</div>
+						<div class="bottom">{{#markdown}}{{description}}{{/markdown}}</div>
 					</paper-shadow>
+				</div>
 				{{/each}}
 			</div>
 			<div class="fab-buffer"></div>
 		</div>
 	</div>
 	{{#if canEditCharacter _id}}
-	<paper-fab id="addNote" 
-				   class="floatyButton" 
-				   icon="add" 
-				   title="Add" 
-				   role="button" 
-				   tabindex="0" 
+	<paper-fab id="addNote"
+				   class="floatyButton"
+				   icon="add"
+				   title="Add"
+				   role="button"
+				   tabindex="0"
 				   hero-id="main"></paper-fab>
 	{{/if}}
-</template>
+</template>

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" startEditing=startEditing}}
-		<div class="pre-wrap">{{evaluateString charId value}}</div>
+	{{#baseDialog title=title class=colorClass hideColor="true" hideDelete="true"}}
+		<div>{{#markdown}}{{evaluateString charId value}}{{/markdown}}</div>
 		{{> proficiencyViewList charId=charId parentId=charId parentGroup="background"}}
 	{{else}}
 		{{> textDialogEdit}}

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

@@ -1,18 +1,36 @@
 <template name="personaDetailsDialog">
 	{{#baseDialog title=name class="deep-purple white-text" hideColor="true" hideDelete="true" startEditing=startEditing}}
-		{{alignment}} {{gender}} {{race}}
+		{{#with char}}
+			<div>{{alignment}} {{gender}} {{race}}</div>
+			<core-image style="width: 350px; height: 350px; margin-top: 8px;"
+				sizing="cover"
+				hero-id="image" hero
+				src={{picture}}></core-image>
+		{{/with}}
 	{{else}}
-		{{> personaDetailsEdit}}
+		{{#with char}}
+			{{> personaDetailsEdit}}
+		{{/with}}
 	{{/baseDialog}}
 </template>
 
 <template name="personaDetailsEdit">
-	<!--Name-->
-	<paper-input id="nameInput" label="Name" floatinglabel value={{name}}></paper-input><br>
-	<!--Alignment-->
-	<paper-input id="alignmentInput" label="Alignment" floatinglabel value={{alignment}}></paper-input><br>
-	<!--Gender-->
-	<paper-input id="genderInput" label="Gender" floatinglabel value={{gender}}></paper-input><br>
-	<!--Race-->
-	<paper-input id="raceInput" label="Race" floatinglabel value={{race}}></paper-input><br>
+	<div layout horizontal center-justified>
+		<div flex style="max-width: 350px;" layout vertical>
+			<!--Name-->
+			<paper-input id="nameInput" label="Name" floatinglabel value={{name}}></paper-input>
+			<!--Alignment-->
+			<paper-input id="alignmentInput" label="Alignment" floatinglabel value={{alignment}}></paper-input>
+			<!--Gender-->
+			<paper-input id="genderInput" label="Gender" floatinglabel value={{gender}}></paper-input>
+			<!--Race-->
+			<paper-input id="raceInput" label="Race" floatinglabel value={{race}}></paper-input>
+			<!--Picture-->
+			<paper-input id="pictureInput" label="Picture URL" floatinglabel value={{picture}}></paper-input>
+			<core-image style="height:350px; width: 100%; margin-top: 8px;"
+						sizing="cover"
+						hero-id="image" hero
+						src={{picture}}></core-image>
+		</div>
+	</div>
 </template>

rpg-docs/client/views/character/persona/peronaDetailsDialog/personaDetailsDialog.js

@@ -2,21 +2,34 @@ Template.personaDetailsEdit.onRendered(function(){
 	updatePolymerInputs(this);
 });
 
+Template.personaDetailsDialog.helpers({
+	char: function() {
+		return Characters.findOne(
+			this._id,
+			{fields: {name: 1, alignment: 1, gender: 1, race: 1, picture: 1}}
+		);
+	}
+});
+
 Template.personaDetailsEdit.events({
 	"change #nameInput": function(event){
 		var input = event.currentTarget.value;
-		Characters.update(this.charId, {$set: {name: input}});
+		Characters.update(this._id, {$set: {name: input}});
 	},
 	"change #alignmentInput": function(event){
 		var input = event.currentTarget.value;
-		Characters.update(this.charId, {$set: {alignment: input}});
+		Characters.update(this._id, {$set: {alignment: input}});
 	},
 	"change #genderInput": function(event){
 		var input = event.currentTarget.value;
-		Characters.update(this.charId, {$set: {gender: input}});
+		Characters.update(this._id, {$set: {gender: input}});
 	},
 	"change #raceInput": function(event){
 		var input = event.currentTarget.value;
-		Characters.update(this.charId, {$set: {race: input}});
+		Characters.update(this._id, {$set: {race: input}});
+	},
+	"change #pictureInput": function(event){
+		var input = event.currentTarget.value;
+		Characters.update(this._id, {$set: {picture: input}});
 	},
 });

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

@@ -3,14 +3,45 @@
 		<div id="persona" class="scroll-y" fit>
 			<div class="column-container">
 				{{#with characterDetails}}
-					{{#containerCardHelper this}}{{alignment}} {{gender}} {{race}}{{/containerCardHelper}}
+				<div>
+					<paper-shadow class="card"
+								  hero-id="main" {{detailHero "details" _id}}>
+						{{#unless picture}}
+							<div class="top subhead characterField {{colorClass}}"
+								 hero-id="toolbar" {{detailHero "details" _id}}>
+								<div class="subhead" flex
+									 hero-id="title" {{detailHero "details" _id}}>
+									{{name}}
+								</div>
+							</div>
+						{{else}}
+							<core-image class="characterField clickable"
+										style="height:350px; width: 100%;
+											   background-color: #e8e8e8;"
+										sizing="cover"
+										hero-id="image" {{detailHero "details" _id}}
+										src={{picture}}></core-image>
+						{{/unless}}
+						<div class="bottom">
+							{{#if picture}}
+								<div class="title" hero-id="title" {{detailHero "details" _id}}>
+									{{name}}
+								</div>
+							{{/if}}
+							<div class="subhead">
+								{{alignment}} {{gender}} {{race}}
+							</div>
+						</div>
+					</paper-shadow>
+				</div>
 				{{/with}}
-				{{> containerCard characterField "description" "Description"}}
-				{{> containerCard characterField "personality" "Personality Traits"}}
-				{{> containerCard characterField "ideals" "Ideals"}}
-				{{> containerCard characterField "bonds" "Bonds"}}
-				{{> containerCard characterField "flaws" "Flaws"}}
-				{{> containerCard characterField "backstory" "Background"}}
+				<div>{{> containerCard characterField "description" "Description"}}</div>
+				<div>{{> containerCard characterField "personality" "Personality Traits"}}</div>
+				<div>{{> containerCard characterField "ideals" "Ideals"}}</div>
+				<div>{{> containerCard characterField "bonds" "Bonds"}}</div>
+				<div>{{> containerCard characterField "flaws" "Flaws"}}</div>
+				<div>{{> containerCard characterField "backstory" "Background"}}</div>
+				<div>
 				<paper-shadow class="card">
                     <div class="white top subhead">
                       Languages
@@ -21,6 +52,7 @@
 						{{/each}}
 					</div>
 				</paper-shadow>
+				</div>
 			</div>
 		</div>
 	</div>
@@ -40,6 +72,6 @@
               {{title}}
           </div>
 		</div>
-		<div class="bottom text">{{> UI.contentBlock}}</div>
+		<div class="bottom">{{#markdown}}{{> UI.contentBlock}}{{/markdown}}</div>
 	</paper-shadow>
-</template>
+</template>

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

@@ -11,12 +11,12 @@ Template.persona.helpers({
 	characterDetails: function(){
 		var char = Characters.findOne(
 			this._id,
-			{fields: {name: 1, gender: 1, alignment: 1, race:1}}
+			{fields: {name: 1, gender: 1, alignment: 1, race:1, picture: 1}}
 		);
 		char.field = "details";
 		char.title = char.name;
 		char.color = "d";
-		char.topClass = "characterField";
+		char.startEditing = true;
 		return char;
 	},
 	characterField: function(field, title){
@@ -40,7 +40,7 @@ Template.persona.helpers({
 
 Template.persona.events({
 	"tap .characterField": function(event){
-		if (this.field === "details"){
+		if (this.field == "details"){
 			this.charId = Template.parentData()._id;
 			GlobalUI.setDetail({
 				template: "personaDetailsDialog",
@@ -58,6 +58,7 @@ Template.persona.events({
 					field: this.field,
 					title: this.title,
 					color: this.color,
+					startEditing: true,
 				},
 				heroId:   this._id + this.field,
 			});

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/spells/spells.html

@@ -1,7 +1,7 @@
 <template name="spells">
 	<div fit>
 		<div id="spells" class="scroll-y" fit>
-			<div style="padding: 4px;" 
+			<div style="padding: 4px;"
 				 layout horizontal start wrap>
 				{{#if hasSlots}}
 					<paper-shadow class="card"
@@ -72,6 +72,7 @@
 								<core-tooltip label="Change prepared spells"
 											  position="left">
 									<paper-icon-button class="prepSpells"
+													   disabled={{#unless canEditCharacter charId}}true{{/unless}}
 													   icon="book">
 									</paper-icon-button>
 								</core-tooltip>
@@ -91,7 +92,7 @@
 												<div class="tall spell item"
 													 hero-id="main" {{detailHero}}
 													 layout horizontal center>
-													<core-icon icon="social:whatshot" 
+													<core-icon icon="social:whatshot"
 															   style="color: {{hexColor color}};
 																	  margin-right: 16px;"
 															   ></core-icon>
@@ -143,4 +144,4 @@
 			</core-tooltip>
 		{{/fabMenu}}
 	{{/if}}
-</template>
+</template>

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

@@ -112,7 +112,7 @@ Template.spells.helpers({
 		for (i = 0; i < currentSlots; i++){
 			bubbles.push({
 				icon: "radio-button-on",
-				disabled: i !== currentSlots - 1, //last full slot not disabled
+				disabled: i !== currentSlots - 1 || !canEditCharacter(char._id), //last full slot not disabled
 				attribute: "level" + this.level + "SpellSlots",
 				charId: char._id,
 			});
@@ -120,7 +120,7 @@ Template.spells.helpers({
 		for (i = 0; i < slotsUsed; i++){
 			bubbles.push({
 				icon: "radio-button-off",
-				disabled: i !== 0, //first empty slot not disabled
+				disabled: i !== 0 || !canEditCharacter(char._id), //first empty slot not disabled
 				attribute: "level" + this.level + "SpellSlots",
 				charId: char._id,
 			});

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

@@ -1,5 +1,6 @@
 <template name="abilityMiniCard">
-	<paper-shadow class="card abilityMiniCard clickable" 
+	<div>
+	<paper-shadow class="card abilityMiniCard clickable"
 				  hero-id="main" {{detailHero ability ../_id}}
 				  layout horizontal>
 		<div class="left white-text {{color}}"
@@ -11,4 +12,5 @@
 			{{title}}
 		</div>
 	</paper-shadow>
+	</div>
 </template>

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,12 +1,16 @@
 <template name="healthCard">
-	<paper-shadow class="card container healthCard" 
-				  hero-id="main" {{detailHero "hitPoints" _id}} 
+	<paper-shadow class="card container healthCard"
+				  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" id="addTempHP" icon="add"></paper-icon-button>
+			<paper-icon-button class="white54"
+							   id="addTempHP"
+							   icon="add"
+							   disabled={{#unless canEditCharacter _id}}true{{/unless}}>
+			</paper-icon-button>
 		</div>
 		<div class="right" flex layout vertical center-justified style="min-width: 180px;">
 			<div layout horizontal>
@@ -14,6 +18,7 @@
 								   value={{characterCalculate "attributeValue" _id "hitPoints"}}
 								   max={{characterCalculate "attributeBase" _id "hitPoints"}}
 								   editable pin
+								   disabled={{#unless canEditCharacter _id}}true{{/unless}}
 								   role="slider">
 				</paper-diff-slider>
 			</div>
@@ -28,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/character/stats/hitDice/hitDice.html

@@ -1,14 +1,15 @@
 <template name="hitDice">
 	{{#if characterCalculate "attributeBase" ../_id name}}
-		<paper-shadow class="card hit-dice" hero-id="main" 
-					  {{detailHero name ../_id}} 
+		<div>
+		<paper-shadow class="card hit-dice" hero-id="main"
+					  {{detailHero name ../_id}}
 					  layout horizontal>
-			<div class="left green display1 white-text" 
+			<div class="left green display1 white-text"
 				 hero-id="toolbar" {{detailHero name ../_id}}
 				 layout horizontal>
 				<div>
-					<paper-icon-button class="resourceUp" 
-									   icon="arrow-drop-up" 
+					<paper-icon-button class="resourceUp"
+									   icon="arrow-drop-up"
 									   disabled={{cantIncrement}}>
 					</paper-icon-button>
 					<paper-icon-button class="resourceDown"
@@ -21,7 +22,7 @@
 						{{characterCalculate "attributeValue" ../_id name}}
 					</div>
 					<div class="title white-text">
-						d{{diceNum}} {{characterCalculate "abilityMod" ../_id "constitution"}}
+						d{{diceNum}} {{conMod}}
 					</div>
 				</div>
 			</div>
@@ -29,5 +30,6 @@
 				Hit Dice
 			</div>
 		</paper-shadow>
+		</div>
 	{{/if}}
 </template>

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

@@ -2,11 +2,16 @@ Template.hitDice.helpers({
 	cantIncrement: function(){
 		var value = Characters.calculate.attributeValue(this.char._id, this.name);
 		var base = Characters.calculate.attributeBase(this.char._id, this.name);
-		return value >= base;
+		return value >= base || !canEditCharacter(this.char._id);
 	},
 	cantDecrement: function(){
 		var value = Characters.calculate.attributeValue(this.char._id, this.name);
-		return value <= 0;
+		return value <= 0 || !canEditCharacter(this.char._id);
+	},
+	conMod: function(){
+		return signedString(
+			Characters.calculate.abilityMod(this.char._id, "constitution")
+		);
 	},
 });
 

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

@@ -27,6 +27,7 @@
 			{{>hitDice name="d10HitDice" diceNum="10" char=this}}
 			{{>hitDice name="d12HitDice" diceNum="12" char=this}}
 			<!--Saving Throws-->
+			<div>
 			<paper-shadow class="card">
 				<div class="top white subhead">
 					Saving Throws
@@ -40,7 +41,9 @@
 					{{> skillRow name="Charisma" skill="charismaSave"}}
 				</div>
 			</paper-shadow>
+			</div>
 			<!--Skills-->
+			<div>
 			<paper-shadow class="card">
 				<div class="top white subhead">
 					Skills
@@ -66,11 +69,13 @@
 					{{> skillRow name="Survival" skill="survival"}}
 				</div>
 			</paper-shadow>
+			</div>
 		</div>
 	</div>
 </template>
 
 <template name="statCard">
+	<div>
 	<paper-shadow class="card statCard clickable" hero-id="main" {{detailHero stat ../_id}} layout horizontal>
 		<div class="left display1 white-text {{color}}"
 			 hero-id="toolbar" {{detailHero stat ../_id}}>
@@ -84,4 +89,5 @@
 			{{name}}
 		</div>
 	</paper-shadow>
+	</div>
 </template>

rpg-docs/client/views/characterList/characterSideList.js

@@ -13,7 +13,10 @@ Template.characterSideList.helpers({
 					{owner: userId},
 				]
 			},
-			{fields: {name: 1}}
+			{
+				fields: {name: 1},
+				sort: {name: 1},
+			}
 		);
 	}
 });

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>
-		<h2>The data for the page you requested could not be found.</h2>
+	<core-toolbar class="app-grey white-text">
+		<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/client/views/paperTemplates/baseDialog/baseDialog.js

@@ -9,20 +9,11 @@ Template.baseDialog.onRendered(function(){
 
 Template.baseDialog.helpers({
 	editing: function(){
-		return Template.instance().editing.get();
+		return Template.instance().editing.get() && canEditCharacter(Template.parentData().charId);
 	},
 	showEdit: function() {
 		if (this.hideEdit) return false;
-		var charId = Template.parentData().charId;
-		var userId = Meteor.userId();
-		if (!userId) return false;
-		if (charId){
-			var char = Characters.findOne(charId);
-			if (char)
-				return char.owner === userId ||
-					_.contains(char.writers, userId);
-		}
-		return true;
+		return canEditCharacter(Template.parentData().charId);
 	},
 });
 

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

@@ -208,3 +208,70 @@ ChangeLogs.insert({
 		"Made dependency loops return NaN immediately, rather than looping indefinitely until a page refresh. Adding an effect that adds \"strength\" to Strength, won't cause Strength to constantly increase or freeze the browser, Strength just becomes NaN",
 	],
 });
+
+ChangeLogs.insert({
+	version: "0.6.4",
+	changes: [
+		"Hit dice now has a \"+\" between the dice and the constitution modifier",
+		"Items with multiple attacks should have the damage type editable on all attacks now",
+		"Spell attacks should now correctly inherit changes to their spell's name",
+		"Character lists should now be ordered alphabetically",
+		"Skills should have correct min and max effects applied again",
+	],
+});
+
+ChangeLogs.insert({
+	version: "0.6.5",
+	changes: [
+		"Net worth now takes container values into account",
+		"Added support for character pictures",
+		"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",
+	],
+});
+
+ChangeLogs.insert({
+	version: "0.7.1",
+	changes: [
+		"Fixed carry capacity effects not displaying correctly when not editing",
+		"Changed how columns are presented to fix a display issue introduced in Chrome 44",
+	],
+});
+
+ChangeLogs.insert({
+	version: "0.7.2",
+	changes: [
+		"Fixed spell attacks appearing on features page when the spell is not prepared",
+	],
+});

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;
+	},
+});