Merge branch 'hotfix-rounding'

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

rpg-docs/.meteor/packages

@@ -25,3 +25,5 @@ splendido:accounts-meld
 email
 fourseven:scss@2.1.1
 wolves:bourbon
+meteorhacks:subs-manager
+meteorhacks:kadira

rpg-docs/.meteor/versions

@@ -50,11 +50,15 @@ logging@1.0.7
 matb33:collection-hooks@0.7.13
 meteor@1.1.6
 meteor-platform@1.2.2
+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

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,16 @@ 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},
+	description:  {type: String, defaultValue: "", trim: false, optional: true},
-	personality:  {type: String, defaultValue: "", trim: false},
+	personality:  {type: String, defaultValue: "", trim: false, optional: true},
-	ideals:       {type: String, defaultValue: "", trim: false},
+	ideals:       {type: String, defaultValue: "", trim: false, optional: true},
-	bonds:        {type: String, defaultValue: "", trim: false},
+	bonds:        {type: String, defaultValue: "", trim: false, optional: true},
-	flaws:        {type: String, defaultValue: "", trim: false},
+	flaws:        {type: String, defaultValue: "", trim: false, optional: true},
-	backstory:    {type: String, defaultValue: "", trim: false},
+	backstory:    {type: String, defaultValue: "", trim: false, optional: true},
 
 	//attributes
 	//ability scores
