Change log

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/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
-	expiry:     {type: Number, optional: true},
-	duration:	{type: Number},
+	name: {
+		type: String,
+		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

@@ -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,21 +169,58 @@ 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},
 });
 
 Characters.attachSchema(Schemas.Character);
 
 var attributeBase = function(charId, statName){
 	check(statName, String);
-	var effects = Effects.find(
-		{charId: charId, stat: statName, enabled: true}
-	).fetch();
-	effects = _.groupBy(effects, "operation");
-	var value = _.contains(DAMAGE_MULTIPLIERS, statName) ? 1 : 0;
+	//if it's a damage multiplier, we treat it specially
+	if (_.contains(DAMAGE_MULTIPLIERS, statName)){
+		var effects = Effects.find(
+			{charId: charId, stat: statName, enabled: true, operation: "mul"}
+		).fetch();
+		var resistCount = 0;
+		var vulnCount = 0;
+		var multiplierEvaluationFail = false;
+		_.each(effects, function(effect){
+			var val = evaluateEffect(charId, effect);
+			if (val === 0.5){ //resistance
+				resistCount += 1;
+			} else if (val === 2){ //vulnerability
+				vulnCount += 1;
+			} else if (val === 0){ //imunity
+				return 0; //imunity is absolute
+			} else {
+				multiplierEvaluationFail = true;
+			}
+		});
+		if (multiplierEvaluationFail){
+			//we can't work it out correctly, set the value to 1
+			//and try work it out using regular maths below
+			value = 1;
+		} else if (resistCount && !vulnCount){
+			return 0.5;
+		} else if (!resistCount && vulnCount){
+			return 2;
+		} else {
+			return 1;
+		}
+	}
+
+	var value = 0;
 
 	//start with the highest base value
-	_.each(effects.base, function(effect){
+	Effects.find(
+		{charId: charId, stat: statName, enabled: true, operation: "base"}
+	).forEach(function(effect){
 		var efv = evaluateEffect(charId, effect);
 		if (efv > value){
 			value = efv;
@@ -190,23 +228,31 @@ var attributeBase = function(charId, statName){
 	});
 
 	//add all the add values
-	_.each(effects.add, function(effect){
+	Effects.find(
+		{charId: charId, stat: statName, enabled: true, operation: "add"}
+	).forEach(function(effect){
 		value += evaluateEffect(charId, effect);
 	});
 
 	//multiply all the mul values
-	_.each(effects.mul, function(effect){
+	Effects.find(
+		{charId: charId, stat: statName, enabled: true, operation: "mul"}
+	).forEach(function(effect){
 		value *= evaluateEffect(charId, effect);
 	});
 
 	//ensure value is >= all mins
-	_.each(effects.min, function(effect){
+	Effects.find(
+		{charId: charId, stat: statName, enabled: true, operation: "min"}
+	).forEach(function(effect){
 		var min = evaluateEffect(charId, effect);
 		value = value > min ? value : min;
 	});
 
 	//ensure value is <= all maxes
-	_.each(effects.max, function(effect){
+	Effects.find(
+		{charId: charId, stat: statName, enabled: true, operation: "max"}
+	).forEach(function(effect){
 		var max = evaluateEffect(charId, effect);
 		value = value < max ? value : max;
 	});

rpg-docs/Model/Meta/Reports.js

@@ -46,6 +46,12 @@ Meteor.methods({
 		});
 		report.owner = this.userId;
 		Reports.insert(report);
+		Email.send({
+			from: "reports@dicecloud.com",
+			to: "stefan.zermatten@gmail.com",
+			subject: "DiceCloud feedback - " + report.title,
+			text: JSON.stringify(_.omit(report, "metaData"), null, '\t'),
+		});
 	},
 	deleteReport: function(id) {
 		var user = Meteor.users.findOne(this.userId);

rpg-docs/Routes/Routes.js

@@ -31,7 +31,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 +47,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 +81,7 @@ Router.map(function() {
 		name: "changeLog",
 		waitOn: function() {
 			return [
-				Meteor.subscribe("changeLog"),
+				subsManager.subscribe("changeLog"),
 			]
 		},
 		data: {

rpg-docs/client/style/cards.scss

@@ -89,3 +89,8 @@ $thinColumnWidth: 240px;
 		border-radius: 0 2px 2px 0;
 	}
 }
+
+/* undo pointer cursor on detail box heading */
+#globalDetail .card .top {
+	cursor: auto;
+}

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,26 @@
 <template name="characterSettings">
-
+	{{#with character}}
+	<div>
+		<table>
+			<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}}
 </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/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 {
-	width: 120px;
+html /deep/ .operationDropDown {
+	width: 152px;
 }
 
-body /deep/ #statDropDown {
-	width: 120px;
+html /deep/ .statDropDown {
+	width: 152px;
 }
 
-body /deep/ #operationDropDown {
-	width: 100px;
-}
-
-body /deep/ #damageMultiplierDropDown {
-	width: 120px;
-}
-
-body /deep/ #proficiencyDropDown {
-	width: 120px;
+html /deep/ .damageMultiplierDropDown {
+	width: 152px;
 }
 
 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 layered class="dropdown">
-				<core-menu class="menu statGroupMenu" selected={{selectedStatGroup}}>
-					{{#each statGroups}}
-						<paper-item class="statGroupSelect" name={{this}}>{{this}}</paper-item>
-					{{/each}}
-				</core-menu>
-			</paper-dropdown>
-		</paper-dropdown-menu>
-		{{#if stats}}
-			<paper-dropdown-menu class="statDropDown" label="Stat" flex>
-				<paper-dropdown layered class="dropdown">
-					<core-menu class="menu statMenu"  selected={{stat}} on-tap="onStatMenuTap">
-						{{#each stats}}
-							<paper-item name={{stat}}>{{name}}</paper-item>
+		<paper-dropdown-menu class="statDropDown"
+							 label="Stat">
+			<paper-dropdown layered
+							class="dropdown">
+					<core-menu class="menu statMenu" selected={{stat}}>
+						{{#each statGroups}}
+							<div style="font-weight: bold;
+										margin-top: 16px;">{{this}}</div>
+							{{#each stats}}
+								<paper-item name={{stat}}>{{name}}</paper-item>
+							{{/each}}
 						{{/each}}
 					</core-menu>
-				</paper-dropdown>
-			</paper-dropdown-menu>
-		{{/if}}
+			</paper-dropdown>
+		</paper-dropdown-menu>
 		{{#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}}
-		<paper-icon-button class="deleteEffect" role="button" tabindex="0" icon="delete" aria-label="Delete"></paper-icon-button>
+		{{#if effectValueTemplate}}
+			{{> 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 layered class="dropdown">
-			<core-menu class="menu multiplierMenu" selected={{value}}>
+	<paper-dropdown-menu class="damageMultiplierDropDown"
+						 label="Damage Multiplier">
+		<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;
-		switch(this.parent.collection){
+		if (!id) return;
+		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(this.operation === "add" && evaluateEffect(this.charId, this) < 0) return null;
-		return operations[this.operation] && operations[this.operation].name || "No Operation";
+		if (stats[this.stat] && stats[this.stat].group === "Weakness/Resistance")
+			return null;
+		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.value == 0.5 || this.calculation == 0.5) return "Half Proficiency";
-			if(this.value == 1   || this.calculation == 1)   return "Proficiency";
-			if(this.value == 2   || this.calculation == 2)   return "Double Proficiency";
+		if (this.operation === "proficiency"){
+			if (this.value == 0.5 || this.calculation == 0.5)
+				return "Half 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(this.value === 0.5) return "Resistance";
-			if(this.value === 2)   return "Vulnerability";
-			if(this.value === 0)   return "Immunity";
+		if (stats[this.stat] && stats[this.stat].group === "Weakness/Resistance"){
+			if (this.value === 0.5) return "Resistance";
+			if (this.value === 2)   return "Vulnerability";
+			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/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 = char.attributeValue("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/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>
-					<div class="indigo white-text subhead left">
-						Net Worth
-					</div>
-					<div class="right" flex>
-						{{valueString netWorth}}
+				<paper-shadow class="card">
+					<div class="white top" layout horizontal center>
+						<div class="subhead" flex>
+							Net Worth
+						</div>
+						<div>
+							{{valueString netWorth}}
+						</div>
 					</div>
 				</paper-shadow>
 				<!--Weight Carried-->
-				<paper-shadow class="card" layout horizontal>
-					<div class="green white-text subhead left">
-						Weight Carried
+				<paper-shadow class="card"
+							  hero-id="main" {{detailHero "weightCarried" _id}}>
+					<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>
-						{{round weightCarried}}lbs
+					<div class="bottom green" style="padding: 0;">
+						{{> 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">

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

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

@@ -4,32 +4,7 @@
 		<hr class="vertMargin">
 		<div>
 			<div class="title padded">Carrying</div>
-			<table class="strengthTable">
-				<tr>
-					<td>Encumbered</td>
-					<td>{{evaluate charId "strength * 5"}}lbs</td>
-					<td class="caption">Speed drops by 10 feet</td>
-				</tr>
-				<tr>
-					<td>Heavily encumbered</td>
-					<td>{{evaluate charId "strength * 10"}}lbs</td>
-					<td class="caption">
-						Speed drops by 20 feet, disadvantage on strength,
-						dexterity and constitution ability checks, attack
-						rolls and saving throws
-					</td>
-				</tr>
-				<tr>
-					<td>Maximum carrying capacity</td>
-					<td>{{evaluate charId "strength * 15"}}lbs</td>
-					<td class="caption">Speed drops to 5 feet</td>
-				</tr>
-				<tr>
-					<td>Push, drag or lift maximum</td>
-					<td>{{evaluate charId "strength * 30"}}lbs</td>
-					<td class="caption">You can't move more than this weight</td>
-				</tr>
-			</table>
+			{{> carryCapacityTable}}
 			<div class="title padded">Jumping</div>
 			<table class="strengthTable">
 				<tr>

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/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="sendButton"   affirmative>Send  </paper-button>
+	<paper-button id="cancelButton"
+				  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

@@ -2,9 +2,10 @@
 	<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>Welcome to the Dicecloud beta.</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>
+			<p>Leave any 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>
+			<p>If you'd like to see a list of known issues and upcoming features, check out the <a href="https://trello.com/b/94M0SCnq/dicecloud-roadmap">DiceCloud Roadmap</a>.</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/paperTemplates/fabMenu/fabMenu.js

@@ -12,4 +12,7 @@ Template.fabMenu.events({
 	"tap .expand-menu": function(event, instance) {
 		instance.active.set(!instance.active.get());
 	},
-});
+	"tap .mini-holder paper-fab": function(event, instance) {
+		instance.active.set(false);
+	},
+});

rpg-docs/lib/constants/subsManager.js

@@ -0,0 +1 @@
+subsManager = new SubsManager();

rpg-docs/lib/methods/conditions.js

@@ -0,0 +1,445 @@
+var checkWritePermission = function(charId) {
+	if (!Meteor.call("canWriteCharacter", charId)){
+		throw new Meteor.Error(
+			"Access denied",
+			"You do not have permission to edit the assets of this character"
+		);
+	}
+};
+
+var getCondition = function(conditionName) {
+	//get condition from constant
+	var condition = CONDITIONS[conditionName];
+	//check that condition exists
+	if (!condition) {
+		throw new Meteor.Error(
+			"Invalid condition",
+			conditionName + " is not a known condition"
+		);
+	}
+	return condition;
+};
+
+Meteor.methods({
+	giveCondition: function(charId, conditionName) {
+		checkWritePermission(charId);
+		var condition = getCondition(conditionName);
+		//create the buff
+		var buff = _.extend(
+			{charId: charId, type: "inate"}, condition.buff
+		);
+
+		//make sure the character doesn't already have the buff
+		var existingBuffs = Buffs.find(_.clone(buff)).count();
+		if (existingBuffs) return;
+		//remove exclusive conditions
+		_.each(condition.exclusiveConditions, function(exCond) {
+			Meteor.call("removeCondition", charId, exCond);
+		});
+		//insert the buff
+		var buffId = Buffs.insert(buff);
+		//extend and insert each effect
+		_.each(condition.effects, function(effect) {
+			var newEffect = {
+				stat: effect.stat,
+				operation: effect.operation,
+				value: effect.value,
+				charId: charId,
+				parent: {
+					id: buffId,
+					collection: "Buffs",
+				},
+				enabled: true,
+			};
+			//we know these effects are right,
+			//skip after hooks, skip validation
+			Effects.direct.insert(
+				newEffect,
+				{
+					validate: false,
+					filter: false,
+					autoConvert: false,
+					removeEmptyStrings: false,
+				}
+			);
+		});
+		//recurse for subConditions
+		_.each(condition.subConditions, function(subCondition) {
+			Meteor.call("giveCondition", charId, subCondition);
+		});
+	},
+	removeCondition: function(charId, conditionName) {
+		checkWritePermission(charId);
+		var condition = getCondition(conditionName);
+		//remove the buff
+		var buff = _.extend(
+			{charId: charId, type: "inate"}, condition.buff
+		);
+		Buffs.remove(buff);
+		//dont remove the effects, they get removed automatically through parenting
+	},
+});
+
+trackEncumbranceConditions = function(charId, templateInstance) {
+	templateInstance.autorun(function() {
+		//get weight
+		var weight = 0;
+		Containers.find(
+			{charId: charId, isCarried: true},
+			{fields: {weight: 1}}
+		).forEach(function(container){
+			weight += container.totalWeight();
+		});
+		Items.find(
+			{charId: charId, "parent.id": charId},
+			{fields: {weight : 1, quantity: 1}}
+		).forEach(function(item){
+			weight += item.totalWeight();
+		});
+		var character = Characters.findOne(
+			charId,
+			{fields: {strength: 1, "settings": 1}}
+		);
+		var strength = character.attributeValue("strength");
+		var give = function(condition) {
+			Meteor.call("giveCondition", charId, condition);
+		};
+		var remove = function(condition) {
+			Meteor.call("removeCondition", charId, condition);
+		};
+		//variant encumbrance rules
+		if (weight > strength * 10 &&
+			character.settings.useVariantEncumbrance) {
+			give("encumbered2");
+			remove("encumbered");
+		} else if (weight > strength * 5 &&
+				   character.settings.useVariantEncumbrance){
+			give("encumbered");
+			remove("encumbered2");
+		} else {
+			remove("encumbered");
+			remove("encumbered2");
+		}
+		//normal encumbrance rules
+		if (weight > strength * 30 &&
+			character.settings.useStandardEncumbrance){
+			give("encumbered4");
+			remove("encumbered3");
+		} else if (weight > strength * 15 &&
+				   character.settings.useStandardEncumbrance) {
+			give("encumbered3");
+			remove("encumbered4");
+		} else {
+			remove("encumbered3");
+			remove("encumbered4");
+		}
+	});
+};
+
+CONDITIONS = {
+	//Conditions
+	blind: {
+		buff: {
+			name: "Blind",
+			description: "A blinded creature can’t see and automatically fails any ability check that requires sight.\n\nAttack rolls against the creature have advantage, and the creature’s attack rolls have disadvantage.",
+		},
+		effects: [
+			{
+				stat: "perception",
+				operation: "conditional",
+				calculation: "You fail your perception check if it requires sight",
+			}
+		],
+	},
+
+	deaf: {
+		buff: {
+			name: "Deaf",
+			description: "A deafened creature can’t hear and automatically fails any ability check that requires hearing.",
+		},
+		effects: [
+			{
+				stat: "perception",
+				operation: "conditional",
+				calculation: "You fail your perception check if it requires hearing",
+			}
+		],
+	},
+
+	frightened: {
+		buff: {
+			name: "Frightened",
+			description: "A frightened creature has disadvantage on ability checks and attack rolls while the source of its fear is within line of sight.\n\nThe creature can’t willingly move closer to the source of its fear.",
+		}
+	},
+
+	grappled: {
+		buff:{
+			name: "Grappled",
+			description: "A grappled creature’s speed becomes 0, and it can’t benefit from any bonus to its speed.\n\nThe condition ends if the grappler is incapacitated.\n\nThe condition also ends if an effect removes the grappled creature from the reach of the grappler or grappling effect, such as when a creature is hurled away by the thunder wave spell.",
+		},
+		effects: [
+			{
+				stat: "speed",
+				operation: "max",
+				value: 0,
+			},
+		],
+	},
+
+	incapacitated: {
+		buff: {
+			name: "Incapacitated",
+			description: "An incapacitated creature can’t take actions or reactions.",
+		}
+	},
+
+	invisible: {
+		buff: {
+			name: "Invisible",
+			description: "An invisible creature is impossible to see without the aid of magic or a special sense. For the purpose of hiding, the creature is heavily obscured. The creature’s location can be detected by any noise it makes or any tracks it leaves.\n\nAttack rolls against the creature have disadvantage, and the creature’s attack rolls have advantage.",
+		}
+	},
+
+	paralyzed: {
+		buff: {
+			name: "Paralyzed",
+			description: "A paralyzed creature is incapacitated and can’t move or speak.\n\nAttack rolls against the creature have advantage.\n\nAny attack that hits the creature is a critical hit if the attacker is within 5 feet of the creature.",
+		},
+		effects: [
+			{
+				stat: "speed",
+				operation: "mul",
+				value: 0,
+			},
+			{
+				stat: "strengthSave",
+				operation: "fail",
+			},
+			{
+				stat: "dexteritySave",
+				operation: "fail",
+			},
+		],
+		subConditions: [
+			"incapacitated",
+		],
+	},
+
+	petrified: {
+		buff: {
+			name: "Petrified",
+			description: "A petrified creature is transformed, along with any nonmagical object it is wearing or carrying, into a solid inanimate substance (usually stone). Its weight increases by a factor of ten, and it ceases aging.\n\nA petrified creature is incapacitated and can’t move or speak, and is unaware of its surroundings.\n\nAttack rolls against the creature have advantage.\n\nThe creature is immune to poison and disease, although a poison or disease already in its system is suspended, not neutralized.",
+		},
+		effects: (function() {
+			var effects = [
+				{stat: "speed", operation: "max", value: 0},
+				{stat: "strengthSave", operation: "fail"},
+				{stat: "dexteritySave", operation: "fail"},
+			];
+			_.each(
+				_.without(DAMAGE_MULTIPLIERS, "poisonMultiplier"),
+				function(multiplier){
+					effects.push({stat: multiplier, operation: "mul", value: 0.5});
+				}
+			);
+			effects.push({stat: "poisonMultiplier", operation: "mul", value: 0});
+		})(),
+		subConditions: [
+			"incapacitated",
+		],
+	},
+
+	poisoned: {
+		buff: {
+			name: "Poisoned",
+			description: "A poisoned creature has disadvantage on attack rolls and ability checks.",
+		},
+		effects: (function() {
+			return _.map(SKILLS, function(skill) {
+				return {stat: skill, operation: "disadvantage", value: 1};
+			});
+		})(),
+	},
+
+	prone: {
+		buff: {
+			name: "Prone",
+			description: "A prone creature’s only movement option is to crawl, unless it stands up and thereby ends the condition.\n\nThe creature has disadvantage on attack rolls.\n\nAn attack roll against the creature has advantage if the attacker is within 5 feet of the creature. Otherwise, the attack roll has disadvantage.",
+		}
+	},
+
+	restrained: {
+		buff: {
+			name: "Restrained",
+			description: "A restrained creature’s speed becomes 0, and it can’t benefit from any bonus to its speed.\n\nAttack rolls against the creature have advantage, and the creature’s attack rolls have disadvantage.\n\nThe creature has disadvantage on Dexterity saving throws.",
+		},
+		effects: [
+			{
+				stat: "speed",
+				operation: "max",
+				value: 0,
+			},
+			{
+				stat: "dexteritySave",
+				operation: "disadvantage",
+				value: 1,
+			},
+		],
+	},
+
+	stunned: {
+		buff: {
+			name: "Stunned",
+			description: "A stunned creature is incapacitated, can’t move, and can speak only falteringly\n\nThe creature automatically fails Strength and Dexterity saving throws.\n\nAttack rolls against the creature have advantage.",
+		},
+		effects: [
+			{
+				stat: "speed",
+				operation: "max",
+				value: 0,
+			},
+			{
+				stat: "strengthSave",
+				operation: "fail",
+			},
+			{
+				stat: "dexteritySave",
+				operation: "fail",
+			},
+		],
+		subConditions: ["incapacitated"],
+	},
+
+	unconscious: {
+		buff: {
+			name: "Unconscious",
+			description: "An unconscious creature is incapacitated, can’t move or speak, and is unaware of its surroundings.\n\nThe creature drops whatever it’s holding and falls prone.\n\nThe creature automatically fails Strength and Dexterity saving throws.\n\nAttack rolls against the creature have advantage.\n\nAny attack that hits the creature is a critical hit if the attacker is within 5 feet of the creature.",
+		},
+		subConditions: ["incapacitated", "prone"],
+	},
+
+	exhaustion1: {
+		buff: {
+			name: "Exhaustion - 1",
+			description: "Disadvantage on ability checks\n\nFinishing a long rest reduces a creature’s exhaustion level by 1, provided that the creature has also ingested some food and drink.",
+		},
+		effects: (function() {
+			return _.map(SKILLS, function(skill) {
+				return {stat: skill, operation: "disadvantage", value: 1};
+			});
+		})(),
+	},
+	exhaustion2: {
+		buff: {
+			name: "Exhaustion - 2",
+			description: "Speed halved",
+		},
+		effects: [
+			{
+				stat: "speed",
+				operation: "mul",
+				value: 0.5,
+			}
+		],
+		subConditions: ["exhaustion1"],
+	},
+	exhaustion3: {
+		buff: {
+			name: "Exhaustion - 3",
+			description: "Disadvantage on attack rolls and saving throws",
+		},
+		effects: (function() {
+			return _.map(SAVES, function(skill) {
+				return {stat: skill, operation: "disadvantage", value: 1};
+			});
+		})(),
+		subConditions: ["exhaustion2"],
+	},
+	exhaustion4: {
+		buff: {
+			name: "Exhaustion - 4",
+			description: "Hit point maximum halved",
+		},
+		effects: [
+			{
+				stat: "hitPoints",
+				operation: "mul",
+				value: 0.5,
+			}
+		],
+		subConditions: ["exhaustion3"],
+	},
+	exhaustion5: {
+		buff: {
+			name: "Exhaustion - 5",
+			description: "Speed reduced to 0",
+		},
+		effects: [
+			{
+				stat: "speed",
+				operation: "max",
+				value: 0,
+			}
+		],
+		subConditions: ["exhaustion4"],
+	},
+	exhaustion6: {
+		buff: {
+			name: "Exhaustion - 6",
+			description: "You have died of exhaustion",
+		},
+		effects: [
+			{
+				stat: "hitPoints",
+				operation: "max",
+				value: 0,
+			}
+		],
+		subConditions: ["exhaustion5"],
+	},
+	encumbered: {
+		buff: {
+			name: "Encumbered",
+			description: "Encumbered characters move 10 feet slower.",
+		},
+		effects: [
+			{stat: "speed", operation: "add", value: -10}
+		],
+	},
+	encumbered2: {
+		buff: {
+			name: "Heavily encumbered",
+			description: "Heavily encumbered characters move 20 feet slower and have disadvantage on ability checks, attack rolls, and saving thows that use Strength, Dexterity, or Constitution.",
+		},
+		effects: [
+			{stat: "speed", operation: "add", value: -20},
+			{stat: "strengthSave", operation: "disadvantage", value: 1},
+			{stat: "dexteritySave", operation: "disadvantage", value: 1},
+			{stat: "constitutionSave", operation: "disadvantage", value: 1},
+			{stat: "athletics", operation: "disadvantage", value: 1},
+			{stat: "acrobatics", operation: "disadvantage", value: 1},
+			{stat: "sleightOfHand", operation: "disadvantage", value: 1},
+			{stat: "stealth", operation: "disadvantage", value: 1},
+			{stat: "initiative", operation: "disadvantage", value: 1},
+		],
+	},
+	encumbered3: {
+		buff: {
+			name: "Over encumbered",
+			description: "Characters that can only just lift, push or drag their current load move at 5 feet.",
+		},
+		effects: [
+			{stat: "speed", operation: "max", value: 5},
+		],
+	},
+	encumbered4: {
+		buff: {
+			name: "Can't move load",
+			description: "Characters attempting to carry more than what they can lift, push, or drag can't move.",
+		},
+		effects: [
+			{stat: "speed", operation: "max", value: 0},
+		],
+	},
+};

rpg-docs/private/changeLogs/changeLogs.js

@@ -93,3 +93,54 @@ ChangeLogs.insert({
 		"Added calculated values for jumping and carrying to the strength detail box",
 	],
 });
+
+ChangeLogs.insert({
+	version: "0.4.1",
+	changes: [
+		"Fixed strength jumping calculations not rounding down correctly",
+	],
+});
+
+ChangeLogs.insert({
+	version: "0.4.2",
+	changes: [
+		"Fixed attack migrations from 0.3 -> 0.4",
+	],
+});
+
+ChangeLogs.insert({
+	version: "0.5",
+	changes: [
+		"Fixed a bug that caused multiple resistances or vulnerabilities to combine incorrectly",
+		"Added encumbrance effects that automatically apply when carrying too much load",
+		"Added a bunch of UI elements to make your character's current load clear",
+		"Floating button menus now close as expected when you click a sub-button",
+		"Base values in attribute summaries no longer look like added values"
+	],
+});
+
+ChangeLogs.insert({
+	version: "0.5.1",
+	changes: [
+		"Characters are now cached and should take much faster to load when swapping between them",
+	],
+});
+
+ChangeLogs.insert({
+	version: "0.5.2",
+	changes: [
+		"Opened the beta up to the general public",
+		"Added performance monitoring",
+	],
+});
+
+ChangeLogs.insert({
+	version: "0.5.2",
+	changes: [
+		"Prevented a harmless error caused by effects which have no stat set",
+		"Added the ability to hide the spells tab",
+		"Feedback forms now give me push notifications",
+		"Feedback forms now won't send unless properly filled out",
+		"Overhauled how effects' stats are chosen",
+	],
+});

rpg-docs/server/kadira.js

@@ -0,0 +1 @@
+Kadira.connect("erzTBaxBGjsd28SDt", "1c100582-dfce-4378-884f-e133e347b7b3");

rpg-docs/server/migrations/migrations.js

@@ -65,20 +65,22 @@ Migrations.add({
 	up: function() {
 		//update attacks
 		Attacks.find({}).forEach(function(attack) {
-			var newDamage = attack.damageDice +
-				" + {" + attack.damageBonus + "}";
-			Attacks.update(
-				attack._id,
-				{
-					$unset: {
-						damageBonus: "",
-						damageDice: "",
+			if (!attack.damage && attack.damageDice && attack.damageBonus){
+				var newDamage = attack.damageDice +
+					" + {" + attack.damageBonus + "}";
+				Attacks.update(
+					attack._id,
+					{
+						$unset: {
+							damageBonus: "",
+							damageDice: "",
+						},
+						$set: {
+							damage: newDamage
+						},
 					},
-					$set: {
-						damage: newDamage
-					},
-				},
-				{validate: false});
+					{validate: false});
+			}
 		});
 		//update Items
 		Items.update(
@@ -88,3 +90,21 @@ Migrations.add({
 		);
 	},
 });
+
+Migrations.add({
+	version: 3,
+	name: "Converts attacks from damage dice and damage bonus to a string with curly bracket calculations, adds settings.showIncrement to items",
+	up: function() {
+		//update characters
+		Characters.update(
+			{"settings.useVariantEncumbrance": undefined},
+			{$set: {"settings.useVariantEncumbrance" : false}},
+			{validate: false, multi: true}
+		);
+		Characters.update(
+			{"settings.useStandardEncumbrance": undefined},
+			{$set: {"settings.useStandardEncumbrance" : true}},
+			{validate: false, multi: true}
+		);
+	},
+});

rpg-docs/server/publications/singleCharacter.js

@@ -15,6 +15,7 @@ Meteor.publish("singleCharacter", function(characterId){
 			//get all the assets for this character including soft deleted ones
 			Actions.find           ({charId: characterId}, {removed: true}),
 			Attacks.find           ({charId: characterId}, {removed: true}),
+			Buffs.find             ({charId: characterId}, {removed: true}),
 			Classes.find           ({charId: characterId}, {removed: true}),
 			Containers.find        ({charId: characterId}, {removed: true}),
 			Effects.find           ({charId: characterId}, {removed: true}),