Set up custom icons for most properties

Add Docker Compose

.idea/inspectionProfiles/Project_Default.xml

@@ -1,13 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="HtmlUnknownAttribute" enabled="false" level="WARNING" enabled_by_default="false">
-      <option name="myValues">
-        <value>
-          <list size="0" />
-        </value>
-      </option>
-      <option name="myCustomValuesEnabled" value="true" />
-    </inspection_tool>
-  </profile>
-</component>

.idea/inspectionProfiles/profiles_settings.xml

@@ -1,7 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <settings>
-    <option name="PROJECT_PROFILE" value="Project Default" />
-    <option name="USE_PROJECT_PROFILE" value="true" />
-    <version value="1.0" />
-  </settings>
-</component>

.jscsrc

@@ -1,56 +0,0 @@
-{
-	"requireOperatorBeforeLineBreak": true,
-	"requireCamelCaseOrUpperCaseIdentifiers": true,
-	"maximumLineLength": {
-		"value": 80,
-		"allowComments": true,
-		"allowRegex": true
-	},
-	"validateIndentation": "\t",
-	"validateQuoteMarks": "\"",
-
-	"disallowMultipleLineStrings": true,
-	"disallowMixedSpacesAndTabs": "smart",
-	"disallowTrailingWhitespace": true,
-	"disallowSpaceAfterPrefixUnaryOperators": true,
-	"disallowMultipleVarDecl": false,
-	"disallowNewlineBeforeBlockStatements": true,
-	"disallowKeywordsOnNewLine": ["else"],
-
-	"requireSpaceAfterKeywords": [
-		"if",
-		"else",
-		"for",
-		"while",
-		"do",
-		"switch",
-		"return",
-		"try",
-		"catch"
-	],
-	"requireSpaceBeforeBinaryOperators": [
-		"=", "+=", "-=", "*=", "/=", "%=", "<<=", ">>=", ">>>=",
-		"&=", "|=", "^=", "+=",
-
-		"+", "-", "*", "/", "%", "<<", ">>", ">>>", "&",
-		"|", "^", "&&", "||", "===", "==", ">=",
-		"<=", "<", ">", "!=", "!=="
-	],
-	"requireSpaceAfterBinaryOperators": true,
-	"requireSpacesInConditionalExpression": true,
-	"requireSpacesInForStatement": true,
-	"requireTrailingComma": {
-		"ignoreSingleValue": true,
-		"ignoreSingleLine": true
-	},
-	"requireLineFeedAtFileEnd": true,
-	"disallowSpacesInAnonymousFunctionExpression": {
-		"beforeOpeningRoundBrace": true
-	},
-	"disallowSpacesInsideObjectBrackets": "all",
-	"disallowSpacesInsideArrayBrackets": "all",
-	"disallowSpacesInsideParentheses": true,
-
-	"disallowMultipleLineBreaks": true,
-	"disallowNewlineBeforeBlockStatements": true
-}

.jshintrc

@@ -1,4 +0,0 @@
-{
-	"undef": false,
-	"esversion": 6
-}

Dockerfile

@@ -0,0 +1,14 @@
+FROM ubuntu:latest
+RUN apt-get update --quiet \
+    && apt-get install --quiet --yes \
+    bsdtar \
+    curl \
+    git
+RUN ln --symbolic --force $(which bsdtar) $(which tar)
+RUN useradd --create-home --shell /bin/bash dicecloud
+USER dicecloud
+WORKDIR /home/dicecloud
+RUN curl https://install.meteor.com/?release=1.8.0.2 | sh
+ENV PATH="${PATH}:/home/dicecloud/.meteor"
+COPY dev.sh ./dev.sh
+ENTRYPOINT ./dev.sh

README.md

@@ -1,13 +1,70 @@
-RPG Docs
+DiceCloud
 ========
 
 This is the repo for [DiceCloud](dicecloud.com).
 
+DiceCloud is a free, auditable, real-time character sheet for D&D 5e.
+
+Philosophy
+----------
+
+Setting up your character on DiceCloud takes a little longer than
+just filling it in on a paper character sheet would. 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 a
+character now pays off over and over again once you're playing.
+
+The idea is to track where each number comes from, and allow you to easily make
+changes on the fly. Let's look at a hypothetical example.
+
+> You need to swim through a sunken section of dungeon to fetch the quest's Thing.
+> You'll need to take off your magical Plate Armor of +1 Constitution to swim
+> without sinking, of course.
+>
+> Taking it off will take away that disadvantage on
+> stealth checks, change your armor class, your speed and your constitution, and
+> which in turn changes your hit points and your constitution saving throw.
+> Working out all those changes in the middle of a game will drag the game to a
+> halt.
+>
+> Fortunately you have DiceCloud, so it's a matter of dragging
+> your Plate Armor +1 Con from your "equipment" box to your "backpack" box and
+> you're done. Your hitpoints change correctly, your saving throws are up to date,
+> your armor class goes back to reflecting the fact that you have natural armor
+> from being a dragonborn. Your character sheet keeps up and you
+> ultimately get more time to play the game. Huzzah!
+
 Getting started
 ---------------
 
