Merge branch 'bugfix-0.6.8'

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

@@ -3,16 +3,17 @@ Characters = new Mongo.Collection("characters");
 
 Schemas.Character = new SimpleSchema({
 	//strings
-	name:         {type: String, defaultValue: "", trim: false},
-	alignment:    {type: String, defaultValue: "", trim: false},
-	gender:       {type: String, defaultValue: "", trim: false},
-	race:         {type: String, defaultValue: "", trim: false},
-	description:  {type: String, defaultValue: "", trim: false},
-	personality:  {type: String, defaultValue: "", trim: false},
-	ideals:       {type: String, defaultValue: "", trim: false},
-	bonds:        {type: String, defaultValue: "", trim: false},
-	flaws:        {type: String, defaultValue: "", trim: false},
-	backstory:    {type: String, defaultValue: "", trim: false},
+	name:         {type: String, defaultValue: "", trim: false, optional: true},
+	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},
+	bonds:        {type: String, defaultValue: "", trim: false, optional: true},
+	flaws:        {type: String, defaultValue: "", trim: false, optional: true},
+	backstory:    {type: String, defaultValue: "", trim: false, optional: true},
 
 	//attributes
 	//ability scores
@@ -186,95 +187,105 @@ Schemas.Character = new SimpleSchema({
 
 Characters.attachSchema(Schemas.Character);
 
-var attributeBase = function(charId, statName){
+var attributeBase = preventLoop(function(charId, statName){
 	check(statName, String);
 	//if it's a damage multiplier, we treat it specially
 	if (_.contains(DAMAGE_MULTIPLIERS, statName)){
-		var effects = Effects.find(
-			{charId: charId, stat: statName, enabled: true, operation: "mul"}
-		).fetch();
-		var resistCount = 0;
-		var vulnCount = 0;
-		var multiplierEvaluationFail = false;
-		_.each(effects, function(effect){
-			var val = evaluateEffect(charId, effect);
-			if (val === 0.5){ //resistance
-				resistCount += 1;
-			} else if (val === 2){ //vulnerability
-				vulnCount += 1;
-			} else if (val === 0){ //imunity
-				return 0; //imunity is absolute
-			} else {
-				multiplierEvaluationFail = true;
-			}
-		});
-		if (multiplierEvaluationFail){
-			//we can't work it out correctly, set the value to 1
-			//and try work it out using regular maths below
-			value = 1;
-		} else if (resistCount && !vulnCount){
+		var invulnerabilityCount = Effects.find({
+			charId: charId,
+			stat: statName,
+			enabled: true,
+			operation: "mul",
+			value: 0,
+		}).count();
+		if (invulnerabilityCount) return 0;
+		var resistCount = Effects.find({
+			charId: charId,
+			stat: statName,
+			enabled: true,
+			operation: "mul",
+			value: 0.5,
+		}).count();
+		var vulnCount = Effects.find({
+			charId: charId,
+			stat: statName,
+			enabled: true,
+			operation: "mul",
+			value: 2,
+		}).count();
+		if (!resistCount && !vulnCount){
+			return 1;
+		}  else if (resistCount && !vulnCount){
 			return 0.5;
-		} else if (!resistCount && vulnCount){
+		}  else if (!resistCount && vulnCount){
 			return 2;
 		} else {
 			return 1;
 		}
 	}
+	var value;
+	var base = 0;
+	var add = 0;
+	var mul = 1;
+	var min = Number.NEGATIVE_INFINITY;
+	var max = Number.POSITIVE_INFINITY;
 
-	var value = 0;
-
-	//start with the highest base value
-	Effects.find(
-		{charId: charId, stat: statName, enabled: true, operation: "base"}
-	).forEach(function(effect){
-		var efv = evaluateEffect(charId, effect);
-		if (efv > value){
-			value = efv;
+	Effects.find({
+		charId: charId,
+		stat: statName,
+		enabled: true,
+		operation: {$in: ["base", "add", "mul", "min", "max"]},
+	}).forEach(function(effect) {
+		value = evaluateEffect(charId, effect);
+		if (effect.operation === "base"){
+			if (value > base) base = value;
+		} else if (effect.operation === "add"){
+			add += value;
+		} else if (effect.operation === "mul"){
+			mul *= value;
+		} else if (effect.operation === "min"){
+			if (value > min) min = value;
+		} else if (effect.operation === "max"){
+			if (value < max) max = value;
 		}
 	});
 
-	//add all the add values
-	Effects.find(
-		{charId: charId, stat: statName, enabled: true, operation: "add"}
-	).forEach(function(effect){
-		value += evaluateEffect(charId, effect);
-	});
+	var result = (base + add) * mul;
+	if (result < min) result = min;
+	if (result > max) result = max;
 
-	//multiply all the mul values
-	Effects.find(
-		{charId: charId, stat: statName, enabled: true, operation: "mul"}
-	).forEach(function(effect){
-		value *= evaluateEffect(charId, effect);
-	});
+	return Math.floor(result);
+});
 
-	//ensure value is >= all mins
-	Effects.find(
-		{charId: charId, stat: statName, enabled: true, operation: "min"}
-	).forEach(function(effect){
-		var min = evaluateEffect(charId, effect);
-		value = value > min ? value : min;
+if (Meteor.isClient) {
+	Template.registerHelper("characterCalculate", function(func, charId, input) {
+		try {
+			return Characters.calculate[func](charId, input);
+		} catch (e){
+			if (!Characters.calculate[func]){
+				throw new Error(func + "is not a function name");
+			} else {
+				throw e;
+			}
+		}
 	});
+}
 
-	//ensure value is <= all maxes
-	Effects.find(
-		{charId: charId, stat: statName, enabled: true, operation: "max"}
-	).forEach(function(effect){
-		var max = evaluateEffect(charId, effect);
-		value = value < max ? value : max;
+//create a local memoize with a argument concatenating hash function
+var memoize = function(f) {
+	return Tracker.memoize(f, function() {
+		return _.reduce(arguments, function(memo, arg) {
+			return memo + arg;
+		}, "");
 	});
-	return value;
 };
 
-//functions and calculated values.
-//These functions can only rely on this._id since no other
-//field is likely to be attached to all returned characters
-Characters.helpers({
-	//returns the value stored in the field requested
-	//will set up dependencies on just that field
-	getField : function(fieldName){
+//memoize funcitons that have finds and slow loops
+Characters.calculate = {
+	getField: function(charId, fieldName) {
 		var fieldSelector = {};
 		fieldSelector[fieldName] = 1;
-		var char = Characters.findOne(this._id, {fields: fieldSelector});
+		var char = Characters.findOne(charId, {fields: fieldSelector});
 		var field = char[fieldName];
 		if (field === undefined){
 			throw new Meteor.Error(
@@ -287,8 +298,7 @@ Characters.helpers({
 		}
 		return field;
 	},
-	//returns the value of a field
-	fieldValue : function(fieldName){
+	fieldValue: function(charId, fieldName) {
 		if (!Schemas.Character.schema(fieldName)){
 			throw new Meteor.Error(
 				"Field not found",
@@ -298,102 +308,92 @@ Characters.helpers({
 		//duck typing to get the right value function
 		//.ability implies skill
 		if (Schemas.Character.schema(fieldName + ".ability")){
-			return this.skillMod(fieldName);
+			return Characters.calculate.skillMod(charId, fieldName);
 		}
 		//adjustment implies attribute
 		if (Schemas.Character.schema(fieldName + ".adjustment")){
-			return this.attributeValue(fieldName);
+			return Characters.calculate.attributeValue(charId, fieldName);
 		}
 		//fall back to just returning the field itself
-		return this.getField(fieldName);
+		return Characters.calculate.getField(charId, fieldName);
 	},
-
-	attributeValue: function(attributeName){
-		var charId = this._id;
-		var attribute = this.getField(attributeName);
+	attributeValue: memoize(function(charId, attributeName){
+		var attribute = Characters.calculate.getField(charId, attributeName);
 		//base value
-		var value = this.attributeBase(attributeName);
+		var value = Characters.calculate.attributeBase(charId, attributeName);
 		//plus adjustment
 		value += attribute.adjustment;
 		return value;
-	},
-
-	attributeBase: preventLoop(function(attributeName){
-		var charId = this._id;
-		//base value
+	}),
+	attributeBase: memoize(function(charId, attributeName){
 		return attributeBase(charId, attributeName);
 	}),
-
-	skillMod: preventLoop(function(skillName){
-		var charId = this._id;
-		var skill = this.getField(skillName);
+	skillMod: memoize(preventLoop(function(charId, skillName){
+		var skill = Characters.calculate.getField(charId, skillName);
 		//get the final value of the ability score
-		var ability = this.attributeValue(skill.ability);
+		var ability = Characters.calculate.attributeValue(charId, skill.ability);
 
 		//base modifier
 		var mod = +getMod(ability);
 
 		//multiply proficiency bonus by largest value in proficiency array
-		var prof = this.proficiency(skillName);
+		var prof = Characters.calculate.proficiency(charId, skillName);
 
 		//add multiplied proficiency bonus to modifier
-		mod += prof * this.attributeValue("proficiencyBonus");
+		mod += prof * Characters.calculate.attributeValue(charId, "proficiencyBonus");
 
 		//apply all effects
-		var rawEffects = Effects.find(
-			{charId: charId, stat: skillName, enabled: true}
-		).fetch();
-		var effects = _.groupBy(rawEffects, "operation");
-		_.forEach(effects.add, function(effect){
-			mod += evaluateEffect(charId, effect);
-		});
-		_.forEach(effects.mul, function(effect){
-			mod *= evaluateEffect(charId, effect);
-		});
-		_.forEach(effects.min, function(effect){
-			var min = evaluateEffect(charId, effect);
-			mod = mod > min ? mod : min;
-		});
-		_.forEach(effects.max, function(effect){
-			var max = evaluateEffect(charId, effect);
-			mod = mod < max ? mod : max;
-		});
-		return signedString(mod);
-	}),
+		var value;
+		var add = 0;
+		var mul = 1;
+		var min = Number.NEGATIVE_INFINITY;
+		var max = Number.POSITIVE_INFINITY;
 
-	proficiency: function(skillName){
-		var charId = this._id;
-		//return largest value in proficiency array
-		var prof = 0;
-		Proficiencies.find(
-			{charId: charId, name: skillName, enabled: true}
-		).forEach(function(proficiency){
-			var newProf = proficiency.value;
-			if (newProf > prof){
-				prof = newProf;
+		Effects.find({
+			charId: charId,
+			stat: skillName,
+			enabled: true,
+			operation: {$in: ["base", "add", "mul", "min", "max"]},
+		}).forEach(function(effect) {
+			value = evaluateEffect(charId, effect);
+			if (effect.operation === "add"){
+				add += value;
+			} else if (effect.operation === "mul"){
+				mul *= value;
+			} else if (effect.operation === "min"){
+				if (value > min) min = value;
+			} else if (effect.operation === "max"){
+				if (value < max) max = value;
 			}
 		});
-		return prof;
-	},
+		var result = (mod + add) * mul;
+		if (result < min) result = min;
+		if (result > max) result = max;
 
-	passiveSkill: function(skillName){
-		if (_.isString(skillName)){
-			var skill = this.getField(skillName);
-		}
-		var charId = this._id;
-		var mod = +this.skillMod(skillName);
+		return Math.floor(result);
+	})),
+	proficiency: memoize(function(charId, skillName){
+		//return largest value in proficiency array
+		var prof = Proficiencies.findOne(
+			{charId: charId, name: skillName, enabled: true},
+			{sort: {value: -1}}
+		);
+		return prof && prof.value || 0;
+	}),
+	passiveSkill: memoize(function(charId, skillName){
+		var skill = Characters.calculate.getField(charId, skillName);
+		var mod = +Characters.calculate.skillMod(charId, skillName);
 		var value = 10 + mod;
 		Effects.find(
 			{charId: charId, stat: skillName, enabled: true, operation: "passiveAdd"}
 		).forEach(function(effect){
 			value += evaluateEffect(charId, effect);
 		});
-		return value;
-		//TODO decide whether (dis)advantage gives (-)+5 to passive checks
-	},
-
-	advantage: function(skillName){
-		var charId = this._id;
+		var advantage = Characters.calculate.advantage(charId, skillName);
+		value += 5 * advantage;
+		return Math.floor(value);
+	}),
+	advantage: memoize(function(charId, skillName){
 		var advantage = Effects.find(
 			{charId: charId, stat: skillName, enabled: true, operation: "advantage"}
 		).count();
@@ -403,19 +403,18 @@ Characters.helpers({
 		if (advantage && !disadvantage) return 1;
 		if (disadvantage && !advantage) return -1;
 		return 0;
+	}),
+	abilityMod: function(charId, attribute){
+		return getMod(
+			Characters.calculate.attributeValue(charId, attribute)
+		);
 	},
-
-	abilityMod: function(attribute){
-		return signedString(getMod(this.attributeValue(attribute)));
-	},
-
-	passiveAbility: function(attribute){
-		var mod = +getMod(this.attributeValue(attribute));
+	passiveAbility: function(charId, attribute){
+		var mod = +getMod(Characters.calculate.attributeValue(charId, attribute));
 		return 10 + mod;
 	},
-
-	xpLevel: function(){
-		var xp = this.experience();
+	xpLevel: function(charId){
+		var xp = Characters.calculate.experience(charId);
 		for (var i = 0; i < 19; i++){
 			if (xp < XP_TABLE[i]){
 				return i;
@@ -424,30 +423,103 @@ Characters.helpers({
 		if (xp > 355000) return 20;
 		return 0;
 	},
-
-	level: function(){
+	level: memoize(function(charId){
 		var level = 0;
-		Classes.find({charId: this._id}).forEach(function(cls){
+		Classes.find({charId: charId}).forEach(function(cls){
 			level += cls.level;
 		});
 		return level;
-	},
-
-	experience: function(){
+	}),
+	experience: memoize(function(charId){
 		var xp = 0;
 		Experiences.find(
-			{charId: this._id},
+			{charId: charId},
 			{fields: {value: 1}}
 		).forEach(function(e){
 			xp += e.value;
 		});
 		return xp;
+	}),
+};
+
+var depreciated = function() {
+	//var err = new Error("this function has been depreciated");
+	var name = "";
+	if (Template.instance()){
+		name = Template.instance().view.name;
+	}
+	var logString = "this function has been depreciated \n";
+	if (name){
+		logString += "View: " + name + "\n\n";
+	}
+	//logString += err.stack + "\n\n---------------------\n\n";
+	console.log(logString);
+};
+
+//functions and calculated values.
+//These functions can only rely on this._id since no other
+//field is likely to be attached to all returned characters
+Characters.helpers({
+	//returns the value stored in the field requested
+	//will set up dependencies on just that field
+	getField : function(fieldName){
+		depreciated();
+		return Characters.calculate.getField(this._id, fieldName);
+	},
+	//returns the value of a field
+	fieldValue : function(fieldName){
+		depreciated();
+		return Characters.calculate.fieldValue(this._id, fieldName);
+	},
+	attributeValue: function(attributeName){
+		depreciated();
+		return Characters.calculate.attributeValue(this._id, attributeName);
+	},
+	attributeBase: function(attributeName){
+		depreciated();
+		return Characters.calculate.attributeBase(this._id, attributeName);
+	},
+	skillMod: function(skillName){
+		depreciated();
+		return Characters.calculate.skillMod(this._id, skillName);
+	},
+	proficiency: function(skillName){
+		depreciated();
+		return Characters.calculate.proficiency(this._id, skillName);
+	},
+	passiveSkill: function(skillName){
+		depreciated();
+		return Characters.calculate.passiveSkill(this._id, skillName);
+	},
+	advantage: function(skillName){
+		depreciated();
+		return Characters.calculate.advantage(this._id, skillName);
+	},
+	abilityMod: function(attribute){
+		depreciated();
+		return Characters.calculate.abilityMod(this._id, attribute);
+	},
+	passiveAbility: function(attribute){
+		depreciated();
+		return Characters.calculate.passiveAbility(this._id, attribute);
+	},
+	xpLevel: function(){
+		depreciated();
+		return Characters.calculate.xpLevel(this._id);
+	},
+	level: function(){
+		depreciated();
+		return Characters.calculate.level(this._id);
+	},
+	experience: function(){
+		depreciated();
+		return Characters.calculate.experience(this._id);
 	},
 });
 
 //clean up all data related to that character before removing it
-Characters.after.remove(function(userId, character) {
-	if (Meteor.isServer){
+if (Meteor.isServer){
+	Characters.after.remove(function(userId, character) {
 		Actions       .remove({charId: character._id});
 		Attacks       .remove({charId: character._id});
 		Buffs         .remove({charId: character._id});
@@ -460,8 +532,8 @@ Characters.after.remove(function(userId, character) {
 		SpellLists    .remove({charId: character._id});
 		Items         .remove({charId: character._id});
 		Containers    .remove({charId: character._id});
-	}
-});
+	});
+}
 
 Characters.allow({
 	insert: function(userId, doc) {

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,7 @@ Spells.attachSchema(Schemas.Spell);
 
 Spells.attachBehaviour("softRemovable");
 makeChild(Spells); //children of spell lists
+makeParent(Spells, ["name", "enabled"]); //parents of attacks
 
 Spells.allow(CHARACTER_SUBSCHEMA_ALLOW);
 Spells.deny(CHARACTER_SUBSCHEMA_DENY);

rpg-docs/Model/Character/SubSchemas/Adjustment.js

@@ -3,10 +3,6 @@
  * Damage, healing and resource cost/recovery are all adjustments
  */
 Schemas.Adjustment = new SimpleSchema({
-	name: {
-		type: String,
-		optional: true,
-	},
 	//which stat the adjustment is applied to
 	stat: {
 		type: String,

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

@@ -91,6 +91,6 @@ $thinColumnWidth: 240px;
 }
 
 /* undo pointer cursor on detail box heading */
-#globalDetail .card .top {
+#globalDetail.card .top {
 	cursor: auto;
 }

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{
@@ -15,4 +12,10 @@ td {
 			width: 250px;
 		}
 	}
-}
+}
+
+.summaryTable  {
+	&:nth-child(3){
+		text-align: right;
+	}
+}

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

@@ -1,7 +1,7 @@
 <template name="characterSettings">
 	{{#with character}}
-	<div>
-		<table>
+	<div style="height: 100px;">
+		<table style="width: 100%;">
 			<tr>
 				<td>Hide Spells tab</td>
 				<td>
@@ -23,4 +23,5 @@
 		</table>
 	</div>
 	{{/with}}
+	<paper-button id="doneButton" affirmative> Done </paper-button>
 </template>

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

@@ -20,7 +20,7 @@ Template.characterSheet.helpers({
 	hideSpellcasting: function() {
 		var char = Characters.findOne(this._id);
 		return char && char.settings.hideSpellcasting;
-	}
+	},
 });
 
 Template.characterSheet.events({

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/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

@@ -95,14 +95,16 @@
 								<core-tooltip label="Feature enabled"
 											  position="left">
 									<paper-checkbox class="enabledCheckbox" 
-													checked={{enabled}}>
+													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>
@@ -135,7 +137,7 @@
 </template>
 
 <template name="resource">
-	{{#if char.attributeBase name}}
+	{{#if characterCalculate "attributeBase" char._id name}}
 		<paper-shadow class="card" 
 					  hero-id="main" {{detailHero name char._id}}
 					  layout horizontal>
@@ -152,7 +154,7 @@
 									   disabled={{cantDecrement}}>
 					</paper-icon-button>
 				</div>
-				<div>{{char.attributeValue name}}</div>
+				<div>{{characterCalculate "attributeValue" char._id name}}</div>
 				<!--<div>/{{char.attributeBase name}}</div>-->
 			</div>
 			<div class="right clickable" 

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);
@@ -96,16 +101,19 @@ Template.features.events({
 
 Template.resource.helpers({
 	cantIncrement: function(){
-		var baseBigger = this.char.attributeValue(this.name) <
-			this.char.attributeBase(this.name);
-		return !baseBigger;
+		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 || !canEditCharacter(this.char._id);
 	},
 	cantDecrement: function(){
-		var valuePositive = this.char.attributeValue(this.name) > 0;
-		return !valuePositive;
+		var value = Characters.calculate.attributeValue(this.char._id, this.name);
+		var valuePositive = value > 0;
+		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";
@@ -115,14 +123,17 @@ Template.resource.helpers({
 
 Template.resource.events({
 	"tap .resourceUp": function(event){
-		if (this.char.attributeValue(this.name) < this.char.attributeBase(this.name)){
+		var value = Characters.calculate.attributeValue(this.char._id, this.name);
+		var base = Characters.calculate.attributeBase(this.char._id, this.name);
+		if (value < base){
 			var modifier = {$inc: {}};
 			modifier.$inc[this.name + ".adjustment"] = 1;
 			Characters.update(this.char._id, modifier, {validate: false});
 		}
 	},
 	"tap .resourceDown": function(event){
-		if (this.char.attributeValue(this.name) > 0){
+		var value = Characters.calculate.attributeValue(this.char._id, this.name);
+		if (value > 0){
 			var modifier = {$inc: {}};
 			modifier.$inc[this.name + ".adjustment"] = -1;
 			Characters.update(this.char._id, modifier, {validate: false});

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

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

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

@@ -34,13 +34,13 @@
 <template name="containerView">
 	<div layout horizontal wrap center justified>
 		<table class="summaryTable fullwidth">
-			<tr><td>Container</td><td>{{weight}}lbs</td><td>{{longValueString value}}</td></tr>
-			<tr><td>Contents</td><td>{{contentsWeight}}lbs</td><td>{{longValueString contentsValue}}</td></tr>
-			<tr class="body2"><td>Total</td><td>{{totalWeight}}lbs</td><td>{{longValueString totalValue}}</td></tr>
+			<tr><td>Container</td><td>{{round weight}}lbs</td><td>{{longValueString value}}</td></tr>
+			<tr><td>Contents</td><td>{{round contentsWeight}}lbs</td><td>{{longValueString contentsValue}}</td></tr>
+			<tr class="body2"><td>Total</td><td>{{round totalWeight}}lbs</td><td>{{longValueString totalValue}}</td></tr>
 		</table>
 	</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

@@ -35,8 +35,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">
@@ -114,6 +113,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>
@@ -152,11 +152,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 +166,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,23 +6,27 @@
 			</div>
 			{{#if description}}
 				<hr class="vertMargin">
-				<div class="pre-wrap">{{description}}</div>
+				<div>{{#markdown}}{{description}}{{/markdown}}</div>
 			{{/if}}
 		{{else}}
-			<div horizontal layout>
-				<!--Name-->
-				<paper-input id="experienceNameInput" label="Name" floatinglabel value={{name}} flex></paper-input>
-				<!--Value-->
-				<paper-input-decorator label="Value" floatinglabel>
-					<input id="valueInput" type="number" value={{value}}>
-				</paper-input-decorator>
-			</div>
-			<!--Description-->
-			<paper-input-decorator label="Description" floatinglabel layout vertical>
-				<paper-autogrow-textarea>
-					<textarea id="experienceDescriptionInput" placeholder value={{description}}></textarea>
-				</paper-autogrow-textarea>
-			</paper-input-decorator>
+			{{> experienceEdit}}
 		{{/baseDialog}}
 	{{/with}}
-</template>
+</template>
+
+<template name="experienceEdit">
+	<div horizontal layout>
+		<!--Name-->
+		<paper-input id="experienceNameInput" label="Name" floatinglabel value={{name}} flex></paper-input>
+		<!--Value-->
+		<paper-input-decorator label="Value" floatinglabel>
+			<input id="valueInput" type="number" value={{value}}>
+		</paper-input-decorator>
+	</div>
+	<!--Description-->
+	<paper-input-decorator label="Description" floatinglabel layout vertical>
+		<paper-autogrow-textarea>
+			<textarea id="experienceDescriptionInput" placeholder value={{description}}></textarea>
+		</paper-autogrow-textarea>
+	</paper-input-decorator>
+</template>

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

@@ -1,3 +1,7 @@
+Template.experienceEdit.onRendered(function(){
+	updatePolymerInputs(this);
+});
+
 Template.experienceDialog.helpers({
 	experience: function(){
 		Experiences.findOne(this.experienceId);
@@ -18,8 +22,10 @@ Template.experienceDialog.events({
 		);
 		GlobalUI.closeDetail();
 	},
-	//TODO validate input (integer, non-negative, etc) for these inputs and give validation errors
-	"change #experienceNameInput, input #experienceNameInput": function(event){
+});
+
+Template.experienceEdit.events({
+	"change #experienceNameInput": function(event){
 		var value = event.currentTarget.value;
 		Experiences.update(this._id, {$set: {name: value}});
 	},

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

@@ -9,8 +9,9 @@
 						 hero-id="toolbar" {{detailHero}}
 						 layout horizontal center>
 						<div flex>Experience</div>
-						<div >{{experience}} XP</div>
-						<paper-icon-button class="black54" id="addXP" icon="add"></paper-icon-button>
+						<div >{{characterCalculate "experience" _id}} XP</div>
+						<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}}
@@ -45,7 +46,7 @@
 						 layout horizontal center>
 						<div flex>
 							<div class="containerName subhead">
-								Level {{level}}
+								Level {{characterCalculate "level" _id}}
 							</div>
 							{{#if nextLevelXP}}
 								<div class="caption">
@@ -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">
@@ -85,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/journal.js

@@ -41,7 +41,7 @@ Template.journal.helpers({
 		return Levels.find({charId: charId, classId: this._id}, {sort: {value: 1}});
 	},
 	nextLevelXP: function(){
-		var currentLevel = this.level();
+		var currentLevel = Characters.calculate.level(this._id);
 		if (currentLevel < 20){
 			return XP_TABLE[currentLevel];
 		}

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,7 +3,35 @@
 		<div id="persona" class="scroll-y" fit>
 			<div class="column-container">
 				{{#with characterDetails}}
-					{{#containerCardHelper this}}{{alignment}} {{gender}} {{race}}{{/containerCardHelper}}
+					<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>
 				{{/with}}
 				{{> containerCard characterField "description" "Description"}}
 				{{> containerCard characterField "personality" "Personality Traits"}}
@@ -40,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/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

@@ -9,24 +9,32 @@
 </template>
 
 <template name="spellDetails">
-	<div class="caption">
+	<div class="body2">
 		Level {{level}} {{school}}, {{preparedString}}
 	</div>
-	<div class="vertMargin">
+	<div style="margin: 16px 0 16px 0;">
+		{{#if castingTime}}
 		<div>
 			<span class="body2">Casting Time: </span><span>{{castingTime}}</span>
 		</div>
+		{{/if}}
+		{{#if range}}
 		<div>
 			<span class="body2">Range: </span><span>{{range}}</span>
 		</div>
+		{{/if}}
+		{{#if getComponents}}
 		<div>
 			<span class="body2">Components: </span><span>{{getComponents}}</span>
 		</div>
+		{{/if}}
+		{{#if duration}}
 		<div>
 			<span class="body2">Duration: </span><span>{{duration}}</span>
 		</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

@@ -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>

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

@@ -84,39 +84,35 @@ Template.spells.helpers({
 	},
 	cantCast: function(level, char){
 		for (var i = level; i <= 9; i++){
-			if (char.attributeValue("level" + i + "SpellSlots") > 0){
+			if (Characters.calculate.attributeValue(char._id, "level" + i + "SpellSlots") > 0){
 				return false;
 			}
 		}
 		return true;
 	},
-	baseSlots: function(char){
-		return char.attributeBase("level" + this.level + "SpellSlots");
-	},
-	slots: function(char){
-		return char.attributeValue("level" + this.level + "SpellSlots");
-	},
 	showSlots: function(char){
-		return this.level && char.attributeBase("level" + this.level + "SpellSlots");
+		return this.level && Characters.calculate.attributeBase(
+			char._id, "level" + this.level + "SpellSlots"
+		);
 	},
 	hasSlots: function(){
 		for (var i = 1; i <= 9; i += 1){
-			if (this.attributeBase("level" + i + "SpellSlots")){
+			if (Characters.calculate.attributeBase(this._id, "level" + i + "SpellSlots")){
 				return true;
 			}
 		}
 		return false;
 	},
 	slotBubbles: function(char){
-		var baseSlots = char.attributeBase("level" + this.level + "SpellSlots");
-		var currentSlots = char.attributeValue("level" + this.level + "SpellSlots");
+		var baseSlots = Characters.calculate.attributeBase(char._id, "level" + this.level + "SpellSlots");
+		var currentSlots = Characters.calculate.attributeValue(char._id, "level" + this.level + "SpellSlots");
 		var slotsUsed = baseSlots - currentSlots;
 		var bubbles = [];
 		var i;
 		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,
 			});
@@ -124,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,
 			});
@@ -143,15 +139,15 @@ Template.spells.events({
 			var char = Characters.findOne(this.charId);
 			if (event.currentTarget.icon === "radio-button-off"){
 				if (
-					char.attributeValue(this.attribute) <
-					char.attributeBase(this.attribute)
+					Characters.calculate.attributeValue(char._id, this.attribute) <
+					Characters.calculate.attributeBase(char._id, this.attribute)
 				){
 					modifier = {$inc: {}};
 					modifier.$inc[this.attribute + ".adjustment"] = 1;
 					Characters.update(this.charId, modifier, {validate: false});
 				}
 			} else {
-				if (char.attributeValue(this.attribute) > 0){
+				if (Characters.calculate.attributeValue(char._id, this.attribute) > 0){
 					modifier = {$inc: {}};
 					modifier.$inc[this.attribute + ".adjustment"] = -1;
 					Characters.update(this.charId, modifier, {validate: false});

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

@@ -4,8 +4,8 @@
 				  layout horizontal>
 		<div class="left white-text {{color}}"
 			 hero-id="toolbar" {{detailHero ability ../_id}}>
-			<div class="display1">{{../attributeValue ability}}</div>
-			<div class="title">{{../abilityMod ability}}</div>
+			<div class="display1">{{characterCalculate "attributeValue" ../_id ability}}</div>
+			<div class="title">{{abilityMod}}</div>
 		</div>
 		<div class="right subhead" layout horizontal center>
 			{{title}}

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

@@ -0,0 +1,9 @@
+Template.abilityMiniCard.helpers({
+	abilityMod: function() {
+		return signedString(
+			Characters.calculate.abilityMod(
+				Template.parentData()._id, this.ability
+			)
+		);
+	}
+});

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

@@ -106,10 +106,8 @@ Template.attributeDialogView.helpers({
 		return a || b || c;
 	},
 	adjustment: function(){
-		var char = Characters.findOne(this.charId);
-		if (!char) return;
-		var value = char.attributeValue(this.statName);
-		var base = char.attributeBase(this.statName);
+		var value = Characters.calculate.attributeValue(this.charId, this.statName);
+		var base = Characters.calculate.attributeBase(this.charId, this.statName);
 		return value - base;
 	},
 	baseEffects: function(){
@@ -138,14 +136,10 @@ Template.attributeDialogView.helpers({
 		);
 	},
 	attributeBase: function(){
-		var char = Characters.findOne(this.charId);
-		if (!char) throw "character is " + char;
-		return char.attributeBase(this.statName);
+		return Characters.calculate.attributeBase(this.charId, this.statName);
 	},
 	attributeValue: function() {
-		var char = Characters.findOne(this.charId);
-		if (!char) throw "character is " + char;
-		return char.attributeValue(this.statName);
+		return Characters.calculate.attributeValue(this.charId, this.statName);
 	},
 	sourceName: function(){
 		if (this.parent.group === "racial"){

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

@@ -1,21 +1,26 @@
 <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>
 				<paper-diff-slider id="hitPointSlider"
-							  value={{attributeValue "hitPoints"}}
-							  max={{attributeBase "hitPoints"}} 
-							  editable pin
-							  role="slider"
-							  ></paper-diff-slider>
+								   value={{characterCalculate "attributeValue" _id "hitPoints"}}
+								   max={{characterCalculate "attributeBase" _id "hitPoints"}}
+								   editable pin
+								   disabled={{#unless canEditCharacter _id}}true{{/unless}}
+								   role="slider">
+				</paper-diff-slider>
 			</div>
 			{{#each tempHitPoints}}
 				<div>
@@ -28,16 +33,28 @@
 							  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}} <div>Immune:     {{#each multipliers.immunities}}  {{name}} {{/each}}</div>{{/if}}
-				{{#if multipliers.resistances.length}}<div>Resistance: {{#each multipliers.resistances}} {{name}} {{/each}}</div>{{/if}}
-				{{#if multipliers.weaknesses.length}} <div>Weakness:   {{#each multipliers.weaknesses}}  {{name}} {{/each}}</div>{{/if}}
+				{{#if multipliers.immunities.length}}
+					<div>
+						Immune:     {{#each multipliers.immunities}}  {{name}} {{/each}}
+					</div>
+				{{/if}}
+				{{#if multipliers.resistances.length}}
+					<div>
+						Resistance: {{#each multipliers.resistances}} {{name}} {{/each}}
+					</div>
+				{{/if}}
+				{{#if multipliers.weaknesses.length}}
+					<div>
+						Weakness:   {{#each multipliers.weaknesses}}  {{name}} {{/each}}
+					</div>
+				{{/if}}
 			</div>
 			{{#if showDeathSave}}
 				{{#with deathSaveObject}}

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

@@ -3,7 +3,7 @@ Template.healthCard.helpers({
 		return TemporaryHitPoints.find({charId: this._id});
 	},
 	showDeathSave: function(){
-		return this.attributeValue("hitPoints") <= 0;
+		return Characters.calculate.attributeValue(this._id, "hitPoints") <= 0;
 	},
 	deathSaveObject: function(){
 		var char = Characters.findOne(this._id, {fields: {deathSave: 1}});
@@ -27,21 +27,20 @@ Template.healthCard.helpers({
 		return this.fail >= 3;
 	},
 	multipliers: function(){
-		var char = Characters.findOne(this._id, {fields: {_id: 1}});
 		var multipliers = [
-			{name: "Acid",        value: char.attributeValue("acidMultiplier", 1)},
-			{name: "Bludgeoning", value: char.attributeValue("bludgeoningMultiplier", 1)},
-			{name: "Cold",        value: char.attributeValue("coldMultiplier", 1)},
-			{name: "Fire",        value: char.attributeValue("fireMultiplier", 1)},
-			{name: "Force",       value: char.attributeValue("forceMultiplier", 1)},
-			{name: "Lightning",   value: char.attributeValue("lightningMultiplier", 1)},
-			{name: "Necrotic",    value: char.attributeValue("necroticMultiplier", 1)},
-			{name: "Piercing",    value: char.attributeValue("piercingMultiplier", 1)},
-			{name: "Poison",      value: char.attributeValue("poisonMultiplier", 1)},
-			{name: "Psychic",     value: char.attributeValue("psychicMultiplier", 1)},
-			{name: "Radiant",     value: char.attributeValue("radiantMultiplier", 1)},
-			{name: "Slashing",    value: char.attributeValue("slashingMultiplier", 1)},
-			{name: "Thunder",     value: char.attributeValue("thunderMultiplier", 1)},
+			{name: "Acid",        value: Characters.calculate.attributeValue(this._id, "acidMultiplier")},
+			{name: "Bludgeoning", value: Characters.calculate.attributeValue(this._id, "bludgeoningMultiplier")},
+			{name: "Cold",        value: Characters.calculate.attributeValue(this._id, "coldMultiplier")},
+			{name: "Fire",        value: Characters.calculate.attributeValue(this._id, "fireMultiplier")},
+			{name: "Force",       value: Characters.calculate.attributeValue(this._id, "forceMultiplier")},
+			{name: "Lightning",   value: Characters.calculate.attributeValue(this._id, "lightningMultiplier")},
+			{name: "Necrotic",    value: Characters.calculate.attributeValue(this._id, "necroticMultiplier")},
+			{name: "Piercing",    value: Characters.calculate.attributeValue(this._id, "piercingMultiplier")},
+			{name: "Poison",      value: Characters.calculate.attributeValue(this._id, "poisonMultiplier")},
+			{name: "Psychic",     value: Characters.calculate.attributeValue(this._id, "psychicMultiplier")},
+			{name: "Radiant",     value: Characters.calculate.attributeValue(this._id, "radiantMultiplier")},
+			{name: "Slashing",    value: Characters.calculate.attributeValue(this._id, "slashingMultiplier")},
+			{name: "Thunder",     value: Characters.calculate.attributeValue(this._id, "thunderMultiplier")},
 		];
 		multipliers = _.groupBy(multipliers, "value");
 		return {
@@ -55,7 +54,8 @@ Template.healthCard.helpers({
 Template.healthCard.events({
 	"change #hitPointSlider": function(event){
 		var value = event.currentTarget.value;
-		var adjustment = value - this.attributeBase("hitPoints");
+		var base = Characters.calculate.attributeBase(this._id, "hitPoints")
+		var adjustment = value - base;
 		Characters.update(this._id, {$set: {"hitPoints.adjustment": adjustment}});
 		//reset the death saves if we are gaining HP
 		if (value > 0)

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

@@ -1,5 +1,5 @@
 <template name="hitDice">
-	{{#if ../attributeBase name}}
+	{{#if characterCalculate "attributeBase" ../_id name}}
 		<paper-shadow class="card hit-dice" hero-id="main" 
 					  {{detailHero name ../_id}} 
 					  layout horizontal>
@@ -18,10 +18,10 @@
 				</div>
 				<div class="resourceValue" layout vertical center>
 					<div>
-						{{../attributeValue name}}
+						{{characterCalculate "attributeValue" ../_id name}}
 					</div>
 					<div class="title white-text">
-						d{{diceNum}} {{../abilityMod "constitution"}}
+						d{{diceNum}} {{conMod}}
 					</div>
 				</div>
 			</div>

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

@@ -1,25 +1,33 @@
 Template.hitDice.helpers({
 	cantIncrement: function(){
-		var valueSmallerThanBase = this.char.attributeValue(this.name) <
-			this.char.attributeBase(this.name);
-		return !valueSmallerThanBase;
+		var value = Characters.calculate.attributeValue(this.char._id, this.name);
+		var base = Characters.calculate.attributeBase(this.char._id, this.name);
+		return value >= base || !canEditCharacter(this.char._id);
 	},
 	cantDecrement: function(){
-		var valuePositive = this.char.attributeValue(this.name) > 0;
-		return !valuePositive;
+		var value = Characters.calculate.attributeValue(this.char._id, this.name);
+		return value <= 0 || !canEditCharacter(this.char._id);
+	},
+	conMod: function(){
+		return signedString(
+			Characters.calculate.abilityMod(this.char._id, "constitution")
+		);
 	},
 });
 
 Template.hitDice.events({
 	"tap .resourceUp": function(event){
-		if (this.char.attributeValue(this.name) < this.char.attributeBase(this.name)){
+		var value = Characters.calculate.attributeValue(this.char._id, this.name);
+		var base = Characters.calculate.attributeBase(this.char._id, this.name);
+		if (value < base){
 			var modifier = {$inc: {}};
 			modifier.$inc[this.name + ".adjustment"] = 1;
 			Characters.update(this.char._id, modifier, {validate: false});
 		}
 	},
 	"tap .resourceDown": function(event){
-		if (this.char.attributeValue(this.name) > 0){
+		var value = Characters.calculate.attributeValue(this.char._id, this.name);
+		if (value > 0){
 			var modifier = {$inc: {}};
 			modifier.$inc[this.name + ".adjustment"] = -1;
 			Characters.update(this.char._id, modifier, {validate: false});

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

@@ -1,4 +1,4 @@
-<!-- needs name, char, and skillName -->
+<!-- needs name, charId, and skillName -->
 <template name="skillDialog">
 	{{#baseDialog title=name class=color hideEdit=true}}
 		{{> skillDialogView}}
@@ -8,7 +8,7 @@
 <template name="skillDialogView">
 	<div layout vertical center>
 		<div class="display2">
-			{{char.skillMod skillName}}
+			{{characterCalculate "skillMod" charId skillName}}
 		</div>
 		<div class="subhead">
 			<core-icon icon="{{profIcon}}" class="black54"></core-icon>
@@ -25,9 +25,9 @@
 	<table class="summaryTable">
 		<tr>
 			<td>{{abilityName}}</td>
-			<td>{{char.abilityMod ability}}</td>
+			<td>{{characterCalculate "abilityMod" charId ability}}</td>
 		</tr>
-		{{#if char.proficiency skillName}}
+		{{#if characterCalculate "proficiency" charId skillName}}
 			<tr>
 				<td>{{proficiencyValue}}</td>
 				<td>{{signedString profBonus}}</td>
@@ -59,7 +59,7 @@
 		{{/each}}
 		<tr class="body2">
 			<td>Total</td>
-			<td>{{char.skillMod skillName}}</td>
+			<td>{{characterCalculate "skillMod" charId skillName}}</td>
 		</tr>
 	</table>
 

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

@@ -106,9 +106,7 @@ Template.skillDialogView.helpers({
 		return a || b || c;
 	},
 	profIcon: function(){
-		var char = Characters.findOne(this.charId);
-		if (!char) return;
-		var prof = char.proficiency(this.skillName);
+		var prof = Characters.calculate.proficiency(this.charId, this.skillName);
 		if (prof > 0 && prof < 1) return "image:brightness-2";
 		if (prof === 1) return "image:brightness-1";
 		if (prof > 1) return "av:album";
@@ -123,13 +121,13 @@ Template.skillDialogView.helpers({
 	profBonus: function(){
 		var char = Characters.findOne(this.charId);
 		if (!char) return;
-		return char.proficiency(this.skillName) *
-			char.attributeValue("proficiencyBonus");
+		var prof = Characters.calculate.proficiency(this.charId, this.skillName);
+		var proficiencyBonus = 
+			Characters.calculate.attributeValue(this.charId, "proficiencyBonus");
+		return prof * proficiencyBonus;
 	},
 	proficiencyValue: function(){
-		var char = Characters.findOne(this.charId);
-		if (!char) return;
-		var prof = char.proficiency(this.skillName);
+		var prof = Characters.calculate.proficiency(this.charId, this.skillName);
 		if (prof == 0.5) return "Half Proficiency";
 		if (prof == 1)   return "Proficient";
 		if (prof == 2)   return "Double Proficiency";
@@ -199,22 +197,15 @@ Template.skillDialogView.helpers({
 		return skill.ability;
 	},
 	abilityName: function(){
-		var opts = {fields: {}};
-		opts.fields[this.skillName] = 1;
-		var char = Characters.findOne(this.charId, opts);
-		if (!char) return;
-		var skill = char[this.skillName];
+		var skill = Characters.calculate.getField(this.charId, this.skillName);
 		if (!skill) return;
 		var ability = skill.ability;
 		return abilities[ability] && abilities[ability].name;
 	},
-	char: function(){
-		return Characters.findOne(this.charId, {fields:{_id: 1}});
-	},
 	sourceName: function(){
 		if (this.parent.collection === "Characters"){
 			if (this.parent.group === "racial"){
-				return Characters.findOne(this.charId, {fields:{race: 1}}).race || "Race";
+				return Characters.calculate.getField(this.charId, "race") || "Race";
 			}
 			if (this.parent.group === "background"){
 				return "Background";

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

@@ -8,7 +8,9 @@
 			{{#if failSkill}}
 				<div class="fail skill-mod">fail</div>
 			{{else}}
-				<div class="{{advantage}} skill-mod">{{../skillMod skill}}</div>
+				<div class="{{advantage}} skill-mod">
+					{{skillMod}}
+				</div>
 			{{/if}}
 			<div flex>
 				{{name}}
@@ -16,7 +18,7 @@
 					*
 				{{/if}}
 				{{#if showPassive}}
-					({{../passiveSkill skill}})
+					({{characterCalculate "passiveSkill" ../_id skill}})
 				{{/if}}
 			</div>
 		</div>

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

@@ -1,13 +1,21 @@
 Template.skillRow.helpers({
+	skillMod: function() {
+		return signedString(
+			Characters.calculate.skillMod(
+				Template.parentData()._id, this.skill
+			)
+		);
+	},
 	profIcon: function(){
-		var prof = Template.parentData(1).proficiency(this.skill);
+		var charId = Template.parentData()._id;
+		var prof = Characters.calculate.proficiency(charId, this.skill);
 		if (prof > 0 && prof < 1) return "image:brightness-2";
 		if (prof === 1) return "image:brightness-1";
 		if (prof > 1) return "av:album";
 		return "radio-button-off";
 	},
 	failSkill: function(){
-		var charId = Template.parentData(1)._id;
+		var charId = Template.parentData()._id;
 		return Effects.find({
 			charId: charId,
 			stat: this.skill,
@@ -16,12 +24,13 @@ Template.skillRow.helpers({
 		}).count();
 	},
 	advantage: function(){
-		var advantage = Template.parentData(1).advantage(this.skill);
+		var charId = Template.parentData()._id;
+		var advantage = Characters.calculate.advantage(charId, this.skill);
 		if (advantage > 0) return "advantage";
 		if (advantage < 0) return "disadvantage";
 	},
 	conditionalCount: function(){
-		var charId = Template.parentData(1)._id;
+		var charId = Template.parentData()._id;
 		return Effects.find({
 			charId: charId,
 			stat: this.skill,

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

@@ -75,9 +75,9 @@
 		<div class="left display1 white-text {{color}}"
 			 hero-id="toolbar" {{detailHero stat ../_id}}>
 			{{#if isSkill}}
-				{{../skillMod stat}}
+				{{prefix}}{{skillMod}}
 			{{else}}
-				{{prefix}}{{../attributeValue stat}}
+				{{prefix}}{{characterCalculate "attributeValue" ../_id stat}}
 			{{/if}}
 		</div>
 		<div class="right subhead" flex horizontal layout center>

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

@@ -67,6 +67,12 @@ Template.stats.events({
 	},
 });
 
-Template.stats.helpers({
-
+Template.statCard.helpers({
+	skillMod: function() {
+		return signedString(
+			Characters.calculate.skillMod(
+				Template.parentData()._id, this.stat
+			)
+		);
+	},
 });

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

@@ -13,22 +13,22 @@
 								   role="button"
 								   tabindex="0"
 								   icon="delete"
-								   aria-label="Delete Feature"
-								   noink></paper-icon-button>
+								   aria-label="Delete Feature">
+				</paper-icon-button>
 			{{/unless}}
 			{{#unless hideColor}}
 				{{> colorDropdown}}
 			{{/unless}}
 			<paper-icon-button id="doneEditingButton"
 							   icon="done"
-							   aria-label="Delete Feature"
-							   noink></paper-icon-button>
+							   aria-label="Delete Feature">
+			</paper-icon-button>
 		{{else}}
 			{{#if showEdit}}
 				<paper-icon-button id="editButton"
 								   icon="create"
-								   aria-label="Delete Feature"
-								   noink></paper-icon-button>
+								   aria-label="Delete Feature">
+				</paper-icon-button>
 			{{/if}}
 		{{/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/evaluate.js

@@ -1,11 +1,10 @@
 //evaluates a calculation string
 evaluate = function(charId, string){
 	if (!string) return string;
-	var char = Characters.findOne(charId, {fields: {_id: 1}});
 	string = string.replace(/\b[a-z]+\b/gi, function(sub){
 		//fields
 		if (Schemas.Character.schema(sub)){
-			return char.fieldValue(sub);
+			return Characters.calculate.fieldValue(charId, sub);
 		}
 		//ability modifiers
 		var abilityMods = [
@@ -19,7 +18,7 @@ evaluate = function(charId, string){
 		if (_.contains(abilityMods, sub)){
 			var slice = sub.slice(0, -3);
 			try {
-				return char.abilityMod(slice);
+				return Characters.calculate.abilityMod(charId, slice);
 			} catch (e){
 				return sub;
 			}
@@ -33,7 +32,7 @@ evaluate = function(charId, string){
 		}
 		//character level
 		if (sub.toUpperCase()  === "LEVEL"){
-			return char.level();
+			return Characters.calculate.level(charId);
 		}
 		return sub;
 	});
@@ -41,7 +40,6 @@ evaluate = function(charId, string){
 		var result = math.eval(string);
 		return result;
 	} catch (e){
-		console.log("Failed to evaluate ", string);
 		return string;
 	}
 };

rpg-docs/lib/functions/preventLoop.js

@@ -1,4 +1,5 @@
 preventLoop = function(inputFunction){
+	var self = this;
 	if (!_.isFunction(inputFunction)){
 		throw new Meteor.Error(
 			"Not a function",
@@ -9,23 +10,26 @@ preventLoop = function(inputFunction){
 	//if we try to visit the same argument twice before resolving its value
 	//we are in a dependency loop and need to GTFO
 	var visitedArgs = [];
-	return function(argument){
-		var value;
+	return function(){
+		var result;
+		var hash = _.reduce(arguments, function(memo, arg) {
+			return memo + arg;
+		}, "");
 		//we're still evaluating this attribute, must be in a loop
-		if (_.contains(visitedArgs, argument)) {
+		if (_.contains(visitedArgs, hash)) {
 			console.warn("dependency loop detected");
 			return NaN;
 		} else {
-			//push this skill to the list of visited skills
+			//push this hash to the list of visited hashes
 			//we can't visit it again unless it returns first
-			visitedArgs.push(argument);
+			visitedArgs.push(hash);
 		}
 		try {
-			value = inputFunction.call(this, argument);
+			result = inputFunction.apply(this, arguments);
 		} finally{
-			//this argument returns or fails, pull it from the array
-			visitedArgs = _.without(visitedArgs, argument);
+			//this hash returns or fails, pull it from the array
+			visitedArgs = _.without(visitedArgs, hash);
 		}
-		return value;
+		return result;
 	};
 };

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

@@ -0,0 +1,60 @@
+Tracker.memoize = function(func, hasher){
+	var memoize  = function(key) {
+		var cache = memoize.cache;
+		var address = "" + (hasher ? hasher.apply(this, arguments) : key);
+		if (!_.has(cache, address)) {
+			cache[address] = new CacheObject(func, address, arguments, cache, this);
+		}
+		return cache[address].get();
+	};
+	memoize.cache = {};
+	return memoize;
+};
+
+function CacheObject(func, address, args, cache, context){
+	var self = this;
+	self.currentValue = null;
+	self.dep = new Tracker.Dependency();
+	self.numRun = 0;
+
+	//spawn a new autorun that keeps the value up-to-date
+	Tracker.nonreactive(function() {
+		Tracker.autorun(function(computation) {
+			//if this isn't the first run and nobody is listening,
+			//delete itself from cache and stop the computation
+			if (!computation.firstRun && !self.dep.hasDependents()){
+				computation.stop();
+				delete cache[address];
+				return;
+			}
+			//if we haven't run this before this flush, reset the counter after the flush
+			if(self.numRun === 0){
+				Tracker.afterFlush(function(){
+					self.numRun = 0;
+				});
+			}
+			self.numRun++;
+			//call the expensive function
+			//even if we don't use its value, we need to track its dependencies
+			var newValue = func.apply(context, args);
+			//prevent dependency loops, the memoized function shouldn't re-run
+			//more than once per flush
+			if (self.numRun > 1){
+				newValue = NaN;
+				if(_.isNaN(self.currentValue)) return;
+			}
+			//if the value changed, store the new value
+			if (self.currentValue !== newValue){
+				self.currentValue = newValue;
+				//tell the dependents that we've changed
+				self.dep.changed();
+			}
+		});
+	});
+}
+
+CacheObject.prototype.get = function() {
+	//if there is an active computation, track dependents
+	if (Tracker.active) this.dep.depend();
+	return this.currentValue;
+};

rpg-docs/lib/methods/conditions.js

@@ -98,9 +98,9 @@ trackEncumbranceConditions = function(charId, templateInstance) {
 		});
 		var character = Characters.findOne(
 			charId,
-			{fields: {strength: 1, "settings": 1}}
+			{fields: {"settings": 1}}
 		);
-		var strength = character.attributeValue("strength");
+		var strength = Characters.calculate.attributeValue(charId, "strength");
 		var give = function(condition) {
 			Meteor.call("giveCondition", charId, condition);
 		};

rpg-docs/private/changeLogs/changeLogs.js

@@ -176,3 +176,70 @@ ChangeLogs.insert({
 		"Added a move item dialog to mobile devices, but it can't be accessed yet, because long-presses are broken",
 	],
 });
+
+ChangeLogs.insert({
+	version: "0.6.0",
+	changes: [
+		"Big performance improvements: loading characters that you've viewed recently and changing effects on characters should be much faster",
+		"Spell dialogs no longer show their casting time, range, etc. if those fields aren't filled in",
+		"The settings dialog now has a done button so it can be closed on small devices",
+		"Container dialogs now have the weight summaries rounded down properly",
+	],
+});
+
+ChangeLogs.insert({
+	version: "0.6.1",
+	changes: [
+		"Experience dialogs should update their edit-mode inputs properly now",
+	],
+});
+
+ChangeLogs.insert({
+	version: "0.6.2",
+	changes: [
+		"Fixed a regression which broke min and max effects",
+	],
+});
+
+ChangeLogs.insert({
+	version: "0.6.3",
+	changes: [
+		"Fixed a regression that stopped skills and attributes from rounding down correctly",
+		"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",
+	],
+});