Merge branch 'feature-carry-capacity-modifier'

Conflicts:
	rpg-docs/client/style/main.scss

rpg-docs/.gitignore

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

rpg-docs/.meteor/packages

@@ -16,7 +16,6 @@ differential:vulcanize
 matb33:collection-hooks
 zimme:collection-softremovable
 momentjs:moment
-mike:mocha
 dburles:mongo-collection-instances
 percolate:migrations
 ecwyne:mathjs
@@ -24,3 +23,9 @@ useraccounts:polymer
 accounts-google
 splendido:accounts-meld
 email
+fourseven:scss@2.1.1
+wolves:bourbon
+meteorhacks:subs-manager
+meteorhacks:kadira
+chuangbo:marked
+reywood:iron-router-ga

rpg-docs/.meteor/versions

@@ -6,7 +6,6 @@ accounts-ui@1.1.5
 accounts-ui-unstyled@1.1.7
 aldeed:collection2@2.3.3
 aldeed:simple-schema@1.3.3
-amplify@1.0.0
 autoupdate@1.2.1
 base64@1.0.3
 binary-heap@1.0.3
@@ -15,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
@@ -25,6 +25,7 @@ ecwyne:mathjs@0.25.0
 ejson@1.0.6
 email@1.0.6
 fastclick@1.0.3
+fourseven:scss@2.1.1
 geojson-utils@1.0.3
 google@1.1.5
 html-tools@1.0.4
@@ -50,30 +51,28 @@ logging@1.0.7
 matb33:collection-hooks@0.7.13
 meteor@1.1.6
 meteor-platform@1.2.2
-mike:mocha@0.5.4
+meteorhacks:kadira@2.21.0
+meteorhacks:meteorx@1.3.1
+meteorhacks:subs-manager@1.3.0
 minifiers@1.1.5
 minimongo@1.0.8
 mobile-status-bar@1.0.3
 momentjs:moment@2.10.3
 mongo@1.1.0
+mongo-livedata@1.0.8
 npm-bcrypt@0.7.8_2
 oauth@1.1.4
 oauth2@1.1.3
 observe-sequence@1.0.6
 ordered-dict@1.0.3
-package-version-parser@3.0.3
 percolate:migrations@0.7.5
-practicalmeteor:chai@1.9.2_3
-practicalmeteor:loglevel@1.1.0_3
 random@1.0.3
 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
-sanjo:long-running-child-process@1.0.3
-sanjo:meteor-files-helpers@1.1.0_4
-sanjo:meteor-version@1.0.0
 service-configuration@1.0.4
 session@1.1.0
 sha@1.0.3
@@ -90,12 +89,8 @@ underscore@1.0.3
 url@1.0.4
 useraccounts:core@1.9.1
 useraccounts:polymer@1.9.1
-velocity:chokidar@0.12.6_1
-velocity:core@0.6.1
-velocity:html-reporter@0.5.3
-velocity:meteor-internals@1.1.0_7
-velocity:shim@0.1.0
 webapp@1.2.0
 webapp-hashing@1.0.3
+wolves:bourbon@1.0.0
 zimme:collection-behaviours@1.0.4
 zimme:collection-softremovable@1.0.4

rpg-docs/Model/Character/Attacks.js