@@ -159,6 +159,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 +169,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 +297,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 +307,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 = Math.NEGATIVE_INFINITY;
-		_.forEach(effects.add, function(effect){
+		var max = Math.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 +402,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 +422,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 +531,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/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/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/Reports.js

@@ -45,7 +45,26 @@ Meteor.methods({
 			metaData: Object,
 		});
 		report.owner = this.userId;
-		Reports.insert(report);
+		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);

rpg-docs/Routes/Routes.js

@@ -4,17 +4,9 @@ Router.configure({
 });
 
 Router.plugin("ensureSignedIn", {
-	except: [
+	only: [
-		"home",
+		"profile",
-		"atSignIn",
+		"characterList",
-		"atSignUp",
-		"atForgotPassword",
-		"atResetPwd",
-		"atEnrollAccount",
-		"atVerifyEmail",
-		"atResendVerificationEmail",
-		"loginButtons",
-		"notFound",
 	]
 });
 
@@ -31,7 +23,7 @@ Router.map(function() {
 	this.route("characterList", {
 		path: "/characterList",
 		waitOn: function(){
-			return Meteor.subscribe("characterList", Meteor.userId());
+			return subsManager.subscribe("characterList", Meteor.userId());
 		},
 		data: {
 			characters: function(){
@@ -47,7 +39,7 @@ 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() {
@@ -81,7 +73,7 @@ Router.map(function() {
 		name: "changeLog",
 		waitOn: function() {
 			return [
-				Meteor.subscribe("changeLog"),
+				subsManager.subscribe("changeLog"),
 			]
 		},
 		data: {
@@ -93,4 +85,11 @@ Router.map(function() {
 			document.title = appName;
 		},
 	});
+
+	this.route("/guide", {
+		name: "guide",
+		onAfterAction: function() {
+			document.title = appName;
+		},
+	});
 });

rpg-docs/bower.json

@@ -15,8 +15,7 @@
   "dependencies": {
     "polymer": "Polymer/polymer#~0.5.5",
     "core-elements": "Polymer/core-elements#~0.5.5",
-    "paper-elements": "Polymer/paper-elements#~0.5.5",
+    "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/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/main.scss

@@ -1,9 +1,6 @@
 @import "bourbon/bourbon";
 @import "colors";
 
-$thickColumnWidth: 304px;
-$thinColumnWidth: 240px;
-
 //apply a natural box layout model to all elements
 *, *:before, *:after {
 	-moz-box-sizing: border-box;
@@ -22,6 +19,16 @@ body {
 	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);
+}
+
 //Horizontal rule
 hr {
 	background-color: #444;
@@ -41,93 +48,6 @@ hr {
 	right: 24px;
 }
 
-//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;
-	}
-}
-
 //Buttons
 paper-button {
 	color: #000;
@@ -146,3 +66,19 @@ paper-button {
 .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/tables.scss

@@ -0,0 +1,24 @@
+td {
+	padding: 8px;
+	&:nth-child(1) {
+		min-width: 100px;
+	}
+}
+
+.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/character/attacks/attackEdit/attackEdit.html

@@ -15,21 +15,11 @@
 							 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"
-							 label="Damage Bonus"
+							 label="Damage"
 							 floatinglabel
-							 value={{damageBonus}}
+							 value={{damage}}
 							 flex></paper-input>
 				<!--DamageType-->
 				<paper-dropdown-menu id="damageTypeDropdown" label="Damage Type">

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

@@ -1,6 +1,18 @@
-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) {
@@ -13,7 +25,7 @@ Template.attackEdit.events({
 	},
 	"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) {
 		var value = event.currentTarget.value;
@@ -26,13 +38,6 @@ Template.attackEdit.events({
 		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

@@ -19,6 +19,9 @@
 						<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>
@@ -28,7 +31,9 @@
 				<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>
@@ -39,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);
@@ -14,6 +17,10 @@ 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,39 @@
 				</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>
+	</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

@@ -93,24 +93,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 +113,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 +138,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 class="pre-wrap">{{evaluateString charId description}}</div>
 	{{/if}}
 
 	{{> effectsViewList charId=charId parentId=_id}}

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

@@ -34,7 +34,7 @@
 												{{name}}
 											</div>
 											<div>
-												{{damageDice}}&nbsp;{{{evaluateSignedSpaced ../_id damageBonus}}}&nbsp;{{damageType}}
+												{{evaluateString ../_id damage}}&nbsp;{{damageType}}
 											</div>
 											{{#if details}}
 												<div class="caption">
@@ -102,7 +102,7 @@
 						</div>
 						{{#if description}}
 							<div flex class="bottom text"
-								 >{{description}}</div>
+								 >{{evaluateString charId description}}</div>
 						{{/if}}
 						{{#if hasUses}}
 							<div layout horizontal center end-justified>
@@ -135,7 +135,7 @@
 </template>
 
 <template name="resource">
-	{{#if char.attributeBase name}}
+	{{#if characterCalculate "attributeBase" char._id name}}
 		<paper-shadow class="card" 
 					  hero-id="main" {{detailHero name char._id}}
 					  layout horizontal>
@@ -152,7 +152,7 @@
 									   disabled={{cantDecrement}}>
 					</paper-icon-button>
 				</div>
-				<div>{{char.attributeValue name}}</div>
+				<div>{{characterCalculate "attributeValue" char._id name}}</div>
 				<!--<div>/{{char.attributeBase name}}</div>-->
 			</div>
 			<div class="right clickable" 

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

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

rpg-docs/client/views/character/inventory/carryCapacityBar/carryCapacityBar.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,65 @@
+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 capacity = strength * 15;
+	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 class="pre-wrap">{{evaluateString charId description}}</div>
 	{{/if}}
 </template>

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

@@ -3,22 +3,51 @@
 		<div id="inventory" class="scroll-y" fit>
 			<div class="column-container">
 				<!--Net Worth-->
-				<paper-shadow class="card" layout horizontal>
+				<paper-shadow class="card">
-					<div class="indigo white-text subhead left">
+					<div class="white top" layout horizontal center>
-						Net Worth
+						<div class="subhead" flex>
-					</div>
+							Net Worth
-					<div class="right" flex>
+						</div>
-						{{valueString netWorth}}
+						<div>
+							{{valueString netWorth}}
+						</div>
 					</div>
 				</paper-shadow>
 				<!--Weight Carried-->
-				<paper-shadow class="card" layout horizontal>
+				<paper-shadow class="card"
-					<div class="green white-text subhead left">
+							  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="right" flex>
+					<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
+								 draggable="true">
+								<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 equipmentContainer">
@@ -51,7 +80,7 @@
 				<!--Carried Items-->
 				<paper-shadow class="card carriedContainer">
 					<div class="white top" layout horizontal center>
-						<div class="subhead">
+						<div class="subhead" flex>
 							Carried
 						</div>
 						<div class="caption" style="margin-right: 8px">
@@ -100,32 +129,44 @@
 			<div class="fab-buffer"></div>
 		</div>
 		{{#if canEditCharacter _id}}
-			<paper-fab-menu id="inventoryAddMenu" 
+			{{#fabMenu}}
-							icon="add" 
+				<core-tooltip label="New container" position="left">
-							closeIcon="close" 
+					<paper-fab icon="work"
-							duration="0.3">
+							   class="addContainer"
-				<paper-fab-menu-item id="addItem"
+							   mini>
-									 icon="note-add"
+					</paper-fab>
-									 color="#d23f31"
+				</core-tooltip>
-									 tooltip="Item">
+				<core-tooltip label="New item" position="left">
-				</paper-fab-menu-item>
+					<paper-fab icon="note-add"
-				<paper-fab-menu-item id="addContainer"
+							   class="addItem"
-									 icon="work"
+							   mini>
-									 color="#d23f31"
+					</paper-fab>
-									 tooltip="Container">
+				</core-tooltip>
-				</paper-fab-menu-item>
+			{{/fabMenu}}
-			</paper-fab-menu>
 		{{/if}}
 	</div>
 </template>
 
 <template name="inventoryItem">
 	<div class="item-slot">
-		<paper-item class="item inventoryItem {{hidden}}" noink
+		<div class="item {{hidden}} inventoryItem"
 					hero-id="main" {{detailHero}}
-					layout horizontal
+					layout horizontal center
 					draggable="true">
-			{{#if ne1 quantity}}{{quantity}}&nbsp;{{/if}}{{pluralName}}
+			<div flex class="itemName">
-		</paper-item>
+				{{#if ne1 quantity}}{{quantity}}&nbsp;{{/if}}{{pluralName}}
+			</div>
+			{{#if settings.showIncrement}}
+			<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}}
+		</div>
 	</div>
 </template>

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

@@ -61,6 +61,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 +115,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 +132,7 @@ Template.inventory.events({
 			});
 		});
 	},
-	"tap #addContainer": function(event){
+	"tap .addContainer": function(event){
 		var containerId = Containers.insert({
 			name: "New Container",
 			isCarried: true,
@@ -136,6 +148,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,6 +174,31 @@ Template.inventory.events({
 			heroId:   itemId,
 		});
 	},
+	"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",
@@ -167,6 +221,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

@@ -19,7 +19,7 @@
 	</div>
 	{{#if description}}
 		<hr class="vertMargin">
-		<div class="prewrap">{{description}}</div>
+		<div class="pre-wrap">{{evaluateString charId description}}</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 class= "display2">
 				{{value}}
 			</div>
 			{{#if description}}
 				<hr class="vertMargin">
-				<div class="prewrap">{{description}}</div>
+				<div class="pre-wrap">{{description}}</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

@@ -9,7 +9,7 @@
 						 hero-id="toolbar" {{detailHero}}
 						 layout horizontal center>
 						<div flex>Experience</div>
-						<div >{{experience}} XP</div>
+						<div >{{characterCalculate "experience" _id}} XP</div>
 						<paper-icon-button class="black54" id="addXP" icon="add"></paper-icon-button>
 					</div>
 					<div class="bottom list">
@@ -45,7 +45,7 @@
 						 layout horizontal center>
 						<div flex>
 							<div class="containerName subhead">
-								Level {{level}}
+								Level {{characterCalculate "level" _id}}
 							</div>
 							{{#if nextLevelXP}}
 								<div class="caption">

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

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

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

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

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

@@ -1,5 +1,5 @@
 <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>

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" startEditing=startEditing}}
+		<div class="pre-wrap">{{evaluateString charId value}}</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/persona.html

@@ -27,7 +27,7 @@
 </template>
 
 <template name="containerCard">
-	{{#containerCardHelper this}}{{body}}{{/containerCardHelper}}
+	{{#containerCardHelper this}}{{evaluateString _id body}}{{/containerCardHelper}}
 </template>
 
 <template name="containerCardHelper">

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

@@ -40,11 +40,20 @@ Template.persona.helpers({
 
 Template.persona.events({
 	"tap .characterField": function(event){
-		if (this.field !== "details"){
+		if (this.field === "details"){
+			this.charId = Template.parentData()._id;
+			GlobalUI.setDetail({
+				template: "personaDetailsDialog",
+				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: "textDialog",
+				template: template,
-				data:     {
+				data: {
 					charId: charId,
 					field: this.field,
 					title: this.title,
@@ -52,13 +61,6 @@ Template.persona.events({
 				},
 				heroId:   this._id + this.field,
 			});
-		} else {
-			this.charId = Template.parentData()._id;
-			GlobalUI.setDetail({
-				template: "personaDetailsDialog",
-				data:     this,
-				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 class="pre-wrap">{{evaluateString charId value}}</div>
 	{{else}}
 		{{> textDialogEdit}}
 	{{/baseDialog}}

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 class="pre-wrap">{{evaluateString charId description}}</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 class="pre-wrap">{{evaluateString charId description}}</div>
 			</div>
 		{{else}}
 			<!--Name-->

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

@@ -128,20 +128,19 @@
 		</div>
 	</div>
 	{{#if canEditCharacter _id}}
-		<paper-fab-menu id="inventoryAddMenu"
+		{{#fabMenu}}
-						icon="add"
+			<core-tooltip label="New spell list" position="left">
-						closeIcon="close"
+				<paper-fab icon="work"
-						duration="0.3">
+						   class="addSpellList"
-			<paper-fab-menu-item id="addSpell"
+						   mini>
-								 icon="note-add"
+				</paper-fab>
-								 color="#d23f31"
+			</core-tooltip>
-								 tooltip="Spell">
+			<core-tooltip label="New spell" position="left">
-			</paper-fab-menu-item>
+				<paper-fab icon="note-add"
-			<paper-fab-menu-item id="addSpellList"
+						   class="addSpell"
-								 icon="work"
+						   mini>
-								 color="#d23f31"
+				</paper-fab>
-								 tooltip="Spell List">
+			</core-tooltip>
-			</paper-fab-menu-item>
+		{{/fabMenu}}
-		</paper-fab-menu>
 	{{/if}}
 </template>

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

@@ -84,32 +84,28 @@ 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;
@@ -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});
@@ -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.html

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

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

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

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

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

@@ -106,10 +106,8 @@ Template.attributeDialogView.helpers({
 		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(){
@@ -138,14 +136,10 @@ Template.attributeDialogView.helpers({
 		);
 	},
 	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.group === "racial"){

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

@@ -10,24 +10,24 @@
 		</div>
 		<div class="right" flex layout vertical center-justified style="min-width: 180px;">
 			<div layout horizontal>
-				<paper-slider id="hitPointSlider"
+				<paper-diff-slider id="hitPointSlider"
-							  value={{attributeValue "hitPoints"}}
+								   value={{characterCalculate "attributeValue" _id "hitPoints"}}
-							  max={{attributeBase "hitPoints"}} 
+								   max={{characterCalculate "attributeBase" _id "hitPoints"}}
-							  editable pin
+								   editable pin
-							  role="slider"
+								   role="slider">
-							  ></paper-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}}
 						<paper-icon-button class="deleteTHP" icon="delete"></paper-icon-button>
 					{{/unless}}{{/unless}}
@@ -35,9 +35,21 @@
 			</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,5 +1,5 @@
 <template name="hitDice">
-	{{#if ../attributeBase name}}
+	{{#if characterCalculate "attributeBase" ../_id name}}
 		<paper-shadow class="card hit-dice" hero-id="main" 
 					  {{detailHero name ../_id}} 
 					  layout horizontal>
@@ -18,10 +18,10 @@
 				</div>
 				<div class="resourceValue" layout vertical center>
 					<div>
-						{{../attributeValue name}}
+						{{characterCalculate "attributeValue" ../_id name}}
 					</div>
 					<div class="title white-text">
-						d{{diceNum}} {{../abilityMod "constitution"}}
+						d{{diceNum}} {{characterCalculate "abilityMod" ../_id "constitution"}}
 					</div>
 				</div>
 			</div>

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

@@ -1,25 +1,28 @@
 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;
 	},
 	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;
 	},
 });
 
 Template.hitDice.events({
 	"tap .resourceUp": function(event){
-		if (this.char.attributeValue(this.name) < this.char.attributeBase(this.name)){
+		var value = Characters.calculate.attributeValue(this.char._id, this.name);
+		var base = Characters.calculate.attributeBase(this.char._id, this.name);
+		if (value < base){
 			var modifier = {$inc: {}};
 			modifier.$inc[this.name + ".adjustment"] = 1;
 			Characters.update(this.char._id, modifier, {validate: false});
 		}
 	},
 	"tap .resourceDown": function(event){
-		if (this.char.attributeValue(this.name) > 0){
+		var value = Characters.calculate.attributeValue(this.char._id, this.name);
+		if (value > 0){
 			var modifier = {$inc: {}};
 			modifier.$inc[this.name + ".adjustment"] = -1;
 			Characters.update(this.char._id, modifier, {validate: false});

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

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

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

@@ -106,9 +106,7 @@ Template.skillDialogView.helpers({
 		return a || b || c;
 	},
 	profIcon: function(){
-		var char = Characters.findOne(this.charId);
+		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";
@@ -123,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";
@@ -199,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(){

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

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

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

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

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

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

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

@@ -27,8 +27,10 @@ Template.stats.events({
 	},
 	"tap .abilityMiniCard": function(event, instance){
 		var charId = Template.parentData()._id;
+		var template = "attributeDialog";
+		if (this.ability === "strength") template = "strengthDialog";
 		GlobalUI.setDetail({
-			template: "attributeDialog",
+			template: template,
 			data:     {
 				name: this.title,
 				statName: this.ability,
@@ -65,6 +67,12 @@ Template.stats.events({
 	},
 });
 
-Template.stats.helpers({
+Template.statCard.helpers({
-
+	skillMod: function() {
+		return signedString(
+			Characters.calculate.skillMod(
+				Template.parentData()._id, this.stat
+			)
+		);
+	},
 });

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

@@ -1,5 +1,5 @@
 <template name="characterList">
-	<core-toolbar class="blue-grey white-text">
+	<core-toolbar class="app-grey white-text">
 		<core-icon-button icon="menu" core-drawer-toggle></core-icon-button>
 		<div flex>
 			Characters

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

@@ -25,6 +25,13 @@
 			</paper-autogrow-textarea>
 		</paper-input-decorator>
 	</div>
-	<paper-button id="cancelButton" affirmative>Cancel</paper-button>
+	<paper-button id="cancelButton"
-	<paper-button id="sendButton"   affirmative>Send  </paper-button>
+				  affirmative>
+		Cancel
+	</paper-button>
+	<paper-button id="sendButton"
+				  affirmative
+				  disabled={{invalid}}>
+		Send
+	</paper-button>
 </template>

rpg-docs/client/views/feedback/feedback.js

@@ -1,4 +1,23 @@
+Template.feedback.onCreated(function() {
+	this.title = new ReactiveVar("");
+	this.description = new ReactiveVar("");
+});
+
+Template.feedback.helpers({
+	invalid: function() {
+		var inst = Template.instance();
+		return !inst.title.get() ||
+			!inst.description.get();
+	}
+});
+
 Template.feedback.events({
+	"input #feedbackTitle": function(event, instance) {
+		instance.title.set(instance.find("#feedbackTitle").value);
+	},
+	"input #feedbackDescription": function(event, instance) {
+		instance.description.set(instance.find("#feedbackDescription").value);
+	},
 	"tap #sendButton": function(event, instance) {
 		var report = {};
 		report.title = instance.find("#feedbackTitle").value;

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

@@ -1,10 +1,10 @@
 <template name="guide">
+	<core-toolbar class="app-grey white-text">
+		<core-icon-button icon="menu" core-drawer-toggle></core-icon-button>
+		<div flex>Guide</div>
+	</core-toolbar>
 	<div layout vertical center>
 		<paper-shadow class="wallOfText card" style="padding: 32px; max-width: 800px;">
-			<h1>Dicecloud Beta</h1>
-			<p>Welcome to the Dicecloud beta. Please don't share the link with people you don't actively play with, since the beta is intended to be small, and your experience will probably get laggy if it gets more traffic than I'm expecting.</p>
-			<p>The beta is going to start with just the character sheet. You can play D&amp;D without minis and maps, without a pre-written adventure, you can play without a lot of things, but the character sheet is necessary. So I'm starting here and working my way outwards.</p>
-			<p>I will eventually have public bug tracking and feature requests going, but for now I'm going to track comments, feedback and suggestions on <a href="http://reddit.com/r/dicecloud">this subreddit</a>. If you've never used reddit before, all you need is a username and password to sign up. So it should be pretty accessible.</p>
 			<h2>Character Sheet Philosophy</h2>
 			<p>Setting up your character on Dicecloud is going to take you a little longer than just filling it in on a paper character sheet would have. The goal of using an online sheet is to make actually playing the game more streamlined, and ultimately more fun. So putting a little extra effort into setting up your character now will pay off over and over again once you're playing.</p>
 			<p>The idea is to track where each number comes from, and allow you to easily make changes on the fly.</p>

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

@@ -1,11 +1,9 @@
 <template name="home">
-	<core-toolbar class="blue-grey white-text">
+	<core-toolbar class="app-grey white-text">
 		<core-icon-button icon="menu" core-drawer-toggle></core-icon-button>
 		<div flex>
-			DiceCloud
+			Home
 		</div>
 	</core-toolbar>
-	<div class="scroll-y" style="padding: 16px" fit>
+	{{> intro}}
-		{{> guide}}
-	</div>
 </template>

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

@@ -1,25 +1,15 @@
 Template.home.helpers({
-	characterDetails: function(){
+	selectedTab: function(){
-		var char = Characters.findOne(
+		return Session.get("homePage.selectedTab");
-			this._id,
+	},
-			{fields: {name: 1, gender: 1, alignment: 1, race:1}}
-		);
-		char.title = char.name;
-		char.field = "base";
-		char.color = "d";
-		char.class = "characterCard";
-		return char;
-	}
 });
 
 Template.home.events({
-	"tap .characterCard": function(event, instance){
+	"core-animated-pages-transition-end .tabPages": function(event) {
-		Router.go("characterSheet", {_id: this._id});
+		event.stopPropagation();
 	},
-	"tap #addCharacter": function(event, template) {
+	"tap .homeTabs paper-tab": function(event, instance){
-		Characters.insert({owner: Meteor.userId()});
+		Session.set("homePage.selectedTab",
-	},
+					event.currentTarget.getAttribute("name"));
-	"tap #deleteChar": function(event, template){
-		Characters.remove(this._id);
 	},
 });

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

@@ -0,0 +1,89 @@
+<template name="intro">
+	<div class="intro">
+		<div class="section white-text" style="background: #282828">
+			<div class="display2">
+				Dice Cloud
+			</div>
+			<img style="width:130px; height:130px; background-color: #282828;"
+						src="/crown-dice-logo-cropped-transparent.png">
+			<div class="display1">
+				Unofficial Online Realtime D&amp;D 5e App
+			</div>
+			<h2>
+				Spend less time shuffling paper and more time playing the game
+			</h2>
+			{{#unless currentUser}}
+			<div layout horizontal around-justified wrap>
+				<paper-button class="red white-text signInButton"
+							  style="margin: 16px;"
+							  raised>
+					Sign In
+				</paper-button>
+				<paper-button class="red white-text signUpButton"
+							  style="margin: 16px;"
+							  raised>
+					Sign Up
+				</paper-button>
+			</div>
+			{{else}}
+			<div style="padding-bottom: 0;"></div>
+			{{/unless}}
+		</div>
+		<div class="section" style="background-color: #e9e9e9;">
+			<div>
+				<div class="display1">Character Sheet Open Beta</div>
+				<h2 style="margin-bottom: 16px;">
+					Check out the example characters
+				</h2>
+				<div layout horizontal around-justified wrap>
+					<paper-shadow class="card characterCard ssArcher clickable"
+								  z="2">
+						<div class="top subhead green white-text">
+							<div class="subhead" flex>
+								Starter Set Archer
+							</div>
+						</div>
+						<div class="bottom text">Lawful Good Human</div>
+					</paper-shadow>
+				</div>
+			</div>
+		</div>
+		<div class="section white-text" style="background: #282828">
+			<div class="columns" layout horizontal around-justified wrap>
+				<div>
+					<h1>Check out the guide</h1>
+					<p>
+						Learn how your class gives you features, those features have effects,
+						and those effects determine your stats.
+						<paper-button class="guideButton">View Guide</paper-button>
+					</p>
+				</div>
+				<div>
+					<h1>
+						Discuss
+					</h1>
+					<p>
+						On the official subreddit
+						<paper-button class="redditButton">
+							<a href="http://www.reddit.com/r/dicecloud/">
+								/r/dicecloud
+							</a>
+						</paper-button>
+					</p>
+				</div>
+				<div>
+					<h1>
+						Get involved
+					</h1>
+					<p>Shape upcoming features and track bugs on the Dice Cloud Trello board
+						<paper-button class="trelloButton">
+							<a href="https://trello.com/b/94M0SCnq/dicecloud-roadmap">
+								Trello Roadmap
+							</a>
+						</paper-button>
+					</p>
+				</div>
+			</div>
+		</div>
+	</div>
+</template>

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

@@ -0,0 +1,14 @@
+Template.intro.events({
+	"tap .signInButton": function() {
+		Router.go("/sign-in");
+	},
+	"tap .signUpButton": function() {
+		Router.go("/sign-up");
+	},
+	"tap .ssArcher": function() {
+		Router.go("/character/yBWwt5XQTTHZiRQxq");
+	},
+	"tap .guideButton": function() {
+		Router.go("/guide");
+	},
+});

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

@@ -0,0 +1,33 @@
+.intro {
+	.section {
+		width: 100%;
+		min-height: 200px;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		flex-direction: column;
+		padding-top: 24px;
+		padding-bottom: 24px;
+		& > div, & > h2 {
+			padding: 32px;
+			.display1 {
+				margin-bottom: 16px;
+			}
+		}
+		.columns > div{
+			max-width: 300px;
+			padding: 16px;
+			text-align: center;
+			paper-button {
+				color: #FF5252;
+			}
+		}
+	}
+	paper-button {
+		min-width: 200px;
+		a {
+			color: inherit;
+			text-decoration: inherit;
+		}
+	}
+}

rpg-docs/client/views/layout/imports.html

@@ -8,6 +8,7 @@
 <link rel="import" href="/components/core-icons/editor-icons.html">
 <link rel="import" href="/components/core-icons/image-icons.html">
 <link rel="import" href="/components/core-icons/social-icons.html">
+<link rel="import" href="/components/core-image/core-image.html">
 <link rel="import" href="/components/core-item/core-item.html">
 <link rel="import" href="/components/core-menu/core-menu.html">
 <link rel="import" href="/components/core-scaffold/core-scaffold.html">
@@ -32,11 +33,12 @@
 <link rel="import" href="/components/paper-radio-group/paper-radio-group.html">
 <link rel="import" href="/components/paper-shadow/paper-shadow.html">
 <link rel="import" href="/components/paper-spinner/paper-spinner.html">
+<link rel="import" href="/components/paper-slider/paper-slider.html">
 <link rel="import" href="/components/paper-tabs/paper-tabs.html">
 <link rel="import" href="/components/paper-toast/paper-toast.html">
 <link rel="import" href="/components/paper-toggle-button/paper-toggle-button.html">
 
 <!--custom components-->
 <link rel="import" href="/custom_components/paper-dropdown-menu/paper-dropdown-menu.html">
-<link rel="import" href="/custom_components/paper-slider-diff/paper-slider.html">
+<link rel="import" href="/custom_components/paper-diff-slider/paper-diff-slider.html">
 <link rel="import" href="/custom_components/swipe-detect/swipe-detect.html">

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

@@ -3,7 +3,8 @@
 		<core-header-panel drawer navigation flex mode="seamed" class="white">
 			<div id="accountSummary">
 				{{#if currentUser}}
-					<div id="profileLink" style="text-decoration: underline; cursor: pointer;">
+					<div id="profileLink"
+						 style="text-decoration: underline; cursor: pointer; font-size: 16px;">
 						{{profileLink}}
 					</div>
 				{{else}}
@@ -13,6 +14,7 @@
 			<div id="navPanel">
 				<core-item id="homeNav" icon="home" label="Home"></core-item>
 				{{> characterSideList}}
+				<core-item id="guide" icon="social:school" label="Guide"></core-item>
 				<core-item id="feedback" icon="bug-report" label="Send Feedback"></core-item>
 				<core-item id="changeLog" icon="list" label="Change Log"></core-item>
 			</div>
@@ -23,7 +25,7 @@
 							 transitions="hero-transition cross-fade"
 							 selected={{globalDetailSelected}}>
 			<section id="mainContentSection" class={{notSelected}}>
-				<core-header-panel fit mode="seamed">
+				<core-header-panel fit mode="standard">
 					{{> yield}}
 				</core-header-panel>
 				<div>

rpg-docs/client/views/layout/layout.js

@@ -41,4 +41,8 @@ Template.layout.events({
 		Router.go("changeLog");
 		instance.find("core-drawer-panel").closeDrawer();
 	},
+	"tap #guide": function(event, instance) {
+		Router.go("guide");
+		instance.find("core-drawer-panel").closeDrawer();
+	},
 });

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

@@ -1,4 +1,5 @@
 .bigSpinner {
 	width: 100px;
 	height: 100px;
+	margin-bottom: 16px;
 }

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

@@ -1,5 +1,5 @@
 <template name="loading">
-	<core-toolbar class="blue-grey white-text">
+	<core-toolbar class="app-grey white-text">
 		<core-icon-button icon="menu" core-drawer-toggle></core-icon-button>
 	</core-toolbar>
     <div fit layout vertical center center-justified>

rpg-docs/client/views/meta/changeLog/changeLog.html

@@ -1,5 +1,5 @@
 <template name="changeLog">
-	<core-toolbar class="blue-grey white-text">
+	<core-toolbar class="app-grey white-text">
 		<core-icon-button icon="menu" core-drawer-toggle></core-icon-button>
 		<div flex>
 			Change Log

rpg-docs/client/views/paperTemplates/baseDialog/baseDialog.html

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