-`git clone https://github.com/ThaumRystra/DiceCloud1 dicecloud`  
+Running DiceCloud locally, either to host it yourself away from an internet
+connection, or to contribute to developing it further, is fairly
+straightforward and it should work on Linux, Windows, and Mac.
+
+You'll need to have installed:
+
+- [git](https://www.atlassian.com/git/tutorials/install-git)
+- [Meteor](https://www.meteor.com/install)
+
+Then, it's just a matter of cloning this repository into a folder, and running
+`meteor` in the app directory.
+
+`git clone https://github.com/ThaumRystra/DiceCloud dicecloud`  
 `cd dicecloud`  
-`cd rpg-docs`  
+`cd app`  
-`bower install`  
+`meteor npm install`  
 `meteor`
+
+You should see this:
+
+```
+=> Started proxy.
+=> [HMR] Dev server listening on port 3003.
+=> Started MongoDB.
+=> Started your app.
+
+=> App running at: http://localhost:3000/
+```
+
+Now, visiting [](http://localhost:3000/) should show you an empty instance of
+DiceCloud running.

app/.gitignore

@@ -1,9 +1,11 @@
 .meteor/local
 .meteor/meteorite
 .demeteorized
+.cache
 settings.json
 public/components
 public/_imports.html
+private/oldClient
 nohup.out
 node_modules
 dump

app/.meteor/.finished-upgraders

@@ -15,3 +15,5 @@ notices-for-facebook-graph-api-2
 1.4.1-add-shell-server-package
 1.4.3-split-account-service-packages
 1.5-add-dynamic-import-package
+1.7-split-underscore-from-meteor-base
+1.8.3-split-jquery-from-blaze

app/.meteor/packages

@@ -0,0 +1,52 @@
+# Meteor packages used by this project, one per line.
+#
+# 'meteor add' and 'meteor remove' will edit this file for you,
+# but you can also edit it by hand.
+
+accounts-password@1.6.0
+accounts-ui@1.3.1
+random@1.2.0
+dburles:collection-helpers
+reactive-var@1.0.11
+underscore@1.0.10
+momentjs:moment
+dburles:mongo-collection-instances
+percolate:migrations
+accounts-google@1.3.3
+email@1.2.3
+meteorhacks:subs-manager
+chuangbo:marked
+meteor-base@1.4.0
+mobile-experience@1.1.0
+mongo@1.10.0
+session@1.2.0
+jquery@1.11.10
+tracker@1.2.0
+logging@1.1.20
+reload@1.3.0
+ejson@1.1.1
+check@1.3.1
+standard-minifier-js@2.6.0
+shell-server@0.5.0
+seba:minifiers-autoprefixer
+templates:array
+ecmascript@0.14.3
+es5-shim@4.8.0
+reactive-dict@1.3.0
+percolate:synced-cron
+ongoworks:speakingurl
+service-configuration@1.0.11
+google-config-ui@1.0.1
+dynamic-import@0.5.2
+ddp-rate-limiter@1.0.7
+rate-limit@1.0.9
+meteortesting:mocha
+mdg:validated-method
+akryum:vue-router2
+static-html
+aldeed:collection2@3.0.0
+aldeed:schema-index
+akryum:vue-component
+accounts-patreon
+bozhao:link-accounts
+peerlibrary:reactive-publish

app/.meteor/release

@@ -0,0 +1 @@
+METEOR@1.10.2

app/.meteor/versions

@@ -0,0 +1,134 @@
+accounts-base@1.6.0
+accounts-google@1.3.3
+accounts-oauth@1.2.0
+accounts-password@1.6.0
+accounts-patreon@0.1.0
+accounts-ui@1.3.1
+accounts-ui-unstyled@1.4.2
+akryum:npm-check@0.1.2
+akryum:vue-component@0.15.2
+akryum:vue-component-dev-client@0.4.7
+akryum:vue-component-dev-server@0.1.4
+akryum:vue-router2@0.2.3
+aldeed:collection2@3.0.6
+aldeed:schema-index@3.0.0
+allow-deny@1.1.0
+autoupdate@1.6.0
+babel-compiler@7.5.3
+babel-runtime@1.5.0
+base64@1.0.12
+binary-heap@1.0.11
+blaze@2.3.4
+blaze-tools@1.0.10
+boilerplate-generator@1.7.0
+bozhao:link-accounts@2.1.1
+caching-compiler@1.2.2
+caching-html-compiler@1.1.3
+callback-hook@1.3.0
+check@1.3.1
+chuangbo:marked@0.3.5_1
+coffeescript@2.4.1
+coffeescript-compiler@2.4.1
+dburles:collection-helpers@1.1.0
+dburles:mongo-collection-instances@0.3.5
+ddp@1.4.0
+ddp-client@2.3.3
+ddp-common@1.4.0
+ddp-rate-limiter@1.0.7
+ddp-server@2.3.1
+deps@1.0.12
+diff-sequence@1.1.1
+dynamic-import@0.5.2
+ecmascript@0.14.3
+ecmascript-runtime@0.7.0
+ecmascript-runtime-client@0.10.0
+ecmascript-runtime-server@0.9.0
+ejson@1.1.1
+email@1.2.3
+es5-shim@4.8.0
+fetch@0.1.1
+geojson-utils@1.0.10
+google-config-ui@1.0.1
+google-oauth@1.3.0
+hot-code-push@1.0.4
+html-tools@1.0.11
+htmljs@1.0.11
+http@1.4.2
+id-map@1.1.0
+inter-process-messaging@0.1.1
+jquery@1.11.11
+lai:collection-extensions@0.2.1_1
+launch-screen@1.2.0
+less@2.8.0
+livedata@1.0.18
+lmieulet:meteor-coverage@1.1.4
+localstorage@1.2.0
+logging@1.1.20
+mdg:validated-method@1.2.0
+meteor@1.9.3
+meteor-base@1.4.0
+meteorhacks:picker@1.0.3
+meteorhacks:subs-manager@1.6.4
+meteortesting:browser-tests@1.3.3
+meteortesting:mocha@1.1.5
+meteortesting:mocha-core@7.0.1
+minifier-css@1.5.0
+minifier-js@2.6.0
+minimongo@1.6.0
+mobile-experience@1.1.0
+mobile-status-bar@1.1.0
+modern-browsers@0.1.5
+modules@0.15.0
+modules-runtime@0.12.0
+momentjs:moment@2.24.0
+mongo@1.10.0
+mongo-decimal@0.1.1
+mongo-dev-server@1.1.0
+mongo-id@1.0.7
+npm-bcrypt@0.9.3
+npm-mongo@3.7.0
+oauth@1.3.0
+oauth2@1.3.0
+observe-sequence@1.0.16
+ongoworks:speakingurl@9.0.0
+ordered-dict@1.1.0
+patreon-oauth@0.1.0
+peerlibrary:assert@0.3.0
+peerlibrary:extend-publish@0.6.0
+peerlibrary:fiber-utils@0.10.0
+peerlibrary:reactive-mongo@0.4.0
+peerlibrary:reactive-publish@0.10.0
+peerlibrary:server-autorun@0.8.0
+percolate:migrations@0.9.8
+percolate:synced-cron@1.3.2
+promise@0.11.2
+raix:eventemitter@0.1.3
+random@1.2.0
+rate-limit@1.0.9
+reactive-dict@1.3.0
+reactive-var@1.0.11
+reload@1.3.0
+retry@1.1.0
+routepolicy@1.1.0
+seba:minifiers-autoprefixer@1.1.2
+service-configuration@1.0.11
+session@1.2.0
+sha@1.0.9
+shell-server@0.5.0
+socket-stream-client@0.3.0
+spacebars@1.0.15
+spacebars-compiler@1.1.3
+srp@1.1.0
+standard-minifier-js@2.6.0
+static-html@1.2.2
+templates:array@1.0.3
+templating@1.3.2
+templating-compiler@1.3.3
+templating-runtime@1.3.2
+templating-tools@1.1.2
+tmeasday:check-npm-versions@0.3.2
+tracker@1.2.0
+underscore@1.0.10
+url@1.3.0
+webapp@1.9.1
+webapp-hashing@1.0.9

app/client/head.html

@@ -1,9 +1,8 @@
 <head>
-	<meta name="viewport" content="width=device-width initial-scale=1.0, user-scalable=no">
+  <link href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900|Material+Icons" rel="stylesheet">
+  <meta name="viewport" content="width=device-width initial-scale=1.0, user-scalable=no">
 	<meta name="mobile-web-app-capable" content="yes">
 	<meta name="apple-mobile-web-app-capable" content="yes">
-	<link href='https://fonts.googleapis.com/css?family=Roboto:400,300,300italic,400italic,500,500italic,700,700italic,900,900italic,100italic,100&subset=latin,latin-ext' rel='stylesheet' type='text/css'>
-
 	<link rel="apple-touch-icon" sizes="57x57" href="/apple-touch-icon-57x57.png?v=lk6WXp6Pmj">
 	<link rel="apple-touch-icon" sizes="60x60" href="/apple-touch-icon-60x60.png?v=lk6WXp6Pmj">
 	<link rel="apple-touch-icon" sizes="72x72" href="/apple-touch-icon-72x72.png?v=lk6WXp6Pmj">
@@ -23,4 +22,17 @@
 	<meta name="msapplication-TileColor" content="#b91d1d">
 	<meta name="msapplication-TileImage" content="/mstile-144x144.png?v=lk6WXp6Pmj">
 	<meta name="theme-color" content="#d12929">
+
+	<style type="text/css" media="print">
+		@page {
+			margin: 0mm;
+		}
+		html {
+			margin: 0px;
+		}
+		* {
+			-webkit-transition: none !important;
+			transition: none !important;
+		}
+	</style>
 </head>

app/client/index.html

@@ -0,0 +1,3 @@
+<body>
+  <div id="app"></div>
+</body>

app/client/main.js

@@ -0,0 +1,3 @@
+import '/imports/ui/vueSetup.js';
+import '/imports/ui/styles/stylesIndex.js';
+import '/imports/ui/styles/stylesIndex.js';

app/imports/api/campaign/Encounter.js

@@ -0,0 +1,11 @@
+import SimpleSchema from 'simpl-schema';
+
+let Encounters = new Mongo.Collection("encounters");
+
+let EncounterSchema = new SimpleSchema({
+	//an encounter is a single flow of time all parties in an encounter are in-sync time wise
+});
+
+Encounters.attachSchema(EncounterSchema);
+
+export default Encounters;

app/imports/api/campaign/Parties.js

@@ -1,6 +1,8 @@
-Parties = new Mongo.Collection("parties");
+import SimpleSchema from 'simpl-schema';
 
-Schemas.Party = new SimpleSchema({
+let Parties = new Mongo.Collection("parties");
+
+let partySchema = new SimpleSchema({
 	name: {
 		type: String,
 		defaultValue: "New Party",
@@ -8,10 +10,13 @@ Schemas.Party = new SimpleSchema({
 		optional: true,
 	},
 	characters: {
-		type: [String],
+		type: Array,
+		defaultValue: [],
+	},
+	characters: {
+		type: String,
 		regEx: SimpleSchema.RegEx.Id,
 		index: 1,
-		defaultValue: [],
 	},
 	owner: {
 		type: String,
@@ -19,7 +24,7 @@ Schemas.Party = new SimpleSchema({
 	},
 });
 
-Parties.attachSchema(Schemas.Party);
+Parties.attachSchema(partySchema);
 
 Parties.allow({
 	insert: function(userId, doc) {
@@ -40,3 +45,5 @@ Parties.deny({
 		return _.contains(fields, "owner");
 	}
 });
+
+export default Parties;

app/imports/api/creature/CreatureProperties.js

@@ -0,0 +1,366 @@
+import { Meteor } from 'meteor/meteor';
+import { Mongo } from 'meteor/mongo';
+import { ValidatedMethod } from 'meteor/mdg:validated-method';
+import SimpleSchema from 'simpl-schema';
+import ColorSchema from '/imports/api/properties/subSchemas/ColorSchema.js';
+import ChildSchema, { RefSchema } from '/imports/api/parenting/ChildSchema.js';
+import { recomputeCreature } from '/imports/api/creature/computation/recomputeCreature.js';
+import LibraryNodes from '/imports/api/library/LibraryNodes.js';
+import Creatures from '/imports/api/creature/Creatures.js';
+import { assertEditPermission } from '/imports/api/sharing/sharingPermissions.js';
+import { softRemove } from '/imports/api/parenting/softRemove.js';
+import SoftRemovableSchema from '/imports/api/parenting/SoftRemovableSchema.js';
+import propertySchemasIndex from '/imports/api/properties/computedPropertySchemasIndex.js';
+import {
+	setLineageOfDocs,
+	getAncestry,
+	renewDocIds
+} from '/imports/api/parenting/parenting.js';
+import {setDocToLastOrder} from '/imports/api/parenting/order.js';
+import { storedIconsSchema } from '/imports/api/icons/Icons.js';
+
+let CreatureProperties = new Mongo.Collection('creatureProperties');
+
+let CreaturePropertySchema = new SimpleSchema({
+	type: {
+    type: String,
+    allowedValues: Object.keys(propertySchemasIndex),
+  },
+	tags: {
+		type: Array,
+		defaultValue: [],
+	},
+	'tags.$': {
+		type: String,
+	},
+	disabled: {
+		type: Boolean,
+		optional: true,
+	},
+  icon: {
+    type: storedIconsSchema,
+    optional: true,
+  }
+});
+
+for (let key in propertySchemasIndex){
+	let schema = new SimpleSchema({});
+	schema.extend(propertySchemasIndex[key]);
+	schema.extend(CreaturePropertySchema);
+  schema.extend(ColorSchema);
+	schema.extend(ChildSchema);
+	schema.extend(SoftRemovableSchema);
+	CreatureProperties.attachSchema(schema, {
+		selector: {type: key}
+	});
+}
+
+function getCreature(property){
+  if (!property) throw new Meteor.Error('No property provided');
+  let creature = Creatures.findOne(property.ancestors[0].id);
+  if (!creature) throw new Meteor.Error('Creature does not exist');
+  return creature;
+}
+
+function assertPropertyEditPermission(property, userId){
+  let creature = getCreature(property);
+  return assertEditPermission(creature, userId);
+}
+
+function recomputeCreatures(property){
+	for (let ref of property.ancestors){
+		if (ref.collection === 'creatures') {
+			recomputeCreature.call({charId: ref.id});
+		}
+	}
+}
+
+const insertProperty = new ValidatedMethod({
+  name: 'CreatureProperties.methods.insert',
+	validate: null,
+  run({creatureProperty}) {
+    delete creatureProperty._id;
+    assertPropertyEditPermission(creatureProperty, this.userId);
+		let _id = CreatureProperties.insert(creatureProperty);
+		let property = CreatureProperties.findOne(_id);
+		recomputeCreatures(property);
+  },
+});
+
+const duplicateProperty = new ValidatedMethod({
+  name: 'CreatureProperties.methods.duplicate',
+  validate: new SimpleSchema({
+    _id: {
+      type: String,
+      regEx: SimpleSchema.RegEx.Id,
+    }
+  }).validator(),
+  run({_id}) {
+    let creatureProperty = CreatureProperties.findOne(_id);
+    assertPropertyEditPermission(creatureProperty, this.userId);
+    delete creatureProperty._id;
+		CreatureProperties.insert(creatureProperty);
+    recomputeCreatures(creatureProperty);
+  },
+});
+
+const insertPropertyFromLibraryNode = new ValidatedMethod({
+	name: 'CreatureProperties.methods.insertPropertyFromLibraryNode',
+	validate: new SimpleSchema({
+		nodeId: {
+			type: String,
+			regEx: SimpleSchema.RegEx.Id,
+		},
+		parentRef: {
+			type: RefSchema,
+		},
+	}).validator(),
+	run({nodeId, parentRef}) {
+		// get the new ancestry for the properties
+		let {parentDoc, ancestors} = getAncestry({parentRef});
+
+		// Check permission to edit
+		if (parentRef.collection === 'creatures'){
+			assertEditPermission(parentDoc, this.userId);
+		} else if (parentRef.collection === 'creatureProperties'){
+			assertPropertyEditPermission(parentDoc, this.userId);
+		} else {
+			throw `${parentRef.collection} is not a valid parent collection`
+		}
+
+		// Fetch the library node and its decendents, provided they have not been
+		// removed
+		let node = LibraryNodes.findOne({
+			_id: nodeId,
+			removed: {$ne: true},
+		});
+		if (!node) throw `Node not found for nodeId: ${nodeId}`;
+		let oldParent = node.parent;
+		let nodes = LibraryNodes.find({
+			'ancestors.id': nodeId,
+			removed: {$ne: true},
+		}).fetch();
+		// The root node is last in the array of nodes
+		nodes.push(node);
+
+		// re-map all the ancestors
+		setLineageOfDocs({
+			docArray: nodes,
+			newAncestry: ancestors,
+			oldParent,
+		});
+
+		// Give the docs new IDs without breaking internal references
+		renewDocIds({
+			docArray: nodes,
+			collectionMap: {'libraryNodes': 'creatureProperties'}
+		});
+
+		// Order the root node
+		setDocToLastOrder({
+			collection: CreatureProperties,
+			doc: node,
+		});
+
+		// Insert the creature properties
+		let docId;
+		nodes.forEach(doc => {
+			docId = CreatureProperties.insert(doc);
+		});
+
+		// Recompute the creatures doc was attached to
+		let doc = CreatureProperties.findOne(docId);
+		recomputeCreatures(doc);
+
+		// Return the docId of the last property, the inserted root property
+		return docId;
+	},
+})
+
+const updateProperty = new ValidatedMethod({
+  name: 'CreatureProperties.methods.update',
+  validate({_id, path}){
+		if (!_id) return false;
+		// We cannot change these fields with a simple update
+		switch (path[0]){
+			case 'type':
+      case 'order':
+      case 'parent':
+      case 'ancestors':
+			case 'damage':
+				throw new Meteor.Error('Permission denied',
+				'This property can\'t be updated directly');
+		}
+  },
+  run({_id, path, value}) {
+    let property = CreatureProperties.findOne(_id);
+    assertPropertyEditPermission(property, this.userId);
+    let pathString = path.join('.');
+    let modifier;
+    // unset empty values
+    if (value === null || value === undefined){
+      modifier = {$unset: {[pathString]: 1}};
+    } else {
+      modifier = {$set: {[pathString]: value}};
+    }
+		CreatureProperties.update(_id, modifier, {
+			selector: {type: property.type},
+		});
+		recomputeCreatures(property);
+  },
+});
+
+const damageProperty = new ValidatedMethod({
+  name: 'CreatureProperties.methods.adjust',
+  validate: new SimpleSchema({
+    _id: SimpleSchema.RegEx.Id,
+    operation: {
+      type: String,
+      allowedValues: ['set', 'increment']
+    },
+    value: Number,
+  }).validator(),
+  run({_id, operation, value}) {
+		let currentProperty = CreatureProperties.findOne(_id);
+		// Check permissions
+		assertPropertyEditPermission(currentProperty, this.userId);
+		// Check if property can take damage
+		let schema = CreatureProperties.simpleSchema(currentProperty);
+		if (!schema.allowsKey('damage')){
+			throw new Meteor.Error(
+				'Damage property failed',
+				`Property of type "${currentProperty.type}" can't be damaged`
+			);
+		}
+		if (operation === 'set'){
+			let currentValue = currentProperty.value;
+			// Set represents what we want the value to be after damage
+			// So we need the actual damage to get to that value
+			let damage = currentValue - value;
+			// Damage can't exceed total value
+			if (damage > currentValue) damage = currentValue;
+			// Damage must be positive
+			if (damage < 0) damage = 0;
+			CreatureProperties.update(_id, {
+				$set: {damage}
+			}, {
+				selector: currentProperty
+			});
+		} else if (operation === 'increment'){
+			let currentValue = currentProperty.value - (currentProperty.damage || 0);
+			let currentDamage = currentProperty.damage;
+			let increment = value;
+			// Can't increase damage above the remaining value
+			if (increment > currentValue) increment = currentValue;
+			// Can't decrease damage below zero
+			if (-increment > currentDamage) increment = -currentDamage;
+			CreatureProperties.update(_id, {
+				$inc: {damage: increment}
+			}, {
+				selector: currentProperty
+			});
+		}
+		recomputeCreatures(currentProperty);
+  },
+});
+
+const adjustQuantity = new ValidatedMethod({
+  name: 'CreatureProperties.methods.adjustQuantity',
+  validate: new SimpleSchema({
+    _id: SimpleSchema.RegEx.Id,
+    operation: {
+      type: String,
+      allowedValues: ['set', 'increment']
+    },
+    value: Number,
+  }).validator(),
+  run({_id, operation, value}) {
+		let currentProperty = CreatureProperties.findOne(_id);
+		// Check permissions
+		assertPropertyEditPermission(currentProperty, this.userId);
+		// Check if property can take damage
+		let schema = CreatureProperties.simpleSchema(currentProperty);
+		if (!schema.allowsKey('quantity')){
+			throw new Meteor.Error(
+				'Adjust quantity failed',
+				`Property of type "${currentProperty.type}" doesn't have a quantity`
+			);
+		}
+		if (operation === 'set'){
+			CreatureProperties.update(_id, {
+				$set: {quantity: value}
+			}, {
+				selector: currentProperty
+			});
+		} else if (operation === 'increment'){
+      // value here is 'damage'
+      value = -value;
+			let currentQuantity = currentProperty.quantity;
+      if (currentQuantity + value < 0) value = -currentQuantity;
+			CreatureProperties.update(_id, {
+				$inc: {quantity: value}
+			}, {
+				selector: currentProperty
+			});
+		}
+  },
+});
+
+const pushToProperty = new ValidatedMethod({
+	name: 'CreatureProperties.methods.push',
+	validate: null,
+	run({_id, path, value}){
+		let property = CreatureProperties.findOne(_id);
+    assertPropertyEditPermission(property, this.userId);
+		CreatureProperties.update(_id, {
+			$push: {[path.join('.')]: value},
+		}, {
+			selector: {type: property.type},
+		});
+		recomputeCreatures(property);
+	}
+});
+
+const pullFromProperty = new ValidatedMethod({
+	name: 'CreatureProperties.methods.pull',
+	validate: null,
+	run({_id, path, itemId}){
+		let property = CreatureProperties.findOne(_id);
+    assertPropertyEditPermission(property, this.userId);
+		CreatureProperties.update(_id, {
+			$pull: {[path.join('.')]: {_id: itemId}},
+		}, {
+			selector: {type: property.type},
+			getAutoValues: false,
+		});
+		recomputeCreatures(property);
+	}
+});
+
+const softRemoveProperty = new ValidatedMethod({
+	name: 'CreatureProperties.methods.softRemove',
+	validate: new SimpleSchema({
+		_id: SimpleSchema.RegEx.Id
+	}).validator(),
+	run({_id}){
+		let property = CreatureProperties.findOne(_id);
+    assertPropertyEditPermission(property, this.userId);
+		softRemove({_id, collection: CreatureProperties});
+		recomputeCreatures(property);
+	}
+});
+
+
+export default CreatureProperties;
+export {
+	CreaturePropertySchema,
+	insertProperty,
+  duplicateProperty,
+	insertPropertyFromLibraryNode,
+	updateProperty,
+	damageProperty,
+  adjustQuantity,
+	pushToProperty,
+	pullFromProperty,
+	softRemoveProperty,
+};

app/imports/api/creature/Creatures.js

@@ -0,0 +1,162 @@
+import { ValidatedMethod } from 'meteor/mdg:validated-method';
+import SimpleSchema from 'simpl-schema';
+import deathSaveSchema from '/imports/api/properties/subSchemas/DeathSavesSchema.js'
+import ColorSchema from '/imports/api/properties/subSchemas/ColorSchema.js';
+import SharingSchema from '/imports/api/sharing/SharingSchema.js';
+import {assertEditPermission} from '/imports/api/sharing/sharingPermissions.js';
+import { getUserTier } from '/imports/api/users/patreon/tiers.js';
+
+import '/imports/api/creature/removeCreature.js';
+import '/imports/api/creature/restCreature.js';
+
+//set up the collection for creatures
+let Creatures = new Mongo.Collection('creatures');
+
+let CreatureSettingsSchema = new SimpleSchema({
+	//slowed down by carrying too much?
+	useVariantEncumbrance: {
+		type: Boolean,
+		optional: true,
+	},
+	//hide spellcasting tab
+	hideSpellcasting: {
+		type: Boolean,
+		optional: true,
+	},
+	// Swap around the modifier and stat
+	swapStatAndModifier: {
+		type: Boolean,
+		optional: true,
+	},
+  // Hide all the unused stats
+  hideUnusedStats: {
+    type: Boolean,
+    optional: true,
+  },
+  // How much each hitDice resets on a long rest
+  hitDiceResetMultiplier: {
+    type: Number,
+    optional: true,
+    min: 0,
+    max: 1,
+  }
+});
+
+let CreatureSchema = new SimpleSchema({
+	// Strings
+	name: {
+		type: String,
+		defaultValue: '',
+		optional: true,
+	},
+	alignment: {
+		type: String,
+		optional: true
+	},
+	gender: {
+		type: String,
+		optional: true
+	},
+	picture: {
+		type: String,
+		optional: true
+	},
+  avatarPicture: {
+    type: String,
+    optional: true,
+  },
+
+	// Mechanics
+	deathSave: {
+		type: deathSaveSchema,
+		defaultValue: {},
+	},
+	xp: {
+		type: SimpleSchema.Integer,
+		defaultValue: 0,
+	},
+	weightCarried: {
+		type: Number,
+		defaultValue: 0,
+	},
+	level: {
+		type: SimpleSchema.Integer,
+		defaultValue: 0,
+	},
+	type: {
+		type: String,
+		defaultValue: 'pc',
+		allowedValues: ['pc', 'npc', 'monster'],
+	},
+  damageMultipliers: {
+    type: Object,
+		blackbox: true,
+		defaultValue: {}
+  },
+	variables: {
+		type: Object,
+		blackbox: true,
+		defaultValue: {}
+	},
+
+	// Settings
+	settings: {
+		type: CreatureSettingsSchema,
+		defaultValue: {},
+	},
+});
+
+CreatureSchema.extend(ColorSchema);
+CreatureSchema.extend(SharingSchema);
+
+Creatures.attachSchema(CreatureSchema);
+
+const insertCreature = new ValidatedMethod({
+
+  name: 'Creatures.methods.insertCreature',
+
+  validate: null,
+
+  run() {
+    if (!this.userId) {
+      throw new Meteor.Error('Creatures.methods.insert.denied',
+      'You need to be logged in to insert a creature');
+    }
+    let tier = getUserTier(this.userId);
+    if (!tier.paidBenefits){
+      throw new Meteor.Error('Creatures.methods.insert.denied',
+      `The ${tier.name} tier does not allow you to insert a creature`);
+    }
+
+		// Create the creature document
+    let charId = Creatures.insert({
+			owner: this.userId,
+		});
+		this.unblock();
+		return charId;
+  },
+
+});
+
+const updateCreature = new ValidatedMethod({
+  name: 'Creatures.methods.update',
+  validate({_id, path}){
+		if (!_id) return false;
+		// Allowed fields
+		let allowedFields = ['name', 'alignment', 'gender', 'picture', 'avatarPicture', 'settings'];
+		if (!allowedFields.includes(path[0])){
+			throw new Meteor.Error('Creatures.methods.update.denied',
+      'This field can\'t be updated using this method');
+		}
+  },
+  run({_id, path, value}) {
+		let creature = Creatures.findOne(_id);
+    assertEditPermission(creature, this.userId);
+		Creatures.update(_id, {
+			$set: {[path.join('.')]: value},
+		});
+  },
+});
+
+export default Creatures;
+export { CreatureSchema, insertCreature, updateCreature };

app/imports/api/creature/computation/ComputationMemo.js

@@ -0,0 +1,254 @@
+import { includes, cloneDeep } from 'lodash';
+
+// The computation memo is an in-memory data structure used only during the
+// computation process
+export default class ComputationMemo {
+  constructor(props){
+    this.statsByVariableName = {};
+    this.extraStatsByVariableName = {};
+    this.statsById = {};
+    this.originalPropsById = {};
+    this.propsById = {};
+    this.skillsByAbility = {};
+    this.unassignedEffects = [];
+    this.classLevelsById = {};
+    this.classes = {};
+    this.togglesById = {};
+    this.toggleIds = new Set();
+    // First note all the ids of all the toggles
+    props.forEach((prop) => {
+      if (
+        prop.type === 'toggle'
+      ) {
+        this.toggleIds.add(prop._id);
+      }
+    });
+    props.filter((prop) => {
+      if (
+        prop.type === 'toggle'
+      ) {
+        this.addToggle(prop);
+      } else {
+        return true;
+      }
+    }).filter((prop) => {
+      if (
+        prop.type === 'attribute' ||
+        prop.type === 'skill'
+      ) {
+        // Add all the stats
+        this.addStat(prop);
+      } else {
+        return true;
+      }
+    }).forEach((prop) => {
+      // Now add all effects and proficiencies
+      if (prop.type === 'effect'){
+        this.addEffect(prop);
+      } else if (prop.type === 'proficiency') {
+        this.addProficiency(prop);
+      } else if (prop.type === 'classLevel'){
+        this.addClassLevel(prop);
+      }
+    });
+  }
+  registerProperty(prop){
+    this.originalPropsById[prop._id] = cloneDeep(prop);
+    this.propsById[prop._id] = prop;
+    prop.computationDetails = propDetails(prop);
+    prop.ancestors.forEach(ancestor => {
+      if (this.toggleIds.has(ancestor.id)){
+        prop.computationDetails.toggleAncestors.push(ancestor.id);
+      }
+    });
+    return prop;
+  }
+  addToggle(prop){
+    prop = this.registerProperty(prop);
+    this.togglesById[prop._id] = prop;
+  }
+  addClassLevel(prop){
+    prop = this.registerProperty(prop);
+    this.classLevelsById[prop._id] = prop;
+  }
+  addStat(prop){
+    let variableName = prop.variableName;
+    if (!variableName) return;
+    let existingStat = this.statsByVariableName[variableName];
+    if (existingStat){
+      existingStat.computationDetails.idsOfSameName.push(prop._id);
+      this.originalPropsById[prop._id] = cloneDeep(prop);
+      if (prop.baseValueCalculation){
+        existingStat.computationDetails.effects.push({
+          operation: 'base',
+          calculation: prop.baseValueCalculation,
+          stats: [variableName],
+          computationDetails: propDetailsByType.effect(),
+          statBase: true,
+        });
+      }
+      if (prop.baseProficiency){
+        existingStat.computationDetails.proficiencies.push({
+          value: prop.baseProficiency,
+          stats: [variableName],
+          computationDetails: propDetailsByType.proficiency(),
+          type: 'proficiency',
+          statBase: true,
+        });
+      }
+    } else {
+      prop = this.registerProperty(prop);
+      this.statsById[prop._id] = prop;
+      this.statsByVariableName[variableName] = prop;
+      if (
+        prop.type === 'skill' &&
+        isSkillCheck(prop) &&
+        prop.ability
+      ){
+        this.addSkillToAbility(prop, prop.ability)
+      }
+    }
+  }
+  addSkillToAbility(prop, ability){
+    if (!this.skillsByAbility[ability]){
+      this.skillsByAbility[ability] = [];
+    }
+    this.skillsByAbility[ability].push(prop);
+  }
+  addEffect(prop){
+    prop = this.registerProperty(prop);
+    let targets = this.getEffectTargets(prop);
+    targets.forEach(target => {
+      if (target.computationDetails.effects){
+        target.computationDetails.effects.push(prop);
+      }
+    });
+    if (!targets.size){
+      this.unassignedEffects.push(prop);
+    }
+  }
+  getEffectTargets(prop){
+    let targets = new Set();
+    if (!prop.stats) return targets;
+    prop.stats.forEach((statName) => {
+      let target = this.statsByVariableName[statName];
+      if (!target) return;
+      targets.add(target);
+      if (isSkillOperation(prop) && isAbility(target)){
+        let extras = this.skillsByAbility[statName] || [];
+        extras.forEach(ex =>{
+          // Only pass on ability effects to skills and checks
+          if (ex.skillType === 'skill' || ex.skillType === 'check'){
+            targets.add(ex)
+          }
+        });
+      }
+    });
+    return targets;
+  }
+  addProficiency(prop){
+    prop = this.registerProperty(prop);
+    let targets = this.getProficiencyTargets(prop);
+    targets.forEach(target => {
+      target.computationDetails.proficiencies.push(prop);
+    });
+  }
+  getProficiencyTargets(prop){
+    let targets = new Set();
+    if (!prop.stats) return targets;
+    prop.stats.forEach(statName => {
+      let target = this.statsByVariableName[statName];
+      if (!target) return;
+      targets.add(target);
+      if (isAbility(target)) {
+        let extras = this.skillsByAbility[statName] || [];
+        extras.forEach(ex =>{
+          // Only pass on ability proficiencies to skills and checks
+          if (ex.skillType === 'skill' || ex.skillType === 'check'){
+            targets.add(ex)
+          }
+        });
+      }
+    });
+    return targets;
+  }
+}
+
+function isAbility(prop){
+  return prop.type === 'attribute' &&
+  prop.attributeType === 'ability'
+}
+
+function isSkillCheck(prop){
+  return includes(['skill', 'check', 'save', 'utility'], prop.skillType);
+}
+
+const skillOperations = [
+  'advantage',
+  'disadvantage',
+  'passiveAdd',
+  'fail',
+  'conditional',
+  'rollBonus',
+];
+
+function isSkillOperation(prop){
+  return skillOperations.includes(prop.operation);
+}
+
+function propDetails(prop){
+  return propDetailsByType[prop.type]() || {};
+}
+
+const propDetailsByType = {
+  toggle(){
+    return {
+      computed: false,
+      busyComputing: false,
+      toggleAncestors: [],
+      disabledByToggle: false,
+    };
+  },
+  attribute(){
+    return {
+      computed: false,
+      busyComputing: false,
+      effects: [],
+      toggleAncestors: [],
+      disabledByToggle: false,
+      idsOfSameName: [],
+    };
+  },
+  skill(){
+    return {
+      computed: false,
+      busyComputing: false,
+      effects: [],
+      proficiencies: [],
+      toggleAncestors: [],
+      disabledByToggle: false,
+      idsOfSameName: [],
+    };
+  },
+  effect(){
+    return {
+      computed: false,
+      busyComputing: false,
+      toggleAncestors: [],
+      disabledByToggle: false,
+    };
+  },
+  classLevel(){
+    return {
+      computed: true,
+      toggleAncestors: [],
+      disabledByToggle: false,
+    };
+  },
+  proficiency(){
+    return {
+      toggleAncestors: [],
+      disabledByToggle: false,
+    };
+  },
+}

app/imports/api/creature/computation/EffectAggregator.js

@@ -0,0 +1,88 @@
+import evaluateCalculation from '/imports/api/creature/computation/evaluateCalculation.js';
+
+export default class EffectAggregator{
+  constructor(stat, memo){
+    delete this.baseValueErrors;
+    if (stat.baseValueCalculation){
+      let {value, errors} = evaluateCalculation(stat.baseValueCalculation, memo);
+      this.statBaseValue = value;
+      if (errors.length){
+        this.baseValueErrors = errors;
+      }
+      this.base = this.statBaseValue;
+    } else {
+      this.base = 0;
+    }
+    this.add = 0;
+    this.mul = 1;
+    this.min = Number.NEGATIVE_INFINITY;
+    this.max = Number.POSITIVE_INFINITY;
+    this.advantage = 0;
+    this.disadvantage = 0;
+    this.passiveAdd = 0;
+    this.fail = 0;
+    this.set = undefined;
+    this.conditional = [];
+    this.rollBonus = [];
+    this.hasNoEffects = true;
+  }
+  addEffect(effect){
+    let result = effect.result;
+    if (this.hasNoEffects) this.hasNoEffects = false;
+    switch(effect.operation){
+      case 'base':
+        // Take the largest base value
+        this.base = result > this.base ? result : this.base;
+        if (effect.statBase){
+          if (this.statBaseValue === undefined || result > this.statBaseValue){
+            this.statBaseValue = result;
+          }
+        }
+        break;
+      case 'add':
+        // Add all adds together
+        this.add += result;
+        break;
+      case 'mul':
+        // Multiply the muls together
+        this.mul *= result;
+        break;
+      case 'min':
+        // Take the largest min value
+        this.min = result > this.min ? result : this.min;
+        break;
+      case 'max':
+        // Take the smallest max value
+        this.max = result < this.max ? result : this.max;
+        break;
+      case 'set':
+        // Take the highest set value
+        this.set = this.set === undefined || result > this.set ? result : this.set;
+        break;
+      case 'advantage':
+        // Sum number of advantages
+        this.advantage++;
+        break;
+      case 'disadvantage':
+        // Sum number of disadvantages
+        this.disadvantage++;
+        break;
+      case 'passiveAdd':
+        // Add all passive adds together
+        this.passiveAdd += result;
+        break;
+      case 'fail':
+        // Sum number of fails
+        this.fail++;
+        break;
+      case 'conditional':
+        // Store array of conditionals
+        this.conditional.push(result);
+        break;
+      case 'rollBonus':
+        // Store array of roll bonuses
+        this.rollBonus.push(result);
+        break;
+    }
+  }
+}

app/imports/api/creature/computation/afterComputation/evaluateString.js

@@ -0,0 +1,98 @@
+import math from '/imports/math.js';
+import bareSymbolSubtitutor from '/imports/api/creature/computation/utility/bareSymbolSubtitutor.js';
+
+export default function evaluateString(string, scope){
+  let errors = [];
+  if (!string){
+    errors.push('No string provided');
+    return {result: string, errors};
+  }
+
+  if (!scope) errors.push('No scope provided');
+
+  // Parse the string using mathjs
+  let calc;
+  try {
+    calc = math.parse(string);
+  } catch (e) {
+    errors.push(e);
+    return {result: string, errors};
+  }
+
+  // Replace all bare symbols with symbol.value
+  let transformedCalc = calc.transform(bareSymbolSubtitutor(scope));
+
+  // Evaluate the expression to a number or return with substitutions
+  try {
+    let result = transformedCalc.evaluate(scope);
+    return {result, errors};
+  } catch (e1){
+    errors.push(e1);
+    try {
+      let result = simplifyWithAccessors(transformedCalc, scope).toHTML();
+      return {result, errors};
+    } catch (e2){
+      errors.push(e2);
+      return {result: transformedCalc.toHTML(), errors};
+    }
+  }
+}
+
+function simplifyWithAccessors(calc, scope){
+  let noAccessorCalc = calc.transform(substituteAccessors(scope));
+  return math.simplify(noAccessorCalc);
+}
+
+// returns a function to replace all accessors with either their resolved value
+// or a symbol to simplify with
+function substituteAccessors(scope){
+  return function(node){
+    if (node.isAccessorNode){
+      try {
+        return evaluateAccessor(node, scope);
+      } catch (e) {
+        return replaceAccessorWithSymbol(node);
+      }
+    } else {
+      return node;
+    }
+  }
+}
+
+// Throws error if symbol is undefined in scope
+function evaluateAccessor(node, scope){
+  let value = node.evaluate(scope);
+  if (value === undefined){
+    throw 'Undefined symbol'
+  }
+  return new math.ConstantNode(value);
+}
+
+function replaceAccessorWithSymbol(node){
+  let symbolNode = new math.SymbolNode(node.toString());
+  return symbolNode;
+}
+
+/*
+function overrideSymbolNodeHTML(symbolNode){
+  let safeName = escape(symbolNode.name);
+  symbolNode.toHTML = function(){
+    console.log('running custom tohtml function')
+    return `<span class="math-symbol math-substitution-failed">${safeName}</span>`
+  }
+  return symbolNode;
+}
+
+// Escape special HTML characters
+// Copied directly from math.js source to help with overriding toHTML
+function escape (value) {
+  let text = String(value)
+  text = text.replace(/&/g, '&amp;')
+    .replace(/"/g, '&quot;')
+    .replace(/'/g, '&#39;')
+    .replace(/</g, '&lt;')
+    .replace(/>/g, '&gt;')
+
+  return text
+}
+*/

app/imports/api/creature/computation/afterComputation/evalutateStringWithEmbeddedCalculations.js

@@ -0,0 +1,11 @@
+import evaluateString from '/imports/api/creature/computation/afterComputation/evaluateString.js';
+
+// Strings can have computations in bracers like so: {computation}
+export default function evalutateStringWithEmbeddedCalculations(string, scope){
+	if (!string) return string;
+  // Compute everything inside bracers
+	return string.replace(/\{([^{}]*)\}/g, function(match, p1){
+    let {result} = evaluateString(p1, scope);
+    return result;
+	});
+}

app/imports/api/creature/computation/applyToggles.js

@@ -0,0 +1,11 @@
+import computeToggle from '/imports/api/creature/computation/computeToggle.js';
+
+export default function applyToggles(prop, memo){
+  prop.computationDetails.toggleAncestors.forEach(toggleId => {
+    let toggle = memo.togglesById[toggleId];
+    computeToggle(toggle, memo);
+    if (!toggle.toggleResult){
+      prop.computationDetails.disabledByToggle = true;
+    }
+  });
+}

app/imports/api/creature/computation/combineStat.js

@@ -0,0 +1,125 @@
+import computeStat from '/imports/api/creature/computation/computeStat.js';
+import applyToggles from '/imports/api/creature/computation/applyToggles.js';
+
+export default function combineStat(stat, aggregator, memo){
+  if (stat.type === 'attribute'){
+    combineAttribute(stat, aggregator);
+  } else if (stat.type === 'skill'){
+    combineSkill(stat, aggregator, memo);
+  } else if (stat.type === 'damageMultiplier'){
+    combineDamageMultiplier(stat, memo);
+  }
+}
+
+function getAggregatorResult(stat, aggregator){
+  let result = (aggregator.base + aggregator.add) * aggregator.mul;
+  if (result < aggregator.min) {
+    result = aggregator.min;
+  }
+  if (result > aggregator.max) {
+    result = aggregator.max;
+  }
+  if (aggregator.set !== undefined) {
+    result = aggregator.set;
+  }
+  if (!stat.decimal && Number.isFinite(result)){
+    result = Math.floor(result);
+  }
+  return result;
+}
+
+function combineAttribute(stat, aggregator){
+  stat.value = getAggregatorResult(stat, aggregator);
+  stat.baseValue = aggregator.statBaseValue;
+  stat.baseValueErrors = aggregator.baseValueErrors;
+  if (stat.attributeType === 'ability') {
+    stat.modifier = Math.floor((stat.value - 10) / 2);
+  }
+  stat.currentValue = stat.value - (stat.damage || 0);
+  stat.hide = aggregator.hasNoEffects &&
+    stat.baseValue === undefined ||
+    undefined
+}
+
+function combineSkill(stat, aggregator, memo){
+  // Skills are based on some ability Modifier
+  let ability = memo.statsByVariableName[stat.ability]
+  if (stat.ability && ability){
+    if (!ability.computationDetails.computed){
+      computeStat(ability, memo);
+    }
+    stat.abilityMod = ability.modifier;
+  }
+  // Combine all the child proficiencies
+  stat.proficiency = stat.baseProficiency || 0;
+  for (let i in stat.computationDetails.proficiencies){
+    let prof = stat.computationDetails.proficiencies[i];
+    applyToggles(prof, memo);
+    if (
+      !prof.computationDetails.disabledByToggle &&
+      prof.value > stat.proficiency
+    ){
+      stat.proficiency = prof.value;
+    }
+  }
+  // Get the character's proficiency bonus to apply
+  let profBonusStat = memo.statsByVariableName['proficiencyBonus'];
+  let profBonus = profBonusStat && profBonusStat.value;
+
+  if (typeof profBonus !== 'number' && memo.statsByVariableName['level']){
+    let level = memo.statsByVariableName['level'].value;
+    profBonus = Math.ceil(level / 4) + 1;
+  }
+  // Multiply the proficiency bonus by the actual proficiency
+  profBonus *= stat.proficiency;
+  // Base value
+  stat.baseValue = aggregator.statBaseValue;
+  stat.baseValueErrors = aggregator.baseValueErrors;
+  // Combine everything to get the final result
+  let result = (aggregator.base + stat.abilityMod + profBonus + aggregator.add) * aggregator.mul;
+  if (result < aggregator.min) result = aggregator.min;
+  if (result > aggregator.max) result = aggregator.max;
+  if (aggregator.set !== undefined) {
+    result = aggregator.set;
+  }
+  if (Number.isFinite(result)){
+    result = Math.floor(result);
+  }
+  stat.value = result;
+  // Advantage/disadvantage
+  if (aggregator.advantage && !aggregator.disadvantage){
+    stat.advantage = 1;
+  } else if (aggregator.disadvantage && !aggregator.advantage){
+    stat.advantage = -1;
+  } else {
+    stat.advantage = 0;
+  }
+  // Passive bonus
+  stat.passiveBonus = aggregator.passiveAdd;
+  // conditional benefits
+  stat.conditionalBenefits = aggregator.conditional;
+  // Roll bonuses
+  stat.rollBonus = aggregator.rollBonus;
+  // Forced to fail
+  stat.fail = aggregator.fail;
+  // Rollbonus
+  stat.rollBonuses = aggregator.rollBonus;
+  // Hide
+  stat.hide = aggregator.hasNoEffects &&
+    stat.baseValue === undefined &&
+    stat.proficiency == 0 ||
+    undefined;
+}
+
+function combineDamageMultiplier(stat){
+  if (stat.immunityCount) return 0;
+  let result;
+  if (stat.ressistanceCount && !stat.vulnerabilityCount){
+    result = 0.5;
+  }  else if (!stat.ressistanceCount && stat.vulnerabilityCount){
+    result = 2;
+  } else {
+    result = 1;
+  }
+  stat.value = result;
+}

app/imports/api/creature/computation/computeEffect.js

@@ -0,0 +1,45 @@
+import evaluateCalculation from '/imports/api/creature/computation/evaluateCalculation.js';
+import applyToggles from '/imports/api/creature/computation/applyToggles.js';
+
+export default function computeEffect(effect, memo){
+  if (effect.computationDetails.computed) return;
+  if (effect.computationDetails.busyComputing){
+    // Trying to compute this effect again while it is already computing.
+    // We must be in a dependency loop.
+    effect.computationDetails.computed = true;
+    effect.result = NaN;
+    effect.computationDetails.busyComputing = false;
+    effect.computationDetails.error = 'dependencyLoop';
+    if (Meteor.isClient) console.warn('dependencyLoop', effect);
+    return;
+  }
+  // Before doing any work, mark this effect as busy
+  effect.computationDetails.busyComputing = true;
+
+  // Apply any toggles
+  applyToggles(effect, memo);
+
+  // Determine result of effect calculation
+  delete effect.errors;
+  if (!effect.calculation){
+    if(effect.operation === 'add' || effect.operation === 'base'){
+      effect.result = 0;
+    } else {
+      delete effect.result
+    }
+  } else if (Number.isFinite(+effect.calculation)){
+    effect.result = +effect.calculation;
+  } else if(effect.operation === 'conditional' || effect.operation === 'rollBonus'){
+    effect.result = effect.calculation;
+  } else if(_.contains(['advantage', 'disadvantage', 'fail'], effect.operation)){
+    effect.result = 1;
+  } else {
+    let {value, errors} = evaluateCalculation(effect.calculation, memo);
+    effect.result = value;
+    if (errors.length){
+      effect.errors = errors;
+    }
+  }
+  effect.computationDetails.computed = true;
+  effect.computationDetails.busyComputing = false;
+}

app/imports/api/creature/computation/computeLevels.js

@@ -0,0 +1,44 @@
+import { forOwn, has } from 'lodash';
+
+export default function computeLevels(memo){
+  computeClassLevels(memo);
+  computeTotalLevel(memo);
+}
+
+function computeClassLevels(memo){
+  forOwn(memo.classLevelsById, classLevel => {
+    let name = classLevel.variableName;
+    let stat = memo.statsByVariableName[name];
+    if (!stat){
+      memo.statsByVariableName[name] = classLevel;
+      memo.classes[name] = classLevel;
+    } else if (!has(stat, 'level')){
+      // Stat is overriden by an attribute
+      return;
+    } else if (stat.level < classLevel.level) {
+      memo.statsByVariableName[name] = classLevel;
+      memo.classes[name] = classLevel;
+    }
+  });
+}
+
+function computeTotalLevel(memo){
+  let currentLevel = memo.statsByVariableName['level'];
+  if (!currentLevel){
+    currentLevel = {
+      value: 0,
+      computationDetails: {
+        builtIn: true,
+        computed: true,
+      }
+    };
+    memo.statsByVariableName['level'] = currentLevel;
+  }
+  // bail out if overriden by an attribute
+  if (!currentLevel.computationDetails.builtIn) return;
+  let level = 0;
+  for (let name in memo.classes){
+    level += memo.classes[name].level || 0;
+  }
+  memo.statsByVariableName['level'].value = level;
+}

app/imports/api/creature/computation/computeMemo.js

@@ -0,0 +1,22 @@
+import { each, forOwn } from 'lodash';
+import computeLevels from '/imports/api/creature/computation/computeLevels.js';
+import computeStat from '/imports/api/creature/computation/computeStat.js';
+import computeEffect from '/imports/api/creature/computation/computeEffect.js';
+import computeToggle from '/imports/api/creature/computation/computeToggle.js';
+
+export default function computeMemo(memo){
+  // Compute level
+  computeLevels(memo);
+  // Compute all stats, even if they are overriden
+  forOwn(memo.statsById, stat => {
+    computeStat (stat, memo);
+  });
+  // Compute effects which didn't end up targeting a stat
+  each(memo.unassignedEffects, effect => {
+    computeEffect(effect, memo);
+  });
+  forOwn(memo.togglesById, toggle => {
+    computeToggle(toggle, memo);
+  });
+  // Compute class levels
+}

app/imports/api/creature/computation/computeStat.js

@@ -0,0 +1,40 @@
+import combineStat from '/imports/api/creature/computation/combineStat.js';
+import computeEffect from '/imports/api/creature/computation/computeEffect.js';
+import EffectAggregator from '/imports/api/creature/computation/EffectAggregator.js';
+import applyToggles from '/imports/api/creature/computation/applyToggles.js';
+import { each } from 'lodash';
+
+export default function computeStat(stat, memo){
+  // If the stat is already computed, skip it
+  if (stat.computationDetails.computed) return;
+  if (stat.computationDetails.busyComputing){
+    // Trying to compute this stat again while it is already computing.
+    // We must be in a dependency loop.
+    stat.computationDetails.computed = true;
+    stat.value = NaN;
+    stat.computationDetails.busyComputing = false;
+    stat.computationDetails.error = 'dependencyLoop';
+    if (Meteor.isClient) console.warn('dependencyLoop', stat);
+    return;
+  }
+  // Before doing any work, mark this stat as busy
+  stat.computationDetails.busyComputing = true;
+  // Apply any toggles
+  applyToggles(stat, memo);
+
+  if (!stat.computationDetails.disabledByToggle){
+    // Compute and aggregate all the effects
+    let aggregator = new EffectAggregator(stat, memo)
+    each(stat.computationDetails.effects, (effect) => {
+      computeEffect(effect, memo);
+      if (!effect.computationDetails.disabledByToggle){
+        aggregator.addEffect(effect);
+      }
+    });
+    // Conglomerate all the effects to compute the final stat values
+    combineStat(stat, aggregator, memo);
+  }
+  // Mark the attribute as computed
+  stat.computationDetails.computed = true;
+  stat.computationDetails.busyComputing = false;
+}

app/imports/api/creature/computation/computeToggle.js

@@ -0,0 +1,37 @@
+import evaluateCalculation from '/imports/api/creature/computation/evaluateCalculation.js';
+
+export default function computeToggle(toggle, memo){
+  if (toggle.computationDetails.computed) return;
+  if (toggle.computationDetails.busyComputing){
+    // Trying to compute this effect again while it is already computing.
+    // We must be in a dependency loop.
+    toggle.computationDetails.computed = true;
+    toggle.result = false;
+    toggle.computationDetails.busyComputing = false;
+    toggle.computationDetails.error = 'dependencyLoop';
+    if (Meteor.isClient) console.warn('dependencyLoop', toggle);
+    return;
+  }
+  // Before doing any work, mark this toggle as busy
+  toggle.computationDetails.busyComputing = true;
+
+  // Do work
+  delete toggle.errors;
+  if (toggle.enabled){
+    toggle.toggleResult = true;
+  } else if (toggle.disabled){
+    toggle.toggleResult = false;
+  } else if (!toggle.condition){
+    toggle.toggleResult = false;
+  } else if (Number.isFinite(+toggle.condition)){
+    toggle.toggleResult = !!+toggle.condition;
+  } else {
+    let {value, errors} = evaluateCalculation(toggle.condition, memo);
+    toggle.toggleResult = value;
+    if (errors.length){
+      toggle.errors = errors;
+    }
+  }
+  toggle.computationDetails.computed = true;
+  toggle.computationDetails.busyComputing = false;
+}

app/imports/api/creature/computation/evaluateCalculation.js

@@ -0,0 +1,98 @@
+import computeStat from '/imports/api/creature/computation/computeStat.js';
+import math from '/imports/math.js';
+
+/* Convert a calculation into a constant output and errors*/
+export default function evaluateCalculation(string, memo){
+  if (!string) return string;
+  let errors = [];
+  // Parse the string using mathjs
+  let calc;
+  try {
+    calc = math.parse(string);
+  } catch (e) {
+    errors.push({
+      type: 'parsing',
+      message: e.message || e
+    });
+    return {errors, value: string};
+  }
+  // Ensure all symbol nodes are defined and coputed
+  calc.traverse(node => {
+    if (node.isSymbolNode){
+      let stat = memo.statsByVariableName[node.name];
+      if (stat && !stat.computationDetails.computed){
+        computeStat(stat, memo);
+      }
+    }
+  });
+  // Replace all symbols with their subtitution
+  let substitutedCalc = calc.transform(
+    symbolSubtitutor(memo.statsByVariableName, errors)
+  );
+  // Evaluate the expression to a number or return with substitutions
+  try {
+    let value = substitutedCalc.evaluate(memo.statsByVariableName);
+    if (typeof value === 'object') value = value.toString();
+    return {errors, value};
+  } catch (e){
+    errors.push({
+      type: 'evaluation',
+      message: e.message || e
+    });
+    let value = substitutedCalc.toString();
+    return {errors, value};
+  }
+}
+
+// returns a function to replace all symbols with either their resolved value
+// or zero, keeping the errors
+function symbolSubtitutor(scope, errors){
+  return function(node){
+    // mark symbol nodes that are children of function nodes to be skipped
+    if (node.isFunctionNode){
+      let fn = node.fn;
+      if (fn && fn.isSymbolNode){
+        fn.skipReplacement = true;
+      }
+      return node;
+    } else if (node.isSymbolNode && node.skipReplacement !== true){
+      //bare symbols of name "stat", should search for stat.value
+      let stat = scope[node.name];
+      if (stat){
+        if (stat.value === undefined){
+          errors.push({
+            type: 'subsitution',
+            message: `${node.name} does not have a value, set to 0`
+          });
+          return new math.ConstantNode(0);
+        } else {
+          return new math.ConstantNode(stat.value);
+        }
+      } else {
+        try {
+          return new math.ConstantNode(node.evaluate(scope));
+        } catch (e) {
+          errors.push({
+            type: 'subsitution',
+            message: `${node.name} not found, set to 0`
+          });
+          return new math.ConstantNode(0);
+        }
+      }
+    } else if (node.isAccessorNode){
+      try {
+        let value = node.evaluate(scope);
+        if (value === undefined) throw 'Not found';
+        return new math.ConstantNode(value);
+      } catch (e) {
+        errors.push({
+          type: 'subsitution',
+          message: `${node.toString()} not found, set to 0`
+        });
+        return new math.ConstantNode(0);
+      }
+    } else {
+      return node;
+    }
+  }
+}

app/imports/api/creature/computation/recomputeCreature.js

@@ -0,0 +1,87 @@
+import { ValidatedMethod } from 'meteor/mdg:validated-method';
+import SimpleSchema from 'simpl-schema';
+import { assertEditPermission } from '/imports/api/creature/creaturePermissions.js';
+import ComputationMemo from '/imports/api/creature/computation/ComputationMemo.js';
+import computeMemo from '/imports/api/creature/computation/computeMemo.js';
+import getActiveProperties from '/imports/api/creature/getActiveProperties.js';
+import writeAlteredProperties from '/imports/api/creature/computation/writeAlteredProperties.js';
+import writeCreatureVariables from '/imports/api/creature/computation/writeCreatureVariables.js';
+import { recomputeDamageMultipliersById } from '/imports/api/creature/damageMultiplierDenormalise/recomputeDamageMultipliers.js'
+
+export const recomputeCreature = new ValidatedMethod({
+
+  name: 'Creatures.methods.recomputeCreature',
+
+  validate: new SimpleSchema({
+    charId: { type: String }
+  }).validator(),
+
+  run({charId}) {
+    // Permission
+    assertEditPermission(charId, this.userId);
+    // Work, call this direcly if you are already in a method that has checked
+    // for permission to edit a given character
+    recomputeCreatureById(charId);
+  },
+
+});
+
+const calculationPropertyTypes = [
+  'attribute',
+  'skill',
+  'effect',
+  'proficiency',
+  'classLevel',
+  'toggle',
+];
+
+/**
+ * This function is the heart of DiceCloud. It recomputes a creature's stats,
+ * distilling down effects and proficiencies into the final stats that make up
+ * a creature.
+ *
+ * Essentially this is a depth first tree traversal algorithm that computes
+ * stats' dependencies before computing stats themselves, while detecting
+ * dependency loops.
+ *
+ * At the moment it makes no effort to limit recomputation to just what was
+ * changed.
+ *
+ * Attempting to implement dependency management to limit recomputation to just
+ * change affected stats should only happen as a last resort, when this function
+ * can no longer be performed more efficiently, and server resources can not be
+ * expanded to meet demand.
+ *
+ * A brief overview:
+ * - Fetch the stats of the creature and add them to
+ *   an object for quick lookup
+ * - Fetch the effects and proficiencies which apply to each stat and store them with the stat
+ * - Fetch the class levels and store them as well
+ * - Mark each stat and effect as uncomputed
+ * - Iterate over each stat in order and compute it
+ *   - If the stat is already computed, skip it
+ *   - If the stat is busy being computed, we are in a dependency loop, make it NaN and mark computed
+ *   - Mark the stat as busy computing
+ *   - Iterate over each effect which applies to the attribute
+ *     - If the effect is not computed compute it
+ *       - If the effect relies on another attribute, get its computed value
+ *       - Recurse if that attribute is uncomputed
+ *     - apply the effect to the attribute
+ *   - Conglomerate all the effects to compute the final stat values
+ *   - Mark the stat as computed
+ * - Write the computed results back to the database
+ */
+export function recomputeCreatureById(creatureId){
+  let props = getActiveProperties({
+    ancestorId: creatureId,
+    filter: {type: {$in: calculationPropertyTypes}},
+    includeUntoggled: true,
+    // TODO filter out expensive fields, particularly icon field
+  });
+  let computationMemo = new ComputationMemo(props);
+  computeMemo(computationMemo);
+  writeAlteredProperties(computationMemo);
+  writeCreatureVariables(computationMemo, creatureId);
+  recomputeDamageMultipliersById(creatureId);
+  return computationMemo;
+}

app/imports/api/creature/computation/utility/bareSymbolSubtitutor.js

@@ -0,0 +1,24 @@
+import math from '/imports/math.js';
+
+export default function bareSymbolSubtitutor(scope){
+  return function(node, path){
+    if (!scope) return node;
+    if (node.isFunctionNode){
+      let fn = node.fn;
+      if (fn && fn.isSymbolNode){
+        fn.skipReplacement = true;
+      }
+      return node;
+    } else if (
+      node.isSymbolNode &&
+      path !== 'object' &&
+      node.skipReplacement !== true
+    ) {
+      let stat = scope[node.name];
+      if (!stat) return node;
+      return new math.ConstantNode(stat.value);
+    } else {
+      return node;
+    }
+  }
+}

app/imports/api/creature/computation/writeAlteredProperties.js

@@ -0,0 +1,114 @@
+import { Meteor } from 'meteor/meteor'
+import { isEqual, forOwn } from 'lodash';
+import { ComputedOnlySkillSchema } from '/imports/api/properties/Skills.js';
+import { ComputedOnlyAttributeSchema } from '/imports/api/properties/Attributes.js';
+import { ComputedOnlyEffectSchema } from '/imports/api/properties/Effects.js';
+import { ComputedOnlyToggleSchema } from '/imports/api/properties/Toggles.js';
+import CreatureProperties from '/imports/api/creature/CreatureProperties.js';
+
+const schemasByType = {
+  'skill': ComputedOnlySkillSchema,
+  'attribute': ComputedOnlyAttributeSchema,
+  'effect': ComputedOnlyEffectSchema,
+  'toggle': ComputedOnlyToggleSchema,
+};
+
+export default function writeAlteredProperties(memo){
+  let bulkWriteOperations = [];
+  // Loop through all properties on the memo
+  forOwn(memo.propsById, changed => {
+    let schema = schemasByType[changed.type];
+    if (!schema) return;
+    let extraIds = changed.computationDetails.idsOfSameName;
+    let ids;
+    if (extraIds && extraIds.length){
+      ids = [changed._id, ...extraIds];
+    } else {
+      ids = [changed._id];
+    }
+    ids.forEach(id => {
+      let op = undefined;
+      let original = memo.originalPropsById[id];
+      op = addChangedKeysToOp(op, schema.objectKeys(), original, changed);
+      if (op){
+        bulkWriteOperations.push(op);
+      }
+    });
+  });
+  bulkWriteProperties(bulkWriteOperations);
+}
+
+function addChangedKeysToOp(op, keys, original, changed) {
+  // Loop through all keys that can be changed by computation
+  // and compile an operation that sets all those keys
+  for (let key of keys){
+    if (!isEqual(original[key], changed[key])){
+      if (!op) op = newOperation(original._id, changed.type);
+      let value = changed[key];
+      if (value === undefined){
+        // Unset values that become undefined
+        addUnsetOp(op, key);
+      } else {
+        // Set values that changed to something else
+        addSetOp(op, key, value);
+      }
+    }
+  }
+  return op;
+}
+
+function newOperation(_id, type){
+  let newOp = {
+    updateOne: {
+      filter: {_id},
+      update: {},
+    }
+  };
+  if (Meteor.isClient){
+    newOp.type = type;
+  }
+  return newOp;
+}
+
+function addSetOp(op, key, value){
+  if (op.updateOne.update.$set){
+    op.updateOne.update.$set[key] = value;
+  } else {
+    op.updateOne.update.$set = {[key]: value};
+  }
+}
+
+function addUnsetOp(op, key){
+  if (op.updateOne.update.$unset){
+    op.updateOne.update.$unset[key] = 1;
+  } else {
+    op.updateOne.update.$unset = {[key]: 1};
+  }
+}
+
+function bulkWriteProperties(bulkWriteOps){
+  if (!bulkWriteOps.length) return;
+  if (Meteor.isServer){
+    CreatureProperties.rawCollection().bulkWrite(
+      bulkWriteOps,
+      {ordered : false},
+      function(e){
+        if (e) {
+          console.error('Bulk write failed: ');
+          console.error(e);
+        }
+      }
+    );
+  } else {
+    bulkWriteOps.forEach(op => {
+      let updateOneOrMany = op.updateOne || op.updateMany;
+      CreatureProperties.update(updateOneOrMany.filter, updateOneOrMany.update, {
+        // The server code is bypassing collection 2 validation, so do the same
+        // on the client
+        // include this if bypass is off:
+        // selector: {type: op.type}
+        bypassCollection2: true,
+      });
+    });
+  }
+}

app/imports/api/creature/computation/writeCreatureVariables.js

@@ -0,0 +1,35 @@
+import { pick, forOwn } from 'lodash';
+import Creatures from '/imports/api/creature/Creatures.js';
+
+export default function writeCreatureVariables(memo, creatureId) {
+  const fields = [
+    'name',
+    'attributeType',
+    'baseValue',
+    'damage',
+    'decimal',
+    'reset',
+    'resetMultiplier',
+    'value',
+    'currentValue',
+    'modifier',
+    'ability',
+    'skillType',
+    'baseProficiency',
+    'abilityMod',
+    'advantage',
+    'passiveBonus',
+    'proficiency',
+    'conditionalBenefits',
+    'rollBonuses',
+    'fail',
+    'level',
+  ];
+
+  memo.creatureVariables = {};
+  forOwn(memo.statsByVariableName, (stat, variableName) => {
+    let condensedStat = pick(stat, fields);
+    memo.creatureVariables[variableName] = condensedStat;
+  });
+  Creatures.update(creatureId, {$set: {variables: memo.creatureVariables}});
+}

app/imports/api/creature/creatureComputation.test.js

@@ -0,0 +1,97 @@
+import {computeCreature} from "./recomputeCreature.js";
+import assert from "assert";
+
+const makeEffect = function(operation, value){
+  let effect = {computed: false, result: 0, operation}
+  if (_.isFinite(value)){
+    effect.value = +value;
+  } else {
+    effect.calculation = value;
+  }
+  return effect;
+}
+
+describe('computeCreature', function () {
+  it('computes an aritrary creature', function () {
+    let char = {
+      atts: {
+        attribute1: {
+          computed: false,
+          busyComputing: false,
+          type: "attribute",
+          attributeType: "ability",
+          result: 0,
+          mod: 0, // The resulting modifier if this is an ability
+          base: 0,
+          add: 0,
+          mul: 1,
+          min: Number.NEGATIVE_INFINITY,
+          max: Number.POSITIVE_INFINITY,
+          effects: [
+            makeEffect("base", 10),
+            makeEffect("add", 5),
+            makeEffect("mul", 2),
+          ],
+        },
+        attribute2: {
+          computed: false,
+          busyComputing: false,
+          type: "attribute",
+          result: 0,
+          mod: 0, // The resulting modifier if this is an ability
+          base: 0,
+          add: 0,
+          mul: 1,
+          min: Number.NEGATIVE_INFINITY,
+          max: Number.POSITIVE_INFINITY,
+          effects: [
+            makeEffect("base", "attribute1"),
+            makeEffect("max", 2),
+          ],
+        },
+      },
+      skills: {
+        skill1: {
+          computed: false,
+          busyComputing: false,
+          type: "skill",
+          ability: "attribute1",
+          result: 0,
+          proficiency: 0,
+          add: 0,
+          mul: 1,
+          min: Number.NEGATIVE_INFINITY,
+          max: Number.POSITIVE_INFINITY,
+          advantage: 0,
+          disadvantage: 0,
+          passiveAdd: 0,
+          fail: 0,
+          conditional: 0,
+          effects: [],
+          proficiencies: [],
+        },
+      },
+      dms: {
+        dm1: {
+          computed: false,
+          busyComputing: false,
+          type: "damageMultiplier",
+          result: 0,
+          immunityCount: 0,
+          ressistanceCount: 0,
+          vulnerabilityCount: 0,
+          effects: [],
+        }
+      },
+      classes: {
+        Barbarian: {
+          level: 5,
+        },
+      },
+      level: 5,
+    };
+    char = computeCreature(char);
+    console.log(char);
+    assert(true);
+  });
+});

app/imports/api/creature/creaturePermissions.js

@@ -0,0 +1,29 @@
+import Creatures from '/imports/api/creature/Creatures.js';
+import {
+  assertEditPermission as editPermission,
+  assertViewPermission as viewPermission,
+  assertOwnership as ownership
+} from '/imports/api/sharing/sharingPermissions.js';
+
+function getCreature(creature, fields){
+  if (typeof creature === 'string'){
+    return Creatures.findOne(creature, {fields});
+  } else {
+    return creature;
+  }
+}
+
+export function assertOwnership(creature, userId){
+  creature = getCreature(creature, {owner: 1});
+  ownership(creature, userId);
+}
+
+export function assertEditPermission(creature, userId) {
+  creature = getCreature(creature, {owner: 1, writers: 1});
+  editPermission(creature, userId);
+}
+
+export function assertViewPermission(creature, userId) {
+  creature = getCreature(creature, {owner: 1, writers: 1, public: 1});
+  viewPermission(creature, userId);
+}

app/imports/api/creature/damageMultiplierDenormalise/recomputeDamageMultipliers.js

@@ -0,0 +1,67 @@
+import { ValidatedMethod } from 'meteor/mdg:validated-method';
+import SimpleSchema from 'simpl-schema';
+import { assertEditPermission } from '/imports/api/creature/creaturePermissions.js';
+import Creatures from '/imports/api/creature/Creatures.js';
+import getActiveProperties from '/imports/api/creature/getActiveProperties.js';
+
+export const recomputeDamageMultipliers = new ValidatedMethod({
+
+  name: 'Creatures.methods.recomputeDamageMultipliers',
+
+  validate: new SimpleSchema({
+    creatureId: { type: String }
+  }).validator(),
+
+  run({creatureId}) {
+    // Permission
+    assertEditPermission(creatureId, this.userId);
+    // Work, call this direcly if you are already in a method that has checked
+    // for permission to edit a given character
+    recomputeDamageMultipliersById(creatureId);
+  },
+
+});
+
+export function recomputeDamageMultipliersById(creatureId){
+  if (!creatureId) throw 'Creature ID is required';
+  let props = getActiveProperties({
+    ancestorId: creatureId,
+    filter: {type: 'damageMultiplier'},
+  });
+
+  // Count of how many weakness, resistances and immunities each damage type has
+  let multipliersByName = {};
+  props.forEach(dm => {
+    dm.damageTypes.forEach(damageType => {
+      if (!multipliersByName[damageType]){
+        multipliersByName[damageType] = {
+          weaknesses: 0,
+          resistances: 0,
+          immunities: 0,
+        };
+      }
+      if (dm.value === 0){
+        multipliersByName[damageType].immunities++;
+      } else if (dm.value === 0.5){
+        multipliersByName[damageType].resistances++;
+      } else if (dm.value === 2){
+        multipliersByName[damageType].weaknesses++;
+      }
+    });
+  });
+  // Make an Object with keys of all the damage types that have a resulting
+  // immunity, weakness, or resistance
+  let damageMultipliers = {};
+  for (let damageType in multipliersByName){
+    let multiplier = multipliersByName[damageType];
+    if (multiplier.immunities){
+      damageMultipliers[damageType] = 0;
+    } else if (multiplier.resistances && !multiplier.weaknesses){
+      damageMultipliers[damageType] = 0.5;
+    } else if (multiplier.weaknesses && !multiplier.resistances){
+      damageMultipliers[damageType] = 2;
+    }
+  }
+  // Store the Object on the creature document
+  Creatures.update(creatureId, {$set: {damageMultipliers}});
+}

app/imports/api/creature/getActiveProperties.js

@@ -0,0 +1,61 @@
+import Creatures from '/imports/api/creature/Creatures.js';
+import CreatureProperties from '/imports/api/creature/CreatureProperties.js';
+
+export default function getActiveProperties({
+  ancestorId,
+  filter = {},
+  options,
+  includeUntoggled = false
+}){
+  filter = getActivePropertyFilter({ancestorId, filter, includeUntoggled});
+  return CreatureProperties.find(filter, options).fetch();
+}
+
+export function getActivePropertyFilter({
+  ancestorId,
+  filter = {},
+  includeUntoggled = false
+}){
+  if (!ancestorId){
+    throw 'Ancestor Id is required to get active properties'
+  }
+  // First get ids of disabled properties, unequiped items, unapplied buffs
+  let disabledAncestorsFilter = {
+    'ancestors.id': ancestorId,
+    $or: [
+      {disabled: true}, // Everything can be disabled
+      {equipped: false}, // Items can be equipped
+      {applied: false}, // Buffs can be applied
+    ],
+  };
+  if (!includeUntoggled){
+    disabledAncestorsFilter.$or.push({toggleResult: false});
+  }
+  let disabledAncestorIds = CreatureProperties.find(disabledAncestorsFilter, {
+    fields: {_id: 1},
+  }).map(prop => prop._id);
+
+  // Then get the ids of creatures that are children of this creature
+  // to isolate their decendent properties
+  Creatures.find({
+    'ancestors.id': ancestorId,
+  }, {
+    fields: {_id: 1},
+  }).forEach(subCreature => {
+    disabledAncestorIds.push(subCreature._id);
+  });
+
+  // Get all the properties that are decendents of the ancestor of interest but
+  // aren't from the excluded decendents
+  filter['ancestors.id'] = {
+    $eq: ancestorId,
+    $nin: disabledAncestorIds,
+  };
+  // Get properties that aren't removed
+  filter.removed = {$ne: true};
+  // Don't include the disabled ancestors themselves either
+  filter._id = {
+    $nin: disabledAncestorIds,
+  }
+  return filter;
+}

app/imports/api/creature/mixins/creaturePermissionMixin.js

@@ -0,0 +1,52 @@
+import {
+  assertEditPermission,
+  assertViewPermission,
+  assertOwnership,
+} from '/imports/api/creature/creaturePermissions.js';
+
+// Checks if the method has permission to run on the document. If the document
+// has a charId, that creature is checked, otherwise if it has an _id and the
+// collection is defined in the method options, that document is fetched to
+// determine its charId, otherwise a getCharId method can be defined to perform
+// a special search for the required creature
+//
+// Because this mixin injects the charId into argument objects that don't
+// already contain it, it should always come last in the mixin list, so that it
+// the outermost wrapper of the run function
+export default function creaturePermissionMixin(methodOptions){
+  let assertPermission;
+  if (methodOptions.permission === 'owner'){
+    assertPermission = assertOwnership;
+  } else if (methodOptions.permission === 'edit'){
+    assertPermission = assertEditPermission;
+  } else if (methodOptions.permission === 'view'){
+    assertPermission = assertViewPermission;
+  } else {
+    throw "`permission` missing in method options";
+  }
+
+  let getCharId;
+  if (methodOptions.getCharId){
+    getCharId = methodOptions.getCharId;
+  } else if (methodOptions.collection) {
+    getCharId = function({_id}){
+      return methodOptions.collection.findOne(_id, {
+        fields: {charId: 1}
+      }).charId;
+    };
+  } else {
+    getCharId = function(){
+      throw "`getCharId` or `collection` missing in method options," +
+      " or {charId} missing in call";
+    };
+  }
+
+  let runFunc = methodOptions.run;
+  methodOptions.run = function(doc, ...rest){
+    // Store the charId on the doc for other mixins if it had to be fetched
+    doc.charId = doc.charId || getCharId.apply(this, arguments);
+    assertPermission(doc.charId, this.userId);
+    return runFunc.call(this, doc, ...rest);
+  };
+  return methodOptions;
+}

app/imports/api/creature/mixins/propagateInheritanceUpdateMixin.js

@@ -0,0 +1,59 @@
+import {
+  updateChildren,
+  updateDescendants,
+} from '/imports/api/parenting/parenting.js';
+import { inheritedFields } from '/imports/api/parenting/ChildSchema.js';
+import MONGO_OPERATORS from '/imports/constants/MONGO_OPERATORS.js';
+
+// This mixin can be safely applied to all update methods which are validated
+// with the updateSchemaMixin. It will propagate updates to fields which
+// are inherited and normalised on the parent or ancestor docs
+// It should have neglible performance impact for updates that aren't inherited
+function propagateInheritanceUpdate({_id, update}){
+  let childModifier = {};
+  let descendantModifier = {};
+  // For each operator
+  for (let operator of MONGO_OPERATORS){
+    // If the operator is in the update, for each field
+    if (update[operator]) for (let field in update[operator]){
+      // Get the top level field that was actually modified
+      const indexOfDot = field.indexOf('.');
+      let modifiedField;
+      if (indexOfDot !== -1) {
+        modifiedField = field.substring(0, indexOfDot);
+      } else {
+        modifiedField = field;
+      }
+      // If that field is updated and inherited
+      if (inheritedFields.has(modifiedField)){
+        // Perform the same update on the descendants
+        if (!childModifier[operator]) childModifier[operator] = {};
+        if (!descendantModifier[operator]) descendantModifier[operator] = {};
+        childModifier[operator][`parent.${field}`] = update[operator][field];
+        descendantModifier[operator][`ancestors.$.${field}`] = update[operator][field];
+      }
+    }
+  }
+
+  // Update the parent object of its children
+  updateChildren({
+    parentId: _id,
+    modifier: childModifier,
+  });
+
+  // Update the ancestors object of its descendants
+  updateDescendants({
+    ancestorId: _id,
+    modifier: descendantModifier,
+  });
+}
+
+export default function propagateInheritanceUpdateMixin(methodOptions){
+  let runFunc = methodOptions.run;
+  methodOptions.run = function({_id, update}){
+    const result = runFunc.apply(this, arguments);
+    propagateInheritanceUpdate({_id, update});
+    return result;
+  };
+  return methodOptions;
+}

app/imports/api/creature/mixins/recomputeCreatureMixin.js

@@ -0,0 +1,17 @@
+import { recomputeCreatureById } from '/imports/api/creature/computation/recomputeCreature.js';
+
+export default function recomputeCreatureMixin(methodOptions){
+  let runFunc = methodOptions.run;
+  methodOptions.run = function({charId}){
+    const result = runFunc.apply(this, arguments);
+    if (
+      methodOptions.skipRecompute &&
+      methodOptions.skipRecompute.apply(this, arguments)
+    ) {
+      return result;
+    }
+    recomputeCreatureById(charId);
+    return result;
+  };
+  return methodOptions;
+}

app/imports/api/creature/mixins/setDocToLastMixin.js

@@ -0,0 +1,27 @@
+import SimpleSchema from 'simpl-schema';
+import { setDocToLastOrder } from '/imports/api/parenting/order.js';
+
+export function setDocToLastMixin(methodOptions){
+  // Make sure the doc has a charId
+  // This mixin should come before simpleSchemaMixin so that it can extend the
+  // schema before it is turned into a validate function
+  if (methodOptions.validate){
+    throw new Meteor.Error(`setDocToLastMixin should come before simpleSchemaMixin`);
+  }
+  methodOptions.schema = new SimpleSchema({
+    charId: {
+      type: String,
+      regEx: SimpleSchema.RegEx.Id,
+    },
+  }).extend(methodOptions.schema);
+  let collection = methodOptions.collection;
+  if (!collection){
+    throw new Meteor.Error("`collection` required in method options for setDocToLastMixin");
+  }
+  let runFunc = methodOptions.run;
+  methodOptions.run = function(doc){
+    setDocToLastOrder({collection, doc});
+    return runFunc.apply(this, arguments);
+  };
+  return methodOptions;
+}

app/imports/api/creature/mixins/simpleSchemaMixin.js

@@ -0,0 +1,51 @@
+// Copied from https://github.com/sethjgore/meteor-simple-schema-mixin
+// and updated to simpl-schema npm package
+import SimpleSchema from 'simpl-schema';
+
+export default function simpleSchemaMixin(methodOptions) {
+  // If the user didn't give us a schema and they did give us a validate, assume
+  // that they are choosing to use the validate way of doing things in this call.
+  //  If they've built a wrapper around ValidateMethod that includes this mixin
+  // all the time, this could happen semi-"intentionally". There may be times they
+  // just don't want to use a schema and have specified a "validate" option. So
+  // returning the unchanged options instead of an error seems proper.
+  if ((typeof methodOptions.schema === 'undefined'
+      && typeof methodOptions.validate !== 'undefined')
+    || (typeof methodOptions.schema !== 'undefined' && methodOptions.schema === null
+      && typeof methodOptions.validate !== 'undefined' && methodOptions.validate !== null)) {
+    return methodOptions;
+  }
+
+  // If they truly gave us both... that just doesn't seem proper.
+  if (methodOptions.validate && methodOptions.validate !== null) {
+    throw new Meteor.Error(
+      'simpleSchemaMixin.options',
+      '"schema" and "validate" options cannot be used together');
+  }
+
+  // Note that setting them both null will make it through, defaulting to the
+  // schema = null behavior (enforce no args) instead of the validate = null
+  // behavior (do no validation).
+
+  const newOptions = methodOptions;
+  newOptions.schemaValidatorOptions =
+    newOptions.schemaValidatorOptions ||
+    { clean: true, filter: false };
+  let simpleSchema;
+  if (!newOptions.schema || newOptions.schema === null) {
+    // Allow simply leaving off both the schema and validate specifications
+    // or setting them to "null" as a shorthand. In this case, unlike
+    // the straight default validate or typical coder's call to validator,
+    // we will ENFORCE the Method be called without parameters because of
+    // the "filter: false" above.
+    simpleSchema = new SimpleSchema({});
+  } else if (newOptions.schema instanceof SimpleSchema) {
+    // In this one case, we can save ourselves the time to make a schema out
+    // of the schema.
+    simpleSchema = newOptions.schema;
+  } else {
+    simpleSchema = new SimpleSchema(newOptions.schema);
+  }
+  newOptions.validate = simpleSchema.validator(newOptions.schemaValidatorOptions);
+  return newOptions;
+};

app/imports/api/creature/mixins/updateSchemaMixin.js

@@ -0,0 +1,67 @@
+const argumentSchema = new SimpleSchema({
+  _id: SimpleSchema.RegEx.Id,
+  update: {
+    type: Object,
+    blackbox: true,
+  },
+});
+
+// Modified simpleSchemaMixin
+import SimpleSchema from 'simpl-schema';
+
+export default function updateSchemaMixin(methodOptions) {
+  // If the user didn't give us a schema and they did give us a validate, assume
+  // that they are choosing to use the validate way of doing things in this call.
+  if ((
+    typeof methodOptions.schema === 'undefined' &&
+    typeof methodOptions.validate !== 'undefined'
+  ) || (
+    typeof methodOptions.schema !== 'undefined' &&
+    methodOptions.schema === null &&
+    typeof methodOptions.validate !== 'undefined' &&
+    methodOptions.validate !== null
+  )) {
+    return methodOptions;
+  }
+
+  // If they truly gave us both... that just doesn't seem proper.
+  if (methodOptions.validate && methodOptions.validate !== null) {
+    throw new Meteor.Error(
+      'simpleSchemaMixin.options',
+      '"schema" and "validate" options cannot be used together');
+  }
+
+  // Note that setting them both null will make it through, defaulting to the
+  // schema = null behavior (enforce no args) instead of the validate = null
+  // behavior (do no validation).
+
+  // Apply default validator options if none are provided
+  methodOptions.schemaValidatorOptions =
+    methodOptions.schemaValidatorOptions ||
+    { clean: true, modifier: true };
+
+  // Make the update schema a SimpleSchema, if it isn't already
+  let updateSchema;
+  if (methodOptions.schema instanceof SimpleSchema) {
+    updateSchema = methodOptions.schema;
+  } else {
+    updateSchema = new SimpleSchema(methodOptions.schema);
+  }
+
+  // Set up the new validation
+  methodOptions.validate = function(args){
+    argumentSchema.validate(args);
+    updateSchema.validate(
+      {$set: args.update},
+      methodOptions.schemaValidatorOptions
+    );
+  };
+
+  // Give a default run function if one isn't supplied
+  if (!methodOptions.run){
+    methodOptions.run = function({_id, update}){
+      return methodOptions.collection.update(_id, {$set: update});
+    };
+  }
+  return methodOptions;
+}

app/imports/api/creature/removeCreature.js

@@ -0,0 +1,26 @@
+import SimpleSchema from 'simpl-schema';
+import Creatures from '/imports/api/creature/Creatures.js';
+import CreatureProperties from '/imports/api/creature/CreatureProperties.js'
+import { assertOwnership } from '/imports/api/creature/creaturePermissions.js';
+
+function removeRelatedDocuments(charId){
+  CreatureProperties.remove({'ancestors.id': charId});
+};
+
+const removeCreature = new ValidatedMethod({
+  name: "Creatures.methods.removeCreature", // DDP method name
+  validate: new SimpleSchema({
+    charId: {
+      type: String,
+      regEx: SimpleSchema.RegEx.Id,
+    },
+  }).validator(),
+  run({charId}) {
+    assertOwnership(charId, this.userId)
+    Creatures.remove(charId);
+		this.unblock();
+		removeRelatedDocuments(charId);
+  },
+});
+
+export default removeCreature;

app/imports/api/creature/restCreature.js

@@ -0,0 +1,106 @@
+import SimpleSchema from 'simpl-schema';
+import { ValidatedMethod } from 'meteor/mdg:validated-method';
+import Creatures from '/imports/api/creature/Creatures.js';
+import CreatureProperties from '/imports/api/creature/CreatureProperties.js';
+import getActiveProperties, { getActivePropertyFilter } from '/imports/api/creature/getActiveProperties.js';
+import { assertEditPermission } from '/imports/api/creature/creaturePermissions.js';
+import { recomputeCreatureById } from '/imports/api/creature/computation/recomputeCreature.js';
+
+const restCreature = new ValidatedMethod({
+  name: 'creature.methods.longRest',
+  validate: new SimpleSchema({
+    creatureId: {
+      type: String,
+      regEx: SimpleSchema.RegEx.Id,
+    },
+    restType: {
+      type: String,
+      allowedValues: ['shortRest', 'longRest'],
+    },
+  }).validator(),
+  run({creatureId, restType}) {
+    let creature = Creatures.findOne(creatureId, {
+      fields: {
+        owner: 1,
+        writers: 1,
+        settings: 1,
+      }
+    }) ;
+    // Need edit permissions
+    assertEditPermission(creature, this.userId);
+
+    // Long rests reset short rest properties as well
+    let resetFilter;
+    if (restType === 'shortRest'){
+      resetFilter = 'shortRest'
+    } else {
+      resetFilter = {$in: ['shortRest', 'longRest']}
+    }
+    // Only apply to active properties
+    let filter = getActivePropertyFilter({
+      filter: {reset: resetFilter},
+      ancestorId: creatureId,
+      includeUntoggled: true,
+    });
+    // update all attribute's damage
+    filter.type = 'attribute';
+    CreatureProperties.update(filter, {
+      $set: {damage: 0}
+    }, {
+      selector: {type: 'attribute'},
+      multi: true,
+    });
+    // Update all action-like properties' usesUsed
+    filter.type = {$in: [
+      'action',
+      'attack',
+      'spell'
+    ]};
+    CreatureProperties.update(filter, {
+      $set: {usesUsed: 0}
+    }, {
+      selector: {type: 'action'},
+      multi: true,
+    });
+    // Reset half hit dice on a long rest, starting with the highest dice
+    if (restType === 'longRest'){
+      let hitDice = getActiveProperties({
+        ancestorId: creatureId,
+        filter: {type: 'attribute', attributeType: 'hitDice'},
+        options: {fields: {
+          hitDiceSize: 1,
+          damage: 1,
+          value: 1,
+        }},
+      });
+      // Use a collator to do sorting in natural order
+      let collator = new Intl.Collator('en', {
+        numeric: true, sensitivity: 'base'
+      });
+      // Get the hit dice in decending order of hitDiceSize
+      let compare = (a, b) => collator.compare(b.hitDiceSize, a.hitDiceSize)
+      hitDice.sort(compare);
+      // Get the total number of hit dice that can be recovered this rest
+      let totalHd = hitDice.reduce((sum, hd) => sum + (hd.value || 0), 0);
+      let resetMultiplier = creature.settings.hitDiceResetMultiplier || 0.5;
+      let recoverableHd = Math.max(Math.floor(totalHd*resetMultiplier), 1);
+      // recover each hit dice in turn until the recoverable amount is used up
+      let amountToRecover, resultingDamage;
+      hitDice.forEach(hd => {
+        if (!recoverableHd) return;
+        amountToRecover = Math.min(recoverableHd, hd.damage || 0);
+        if (!amountToRecover) return;
+        recoverableHd -= amountToRecover;
+        resultingDamage = hd.damage - amountToRecover;
+        CreatureProperties.update(hd._id, {
+          $set: {damage: resultingDamage}
+        }, {
+          selector: {type: 'attribute'},
+        });
+      });
+    }
+    recomputeCreatureById(creatureId);
+  },
+});
+
+export default restCreature;

app/imports/api/getModifierFields.js

@@ -0,0 +1,28 @@
+import MONGO_OPERATORS from '/imports/constants/MONGO_OPERATORS.js';
+
+const hasAny = function(values){
+  for (let value of values){
+    if (this.has(value)){
+      return true;
+    }
+  }
+  return false;
+};
+
+// Returns a Set of fields the modifier changes
+// The set has been extended with the "hasAny" function
+export default function getModifierFields (modifier) {
+  let fields = new Set();
+
+  for (let operator of MONGO_OPERATORS){
+    if (modifier[operator]) for (let field in modifier[operator]){
+      const indexOfDot = field.indexOf('.');
+      if (indexOfDot !== -1) {
+        field = field.substring(0, indexOfDot);
+      }
+      fields.add(field);
+    }
+  }
+  fields.hasAny = hasAny;
+  return fields;
+}

app/imports/api/icons/Icons.js

@@ -0,0 +1,91 @@
+import SimpleSchema from 'simpl-schema';
+import { ValidatedMethod } from 'meteor/mdg:validated-method';
+import { assertAdmin } from '/imports/api/sharing/sharingPermissions.js';
+
+let Icons = new Mongo.Collection('icons');
+
+let iconsSchema = new SimpleSchema({
+	name: {
+		type: String,
+    unique: true,
+    index: 1,
+	},
+	description: {
+		type: String,
+		optional: true,
+	},
+  tags: {
+    type: Array,
+    optional: true,
+    index: 1,
+  },
+  'tags.$': {
+    type: String,
+  },
+  shape: {
+    type: String,
+  },
+});
+
+if (Meteor.isServer) {
+  Icons._ensureIndex({
+    'name': 'text',
+    'description': 'text',
+		'tags': 'text',
+  });
+}
+
+const storedIconsSchema = new SimpleSchema({
+  name: {
+    type: String,
+  },
+  shape: {
+    type: String,
+  },
+});
+
+Icons.attachSchema(iconsSchema);
+
+// This method does not validate icons against the schema, use wisely;
+const writeIcons = new ValidatedMethod({
+	name: 'icons.methods.write',
+	validate: null,
+	run(icons){
+    assertAdmin(this.userId);
+    if (Meteor.isServer){
+      this.unblock();
+      Icons.rawCollection().insert(icons, {ordered: false});
+    }
+	}
+});
+
+const findIcons = new ValidatedMethod({
+  name: 'icons.methods.find',
+  validate: new SimpleSchema({
+    search: {
+      type: String,
+      max: 30,
+      optional: true,
+    },
+  }).validator(),
+  run({search}){
+    if (!search) return [];
+    if (!Meteor.isServer) return;
+    return Icons.find(
+      { $text: {$search: search} },
+      {
+        // relevant documents have a higher score.
+        fields: {
+          score: { $meta: 'textScore' }
+        },
+        // `score` property specified in the projection fields above.
+        sort: {
+          score: { $meta: 'textScore' }
+        }
+      }
+    ).fetch();
+  }
+})
+
+export { writeIcons, findIcons, storedIconsSchema };
+export default Icons;

app/imports/api/library/Libraries.js

@@ -0,0 +1,111 @@
+import { ValidatedMethod } from 'meteor/mdg:validated-method';
+import SimpleSchema from 'simpl-schema';
+import SharingSchema from '/imports/api/sharing/SharingSchema.js';
+import simpleSchemaMixin from '/imports/api/creature/mixins/simpleSchemaMixin.js';
+import { assertEditPermission, assertOwnership } from '/imports/api/sharing/sharingPermissions.js';
+import LibraryNodes from '/imports/api/library/LibraryNodes.js';
+import { getUserTier } from '/imports/api/users/patreon/tiers.js'
+
+/**
+ * Libraries are trees of library nodes where each node represents a character
+ * property.
+ *
+ * Libraries can be shared, have multiple readers and writers, and can be
+ * subscribed to.
+ *
+ * Permissions to library nodes are controlled by the libraries they belong to.
+ */
+let Libraries = new Mongo.Collection('libraries');
+
+let LibrarySchema = new SimpleSchema({
+	name: {
+    type: String,
+  },
+	isDefault: {
+		type: Boolean,
+		optional: true,
+	},
+});
+
+LibrarySchema.extend(SharingSchema);
+
+Libraries.attachSchema(LibrarySchema);
+
+export default Libraries;
+
+const insertLibrary = new ValidatedMethod({
+  name: 'Libraries.methods.insert',
+	mixins: [
+		simpleSchemaMixin,
+  ],
+  schema: LibrarySchema.omit('owner', 'isDefault'),
+  run(library) {
+    if (!this.userId) {
+      throw new Meteor.Error('Libraries.methods.insert.denied',
+      'You need to be logged in to insert a library');
+    }
+    let tier = getUserTier(this.userId);
+    if (!tier.paidBenefits){
+      throw new Meteor.Error('Libraries.methods.insert.denied',
+      `The ${tier.name} tier does not allow you to insert a library`);
+    }
+    library.owner = this.userId;
+		return Libraries.insert(library);
+  },
+});
+
+const updateLibraryName = new ValidatedMethod({
+	name: 'Libraries.methods.updateName',
+	validate: new SimpleSchema({
+		_id: {
+			type: String,
+			regEx: SimpleSchema.RegEx.id
+		},
+		name: {
+			type: String,
+		},
+	}).validator(),
+	run({_id, name}){
+		let library = Libraries.findOne(_id);
+		assertEditPermission(library, this.userId);
+		Libraries.update(_id, {$set: {name}});
+	},
+});
+
+const setLibraryDefault = new ValidatedMethod({
+  name: 'Libraries.methods.makeLibraryDefault',
+	validate: new SimpleSchema({
+		_id: {
+			type: String,
+			regEx: SimpleSchema.RegEx.id
+		},
+		isDefault: {
+			type: Boolean,
+		},
+	}).validator(),
+  run({_id, isDefault}) {
+		if (!Meteor.users.isAdmin()){
+			throw new Meteor.Error('Permission denied', 'User must be admin to set libraries as default');
+		}
+		return Libraries.update(_id, {$set: {isDefault}});
+  },
+});
+
+const removeLibrary = new ValidatedMethod({
+	name: 'Libraries.methods.remove',
+	validate: new SimpleSchema({
+		_id: {
+			type: String,
+			regEx: SimpleSchema.RegEx.id
+		},
+	}).validator(),
+	run({_id}){
+		let library = Libraries.findOne(_id);
+		assertOwnership(library, this.userId);
+		Libraries.remove(_id);
+		this.unblock();
+		LibraryNodes.remove({'ancestors.id': _id});
+	}
+})
+
+export { LibrarySchema, insertLibrary, setLibraryDefault, updateLibraryName, removeLibrary };

app/imports/api/library/LibraryNodes.js

@@ -0,0 +1,164 @@
+import { Meteor } from 'meteor/meteor';
+import { Mongo } from 'meteor/mongo';
+import { ValidatedMethod } from 'meteor/mdg:validated-method';
+import SimpleSchema from 'simpl-schema';
+import ColorSchema from '/imports/api/properties/subSchemas/ColorSchema.js';
+import ChildSchema from '/imports/api/parenting/ChildSchema.js';
+import propertySchemasIndex from '/imports/api/properties/propertySchemasIndex.js';
+import Libraries from '/imports/api/library/Libraries.js';
+import { assertEditPermission } from '/imports/api/sharing/sharingPermissions.js';
+import { softRemove } from '/imports/api/parenting/softRemove.js';
+import SoftRemovableSchema from '/imports/api/parenting/SoftRemovableSchema.js';
+import { storedIconsSchema } from '/imports/api/icons/Icons.js';
+
+let LibraryNodes = new Mongo.Collection('libraryNodes');
+
+let LibraryNodeSchema = new SimpleSchema({
+	type: {
+    type: String,
+    allowedValues: Object.keys(propertySchemasIndex),
+  },
+	tags: {
+		type: Array,
+		defaultValue: [],
+	},
+	'tags.$': {
+		type: String,
+	},
+  icon: {
+    type: storedIconsSchema,
+    optional: true,
+  }
+});
+
+for (let key in propertySchemasIndex){
+	let schema = new SimpleSchema({});
+	schema.extend(LibraryNodeSchema);
+  schema.extend(ColorSchema);
+	schema.extend(propertySchemasIndex[key]);
+	schema.extend(ChildSchema);
+	schema.extend(SoftRemovableSchema);
+	LibraryNodes.attachSchema(schema, {
+		selector: {type: key}
+	});
+}
+
+function getLibrary(node){
+  if (!node) throw new Meteor.Error('No node provided');
+  let library = Libraries.findOne(node.ancestors[0].id);
+  if (!library) throw new Meteor.Error('Library does not exist');
+  return library;
+}
+
+function assertNodeEditPermission(node, userId){
+  let lib = getLibrary(node);
+  return assertEditPermission(lib, userId);
+}
+
+const insertNode = new ValidatedMethod({
+  name: 'LibraryNodes.methods.insert',
+	validate: null,
+  run(libraryNode) {
+    delete libraryNode._id;
+    assertNodeEditPermission(libraryNode, this.userId);
+		return LibraryNodes.insert(libraryNode);
+  },
+});
+
+const duplicateNode = new ValidatedMethod({
+  name: 'LibraryNodes.methods.duplicate',
+	validate: new SimpleSchema({
+    _id: {
+      type: String,
+      regEx: SimpleSchema.RegEx.Id,
+    }
+  }).validator(),
+  run({_id}) {
+    let libraryNode = LibraryNodes.findOne(_id);
+    assertNodeEditPermission(libraryNode, this.userId);
+    delete libraryNode._id;
+		return LibraryNodes.insert(libraryNode);
+  },
+})
+
+const updateLibraryNode = new ValidatedMethod({
+  name: 'LibraryNodes.methods.update',
+  validate({_id, path}){
+		if (!_id) return false;
+		// We cannot change these fields with a simple update
+		switch (path[0]){
+			case 'type':
+      case 'order':
+      case 'parent':
+      case 'ancestors':
+				return false;
+		}
+  },
+  run({_id, path, value}) {
+    let node = LibraryNodes.findOne(_id);
+    assertNodeEditPermission(node, this.userId);
+    let pathString = path.join('.');
+    let modifier;
+    // unset empty values
+    if (value === null || value === undefined){
+      modifier = {$unset: {[pathString]: 1}};
+    } else {
+      modifier = {$set: {[pathString]: value}};
+    }
+		return LibraryNodes.update(_id, modifier, {
+			selector: {type: node.type},
+		});
+  },
+});
+
+const pushToLibraryNode = new ValidatedMethod({
+	name: 'LibraryNodes.methods.push',
+	validate: null,
+	run({_id, path, value}){
+		let node = LibraryNodes.findOne(_id);
+    assertNodeEditPermission(node, this.userId);
+		return LibraryNodes.update(_id, {
+			$push: {[path.join('.')]: value},
+		}, {
+			selector: {type: node.type},
+		});
+	}
+});
+
+const pullFromLibraryNode = new ValidatedMethod({
+	name: 'LibraryNodes.methods.pull',
+	validate: null,
+	run({_id, path, itemId}){
+		let node = LibraryNodes.findOne(_id);
+    assertNodeEditPermission(node, this.userId);
+		return LibraryNodes.update(_id, {
+			$pull: {[path.join('.')]: {_id: itemId}},
+		}, {
+			selector: {type: node.type},
+			getAutoValues: false,
+		});
+	}
+});
+
+const softRemoveLibraryNode = new ValidatedMethod({
+	name: 'LibraryNodes.methods.softRemove',
+	validate: new SimpleSchema({
+		_id: SimpleSchema.RegEx.Id
+	}).validator(),
+	run({_id}){
+		let node = LibraryNodes.findOne(_id);
+    assertNodeEditPermission(node, this.userId);
+		softRemove({_id, collection: LibraryNodes});
+	}
+});
+
+export default LibraryNodes;
+export {
+	LibraryNodeSchema,
+	insertNode,
+  duplicateNode,
+	updateLibraryNode,
+	pullFromLibraryNode,
+	pushToLibraryNode,
+	softRemoveLibraryNode,
+};

app/imports/api/meta/Blacklist.js

@@ -0,0 +1,11 @@
+import SimpleSchema from 'simpl-schema';
+
+Blacklist = new Mongo.Collection("blacklist");
+
+Schemas.Blacklist = new SimpleSchema({
+	userId: {
+		type: String,
+	},
+});
+
+Blacklist.attachSchema(Schemas.Blacklist);

app/imports/api/meta/ChangeLogs.js

@@ -1,3 +1,5 @@
+import SimpleSchema from 'simpl-schema';
+
 ChangeLogs = new Mongo.Collection("changeLogs");
 
 Schemas.ChangeLog = new SimpleSchema({

app/imports/api/meta/Reports.js

@@ -1,3 +1,5 @@
+import SimpleSchema from 'simpl-schema';
+
 Reports = new Mongo.Collection("reports");
 
 Schemas.Report = new SimpleSchema({
@@ -22,7 +24,7 @@ Schemas.Report = new SimpleSchema({
 	},
 	//the immediate impact of doing this action (eg. -1 rages)
 	severity: {
-		type: Number,
+		type: SimpleSchema.Integer,
 		defaultValue: 5,
 		min: 1,
 		max: 10,

app/imports/api/parenting/ChildSchema.js

@@ -0,0 +1,33 @@
+import SimpleSchema from 'simpl-schema';
+
+const RefSchema = new SimpleSchema({
+  id: {
+    type: String,
+    regEx: SimpleSchema.RegEx.Id,
+    index: 1
+  },
+  collection: {
+    type: String
+  },
+});
+
+let ChildSchema = new SimpleSchema({
+  order: {
+    type: Number,
+  },
+	parent: {
+    type: RefSchema,
+    optional: true,
+  },
+  ancestors: {
+    type: Array,
+    defaultValue: [],
+    max: 100,
+  },
+  'ancestors.$': {
+    type: RefSchema,
+  },
+});
+
+export default ChildSchema;
+export { RefSchema };

app/imports/api/parenting/SoftRemovableSchema.js

@@ -0,0 +1,22 @@
+import SimpleSchema from 'simpl-schema';
+
+let SoftRemovableSchema = new SimpleSchema({
+	"removed": {
+    type: Boolean,
+    optional: true,
+    index: 1,
+  },
+  "removedAt": {
+    type: Date,
+    optional: true,
+    index: 1,
+  },
+  "removedWith": {
+    optional: true,
+    type: String,
+    regEx: SimpleSchema.RegEx.Id,
+    index: 1,
+  },
+});
+
+export default SoftRemovableSchema;

app/imports/api/parenting/deleteRemovedDocuments.js

@@ -1,26 +1,24 @@
-Meteor.startup(() => {
+import LibraryNodes from '/imports/api/library/LibraryNodes.js';
-	const collections = [
-		Attacks, Buffs, Classes, CustomBuffs, Effects, Experiences,
-		Features, Notes, Proficiencies, SpellLists, Spells,
-		Containers, Items,
-	];
 
+let collections = [LibraryNodes];
+
+if (Meteor.isServer) Meteor.startup(() => {
 	/**
 	 * Deletes all soft removed documents that were removed more than 30 minutes ago
 	 * and were not restored
-	 * @return {Number} Number of documents removed
 	 */
 	const deleteOldSoftRemovedDocs = function(){
-		let numRemoved = 0;
 		const now = new Date();
 		const thirtyMinutesAgo = new Date(now.getTime() - 30*60000);
-		_.each(collections, (collection) => {
+		collections.forEach(collection => {
-			numRemoved += collection.remove({
+			collection.remove({
 				removed: true,
 				removedAt: {$lt: thirtyMinutesAgo} // dates *before* 30 minutes ago
+			}, error => {
+				if (error) console.error(error);
 			});
 		});
-		return numRemoved;
+		return;
 	};
 
 	SyncedCron.add({

app/imports/api/parenting/fetchDocByRef.js

@@ -0,0 +1,12 @@
+import getCollectionByName from '/imports/api/parenting/getCollectionByName.js';
+
+const docNotFoundError = function({id, collection}){
+  throw new Meteor.Error('document-not-found',
+    `No document could be found with id: ${id} in ${collection}`
+  );
+};
+
+export default function fetchDocByRef({id, collection}, options){
+  return getCollectionByName(collection).findOne(id, options) ||
+    docNotFoundError({id, collection});
+}

app/imports/api/parenting/getCollectionByName.js

@@ -0,0 +1,11 @@
+const collectionDoesntExistError = function(collectionName){
+  throw new Meteor.Error('bad-collection-reference',
+    `Parent references collection ${collectionName}, which does not exist`
+  );
+};
+
+const getCollectionByName = function(name){
+  return Mongo.Collection.get(name) || collectionDoesntExistError(name);
+};
+
+export default getCollectionByName;

app/imports/api/parenting/getDescendantsInDepthFirstOrder.js

@@ -0,0 +1,27 @@
+import { nodesToTree } from '/imports/api/parenting/parenting.js';
+
+export default function getDescendantsInDepthFirstOrder({
+  collection,
+  ancestorId,
+  filter,
+  options = {fields: {order: 1, ancestors: 1}},
+}){
+  let forest = nodesToTree({collection, ancestorId, filter, options});
+  let orderMemo = getDocsInDepthFirstOrder(forest);
+  return orderMemo;
+}
+
+export function getDocsInDepthFirstOrder(forest){
+  let docs = [];
+  forest.forEach(node => {
+    addNodeAndTraverse(node, docs)
+  });
+  return docs;
+}
+
+function addNodeAndTraverse(node, docs){
+  docs.push(node.node);
+  node.children.forEach(child => {
+    addNodeAndTraverse(child, docs)
+  });
+}

app/imports/api/parenting/order.js

@@ -0,0 +1,156 @@
+import fetchDocByRef from '/imports/api/parenting/fetchDocByRef.js';
+import getCollectionByName from '/imports/api/parenting/getCollectionByName.js';
+import getDescendantsInDepthFirstOrder from '/imports/api/parenting/getDescendantsInDepthFirstOrder.js'
+
+// Docs keep track of their depth-first order amongst their entire ancestor tree
+export function compareOrder(docA, docB){
+  // < 0 if A comes before B
+  // = 0 if A and B are the same order
+  // > 0 if B comes before A
+
+  // They must share a root ancestor to be meaningfully sorted
+  if (docA.ancestors[0].id !== docB.ancestors[0].id){
+    return 0;
+  } else {
+    return docA.order - docB.order;
+  }
+}
+
+export function getHighestOrder({collection, ancestorId}){
+  const highestOrderedDoc = collection.findOne({
+    'ancestors.id': ancestorId,
+  }, {
+    fields: {order: 1},
+    sort: {order: -1},
+  });
+  return highestOrderedDoc ? highestOrderedDoc.order : -1;
+}
+
+export function setDocToLastOrder({collection, doc}){
+  doc.order = getHighestOrder({
+    collection,
+    ancestorId: doc.ancestors[0].id,
+  }) + 1;
+}
+
+// update the order of a doc, and shift the related docs around to suit the new
+// order
+function cheapUpdateDocOrder({docRef, order}){
+  let doc = fetchDocByRef(docRef, {fields: {
+    order: 1,
+    parent: 1,
+  }});
+  let collection = getCollectionByName(docRef.collection);
+  const currentOrder = doc.order;
+  if (currentOrder === order){
+    return;
+  } else {
+    // First move the documents that are in the way
+    let inBetweenSelector, increment;
+    if (order > currentOrder){
+      // Move in-between docs backward
+      inBetweenSelector = {
+        $gt: currentOrder,
+        $lte: order
+      };
+      increment = -1;
+    } else if (order < currentOrder){
+      // Move in-between docs forward
+      inBetweenSelector = {
+        $lt: currentOrder,
+        $gte: order
+      };
+      increment = 1;
+    }
+    collection.update({
+      'ancestors.id': doc.ancestors[0].id,
+      order: inBetweenSelector,
+    }, {
+      $inc: {order: increment},
+    }, {
+      multi: true,
+      selector: {type: 'any'},
+    });
+    // Then move the document itself
+    collection.update(doc._id, {$set: {order}}, {selector: {type: 'any'}});
+  }
+}
+
+export function cheapRemovedDocAtOrder({collection, doc}){
+  // Decrement the order of all docs after the removed doc
+  collection.update({
+    'ancestors.id': doc.ancestors[0].id,
+    order: {$gt: doc.order},
+  }, {
+    $inc: {order: -1},
+  }, {
+    multi: true,
+    selector: {type: 'any'},
+  });
+}
+
+export function cheapInsertedDocAtOrder({collection, ancestorId, order}){
+  // Increment the order of all docs after the inserted doc
+  collection.update({
+    'ancestors.id': ancestorId,
+    order: {$gte: order},
+  }, {
+    $inc: {order: 1},
+  }, {
+    multi: true,
+    selector: {type: 'any'},
+  });
+}
+
+// Update the order a single doc and re-order the entire related doc list
+// with the change
+export function safeUpdateDocOrder({docRef, order}){
+  let collection = getCollectionByName(docRef.collection);
+  // Put the new doc half a step in front of its new order
+  // to ensure it's in front of whichever doc was there before
+  collection.update(docRef.id, {
+    $set: {order}
+  }, {
+    selector: {type: 'any'}
+  });
+  // reorder all related docs so that order is back to being a continous
+  // set of whole numbers
+  let movedDoc = fetchDocByRef(docRef, {fields: {ancestors: 1}});
+  let ancestorId = movedDoc.ancestors[0].id;
+  reorderDocs({collection, ancestorId});
+}
+
+export function reorderDocs({collection, ancestorId}){
+  let orderedDocs = getDescendantsInDepthFirstOrder({collection, ancestorId});
+  let bulkWrite = [];
+  orderedDocs.forEach((doc, index) => {
+    if (doc.order !== index){
+      bulkWrite.push({
+        updateOne : {
+          filter: {_id: doc._id},
+          update: {$set: {order: index}},
+        },
+      });
+    }
+  });
+  if (Meteor.isServer && bulkWrite.length){
+    collection.rawCollection().bulkWrite(
+      bulkWrite,
+      {ordered : false},
+      function(e){
+        if (e) {
+          console.error('Bulk write failed: ');
+          console.error(e);
+        }
+      }
+    );
+  } else {
+    bulkWrite.forEach(op => {
+      collection.update(
+        op.updateOne.filter,
+        op.updateOne.update,
+        {selector: {type: 'any'}}
+      );
+    });
+  }
+}

app/imports/api/parenting/organizeMethods.js

@@ -0,0 +1,99 @@
+import SimpleSchema from 'simpl-schema';
+import { union } from 'lodash';
+import { ValidatedMethod } from 'meteor/mdg:validated-method';
+import { updateParent } from '/imports/api/parenting/parenting.js';
+import { reorderDocs, safeUpdateDocOrder } from '/imports/api/parenting/order.js';
+import { RefSchema } from '/imports/api/parenting/ChildSchema.js';
+import { assertDocEditPermission } from '/imports/api/sharing/sharingPermissions.js';
+import fetchDocByRef from '/imports/api/parenting/fetchDocByRef.js';
+import getCollectionByName from '/imports/api/parenting/getCollectionByName.js';
+import { recomputeCreatureById } from '/imports/api/creature/computation/recomputeCreature.js';
+
+const organizeDoc = new ValidatedMethod({
+  name: 'organize.methods.organizeDoc',
+  validate: new SimpleSchema({
+    docRef: RefSchema,
+    parentRef: RefSchema,
+    order: {
+      type: Number,
+      // Should end in 0.5 to place it reliably between two existing documents
+    },
+  }).validator(),
+  run({docRef, parentRef, order}) {
+    let doc = fetchDocByRef(docRef);
+    let collection = getCollectionByName(docRef.collection);
+    // The user must be able to edit both the doc and its parent to move it
+    // successfully
+    assertDocEditPermission(doc, this.userId);
+    let parent = fetchDocByRef(parentRef);
+    assertDocEditPermission(parent, this.userId);
+
+    // Change the doc's parent
+    updateParent({docRef, parentRef});
+    // Change the doc's order to be a half step ahead of its target location
+    collection.update(doc._id, {$set: {order}}, {selector: {type: 'any'}});
+
+    // Reorder both ancestors' documents
+    let oldAncestorId = doc.ancestors[0].id;
+    reorderDocs({collection, ancestorId: oldAncestorId});
+
+    let newAncestorId = getRootId(parent);
+    if (newAncestorId !== oldAncestorId){
+      reorderDocs({collection, ancestorId: newAncestorId});
+    }
+
+    // Figure out which creatures need to be recalculated after this move
+    let docCreatures = getCreatureAncestors(doc);
+    let parentCreatures = getCreatureAncestors(parent);
+    let creaturesToRecompute = union(docCreatures, parentCreatures);
+    // Recompute the creatures
+    creaturesToRecompute.forEach(id => {
+      recomputeCreatureById(id);
+    });
+  },
+});
+
+const reorderDoc = new ValidatedMethod({
+  name: 'organize.methods.reorderDoc',
+  validate: new SimpleSchema({
+    docRef: RefSchema,
+    order: {
+      type: Number,
+      // Should end in 0.5 to place it reliably between two existing documents
+    },
+  }).validator(),
+  run({docRef, order}) {
+    let doc = fetchDocByRef(docRef);
+    assertDocEditPermission(doc, this.userId);
+    safeUpdateDocOrder({docRef, order});
+    // Recompute the affected creatures
+    getCreatureAncestors(doc).forEach(id => {
+      recomputeCreatureById(id);
+    });
+  },
+});
+
+function getRootId(doc){
+  if (doc.ancestors && doc.ancestors.length && doc.ancestors[0]){
+    return doc.ancestors[0].id;
+  } else {
+    return doc._id;
+  }
+}
+
+function getCreatureAncestors(doc){
+  let ids = [];
+  if(doc.type === 'pc' || doc.type === 'npc' || doc.type === 'monster'){
+    ids.push(doc._id);
+  }
+  if (doc.ancestors){
+    doc.ancestors.forEach(ancestorRef => {
+      if (ancestorRef.collection === 'creatures'){
+        ids.push(ancestorRef.id);
+      }
+    });
+  }
+  return ids;
+}
+
+export { organizeDoc, reorderDoc };

app/imports/api/parenting/parenting.js

@@ -0,0 +1,240 @@
+import fetchDocByRef from '/imports/api/parenting/fetchDocByRef.js';
+import getCollectionByName from '/imports/api/parenting/getCollectionByName.js';
+import { flatten, findLast } from 'lodash';
+
+const generalParents = [
+  'attribute',
+  'buff',
+  'classLevel',
+  'feature',
+  'folder',
+  'root',
+  'item',
+  'spell',
+];
+
+// Which types are allowed as parents for other types
+const allowedParenting = {
+  folder: [...generalParents, 'container'],
+  rollResult: ['roll', 'rollResult'],
+  container: ['root', 'folder'],
+  item: ['root', 'container', 'folder'],
+};
+
+const allParentTypes = new Set(flatten(Object.values(allowedParenting)));
+
+export function canBeParent(type){
+  return true;
+  //TODO until there is a good reason to disallow certain parenting options,
+  // this should just let the user do whatever
+  return type && allParentTypes.has(type);
+}
+
+export function getAllowedParents({childType}){
+  return allowedParenting[childType] || generalParents;
+}
+
+export function isParentAllowed({parentType = 'root', childType}){
+  return true;
+  //TODO until there is a good reason to disallow certain parenting options,
+  // this should just let the user do whatever
+  if (!childType) throw 'childType is required';
+  let allowedParents = getAllowedParents({childType});
+  return allowedParents.includes(parentType);
+}
+
+export function fetchParent({id, collection}){
+  return fetchDocByRef({id, collection});
+}
+
+export function fetchChildren({ collection, parentId, filter = {}, options = {sort: {order: 1}} }){
+  filter['parent.id'] = parentId;
+  let children = [];
+  children.push(
+    ...collection.find({
+      'parent.id': parentId
+    }, options).fetch()
+  );
+  return children;
+}
+
+export function updateChildren({collection, parentId, filter = {}, modifier, options={}}){
+  filter['parent.id'] = parentId;
+  options.multi = true;
+  collection.update(filter, modifier, options);
+}
+
+export function fetchDescendants({ collection, ancestorId, filter = {}, options}){
+  filter['ancestors.id'] = ancestorId;
+  let descendants = [];
+  descendants.push(...collection.find(filter, options).fetch());
+  return descendants;
+}
+
+export function updateDescendants({collection, ancestorId, filter = {}, modifier, options={}}){
+  filter['ancestors.id'] = ancestorId;
+  options.multi = true;
+  options.selector = {type: 'any'};
+  collection.update(filter, modifier, options);
+}
+
+export function forEachDescendant({collection, ancestorId, filter = {}, options}, callback){
+  filter['ancestors.id'] = ancestorId;
+  collection.find(filter, options).forEach(callback);
+}
+
+// 1 database read
+export function getAncestry({parentRef, inheritedFields = {}}){
+  let parentDoc = fetchDocByRef(parentRef, {fields: inheritedFields});
+  let parent = { ...parentRef};
+  for (let field in inheritedFields){
+    if (inheritedFields[field]){
+      parent[field] = parentDoc[field];
+    }
+  }
+
+  // Ancestors is [...parent's ancestors, parent ref]
+  let ancestors = parentDoc.ancestors || [];
+  ancestors.push(parent);
+
+  return {parentDoc, parent, ancestors};
+}
+
+export function setLineageOfDocs({docArray, oldParent, newAncestry}){
+  //const oldParent = oldAncestry[oldAncestry.length - 1];
+  const newParent = newAncestry[newAncestry.length - 1];
+  docArray.forEach(doc => {
+    if(doc.parent.id === oldParent.id){
+      doc.parent = newParent;
+    }
+    let oldAncestors = doc.ancestors;
+    let oldParentIndex = oldAncestors.findIndex(a => a.id === oldParent.id);
+    doc.ancestors = [...newAncestry, ...oldAncestors.slice(oldParentIndex + 1)];
+  });
+}
+
+/**
+ * Give documents new random ids and transform their references.
+ * Transform collections of re-IDed docs according to the collection map
+ */
+export function renewDocIds({docArray, collectionMap}){
+  // map of {oldId: newId}
+  let idMap = {};
+  // Give new ids and map the changes
+  docArray.forEach(doc => {
+    let oldId = doc._id;
+    let newId = Random.id();
+    doc._id = newId;
+    idMap[oldId] = newId;
+  });
+  const remapReference = ref => {
+    if (idMap[ref.id]){
+      ref.id = idMap[ref.id];
+      ref.collection = collectionMap[ref.collection] || ref.collection;
+    }
+  }
+  docArray.forEach(doc => {
+    remapReference(doc.parent);
+    doc.ancestors.forEach(remapReference);
+  });
+}
+
+export function updateParent({docRef, parentRef}){
+  let collection = getCollectionByName(docRef.collection);
+  let oldDoc = fetchDocByRef(docRef, {fields: {
+    parent: 1,
+    ancestors: 1,
+    type: 1,
+  }});
+  let updateOptions = { selector: {type: 'any'} };
+
+  // Skip if we aren't changing the parent id
+  if (oldDoc.parent.id === parentRef.id) return;
+
+  // Get the parent and its ancestry
+  let {parentDoc, parent, ancestors} = getAncestry({parentRef});
+
+  // If the doc and its parent are in the same collection, apply the allowed
+  // parent rules based on type
+  if (docRef.collection === parentRef.collection){
+    let parentAllowed = isParentAllowed({
+      parentType: parentDoc.type,
+      childType: oldDoc.type
+    });
+    if (!parentAllowed){
+      throw new Meteor.Error('invalid parenting',
+        `Can't make ${oldDoc.type} a child of ${parentDoc.type}`)
+    }
+  }
+
+  // update the document's parenting
+  collection.update(docRef.id, {
+    $set: {parent, ancestors}
+  }, updateOptions);
+
+  // Remove the old ancestors from the descendants
+  updateDescendants({
+    collection,
+    ancestorId: docRef.id,
+    modifier: {$pullAll: {
+      ancestors: oldDoc.ancestors,
+    }},
+    options: updateOptions,
+  });
+
+  // Add the new ancestors to the descendants
+  updateDescendants({
+    collection,
+    ancestorId: docRef.id,
+    modifier: {$push: {
+      ancestors: {
+        $each: ancestors,
+        $position: 0,
+      },
+    }},
+    options: updateOptions,
+  });
+}
+
+export function getName(doc){
+  if (doc.name) return name;
+  var i = doc.ancestors.length;
+  while(i--) {
+    if (doc.ancestors[i].name) return doc.ancestors[i].name;
+  }
+}
+
+export function nodesToTree({collection, ancestorId, filter, options}){
+  // Store a dict of all the nodes
+  let nodeIndex = {};
+  let nodeList = [];
+  if (!options) options = {};
+  options.sort = {order: 1};
+  collection.find({
+    'ancestors.id': ancestorId,
+		removed: {$ne: true},
+    ...filter,
+  }, options).forEach( node => {
+    let treeNode = {
+      node: node,
+      children: [],
+    };
+    nodeIndex[node._id] = treeNode;
+    nodeList.push(treeNode);
+  });
+  // Create a forest of trees
+  let forest = [];
+  // Either the node is a child of its nearest found ancestor, or in the forest as a root
+  nodeList.forEach(treeNode => {
+    let ancestorInForest = findLast(
+      treeNode.node.ancestors,
+      ancestor => !!nodeIndex[ancestor.id]
+    );
+    if (ancestorInForest){
+      nodeIndex[ancestorInForest.id].children.push(treeNode);
+    } else {
+      forest.push(treeNode);
+    }
+  });
+  return forest;
+}

app/imports/api/parenting/softRemove.js

@@ -0,0 +1,64 @@
+import getCollectionByName from '/imports/api/parenting/getCollectionByName.js';
+import { updateDescendants } from '/imports/api/parenting/parenting.js';
+
+export function softRemove({_id, collection}){
+  let removalDate = new Date();
+  if (typeof collection === 'string') {
+    collection = getCollectionByName(collection);
+  }
+  // Remove this document
+  collection.update(
+    _id, {
+      $set: {
+        removed: true,
+        removedAt: removalDate,
+      },
+      $unset: {
+        removedWith: 1,
+      }
+    }, {
+      selector: {type: 'any'},
+    },
+  );
+  // Remove all the descendants that have not yet been removed, and set them to be
+  // removed with this document
+  updateDescendants({
+    collection,
+    ancestorId: _id,
+    filter: {removed: {$ne: true}},
+    modifier: {$set: {
+      removed: true,
+      removedAt: removalDate,
+      removedWith: _id,
+    }},
+  });
+}
+
+const restoreError = function(){
+  throw new Meteor.Error('restore-failed',
+    'Could not restore this document, maybe it was removed by a parent?'
+  );
+};
+
+export function restore({_id, collection}){
+  collection = getCollectionByName(collection);
+  let numUpdated = collection.update({
+    _id,
+    removedWith: {$exists: false}
+  }, { $unset: {
+    removed: 1,
+    removedAt: 1,
+  }});
+  if (numUpdated === 0) restoreError();
+  updateDescendants({
+    ancestorId: _id,
+    filter: {
+      removedWith: _id,
+    },
+    modifier: { $unset: {
+      removed: 1,
+      removedAt: 1,
+      removedWith: 1,
+    }},
+  });
+}

app/imports/api/properties/Actions.js

@@ -0,0 +1,67 @@
+import SimpleSchema from 'simpl-schema';
+import ResourcesSchema from '/imports/api/properties/subSchemas/ResourcesSchema.js'
+
+/*
+ * Actions are things a character can do
+ * Any rolls that are children of actions will be rolled when taking the action
+ * Any actions that are children of this action will be considered alternatives
+ * to this action
+ */
+let ActionSchema = new SimpleSchema({
+	name: {
+		type: String,
+		optional: true,
+	},
+	description: {
+		type: String,
+		optional: true,
+	},
+	// What time-resource is used to take the action in combat
+	// long actions take longer than 1 round to cast
+	actionType: {
+		type: String,
+		allowedValues: ['action', 'bonus', 'attack', 'reaction', 'free', 'long'],
+		defaultValue: 'action',
+	},
+	// Who is the action directed at
+	target: {
+		type: String,
+		defaultValue: 'singleTarget',
+		allowedValues: [
+      'self',
+      'singleTarget',
+			'multipleTargets',
+    ],
+	},
+  tags: {
+    type: Array,
+    defaultValue: [],
+  },
+  'tags.$': {
+    type: String,
+  },
+  resources: {
+    type: ResourcesSchema,
+    defaultValue: {},
+  },
+	// Calculation of how many times this action can be used
+	// Only set if this action tracks its own uses, rather than adjusting
+	// resources
+	uses: {
+		type: String,
+		optional: true,
+	},
+	// Integer of how many times it has already been used
+	usesUsed: {
+		type: SimpleSchema.Integer,
+		optional: true,
+	},
+	// How this action's uses are reset automatically
+	reset: {
+		type: String,
+		allowedValues: ['longRest', 'shortRest'],
+		optional: true,
+	},
+});
+
+export { ActionSchema };

app/imports/api/properties/Adjustments.js

@@ -0,0 +1,27 @@
+import SimpleSchema from 'simpl-schema';
+
+const AdjustmentSchema = new SimpleSchema({
+	// The roll that determines how much to change the attribute
+  amount: {
+    type: String,
+    optional: true,
+    defaultValue: '1',
+  },
+	// Who this adjustment applies to
+	target: {
+		type: String,
+    defaultValue: 'every',
+		allowedValues: [
+      'self',   // the character who took the action
+      'each',   // rolled once for `each` target
+      'every',  // rolled once and applied to `every` target
+    ],
+	},
+	// The stat this rolls applies to
+	stat: {
+		type: String,
+    optional: true,
+	},
+});
+
+export { AdjustmentSchema };

app/imports/api/properties/Attacks.js

@@ -0,0 +1,28 @@
+import SimpleSchema from 'simpl-schema';
+import { ActionSchema } from '/imports/api/properties/Actions.js';
+
+// Attacks are special instances of actions
+let AttackSchema = new SimpleSchema()
+  .extend(ActionSchema)
+  .extend({
+    // What gets added to the d20 roll
+    rollBonus: {
+      type: String,
+      defaultValue: 'strength.modifier + proficiencyBonus',
+      optional: true,
+    },
+    // Set better defaults for the action
+    actionType: {
+      type: String,
+      defaultValue: 'attack',
+    },
+    tags: {
+      type: Array,
+      defaultValue: ['attack'],
+    },
+    'tags.$': {
+      type: String,
+    },
+  });
+
+export { AttackSchema };

app/imports/api/properties/Attributes.js

@@ -0,0 +1,113 @@
+import SimpleSchema from 'simpl-schema';
+import ErrorSchema from '/imports/api/properties/subSchemas/ErrorSchema.js';
+import VARIABLE_NAME_REGEX from '/imports/constants/VARIABLE_NAME_REGEX.js';
+
+/*
+ * Attributes are numbered stats of a character
+ */
+let AttributeSchema = new SimpleSchema({
+  name: {
+		type: String,
+    defaultValue: 'New Attribute',
+	},
+  // The technical, lowercase, single-word name used in formulae
+  variableName: {
+    type: String,
+		regEx: VARIABLE_NAME_REGEX,
+    min: 2,
+    defaultValue: 'newAttribute',
+  },
+	// How it is displayed and computed is determined by type
+  attributeType: {
+    type: String,
+    allowedValues: [
+      'ability', //Strength, Dex, Con, etc.
+      'stat', // Speed, Armor Class
+			'modifier', // Proficiency Bonus, Initiative
+      'hitDice', // d12 hit dice
+      'healthBar', // Hitpoints, Temporary Hitpoints, can take damage
+			'bar', // Displayed as a health bar, can't take damage
+      'resource', // Rages, sorcery points
+      'spellSlot', // Level 1, 2, 3... spell slots
+      'utility', // Aren't displayed, Jump height, Carry capacity
+    ],
+    defaultValue: 'stat',
+		index: 1,
+  },
+  // For type hitDice, the size needs to be stored separately
+  hitDiceSize: {
+    type: String,
+    allowedValues: ['d4', 'd6', 'd8', 'd10', 'd12', 'd20'],
+    optional: true,
+  },
+	// The starting value, before effects
+	baseValueCalculation: {
+		type: String,
+		optional: true,
+	},
+  // Description of what the attribute is used for
+  description: {
+		type: String,
+		optional: true,
+	},
+	// The damage done to the attribute, always positive
+  damage: {
+    type: SimpleSchema.Integer,
+    optional: true,
+		min: 0,
+  },
+  // Can the value be decimal?
+  decimal: {
+    type: Boolean,
+    optional: true,
+  },
+	// Automatically zero the adjustment on these conditions
+  reset: {
+    type: String,
+    optional: true,
+    allowedValues: ['shortRest', 'longRest'],
+  },
+});
+
+let ComputedOnlyAttributeSchema = new SimpleSchema({
+  // The result of baseValueCalculation
+  baseValue: {
+    type: SimpleSchema.oneOf(Number, String, Boolean),
+    optional: true,
+  },
+  baseValueErrors: {
+    type: Array,
+    optional: true,
+  },
+  'baseValueErrors.$': {
+    type: ErrorSchema,
+  },
+	// The computed value of the attribute
+  value: {
+    type: SimpleSchema.oneOf(Number, String, Boolean),
+		defaultValue: 0,
+    optional: true,
+  },
+  // The computed value of the attribute minus the damage
+  currentValue: {
+    type: SimpleSchema.oneOf(Number, String, Boolean),
+		defaultValue: 0,
+    optional: true,
+  },
+	// The computed modifier, provided the attribute type is `ability`
+	modifier: {
+		type: SimpleSchema.Integer,
+		optional: true,
+	},
+  // Should this attribute hide
+  hide: {
+    type: Boolean,
+    optional: true,
+  },
+});
+
+const ComputedAttributeSchema = new SimpleSchema()
+  .extend(ComputedOnlyAttributeSchema)
+  .extend(AttributeSchema);
+
+export { AttributeSchema, ComputedOnlyAttributeSchema, ComputedAttributeSchema };

app/imports/api/properties/Buffs.js

@@ -0,0 +1,59 @@
+import SimpleSchema from 'simpl-schema';
+
+let BuffSchema = new SimpleSchema({
+	name: {
+		type: String,
+		optional: true,
+	},
+	description: {
+		type: String,
+		optional: true,
+	},
+	duration: {
+		type: String,
+		optional: true,
+	},
+  applied: {
+    type: Boolean,
+    defaultValue: false,
+    index: 1,
+  },
+  target: {
+		type: String,
+		allowedValues: [
+      'self',  // the character who took the buff
+      'each',  // rolled once for `each` target
+      'every', // rolled once and applied to `every` target
+    ],
+		defaultValue: 'every',
+	},
+});
+
+let AppliedBuffSchema = new SimpleSchema({
+  applied: {
+    type: Boolean,
+    defaultValue: true,
+    index: 1,
+  },
+	durationSpent: {
+		type: Number,
+		optional: true,
+		min: 0,
+	},
+	appliedBy: {
+		type: Object,
+    optional: true,
+	},
+	'appliedBy.name': {
+		type: String,
+	},
+	'appliedBy.id': {
+		type: String,
+		regEx: SimpleSchema.RegEx.Id,
+	},
+	'appliedBy.collection': {
+		type: String,
+	},
+}).extend(BuffSchema);
+
+export { AppliedBuffSchema, BuffSchema };

app/imports/api/properties/ClassLevels.js

@@ -0,0 +1,28 @@
+import SimpleSchema from 'simpl-schema';
+import VARIABLE_NAME_REGEX from '/imports/constants/VARIABLE_NAME_REGEX.js';
+
+let ClassLevelSchema = new SimpleSchema({
+	name: {
+		type: String,
+		optional: true,
+	},
+	// The name of this class level's variable
+	variableName: {
+    type: String,
+    min: 2,
+		regEx: VARIABLE_NAME_REGEX,
+  },
+	level: {
+    type: SimpleSchema.Integer,
+		defaultValue: 1,
+  },
+	nextLevelTags: {
+		type: Array,
+		defaultValue: [],
+	},
+	'nextLevelTags.$': {
+		type: String,
+	},
+});
+
+export { ClassLevelSchema };

app/imports/api/properties/Containers.js

@@ -0,0 +1,47 @@
+import SimpleSchema from 'simpl-schema';
+
+let ContainerSchema = new SimpleSchema({
+	name: {
+		type: String,
+		optional: true,
+		trim: false
+	},
+	carried: {
+		type: Boolean,
+		defaultValue: true,
+		optional: true,
+	},
+	contentsWeightless: {
+		type: Boolean,
+		optional: true,
+	},
+	weight: {
+		type: Number,
+		min: 0,
+    optional: true,
+	},
+	value: {
+		type: Number,
+		min: 0,
+    optional: true,
+	},
+	description: {
+		type: String,
+		optional: true,
+		trim: false
+	},
+});
+
+const ComputedOnlyContainerSchema = new SimpleSchema({
+  // Weight of all the contents, zero if `contentsWeightless` is true
+  contentsWeight:{
+    type: Number,
+    optional: true,
+  },
+});
+
+const ComputedContainerSchema = new SimpleSchema()
+	.extend(ComputedOnlyContainerSchema)
+	.extend(ContainerSchema);
+
+export { ContainerSchema, ComputedContainerSchema };

app/imports/api/properties/DamageMultipliers.js

@@ -0,0 +1,46 @@
+import SimpleSchema from 'simpl-schema';
+import DAMAGE_TYPES from '/imports/constants/DAMAGE_TYPES.js';
+
+/*
+ * DamageMultipliers are multipliers that affect how much damage is taken from
+ * a given damage type
+ */
+let DamageMultiplierSchema = new SimpleSchema({
+  name: {
+		type: String,
+		optional: true,
+	},
+  damageTypes: {
+    type: Array,
+    defaultValue: [],
+  },
+  // The technical, lowercase, single-word name used in formulae
+  'damageTypes.$': {
+    type: String,
+		allowedValues: DAMAGE_TYPES,
+  },
+	// The value of the damage multiplier
+	value: {
+    type: Number,
+		defaultValue: 0.5,
+		allowedValues: [0, 0.5, 2],
+  },
+  // Tags which bypass this multiplier (OR)
+  excludeTags: {
+    type: Array,
+    defaultValue: [],
+  },
+  'excludeTags.$': {
+    type: String,
+  },
+  // Tags which must be present to be affected by this multiplier (AND)
+  includeTags: {
+    type: Array,
+    defaultValue: [],
+  },
+  'includeTags.$': {
+    type: String,
+  },
+});
+
+export { DamageMultiplierSchema };

app/imports/api/properties/Damages.js

@@ -0,0 +1,28 @@
+import SimpleSchema from 'simpl-schema';
+import DAMAGE_TYPES from '/imports/constants/DAMAGE_TYPES.js';
+
+const DamageSchema = new SimpleSchema({
+	// The roll that determines how much to damage the attribute
+  amount: {
+    type: String,
+    optional: true,
+    defaultValue: '1d8 + strength.modifier',
+  },
+	// Who this damage applies to
+	target: {
+		type: String,
+    defaultValue: 'every',
+		allowedValues: [
+      'self',   // the character who took the action
+      'each',   // rolled once for `each` target
+      'every',  // rolled once and applied to `every` target
+    ],
+	},
+	damageType: {
+		type: String,
+		allowedValues: DAMAGE_TYPES,
+		defaultValue: 'slashing',
+	},
+});
+
+export { DamageSchema };

app/imports/api/properties/Effects.js

@@ -0,0 +1,65 @@
+import SimpleSchema from 'simpl-schema';
+import ErrorSchema from '/imports/api/properties/subSchemas/ErrorSchema.js';
+/*
+ * Effects are reason-value attached to skills and abilities
+ * that modify their final value or presentation in some way
+ */
+let EffectSchema = new SimpleSchema({
+	name: {
+		type: String,
+		optional: true,
+	},
+	operation: {
+		type: String,
+		defaultValue: 'add',
+		allowedValues: [
+			'base',
+			'add',
+			'mul',
+			'min',
+			'max',
+      'set',
+			'advantage',
+			'disadvantage',
+			'passiveAdd',
+			'fail',
+			'conditional',
+			'rollBonus',
+		],
+	},
+	calculation: {
+		type: String,
+		optional: true,
+	},
+	//which stats the effect is applied to
+	stats: {
+		type: Array,
+		defaultValue: [],
+	},
+	'stats.$': {
+		type: String,
+		optional: true,
+	},
+});
+
+const ComputedOnlyEffectSchema = new SimpleSchema({
+	// The computed result of the effect
+	result: {
+		type: SimpleSchema.oneOf(Number, String, Boolean),
+		optional: true,
+	},
+  // The errors encountered while computing the result
+  errors: {
+    type: Array,
+    optional: true,
+  },
+  'errors.$':{
+    type: ErrorSchema,
+  },
+});
+
+const ComputedEffectSchema = new SimpleSchema()
+	.extend(ComputedOnlyEffectSchema)
+	.extend(EffectSchema);
+
+export { EffectSchema, ComputedEffectSchema, ComputedOnlyEffectSchema };

app/imports/api/properties/Experiences.js

@@ -0,0 +1,35 @@
+import SimpleSchema from 'simpl-schema';
+
+let ExperienceSchema = new SimpleSchema({
+	name: {
+		type: String,
+		optional: true,
+	},
+	// Potentially long description of the event
+	description: {
+		type: String,
+		optional: true,
+	},
+	// The amount of XP this experience gives
+	value: {
+		type: SimpleSchema.Integer,
+		optional: true,
+	},
+	// The real-world date that it occured
+	date: {
+		type: Date,
+		autoValue: function() {
+			// If the date isn't set, set it to now
+			if (!this.isSet) {
+				return new Date();
+			}
+		},
+	},
+	// The date in-world of this event
+	worldDate: {
+		type: String,
+		optional: true,
+	},
+});
+
+export { ExperienceSchema };

app/imports/api/properties/Features.js

@@ -0,0 +1,17 @@
+import SimpleSchema from 'simpl-schema';
+
+let FeatureSchema = new SimpleSchema({
+	name: {
+		type: String,
+	},
+	summary: {
+		type: String,
+		optional: true,
+	},
+  description: {
+		type: String,
+		optional: true,
+	},
+});
+
+export { FeatureSchema }

app/imports/api/properties/Folders.js

@@ -0,0 +1,11 @@
+import SimpleSchema from 'simpl-schema';
+
+// Folders organize a character sheet into a tree, particularly to group things
+// like 'race' and 'background'
+let FolderSchema = new SimpleSchema({
+  name: {
+    type: String,
+  },
+});
+
+export { FolderSchema };

app/imports/api/properties/Items.js

@@ -0,0 +1,57 @@
+import SimpleSchema from 'simpl-schema';
+
+const ItemSchema = new SimpleSchema({
+	name: {
+		type: String,
+		optional: true,
+	},
+	// Plural name of the item, if there is more than one
+	plural: {
+		type: String,
+		optional: true,
+	},
+	description: {
+		type: String,
+		optional: true,
+	},
+	// Number currently held
+	quantity: {
+		type: SimpleSchema.Integer,
+		min: 0,
+		defaultValue: 1
+	},
+	// Weight per item in the stack
+	weight: {
+		type: Number,
+		min: 0,
+    optional: true,
+	},
+	// Value per item in the stack, in gold pieces
+	value: {
+		type: Number,
+		min: 0,
+    optional: true,
+	},
+	// If this item is equipped, it requires attunement
+	// Being equipped is `enabled === true`
+	requiresAttunement: {
+		type: Boolean,
+		optional: true,
+	},
+  attuned: {
+		type: Boolean,
+		optional: true,
+	},
+	// Show increment/decrement buttons in item lists
+	showIncrement: {
+		type: Boolean,
+		optional: true,
+	},
+	// Unequipped items shouldn't affect creature stats
+	equipped: {
+		type: Boolean,
+		defaultValue: false,
+	},
+});
+
+export { ItemSchema };

app/imports/api/properties/Notes.js

@@ -0,0 +1,14 @@
+import SimpleSchema from 'simpl-schema';
+
+let NoteSchema = new SimpleSchema({
+	name: {
+		type: String,
+		optional: true,
+	},
+	description: {
+		type: String,
+		optional: true,
+	},
+});
+
+export { NoteSchema };

app/imports/api/properties/Proficiencies.js

@@ -0,0 +1,25 @@
+import SimpleSchema from 'simpl-schema';
+
+let ProficiencySchema = new SimpleSchema({
+	name: {
+		type: String,
+		optional: true,
+	},
+	// The variableNames of the skills, tags, or attributes to apply proficiency to
+	stats: {
+		type: Array,
+		defaultValue: [],
+	},
+	'stats.$': {
+		type: String,
+		optional: true,
+	},
+	// A number representing how proficient the character is
+	value: {
+		type: Number,
+		allowedValues: [0.5, 1, 2],
+		defaultValue: 1,
+	},
+});
+
+export { ProficiencySchema };

app/imports/api/properties/Rolls.js

@@ -0,0 +1,38 @@
+import SimpleSchema from 'simpl-schema';
+
+/**
+ * Rolls are children to actions or other rolls, they are triggered with 0 or
+ * more targets and then apply their results to the character taking the action
+ * or the target of the action.
+ *
+ * # Rolls are resolved in one of two ways:
+ * Regular rolls:
+ * The target number is computed in the target's context
+ * The roll is computed in the action taker's context
+ * If the roll meets or exceeds the target number, the adjustments and buffs
+ * are applied
+ *
+ * Saving throws:
+ * The target number is computed in the action taker's context
+ * The roll is computed in the target's context
+ * If the roll fails to meet or exceed the target number, the adjustments and
+ *  child rolls are applied
+ */
+let RollSchema = new SimpleSchema({
+  // The roll
+  roll: {
+    type: String,
+    optional: true,
+  },
+  // Effects can apply to this tag specifically
+  // Ranged spell attack, Ranged weapon attack, etc.
+  tags: {
+    type: Array,
+    defaultValue: [],
+  },
+  'tags.$': {
+    type: String,
+  },
+});
+
+export { RollSchema };

app/imports/api/properties/SavingThrows.js

@@ -0,0 +1,21 @@
+import SimpleSchema from 'simpl-schema';
+
+// These are the rolls made when saves are called for
+// For the saving throw bonus or proficiency, see ./Skills.js
+let SavingThrowSchema = new SimpleSchema ({
+  name: {
+    type: String,
+    optional: true,
+  },
+  dc: {
+    type: String,
+    optional: true,
+  },
+  // The variable name of ability the save to roll
+  stat: {
+    type: String,
+    optional: true,
+  },
+});
+
+export { SavingThrowSchema };

app/imports/api/properties/Skills.js

@@ -0,0 +1,130 @@
+import SimpleSchema from 'simpl-schema';
+import VARIABLE_NAME_REGEX from '/imports/constants/VARIABLE_NAME_REGEX.js';
+import ErrorSchema from '/imports/api/properties/subSchemas/ErrorSchema.js';
+
+/*
+ * Skills are anything that results in a modifier to be added to a D20
+ * Skills have an ability score modifier that they use as their basis
+ */
+let SkillSchema = new SimpleSchema({
+  name: {
+		type: String,
+		optional: true,
+	},
+  // The technical, lowercase, single-word name used in formulae
+  // Ignored for skilltype = save
+  variableName: {
+    type: String,
+    regEx: VARIABLE_NAME_REGEX,
+    min: 2,
+  },
+	// The variable name of the ability this skill relies on
+  ability: {
+    type: String,
+    optional: true,
+  },
+	// What type of skill is this
+  skillType: {
+    type: String,
+    allowedValues: [
+      'skill',
+      'save',
+			'check',
+      'tool',
+      'weapon',
+      'armor',
+      'language',
+			'utility', //not displayed anywhere
+    ],
+    defaultValue: 'skill',
+  },
+  // The starting value, before effects
+	baseValueCalculation: {
+		type: String,
+		optional: true,
+	},
+	// The base proficiency of this skill
+	baseProficiency: {
+		type: Number,
+		optional: true,
+	},
+  // Description of what the skill is used for
+  description: {
+		type: String,
+		optional: true,
+	},
+});
+
+let ComputedOnlySkillSchema = new SimpleSchema({
+	// Computed value of skill to be added to skill rolls
+  value: {
+    type: Number,
+		defaultValue: 0,
+  },
+  // The result of baseValueCalculation
+  baseValue: {
+    type: SimpleSchema.oneOf(Number, String, Boolean),
+    optional: true,
+  },
+  baseValueErrors: {
+    type: Array,
+    optional: true,
+  },
+  'baseValueErrors.$': {
+    type: ErrorSchema,
+  },
+	// Computed value added by the ability
+	abilityMod: {
+		type: SimpleSchema.Integer,
+		optional: true,
+	},
+	// Computed advantage/disadvantage
+  advantage: {
+    type: SimpleSchema.Integer,
+    optional: true,
+    allowedValues: [-1, 0, 1],
+  },
+	// Computed bonus to passive checks
+  passiveBonus: {
+    type: Number,
+    optional: true,
+  },
+	// Computed proficiency multiplier
+  proficiency: {
+    type: Number,
+    allowedValues: [0, 0.5, 1, 2],
+		defaultValue: 0,
+  },
+  // Compiled text of all conditional benefits
+  conditionalBenefits: {
+    type: Array,
+    optional: true,
+  },
+  'conditionalBenefits.$': {
+    type: String,
+  },
+  // Compiled text of all roll bonuses
+  rollBonuses: {
+    type: Array,
+    optional: true,
+  },
+  'rollBonuses.$': {
+    type: String,
+  },
+	// Computed number of things forcing this skill to fail
+  fail: {
+    type: SimpleSchema.Integer,
+    optional: true,
+  },
+  // Should this attribute hide
+  hide: {
+    type: Boolean,
+    optional: true,
+  },
+})
+
+const ComputedSkillSchema = new SimpleSchema()
+  .extend(ComputedOnlySkillSchema)
+  .extend(SkillSchema);
+
+export { SkillSchema, ComputedSkillSchema, ComputedOnlySkillSchema };

app/imports/api/properties/Slots.js

@@ -0,0 +1,13 @@
+import SimpleSchema from 'simpl-schema';
+
+let SlotSchema = new SimpleSchema({
+	slotTags: {
+    type: Array,
+		defaultValue: [],
+  },
+	'slotTags.$': {
+		type: String,
+	},
+});
+
+export { SlotSchema };

app/imports/api/properties/SpellLists.js

@@ -0,0 +1,19 @@
+import SimpleSchema from 'simpl-schema';
+
+let SpellListSchema = new SimpleSchema({
+	name: {
+		type: String,
+		optional: true,
+	},
+	description: {
+		type: String,
+		optional: true,
+	},
+	// Calculation of how many spells in this list can be prepared
+	maxPrepared: {
+		type: String,
+		optional: true,
+	},
+});
+
+export { SpellListSchema }

app/imports/api/properties/Spells.js

@@ -0,0 +1,96 @@
+import { ActionSchema } from '/imports/api/properties/Actions.js';
+import SimpleSchema from 'simpl-schema';
+
+const magicSchools = [
+	'abjuration',
+	'conjuration',
+	'divination',
+	'enchantment',
+	'evocation',
+	'illusion',
+	'necromancy',
+	'transmutation',
+];
+
+let SpellSchema = new SimpleSchema({})
+.extend(ActionSchema)
+.extend({
+	name: {
+		type: String,
+		optional: true,
+	},
+	// If it's always prepared, it doesn't count against the number of spells
+	// prepared in a spell list, and enabled should be true
+	alwaysPrepared: {
+		type: Boolean,
+		optional: true,
+	},
+  // This spell ignores spell slot rules
+  castWithoutSpellSlots: {
+    type: Boolean,
+    optional: true,
+  },
+  hasAttackRoll: {
+    type: Boolean,
+    optional: true,
+  },
+	// Spell lists that this spell appears on
+  spellLists: {
+    type: Array,
+    defaultValue: [],
+  },
+  'spellLists.$': {
+    type: String,
+  },
+	description: {
+		type: String,
+		optional: true,
+	},
+	castingTime: {
+		type: String,
+		optional: true,
+		defaultValue: 'action',
+	},
+	range: {
+		type: String,
+		optional: true,
+	},
+	duration: {
+		type: String,
+		optional: true,
+		defaultValue: 'Instantaneous',
+	},
+	verbal: {
+		type: Boolean,
+		optional: true,
+	},
+	somatic: {
+		type: Boolean,
+		optional: true,
+	},
+	concentration: {
+		type: Boolean,
+		optional: true,
+	},
+	material: {
+		type: String,
+		optional: true,
+	},
+	ritual: {
+		type: Boolean,
+		optional: true,
+	},
+	level: {
+		type: SimpleSchema.Integer,
+		defaultValue: 1,
+		max: 9,
+		min: 0,
+	},
+	school: {
+		type: String,
+		defaultValue: 'abjuration',
+		allowedValues: magicSchools,
+	},
+});
+
+export { SpellSchema };

app/imports/api/properties/Toggles.js

@@ -0,0 +1,45 @@
+import SimpleSchema from 'simpl-schema';
+import ErrorSchema from '/imports/api/properties/subSchemas/ErrorSchema.js';
+
+const ToggleSchema = new SimpleSchema({
+  name: {
+    type: String,
+    optional: true,
+  },
+  disabled: {
+    type: Boolean,
+    optional: true,
+  },
+  enabled: {
+    type: Boolean,
+    optional: true,
+  },
+  // if neither disabled or enabled, the condition will be run to determine
+  // if the children of the toggle should be active
+  condition: {
+    type: String,
+    optional: true,
+  },
+});
+
+const ComputedOnlyToggleSchema = new SimpleSchema({
+	// The computed result of the effect
+	toggleResult: {
+		type: SimpleSchema.oneOf(Number, String, Boolean),
+		optional: true,
+	},
+  // The errors encountered while computing the result
+  errors: {
+    type: Array,
+    optional: true,
+  },
+  'errors.$': {
+    type: ErrorSchema,
+  },
+});
+
+const ComputedToggleSchema = new SimpleSchema()
+	.extend(ComputedOnlyToggleSchema)
+	.extend(ToggleSchema);
+
+export { ToggleSchema, ComputedOnlyToggleSchema, ComputedToggleSchema };

app/imports/api/properties/computedPropertySchemasIndex.js

@@ -0,0 +1,53 @@
+import SimpleSchema from 'simpl-schema';
+import { ActionSchema } from '/imports/api/properties/Actions.js';
+import { AdjustmentSchema } from '/imports/api/properties/Adjustments.js';
+import { AttackSchema } from '/imports/api/properties/Attacks.js';
+import { ComputedAttributeSchema } from '/imports/api/properties/Attributes.js';
+import { BuffSchema } from '/imports/api/properties/Buffs.js';
+import { ClassLevelSchema } from '/imports/api/properties/ClassLevels.js';
+import { ContainerSchema } from '/imports/api/properties/Containers.js';
+import { DamageSchema } from '/imports/api/properties/Damages.js';
+import { DamageMultiplierSchema } from '/imports/api/properties/DamageMultipliers.js';
+import { ComputedEffectSchema } from '/imports/api/properties/Effects.js';
+import { ExperienceSchema } from '/imports/api/properties/Experiences.js';
+import { FeatureSchema } from '/imports/api/properties/Features.js';
+import { FolderSchema } from '/imports/api/properties/Folders.js';
+import { ItemSchema } from '/imports/api/properties/Items.js';
+import { NoteSchema } from '/imports/api/properties/Notes.js';
+import { ProficiencySchema } from '/imports/api/properties/Proficiencies.js';
+import { RollSchema } from '/imports/api/properties/Rolls.js';
+import { SavingThrowSchema } from '/imports/api/properties/SavingThrows.js';
+import { ComputedSkillSchema } from '/imports/api/properties/Skills.js';
+import { SlotSchema } from '/imports/api/properties/Slots.js';
+import { SpellSchema } from '/imports/api/properties/Spells.js';
+import { SpellListSchema } from '/imports/api/properties/SpellLists.js';
+import { ToggleSchema } from '/imports/api/properties/Toggles.js';
+
+const propertySchemasIndex = {
+  action: ActionSchema,
+  adjustment: AdjustmentSchema,
+  attack: AttackSchema,
+  attribute: ComputedAttributeSchema,
+  buff: BuffSchema,
+  classLevel: ClassLevelSchema,
+  damage: DamageSchema,
+  damageMultiplier: DamageMultiplierSchema,
+  effect: ComputedEffectSchema,
+  experience: ExperienceSchema,
+  feature: FeatureSchema,
+  folder: FolderSchema,
+  note: NoteSchema,
+  proficiency: ProficiencySchema,
+  roll: RollSchema,
+  savingThrow: SavingThrowSchema,
+  skill: ComputedSkillSchema,
+  slot: SlotSchema,
+  spellList: SpellListSchema,
+  spell: SpellSchema,
+  toggle: ToggleSchema,
+  container: ContainerSchema,
+  item: ItemSchema,
+  any: new SimpleSchema({}),
+};
+
+export default propertySchemasIndex;

app/imports/api/properties/propertySchemasIndex.js

@@ -0,0 +1,53 @@
+import SimpleSchema from 'simpl-schema';
+import { ActionSchema } from '/imports/api/properties/Actions.js';
+import { AdjustmentSchema } from '/imports/api/properties/Adjustments.js';
+import { AttackSchema } from '/imports/api/properties/Attacks.js';
+import { AttributeSchema } from '/imports/api/properties/Attributes.js';
+import { BuffSchema } from '/imports/api/properties/Buffs.js';
+import { ClassLevelSchema } from '/imports/api/properties/ClassLevels.js';
+import { DamageSchema } from '/imports/api/properties/Damages.js';
+import { DamageMultiplierSchema } from '/imports/api/properties/DamageMultipliers.js';
+import { EffectSchema } from '/imports/api/properties/Effects.js';
+import { ExperienceSchema } from '/imports/api/properties/Experiences.js';
+import { FeatureSchema } from '/imports/api/properties/Features.js';
+import { FolderSchema } from '/imports/api/properties/Folders.js';
+import { NoteSchema } from '/imports/api/properties/Notes.js';
+import { ProficiencySchema } from '/imports/api/properties/Proficiencies.js';
+import { RollSchema } from '/imports/api/properties/Rolls.js';
+import { SavingThrowSchema } from '/imports/api/properties/SavingThrows.js';
+import { SkillSchema } from '/imports/api/properties/Skills.js';
+import { SlotSchema } from '/imports/api/properties/Slots.js';
+import { SpellListSchema } from '/imports/api/properties/SpellLists.js';
+import { SpellSchema } from '/imports/api/properties/Spells.js';
+import { ToggleSchema } from '/imports/api/properties/Toggles.js';
+import { ContainerSchema } from '/imports/api/properties/Containers.js';
+import { ItemSchema } from '/imports/api/properties/Items.js';
+
+const propertySchemasIndex = {
+  action: ActionSchema,
+  adjustment: AdjustmentSchema,
+  attack: AttackSchema,
+  attribute: AttributeSchema,
+  buff: BuffSchema,
+  classLevel: ClassLevelSchema,
+  damage: DamageSchema,
+  damageMultiplier: DamageMultiplierSchema,
+  effect: EffectSchema,
+  experience: ExperienceSchema,
+  feature: FeatureSchema,
+  folder: FolderSchema,
+  note: NoteSchema,
+  proficiency: ProficiencySchema,
+  roll: RollSchema,
+  savingThrow: SavingThrowSchema,
+  skill: SkillSchema,
+  slot: SlotSchema,
+  spellList: SpellListSchema,
+  spell: SpellSchema,
+  toggle: ToggleSchema,
+  container: ContainerSchema,
+  item: ItemSchema,
+  any: new SimpleSchema({}),
+};
+
+export default propertySchemasIndex;

app/imports/api/properties/subSchemas/AdjustmentSchema.js

@@ -0,0 +1,35 @@
+import SimpleSchema from 'simpl-schema';
+import { Random } from 'meteor/random';
+
+const AdjustmentSchema = new SimpleSchema({
+  _id: {
+    type: String,
+    regEx: SimpleSchema.RegEx.Id,
+    autoValue(){
+      if (!this.isSet) return Random.id();
+    }
+  },
+	// The roll that determines how much to change the attribute
+  adjustment: {
+    type: String,
+    optional: true,
+    defaultValue: '1',
+  },
+	// Who this adjustment applies to
+	target: {
+		type: String,
+    defaultValue: 'every',
+		allowedValues: [
+      'self',   // the character who took the action
+      'each',   // rolled once for `each` target
+      'every',  // rolled once and applied to `every` target
+    ],
+	},
+	// The stat this rolls applies to, if damage type is set, this is ignored
+	stat: {
+		type: String,
+    optional: true,
+	},
+});
+
+export default AdjustmentSchema;

app/imports/api/properties/subSchemas/AttributeConsumedSchema.js

@@ -0,0 +1,22 @@
+import SimpleSchema from 'simpl-schema';
+import { Random } from 'meteor/random';
+
+const AttributeConsumedSchema = new SimpleSchema({
+  _id: {
+    type: String,
+    regEx: SimpleSchema.RegEx.Id,
+    autoValue(){
+      if (!this.isSet) return Random.id();
+    }
+  },
+  variableName: {
+    type: String,
+    optional: true,
+  },
+  quantity: {
+    type: Number,
+    defaultValue: 1,
+  },
+});
+
+export default AttributeConsumedSchema;

app/imports/api/properties/subSchemas/ColorSchema.js

@@ -0,0 +1,12 @@
+import SimpleSchema from 'simpl-schema';
+
+const ColorSchema = new SimpleSchema({
+	color: {
+		type: String,
+		// match hex colors of the form #A23 or #A23f56
+		regEx: /^#([a-f0-9]{3}){1,2}\b$/i,
+		optional: true,
+	},
+});
+
+export default ColorSchema;

app/imports/api/properties/subSchemas/DeathSavesSchema.js

@@ -1,12 +1,14 @@
-Schemas.DeathSave = new SimpleSchema({
+import SimpleSchema from 'simpl-schema';
+
+const DeathSavesSchema = new SimpleSchema({
 	pass: {
-		type: Number,
+		type: SimpleSchema.Integer,
 		min: 0,
 		max: 3,
 		defaultValue: 0,
 	},
 	fail: {
-		type: Number,
+		type: SimpleSchema.Integer,
 		min: 0,
 		max: 3,
 		defaultValue: 0,
@@ -20,3 +22,5 @@ Schemas.DeathSave = new SimpleSchema({
 		defaultValue: false,
 	},
 });
+
+export default DeathSavesSchema;

app/imports/api/properties/subSchemas/ErrorSchema.js

@@ -0,0 +1,14 @@
+import SimpleSchema from 'simpl-schema';
+
+const ErrorSchema = new SimpleSchema({
+	// The roll that determines how much to change the attribute
+  message: {
+    type: String,
+  },
+	// Who this adjustment applies to
+	type: {
+    type: String,
+	},
+});
+
+export default ErrorSchema;

app/imports/api/properties/subSchemas/ItemConsumedSchema.js

@@ -0,0 +1,22 @@
+import SimpleSchema from 'simpl-schema';
+import { Random } from 'meteor/random';
+
+const ItemConsumedSchema = new SimpleSchema({
+  _id: {
+    type: String,
+    regEx: SimpleSchema.RegEx.Id,
+    autoValue(){
+      if (!this.isSet) return Random.id();
+    }
+  },
+  tag: {
+    type: String,
+    optional: true,
+  },
+  quantity: {
+    type: Number,
+    defaultValue: 1,
+  },
+});
+
+export default ItemConsumedSchema;

app/imports/api/properties/subSchemas/ResourcesSchema.js

@@ -0,0 +1,22 @@
+import SimpleSchema from 'simpl-schema';
+import ItemConsumedSchema from '/imports/api/properties/subSchemas/ItemConsumedSchema.js';
+import AttributeConsumedSchema from '/imports/api/properties/subSchemas/AttributeConsumedSchema.js';
+
+const ResourcesSchema = new SimpleSchema({
+  itemsConsumed: {
+    type: Array,
+    defaultValue: [],
+  },
+  'itemsConsumed.$': {
+    type: ItemConsumedSchema,
+  },
+  attributesConsumed: {
+    type: Array,
+    defaultValue: [],
+  },
+  'attributesConsumed.$': {
+    type: AttributeConsumedSchema,
+  },
+});
+
+export default ResourcesSchema;

app/imports/api/properties/subSchemas/RollResultsSchema.js

@@ -0,0 +1,25 @@
+import SimpleSchema from 'simpl-schema';
+import ResultsSchema from '/imports/api/properties/subSchemas/ResultsSchema.js';
+
+let RollResultsSchema = new SimpleSchema ({
+  _id: {
+    type: String,
+    regEx: SimpleSchema.RegEx.Id,
+    autoValue(){
+      if (!this.isSet) return Random.id();
+    }
+  },
+  // Expression of whether or not to apply the roll
+  // Evaluates to an expression which gets compared to the roll
+  // or a number which the roll must equal
+  comparison: {
+    type: String,
+    optional: true,
+  },
+  results: {
+		type: ResultsSchema,
+		defaultValue: {},
+	},
+});
+
+export default RollResultsSchema ;