@@ -24,18 +24,12 @@ Schemas.Attack = new SimpleSchema({
 		optional: true,
 		trim: false,
 	},
-	damageBonus: {
+	damage: {
 		type: String,
-		defaultValue: "strengthMod",
+		defaultValue: "1d8 + {strengthMod}",
 		optional: true,
 		trim: false,
 	},
-	damageDice: {
-		type: String,
-		optional: true,
-		defaultValue: "1d8",
-		allowedValues: DAMAGE_DICE,
-	},
 	damageType: {
 		type: String,
 		allowedValues: [

rpg-docs/Model/Character/Buffs.js

@@ -1,28 +1,51 @@
 Buffs = new Mongo.Collection("buffs");
 
-//buffs are temporary once applied and store things which expire and their expiry time
 Schemas.Buff = new SimpleSchema({
-	//buff id
-	_id: {
-		type: String,
-		regEx: SimpleSchema.RegEx.Id,
-		autoValue: function(){
-			if (!this.isSet) return Random.id();
-		},
-	},
 	charId: {
 		type: String,
 		regEx: SimpleSchema.RegEx.Id,
 	},
-	//expiry time
+	name: {
-	expiry:     {type: Number, optional: true},
+		type: String,
-	duration:	{type: Number},
+		trim: false,
+	},
+	description: {
+		type: String,
+		optional: true,
+		trim: false,
+	},
+	enabled: {
+		type: Boolean,
+		defaultValue: true,
+	},
+	type: {
+		type: String,
+		allowedValues: [
+			"inate",
+			"custom",
+		],
+	},
+	"lifeTime.total": {
+		type: Number,
+		defaultValue: 0, //0 is infinite
+		min: 0,
+	},
+	"lifeTime.spent": {
+		type: Number,
+		defaultValue: 0,
+		min: 0,
+	},
+	color: {
+		type: String,
+		allowedValues: _.pluck(colorOptions, "key"),
+		defaultValue: "q",
+	},
 });
 
 Buffs.attachSchema(Schemas.Buff);
 
 Buffs.attachBehaviour("softRemovable");
-makeParent(Buffs, "name"); //parents of effects and attacks
+makeParent(Buffs, ["name", "enabled"]); //parents of effects
 
 Buffs.allow(CHARACTER_SUBSCHEMA_ALLOW);
 Buffs.deny(CHARACTER_SUBSCHEMA_DENY);

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},
+	name:         {type: String, defaultValue: "", trim: false, optional: true},
-	alignment:    {type: String, defaultValue: "", trim: false},
+	alignment:    {type: String, defaultValue: "", trim: false, optional: true},
-	gender:       {type: String, defaultValue: "", trim: false},
+	gender:       {type: String, defaultValue: "", trim: false, optional: true},
-	race:         {type: String, defaultValue: "", trim: false},
+	race:         {type: String, defaultValue: "", trim: false, optional: true},
-	description:  {type: String, defaultValue: "", trim: false},
+	picture:      {type: String, defaultValue: "", trim: true,  optional: true},
-	personality:  {type: String, defaultValue: "", trim: false},
+	description:  {type: String, defaultValue: "", trim: false, optional: true},
-	ideals:       {type: String, defaultValue: "", trim: false},
+	personality:  {type: String, defaultValue: "", trim: false, optional: true},
-	bonds:        {type: String, defaultValue: "", trim: false},
+	ideals:       {type: String, defaultValue: "", trim: false, optional: true},
-	flaws:        {type: String, defaultValue: "", trim: false},
+	bonds:        {type: String, defaultValue: "", trim: false, optional: true},
-	backstory:    {type: String, defaultValue: "", trim: false},
+	flaws:        {type: String, defaultValue: "", trim: false, optional: true},
+	backstory:    {type: String, defaultValue: "", trim: false, optional: true},
 
 	//attributes
 	//ability scores
@@ -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},
@@ -159,6 +161,7 @@ Schemas.Character = new SimpleSchema({
 	deathSave:      {type: Schemas.DeathSave},
 
 	//permissions
+	party:   {type: String, regEx: SimpleSchema.RegEx.Id, optional: true},
 	owner:   {type: String, regEx: SimpleSchema.RegEx.Id},
 	readers: {type: [String], regEx: SimpleSchema.RegEx.Id, defaultValue: []},
 	writers: {type: [String], regEx: SimpleSchema.RegEx.Id, defaultValue: []},
@@ -168,61 +171,122 @@ Schemas.Character = new SimpleSchema({
 		defaultValue: "q",
 	},
 	//TODO add per-character settings
-	"settings.experiencesInc": {type: Number, defaultValue: 20}, //how many experiences to load at a time in XP table
+	//how many experiences to load at a time in XP table
+	"settings.experiencesInc": {type: Number, defaultValue: 20},
+	//slowed down by carrying too much?
+	"settings.useVariantEncumbrance": {type: Boolean, defaultValue: false},
+	"settings.useStandardEncumbrance": {type: Boolean, defaultValue: true},
+	//hide spellcasting
+	"settings.hideSpellcasting": {type: Boolean, defaultValue: false},
+	//show to anyone with link
+	"settings.viewPermission": {
+		type: String,
+		defaultValue: "whitelist",
+		allowedValues: ["whitelist", "public"],
+	},
 });
 
 Characters.attachSchema(Schemas.Character);
 
-var attributeBase = function(charId, statName){
+var attributeBase = preventLoop(function(charId, statName){
 	check(statName, String);
-	var effects = Effects.find(
+	//if it's a damage multiplier, we treat it specially
-		{charId: charId, stat: statName, enabled: true}
+	if (_.contains(DAMAGE_MULTIPLIERS, statName)){
-	).fetch();
+		var invulnerabilityCount = Effects.find({
-	effects = _.groupBy(effects, "operation");
+			charId: charId,
-	var value = _.contains(DAMAGE_MULTIPLIERS, statName) ? 1 : 0;
+			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){
+			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;
 
-	//start with the highest base value
+	Effects.find({
-	_.each(effects.base, function(effect){
+		charId: charId,
-		var efv = evaluateEffect(charId, effect);
+		stat: statName,
-		if (efv > value){
+		enabled: true,
-			value = efv;
+		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
+	var result = (base + add) * mul;
-	_.each(effects.add, function(effect){
+	if (result < min) result = min;
-		value += evaluateEffect(charId, effect);
+	if (result > max) result = max;
-	});
 
-	//multiply all the mul values
+	return Math.floor(result);
-	_.each(effects.mul, function(effect){
+});
-		value *= evaluateEffect(charId, effect);
-	});
 
-	//ensure value is >= all mins
+if (Meteor.isClient) {
-	_.each(effects.min, function(effect){
+	Template.registerHelper("characterCalculate", function(func, charId, input) {
-		var min = evaluateEffect(charId, effect);
+		try {
-		value = value > min ? value : min;
+			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
+//create a local memoize with a argument concatenating hash function
-	_.each(effects.max, function(effect){
+var memoize = function(f) {
-		var max = evaluateEffect(charId, effect);
+	return Tracker.memoize(f, function() {
-		value = value < max ? value : max;
+		return _.reduce(arguments, function(memo, arg) {
+			return memo + arg;
+		}, "");
 	});
-	return value;
 };
 
-//functions and calculated values.
+//memoize funcitons that have finds and slow loops
-//These functions can only rely on this._id since no other
+Characters.calculate = {
-//field is likely to be attached to all returned characters
+	getField: function(charId, fieldName) {
-Characters.helpers({
-	//returns the value stored in the field requested
-	//will set up dependencies on just that field
-	getField : function(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(
@@ -235,8 +299,7 @@ Characters.helpers({
 		}
 		return field;
 	},
-	//returns the value of a field
+	fieldValue: function(charId, fieldName) {
-	fieldValue : function(fieldName){
 		if (!Schemas.Character.schema(fieldName)){
 			throw new Meteor.Error(
 				"Field not found",
@@ -246,102 +309,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: memoize(function(charId, attributeName){
-	attributeValue: function(attributeName){
+		var attribute = Characters.calculate.getField(charId, attributeName);
-		var charId = this._id;
-		var attribute = this.getField(attributeName);
 		//base value
-		var value = this.attributeBase(attributeName);
+		var value = Characters.calculate.attributeBase(charId, attributeName);
 		//plus adjustment
 		value += attribute.adjustment;
 		return value;
-	},
+	}),
-
+	attributeBase: memoize(function(charId, attributeName){
-	attributeBase: preventLoop(function(attributeName){
-		var charId = this._id;
-		//base value
 		return attributeBase(charId, attributeName);
 	}),
-
+	skillMod: memoize(preventLoop(function(charId, skillName){
-	skillMod: preventLoop(function(skillName){
+		var skill = Characters.calculate.getField(charId, skillName);
-		var charId = this._id;
-		var skill = this.getField(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(
+		var value;
-			{charId: charId, stat: skillName, enabled: true}
+		var add = 0;
-		).fetch();
+		var mul = 1;
-		var effects = _.groupBy(rawEffects, "operation");
+		var min = Number.NEGATIVE_INFINITY;
-		_.forEach(effects.add, function(effect){
+		var max = Number.POSITIVE_INFINITY;
-			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);
-	}),
 
-	proficiency: function(skillName){
+		Effects.find({
-		var charId = this._id;
+			charId: charId,
-		//return largest value in proficiency array
+			stat: skillName,
-		var prof = 0;
+			enabled: true,
-		Proficiencies.find(
+			operation: {$in: ["base", "add", "mul", "min", "max"]},
-			{charId: charId, name: skillName, enabled: true}
+		}).forEach(function(effect) {
-		).forEach(function(proficiency){
+			value = evaluateEffect(charId, effect);
-			var newProf = proficiency.value;
+			if (effect.operation === "add"){
-			if (newProf > prof){
+				add += value;
-				prof = newProf;
+			} 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){
+		return Math.floor(result);
-		if (_.isString(skillName)){
+	})),
-			var skill = this.getField(skillName);
+	proficiency: memoize(function(charId, skillName){
-		}
+		//return largest value in proficiency array
-		var charId = this._id;
+		var prof = Proficiencies.findOne(
-		var mod = +this.skillMod(skillName);
+			{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;
+		var advantage = Characters.calculate.advantage(charId, skillName);
-		//TODO decide whether (dis)advantage gives (-)+5 to passive checks
+		value += 5 * advantage;
-	},
+		return Math.floor(value);
-
+	}),
-	advantage: function(skillName){
+	advantage: memoize(function(charId, skillName){
-		var charId = this._id;
 		var advantage = Effects.find(
 			{charId: charId, stat: skillName, enabled: true, operation: "advantage"}
 		).count();
@@ -351,19 +404,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)
+		);
 	},
-
+	passiveAbility: function(charId, attribute){
-	abilityMod: function(attribute){
+		var mod = +getMod(Characters.calculate.attributeValue(charId, attribute));
-		return signedString(getMod(this.attributeValue(attribute)));
-	},
-
-	passiveAbility: function(attribute){
-		var mod = +getMod(this.attributeValue(attribute));
 		return 10 + mod;
 	},
-
+	xpLevel: function(charId){
-	xpLevel: function(){
+		var xp = Characters.calculate.experience(charId);
-		var xp = this.experience();
 		for (var i = 0; i < 19; i++){
 			if (xp < XP_TABLE[i]){
 				return i;
@@ -372,30 +424,103 @@ Characters.helpers({
 		if (xp > 355000) return 20;
 		return 0;
 	},
-
+	level: memoize(function(charId){
-	level: function(){
 		var level = 0;
-		Classes.find({charId: this._id}).forEach(function(cls){
+		Classes.find({charId: charId}).forEach(function(cls){
 			level += cls.level;
 		});
 		return level;
-	},
+	}),
-
+	experience: memoize(function(charId){
-	experience: function(){
 		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});
@@ -408,8 +533,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/Effects.js

@@ -61,7 +61,6 @@ Effects.attachSchema(Schemas.Effect);
 if (Meteor.isServer) Characters.after.insert(function(userId, char) {
 	Effects.insert({
 		charId: char._id,
-		type: "inate",
 		name: "Constitution modifier for each level",
 		stat: "hitPoints",
 		operation: "add",
@@ -69,11 +68,11 @@ if (Meteor.isServer) Characters.after.insert(function(userId, char) {
 		parent: {
 			id: char._id,
 			collection: "Characters",
+			group: "Inate",
 		},
 	});
 	Effects.insert({
 		charId: char._id,
-		type: "inate",
 		name: "Proficiency bonus by level",
 		stat: "proficiencyBonus",
 		operation: "add",
@@ -81,11 +80,11 @@ if (Meteor.isServer) Characters.after.insert(function(userId, char) {
 		parent: {
 			id: char._id,
 			collection: "Characters",
+			group: "Inate",
 		},
 	});
 	Effects.insert({
 		charId: char._id,
-		type: "inate",
 		name: "Dexterity Armor Bonus",
 		stat: "armor",
 		operation: "add",
@@ -93,11 +92,11 @@ if (Meteor.isServer) Characters.after.insert(function(userId, char) {
 		parent: {
 			id: char._id,
 			collection: "Characters",
+			group: "Inate",
 		},
 	});
 	Effects.insert({
 		charId: char._id,
-		type: "inate",
 		name: "Natural Armor",
 		stat: "armor",
 		operation: "base",
@@ -105,6 +104,19 @@ if (Meteor.isServer) Characters.after.insert(function(userId, char) {
 		parent: {
 			id: char._id,
 			collection: "Characters",
+			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",
 		},
 	});
 });

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

rpg-docs/Model/Inventory/Items.js

@@ -10,6 +10,7 @@ Schemas.Item = new SimpleSchema({
 	value:		{type: Number, min: 0, defaultValue: 0, decimal: true},
 	enabled:    {type: Boolean, defaultValue: false},
 	requiresAttunement: {type: Boolean, defaultValue: false},
+	"settings.showIncrement": {type: Boolean, defaultValue: false},
 	color:      {
 		type: String,
 		allowedValues: _.pluck(colorOptions, "key"),

rpg-docs/Model/Meta/ChangeLogs.js

@@ -0,0 +1,27 @@
+ChangeLogs = new Mongo.Collection("changeLogs");
+
+Schemas.ChangeLog = new SimpleSchema({
+	version: {
+		type: String,
+	},
+	changes: {
+		type: [String],
+	},
+});
+
+ChangeLogs.attachSchema(Schemas.ChangeLog);
+
+ChangeLogs.allow({
+	insert: function(userId, doc) {
+		var user = Meteor.users.findOne(userId);
+		if (user) return _.contains(user.roles, "admin");
+	},
+	update: function(userId, doc, fields, modifier) {
+		var user = Meteor.users.findOne(userId);
+		if (user) return _.contains(user.roles, "admin");
+	},
+	remove: function(userId, doc) {
+		var user = Meteor.users.findOne(userId);
+		if (user) return _.contains(user.roles, "admin");
+	},
+});

rpg-docs/Model/Meta/Reports.js

@@ -0,0 +1,79 @@
+Reports = new Mongo.Collection("reports");
+
+Schemas.Report = new SimpleSchema({
+	owner: {
+		type: String,
+		regEx: SimpleSchema.RegEx.Id,
+	},
+	title: {
+		type: String,
+		trim: false,
+		optional: true,
+	},
+	description: {
+		type: String,
+		trim: false,
+		optional: true,
+	},
+	type: {
+		type: String,
+		allowedValues: ["bug", "change", "feature", "general"],
+		defaultValue: "bug",
+	},
+	//the immediate impact of doing this action (eg. -1 rages)
+	severity: {
+		type: Number,
+		defaultValue: 5,
+		min: 1,
+		max: 10,
+	},
+	metaData: {
+		type: Object,
+		blackbox: true,
+	},
+});
+
+Reports.attachSchema(Schemas.Report);
+
+Meteor.methods({
+	insertReport: function(report) {
+		check(report, {
+			title: String,
+			description: String,
+			type: String,
+			severity: Number,
+			metaData: Object,
+		});
+		report.owner = this.userId;
+		var id = Reports.insert(report);
+		var user = Meteor.users.findOne(this.userId);
+		var sender = user &&
+			user.emails &&
+			user.emails[0] &&
+			user.emails[0].address ||
+			user.services &&
+			user.services.google &&
+			user.services.google.email ||
+			"reports@dicecloud.com";
+		var bodyText = "Report ID: " + id +
+			"\nSeverity: " + report.severity +
+			"\nType: " + report.type +
+			"\n\n" + report.description;
+		Email.send({
+			from: sender,
+			to: "stefan.zermatten@gmail.com",
+			subject: "DiceCloud feedback - " + report.title,
+			text: bodyText,
+		});
+	},
+	deleteReport: function(id) {
+		var user = Meteor.users.findOne(this.userId);
+		if (!_.contains(user.roles, "admin")){
+			throw new Meteor.Error(
+				"not admin",
+				"The user must be an administrator to delete feedback"
+			);
+		}
+		Reports.remove(id);
+	},
+});

rpg-docs/Routes/Routes.js

@@ -1,20 +1,13 @@
 Router.configure({
 	loadingTemplate: "loading",
 	layoutTemplate: "layout",
+	trackPageView: true,
 });
 
 Router.plugin("ensureSignedIn", {
-	except: [
+	only: [
-		"home",
+		"profile",
-		"atSignIn",
+		"characterList",
-		"atSignUp",
-		"atForgotPassword",
-		"atResetPwd",
-		"atEnrollAccount",
-		"atVerifyEmail",
-		"atresendVerificationEmail",
-		"loginButtons",
-		"notFound",
 	]
 });
 
@@ -23,16 +16,19 @@ Router.plugin("dataNotFound", {notFoundTemplate: "notFound"});
 Router.map(function() {
 	this.route("/", {
 		name: "home",
+		onAfterAction: function() {
+			document.title = appName;
+		},
 	});
 
 	this.route("characterList", {
 		path: "/characterList",
 		waitOn: function(){
-			return Meteor.subscribe("characterList", Meteor.userId());
+			return subsManager.subscribe("characterList", Meteor.userId());
 		},
 		data: {
 			characters: function(){
-				return Characters.find({}, {fields: {_id: 1}});
+				return Characters.find({}, {fields: {_id: 1}, sort: {name: 1}});
 			}
 		},
 		onAfterAction: function() {
@@ -44,13 +40,13 @@ Router.map(function() {
 		path: "/character/:_id",
 		waitOn: function(){
 			return [
-				Meteor.subscribe("singleCharacter", this.params._id, Meteor.userId()),
+				subsManager.subscribe("singleCharacter", this.params._id, Meteor.userId()),
 			];
 		},
 		data: function() {
 			var data = Characters.findOne(
 				{_id: this.params._id},
-				{fields: {_id: 1, name: 1, color: 1}}
+				{fields: {_id: 1, name: 1, color: 1, writers: 1, readers: 1}}
 			);
 			return data;
 		},
@@ -61,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", {
@@ -74,7 +76,27 @@ Router.map(function() {
 		},
 	});
 
-	this.route("/loginButtons", {
+	this.route("/changelog", {
-		name: "loginButtons",
+		name: "changeLog",
-	})
+		waitOn: function() {
+			return [
+				subsManager.subscribe("changeLog"),
+			]
+		},
+		data: {
+			changeLogs: function() {
+				return ChangeLogs.find({}, {sort: {version: -1}});
+			}
+		},
+		onAfterAction: function() {
+			document.title = appName;
+		},
+	});
+
+	this.route("/guide", {
+		name: "guide",
+		onAfterAction: function() {
+			document.title = appName;
+		},
+	});
 });

rpg-docs/bower.json

@@ -13,10 +13,9 @@
     "tests"
   ],
   "dependencies": {
-    "polymer": "Polymer/polymer#~0.5.4",
+    "polymer": "Polymer/polymer#~0.5.5",
-    "core-elements": "Polymer/core-elements#~0.5.4",
+    "core-elements": "Polymer/core-elements#~0.5.5",
-    "paper-elements": "Polymer/paper-elements#~0.5.4",
+    "paper-elements": "Polymer/paper-elements#~0.5.5"
-	"paper-fab-menu": "cwdoh/paper-fab-menu"
   },
   "resolutions": {
     "core-component-page": "^0.5.0",

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

@@ -0,0 +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/globalHelpers/openParentDialog.js

@@ -20,6 +20,11 @@ openParentDialog = function(parent, charId, heroId) {
 			template: "itemDialog",
 			data:     {itemId: parent.id},
 		};
+	} else if (parent.collection === "Spells") {
+		detail = {
+			template: "spellDialog",
+			data:     {spellId: parent.id},
+		};
 	}
 	detail.heroId = heroId;
 	detail.charId = charId;

rpg-docs/client/globalHelpers/valueString.js

@@ -1,25 +1,27 @@
 Template.registerHelper("valueString", function(value) {
+	var intValue = Math.round(value * 100);
+	var cp = intValue % 10;
+	intValue -= cp;
+	cp = Math.round(cp);
+	sp = intValue % 100;
+	intValue -= sp;
+	sp = Math.round(sp / 10)
+	gp = Math.floor(value);
+
 	var resultArray = [];
-	//sp
-	var gp = Math.floor(value);
 	if (gp > 0) {
 		resultArray.push(gp + "gp");
 	}
-	//sp
-	var sp = Math.floor(10 * (value % 1));
 	if (sp > 0) {
 		resultArray.push(sp + "sp");
 	}
-	//cp
-	var cp = 10 * ((value * 10) % 1);
-	cp = Math.round(cp * 1000) / 1000;
 	if (cp > 0) {
 		resultArray.push(cp + "cp");
 	}
 
 	//build string with correct spacing
 	var result = "";
-	for (var i = 0; i < resultArray.length; i++) {
+	for (var i = 0, l = resultArray.length; i < l; i++) {
 		//add a space between values
 		if (i !== 0) {
 			result += " ";

rpg-docs/client/style/cards.scss

@@ -0,0 +1,96 @@
+@import "bourbon/bourbon";
+
+$thickColumnWidth: 304px;
+$thinColumnWidth: 240px;
+
+//Column layouts of cards
+.column-container {
+	@include column-fill(balance);
+	@include column-gap(8px);
+	@include column-width($thickColumnWidth);
+	padding: 8px;
+
+	&.thin-columns {
+		@include column-count(4);
+		@include column-width($thinColumnWidth);
+	}
+}
+
+//Cards
+.card {
+	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;
+		border-radius: 2px 2px 0 0;
+		&.white {
+			cursor: auto;
+			padding: 16px;
+			border-bottom: rgba(0,0,0,0.12) solid 1px;
+		}
+		paper-checkbox::shadow #ink[checked] {
+			color: #ffffff;
+		}
+		paper-checkbox::shadow #ink {
+			color: #ffffff;
+		}
+		paper-checkbox::shadow #checkbox.checked {
+			background-color: #ffffff;
+			background-color: rgba(255,255,255,0.27);
+			border-color: #ffffff;
+			border-color: rgba(255,255,255,0.27);
+		}
+		paper-checkbox::shadow #checkbox {
+			border-color: #ffffff;
+			border-color: rgba(255,255,255,0.54);
+		}
+	}
+	.bottom {
+		padding: 16px;
+		border-radius: 0 0 2px 2px;
+		&.list {
+			padding: 0 0 16px 0;
+			.subhead {
+				color: rgba(0,0,0,0.54);
+				font-size: 14px;
+				font-weight: 500;
+				letter-spacing: 0.010em;
+				padding: 12px 16px 12px 16px;
+			}
+		}
+		&.text {
+			white-space: pre-wrap;
+		}
+	}
+	.left {
+		padding: 16px;
+		border-radius: 2px 0 0 2px;
+		text-align: center;
+		min-width: 72px;
+	}
+	.right {
+		padding: 16px;
+		border-radius: 0 2px 2px 0;
+	}
+}
+
+/* undo pointer cursor on detail box heading */
+#globalDetail.card .top {
+	cursor: auto;
+}

rpg-docs/client/style/colors.scss

@@ -70,8 +70,8 @@
 	background-color: #9E9E9E;
 }
 
-.blue-grey {
+.app-grey {
-	background-color: #607D8B;
+	background-color: #424242;
 }
 
 .white {

rpg-docs/client/style/listItem.scss

@@ -0,0 +1,37 @@
+/*
+List items
+*/
+.item-slot {
+	background-color: rgb(232, 232, 232);
+	background-color: rgba(0, 0, 0, 0.1);	
+}
+
+.item {
+	background: white;
+	cursor: pointer;
+	font-size: 16px;
+	height: 40px;
+	margin: 1px 0 1px 0;
+	padding: 0 16px 0 16px;
+	position: relative;
+	transition: box-shadow 0.3s ease, opacity 0.5s ease-in-out;
+	&.small {
+		height: 32px;
+	}
+	&.tall {
+		height: 56px;
+	}
+	&.flexible {
+		height: auto;
+		padding-top: 16px;
+		padding-bottom: 16px;
+	}
+	&[hero], &:active{
+		box-shadow: 0 0 2px 0 rgba(0, 0, 0, 0.37);
+		z-index: 10;
+	}
+	core-icon, paper-icon-button {
+		color: #747474;
+		color: rgba(0,0,0,0.54);
+	}
+}

rpg-docs/client/style/main.scss

@@ -0,0 +1,89 @@
+@import "bourbon/bourbon";
+@import "colors";
+
+//apply a natural box layout model to all elements
+*, *:before, *:after {
+	-moz-box-sizing: border-box;
+	-webkit-box-sizing: border-box;
+	box-sizing: border-box;
+}
+
+root {
+	display: block;
+}
+
+body {
+	font-family: 'Roboto', 'Helvetica Neue', Helvetica, Arial;
+	margin: 0;
+	overflow-x: hidden;
+	background-color: #E0E0E0;
+}
+
+//fix tabs and core-toolbar having box shadow
+core-toolbar {
+	box-shadow: none;
+}
+
+//give drawer panel a shadow always
+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;
+	opacity: 0.12;
+	border-width: 0;
+	color: #444;
+	height: 1px;
+	line-height: 0;
+	margin: 16px 0;
+	text-align: center;
+}
+
+//FABs
+.floatyButton {
+	position: absolute;
+	bottom: 24px;
+	right: 24px;
+}
+
+//Buttons
+paper-button {
+	color: #000;
+	color: rgba(0,0,0,0.87);
+	font-size: 14px;
+	font-weight: 400;
+	letter-spacing: 0.010;
+	text-transform: uppercase;
+}
+
+//Style shortcuts
+.scroll-y {
+	overflow-y: auto;
+}
+
+.clickable, core-item, paper-tab {
+	cursor: pointer;
+}
+
+.pre-wrap, .prewrap{
+	white-space: pre-wrap;
+}
+
+.padded {
+	padding: 8px;
+}
+
+.fullwidth {
+	width: 100%;
+}
+
+.fab-buffer {
+    height: 100px;
+}

rpg-docs/client/style/shadowDom.css

@@ -0,0 +1,20 @@
+.card .left paper-icon-button {
+	display: block;
+	height: 32px;
+	padding: 0;
+	width: 32px;
+}
+
+.card .left paper-icon-button[disabled] {
+	color: rgba(255, 255, 255, 0.2);
+}
+
+.card .left paper-icon-button /deep/ core-icon {
+	height: 32px;
+	width: 32px;
+}
+
+/*fix paper-dropdowns*/
+body /deep/ core-menu {
+	overflow-x: hidden !important;
+}

rpg-docs/client/style/tables.scss

@@ -0,0 +1,21 @@
+td {
+	padding: 8px;
+}
+
+.strengthTable{
+	width: 100%;
+	td{
+		&:nth-child(2) {
+			text-align: right;
+		}
+		&:nth-child(3) {
+			width: 250px;
+		}
+	}
+}
+
+.summaryTable  {
+	&:nth-child(3){
+		text-align: right;
+	}
+}

rpg-docs/client/views/GeneralCSS/general.css

@@ -1,268 +0,0 @@
-root {
-	display: block;
-}
-
-body {
-	font-family: 'Roboto', 'Helvetica Neue', Helvetica, Arial;
-	margin: 0;
-	overflow-x: hidden;
-}
-
-body.core-narrow {
-	padding: 8px;
-}
-
-body /deep/ core-menu {
-	overflow-x: hidden !important;
-}
-
-.calculatedValue {
-	color: #021C33;
-	font-weight: bold;
-}
-
-* {
-	box-sizing: border-box;
-}
-
-td {
-	padding: 0;
-}
-
-table {
-	border-spacing: 0;
-}
-
-.summaryTable td{
-	text-align: right;
-	padding: 4px;
-	min-width: 80px;
-}
-
-.summaryTable td:first-child {
-	text-align: left;
-}
-
-hr {
-	background-color: #444;
-	opacity: 0.12;
-	border-width: 0;
-	color: #444;
-	height: 1px;
-	line-height: 0;
-	margin: 0 -16px;
-	text-align: center;
-}
-
-paper-button {
-	font-size: 14px;
-	font-weight: 400;
-	text-transform: uppercase;
-	color: #000;
-	color: rgba(0,0,0,0.87);
-	letter-spacing: 0.010;
-}
-
-core-item {
-	cursor: pointer;
-}
-
-.listRow {
-	height: 32px;
-}
-
-.card {
-	margin-bottom: 8px;
-	/*hack to stop flickering*/
-	-webkit-backface-visibility: hidden;
-	-webkit-transform: translateX(0);
-	/*stop divs breaking over divide*/
-	-webkit-column-break-inside: avoid;
-	page-break-inside: avoid;
-	break-inside: avoid;
-	/*Fixes extra margin at top of columns*/
-	display: inline-block;
-
-	width: 100%;
-
-	font-size: 14px;
-	border-radius: 2px;
-	background-color: white;
-}
-
-.card.double {
-	padding: 0;
-}
-
-.card paper-button {
-	font-size: 14px;
-	letter-spacing: 0.01em;
-}
-
-.cardHeader {
-	height: 48px;
-	padding: 0 16px 0 16px;
-	align-content: center;
-	font-size: 14px;
-	font-weight: 400;
-	color: rgba(0, 0, 0, 0.54);
-}
-
-.clickable, .statCard, .abilityMiniCard {
-	cursor: pointer;
-}
-
-.skillRow {
-	cursor: pointer;
-}
-
-.resourceCards {
-	padding: 4px 4px 0 4px;
-	margin-bottom: -4px;
-}
-
-.resourceCards .card {
-	width: 180px;
-	margin: 4px;
-	flex-grow: 1;
-	flex-shrink: 1;
-}
-
-.grey-background, body {
-	background-color: #E0E0E0;
-}
-
-.center {
-	text-align: center;
-}
-
-.screen-center {
-	position: fixed;
-	top: 50%;
-	left: 50%;
-	-webkit-transform: translate(-50%, -50%);
-	transform: translate(-50%, -50%);
-}
-
-.scroll-y {
-	overflow-y: auto;
-}
-
-.fab-buffer {
-	height: 88px;
-	width: 100%;
-	order: 999;
-}
-
-*[hidden] {
-	visibility: hidden;
-}
-
-.hidden{
-	opacity: 0;
-}
-
-@media (max-width: 640px) {
-	html /deep/ paper-action-dialog[global-dialog] {
-		top: 0 !important;
-		left: 0 !important;
-		width: 100%;
-		height: 100%;
-		margin: 0;
-		border-radius: 0;
-	}
-}
-
-.floatyButton {
-	position: absolute;
-	bottom: 24px;
-	right: 24px;
-}
-
-.wideTable td {
-	padding: 4px 8px 4px 8px;
-}
-
-.wideTable table {
-	padding: 8px;
-}
-
-paper-fab-menu /deep/ .container {
-	padding: 24px !important;
-}
-
-paper-slider {
-	margin-left: -8px;
-}
-
-.list-subhead {
-	color: rgba(0,0,0,0.54);
-	font-size: 14px;
-	height: 40px;
-	padding-left: 16px;
-	font-weight: 500;
-}
-
-.whiteTop {
-	cursor: initial;
-	border-bottom: black solid 0.5px;
-	border-bottom: rgba(0,0,0,0.12) solid 1px;
-	background: white;
-	padding: 16px;
-	position: relative;
-	border-radius: 2px 2px 0 0;
-}
-
-.whiteTop paper-icon-button {
-	margin: -8px;
-}
-
-.fullwidth {
-	width: 100%;
-}
-
-.padded {
-	padding: 16px;
-}
-
-.listPadded {
-	padding: 0 0 16px 0; 
-}
-
-.rightPadded {
-	padding-right: 16px;
-}
-
-.bottomPadded {
-	padding-bottom: 16px;
-}
-
-.sideMargin {
-	margin-left: 16px;
-	margin-right: 16px;
-}
-
-.vertMargin {
-	margin-top: 16px;
-	margin-bottom: 16px;
-}
-
-.spaceAfter {
-	margin-bottom: 8px;
-}
-
-.s {
-	padding: 0 0 16px 0;
-}
-
-.leftRound{
-	border-radius: 2px 0 0 2px;
-}
-
-.preline {
-	white-space: pre-line;
-}
-
-.prewrap{
-	white-space: pre-wrap;
-}

rpg-docs/client/views/GeneralCSS/typography.css

@@ -18,7 +18,7 @@
 	letter-spacing: 0;
 }
 
-.white-text .display1{
+.white-text .display1, .white-text.display1{
 	color: rgba(255,255,255,0.54);
 }
 

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

@@ -3,36 +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>
-				<!--DamageType-->
-				<paper-dropdown-menu id="damageDiceDropdown" label="Damage Dice">
-					<paper-dropdown layered class="dropdown">
-						<core-menu class="menu"  selected={{damageDice}}>
-							{{#each DAMAGE_DICE}}
-								<paper-item name={{this}} class="containerMenuItem">{{this}}</paper-item>
-							{{/each}}
-						</core-menu>
-					</paper-dropdown>
-				</paper-dropdown-menu>
 				<!--damageBonus-->
-				<paper-input id="damageInput"
+				<paper-input class="damageInput"
-							 label="Damage Bonus"
+							 label="Damage"
 							 floatinglabel
-							 value={{damageBonus}}
+							 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}}
@@ -44,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

@@ -1,38 +1,43 @@
-var damageTypes = ["bludgeoning", "piercing", "slashing",
+var damageTypes = [
-				   "acid", "cold", "fire", "force", "lightning", "necrotic",
+	"bludgeoning",
-				  "poison", "psychic", "radiant", "thunder"];
+	"piercing",
+	"slashing",
+	"acid",
+	"cold",
+	"fire",
+	"force",
+	"lightning",
+	"necrotic",
+	"poison",
+	"psychic",
+	"radiant",
+	"thunder",
+];
 
 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: {damageBonus: 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");
 		if (value == this.damageType) return;
 		Attacks.update(this._id, {$set: {damageType: value}});
 	},
-	"core-select #damageDiceDropdown": function(event) {
-		var detail = event.originalEvent.detail;
-		if (!detail.isSelected) return;
-		var value = detail.item.getAttribute("name");
-		if (value == this.damageDice) return;
-		Attacks.update(this._id, {$set: {damageDice: value}});
-	}
 });
 
 Template.attackEdit.helpers({
@@ -41,5 +46,5 @@ Template.attackEdit.helpers({
 	},
 	DAMAGE_DICE: function() {
 		return DAMAGE_DICE;
-	}
+	},
 });

rpg-docs/client/views/character/attacks/attackView/attackView.html

@@ -1,11 +1,11 @@
 <template name="attackView">
 	<div class="attackView" layout horizontal>
-		<div class="headline rightPadded" layout horizontal center>
+		<div class="headline" style="margin-right: 16px;" layout horizontal center>
 			{{evaluateSigned charId attackBonus}}
 		</div>
 		<div layout vertical>
 			<div>
-				{{damageDice}}&nbsp;{{{evaluateSignedSpaced charId damageBonus}}}&nbsp;{{damageType}}
+				{{evaluateString charId damage}}&nbsp;{{damageType}}
 			</div>
 			{{#if details}}
 			<div class="caption">

rpg-docs/client/views/character/buffs/buffDialog/buffDialog.html

@@ -0,0 +1,15 @@
+<template name="buffDialog">
+	{{#with buff}}
+		{{#baseDialog title=name class=colorClass hideEdit=true}}
+			{{> buffDetails}}
+		{{/baseDialog}}
+	{{/with}}
+</template>
+
+<template name="buffDetails">
+	{{#if description}}
+		<div class="pre-wrap">{{evaluateString charId description}}</div>
+	{{/if}}
+
+	{{> effectsViewList charId=charId parentId=_id}}
+</template>

rpg-docs/client/views/character/buffs/buffDialog/buffDialog.js

@@ -0,0 +1,5 @@
+Template.buffDialog.helpers({
+	buff: function(){
+		return Buffs.findOne(this.buffId);
+	},
+});

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

@@ -1,3 +1,27 @@
 <template name="characterSettings">
-
+	{{#with character}}
+	<div style="height: 100px;">
+		<table style="width: 100%;">
+			<tr>
+				<td>Hide Spells tab</td>
+				<td>
+					<paper-toggle-button id="hideSpellcasting"
+										 checked={{settings.hideSpellcasting}}
+										 touch-action="pan-y">
+					</paper-toggle-button>
+				</td>
+			</tr>
+			<tr>
+				<td>Use variant encumbrance</td>
+				<td>
+					<paper-toggle-button id="variantEncumbrance"
+										 checked={{settings.useVariantEncumbrance}}
+										 touch-action="pan-y">
+					</paper-toggle-button>
+				</td>
+			</tr>
+		</table>
+	</div>
+	{{/with}}
+	<paper-button id="doneButton" affirmative> Done </paper-button>
 </template>

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

@@ -1,3 +1,26 @@
-Template.characterSettings.events({
+Template.characterSettings.helpers({
-
+	character: function() {
+		return Characters.findOne(this._id, {fields: {settings: 1}});
+	}
+});
+
+Template.characterSettings.events({
+	"change #variantEncumbrance": function(event, instance){
+		var value = instance.find("#variantEncumbrance").checked;
+		if (this.settings.useVariantEncumbrance !== value){
+			Characters.update(
+				this._id,
+				{$set: {"settings.useVariantEncumbrance": value}}
+			);
+		}
+	},
+	"change #hideSpellcasting": function(event, instance){
+		var value = instance.find("#hideSpellcasting").checked;
+		if (this.settings.hideSpellcasting !== value){
+			Characters.update(
+				this._id,
+				{$set: {"settings.hideSpellcasting": value}}
+			);
+		}
+	},
 });

rpg-docs/client/views/character/characterSettings/shareDialog.html

@@ -1,5 +1,17 @@
 <template name="shareDialog">
 	<div style="width: 360px;">
+		<div layout horizontal center>
+			<div>Who can view this character: </div>
+			<paper-dropdown-menu class="visibilityDropdown"
+								 label="Visibility">
+				<paper-dropdown layered class="dropdown">
+					<core-menu class="menu visibilityMenu" selected={{viewPermission}}>
+						<paper-item name="whitelist">Only people I share with</paper-item>
+						<paper-item name="public">Anyone with link</paper-item>
+					</core-menu>
+				</paper-dropdown>
+			</paper-dropdown-menu>
+		</div>
 		<div>
 			{{#if readers.count}}
 				<div style="font-weight: 500;">
@@ -7,7 +19,7 @@
 				</div>
 				{{#each readers}}
 					<div layout horizontal center>
-						<div flex>{{username}}</div>
+						<div flex>{{getUserName}}</div>
 						<paper-icon-button class="deleteShare" icon="delete"></paper-icon-button>
 					</div>
 				{{/each}}

rpg-docs/client/views/character/characterSettings/shareDialog.js

@@ -3,6 +3,10 @@ Template.shareDialog.onCreated(function(){
 });
 
 Template.shareDialog.helpers({
+	viewPermission: function() {
+		var char = Characters.findOne(this._id, {fields: {settings: 1}});
+		return char.settings.viewPermission || "whitelist";
+	},
 	readers: function(){
 		var char = Characters.findOne(this._id, {fields: {readers: 1}});
 		return Meteor.users.find({_id: {$in: char.readers}});
@@ -19,9 +23,20 @@ Template.shareDialog.helpers({
 			return "User not found";
 		}
 	},
+	getUserName: function() {
+		return this.username || "user: " + this._id;
+	}
 });
 
 Template.shareDialog.events({
+	"core-select .visibilityDropdown": function(event){
+		var detail = event.originalEvent.detail;
+		if (!detail.isSelected) return;
+		var value = detail.item.getAttribute("name");
+		var char = Characters.findOne(this._id, {fields: {settings: 1}});
+		if (value == char.settings.viewPermission) return;
+		Characters.update(this._id, {$set: {"settings.viewPermission": value}});
+	},
 	"input #userNameOrEmailInput":
 	function(event, instance){
 		var userName = instance.find("#userNameOrEmailInput").value;

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

@@ -5,24 +5,35 @@
 		<div flex>
 			{{name}}
 		</div>
-		<div>
+		{{#if canEditCharacter _id}}
-			{{> colorDropdown}}
+			<div>
-		</div>
+				{{> colorDropdown}}
-		<paper-menu-button>
+			</div>
-			<paper-icon-button icon="more-vert" noink></paper-icon-button>
+			<paper-menu-button>
-			<paper-dropdown class="dropdown" halign="right">
+				<paper-icon-button icon="more-vert" noink></paper-icon-button>
-				<core-menu class="menu" style="color: black; color: rgba(0,0,0,0.87);">
+				<paper-dropdown class="dropdown" halign="right">
-					<paper-item id="deleteCharacter"><core-icon icon="delete"></core-icon>Delete</paper-item>
+					<core-menu class="menu" style="color: black; color: rgba(0,0,0,0.87);">
-					<paper-item id="shareCharacter"><core-icon icon="social:share"></core-icon>Share</paper-item>
+						<paper-item id="deleteCharacter">
-				</core-menu>
+							<core-icon icon="delete"></core-icon>Delete
-			</paper-dropdown>
+						</paper-item>
-		</paper-menu-button>
+						<paper-item id="shareCharacter">
+							<core-icon icon="social:share"></core-icon>Share
+						</paper-item>
+						<paper-item id="characterSettings">
+							<core-icon icon="settings"></core-icon>Settings
+						</paper-item>
+					</core-menu>
+				</paper-dropdown>
+			</paper-menu-button>
+		{{/if}}
 		<div class="bottom fit" horizontal layout>
 			<paper-tabs flex horizontal center layout id="characterSheetTabs" selected={{selectedTab}} class="{{colorClass}}">
 				<paper-tab name="stats">Stats</paper-tab>
 				<paper-tab name="features">Features</paper-tab>
 				<paper-tab name="inventory">Inventory</paper-tab>
+				{{#unless hideSpellcasting}}
 				<paper-tab name="spells">Spells</paper-tab>
+				{{/unless}}
 				<paper-tab name="persona">Persona</paper-tab>
 				<paper-tab name="journal">Journal</paper-tab>
 			</paper-tabs>
@@ -33,7 +44,9 @@
 			<section flex name="stats">{{> stats}}</section>
 			<section flex name="features">{{> features}}</section>
 			<section flex name="inventory">{{> inventory}}</section>
+			{{#unless hideSpellcasting}}
 			<section flex name="spells">{{> spells}}</section>
+			{{/unless}}
 			<section flex name="persona">{{> persona}}</section>
 			<section flex name="journal">{{> journal}}</section>
 		</core-animated-pages>

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

@@ -1,6 +1,9 @@
-Template.characterSheet.created = function(){
+Template.characterSheet.onCreated(function() {
+	//default to the first tab
 	Session.setDefault(this.data._id + ".selectedTab", "stats");
-};
+	//watch this character and make sure their encumbrance is updated
+	trackEncumbranceConditions(this.data._id, this);
+});
 
 var setTab = function(charId, tab){
 	return Session.set(charId + ".selectedTab", tab);
@@ -13,7 +16,11 @@ var getTab = function(charId){
 Template.characterSheet.helpers({
 	selectedTab: function(){
 		return getTab(this._id);
-	}
+	},
+	hideSpellcasting: function() {
+		var char = Characters.findOne(this._id);
+		return char && char.settings.hideSpellcasting;
+	},
 });
 
 Template.characterSheet.events({
@@ -40,4 +47,11 @@ Template.characterSheet.events({
 			template: "shareDialog",
 		});
 	},
+	"tap #characterSettings": function(event, instance){
+		GlobalUI.showDialog({
+			heading: this.name + " Settings",
+			data: this,
+			template: "characterSettings",
+		});
+	},
 });

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

@@ -1,21 +1,13 @@
-body /deep/ #statGroupDropDown {
+html /deep/ .operationDropDown {
-	width: 120px;
+	width: 152px;
 }
 
-body /deep/ #statDropDown {
+html /deep/ .statDropDown {
-	width: 120px;
+	width: 152px;
 }
 
-body /deep/ #operationDropDown {
+html /deep/ .damageMultiplierDropDown {
-	width: 100px;
+	width: 152px;
-}
-
-body /deep/ #damageMultiplierDropDown {
-	width: 120px;
-}
-
-body /deep/ #proficiencyDropDown {
-	width: 120px;
 }
 
 html /deep/ .effectEdit paper-input {
@@ -24,6 +16,7 @@ html /deep/ .effectEdit paper-input {
 }
 
 html /deep/ .effectEdit {
+	height: 64px;
 	display: flex;
 	align-items: flex-end;
 }

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

@@ -1,27 +1,23 @@
 <template name="effectEdit">
 	<div class="effectEdit" layout horizontal center>
-		<paper-dropdown-menu class="statGroupDropDown" label="Stat Group" flex>
+		<paper-dropdown-menu class="statDropDown"
-			<paper-dropdown layered class="dropdown">
+							 label="Stat">
-				<core-menu class="menu statGroupMenu" selected={{selectedStatGroup}}>
+			<paper-dropdown layered
-					{{#each statGroups}}
+							class="dropdown">
-						<paper-item class="statGroupSelect" name={{this}}>{{this}}</paper-item>
+					<core-menu class="menu statMenu" selected={{stat}}>
-					{{/each}}
+						{{#each statGroups}}
-				</core-menu>
+							<div style="font-weight: bold;
-			</paper-dropdown>
+										margin-top: 16px;">{{this}}</div>
-		</paper-dropdown-menu>
+							{{#each stats}}
-		{{#if stats}}
+								<paper-item name={{stat}}>{{name}}</paper-item>
-			<paper-dropdown-menu class="statDropDown" label="Stat" flex>
+							{{/each}}
-				<paper-dropdown layered class="dropdown">
-					<core-menu class="menu statMenu"  selected={{stat}} on-tap="onStatMenuTap">
-						{{#each stats}}
-							<paper-item name={{stat}}>{{name}}</paper-item>
 						{{/each}}
 					</core-menu>
-				</paper-dropdown>
+			</paper-dropdown>
-			</paper-dropdown-menu>
+		</paper-dropdown-menu>
-		{{/if}}
 		{{#if operations}}
-			<paper-dropdown-menu class="operationDropDown" label="Operation" flex>
+			<paper-dropdown-menu class="operationDropDown"
+								 label="Operation">
 				<paper-dropdown layered class="dropdown">
 					<core-menu class="menu operationMenu" selected={{operation}}>
 						{{#each operations}}
@@ -31,24 +27,40 @@
 				</paper-dropdown>
 			</paper-dropdown-menu>
 		{{/if}}
-		{{> Template.dynamic template=effectValueTemplate}}
+		{{#if effectValueTemplate}}
-		<paper-icon-button class="deleteEffect" role="button" tabindex="0" icon="delete" aria-label="Delete"></paper-icon-button>
+			{{> Template.dynamic template=effectValueTemplate}}
+		{{else}}
+			<div flex></div>
+		{{/if}}
+		<paper-icon-button class="deleteEffect"
+						   icon="delete">
+		</paper-icon-button>
 		<br>
 	</div>
 </template>
 
 <template name="regularEffectValue">
-	<paper-input class="effectValueInput" label="Value" floatinglabel value={{effectValue}} flex></paper-input>
+	<paper-input class="effectValueInput" 
+				 label="Value" 
+				 floatinglabel 
+				 value={{effectValue}} 
+				 flex
+				 style="flex-basis: 100px;">
+	</paper-input>
 </template>
 
 <template name="multiplierEffectValue">
-	<paper-dropdown-menu class="damageMultiplierDropDown" label="Damage Multiplier" flex>
+	<paper-dropdown-menu class="damageMultiplierDropDown"
-		<paper-dropdown layered class="dropdown">
+						 label="Damage Multiplier">
-			<core-menu class="menu multiplierMenu" selected={{value}}>
+		<paper-dropdown layered
+						class="dropdown">
+			<core-menu class="menu multiplierMenu"
+					   selected={{value}}>
 				<paper-item name="0.5">Resistance</paper-item>
 				<paper-item name="2">Vulnerability</paper-item>
 				<paper-item name="0">Immunity</paper-item>
 			</core-menu>
 		</paper-dropdown>
 	</paper-dropdown-menu>
+	<div flex></div>
 </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"},
@@ -93,24 +94,17 @@ var skillOperations = [
 	{name: "Conditional Benefit", operation: "conditional"}
 ];
 
-Template.effectEdit.created = function(){
-	var statGroup = statsDict[this.data.stat] && statsDict[this.data.stat].group;
-	this.selectedStatGroup = new ReactiveVar(statGroup);
-};
-
 Template.effectEdit.helpers({
-	selectedStatGroup: function(){
-		return Template.instance().selectedStatGroup.get();
-	},
 	statGroups: function(){
 		return statGroupNames;
 	},
 	stats: function(){
-		var group = Template.instance().selectedStatGroup.get();
+		var group = this;
 		return statGroups[group];
 	},
 	operations: function(){
-		var group = Template.instance().selectedStatGroup.get();
+		var stat = statsDict[this.stat];
+		var group = stat && stat.group;
 		if (group === "Weakness/Resistance") return null;
 		if (group === "Saving Throws" || group === "Skills"){
 			return skillOperations;
@@ -120,7 +114,8 @@ Template.effectEdit.helpers({
 	},
 	effectValueTemplate: function(){
 		//resistance/vulnerability template
-		var group = Template.instance().selectedStatGroup.get();
+		var stat = statsDict[this.stat];
+		var group = stat && stat.group;
 		if (group === "Weakness/Resistance") return "multiplierEffectValue";
 
 		var op = this.operation;
@@ -144,25 +139,6 @@ Template.effectEdit.events({
 		Effects.softRemoveNode(this._id);
 		GlobalUI.deletedToast(this._id, "Effects", "Effect");
 	},
-	"core-select .statGroupDropDown": function(event, instance){
-		var detail = event.originalEvent.detail;
-		if (!detail.isSelected) return;
-		var groupName = detail.item.getAttribute("name");
-		var oldName = Template.instance().selectedStatGroup.get();
-		if (oldName != groupName){
-			instance.selectedStatGroup.set(groupName);
-			if (groupName === "Weakness/Resistance"){
-				Effects.update(this._id, {$set: {
-					value: 0.5,
-					calculation: "",
-					operation: "mul"}, $unset: {stat: ""}});
-			} else {
-				Effects.update(this._id,
-							   {$set: {operation: "add"},
-								$unset: {stat: "", value: "", calculation: ""}});
-			}
-		}
-	},
 	"core-select .statDropDown": function(event){
 		var detail = event.originalEvent.detail;
 		if (!detail.isSelected) return;

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

@@ -57,40 +57,40 @@ var stats = {
 	"d12HitDice":{"name":"d12 Hit Dice"},
 	"acidMultiplier":{"name":"Acid damage", "group": "Weakness/Resistance"},
 	"bludgeoningMultiplier":{
-		"name":"Bludgeoning damage", "group": "Weakness/Resistance"
+		"name":"Bludgeoning damage", "group": "Weakness/Resistance",
 	},
 	"coldMultiplier":{
-		"name":"Cold damage", "group": "Weakness/Resistance"
+		"name":"Cold damage", "group": "Weakness/Resistance",
 	},
 	"fireMultiplier":{
-		"name":"Fire damage", "group": "Weakness/Resistance"
+		"name":"Fire damage", "group": "Weakness/Resistance",
 	},
 	"forceMultiplier":{
-		"name":"Force damage", "group": "Weakness/Resistance"
+		"name":"Force damage", "group": "Weakness/Resistance",
 	},
 	"lightningMultiplier":{
-		"name":"Lightning damage", "group": "Weakness/Resistance"
+		"name":"Lightning damage", "group": "Weakness/Resistance",
 	},
 	"necroticMultiplier":{
-		"name":"Necrotic damage", "group": "Weakness/Resistance"
+		"name":"Necrotic damage", "group": "Weakness/Resistance",
 	},
 	"piercingMultiplier":{
-		"name":"Piercing damage", "group": "Weakness/Resistance"
+		"name":"Piercing damage", "group": "Weakness/Resistance",
 	},
 	"poisonMultiplier":{
-		"name":"Poison damage", "group": "Weakness/Resistance"
+		"name":"Poison damage", "group": "Weakness/Resistance",
 	},
 	"psychicMultiplier":{
-		"name":"Psychic damage", "group": "Weakness/Resistance"
+		"name":"Psychic damage", "group": "Weakness/Resistance",
 	},
 	"radiantMultiplier":{
-		"name":"Radiant damage", "group": "Weakness/Resistance"
+		"name":"Radiant damage", "group": "Weakness/Resistance",
 	},
 	"slashingMultiplier":{
-		"name":"Slashing damage", "group": "Weakness/Resistance"
+		"name":"Slashing damage", "group": "Weakness/Resistance",
 	},
 	"thunderMultiplier":{
-		"name":"Thunder damage", "group": "Weakness/Resistance"
+		"name":"Thunder damage", "group": "Weakness/Resistance",
 	},
 };
 
@@ -110,8 +110,8 @@ var operations = {
 Template.effectView.helpers({
 	sourceName: function(){
 		var id = this.parent.id;
-		if(!id) return;
+		if (!id) return;
-		switch(this.parent.collection){
+		switch (this.parent.collection){
 			case "Features":
 				return "Feature - " + Features.findOne(id, {fields: {name: 1}}).name;
 			case "Classes":
@@ -130,33 +130,39 @@ Template.effectView.helpers({
 		return stats[this.stat] && stats[this.stat].name || "No Stat";
 	},
 	operationName: function(){
-		if(this.operation === "proficiency" ||
+		if (this.operation === "proficiency" ||
 		   this.operation === "conditional") return null;
-		if(stats[this.stat].group === "Weakness/Resistance") return null;
+		if (stats[this.stat] && stats[this.stat].group === "Weakness/Resistance")
-		if(this.operation === "add" && evaluateEffect(this.charId, this) < 0) return null;
+			return null;
-		return operations[this.operation] && operations[this.operation].name || "No Operation";
+		if (this.operation === "add" && evaluateEffect(this.charId, this) < 0)
+			return null;
+		return operations[this.operation] &&
+			operations[this.operation].name || "No Operation";
 	},
 	statValue: function(){
-		if(this.operation === "advantage" ||
+		if (this.operation === "advantage" ||
 		   this.operation === "disadvantage" ||
 		   this.operation === "fail"){
 			return null;
 		}
-		if(this.operation === "proficiency"){
+		if (this.operation === "proficiency"){
-			if(this.value == 0.5 || this.calculation == 0.5) return "Half Proficiency";
+			if (this.value == 0.5 || this.calculation == 0.5)
-			if(this.value == 1   || this.calculation == 1)   return "Proficiency";
+				return "Half Proficiency";
-			if(this.value == 2   || this.calculation == 2)   return "Double Proficiency";
+			if (this.value == 1   || this.calculation == 1)
+				return "Proficiency";
+			if (this.value == 2   || this.calculation == 2)
+				return "Double Proficiency";
 		}
-		if(this.operation === "conditional"){
+		if (this.operation === "conditional"){
 			return this.calculation || this.value;
 		}
-		if(stats[this.stat].group === "Weakness/Resistance"){
+		if (stats[this.stat] && stats[this.stat].group === "Weakness/Resistance"){
-			if(this.value === 0.5) return "Resistance";
+			if (this.value === 0.5) return "Resistance";
-			if(this.value === 2)   return "Vulnerability";
+			if (this.value === 2)   return "Vulnerability";
-			if(this.value === 0)   return "Immunity";
+			if (this.value === 0)   return "Immunity";
 		}
 		var value = evaluateEffect(this.charId, this);
-		if(_.isNumber(value)) return value;
+		if (_.isNumber(value)) return value;
 		return this.calculation || this.value;
-	}
+	},
 });

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

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

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

@@ -1,7 +1,7 @@
 <template name="features">
 	<div fit>
 		<div class="scroll-y" fit>
-			<div class="containers">
+			<div class="column-container">
 				<!--expertiseDice-->
 				{{>resource name="expertiseDice" title="Expertise Dice" color="teal" char=this}}
 				<!--ki-->
@@ -14,27 +14,27 @@
 				{{>resource name="superiorityDice" title="Superiority Dice" color="teal" char=this}}
 				
 				<!--Attacks-->
-				<paper-shadow class="card container"  hero-id="main" {{detailHero}}>
+				<paper-shadow class="card">
-					<div class="whiteTop" hero-id="toolbar" layout horizontal center {{detailHero}}>
+					<div class="top white">
-						<div flex>
+						Attacks
-							<div class="containerName subhead">Attacks</div>
-						</div>
-						<!--<paper-icon-button class="black54" id="addAttackButton" icon="add"></paper-icon-button>-->
 					</div>
-					<div class="containerMain listPadded">
+					<div class="bottom list">
 						{{#each attacks}}
-							<div class="itemSlot">
+							<div class="item-slot">
-								<paper-item class="white attack" hero-id="main" {{detailHero}}>
+								<div class="flexible attack item"
-									<div layout horizontal class="fullwidth">
+											hero-id="main" {{detailHero}}>
-										<div class="headline rightPadded" layout horizontal center>
+									<div layout horizontal>
+										<div class="headline"
+											 style="margin-right: 16px;"
+											 layout horizontal center>
 											{{evaluateSigned ../_id attackBonus}}
 										</div>
-										<div layout vertical flex>
+										<div flex layout vertical>
 											<div class="body2">
 												{{name}}
 											</div>
 											<div>
-												{{damageDice}}&nbsp;{{{evaluateSignedSpaced ../_id damageBonus}}}&nbsp;{{damageType}}
+												{{evaluateString ../_id damage}}&nbsp;{{damageType}}
 											</div>
 											{{#if details}}
 												<div class="caption">
@@ -43,34 +43,32 @@
 											{{/if}}
 										</div>
 									</div>
-								</paper-item>
+								</div>
 							</div>
 						{{/each}}
 					</div>
 				</paper-shadow>
 
 				<!--Proficiencies-->
-				<paper-shadow class="card container"  hero-id="main" {{detailHero "proficiencies"}}>
+				<paper-shadow class="card">
-					<div id="proficiencies"
+					<div class="white top">
-						 class="whiteTop"
+						Proficiencies
-						 layout horizontal center>
-						<div class="containerName subhead">Proficiencies</div>
 					</div>
-					<div flex class="containerMain listPadded">
+					<div flex class="bottom list">
 						{{#if weaponProfs.count}}
-							<div class="list-subhead" layout horizontal center>Weapons</div>
+							<div class="subhead">Weapons</div>
 						{{/if}}
 						{{#each weaponProfs}}
 							{{> proficiencyListItem}}
 						{{/each}}
 						{{#if armorProfs.count}}
-							<div class="list-subhead" layout horizontal center>Armor</div>
+							<div class="subhead">Armor</div>
 						{{/if}}
 						{{#each armorProfs}}
 							{{> proficiencyListItem}}
 						{{/each}}
 						{{#if toolProfs.count}}
-							<div class="list-subhead" layout horizontal center>Tools</div>
+							<div class="subhead">Tools</div>
 						{{/if}}
 						{{#each toolProfs}}
 							{{> proficiencyListItem}}
@@ -80,23 +78,44 @@
 
 				<!--features-->
 				{{#each features}}
-					<paper-shadow class="card container featureCard"  hero-id="main" {{detailHero}}>
+					<paper-shadow class="card featureCard"
-						<div class="containerTop {{colorClass}}" hero-id="toolbar" layout horizontal center {{detailHero}}>
+								  hero-id="main" {{detailHero}}>
-							<paper-ripple fit></paper-ripple>
+						<div class="top {{colorClass}} subhead" 
-							<div class="containerName subhead" hero-id="title" flex {{detailHero}}>{{name}}</div>
+							 layout horizontal 
-							{{#if hasUses}}<div class="subhead" style="margin-right: 8px">{{usesLeft}}/{{usesValue}}</div>{{/if}}
+							 hero-id="toolbar" {{detailHero}}>
-							<paper-ripple fit></paper-ripple>
+							<div flex hero-id="title" {{detailHero}}>
+								{{name}}
+							</div>
+							{{#if hasUses}}
+								<div style="margin-right: 8px">
+									{{usesLeft}}/{{usesValue}}
+								</div>
+							{{/if}}
 							{{#if canEnable}}
-								<core-tooltip label="Feature enabled" position="left">
+								<core-tooltip label="Feature enabled"
-									<paper-checkbox class="enabledCheckbox" checked={{enabled}}></paper-checkbox>
+											  position="left">
+									<paper-checkbox class="enabledCheckbox" 
+													checked={{enabled}}
+													disabled={{#unless canEditCharacter charId}}true{{/unless}}>
+									</paper-checkbox>
 								</core-tooltip>
 							{{/if}}
 						</div>
-						{{#if description}}<div flex class="containerMain body1 featureDescription">{{description}}</div>{{/if}}
+						{{#if description}}
+							<div flex class="bottom">
+								{{#markdown}}{{evaluateString charId shortDescription}}{{/markdown}}
+							</div>
+						{{/if}}
 						{{#if hasUses}}
-							<div class="containerFoot" layout horizontal center end-justified>
+							<div layout horizontal center end-justified>
-								<paper-button class="useFeature" disabled={{noUsesLeft}}>Use</paper-button>
+								<paper-button class="useFeature" 
-								<paper-button class="resetFeature" disabled={{usesFull}}>Reset</paper-button>
+											  disabled={{noUsesLeft}}>
+									Use
+								</paper-button>
+								<paper-button class="resetFeature" 
+											  disabled={{usesFull}}>
+									Reset
+								</paper-button>
 							</div>
 						{{/if}}
 					</paper-shadow>
@@ -104,31 +123,43 @@
 			</div>
 			<div class="fab-buffer"></div>
 		</div>
-		<paper-fab id="addFeature" 
+		{{#if canEditCharacter _id}}
-				   class="floatyButton" 
+			<paper-fab id="addFeature" 
-				   icon="add" 
+					   class="floatyButton" 
-				   title="Add" 
+					   icon="add" 
-				   role="button" 
+					   title="Add" 
-				   tabindex="0" 
+					   role="button" 
-				   aria-label="Add" 
+					   tabindex="0" 
-				   hero-id="main"></paper-fab>
+					   aria-label="Add" 
+					   hero-id="main"></paper-fab>
+		{{/if}}
 	</div>
 </template>
 
 <template name="resource">
-	{{#if char.attributeBase name}}
+	{{#if characterCalculate "attributeBase" char._id name}}
-		<paper-shadow class="card container" hero-id="main" {{detailHero name char._id}} layout horizontal>
+		<paper-shadow class="card" 
-			<div class="containerLeft {{getColor}}" hero-id="toolbar" {{detailHero name char._id}} >
+					  hero-id="main" {{detailHero name char._id}}
-				<div class="resourceButtons">
+					  layout horizontal>
-					<paper-icon-button class="resourceUp" icon="arrow-drop-up" disabled={{cantIncrement}}></paper-icon-button>
+			<div class="left {{getColor}} display1 white-text" 
-					<paper-icon-button class="resourceDown" icon="arrow-drop-down" disabled={{cantDecrement}}></paper-icon-button>
+				 hero-id="toolbar" {{detailHero name char._id}}
+				 layout horizontal center>
+				<div style="margin-right: 8px;">
+					<paper-icon-button class="resourceUp" 
+									   icon="arrow-drop-up" 
+									   disabled={{cantIncrement}}>
+					</paper-icon-button>
+					<paper-icon-button class="resourceDown"
+									   icon="arrow-drop-down"
+									   disabled={{cantDecrement}}>
+					</paper-icon-button>
 				</div>
-				<div class="resourceValue">{{char.attributeValue name}}</div>
+				<div>{{characterCalculate "attributeValue" char._id name}}</div>
-				<!--<div class="resourceMax">{{char.attributeBase name}}</div>-->
+				<!--<div>/{{char.attributeBase name}}</div>-->
 			</div>
-			<div class="containerRight clickable" flex relative horizontal layout center>
+			<div class="right clickable" 
+				 flex layout horizontal center>
 				{{title}}
-				<paper-ripple fit></paper-ripple>
 			</div>
 		</paper-shadow>
 	{{/if}}

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);
@@ -65,7 +70,7 @@ Template.features.events({
 			}
 		});
 	},
-	"tap .featureCard .containerTop": function(event){
+	"tap .featureCard .top": function(event){
 		var featureId = this._id;
 		var charId = Template.parentData()._id;
 		GlobalUI.setDetail({
@@ -96,16 +101,19 @@ Template.features.events({
 
 Template.resource.helpers({
 	cantIncrement: function(){
-		var baseBigger = this.char.attributeValue(this.name) <
+		var value = Characters.calculate.attributeValue(this.char._id, this.name);
-			this.char.attributeBase(this.name);
+		var base = Characters.calculate.attributeBase(this.char._id, this.name);
-		return !baseBigger;
+		var baseBigger = value < base;
+		return !baseBigger || !canEditCharacter(this.char._id);
 	},
 	cantDecrement: function(){
-		var valuePositive = this.char.attributeValue(this.name) > 0;
+		var value = Characters.calculate.attributeValue(this.char._id, this.name);
-		return !valuePositive;
+		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,20 +123,23 @@ 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});
 		}
 	},
-	"tap .containerRight": function(event, instance) {
+	"tap .right": function(event, instance) {
 		GlobalUI.setDetail({
 			template: "attributeDialog",
 			data:     {name: this.title, statName: this.name, charId: this.char._id},

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

@@ -0,0 +1,22 @@
+<template name="carryCapacityBar">
+	<div class="carryCapacityBar">
+		<div class="carriedWeightBar"
+			 style="width: {{carriedPercent}}%;
+					background-color: {{carriedColor}}">
+		</div>
+		<div class="tick"
+			 style="width: 33.333%;">
+		</div>
+		<div class="tick"
+			 style="width: 66.666%;">
+		</div>
+	</div>
+	{{#if overCarriedPercent}}
+	<div class="carryCapacityBar">
+		<div class="carriedWeightBar"
+			 style="width: {{overCarriedPercent}}%;
+					background-color: {{overCarriedColor}}">
+		</div>
+	</div>
+	{{/if}}
+</template>

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

@@ -0,0 +1,67 @@
+var getFractionCarried = function(char) {
+	//find out the weight
+	var weight = 0;
+	Containers.find(
+		{charId: char._id, isCarried: true}
+	).forEach(function(container){
+		weight += container.totalWeight();
+	});
+	Items.find(
+		{charId: char._id, "parent.id": char._id},
+		{fields: {weight : 1, quantity: 1}}
+	).forEach(function(item){
+		weight += item.totalWeight();
+	});
+	//get strength
+	var strength = Characters.calculate.attributeValue(char._id, "strength");
+	var carryMultiplier = Characters.calculate
+		.attributeValue(char._id, "carryMultiplier");
+	var capacity = strength * 15 * carryMultiplier;
+	return weight / capacity;
+};
+
+Template.carryCapacityBar.onCreated(function() {
+	var self = this;
+	self.carriedFraction = new ReactiveVar(0);
+	self.autorun(function() {
+		self.carriedFraction.set(getFractionCarried(self.data));
+	});
+});
+
+Template.carryCapacityBar.helpers({
+	carriedPercent: function() {
+		var percent = 100 * Template.instance().carriedFraction.get();
+		return percent > 100 ? 100 : percent;
+	},
+	overCarriedPercent: function() {
+		var percent = 100 * Template.instance().carriedFraction.get();
+		var overPercent = percent - 100;
+		if (overPercent < 0) return 0;
+		if (overPercent > 100) return 100;
+		return overPercent;
+	},
+	carriedColor: function() {
+		var frac = Template.instance().carriedFraction.get();
+		if (frac < 1 / 3){
+			return "#2196F3";
+		} else if (frac < 2 / 3){
+			return "#CDDC39";
+		} else if (frac < 1) {
+			return "#FFC107";
+		} else {
+			return "#F44336";
+		}
+	},
+	overCarriedColor: function() {
+		var frac = Template.instance().carriedFraction.get();
+		if (frac < 1 / 3){
+			return "#2196F3";
+		} else if (frac < 2 / 3){
+			return "#CDDC39";
+		} else if (frac < 1) {
+			return "#FFC107";
+		} else {
+			return "#F44336";
+		}
+	},
+});

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

@@ -0,0 +1,14 @@
+.carryCapacityBar {
+	background-color: #7DC580;
+	background-color: rgba(255,255,255,0.27);
+	position: relative;
+	height: 4px;
+	div{
+		height: 100%;
+		position: absolute;
+	}
+	.tick {
+		border-right: solid 2px #E5E5E5;
+		border-right-color: rgba(255,255,255,0.54);
+	}
+}

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

@@ -0,0 +1,17 @@
+<template name="carryDialog">
+	{{#baseDialog title="Weight Carried" class=color hideEdit=true}}
+	<div layout horizontal center-justified end>
+		<div class="display2">
+			{{round carriedWeight 1}}
+		</div>
+		<div class="display1">
+			lbs
+		</div>
+	</div>
+
+	<hr class="vertMargin">
+	
+	{{> carryCapacityTable}}
+
+	{{/baseDialog}}
+</template>

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

@@ -0,0 +1,20 @@
+Template.carryDialog.helpers({
+	carriedWeight: function() {
+		var weight = 0;
+		Containers.find(
+			{charId: this.charId, isCarried: true}
+		).forEach(function(container){
+			weight += container.totalWeight();
+		});
+		Items.find(
+			{charId: this.charId, "parent.id": this.charId},
+			{fields: {weight : 1, quantity: 1}}
+		).forEach(function(item){
+			weight += item.totalWeight();
+		});
+		return weight;
+	},
+	color: function() {
+		if (this.color) return this.color + " white-text";
+	},
+});

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>Container</td><td>{{round weight}}lbs</td><td>{{longValueString value}}</td></tr>
-			<tr><td>Contents</td><td>{{contentsWeight}}lbs</td><td>{{longValueString contentsValue}}</td></tr>
+			<tr><td>Contents</td><td>{{round contentsWeight}}lbs</td><td>{{longValueString contentsValue}}</td></tr>
-			<tr class="body2"><td>Total</td><td>{{totalWeight}}lbs</td><td>{{longValueString totalValue}}</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="prewrap">{{description}}</div>
+		<div>{{#markdown}}{{evaluateString charId description}}{{/markdown}}</div>
 	{{/if}}
 </template>

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

@@ -1,152 +0,0 @@
-div#stats {
-	-webkit-column-width: 200px;
-	-moz-column-width: 200px;
-	column-width: 200px;
-	-webkit-column-count: 4;
-	-moz-column-count: 4;
-	column-count: 4;
-}
-
-.containers {
-	-webkit-column-width: 300px;
-	-moz-column-width: 300px;
-	column-width: 300px;
-	-webkit-column-gap: 8px;
-	-moz-column-gap: 8px;
-	column-gap: 8px;
-	-moz-column-fill: balance;
-	column-fill: balance;
-	padding: 8px;
-}
-
-.containerLeft {
-	padding: 16px 16px 16px 24px;
-	display: flex;
-	justify-content: center;
-	flex-direction: row;
-	border-radius: 2px 0 0 2px;
-
-	/* same style as display-1 */
-	font-size: 34px;
-	font-weight: 400;
-	color: #ffffff;
-	color: rgba(255,255,255,0.54);
-	letter-spacing: 0;
-}
-
-.statCard .containerLeft {
-	padding: 16px;
-}
-
-.containerRight {
-	padding: 16px;
-
-	/* same style as subhead */
-	font-size: 16px;
-	font-weight: 400;
-	margin: 0;
-	color: #000;
-	color: rgba(0,0,0,0.87);
-	letter-spacing: 0.010em;
-}
-
-.resourceValue {
-	display: inline-block;
-}
-
-.resourceMax {
-	display: inline-block;
-	align-self: flex-end;
-
-	/* same style as subhead */
-	font-size: 16px;
-	font-weight: 400;
-	margin: 0;
-	color: #fff;
-	color: rgba(255,255,255,0.54);
-	letter-spacing: 0.010em;
-}
-
-.resourceMax:before {
-	content: "/";
-}
-
-.resourceButtons {
-	margin: -16px 8px -16px -16px;
-	align-self: center;
-}
-
-.resourceButtons paper-icon-button{
-	width: 32px;
-	height: 32px;
-	padding: 0;
-	display: block;
-}
-
-.resourceButtons paper-icon-button[disabled]{
-	color: rgba(255, 255, 255, 0.26);
-}
-
-.resourceButtons /deep/ core-icon {
-	width: 32px;
-	height: 32px;
-}
-
-.containerTop {
-	cursor: pointer;
-	padding: 16px;
-	position: relative;
-	border-radius: 2px 2px 0 0;
-}
-
-.equipmentTop {
-	padding: 16px;
-	border-bottom: rgba(0,0,0,0.12) solid 1px;
-}
-
-.containerMain {
-	padding: 16px;
-}
-
-.equipmentMain {
-	padding-bottom: 16px;
-}
-
-.inventoryItem {
-	background: white;
-	transition: box-shadow 0.3s ease,
-		opacity 0.5s ease-in-out;
-	height: 40px;
-	margin: 1px 0 1px 0;
-	font-size: 16px;
-	color: rgba(0,0,0,0.87);
-	letter-spacing: 0.010em;
-}
-
-.inventoryItem core-icon, .inventoryItem paper-icon-button {
-	color: rgba(0,0,0,0.54);
-}
-
-.inventoryItem core-icon {
-	margin-right: 16px;
-}
-
-.inventoryItem /deep/ .button-content {
-	-webkit-flex: 1;
-	flex: 1;
-	-webkit-flex-basis: 0.000000001px;
-	flex-basis: 0.000000001px;
-}
-
-.inventoryItem[hero] {
-	box-shadow: 0 0 2px 0 rgba(0, 0, 0, 0.37);
-}
-
-.itemSlot {
-	background-color: rgb(232, 232, 232);
-	background-color: rgba(0, 0, 0, 0.1);
-}
-
-#inventory .containerMain {
-	padding: 0 0 16px 0;
-}

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

@@ -1,73 +1,124 @@
 <template name="inventory">
 	<div fit>
 		<div id="inventory" class="scroll-y" fit>
-			<div class="containers">
+			<div class="column-container">
 				<!--Net Worth-->
-				<paper-shadow class="card container" hero-id="main" {{detailHero}} layout horizontal>
+				<paper-shadow class="card">
-					<div class="indigo white-text subhead padded leftRound" layout horizontal center>
+					<div class="white top" layout horizontal center>
-						Net Worth
+						<div class="subhead" flex>
-					</div>
+							Net Worth
-					<div class="padded" layout horizontal center>
+						</div>
-						{{valueString netWorth}}
+						<div>
+							{{valueString netWorth}}
+						</div>
 					</div>
 				</paper-shadow>
 				<!--Weight Carried-->
-				<paper-shadow class="card container" hero-id="main" {{detailHero}} layout horizontal>
+				<paper-shadow class="card"
-					<div class="green white-text subhead padded leftRound" layout horizontal center>
+							  hero-id="main" {{detailHero "weightCarried" _id}}>
-						Weight Carried
+					<div class="top green white-text weightCarried"
+						 hero-id="toolbar" {{detailHero "weightCarried" _id}}
+						 layout horizontal center>
+						<div class="subhead" flex>
+							Weight Carried
+						</div>
+						<div>
+							{{round weightCarried}}lbs
+						</div>
 					</div>
-					<div class="padded" layout horizontal center>
+					<div class="bottom green" style="padding: 0;">
-						{{round weightCarried}}lbs
+						{{> carryCapacityBar}}
 					</div>
+					{{#if encumberedBuffs.count}}
+					<div class="bottom list">
+						{{#each encumberedBuffs}}
+						<div class="item-slot">
+							<div class="item buff"
+								 hero-id="main" {{detailHero}}
+								 layout horizontal center>
+								<div flex>
+									<core-icon icon="work"
+											   style="margin-right: 16px">
+									</core-icon>
+									{{name}}
+								</div>
+							</div>
+						</div>
+						{{/each}}
+					</div>
+					{{/if}}
 				</paper-shadow>
 				<!--Equipment-->
-				<paper-shadow class="card container equipmentContainer">
+				<paper-shadow class="card equipmentContainer">
-					<div class="equipmentTop" layout horizontal center>
+					<div class="white top" layout horizontal center>
-						<div class="containerName subhead" flex>
+						<div class="subhead" flex>
 							Equipment
 						</div>
-						<div class="caption" style="margin-right: 8px">{{valueString equipmentValue}}</div>
+						<div class="caption" style="margin-right: 8px">
-						<div class="caption">{{round equipmentWeight}}lbs</div>
+							{{valueString equipmentValue}}
+						</div>
+						<div class="caption">
+							{{round equipmentWeight}}lbs
+						</div>
 					</div>
-					<div flex class="equipmentMain">
+					<div flex class="bottom list">
 						{{#if attuned.count}}
-							<div class="list-subhead" layout horizontal center>Attuned</div>
+							<div class="subhead">Attuned</div>
 						{{/if}}
 						{{#each attuned}}
 							{{>inventoryItem}}
 						{{/each}}
-						{{#if attuned.count}}<div class="list-subhead" layout horizontal center>Equipment</div>{{/if}}
+						{{#if attuned.count}}
+							<div class="subhead">Equipment</div>
+						{{/if}}
 						{{#each equipment}}
 							{{>inventoryItem}}
 						{{/each}}
 					</div>
 				</paper-shadow>
 				<!--Carried Items-->
-				<paper-shadow class="card container carriedContainer">
+				<paper-shadow class="card carriedContainer">
-					<div class="equipmentTop" layout horizontal center>
+					<div class="white top" layout horizontal center>
-						<div class="containerName subhead" flex>
+						<div class="subhead" flex>
 							Carried
 						</div>
-						<div class="caption" style="margin-right: 8px">{{valueString carriedValue}}</div>
+						<div class="caption" style="margin-right: 8px">
-						<div class="caption">{{round carriedWeight}}lbs</div>
+							{{valueString carriedValue}}
+						</div>
+						<div class="caption">
+							{{round carriedWeight}}lbs
+						</div>
 					</div>
-					<div flex class="containerMain">
+					<div flex class="bottom list">
 						{{#each carriedItems}}
 							{{>inventoryItem}}
 						{{/each}}
 					</div>
 				</paper-shadow>
 				{{#each containers}}
-					<paper-shadow class="card container itemContainer"  hero-id="main" {{detailHero}} style="order: {{containerOrder}};">
+					<paper-shadow class="card itemContainer" 
-						<div class="containerTop {{colorClass}}" hero-id="toolbar" layout horizontal center {{detailHero}}>
+								  hero-id="main" {{detailHero}}>
-							<div class="containerName subhead" hero-id="title" flex {{detailHero}}>{{name}}</div>
+						<div class="top {{colorClass}}"
-							<div class="caption" style="margin-right: 8px">{{valueString totalValue}}</div>
+							 hero-id="toolbar" {{detailHero}}
-							<div class="caption" style="margin-right: 8px">{{round totalWeight}}lbs</div>
+							 layout horizontal center>
+							<div class="subhead" flex
+								 hero-id="title" {{detailHero}}>
+								{{name}}
+							</div>
+							<div class="caption" style="margin-right: 8px">
+								{{valueString totalValue}}
+							</div>
+							<div class="caption" style="margin-right: 8px">
+								{{round totalWeight}}lbs
+							</div>
 							<core-tooltip label="Container carried" position="left">
-								<paper-checkbox class="carriedCheckbox" checked={{isCarried}}></paper-checkbox>
+								<paper-checkbox class="carriedCheckbox"
+												disabled={{#unless canEditCharacter charId}}true{{/unless}}
+												checked={{isCarried}}>
+								</paper-checkbox>
 							</core-tooltip>
 						</div>
-						<div flex class="containerMain">
+						<div class="bottom list">
 							{{#each items ../_id _id}}
 								{{>inventoryItem}}
 							{{/each}}
@@ -77,17 +128,45 @@
 			</div>
 			<div class="fab-buffer"></div>
 		</div>
-		<paper-fab-menu id="inventoryAddMenu" icon="add" closeIcon="close" duration="0.3">
+		{{#if canEditCharacter _id}}
-			<paper-fab-menu-item id="addItem" icon="note-add" color="#d23f31" tooltip="Item"></paper-fab-menu-item>
+			{{#fabMenu}}
-			<paper-fab-menu-item id="addContainer" icon="work" color="#d23f31" tooltip="Container"></paper-fab-menu-item>
+				<core-tooltip label="New container" position="left">
-		</paper-fab-menu>
+					<paper-fab icon="work"
+							   class="addContainer"
+							   mini>
+					</paper-fab>
+				</core-tooltip>
+				<core-tooltip label="New item" position="left">
+					<paper-fab icon="note-add"
+							   class="addItem"
+							   mini>
+					</paper-fab>
+				</core-tooltip>
+			{{/fabMenu}}
+		{{/if}}
 	</div>
 </template>
 
 <template name="inventoryItem">
-	<div class="itemSlot">
+	<div class="item-slot">
-		<paper-item class="inventoryItem {{hidden}}" hero-id="main" noink {{detailHero}} layout horizontal draggable="true">
+		<div class="item {{hidden}} inventoryItem"
-			{{#if ne1 quantity}}{{quantity}}&nbsp;{{/if}}{{pluralName}}
+					hero-id="main" {{detailHero}}
-		</paper-item>
+					layout horizontal center
+			 		draggable={{canEditCharacter charId}}>
+			<div flex class="itemName">
+				{{#if ne1 quantity}}{{quantity}}&nbsp;{{/if}}{{pluralName}}
+			</div>
+			{{#if settings.showIncrement}}{{#if canEditCharacter charId}}
+			<div class="incrementButtons">
+				<paper-icon-button class="addItemQuantity"
+								   icon="add"
+								   style="margin-right: -8px"></paper-icon-button>
+				<paper-icon-button class="subItemQuantity"
+								   disabled={{lt1 quantity}}
+								   icon="remove"
+								   style="margin-right: -8px"></paper-icon-button>
+			</div>
+			{{/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(){
@@ -61,6 +67,18 @@ Template.inventory.helpers({
 		});
 		return weight;
 	},
+	encumberedBuffs: function(){
+		return Buffs.find({
+			charId: this._id,
+			type: "inate",
+			name: {$in: [
+				"Encumbered",
+				"Heavily encumbered",
+				"Over encumbered",
+				"Can't move load",
+			]},
+		});
+	},
 	equipmentValue: function(){
 		var value = 0;
 		Items.find(
@@ -103,7 +121,7 @@ Template.inventory.helpers({
 });
 
 Template.inventory.events({
-	"tap #addItem": function(event){
+	"tap .addItem": function(event){
 		var charId = this._id;
 		Items.insert({
 			charId: charId,
@@ -120,7 +138,7 @@ Template.inventory.events({
 			});
 		});
 	},
-	"tap #addContainer": function(event){
+	"tap .addContainer": function(event){
 		var containerId = Containers.insert({
 			name: "New Container",
 			isCarried: true,
@@ -136,6 +154,23 @@ Template.inventory.events({
 			heroId:   containerId,
 		});
 	},
+	"tap .weightCarried": function(event) {
+		var charId = this._id;
+		GlobalUI.setDetail({
+			template: "carryDialog",
+			data:     {charId: charId, color: "green"},
+			heroId:   charId + "weightCarried",
+		});
+	},
+	"tap .buff": function(event){
+		var buffId = this._id;
+		var charId = Template.parentData()._id;
+		GlobalUI.setDetail({
+			template: "buffDialog",
+			data:     {buffId: buffId, charId: charId},
+			heroId:   buffId,
+		});
+	},
 	"tap .inventoryItem": function(event){
 		var itemId = this._id;
 		var charId = Template.parentData()._id;
@@ -145,7 +180,32 @@ Template.inventory.events({
 			heroId:   itemId,
 		});
 	},
-	"tap .containerTop": function(event){
+	"hold .inventoryItem": function(event, instance) {
+		var itemId = this._id;
+		var charId = Template.parentData()._id;
+		var containerId = this.parent.id;
+		GlobalUI.showDialog({
+			template: "moveItemDialog",
+			data:     {
+				charId: charId,
+				itemId: itemId,
+				containerId: containerId,
+			},
+			heading:   "Move " + this.pluralName(),
+		});
+	},
+	"tap .incrementButtons": function(event) {
+		event.stopPropagation();
+	},
+	"tap .addItemQuantity": function(event) {
+		var itemId = this._id;
+		Items.update(itemId, {$set: {quantity: this.quantity + 1}});
+	},
+	"tap .subItemQuantity": function(event) {
+		var itemId = this._id;
+		Items.update(itemId, {$set: {quantity: this.quantity - 1}});
+	},
+	"tap .itemContainer .top": function(event){
 		GlobalUI.setDetail({
 			template: "containerDialog",
 			data:     {containerId: this._id, charId: this.charId},
@@ -167,6 +227,9 @@ Template.inventoryItem.helpers({
 	ne1: function(num){
 		return num !== 1;
 	},
+	lt1: function(num) {
+		return num < 1;
+	},
 	hidden: function(){
 		return Session.equals("inventory.dragItemId", this._id) ? "hidden" : null;
 	},

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

@@ -10,7 +10,7 @@
 
 <template name="itemDetails">
 	<div layout horizontal wrap center justified class="headline">
-		{{#if weight}}<div class="sideMargin">{{totalWeight}}lbs</div>{{/if}}
+		{{#if weight}}<div class="sideMargin">{{round totalWeight}}lbs</div>{{/if}}
 		{{#if value}}<div>{{valueString totalValue}}</div>{{/if}}
 	</div>
 	<div layout horizontal wrap class="caption">
@@ -18,8 +18,8 @@
 		{{#if requiresAttunement}}<div class="vertMargin">Requires Attunement</div>{{/if}}
 	</div>
 	{{#if description}}
-		<hr class="vertMargin">
+		<hr style="margin: 16px 0 16px 0;">
-		<div class="prewrap">{{description}}</div>
+		<div>{{#markdown}}{{evaluateString charId description}}{{/markdown}}</div>
 	{{/if}}
 	{{> effectsViewList charId=charId parentId=_id}}
 	{{> attacksViewList charId=charId parentId=_id}}
@@ -28,10 +28,25 @@
 <template name="itemEdit">
 	<paper-input class="fullwidth" id="itemNameInput" label="Name" floatinglabel value={{name}}></paper-input>
 	<div layout horizontal wrap>
-		<paper-input-decorator label="Quantity" floatinglabel>
+		<paper-input-decorator label="Quantity"
-			<input id="quantityInput" type="number" value={{quantity}}>
+							   floatinglabel
+							   style="width: 80px">
+			<input id="quantityInput"
+				   type="number"
+				   value={{quantity}}>
 		</paper-input-decorator>
-		{{# if ne1 quantity}}<paper-input flex id="itemPluralInput" label="Plural Name" floatinglabel value={{plural}}></paper-input>{{/if}}
+		{{# if ne1 quantity}}
+		<paper-input flex id="itemPluralInput" 
+					 label="Plural Name" 
+					 floatinglabel
+					 value={{plural}}></paper-input>
+		{{/if}}
+	</div>
+	<div center horizontal layout>
+		<div class="padded">Show increment buttons</div>
+		<paper-checkbox id="incrementCheckbox"
+						checked={{settings.showIncrement}}>
+		</paper-checkbox>
 	</div>
 
 	<hr class="vertMargin">
@@ -53,7 +68,9 @@
 		</div>
 		<div center horizontal layout>
 			<div class="padded">Requires Attunement</div>
-			<paper-checkbox id="attunementCheckbox" checked={{requiresAttunement}}></paper-checkbox>
+			<paper-checkbox id="attunementCheckbox"
+							checked={{requiresAttunement}}>
+			</paper-checkbox>
 		</div>
 	</div>
 

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

@@ -50,7 +50,7 @@ Template.itemEdit.onRendered(function(){
 Template.itemEdit.helpers({
 	ne1: function(num){
 		return num != 1;
-	}
+	},
 });
 
 Template.itemEdit.events({
@@ -87,6 +87,10 @@ Template.itemEdit.events({
 			Meteor.call("unequipItem", this._id, this.charId);
 		}
 	},
+	"change #incrementCheckbox": function(event){
+		var value = event.currentTarget.checked;
+		Items.update(this._id, {$set: {"settings.showIncrement": value}});
+	},
 	"change #attunementCheckbox": function(event){
 		var value = event.currentTarget.checked;
 		Items.update(this._id, {$set: {requiresAttunement: value}});

rpg-docs/client/views/character/inventory/moveItemDialog/moveItemDialog.css

@@ -0,0 +1,7 @@
+html /deep/ .moveItemDialog paper-tabs::shadow #selectionBar {
+	background-color: #D50000;
+}
+
+html /deep/ .moveItemDialog paper-tab::shadow #ink {
+	color: #D50000;
+}

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

@@ -0,0 +1,49 @@
+<template name="moveItemDialog">
+	<div class="moveItemDialog">
+		<paper-tabs selected="{{selectedTab}}">
+			<paper-tab name="containers"
+					   class="clickable">
+				Containers
+			</paper-tab>
+			<paper-tab name="characters"
+					   class="clickable">
+				Characters
+			</paper-tab>
+		</paper-tabs>
+		<core-animated-pages selected="{{selectedTab}}"
+							 transitions="slide-from-right"
+							 style="width: 250px;
+									height: 200px;
+									overflow-y: auto;
+									overflow-x: hidden;">
+			<section name="containers">
+				<core-menu id="containerMenu" style="margin: 0;">
+					{{#each containers}}
+						<paper-item name={{_id}}
+									layout horizontal center>
+							<core-icon icon="image:brightness-1"
+									   style="color: {{hexColor color}};
+											  margin-right: 16px;">
+							</core-icon>
+							<div>{{name}}</div>
+						</paper-item>
+					{{/each}}
+				</core-menu>
+			</section>
+			<section name="characters">
+				<core-menu id="characterMenu"  style="margin: 0;">
+					{{#each characters}}
+					<paper-item name={{_id}}
+								layout horizontal center>
+						<div class="item small">
+							{{name}}
+						</div>
+					</paper-item>
+					{{/each}}
+				</core-menu>
+			</section>
+		</core-animated-pages>
+	</div>
+	<paper-button id="cancelButton" affirmative> Cancel </paper-button>
+	<paper-button id="moveButton" affirmative> Move </paper-button>
+</template>

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

@@ -0,0 +1,56 @@
+Template.moveItemDialog.onCreated(function() {
+	Session.setDefault("moveItemDialogTab", "containers");
+});
+
+Template.moveItemDialog.helpers({
+	selectedTab: function() {
+		return Session.get("moveItemDialogTab");
+	},
+	characters: function() {
+		var userId = Meteor.userId();
+		return Characters.find(
+			{
+				$or: [
+					{readers: userId},
+					{writers: userId},
+					{owner: userId},
+				],
+				_id: {$ne: this.charId},
+			},
+			{fields: {name: 1}}
+		);
+	},
+	containers: function(){
+		return Containers.find(
+			{
+				charId: this.charId,
+				_id: {$ne: this.containerId},
+			},
+			{
+				fields: {color: 1, name: 1},
+				sort: {color: 1, name: 1},
+			}
+		);
+	},
+});
+
+Template.moveItemDialog.events({
+	"tap paper-tab": function(event) {
+		Session.set("moveItemDialogTab", event.currentTarget.getAttribute("name"));
+	},
+	"tap #moveButton": function(event, instance) {
+		var tab = Session.get("moveItemDialogTab");
+		if (tab === "containers"){
+			var containerId = instance.find("#containerMenu").selected;
+			if (!containerId) throw "no menu selection";
+			Meteor.call("moveItemToContainer", this.itemId, containerId);
+		} else if (tab === "characters"){
+			var characterId = instance.find("#characterMenu").selected;
+			if (!characterId) throw "no menu selection";
+			Meteor.call("moveItemToCharacter", this.itemId, characterId);
+		} else {
+			throw "Move item dialog tab is not set to containers or character," +
+				" it is set to " + tab;
+		}
+	},
+});

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

@@ -3,6 +3,9 @@ Template.classDialog.onRendered(function(){
 });
 
 Template.classDialog.events({
+	"color-change": function(event, instance){
+		Classes.update(instance.data.classId, {$set: {color: event.color}});
+	},
 	"tap #deleteButton": function(event, instance){
 		Classes.softRemoveNode(instance.data.classId);
 		GlobalUI.deletedToast(instance.data.classId, "Classes", "Class");

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

@@ -1,28 +1,32 @@
 <template name="experienceDialog">
 	{{#with experience}}
-		{{#baseDialog title=name class=colorClass hideColor="true" startEditing=../startEditing}}
+		{{#baseDialog title=name class=color hideColor="true" startEditing=../startEditing}}
-			<div horizontal layout center-justified>
+			<div horizontal layout center-justified class= "display2">
 				{{value}}
 			</div>
 			{{#if description}}
 				<hr class="vertMargin">
-				<div class="prewrap">{{description}}</div>
+				<div>{{#markdown}}{{description}}{{/markdown}}</div>
 			{{/if}}
 		{{else}}
-			<div horizontal layout>
+			{{> experienceEdit}}
-				<!--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>
 		{{/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,6 +1,15 @@
+Template.experienceEdit.onRendered(function(){
+	updatePolymerInputs(this);
+});
+
 Template.experienceDialog.helpers({
-	feature: function(){
+	experience: function(){
-		return Features.findOne(this.featureId);
+		Experiences.findOne(this.experienceId);
+		return Experiences.findOne(this.experienceId);
+	},
+	color: function() {
+		var char = Characters.findOne(this.charId, {fields: {color: 1}});
+		if (char) return getColorClass(char.color);
 	},
 });
 
@@ -13,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}});
 	},
@@ -27,10 +38,3 @@ Template.experienceDialog.events({
 		Experiences.update(this._id, {$set: {description: value}});
 	},
 });
-
-Template.experienceDialog.helpers({
-	experience: function(){
-		Experiences.findOne(this.experienceId);
-		return Experiences.findOne(this.experienceId);
-	}
-});

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

@@ -1,73 +1,100 @@
 <template name="journal">
 	<div fit>
 		<div id="journal" class="scroll-y" fit>
-			<div class="containers">
+			<div class="column-container">
 				<!--Experience Table-->
-				<paper-shadow class="card container experiencesCard"  hero-id="main" {{detailHero}}>
+				<paper-shadow class="card experiencesCard"
-					<div class="whiteTop" hero-id="toolbar" layout horizontal center {{detailHero}}>
+							  hero-id="main" {{detailHero}}>
-						<div class="containerName subhead" flex>Experience</div>
+					<div class="top white subhead"
-						<div class="subhead">{{experience}} XP</div>
+						 hero-id="toolbar" {{detailHero}}
-						<paper-icon-button class="black54" id="addXP" icon="add"></paper-icon-button>
+						 layout horizontal center>
+						<div flex>Experience</div>
+						<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="containerMain experiences">
+					<div class="bottom list">
 						{{#each experiences}}
-							<div class="itemSlot">
+							<div class="item-slot">
-								<paper-item class="inventoryItem experience" hero-id="main" {{detailHero}} layout horizontal>
+								<div class="item experience"
-									<div flex>{{name}}</div><div class="xpValue">{{value}}</div>
+									 hero-id="main" {{detailHero}}
-								</paper-item>
+									 layout horizontal center>
+									<div flex>{{name}}</div>
+									<div class="xpValue">{{value}}</div>
+								</div>
 							</div>
 						{{/each}}
 					</div>
 					{{#if moreExperiencesOrCollapse}}
-						<div class="containerFoot" layout="" horizontal="" center="" end-justified="">
+						<div layout horizontal center end-justified>
-							<paper-button id="moreExperiences" disabled={{notMoreExperiences}}>Load More</paper-button>
+							<paper-button id="moreExperiences"
-							<paper-button id="lessExperiences" disabled={{cantCollapse}}>Collapse</paper-button>
+										  disabled={{notMoreExperiences}}>
+								Load More
+							</paper-button>
+							<paper-button id="lessExperiences"
+										  disabled={{cantCollapse}}>
+								Collapse
+							</paper-button>
 						</div>
 					{{/if}}
 				</paper-shadow>
 				<!--Class Table-->
-				<paper-shadow class="card container"  hero-id="main" {{detailHero}}>
+				<paper-shadow class="card"
-					<div class="whiteTop" hero-id="toolbar" layout horizontal center {{detailHero}}>
+							  hero-id="main" {{detailHero}}>
+					<div class="white top"
+						 hero-id="toolbar" {{detailHero}}
+						 layout horizontal center>
 						<div flex>
-							<div class="containerName subhead">Level {{level}}</div>
+							<div class="containerName subhead">
+								Level {{characterCalculate "level" _id}}
+							</div>
 							{{#if nextLevelXP}}
 								<div class="caption">
 									Next Level: {{nextLevelXP}}XP
 								</div>
 							{{/if}}
 						</div>
-						<paper-icon-button class="black54" id="addClassButton" icon="add"></paper-icon-button>
+						<paper-icon-button class="black54"
+										   id="addClassButton"
+										   icon="add"
+										   disabled={{#unless canEditCharacter _id}}true{{/unless}}>
+						</paper-icon-button>
 					</div>
-					<div class="containerMain experiences">
+					<div class="bottom list">
-						<div class="itemSlot">
+						<div class="item-slot">
-							<paper-item class="inventoryItem race" hero-id="main" {{detailHero "race" _id}} layout horizontal>
+							<div class="item race"
+								 hero-id="main" {{detailHero "race" _id}}
+								 layout horizontal center>
 								{{race}}
-							</paper-item>
+							</div>
 						</div>
 						{{#each classes}}
-							<div class="itemSlot">
+							<div class="item-slot">
-								<paper-item class="inventoryItem class" hero-id="main" {{detailHero}} layout horizontal>
+								<div class="item class"
+									 hero-id="main" {{detailHero}}
+									 layout horizontal center>
 									{{name}}&nbsp;{{level}}
-								</paper-item>
+								</div>
 							</div>
 						{{/each}}
 					</div>
 				</paper-shadow>
 				<!--Notes-->
 				{{#each notes}}
-					<paper-shadow class="card container"  hero-id="main" {{detailHero}}>
+					<paper-shadow class="card"  hero-id="main" {{detailHero}}>
-						<div class="containerTop {{colorClass}} noteTop" hero-id="toolbar" layout horizontal center {{detailHero}}>
+						<div class="top {{colorClass}} noteTop subhead"
-							<div flex>
+							 hero-id="toolbar" {{detailHero}}
-								<div class="containerName subhead">{{name}}</div>
+							 layout horizontal center>
-							</div>
+							{{name}}
 						</div>
-						<div class="containerMain preline">{{description}}</div>
+						<div class="bottom">{{#markdown}}{{description}}{{/markdown}}</div>
 					</paper-shadow>
 				{{/each}}
 			</div>
 			<div class="fab-buffer"></div>
 		</div>
 	</div>
+	{{#if canEditCharacter _id}}
 	<paper-fab id="addNote" 
 				   class="floatyButton" 
 				   icon="add" 
@@ -75,4 +102,5 @@
 				   role="button" 
 				   tabindex="0" 
 				   hero-id="main"></paper-fab>
+	{{/if}}
 </template>

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,18 +1,30 @@
 <template name="noteDialog">
 	{{#with note}}
 		{{#baseDialog title=name class=colorClass startEditing=../startEditing}}
-			<div class="prewrap">{{description}}</div>
+			<div>{{#markdown}}{{description}}{{/markdown}}</div>
 		{{else}}
-			<!--Name-->
+			{{> noteDialogEdit}}
-			<div horizontal layout>
-				<paper-input id="noteNameInput" label="Name" floatinglabel value={{name}} flex></paper-input>
-			</div>
-			<!--Description-->
-			<paper-input-decorator label="Description" floatinglabel layout vertical>
-				<paper-autogrow-textarea>
-					<textarea id="noteDescriptionInput" value={{description}}></textarea>
-				</paper-autogrow-textarea>
-			</paper-input-decorator>
 		{{/baseDialog}}
 	{{/with}}
+</template>
+
+<template name="noteDialogEdit">
+	<!--Name-->
+	<div horizontal layout>
+		<paper-input id="noteNameInput"
+					 label="Name"
+					 floatinglabel
+					 value={{name}}
+					 flex>
+		</paper-input>
+	</div>
+	<!--Description, formatting this nicely breaks it, leave it as is-->
+	<paper-input-decorator label="Description"
+						   floatinglabel
+						   layout vertical>
+		<paper-autogrow-textarea>
+			<textarea id="noteDescriptionInput"
+					  value={{description}}></textarea>
+		</paper-autogrow-textarea>
+	</paper-input-decorator>
 </template>

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

@@ -1,5 +1,7 @@
-Template.noteDialog.onRendered(function(){
+Template.noteDialog.helpers({
-	updatePolymerInputs(this);
+	note: function(){
+		return Notes.findOne(this.noteId);
+	}
 });
 
 Template.noteDialog.events({
@@ -11,6 +13,13 @@ Template.noteDialog.events({
 		GlobalUI.deletedToast(instance.data.noteId, "Notes", "Note");
 		GlobalUI.closeDetail();
 	},
+});
+
+Template.noteDialogEdit.onRendered(function(){
+	updatePolymerInputs(this);
+});
+
+Template.noteDialogEdit.events({
 	"change #noteNameInput, input #noteNameInput": function(event){
 		var value = event.currentTarget.value;
 		Notes.update(this._id, {$set: {name: value}});
@@ -20,9 +29,3 @@ Template.noteDialog.events({
 		Notes.update(this._id, {$set: {description: value}});
 	},
 });
-
-Template.noteDialog.helpers({
-	note: function(){
-		return Notes.findOne(this.noteId);
-	}
-});

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

@@ -1,5 +1,8 @@
 <template name="raceDialog">
-	{{#baseDialog title="Race" class=colorClass hideColor="true" hideDelete="true" startEditing=startEditing}}
+	{{#baseDialog title="Race" class=color hideColor="true" hideDelete="true" startEditing=startEditing}}
+		<div horizontal layout center-justified class= "display2">
+			{{race}}
+		</div>
 		{{> effectsViewList charId=charId parentId=charId parentGroup="racial"}}
 		{{> proficiencyViewList charId=charId parentId=charId parentGroup="racial"}}
 	{{else}}

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

@@ -13,5 +13,9 @@ Template.raceDialog.helpers({
 	race: function(){
 		var char = Characters.findOne(this.charId, {fields: {race: 1}});
 		return char && char.race;
-	}
+	},
+	color: function() {
+		var char = Characters.findOne(this.charId, {fields: {color: 1}});
+		if (char) return getColorClass(char.color);
+	},
 });

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

@@ -0,0 +1,9 @@
+<template name="backgroundDialog">
+	{{#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}}
+		{{> proficiencyEditList parentId=charId parentCollection="Characters" charId=charId parentGroup="background"}}
+	{{/baseDialog}}
+</template>

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

@@ -0,0 +1,8 @@
+Template.backgroundDialog.helpers({
+	value: function(){
+		var fieldSelector = {fields: {}};
+		fieldSelector.fields[this.field] = 1;
+		var char = Characters.findOne(this.charId, fieldSelector);
+		return char[this.field];
+	}
+});

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-->
+	<div layout horizontal center-justified>
-	<paper-input id="nameInput" label="Name" floatinglabel value={{name}}></paper-input><br>
+		<div flex style="max-width: 350px;" layout vertical>
-	<!--Alignment-->
+			<!--Name-->
-	<paper-input id="alignmentInput" label="Alignment" floatinglabel value={{alignment}}></paper-input><br>
+			<paper-input id="nameInput" label="Name" floatinglabel value={{name}}></paper-input>
-	<!--Gender-->
+			<!--Alignment-->
-	<paper-input id="genderInput" label="Gender" floatinglabel value={{gender}}></paper-input><br>
+			<paper-input id="alignmentInput" label="Alignment" floatinglabel value={{alignment}}></paper-input>
-	<!--Race-->
+			<!--Gender-->
-	<paper-input id="raceInput" label="Race" floatinglabel value={{race}}></paper-input><br>
+			<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

@@ -1,9 +1,37 @@
 <template name="persona">
 	<div fit>
 		<div id="persona" class="scroll-y" fit>
-			<div class="containers">
+			<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"}}
@@ -11,11 +39,11 @@
 				{{> containerCard characterField "bonds" "Bonds"}}
 				{{> containerCard characterField "flaws" "Flaws"}}
 				{{> containerCard characterField "backstory" "Background"}}
-				<paper-shadow class="card container">
+				<paper-shadow class="card">
-					<div class="containerTop whiteTop" layout horizontal center>
+                    <div class="white top subhead">
-						<div class="containerName subhead" flex>Languages</div>
+                      Languages
 					</div>
-					<div flex class="containerMain listPadded">
+					<div class="bottom list">
 						{{#each languages}}
 							{{> proficiencyListItem}}
 						{{/each}}
@@ -27,14 +55,19 @@
 </template>
 
 <template name="containerCard">
-	{{#containerCardHelper this}}{{body}}{{/containerCardHelper}}
+	{{#containerCardHelper this}}{{evaluateString _id body}}{{/containerCardHelper}}
 </template>
 
 <template name="containerCardHelper">
-	<paper-shadow class="card container {{class}}"  hero-id="main" {{detailHero field ../_id}}>
+	<paper-shadow class="card {{class}}"
-		<div class="containerTop {{colorClass}} {{topClass}}" hero-id="toolbar" layout horizontal center {{detailHero field ../_id}}>
+                  hero-id="main" {{detailHero field ../_id}}>
-			<div class="containerName subhead" hero-id="title" flex {{detailHero field ../_id}}>{{title}}</div>
+        <div class="top subhead {{colorClass}} {{topClass}}"
+             hero-id="toolbar" {{detailHero field ../_id}}>
+			<div class="subhead" flex
+                 hero-id="title" {{detailHero field ../_id}}>
+              {{title}}
+          </div>
 		</div>
-		<div flex class="containerMain prewrap">{{> 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,25 +40,28 @@ Template.persona.helpers({
 
 Template.persona.events({
 	"tap .characterField": function(event){
-		if (this.field !== "details"){
+		if (this.field == "details"){
-			var charId = Template.parentData()._id;
-			GlobalUI.setDetail({
-				template: "textDialog",
-				data:     {
-					charId: charId,
-					field: this.field,
-					title: this.title,
-					color: this.color,
-				},
-				heroId:   this._id + this.field,
-			});
-		} else {
 			this.charId = Template.parentData()._id;
 			GlobalUI.setDetail({
 				template: "personaDetailsDialog",
 				data:     this,
 				heroId:   this._id + this.field,
 			});
+		} else {
+			var template = "textDialog";
+			if (this.field === "backstory") template = "backgroundDialog";
+			var charId = Template.parentData()._id;
+			GlobalUI.setDetail({
+				template: template,
+				data: {
+					charId: charId,
+					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="prewrap">{{value}}</div>
+		<div>{{#markdown}}{{evaluateString charId value}}{{/markdown}}</div>
 	{{else}}
 		{{> textDialogEdit}}
 	{{/baseDialog}}

rpg-docs/client/views/character/proficiencies/proficiencyListItem/proficiencyListItem.html

@@ -1,8 +1,11 @@
 <template name="proficiencyListItem">
-	<div class="itemSlot">
+	<div class="item-slot">
-		<paper-item noink class="white proficiencyItem" hero-id="main" {{detailHero}}>
+		<div class="proficiency item small"
-			<core-icon icon="{{profIcon}}" class="black54"></core-icon>
+			 hero-id="main" {{detailHero}}
-			<div class="sideMargin">{{getName}}</div>
+			 layout horizontal center>
-		</paper-item>
+			<core-icon icon="{{profIcon}}"
+					   style="margin-right: 16px;"></core-icon>
+			<div flex>{{getName}}</div>
+		</div>
 	</div>
 </template>

rpg-docs/client/views/character/proficiencies/proficiencyListItem/proficiencyListItem.js

@@ -14,7 +14,7 @@ Template.proficiencyListItem.helpers({
 });
 
 Template.proficiencyListItem.events({
-	"tap .proficiencyItem": function(event, instance){
+	"tap .proficiency": function(event, instance){
 		openParentDialog(this.parent, this.charId, this._id);
 	}
 });

rpg-docs/client/views/character/proficiencies/proficiencyView/proficiencyView.html

@@ -1,6 +1,10 @@
 <template name="proficiencyView">
-	<div class="proficiencyView" layout horizontal center>
+	<div class="proficiencyView item small"
-		<core-icon icon="{{profIcon}}"></core-icon>
+		 style="padding: 0;"
-		<div class="sideMargin">{{getName}}</div>
+		 layout horizontal center>
+		<core-icon icon="{{profIcon}}" style="margin-right: 16px;"></core-icon>
+		<div>{{getName}}</div>
 	</div>
 </template>
+
+

rpg-docs/client/views/character/proficiencies/proficiencyViewList/proficiencyViewList.html

@@ -2,7 +2,7 @@
 	{{#if proficiencies.count}}
 		<hr class="vertMargin">
 		<div class="proficiencies">
-			<h2 class="spaceAfter">Proficiencies</h2>
+			<h2 style="margin-bottom: 8px;">Proficiencies</h2>
 			{{#each proficiencies}}
 				{{> proficiencyView}}
 			{{/each}}

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

@@ -9,24 +9,33 @@
 </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="prewrap">{{description}}</div>
+	<div>{{#markdown}}{{evaluateString charId description}}{{/markdown}}</div>
+	{{> attacksViewList charId=charId parentId=_id}}
 </template>
 
 <template name="spellEdit">
@@ -126,4 +135,5 @@
 			<textarea id="descriptionInput" placeholder value={{description}}></textarea>
 		</paper-autogrow-textarea>
 	</paper-input-decorator>
+	{{> attackEditList  parentId=_id parentCollection="Spells" charId=charId enabled=true name=name}}
 </template>

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

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

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

@@ -1,84 +1,121 @@
 <template name="spells">
 	<div fit>
 		<div id="spells" class="scroll-y" fit>
-			<div class="spellsContainer" layout horizontal start wrap>
+			<div style="padding: 4px;" 
+				 layout horizontal start wrap>
 				{{#if hasSlots}}
-					<paper-shadow class="card container spellSlotContainer"  hero-id="main" {{detailHero}}>
+					<paper-shadow class="card"
-						<div class="containerTop whiteTop" layout horizontal center>
+								  style="margin: 4px;"
-							<div class="containerName subhead" hero-id="title" flex>Spell Slots</div>
+								  hero-id="main" {{detailHero}}>
+						<div class="white top subhead"
+							 layout horizontal center>
+							Spell Slots
 						</div>
-						<div flex class="containerMain">
+						<div class="bottom list">
 							{{#each levels}}{{#if showSlots ..}}
-								<div class="itemSlot">
+								<div class="item-slot">
-									<paper-item class="inventoryItem spellSlot" hero-id="main" {{detailHero slotStatName ../_id}} layout horizontal>
+									<div class="item spellSlot"
-										<div class="slotName">
+												hero-id="main" {{detailHero slotStatName ../_id}}
+												layout horizontal center>
+										<div style="margin-right: 16px">
 											{{name}}
 										</div>
 										<div flex layout horizontal center>
 											{{#each slotBubbles ..}}
-												<paper-icon-button class="slotBubble" icon={{icon}} disabled={{disabled}}></paper-icon-button>
+												<paper-icon-button class="slotBubble"
+																   icon={{icon}}
+																   disabled={{disabled}}>
+												</paper-icon-button>
 											{{/each}}
 										</div>
-									</paper-item>
+									</div>
 								</div>
 							{{/if}}{{/each}}
 						</div>
 					</paper-shadow>
 				{{/if}}
 				{{#each spellLists}}
-					<paper-shadow class="card container spellList"  hero-id="main" {{detailHero}} flex>
+					<paper-shadow class="card spellList" flex
-						<div class="containerTop {{colorClass}}" hero-id="toolbar" layout horizontal center {{detailHero}}>
+								  hero-id="main" {{detailHero}}
+								  style="margin: 4px;">
+						<div class="top {{colorClass}}"
+							 hero-id="toolbar" {{detailHero}}
+							 layout horizontal center>
 							<div flex>
-								<div class="containerName subhead">{{name}}</div>
+								<div class="subhead">{{name}}</div>
 								<div class="caption">
 									{{#if saveDC}}
-										Save DC: {{evaluate charId saveDC}}
+										<span style="margin-right: 16px;">
-										<div style="width: 16px; display: inline-block;"></div>
+											Save DC: {{evaluate charId saveDC}}
+										</span>
 									{{/if}}
 									{{#if attackBonus}}
-										Attack Bonus: {{evaluateSigned charId attackBonus}}
+										<span>
+											Attack Bonus: {{evaluateSigned charId attackBonus}}
+										</span>
 									{{/if}}
 								</div>
 							</div>
 							{{#if settings.showUnprepared}}
-								{{#if maxPrepared}}<div class="subhead">{{numPrepared}} / {{evaluate charId maxPrepared}}</div>{{/if}}
+								{{#if maxPrepared}}
-								<core-tooltip label="Done" position="left">
+									<div class="subhead">
-									<paper-icon-button class="finishPrep" icon="done"></paper-icon-button>
+										{{numPrepared}} / {{evaluate charId maxPrepared}}
-							</core-tooltip>
+									</div>
+								{{/if}}
+								<core-tooltip label="Done"
+											  position="left">
+									<paper-icon-button class="finishPrep"
+													   icon="done">
+									</paper-icon-button>
+								</core-tooltip>
 							{{else}}
-								<core-tooltip label="Change prepared spells" position="left">
+								<core-tooltip label="Change prepared spells"
-									<paper-icon-button class="prepSpells" icon="book"></paper-icon-button>
+											  position="left">
+									<paper-icon-button class="prepSpells"
+													   disabled={{#unless canEditCharacter charId}}true{{/unless}}
+													   icon="book">
+									</paper-icon-button>
 								</core-tooltip>
 							{{/if}}
 						</div>
-						<div class="containerMain">
+						<div class="bottom list column-container">
 							{{#each levels}}
 								<div class="spellLevel">
 									{{#if spellCount .. ../../_id}}
-										<div class="list-subhead" layout horizontal center>
+										<div class="subhead">
 											{{name}}
 										</div>
 									{{/if}}
 									{{#each spells ../_id ../../_id}}
 										{{#if showSpell ../../settings.showUnprepared}}
-											<div class="itemSlot">
+											<div class="item-slot">
-												<paper-item class="inventoryItem spell" hero-id="main" {{detailHero}} 
+												<div class="tall spell item"
-															layout horizontal center>
+													 hero-id="main" {{detailHero}}
-														<!--disabled={{cantCast ../level ../../..}} to grey out spells above highest usable slot-->
+													 layout horizontal center>
 													<core-icon icon="social:whatshot" 
-															   style="color: {{hexColor color}};"
+															   style="color: {{hexColor color}};
+																	  margin-right: 16px;"
 															   ></core-icon>
 													<div flex layout vertical>
 														<div>{{name}}</div>
 														<div class="caption">
-															{{school}} {{castingTime}}
+															{{school}}
-															{{#if ritual}}(ritual){{/if}}{{#if spellComponents}} - {{spellComponents}}{{/if}}
+															{{castingTime}}
+															{{#if ritual}}
+																(ritual)
+															{{/if}}
+															{{#if spellComponents}}
+																- {{spellComponents}}
+															{{/if}}
 														</div>
 													</div>
 													{{#if ../../settings.showUnprepared}}
-														<paper-checkbox class="preparedCheckbox" checked={{isPrepared}} disabled={{cantUnprepare}}></paper-checkbox>
+														<paper-checkbox class="preparedCheckbox"
+																		checked={{isPrepared}}
+																		disabled={{cantUnprepare}}>
+														</paper-checkbox>
 													{{/if}}
-												</paper-item>
+												</div>
 											</div>
 										{{/if}}
 									{{/each}}
@@ -91,8 +128,20 @@
 			<div class="fab-buffer"></div>
 		</div>
 	</div>
-	<paper-fab-menu id="inventoryAddMenu" icon="add" closeIcon="close" duration="0.3">
+	{{#if canEditCharacter _id}}
-		<paper-fab-menu-item id="addSpell" icon="note-add" color="#d23f31" tooltip="Spell"></paper-fab-menu-item>
+		{{#fabMenu}}
-		<paper-fab-menu-item id="addSpellList" icon="work" color="#d23f31" tooltip="Spell List"></paper-fab-menu-item>
+			<core-tooltip label="New spell list" position="left">
-	</paper-fab-menu>
+				<paper-fab icon="work"
+						   class="addSpellList"
+						   mini>
+				</paper-fab>
+			</core-tooltip>
+			<core-tooltip label="New spell" position="left">
+				<paper-fab icon="note-add"
+						   class="addSpell"
+						   mini>
+				</paper-fab>
+			</core-tooltip>
+		{{/fabMenu}}
+	{{/if}}
 </template>

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 baseSlots = Characters.calculate.attributeBase(char._id, "level" + this.level + "SpellSlots");
-		var currentSlots = char.attributeValue("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) <
+					Characters.calculate.attributeValue(char._id, this.attribute) <
-					char.attributeBase(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});
@@ -170,7 +166,7 @@ Template.spells.events({
 			heroId:   charId + stat,
 		});
 	},
-	"tap .containerTop": function(event){
+	"tap .spellList .top": function(event){
 		GlobalUI.setDetail({
 			template: "spellListDialog",
 			data:     {spellListId: this._id, charId: this.charId},
@@ -184,7 +180,7 @@ Template.spells.events({
 			heroId:   this._id,
 		});
 	},
-	"tap #addSpellList": function(event){
+	"tap .addSpellList": function(event){
 		var charId = this.charId;
 		SpellLists.insert({
 			name: "New SpellList",
@@ -201,7 +197,7 @@ Template.spells.events({
 			}
 		});
 	},
-	"tap #addSpell": function(event){
+	"tap .addSpell": function(event){
 		var charId = this.charId;
 		var listId = SpellLists.findOne({charId: this._id})._id;
 		Spells.insert({

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

@@ -1,34 +0,0 @@
-.card.double {
-	display: flex;
-}
-
-.card.double > div{
-	vertical-align: top;
-	padding: 16px;
-}
-
-.abilityScore {
-	width: 70px;
-	text-align: center;
-	background-color: #D50000;
-	padding: 16px;
-	position: relative;
-	border-radius: 2px 0 0 2px;
-}
-
-#stats .card {
-	padding: 0;
-}
-
-.abilityCardRight {
-	flex-grow: 1;
-	padding-right: 0;
-}
-
-.abilityCardRight hr{
-	margin: 8px 0 8px -16px;
-}
-
-.abilityCardRight h1{
-	margin-bottom: 8px;
-}

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

@@ -1,122 +1,14 @@
 <template name="abilityMiniCard">
-	<paper-shadow class="card double abilityMiniCard" 
+	<paper-shadow class="card abilityMiniCard clickable" 
-				  hero-id="main" {{detailHero ability ../_id}}>
+				  hero-id="main" {{detailHero ability ../_id}}
-		<div class="abilityScore white-text {{color}}"
+				  layout horizontal>
+		<div class="left white-text {{color}}"
 			 hero-id="toolbar" {{detailHero ability ../_id}}>
-			<h1 class="display1">{{../attributeValue ability}}</h1>
+			<div class="display1">{{characterCalculate "attributeValue" ../_id ability}}</div>
-			<h2>{{../abilityMod ability}}</h2>
+			<div class="title">{{abilityMod}}</div>
 		</div>
-		<div class="abilityCardRight subhead" layout horizontal center>
+		<div class="right subhead" layout horizontal center>
 			{{title}}
 		</div>
-		<paper-ripple fit></paper-ripple>
 	</paper-shadow>
 </template>
-
-<template name="strengthCard">
-	<paper-shadow class="card double">
-		<div class="abilityScore red white-text">
-			{{> ripple color="#eee"}}
-			<h1 class="display1">{{attributeValue "strength"}}</h1>
-			<h2>{{abilityMod "strength"}}</h2>
-		</div>
-		<div class="abilityCardRight">
-			<h1>Strength</h1>
-			{{> skillRow name="Save" skill="strengthSave"}}
-			<hr>
-			{{> skillRow name="Athletics" skill="athletics"}}
-		</div>
-	</paper-shadow>
-</template>
-
-<template name="dexterityCard">
-	<paper-shadow class="card double">
-		<div class="abilityScore green white-text">
-			{{> ripple color="#eee"}}
-			<h1 class="display1">{{attributeValue "dexterity"}}</h1>
-			<h2>{{abilityMod "dexterity"}}</h2>
-		</div>
-		<div class="abilityCardRight">
-			<h1>Dexterity</h1>
-			{{> skillRow name="Save" skill="dexteritySave"}}
-			<hr>
-			{{> skillRow name="Acrobatics" skill="acrobatics"}}
-			{{> skillRow name="Sleight of Hand" skill="sleightOfHand"}}
-			{{> skillRow name="Stealth" skill="stealth"}}
-		</div>
-	</paper-shadow>
-</template>
-
-<template name="constitutionCard">
-	<paper-shadow class="card double">
-		<div class="abilityScore deep-orange white-text">
-			{{> ripple color="#eee"}}
-			<h1 class="display1">{{attributeValue "constitution"}}</h1>
-			<h2>{{abilityMod "constitution"}}</h2>
-		</div>
-		<div class="abilityCardRight">
-			<h1>Constitution</h1>
-			{{> skillRow name="Save" skill="constitutionSave"}}
-			<hr>
-		</div>
-	</paper-shadow>
-</template>
-
-<template name="intelligenceCard">
-	<paper-shadow class="card double">
-		<div class="abilityScore indigo white-text">
-			{{> ripple color="#eee"}}
-			<h1 class="display1">{{attributeValue "intelligence"}}</h1>
-			<h2>{{abilityMod "intelligence"}}</h2>
-		</div>
-		<div class="abilityCardRight">
-			<h1>Intelligence</h1>
-			{{> skillRow name="Save" skill="intelligenceSave"}}
-			<hr>
-			{{> skillRow name="Arcana" skill="arcana"}}
-			{{> skillRow name="History" skill="history"}}
-			{{> skillRow name="Investigation" skill="investigation"}}
-			{{> skillRow name="Nature" skill="nature"}}
-			{{> skillRow name="Religion" skill="religion"}}
-		</div>
-	</paper-shadow>
-</template>
-
-<template name="wisdomCard">
-	<paper-shadow class="card double">
-		<div class="abilityScore purple white-text">
-			{{> ripple color="#eee"}}
-			<h1 class="display1">{{attributeValue "wisdom"}}</h1>
-			<h2>{{abilityMod "wisdom"}}</h2>
-		</div>
-		<div class="abilityCardRight">
-			<h1>Wisdom</h1>
-			{{> skillRow name="Save" skill="wisdomSave"}}
-			<hr>
-			{{> skillRow name="Animal Handling" skill="animalHandling"}}
-			{{> skillRow name="Insight" skill="insight"}}
-			{{> skillRow name="Medicine" skill="medicine"}}
-			{{> skillRow name="Perception" skill="perception" showPassive="true"}}
-			{{> skillRow name="Survival" skill="survival"}}
-		</div>
-	</paper-shadow>
-</template>
-
-<template name="charismaCard">
-	<paper-shadow class="card double">
-		<div class="abilityScore pink white-text">
-			{{> ripple color="#eee"}}
-			<h1 class="display1">{{attributeValue "charisma"}}</h1>
-			<h2>{{abilityMod "charisma"}}</h2>
-		</div>
-		<div class="abilityCardRight">
-			<h1>Charisma</h1>
-			{{> skillRow name="Save" skill="charismaSave"}}
-			<hr>
-			{{> skillRow name="Deception" skill="deception"}}
-			{{> skillRow name="Intimidation" skill="intimidation"}}
-			{{> skillRow name="Performance" skill="performance"}}
-			{{> skillRow name="Persuasion" skill="persuasion"}}
-		</div>
-	</paper-shadow>
-</template>

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

@@ -1,6 +1,6 @@
 <!-- needs name, char, and statName -->
 <template name="attributeDialog">
-	{{#baseDialog title=name class=colorClass hideEdit=true}}
+	{{#baseDialog title=name class=color hideEdit=true}}
 		{{> attributeDialogView}}
 	{{/baseDialog}}
 </template>
@@ -23,7 +23,7 @@
 		{{#each baseEffects}}
 			<tr>
 				<td>{{sourceName}}</td>
-				<td>{{signedString statValue}}</td>
+				<td>Base: {{statValue}}</td>
 			</tr>
 		{{/each}}
 		{{#each addEffects}}
@@ -35,7 +35,7 @@
 		{{#each mulEffects}}
 			<tr>
 				<td>{{sourceName}}</td>
-				<td>&times;{{statValue}}</td>
+				<td>&times; {{statValue}}</td>
 			</tr>
 		{{/each}}
 		{{#each minEffects}}

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

@@ -93,54 +93,61 @@ var abilities = {
 	charisma: {name: "Charisma"},
 };
 
+Template.attributeDialog.helpers({
+	color: function(){
+		if (this.color) return this.color + " white-text";
+		var char = Characters.findOne(this.charId, {fields: {color: 1}});
+		if (char) return getColorClass(char.color);
+	},
+});
+
 Template.attributeDialogView.helpers({
 	or: function(a, b, c){
 		return a || b || c;
 	},
 	adjustment: function(){
-		var char = Characters.findOne(this.charId);
+		var value = Characters.calculate.attributeValue(this.charId, this.statName);
-		if (!char) return;
+		var base = Characters.calculate.attributeBase(this.charId, this.statName);
-		var value = char.attributeValue(this.statName);
-		var base = char.attributeBase(this.statName);
 		return value - base;
 	},
 	baseEffects: function(){
 		return Effects.find(
-			{charId: this.charId, stat: this.statName, operation: "base"}
+			{charId: this.charId, stat: this.statName, operation: "base", enabled: true}
 		);
 	},
 	addEffects: function(){
 		return Effects.find(
-			{charId: this.charId, stat: this.statName, operation: "add"}
+			{charId: this.charId, stat: this.statName, operation: "add", enabled: true}
 		);
 	},
 	mulEffects: function(){
 		return Effects.find(
-			{charId: this.charId, stat: this.statName, operation: "mul"}
+			{charId: this.charId, stat: this.statName, operation: "mul", enabled: true}
 		);
 	},
 	minEffects: function(){
 		return Effects.find(
-			{charId: this.charId, stat: this.statName, operation: "min"}
+			{charId: this.charId, stat: this.statName, operation: "min", enabled: true}
 		);
 	},
 	maxEffects: function(){
 		return Effects.find(
-			{charId: this.charId, stat: this.statName, operation: "max"}
+			{charId: this.charId, stat: this.statName, operation: "max", enabled: true}
 		);
 	},
 	attributeBase: function(){
-		var char = Characters.findOne(this.charId);
+		return Characters.calculate.attributeBase(this.charId, this.statName);
-		if (!char) throw "character is " + char;
-		return char.attributeBase(this.statName);
 	},
 	attributeValue: function() {
-		var char = Characters.findOne(this.charId);
+		return Characters.calculate.attributeValue(this.charId, this.statName);
-		if (!char) throw "character is " + char;
-		return char.attributeValue(this.statName);
 	},
 	sourceName: function(){
-		if (this.parent.collection === "Characters") return this.name;
+		if (this.parent.group === "racial"){
+			return this.getParent().race;
+		}
+		if (this.parent.collection === "Characters"){
+			return this.name;
+		}
 		return this.getParent().name;
 	},
 	operationName: function(){

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

@@ -0,0 +1,39 @@
+<template name="strengthDialog">
+	{{#baseDialog title=name class=color hideEdit=true}}
+		{{> attributeDialogView}}
+		<hr class="vertMargin">
+		<div>
+			<div class="title padded">Carrying</div>
+			{{> carryCapacityTable}}
+			<div class="title padded">Jumping</div>
+			<table class="strengthTable">
+				<tr>
+					<td>Running long jump</td>
+					<td>{{evaluate charId "strength"}} feet</td>
+				</tr>
+				<tr>
+					<td>Standing long jump</td>
+					<td>{{evaluate charId "floor(strength/2)"}} feet</td>
+				</tr>
+				<tr>
+					<td>Running high jump</td>
+					<td>{{evaluate charId "3 + strengthMod"}} feet</td>
+					<td class="caption">
+						Can reach a ledge as high as
+						{{evaluate charId "3 + strengthMod"}} feet
+						+ 1.5&times; your height
+					</td>
+				</tr>
+				<tr>
+					<td>Standing high jump</td>
+					<td>{{evaluate charId "floor((3 + strengthMod)/2)"}} feet</td>
+					<td class="caption">
+						Can reach a ledge as high as
+						{{evaluate charId "floor((3 + strengthMod)/2)"}} feet
+						+ 1.5&times; your height
+					</td>
+				</tr>
+			</table>
+		</div>
+	{{/baseDialog}}
+</template>

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

@@ -0,0 +1,7 @@
+Template.strengthDialog.helpers({
+	color: function(){
+		if (this.color) return this.color + " white-text";
+		var char = Characters.findOne(this.charId, {fields: {color: 1}});
+		if (char) return getColorClass(char.color);
+	},
+});

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

@@ -0,0 +1,28 @@
+<template name="carryCapacityTable">
+	<table class="carryCapacityTable strengthTable">
+		<tr>
+			<td>Encumbered</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 * 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 * 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 * carryMultiplier"}}lbs</td>
+			<td class="caption"></td>
+		</tr>
+	</table>
+</template>

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

@@ -1,4 +1,4 @@
-.healthCard paper-slider{
+.healthCard paper-diff-slider{
 	width: 100%;
 	margin-right: 8px;
 }

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

@@ -1,41 +1,60 @@
 <template name="healthCard">
-	<paper-shadow class="card container healthCard" 
+	<paper-shadow class="card container healthCard"
-				  hero-id="main" {{detailHero "hitPoints" _id}} 
+				  hero-id="main" {{detailHero "hitPoints" _id}}
 				  layout horizontal wrap>
-		<div class="green white-text subhead padded leftRound" 
+		<div class="green white-text subhead left"
 			 hero-id="toolbar" {{detailHero "hitPoints" _id}}
-			 layout vertical center>
+			 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="padded" flex layout vertical center-justified style="min-width: 180px;">
+		<div class="right" flex layout vertical center-justified style="min-width: 180px;">
-			<paper-slider id="hitPointSlider"
+			<div layout horizontal>
-						  value={{attributeValue "hitPoints"}}
+				<paper-diff-slider id="hitPointSlider"
-						  max={{attributeBase "hitPoints"}} 
+								   value={{characterCalculate "attributeValue" _id "hitPoints"}}
-						  editable pin
+								   max={{characterCalculate "attributeBase" _id "hitPoints"}}
-						  role="slider"
+								   editable pin
-						  ></paper-slider>
+								   disabled={{#unless canEditCharacter _id}}true{{/unless}}
+								   role="slider">
+				</paper-diff-slider>
+			</div>
 			{{#each tempHitPoints}}
 				<div>
 					{{name}}
 					<div layout horizontal>
-					<paper-slider class="tempHitPointSlider"
+					<paper-diff-slider class="tempHitPointSlider"
 							  value={{left}}
 							  max={{maximum}}
 							  editable pin
 							  role="slider"
 							  flex
-							  ></paper-slider>
+							  ></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.immunities.length}}
-				{{#if multipliers.resistances.length}}<div>Resistance: {{#each multipliers.resistances}} {{name}} {{/each}}</div>{{/if}}
+					<div>
-				{{#if multipliers.weaknesses.length}} <div>Weakness:   {{#each multipliers.weaknesses}}  {{name}} {{/each}}</div>{{/if}}
+						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: "Acid",        value: Characters.calculate.attributeValue(this._id, "acidMultiplier")},
-			{name: "Bludgeoning", value: char.attributeValue("bludgeoningMultiplier", 1)},
+			{name: "Bludgeoning", value: Characters.calculate.attributeValue(this._id, "bludgeoningMultiplier")},
-			{name: "Cold",        value: char.attributeValue("coldMultiplier", 1)},
+			{name: "Cold",        value: Characters.calculate.attributeValue(this._id, "coldMultiplier")},
-			{name: "Fire",        value: char.attributeValue("fireMultiplier", 1)},
+			{name: "Fire",        value: Characters.calculate.attributeValue(this._id, "fireMultiplier")},
-			{name: "Force",       value: char.attributeValue("forceMultiplier", 1)},
+			{name: "Force",       value: Characters.calculate.attributeValue(this._id, "forceMultiplier")},
-			{name: "Lightning",   value: char.attributeValue("lightningMultiplier", 1)},
+			{name: "Lightning",   value: Characters.calculate.attributeValue(this._id, "lightningMultiplier")},
-			{name: "Necrotic",    value: char.attributeValue("necroticMultiplier", 1)},
+			{name: "Necrotic",    value: Characters.calculate.attributeValue(this._id, "necroticMultiplier")},
-			{name: "Piercing",    value: char.attributeValue("piercingMultiplier", 1)},
+			{name: "Piercing",    value: Characters.calculate.attributeValue(this._id, "piercingMultiplier")},
-			{name: "Poison",      value: char.attributeValue("poisonMultiplier", 1)},
+			{name: "Poison",      value: Characters.calculate.attributeValue(this._id, "poisonMultiplier")},
-			{name: "Psychic",     value: char.attributeValue("psychicMultiplier", 1)},
+			{name: "Psychic",     value: Characters.calculate.attributeValue(this._id, "psychicMultiplier")},
-			{name: "Radiant",     value: char.attributeValue("radiantMultiplier", 1)},
+			{name: "Radiant",     value: Characters.calculate.attributeValue(this._id, "radiantMultiplier")},
-			{name: "Slashing",    value: char.attributeValue("slashingMultiplier", 1)},
+			{name: "Slashing",    value: Characters.calculate.attributeValue(this._id, "slashingMultiplier")},
-			{name: "Thunder",     value: char.attributeValue("thunderMultiplier", 1)},
+			{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,23 +1,32 @@
 <template name="hitDice">
-	{{#if ../attributeBase name}}
+	{{#if characterCalculate "attributeBase" ../_id name}}
-		<paper-shadow class="card container" hero-id="main" {{detailHero name ../_id}} layout horizontal>
+		<paper-shadow class="card hit-dice" hero-id="main" 
-			<div class="containerLeft green" layout horizontal hero-id="toolbar" {{detailHero name ../_id}}>
+					  {{detailHero name ../_id}} 
-				<div class="resourceButtons">
+					  layout horizontal>
-					<paper-icon-button class="resourceUp" icon="arrow-drop-up" disabled={{cantIncrement}}></paper-icon-button>
+			<div class="left green display1 white-text" 
-					<paper-icon-button class="resourceDown" icon="arrow-drop-down" disabled={{cantDecrement}}></paper-icon-button>
+				 hero-id="toolbar" {{detailHero name ../_id}}
+				 layout horizontal>
+				<div>
+					<paper-icon-button class="resourceUp" 
+									   icon="arrow-drop-up" 
+									   disabled={{cantIncrement}}>
+					</paper-icon-button>
+					<paper-icon-button class="resourceDown"
+									   icon="arrow-drop-down"
+									   disabled={{cantDecrement}}>
+					</paper-icon-button>
 				</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>
-			<div class="containerRight clickable" flex relative horizontal layout center>
+			<div class="right clickable" flex relative horizontal layout center>
 				Hit Dice
-				<paper-ripple fit></paper-ripple>
 			</div>
 		</paper-shadow>
 	{{/if}}

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

@@ -1,36 +1,49 @@
 Template.hitDice.helpers({
 	cantIncrement: function(){
-		var valueSmallerThanBase = this.char.attributeValue(this.name) <
+		var value = Characters.calculate.attributeValue(this.char._id, this.name);
-			this.char.attributeBase(this.name);
+		var base = Characters.calculate.attributeBase(this.char._id, this.name);
-		return !valueSmallerThanBase;
+		return value >= base || !canEditCharacter(this.char._id);
 	},
 	cantDecrement: function(){
-		var valuePositive = this.char.attributeValue(this.name) > 0;
+		var value = Characters.calculate.attributeValue(this.char._id, this.name);
-		return !valuePositive;
+		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});
 		}
 	},
-	"tap .containerRight": function() {
+	"tap .right": function() {
 		var charId = Template.parentData()._id;
 		var title = "d" + this.diceNum + " Hit Dice";
 		GlobalUI.setDetail({
 			template: "attributeDialog",
-			data:     {name: title, statName: this.name, charId: charId},
+			data:     {
+				name: title,
+				statName: this.name,
+				charId: charId,
+				color: "green",
+			},
 			heroId:   charId + this.name,
 		});
 	},

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

@@ -1,6 +1,6 @@
-<!-- needs name, char, and skillName -->
+<!-- needs name, charId, and skillName -->
 <template name="skillDialog">
-	{{#baseDialog title=name class=colorClass hideEdit=true}}
+	{{#baseDialog title=name class=color hideEdit=true}}
 		{{> skillDialogView}}
 	{{/baseDialog}}
 </template>
@@ -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

@@ -93,14 +93,20 @@ var abilities = {
 	charisma: {name: "Charisma"},
 };
 
+Template.skillDialog.helpers({
+	color: function(){
+		if (this.color) return this.color + " white-text";
+		var char = Characters.findOne(this.charId, {fields: {color: 1}});
+		if (char) return getColorClass(char.color);
+	},
+});
+
 Template.skillDialogView.helpers({
 	or: function(a, b, c){
 		return a || b || c;
 	},
 	profIcon: function(){
-		var char = Characters.findOne(this.charId);
+		var prof = Characters.calculate.proficiency(this.charId, this.skillName);
-		if (!char) return;
-		var prof = char.proficiency(this.skillName);
 		if (prof > 0 && prof < 1) return "image:brightness-2";
 		if (prof === 1) return "image:brightness-1";
 		if (prof > 1) return "av:album";
@@ -115,13 +121,13 @@ Template.skillDialogView.helpers({
 	profBonus: function(){
 		var char = Characters.findOne(this.charId);
 		if (!char) return;
-		return char.proficiency(this.skillName) *
+		var prof = Characters.calculate.proficiency(this.charId, this.skillName);
-			char.attributeValue("proficiencyBonus");
+		var proficiencyBonus = 
+			Characters.calculate.attributeValue(this.charId, "proficiencyBonus");
+		return prof * proficiencyBonus;
 	},
 	proficiencyValue: function(){
-		var char = Characters.findOne(this.charId);
+		var prof = Characters.calculate.proficiency(this.charId, this.skillName);
-		if (!char) return;
-		var prof = char.proficiency(this.skillName);
 		if (prof == 0.5) return "Half Proficiency";
 		if (prof == 1)   return "Proficient";
 		if (prof == 2)   return "Double Proficiency";
@@ -132,6 +138,7 @@ Template.skillDialogView.helpers({
 			charId: this.charId,
 			stat: this.skillName,
 			operation: "add",
+			enabled: true,
 		});
 	},
 	mulEffects: function(){
@@ -139,6 +146,7 @@ Template.skillDialogView.helpers({
 			charId: this.charId,
 			stat: this.skillName,
 			operation: "mul",
+			enabled: true,
 		});
 	},
 	minEffects: function(){
@@ -146,6 +154,7 @@ Template.skillDialogView.helpers({
 			charId: this.charId,
 			stat: this.skillName,
 			operation: "min",
+			enabled: true,
 		});
 	},
 	maxEffects: function(){
@@ -153,6 +162,7 @@ Template.skillDialogView.helpers({
 			charId: this.charId,
 			stat: this.skillName,
 			operation: "max",
+			enabled: true,
 		});
 	},
 	advEffects: function(){
@@ -160,6 +170,7 @@ Template.skillDialogView.helpers({
 			charId: this.charId,
 			stat: this.skillName,
 			operation: "advantage",
+			enabled: true,
 		});
 	},
 	dadvEffects: function(){
@@ -167,6 +178,7 @@ Template.skillDialogView.helpers({
 			charId: this.charId,
 			stat: this.skillName,
 			operation: "disadvantage",
+			enabled: true,
 		});
 	},
 	conditionalEffects: function(){
@@ -174,6 +186,7 @@ Template.skillDialogView.helpers({
 			charId: this.charId,
 			stat: this.skillName,
 			operation: "conditional",
+			enabled: true,
 		});
 	},
 	ability: function(){
@@ -184,20 +197,21 @@ Template.skillDialogView.helpers({
 		return skill.ability;
 	},
 	abilityName: function(){
-		var opts = {fields: {}};
+		var skill = Characters.calculate.getField(this.charId, this.skillName);
-		opts.fields[this.skillName] = 1;
-		var char = Characters.findOne(this.charId, opts);
-		if (!char) return;
-		var skill = char[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") return "inate";
+		if (this.parent.collection === "Characters"){
+			if (this.parent.group === "racial"){
+				return Characters.calculate.getField(this.charId, "race") || "Race";
+			}
+			if (this.parent.group === "background"){
+				return "Background";
+			}
+			return "Innate";
+		}
 		return this.getParent().name;
 	},
 	operationName: function(){