Hotfix: Adding properties to the tree, type selection fixed

Slot fillers removed from a library can no longer be added to a slot.
If a slot has limited space left, this will be reflected on the error 
finding slots message

app/.meteor/packages

@@ -3,7 +3,7 @@
 # '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-password@1.6.2
 accounts-ui@1.3.1
 random@1.2.0
 dburles:collection-helpers
@@ -13,7 +13,7 @@ momentjs:moment
 dburles:mongo-collection-instances
 percolate:migrations
 accounts-google@1.3.3
-email@1.2.3
+email@2.0.0
 meteorhacks:subs-manager
 chuangbo:marked
 meteor-base@1.4.0
@@ -38,7 +38,7 @@ ongoworks:speakingurl
 service-configuration@1.0.11
 google-config-ui@1.0.1
 dynamic-import@0.5.2
-ddp-rate-limiter@1.0.7
+ddp-rate-limiter@1.0.9
 rate-limit@1.0.9
 meteortesting:mocha
 mdg:validated-method
@@ -49,3 +49,8 @@ aldeed:schema-index
 akryum:vue-component
 accounts-patreon
 bozhao:link-accounts
+peerlibrary:reactive-publish
+simple:rest
+simple:rest-method-mixin
+mikowals:batch-insert
+peerlibrary:subscription-data

app/.meteor/release

@@ -1 +1 @@
-METEOR@1.10.2
+METEOR@1.11.1

app/.meteor/versions

@@ -1,7 +1,7 @@
-accounts-base@1.6.0
+accounts-base@1.7.0
 accounts-google@1.3.3
 accounts-oauth@1.2.0
-accounts-password@1.6.0
+accounts-password@1.6.2
 accounts-patreon@0.1.0
 accounts-ui@1.3.1
 accounts-ui-unstyled@1.4.2
@@ -10,7 +10,7 @@ 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:collection2@3.2.1
 aldeed:schema-index@3.0.0
 allow-deny@1.1.0
 autoupdate@1.6.0
@@ -20,29 +20,31 @@ 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
+boilerplate-generator@1.7.1
+bozhao:link-accounts@2.2.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
+ddp-rate-limiter@1.0.9
+ddp-server@2.3.2
 deps@1.0.12
 diff-sequence@1.1.1
-dynamic-import@0.5.2
+dynamic-import@0.5.3
 ecmascript@0.14.3
 ecmascript-runtime@0.7.0
-ecmascript-runtime-client@0.10.0
-ecmascript-runtime-server@0.9.0
+ecmascript-runtime-client@0.11.0
+ecmascript-runtime-server@0.10.0
 ejson@1.1.1
-email@1.2.3
+email@2.0.0
 es5-shim@4.8.0
 fetch@0.1.1
 geojson-utils@1.0.10
@@ -67,10 +69,11 @@ 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:browser-tests@1.3.4
 meteortesting:mocha@1.1.5
 meteortesting:mocha-core@7.0.1
-minifier-css@1.5.0
+mikowals:batch-insert@1.2.0
+minifier-css@1.5.3
 minifier-js@2.6.0
 minimongo@1.6.0
 mobile-experience@1.1.0
@@ -78,19 +81,29 @@ 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
+momentjs:moment@2.29.1
 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
+npm-mongo@3.8.1
+oauth@1.3.2
 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:check-extension@0.7.0
+peerlibrary:computed-field@0.10.0
+peerlibrary:data-lookup@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
+peerlibrary:subscription-data@0.8.0
 percolate:migrations@0.9.8
 percolate:synced-cron@1.3.2
 promise@0.11.2
@@ -102,12 +115,15 @@ reactive-var@1.0.11
 reload@1.3.0
 retry@1.1.0
 routepolicy@1.1.0
-seba:minifiers-autoprefixer@1.1.2
+seba:minifiers-autoprefixer@1.2.1
 service-configuration@1.0.11
 session@1.2.0
 sha@1.0.9
 shell-server@0.5.0
-socket-stream-client@0.3.0
+simple:json-routes@2.1.0
+simple:rest@1.1.1
+simple:rest-method-mixin@1.0.1
+socket-stream-client@0.3.1
 spacebars@1.0.15
 spacebars-compiler@1.1.3
 srp@1.1.0
@@ -121,6 +137,6 @@ templating-tools@1.1.2
 tmeasday:check-npm-versions@0.3.2
 tracker@1.2.0
 underscore@1.0.10
-url@1.3.0
+url@1.3.1
 webapp@1.9.1
 webapp-hashing@1.0.9

app/client/main.js

@@ -1,2 +1,3 @@
-import "/imports/ui/vueSetup.js";
-import "/imports/ui/styles/stylesIndex.js";
+import '/imports/ui/vueSetup.js';
+import '/imports/ui/styles/stylesIndex.js';
+import '/imports/client/config.js';

app/imports/api/campaign/Encounter.js

@@ -1,11 +0,0 @@
-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,49 +0,0 @@
-import SimpleSchema from 'simpl-schema';
-
-let Parties = new Mongo.Collection("parties");
-
-let partySchema = new SimpleSchema({
-	name: {
-		type: String,
-		defaultValue: "New Party",
-		trim: false,
-		optional: true,
-	},
-	characters: {
-		type: Array,
-		defaultValue: [],
-	},
-	characters: {
-		type: String,
-		regEx: SimpleSchema.RegEx.Id,
-		index: 1,
-	},
-	owner: {
-		type: String,
-		regEx: SimpleSchema.RegEx.Id,
-	},
-});
-
-Parties.attachSchema(partySchema);
-
-Parties.allow({
-	insert: function(userId, doc) {
-		return userId && doc.owner === userId;
-	},
-	update: function(userId, doc, fields, modifier) {
-		return userId && doc.owner === userId;
-	},
-	remove: function(userId, doc) {
-		return userId && doc.owner === userId;
-	},
-	fetch: ["owner"],
-});
-
-Parties.deny({
-	update: function(userId, docs, fields, modifier) {
-		// can't change owners
-		return _.contains(fields, "owner");
-	}
-});
-
-export default Parties;

app/imports/api/creature/CreatureProperties.js

@@ -1,297 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-import { Mongo } from 'meteor/mongo';
-import { ValidatedMethod } from 'meteor/mdg:validated-method';
-import SimpleSchema from 'simpl-schema';
-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';
-
-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,
-	},
-});
-
-for (let key in propertySchemasIndex){
-	let schema = new SimpleSchema({});
-	schema.extend(propertySchemasIndex[key]);
-	schema.extend(CreaturePropertySchema);
-	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}) {
-    assertPropertyEditPermission(creatureProperty, this.userId);
-		let _id = CreatureProperties.insert(creatureProperty);
-		let property = CreatureProperties.findOne(_id);
-		recomputeCreatures(property);
-  },
-});
-
-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 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,
-	insertPropertyFromLibraryNode,
-	updateProperty,
-	damageProperty,
-	pushToProperty,
-	pullFromProperty,
-	softRemoveProperty,
-};

app/imports/api/creature/Creatures.js

@@ -1,13 +1,18 @@
+import { ValidatedMethod } from 'meteor/mdg:validated-method';
+import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
 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, assertOwnership} from '/imports/api/sharing/sharingPermissions.js';
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+import {assertEditPermission} from '/imports/api/sharing/sharingPermissions.js';
+import { assertUserHasPaidBenefits } 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
-Creatures = new Mongo.Collection('creatures');
+let Creatures = new Mongo.Collection('creatures');
 
 let CreatureSettingsSchema = new SimpleSchema({
 	//slowed down by carrying too much?
@@ -25,6 +30,23 @@ let CreatureSettingsSchema = new SimpleSchema({
 		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,
+  },
+  discordWebhook: {
+    type: String,
+    optional: true,
+    max: 200,
+  },
 });
 
 let CreatureSchema = new SimpleSchema({
@@ -34,13 +56,6 @@ let CreatureSchema = new SimpleSchema({
 		defaultValue: '',
 		optional: true,
 	},
-	urlName: {
-		type: String,
-		optional: true,
-		autoValue: function() {
-			return getSlug(this.field('name').value, {maintainCase: true}) || '-';
-		},
-	},
 	alignment: {
 		type: String,
 		optional: true
@@ -53,35 +68,91 @@ let CreatureSchema = new SimpleSchema({
 		type: String,
 		optional: true
 	},
-
+  avatarPicture: {
+    type: String,
+    optional: true,
+  },
 	// Mechanics
 	deathSave: {
 		type: deathSaveSchema,
 		defaultValue: {},
 	},
-	xp: {
+  // Stats that are computed and denormalised outside of recomputation
+  denormalizedStats: {
+    type: Object,
+    defaultValue: {},
+  },
+  // Sum of all XP gained by this character
+	'denormalizedStats.xp': {
 		type: SimpleSchema.Integer,
 		defaultValue: 0,
 	},
-	weightCarried: {
+  // Sum of all levels granted by milestone XP
+  'denormalizedStats.milestoneLevels': {
+    type: SimpleSchema.Integer,
+    defaultValue: 0,
+  },
+  // Inventory
+	'denormalizedStats.weightTotal': {
 		type: Number,
 		defaultValue: 0,
 	},
-	level: {
-		type: SimpleSchema.Integer,
+  'denormalizedStats.weightEquipment': {
+		type: Number,
 		defaultValue: 0,
 	},
+  'denormalizedStats.weightCarried': {
+		type: Number,
+		defaultValue: 0,
+	},
+  'denormalizedStats.valueTotal': {
+		type: Number,
+		defaultValue: 0,
+	},
+  'denormalizedStats.valueEquipment': {
+		type: Number,
+		defaultValue: 0,
+	},
+  'denormalizedStats.valueCarried': {
+		type: Number,
+		defaultValue: 0,
+	},
+  'denormalizedStats.itemsAttuned': {
+		type: Number,
+		defaultValue: 0,
+	},
+  // Version of computation engine that was last used to compute this creature
+  computeVersion: {
+		type: String,
+    optional: true,
+	},
 	type: {
 		type: String,
 		defaultValue: 'pc',
 		allowedValues: ['pc', 'npc', 'monster'],
 	},
+  damageMultipliers: {
+    type: Object,
+		blackbox: true,
+		defaultValue: {}
+  },
 	variables: {
 		type: Object,
 		blackbox: true,
 		defaultValue: {}
 	},
 
+  // Tabletop
+  tabletop: {
+    type: String,
+    regEx: SimpleSchema.RegEx.id,
+    optional: true,
+  },
+  initiativeRoll: {
+    type: SimpleSchema.Integer,
+    optional: true,
+  },
+
 	// Settings
 	settings: {
 		type: CreatureSettingsSchema,
@@ -96,45 +167,85 @@ Creatures.attachSchema(CreatureSchema);
 
 const insertCreature = new ValidatedMethod({
 
-  name: 'Creatures.methods.insertCreature',
+  name: 'creatures.insertCreature',
 
   validate: null,
 
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 5,
+    timeInterval: 5000,
+  },
+
   run() {
     if (!this.userId) {
       throw new Meteor.Error('Creatures.methods.insert.denied',
       'You need to be logged in to insert a creature');
     }
+    assertUserHasPaidBenefits(this.userId);
 
 		// Create the creature document
-    let charId = Creatures.insert({
+    let creatureId = Creatures.insert({
 			owner: this.userId,
 		});
+    CreatureProperties.insert({
+      slotTags: ['base'],
+      quantityExpected: 1,
+      type: 'propertySlot',
+      name: 'Base',
+      description: 'Choose a starting point for your character, this will define the basic setup of your character sheet. Without a base, your sheet will be empty.',
+      hideWhenFull: true,
+      parent: {collection: 'creatures', id: creatureId},
+      ancestors: [{collection: 'creatures', id: creatureId}],
+      order: 0,
+      tags: [],
+      spaceLeft: 1,
+      totalFilled: 0,
+    });
 		this.unblock();
-		return charId;
+		return creatureId;
   },
 
 });
 
 const updateCreature = new ValidatedMethod({
-  name: 'Creatures.methods.update',
-  validate({_id, path, value}){
+  name: 'creatures.update',
+  validate({_id, path}){
 		if (!_id) return false;
 		// Allowed fields
-		let allowedFields = ['name', 'alignment', 'gender', 'picture', 'settings'];
+		let allowedFields = [
+      'name',
+      'alignment',
+      'gender',
+      'picture',
+      'avatarPicture',
+      'color',
+      'settings',
+    ];
 		if (!allowedFields.includes(path[0])){
 			throw new Meteor.Error('Creatures.methods.update.denied',
       'This field can\'t be updated using this method');
 		}
   },
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 5,
+    timeInterval: 5000,
+  },
   run({_id, path, value}) {
 		let creature = Creatures.findOne(_id);
     assertEditPermission(creature, this.userId);
-		Creatures.update(_id, {
-			$set: {[path.join('.')]: value},
-		});
+    if (value === undefined || value === null){
+      Creatures.update(_id, {
+        $unset: {[path.join('.')]: 1},
+      });
+    } else {
+      Creatures.update(_id, {
+        $set: {[path.join('.')]: value},
+      });
+    }
   },
 });
 
 export default Creatures;
-export { CreatureSchema, insertCreature, removeCreature, updateCreature };
+export { CreatureSchema, insertCreature, updateCreature };

app/imports/api/creature/DEFAULT_CHARACTER_DOCS.js

@@ -1,146 +0,0 @@
-// Don't just export a constant, because deep nested objects could be changed
-// by code that requires it. Exporting a function that returns the newly created
-// object is a little safer.
-export default () => ({
-  "attributes": [
-    {"name": "Strength",     "variableName": "strength",     "baseValue": 10, "type": "ability"},
-    {"name": "Dexterity",    "variableName": "dexterity",    "baseValue": 10, "type": "ability"},
-    {"name": "Constitution", "variableName": "constitution", "baseValue": 10, "type": "ability"},
-    {"name": "Intelligence", "variableName": "intelligence", "baseValue": 10, "type": "ability"},
-    {"name": "Wisdom",       "variableName": "wisdom",       "baseValue": 10, "type": "ability"},
-    {"name": "Charisma",     "variableName": "charisma",     "baseValue": 10, "type": "ability"},
-
-  	{"name": "Speed",       "variableName": "speed", "baseValue": 30, "type": "stat"},
-  	{"name": "Armor Class", "variableName": "armor", "baseValue": 10, "type": "stat"},
-
-  	{"name":  "d6 Hit Dice", "variableName":  "d6HitDice", "type": "hitDice"},
-		{"name":  "d8 Hit Dice", "variableName":  "d8HitDice", "type": "hitDice"},
-		{"name": "d10 Hit Dice", "variableName": "d10HitDice", "type": "hitDice"},
-		{"name": "d12 Hit Dice", "variableName": "d12HitDice", "type": "hitDice"},
-
-
-		{"name": "Hit Points",           "variableName": "hitPoints",     "type": "healthBar"},
-		{"name": "Temporary Hit Points", "variableName": "tempHitPoints", "type": "healthBar"},
-
-    {"name": "Ki",               "variableName": "ki",              "type": "resource"},
-    {"name": "Rages",            "variableName": "rages",           "type": "resource"},
-		{"name": "Sourcery Points",  "variableName": "sorceryPoints",   "type": "resource"},
-		{"name": "Superiority Dice", "variableName": "superiorityDice", "type": "resource"},
-		{"name": "Expertise Dice",   "variableName": "expertiseDice",   "type": "resource"},
-
-		{"name": "Level 1 Spell Slots", "variableName": "level1SpellSlots", "type": "spellSlot"},
-		{"name": "Level 2 Spell Slots", "variableName": "level2SpellSlots", "type": "spellSlot"},
-		{"name": "Level 3 Spell Slots", "variableName": "level3SpellSlots", "type": "spellSlot"},
-		{"name": "Level 4 Spell Slots", "variableName": "level4SpellSlots", "type": "spellSlot"},
-		{"name": "Level 5 Spell Slots", "variableName": "level5SpellSlots", "type": "spellSlot"},
-		{"name": "Level 6 Spell Slots", "variableName": "level6SpellSlots", "type": "spellSlot"},
-		{"name": "Level 7 Spell Slots", "variableName": "level7SpellSlots", "type": "spellSlot"},
-		{"name": "Level 8 Spell Slots", "variableName": "level8SpellSlots", "type": "spellSlot"},
-		{"name": "Level 9 Spell Slots", "variableName": "level9SpellSlots", "type": "spellSlot"},
-
-    {"name": "Proficiency Bonus", "variableName": "proficiencyBonus", "type": "modifier"},
-
-  	{"name": "Carry Capacity Multiplier", "variableName": "carryMultiplier", "type": "utility", "baseValue": 1},
-  	{"name": "Rage Damage",               "variableName": "rageDamage",      "type": "utility"},
-  ],
-
-  "skills": [
-    {"name": "Acrobatics",      "variableName": "acrobatics",     "ability": "dexterity",    "type":"skill"},
-    {"name": "Animal Handling", "variableName": "animalHandling", "ability": "wisdom",       "type":"skill"},
-    {"name": "Arcana",          "variableName": "arcana",         "ability": "intelligence", "type":"skill"},
-    {"name": "Athletics",       "variableName": "athletics",      "ability": "strength",     "type":"skill"},
-    {"name": "Deception",       "variableName": "deception",      "ability": "charisma",     "type":"skill"},
-    {"name": "History",         "variableName": "history",        "ability": "intelligence", "type":"skill"},
-    {"name": "Insight",         "variableName": "insight",        "ability": "wisdom",       "type":"skill"},
-    {"name": "Intimidation",    "variableName": "intimidation",   "ability": "charisma",     "type":"skill"},
-    {"name": "Investigation",   "variableName": "investigation",  "ability": "intelligence", "type":"skill"},
-    {"name": "Medicine",        "variableName": "medicine",       "ability": "wisdom",       "type":"skill"},
-    {"name": "Nature",          "variableName": "nature",         "ability": "intelligence", "type":"skill"},
-    {"name": "Perception",      "variableName": "perception",     "ability": "wisdom",       "type":"skill"},
-    {"name": "Performance",     "variableName": "performance",    "ability": "charisma",     "type":"skill"},
-    {"name": "Persuasion",      "variableName": "persuasion",     "ability": "charisma",     "type":"skill"},
-    {"name": "Religion",        "variableName": "religion",       "ability": "intelligence", "type":"skill"},
-    {"name": "Sleight of Hand", "variableName": "sleightOfHand",  "ability": "dexterity",    "type":"skill"},
-    {"name": "Stealth",         "variableName": "stealth",        "ability": "dexterity",    "type":"skill"},
-    {"name": "Survival",        "variableName": "survival",       "ability": "wisdom",       "type":"skill"},
-
-    {"name": "Strength Save",     "variableName": "strengthSave",     "ability": "strength",     "type":"save"},
-    {"name": "Dexterity Save",    "variableName": "dexteritySave",    "ability": "dexterity",    "type":"save"},
-    {"name": "Constitution Save", "variableName": "constitutionSave", "ability": "constitution", "type":"save"},
-    {"name": "Intelligence Save", "variableName": "intelligenceSave", "ability": "intelligence", "type":"save"},
-    {"name": "Wisdom Save",       "variableName": "wisdomSave",       "ability": "wisdom",       "type":"save"},
-    {"name": "Charisma Save",     "variableName": "charismaSave",     "ability": "charisma",     "type":"save"},
-
-    {"name": "Initiative",     "variableName": "initiative",     "ability": "dexterity",     "type":"check"},
-  ],
-
-  "damageMultipliers": [
-    {"name": "Acid Multiplier",        "variableName":"acidMultiplier"},
-    {"name": "Bludgeoning Multiplier", "variableName":"bludgeoningMultiplier"},
-    {"name": "Cold Multiplier",        "variableName":"coldMultiplier"},
-    {"name": "Fire Multiplier",        "variableName":"fireMultiplier"},
-    {"name": "Force Multiplier",       "variableName":"forceMultiplier"},
-    {"name": "Lightning Multiplier",   "variableName":"lightningMultiplier"},
-    {"name": "Necrotic Multiplier",    "variableName":"necroticMultiplier"},
-    {"name": "Piercing Multiplier",    "variableName":"piercingMultiplier"},
-    {"name": "Poison Multiplier",      "variableName":"poisonMultiplier"},
-    {"name": "Psychic Multiplier",     "variableName":"psychicMultiplier"},
-    {"name": "Radiant Multiplier",     "variableName":"radiantMultiplier"},
-    {"name": "Slashing Multiplier",    "variableName":"slashingMultiplier"},
-    {"name": "Thunder Multiplier",     "variableName":"thunderMultiplier"},
-  ],
-
-  "effects": [
-    {
-      "name": "Proficiency bonus by level",
-      "stat": "proficiencyBonus",
-      "operation": "add",
-      "calculation": "floor(level / 4 + 1.75)",
-      "enabled": true,
-    },{
-      "name": "Constitution modifier per level",
-      "stat": "hitPoints",
-      "operation": "add",
-      "calculation": "constitutionMod * level",
-      "enabled": true,
-    },
-  ],
-
-  "containers": [
-    {
-			"name": "Coin Pouch",
-			"isCarried": true,
-			"description": "A sturdy pouch for coins",
-      "items": [
-        {
-    			"name": "Gold piece",
-    			"plural": "Gold pieces",
-    			"quantity": 0,
-    			"weight": 0.02,
-    			"value": 1,
-    			"settings": {
-    				"showIncrement": true,
-    			},
-        }, {
-    			"name": "Silver piece",
-    			"plural": "Silver pieces",
-    			"quantity": 0,
-    			"weight": 0.02,
-    			"value": 0.1,
-    			"settings": {
-    				"showIncrement": true,
-    			},
-    		}, {
-    			"name": "Copper piece",
-    			"plural": "Copper pieces",
-    			"quantity": 0,
-    			"weight": 0.02,
-    			"value": 0.01,
-    			"settings": {
-    				"showIncrement": true,
-    			},
-        },
-      ],
-    },
-  ],
-});

app/imports/api/creature/Parties.js

@@ -0,0 +1,28 @@
+import SimpleSchema from 'simpl-schema';
+
+let Parties = new Mongo.Collection('parties');
+
+let partySchema = new SimpleSchema({
+	name: {
+		type: String,
+		defaultValue: 'New Party',
+		trim: false,
+		optional: true,
+	},
+	creatures: {
+		type: Array,
+		defaultValue: [],
+	},
+	'creatures.$': {
+		type: String,
+		regEx: SimpleSchema.RegEx.Id,
+	},
+	owner: {
+		type: String,
+		regEx: SimpleSchema.RegEx.Id,
+	},
+});
+
+Parties.attachSchema(partySchema);
+
+export default Parties;

app/imports/api/creature/actions/applyAction.js

@@ -0,0 +1,13 @@
+import spendResources from '/imports/api/creature/actions/spendResources.js'
+import embedInlineCalculations from '/imports/api/creature/computation/afterComputation/embedInlineCalculations.js';
+
+export default function applyAction({prop, log}){
+  let content = { name: prop.name };
+  if (prop.summary){
+    content.description = embedInlineCalculations(
+      prop.summary, prop.summaryCalculations
+    );
+  }
+  log.content.push(content);
+  spendResources({prop, log});
+}

app/imports/api/creature/actions/applyAdjustment.js

@@ -0,0 +1,54 @@
+import evaluateString from '/imports/api/creature/computation/afterComputation/evaluateString.js';
+import damagePropertiesByName from '/imports/api/creature/creatureProperties/methods/damagePropertiesByName.js';
+
+export default function applyAdjustment({
+  prop,
+  creature,
+  targets,
+  actionContext,
+  log
+}){
+  let damageTargets = prop.target === 'self' ? [creature] : targets;
+  let scope = {
+    ...creature.variables,
+    ...actionContext,
+  };
+  try {
+    var {result, errors} = evaluateString(prop.amount, scope, 'reduce');
+    if (typeof result !== 'number') {
+      log.content.push({
+        name: 'Attribute damage',
+        error: errors.join(', ') || 'Something went wrong',
+      });
+    }
+  } catch (e){
+    log.content.push({
+      name: 'Attribute damage',
+      error: e.toString(),
+    });
+  }
+  if (damageTargets) {
+    damageTargets.forEach(target => {
+      if (prop.target === 'each'){
+        result = evaluateString(prop.amount, scope, 'reduce');
+      }
+      damagePropertiesByName.call({
+        creatureId: target._id,
+        variableName: prop.stat,
+        operation: prop.operation || 'increment',
+        value: result
+      });
+      log.content.push({
+        name: 'Attribute damage',
+        resultPrefix: `${prop.stat} ${prop.operation === 'set' ? 'set to' : ''}`,
+        result: `${-result}`,
+      });
+    });
+  } else {
+    log.content.push({
+      name: 'Attribute damage',
+      resultPrefix: `${prop.stat} ${prop.operation === 'set' ? 'set to' : ''}`,
+      result: `${-result}`,
+    });
+  }
+}

app/imports/api/creature/actions/applyAttack.js

@@ -0,0 +1,23 @@
+import roll from '/imports/parser/roll.js';
+
+export default function applyAttack({
+  prop,
+  log,
+  actionContext,
+  creature,
+}){
+  let value = roll(1, 20)[0];
+  actionContext.attackRoll = {value};
+  let criticalHitTarget = creature.variables.criticalHitTarget &&
+    creature.variables.criticalHitTarget.currentValue || 20;
+  let criticalHit = value >= criticalHitTarget;
+  if (criticalHit) actionContext.criticalHit = {value: true};
+  let result = value + prop.rollBonusResult;
+  actionContext.toHit = {value: result};
+
+  log.content.push({
+    name: criticalHit ? 'Critical Hit!' : 'To Hit',
+    resultPrefix: `1d20 [${value}] + ${prop.rollBonusResult} = `,
+    result,
+  });
+}

app/imports/api/creature/actions/applyBuff.js

@@ -0,0 +1,67 @@
+import {
+	setLineageOfDocs,
+	renewDocIds
+} from '/imports/api/parenting/parenting.js';
+import {setDocToLastOrder} from '/imports/api/parenting/order.js';
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+import { recomputeCreatureByDoc } from '/imports/api/creature/computation/methods/recomputeCreature.js';
+
+export default function applyBuff({
+  prop,
+  children,
+  creature,
+  targets = [],
+  //actionContext,
+}){
+  let buffTargets = prop.target === 'self' ? [creature] : targets;
+
+  //let scope = {
+  //  ...creature.variables,
+  //  ...actionContext,
+  //};
+
+  // TODO
+  // If the target is not self, walk through all decendants and replace
+  // variables in calculations with their values from the creature scope
+  // If the target is self, replace all the target.x references with just x
+
+  // Then copy the decendants of the buff to the targets
+  prop.applied = true;
+  let propList = [prop];
+  function addChildrenToPropList(children){
+    children.forEach(child => {
+      propList.push(child.node);
+      addChildrenToPropList(child.children);
+    });
+  }
+  addChildrenToPropList(children);
+  let oldParent = {
+    id: prop.parent.id,
+    collection: prop.parent.collection,
+  };
+  buffTargets.forEach(target => {
+    copyNodeListToTarget(propList, target, oldParent);
+  });
+}
+
+function copyNodeListToTarget(propList, target, oldParent){
+  let ancestry = [{collection: 'creatures', id: target._id}];
+  setLineageOfDocs({
+    docArray: propList,
+    newAncestry: ancestry,
+    oldParent,
+  });
+  renewDocIds({
+    docArray: propList,
+  });
+  setDocToLastOrder({
+    collection: CreatureProperties,
+    doc: propList[0],
+  });
+
+  CreatureProperties.batchInsert(propList, () => {
+    // This insert is racing the main recompute, recmpute again after it's
+    // certainly finished
+    recomputeCreatureByDoc(target);
+  });
+}

app/imports/api/creature/actions/applyDamage.js

@@ -0,0 +1,89 @@
+import evaluateString from '/imports/api/creature/computation/afterComputation/evaluateString.js';
+import dealDamage from '/imports/api/creature/creatureProperties/methods/dealDamage.js';
+import {insertCreatureLog} from '/imports/api/creature/log/CreatureLogs.js';
+import { CompilationContext } from '/imports/parser/parser.js';
+
+export default function applyDamage({
+  prop,
+  creature,
+  targets,
+  actionContext,
+  log,
+}){
+  let damageTargets = prop.target === 'self' ? [creature] : targets;
+  let scope = {
+    ...creature.variables,
+    ...actionContext,
+  };
+  if (targets.length === 1){
+    scope.target = targets[0].variables;
+  }
+  let criticalHit = !!(
+    actionContext.criticalHit &&
+    actionContext.criticalHit.value &&
+    prop.damageType !== 'healing' // Can't critically heal
+  );
+  let context = new CompilationContext({
+    doubleRolls: criticalHit,
+  });
+  try {
+    var {result, errors} = evaluateString(prop.amount, scope, 'reduce', context);
+    if (typeof result !== 'number') {
+      log.content.push({
+        error: errors.join(', '),
+      });
+    }
+  } catch (e){
+    log.content.push({
+      error: e.toString(),
+    });
+  }
+  let suffix = (criticalHit ? ' critical ' : '') +
+    prop.damageType +
+    (prop.damageType !== 'healing' ? ' damage': '');
+
+  if (damageTargets && damageTargets.length) {
+    damageTargets.forEach(target => {
+      let name = prop.damageType === 'healing' ? 'Healing' : 'Damage';
+      if (prop.target === 'each'){
+        result = evaluateString(prop.amount, scope, 'reduce');
+      }
+      let damageDealt = dealDamage.call({
+        creatureId: target._id,
+        damageType: prop.damageType,
+        amount: result,
+      });
+      if (target._id === creature._id){
+        log.content.push({
+          name,
+          result: damageDealt,
+          details: suffix + 'to self',
+        });
+      } else {
+        log.content.push({
+          name,
+          resultPrefix: 'Dealt ',
+          result: damageDealt,
+          details: suffix + `${target.name && ' to '}${target.name}`,
+        });
+        insertCreatureLog.call({
+          log: {
+            content: [{
+              name,
+              resultPrefix: 'Recieved ',
+              result: damageDealt,
+              details: suffix,
+            }],
+            creatureId: target._id,
+          }
+        });
+      }
+    });
+  } else {
+    log.content.push({
+      name: prop.damageType === 'healing' ? 'Healing' : 'Damage',
+      result,
+      details: suffix,
+    });
+  }
+}

app/imports/api/creature/actions/applyProperties.js

@@ -0,0 +1,81 @@
+import applyAction from '/imports/api/creature/actions/applyAction.js';
+import applyAdjustment from '/imports/api/creature/actions/applyAdjustment.js';
+import applyAttack from '/imports/api/creature/actions/applyAttack.js';
+import applyBuff from '/imports/api/creature/actions/applyBuff.js';
+import applyDamage from '/imports/api/creature/actions/applyDamage.js';
+import applyRoll from '/imports/api/creature/actions/applyRoll.js';
+import applyToggle from '/imports/api/creature/actions/applyToggle.js';
+import applySave from '/imports/api/creature/actions/applySave.js';
+
+function applyProperty(options){
+  let prop = options.prop;
+  if (prop.type === 'buff'){
+    // ignore only applied buffs
+    if (prop.applied === true){
+      return false;
+    }
+  // Only ignore toggles if they wont be computed
+  } else if (prop.type === 'toggle') {
+    if (prop.disabled) return false;
+    if (prop.enabled) return true;
+    if (!prop.condition) return false;
+  // Ignore inactive props of other types
+  } else if (prop.deactivatedBySelf === true){
+    return false;
+  }
+  switch (prop.type){
+    case 'action':
+    case 'spell':
+      applyAction(options);
+      break;
+    case 'attack':
+      applyAction(options);
+      applyAttack(options);
+      break;
+    case 'damage':
+      applyDamage(options);
+      break;
+    case 'adjustment':
+      applyAdjustment(options);
+      break;
+    case 'buff':
+      applyBuff(options);
+      break;
+    case 'toggle':
+      return applyToggle(options);
+    case 'roll':
+      applyRoll(options);
+      break;
+    case 'savingThrow':
+      return applySave(options);
+  }
+  return true;
+}
+
+function applyPropertyAndWalkChildren({prop, children, targets, ...options}){
+  let shouldKeepWalking = applyProperty({ prop, children, targets, ...options });
+  if (shouldKeepWalking){
+    applyProperties({ forest: children, targets, ...options,});
+  }
+}
+
+export default function applyProperties({ forest, targets, ...options}){
+  forest.forEach(node => {
+    let prop = node.node;
+    let children = node.children;
+    if (shouldSplit(prop) && targets.length){
+      targets.forEach(target => {
+        let targets = [target]
+        applyPropertyAndWalkChildren({ targets, prop, children, ...options});
+      });
+    } else {
+      applyPropertyAndWalkChildren({prop, children, targets, ...options});
+    }
+  });
+}
+
+function shouldSplit(prop){
+  if (prop.target === 'each'){
+    return true;
+  }
+}

app/imports/api/creature/actions/applyRoll.js

@@ -0,0 +1,32 @@
+import evaluateString from '/imports/api/creature/computation/afterComputation/evaluateString.js';
+
+export default function applyRoll({
+  prop,
+  creature,
+  actionContext,
+  log,
+}){
+  let scope = {
+    ...creature.variables,
+    ...actionContext,
+  };
+  try {
+    var {result, errors} = evaluateString(prop.roll, scope, 'reduce');
+    actionContext[prop.variableName] = result;
+    log.content.push({
+      name: prop.name,
+      resultPrefix: prop.variableName + ' = ' + prop.roll + ' = ',
+      result,
+    });
+    if (errors.length) {
+      log.content.push({
+        error: errors.join(', '),
+      });
+    }
+
+  } catch (e){
+    log.content.push({
+      error: e.toString(),
+    });
+  }
+}

app/imports/api/creature/actions/applySave.js

@@ -0,0 +1,79 @@
+import evaluateString from '/imports/api/creature/computation/afterComputation/evaluateString.js';
+import CreaturesProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+import roll from '/imports/parser/roll.js';
+
+export default function applySave({
+  prop,
+  creature,
+  actionContext,
+  log,
+}){
+  let scope = {
+    ...creature.variables,
+    ...actionContext,
+  };
+  try {
+    // Calculate the DC
+    var {result, errors} = evaluateString(prop.dc, scope, 'reduce');
+    let dc = result;
+    log.content.push({
+      name: prop.name,
+      resultPrefix: ' DC ',
+      result,
+    });
+    if (errors.length) {
+      log.content.push({
+        error: errors.join(', '),
+      });
+      return false;
+    }
+    if (prop.target === 'self'){
+      let save = CreaturesProperties.findOne({
+        'ancestors.id': creature._id,
+        type: 'skill',
+        skillType: 'save',
+        variableName: prop.stat,
+        removed: {$ne: true},
+        inactive: {$ne: true},
+      });
+      if (!save){
+        log.content.push({
+          error: 'No saving throw found: ' + prop.stat,
+        });
+        return;
+      }
+      let value, values, resultPrefix;
+      if (save.advantage === 1){
+        values = roll(2, 20).sort().reverse();
+        value = values[0];
+        resultPrefix = `Advantage: 1d20 [${values[0]},~~${values[1]}~~] + ${save.value} = `
+      } else if (save.advantage === -1){
+        values = roll(2, 20).sort();
+        value = values[0];
+        resultPrefix = `Disadvantage: 1d20 [${values[0]},~~${values[1]}~~] + ${save.value} = `
+      } else {
+        values = roll(1, 20);
+        value = values[0];
+        resultPrefix = `1d20 [${value}] + ${save.value} = `
+      }
+      actionContext.savingThrowRoll = {value};
+      let result = value + save.value;
+      actionContext.savingThrow = {value: result};
+      let saveSuccess = result >= dc;
+      log.content.push({
+        name: 'Save',
+        resultPrefix,
+        result,
+        details: saveSuccess ? 'Passed' : 'Failed'
+      });
+      return !saveSuccess;
+    } else {
+      // TODO
+      return true;
+    }
+  } catch (e){
+    log.content.push({
+      error: e.toString(),
+    });
+  }
+}

app/imports/api/creature/actions/applyToggle.js

@@ -0,0 +1,35 @@
+import evaluateString from '/imports/api/creature/computation/afterComputation/evaluateString.js';
+
+export default function applyToggle({
+  prop,
+  creature,
+  actionContext,
+  log,
+}){
+  let scope = {
+    ...creature.variables,
+    ...actionContext,
+  };
+  if (Number.isFinite(+prop.condition)){
+    return !!+prop.condition;
+  }
+  try {
+    var {result, errors} = evaluateString(prop.condition, scope, 'reduce');
+    if (typeof result !== 'number' && typeof result !== 'boolean') {
+      log.content.push({
+        error: errors.join(', '),
+      });
+      return false;
+    }
+    log.content.push({
+      name: prop.name,
+      resultPrefix: prop.condition + ' = ',
+      result,
+    });
+    return !!result;
+  } catch (e){
+    log.content.push({
+      error: e.toString(),
+    });
+  }
+}

app/imports/api/creature/actions/castSpellWithSlot.js

@@ -0,0 +1,79 @@
+import SimpleSchema from 'simpl-schema';
+import { ValidatedMethod } from 'meteor/mdg:validated-method';
+import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+import Creatures from '/imports/api/creature/Creatures.js';
+import { damagePropertyWork } from '/imports/api/creature/creatureProperties/methods/damageProperty.js';
+import { assertEditPermission } from '/imports/api/creature/creaturePermissions.js';
+import { recomputeCreatureByDoc } from '/imports/api/creature/computation/methods/recomputeCreature.js';
+import { doActionWork } from '/imports/api/creature/actions/doAction.js';
+import getRootCreatureAncestor from '/imports/api/creature/creatureProperties/getRootCreatureAncestor.js';
+
+const castSpellWithSlot = new ValidatedMethod({
+  name: 'creatureProperties.castSpellWithSlot',
+  validate: new SimpleSchema({
+    spellId: SimpleSchema.RegEx.Id,
+    slotId: {
+      type: String,
+      regEx: SimpleSchema.RegEx.Id,
+      optional: true,
+    },
+    targetId: {
+      type: String,
+      regEx: SimpleSchema.RegEx.Id,
+      optional: true,
+    },
+  }).validator(),
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 10,
+    timeInterval: 5000,
+  },
+  run({spellId, slotId, targetId}) {
+    let spell = CreatureProperties.findOne(spellId);
+		// Check permissions
+    let creature = getRootCreatureAncestor(spell);
+    assertEditPermission(creature, this.userId);
+    let target = undefined;
+    if (targetId) {
+      target = Creatures.findOne(targetId);
+      assertEditPermission(target, this.userId);
+    }
+    let slotLevel = spell.level || 0;
+    if (slotLevel !== 0){
+      let slot = CreatureProperties.findOne(slotId);
+      if (!slot){
+        throw new Meteor.Error('No slot',
+          'Slot not found to cast spell');
+      }
+      if (!slot.currentValue){
+        throw new Meteor.Error('No slot',
+          'Slot depleted');
+      }
+      if (!(slot.spellSlotLevelValue >= spell.level)){
+        throw new Meteor.Error('Slot too small',
+          'Slot is not large enough to cast spell');
+      }
+      slotLevel = slot.spellSlotLevelValue;
+      damagePropertyWork({
+        property: slot,
+        operation: 'increment',
+        value: 1,
+      });
+    }
+		doActionWork({
+      action: spell,
+      context: {slotLevel},
+      creature,
+      target,
+      method: this,
+    });
+    // Note this only recomputes the top-level creature, not the nearest one
+		recomputeCreatureByDoc(creature);
+    if (target){
+      recomputeCreatureByDoc(target);
+    }
+  },
+});
+
+export default castSpellWithSlot;

app/imports/api/creature/actions/doAction.js

@@ -0,0 +1,88 @@
+import SimpleSchema from 'simpl-schema';
+import { ValidatedMethod } from 'meteor/mdg:validated-method';
+import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+import Creatures from '/imports/api/creature/Creatures.js';
+import { CreatureLogSchema, insertCreatureLogWork } from '/imports/api/creature/log/CreatureLogs.js';
+import getRootCreatureAncestor from '/imports/api/creature/creatureProperties/getRootCreatureAncestor.js';
+import { assertEditPermission } from '/imports/api/creature/creaturePermissions.js';
+import { recomputeCreatureByDoc } from '/imports/api/creature/computation/methods/recomputeCreature.js';
+import { nodesToTree } from '/imports/api/parenting/parenting.js';
+import applyProperties from '/imports/api/creature/actions/applyProperties.js';
+import recomputeInventory from '/imports/api/creature/denormalise/recomputeInventory.js';
+
+const doAction = new ValidatedMethod({
+  name: 'creatureProperties.doAction',
+  validate: new SimpleSchema({
+    actionId: SimpleSchema.RegEx.Id,
+    targetIds: {
+      type: Array,
+      defaultValue: [],
+      maxCount: 10,
+      optional: true,
+    },
+    'targetIds.$': {
+      type: String,
+      regEx: SimpleSchema.RegEx.Id,
+    },
+  }).validator(),
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 10,
+    timeInterval: 5000,
+  },
+  run({actionId, targetIds = []}) {
+    let action = CreatureProperties.findOne(actionId);
+		// Check permissions
+    let creature = getRootCreatureAncestor(action);
+    assertEditPermission(creature, this.userId);
+    let targets = [];
+    targetIds.forEach(targetId => {
+      let target = Creatures.findOne(targetId);
+      assertEditPermission(target, this.userId);
+      targets.push(target);
+    });
+		doActionWork({action, creature, targets, method: this});
+
+    // The acting creature might have used ammo
+    recomputeInventory(creature._id);
+    // recompute creatures
+		recomputeCreatureByDoc(creature);
+    targets.forEach(target => {
+      recomputeCreatureByDoc(target);
+    });
+  },
+});
+
+export function doActionWork({
+  action,
+  creature,
+  targets,
+  context = {},
+  method
+}){
+  // Create the log
+  let log = CreatureLogSchema.clean({
+    creatureId: creature._id,
+    creatureName: creature.name,
+  });
+
+  let decendantForest = nodesToTree({
+    collection: CreatureProperties,
+    ancestorId: action._id,
+  });
+  let startingForest = [{
+    node: action,
+    children: decendantForest,
+  }];
+  applyProperties({
+    forest: startingForest,
+    actionContext: context,
+    creature,
+    targets,
+    log,
+  });
+  insertCreatureLogWork({log, creature, method});
+}
+
+export default doAction;

app/imports/api/creature/actions/doCheck.js

@@ -0,0 +1,56 @@
+import SimpleSchema from 'simpl-schema';
+import { ValidatedMethod } from 'meteor/mdg:validated-method';
+import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
+import Creatures from '/imports/api/creature/Creatures.js';
+import { assertEditPermission } from '/imports/api/creature/creaturePermissions.js';
+import roll from '/imports/parser/roll.js';
+
+const doCheck = new ValidatedMethod({
+  name: 'creature.doCheck',
+  validate: new SimpleSchema({
+    creatureId: {
+      type: String,
+      regEx: SimpleSchema.RegEx.Id,
+      optional: true,
+    },
+    attributeName: {
+      type: String,
+      optional: true,
+    },
+  }).validator(),
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 10,
+    timeInterval: 5000,
+  },
+  run({creatureId, attributeName}) {
+    let creature = Creatures.findOne(creatureId);
+    assertEditPermission(creature, this.userId);
+    let bonus = getAttributeValue({creature, attributeName})
+		return doCheckWork({bonus});
+  },
+});
+
+function getAttributeValue({creature, attributeName}){
+  let att = creature.variables[attributeName];
+  if (!att) throw new Meteor.Error('No such attribute',
+    `This creature does not have a ${attributeName} property`);
+  let bonus = att.attributeType === 'ability'? att.modifier : att.value;
+  return bonus || 0;
+}
+
+export function doCheckWork({bonus, advantage = 0}){
+  let rolls = roll(2,20);
+  let chosenRoll;
+  if (advantage === 1){
+    chosenRoll = Math.max.apply(rolls);
+  } else if (advantage === -1){
+    chosenRoll = Math.min.apply(rolls);
+  } else {
+    chosenRoll = rolls[0];
+  }
+  let result = chosenRoll + bonus;
+  return {rolls, bonus, chosenRoll, result};
+}
+
+export default doCheck;

app/imports/api/creature/actions/spendResources.js

@@ -0,0 +1,93 @@
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+import { adjustQuantityWork } from '/imports/api/creature/creatureProperties/methods/adjustQuantity.js';
+import { damagePropertyWork } from '/imports/api/creature/creatureProperties/methods/damageProperty.js';
+
+export default function spendResources({prop, log}){
+  // Check Uses
+  if (prop.usesUsed >= prop.usesResult){
+    throw new Meteor.Error('Insufficient Uses',
+      'This prop has no uses left');
+  }
+  // Resources
+  if (prop.insufficientResources){
+    throw new Meteor.Error('Insufficient Resources',
+      'This creature doesn\'t have sufficient resources to perform this prop');
+  }
+  // Items
+  let itemQuantityAdjustments = [];
+  let spendLog = [];
+  let gainLog = [];
+  prop.resources.itemsConsumed.forEach(itemConsumed => {
+    if (!itemConsumed.itemId){
+      throw new Meteor.Error('Ammo not selected',
+        'No ammo was selected for this prop');
+    }
+    let item = CreatureProperties.findOne(itemConsumed.itemId);
+    if (!item || item.ancestors[0].id !== prop.ancestors[0].id){
+      throw new Meteor.Error('Ammo not found',
+        'The prop\'s ammo was not found on the creature');
+    }
+    if (!item.equipped){
+      throw new Meteor.Error('Ammo not equipped',
+        'The selected ammo is not equipped');
+    }
+    if (!itemConsumed.quantity) return;
+    itemQuantityAdjustments.push({
+      property: item,
+      operation: 'increment',
+      value: itemConsumed.quantity,
+    });
+    let logName = item.name;
+    if (itemConsumed.quantity > 1 || itemConsumed.quantity < -1){
+      logName = item.plural || logName;
+    }
+    if (itemConsumed.quantity > 0){
+      spendLog.push(logName + ': ' + itemConsumed.quantity);
+    } else if (itemConsumed.quantity < 0){
+      gainLog.push(logName + ': ' + -itemConsumed.quantity);
+    }
+  });
+  // No more errors should be thrown after this line
+  // Now that we have confirmed that there are no errors, do actual work
+  //Items
+  itemQuantityAdjustments.forEach(adjustQuantityWork);
+  
+  // Use uses
+  if (prop.usesResult){
+    CreatureProperties.update(prop._id, {
+      $inc: {usesUsed: 1}
+    }, {
+      selector: prop
+    });
+    log.content.push({
+      name: 'Uses left',
+      result: prop.usesResult - prop.usesUsed - 1,
+    });
+  }
+
+  // Damage stats
+  prop.resources.attributesConsumed.forEach(attConsumed => {
+    if (!attConsumed.quantity) return;
+    let stat = CreatureProperties.findOne(attConsumed.statId);
+    damagePropertyWork({
+      property: stat,
+      operation: 'increment',
+      value: attConsumed.quantity,
+    });
+    if (attConsumed.quantity > 0){
+      spendLog.push(stat.name + ': ' + attConsumed.quantity);
+    } else if (attConsumed.quantity < 0){
+      gainLog.push(stat.name + ': ' + -attConsumed.quantity);
+    }
+  });
+
+  // Log all the spending
+  if (gainLog.length) log.content.push({
+    name: 'Gained',
+    description: gainLog.join('\n'),
+  });
+  if (spendLog.length) log.content.push({
+    name: 'Spent',
+    description: spendLog.join('\n'),
+  });
+}

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

@@ -1,187 +0,0 @@
-import { includes, cloneDeep, has } from 'lodash';
-
-export default class ComputationMemo {
-  constructor(props){
-    this.statsByVariableName = {};
-    this.originalPropsById = {};
-    this.propsById = {};
-    this.skillsByAbility = {};
-    this.unassignedEffects = [];
-    props.filter((prop) => {
-      // skip effects, proficiencies, and class levels for the next pass
-      if (
-        prop.type === 'effect' ||
-        prop.type === 'proficiency' ||
-        prop.type === 'classLevel'
-      ) return true;
-      // Add all the stats
-      this.addStat(prop);
-    }).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);
-    return prop;
-  }
-  storeHighestClassLevel(name, prop){
-    // Only store the highest level classLevel
-    let stat = this.statsByVariableName[name]
-    if (!stat){
-      this.statsByVariableName[name] = prop;
-    } else if (!has(stat, 'level')){
-      // Stat is overriden by an attribute
-      return;
-    } else if (stat.level < prop.level) {
-      this.statsByVariableName[name] = prop;
-    }
-  }
-  addClassLevel(prop){
-    prop = this.registerProperty(prop);
-    if (prop.variableName){
-      this.storeHighestClassLevel(prop.variableName, prop);
-    }
-    if (prop.baseClass){
-      this.storeHighestClassLevel(prop.baseClass, prop);
-    }
-  }
-  addStat(prop){
-    prop = this.registerProperty(prop);
-    let variableName = prop.variableName;
-    if (!variableName) return;
-    if (this.statsByVariableName[variableName]){
-      prop.value = NaN;
-      prop.computationDetails.error = 'variableNameCollision';
-      console.warn('variableNameCollision', prop);
-      return;
-    }
-    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 => {
-      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] || [];
-        targets.add(...extras)
-      }
-    });
-    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) && isSkillCheck(prop)) {
-        let extras = this.skillsByAbility[statName] || [];
-        targets.add(...extras)
-      }
-    });
-    return targets;
-  }
-}
-
-const skillOperations = [
-  'advantage',
-  'disadvantage',
-  'passiveAdd',
-  'fail',
-  'conditional',
-  'rollBonus',
-];
-
-function isAbility(prop){
-  return prop.type === 'attribute' &&
-  prop.attributeType === 'ability'
-}
-
-function isSkillCheck(prop){
-  return includes(['skill', 'check', 'save', 'utility'], prop.skillType);
-}
-
-function isSkillOperation(prop){
-  return skillOperations.includes(prop.operation);
-}
-
-function propDetails(prop){
-  return propDetailsByType[prop.type]() || {};
-}
-
-const propDetailsByType = {
-  attribute(){
-    return {
-      computed: false,
-      busyComputing: false,
-      effects: [],
-    };
-  },
-  skill(){
-    return {
-      computed: false,
-      busyComputing: false,
-      effects: [],
-      proficiencies: [],
-    };
-  },
-  effect(){
-    return {
-      computed: false,
-    };
-  },
-  classLevel(){
-    return {
-      computed: true,
-    };
-  },
-  proficiency(){
-    return {};
-  },
-  damageMultiplier(){
-    return {};
-  },
-}

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

@@ -0,0 +1,11 @@
+import INLINE_CALCULATION_REGEX from '/imports/constants/INLINE_CALCULTION_REGEX.js';
+
+export default function embedInlineCalculations(string, calculations){
+  if (!string) return '';
+  if (!calculations) return string;
+  let index = 0;
+  return string.replace(INLINE_CALCULATION_REGEX, substring => {
+    let comp = calculations && calculations[index++];
+    return (comp && 'result' in comp) ? comp.result : substring;
+  });
+}

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

@@ -1,7 +1,7 @@
-import * as math from 'mathjs';
-import  replaceBareSymbolsWithValueAccessor from '/imports/api/creature/computation/utility/replaceBareSymbolsWithValueAccessor.js';
+import { parse, CompilationContext } from '/imports/parser/parser.js';
+import ConstantNode from '/imports/parser/parseTree/ConstantNode.js';
 
-export default function evaluateString(string, scope){
+export default function evaluateString(string, scope, fn = 'compile', context){
   let errors = [];
   if (!string){
     errors.push('No string provided');
@@ -11,88 +11,20 @@ export default function evaluateString(string, scope){
   if (!scope) errors.push('No scope provided');
 
   // Parse the string using mathjs
-  let calc;
+  let node;
   try {
-    calc = math.parse(string);
+    node = parse(string);
   } catch (e) {
     errors.push(e);
     return {result: string, errors};
   }
-
-  // Replace all bare symbols with symbol.value
-  let transformedCalc = calc.transform(replaceBareSymbolsWithValueAccessor);
-
-  // 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(calc, scope).toHTML();
-      return {result, errors};
-    } catch (e2){
-      errors.push(e2);
-      return {result: calc.toHTML(), errors};
-    }
+  if (!context){
+    context = new CompilationContext({});
+  }
+  let result = node[fn](scope, context);
+  if (result instanceof ConstantNode){
+    return {result: result.value, errors: context.errors}
+  } else {
+    return {result: result.toString(), errors: context.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

@@ -2,6 +2,8 @@ import evaluateString from '/imports/api/creature/computation/afterComputation/e
 
 // Strings can have computations in bracers like so: {computation}
 export default function evalutateStringWithEmbeddedCalculations(string, scope){
+  console.warn('evalutateStringWithEmbeddedCalculations should be replaced with ' +
+  'fetching the result from the compuations on the property doc');
 	if (!string) return string;
   // Compute everything inside bracers
 	return string.replace(/\{([^{}]*)\}/g, function(match, p1){

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

@@ -1,73 +0,0 @@
-import computeStat from '/imports/api/creature/computation/computeStat.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 combineAttribute(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 (!stat.decimal) result = Math.floor(result);
-  stat.value = result;
-  stat.baseValue = aggregator.statBaseValue;
-  if (stat.attributeType === 'ability') {
-    stat.modifier = Math.floor((result - 10) / 2);
-  }
-  stat.currentValue = stat.value - (stat.damage || 0);
-}
-
-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];
-    if (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;
-
-  /** TODO level needs to be on the memo somewhere
-  if (typeof profBonus !== "number"){
-    profBonus = Math.floor(char.level / 4 + 1.75);
-  }
-  */
-  // Multiply the proficiency bonus by the actual proficiency
-  profBonus *= stat.proficiency;
-  // Combine everything to get the final result
-  let result = (stat.abilityMod + profBonus + aggregator.add) * aggregator.mul;
-  if (result < aggregator.min) result = aggregator.min;
-  if (result > aggregator.max) result = aggregator.max;
-  result = Math.floor(result);
-  if (stat.base > result) result = stat.base;
-  stat.value = result;
-}
-
-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

@@ -1,15 +0,0 @@
-import evaluateCalculation from '/imports/api/creature/computation/evaluateCalculation.js';
-
-export default function computeEffect(effect, memo){
-  if (effect.computationDetails.computed) return;
-  if (_.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 {
-    effect.result = evaluateCalculation(effect.calculation, memo);
-  }
-  effect.computationDetails.computed = true;
-}

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

@@ -1,12 +0,0 @@
-import { each, forOwn } from 'lodash';
-import computeStat from '/imports/api/creature/computation/computeStat.js';
-import computeEffect from '/imports/api/creature/computation/computeEffect.js';
-
-export default function computeMemo(memo){
-  forOwn(memo.statsByVariableName, (stat) => {
-    computeStat (stat, memo);
-  });
-  each(memo.unassignedEffects, (effect) => {
-    computeEffect(effect, memo);
-  });
-}

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

@@ -1,30 +0,0 @@
-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 { 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';
-    console.warn('dependencyLoop', stat);
-    return;
-  }
-  // Compute and aggregate all the effects
-  let aggregator = new EffectAggregator(stat, memo)
-  each(stat.computationDetails.effects, (effect) => {
-    computeEffect(effect, memo);
-    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/engine/ComputationMemo.js

@@ -0,0 +1,318 @@
+import { includes, cloneDeep } from 'lodash';
+import findAncestorByType from '/imports/api/creature/computation/engine/findAncestorByType.js';
+
+// The computation memo is an in-memory data structure used only during the
+// computation process
+export default class ComputationMemo {
+  constructor(props, creature){
+    this.statsByVariableName = {};
+    this.constantsByVariableName = {};
+    this.extraStatsByVariableName = {};
+    this.statsById = {};
+    this.originalPropsById = {};
+    this.propsById = {};
+    this.skillsByAbility = {};
+    this.unassignedEffects = [];
+    this.classLevelsById = {};
+    this.classes = {};
+    this.togglesById = {};
+    this.toggleIds = new Set();
+    // Equipped items that might be used as ammo
+    this.equipmentById = {};
+    // Properties that have calculations, but don't impact other properties
+    this.endStepPropsById = {};
+    // 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 if (
+        prop.type === 'item'
+      ) {
+        this.addEquipment(prop);
+      } else {
+        return true;
+      }
+    }).forEach((prop) => {
+      // Now add everything else
+      if (prop.type === 'effect'){
+        this.addEffect(prop);
+      } else if (prop.type === 'proficiency') {
+        this.addProficiency(prop);
+      } else if (prop.type === 'classLevel'){
+        this.addClassLevel(prop);
+      } else if (prop.type === 'constant'){
+        this.addConstant(prop);
+      } else {
+        this.addEndStepProp(prop);
+      }
+    });
+    for (let name in creature.denormalizedStats){
+      if (!this.statsByVariableName[name]){
+        this.statsByVariableName[name] = {
+          variableName: name,
+          value: creature.denormalizedStats[name],
+          computationDetails: propDetailsByType.denormalizedStat(),
+        }
+      }
+    }
+  }
+  addConstant(prop){
+    prop = this.registerProperty(prop);
+    if (
+      !this.constantsByVariableName[prop.variableName]
+    ){
+      this.constantsByVariableName[prop.variableName] = prop
+    }
+  }
+  registerProperty(prop){
+    this.originalPropsById[prop._id] = cloneDeep(prop);
+    this.propsById[prop._id] = prop;
+    prop.dependencies = [];
+    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,
+          dependencies: [],
+        });
+      }
+      if (prop.baseProficiency){
+        existingStat.computationDetails.proficiencies.push({
+          value: prop.baseProficiency,
+          stats: [variableName],
+          computationDetails: propDetailsByType.proficiency(),
+          type: 'proficiency',
+          statBase: true,
+          dependencies: [],
+        });
+      }
+    } 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 && 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;
+      if (statName[0] === '#'){
+        target = findAncestorByType({
+          type: statName.slice(1),
+          prop,
+          memo: this
+        });
+      } else {
+        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;
+  }
+  addEquipment(prop){
+    prop = this.registerProperty(prop);
+    this.equipmentById[prop._id] = prop;
+  }
+  addEndStepProp(prop){
+    prop = this.registerProperty(prop);
+    this.endStepPropsById[prop._id] = prop;
+  }
+}
+
+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] && propDetailsByType[prop.type]() ||
+    propDetailsByType.default();
+}
+
+const propDetailsByType = {
+  default(){
+    return {
+      toggleAncestors: [],
+      disabledByToggle: false,
+    };
+  },
+  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,
+    };
+  },
+  denormalizedStat(){
+    return {
+      toggleAncestors: [],
+      disabledByToggle: false,
+    };
+  }
+}

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

@@ -1,10 +1,28 @@
-import evaluateCalculation from '/imports/api/creature/computation/evaluateCalculation.js';
+import evaluateCalculation from '/imports/api/creature/computation/engine/evaluateCalculation.js';
+import { union } from 'lodash';
 
 export default class EffectAggregator{
   constructor(stat, memo){
+    delete this.baseValueErrors;
     if (stat.baseValueCalculation){
-      this.statBaseValue = evaluateCalculation(stat.baseValueCalculation, memo);
-      this.base = +this.statBaseValue;
+      let {
+        result,
+        context,
+        dependencies
+      } = evaluateCalculation({
+        string: stat.baseValueCalculation,
+        prop: stat,
+        memo
+      });
+      this.statBaseValue = +result.value;
+      stat.dependencies = union(
+        stat.dependencies,
+        dependencies,
+      );
+      if (context.errors.length){
+        this.baseValueErrors = context.errors;
+      }
+      this.base = this.statBaseValue;
     } else {
       this.base = 0;
     }
@@ -14,17 +32,25 @@ export default class EffectAggregator{
     this.max = Number.POSITIVE_INFINITY;
     this.advantage = 0;
     this.disadvantage = 0;
-    this.passiveAdd = 0;
+    this.passiveAdd = undefined;
     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
@@ -42,6 +68,10 @@ export default class EffectAggregator{
         // 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++;
@@ -52,6 +82,7 @@ export default class EffectAggregator{
         break;
       case 'passiveAdd':
         // Add all passive adds together
+        if (this.passiveAdd === undefined) this.passiveAdd = 0;
         this.passiveAdd += result;
         break;
       case 'fail':

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

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

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

@@ -0,0 +1,182 @@
+import computeStat from '/imports/api/creature/computation/engine/computeStat.js';
+import applyToggles from '/imports/api/creature/computation/engine/applyToggles.js';
+import evaluateCalculation from '/imports/api/creature/computation/engine/evaluateCalculation.js';
+import { union } from 'lodash';
+
+export default function combineStat(stat, aggregator, memo){
+  if (stat.type === 'attribute'){
+    combineAttribute(stat, aggregator, memo);
+  } 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, memo){
+  stat.value = getAggregatorResult(stat, aggregator);
+  stat.baseValue = aggregator.statBaseValue;
+  stat.baseValueErrors = aggregator.baseValueErrors;
+  if (stat.attributeType === 'spellSlot'){
+    let {
+      result,
+      context,
+      dependencies
+    } = evaluateCalculation({
+      string: stat.spellSlotLevelCalculation,
+      memo,
+      prop: stat,
+    });
+    stat.spellSlotLevelValue = result.value;
+    stat.spellSlotLevelErrors = context.errors;
+    stat.dependencies = union(stat.dependencies, dependencies);
+  }
+  stat.currentValue = stat.value - (stat.damage || 0);
+  // Ability scores get modifiers
+  if (stat.attributeType === 'ability') {
+    stat.modifier = Math.floor((stat.currentValue - 10) / 2);
+  } else {
+    stat.modifier = undefined;
+  }
+  // Hit dice get constitution modifiers
+  stat.constitutionMod = undefined;
+  if (stat.attributeType === 'hitDice') {
+    let conStat = memo.statsByVariableName['constitution'];
+    if (conStat && 'modifier' in conStat){
+      stat.constitutionMod = conStat.modifier;
+      stat.dependencies = union(
+        stat.dependencies,
+        [conStat._id],
+        conStat.dependencies,
+      );
+    }
+  }
+  // Stats that have no effects can be hidden based on a sheet setting
+  stat.hide = aggregator.hasNoEffects &&
+    stat.baseValue === undefined ||
+    undefined
+}
+
+function combineSkill(stat, aggregator, memo){
+  // Skills are based on some ability Modifier
+  let ability = stat.ability && memo.statsByVariableName[stat.ability]
+  if (stat.ability && ability){
+    if (!ability.computationDetails.computed){
+      computeStat(ability, memo);
+    }
+    stat.abilityMod = ability.modifier;
+    stat.dependencies = union(
+      stat.dependencies,
+      [ability._id],
+      ability.dependencies,
+    );
+  } else {
+    stat.abilityMod = 0;
+  }
+  // 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;
+      stat.dependencies = union(
+        stat.dependencies,
+        [prof._id],
+        prof.dependencies,
+      );
+    }
+  }
+  // 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;
+    if (level._id){
+      stat.dependencies = union(stat.dependencies, [level._id]);
+    }
+    if (level.dependencies){
+      stat.dependencies = union(stat.dependencies, level.dependencies);
+    }
+  } else {
+    stat.dependencies = union(
+      stat.dependencies,
+      [profBonusStat._id],
+      profBonusStat.dependencies,
+    );
+  }
+  // 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/engine/computeEffect.js

@@ -0,0 +1,55 @@
+import evaluateCalculation from '/imports/api/creature/computation/engine/evaluateCalculation.js';
+import applyToggles from '/imports/api/creature/computation/engine/applyToggles.js';
+import { union } from 'lodash';
+
+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 {
+      result,
+      context,
+      dependencies,
+    } = evaluateCalculation({
+      string: effect.calculation,
+      prop: effect,
+      memo
+    });
+    effect.result = result.value;
+    effect.dependencies = union(effect.dependencies, dependencies);
+    if (context.errors.length){
+      effect.errors = context.errors;
+    }
+  }
+  effect.computationDetails.computed = true;
+  effect.computationDetails.busyComputing = false;
+}

app/imports/api/creature/computation/engine/computeEndStepProperty.js

@@ -0,0 +1,119 @@
+import evaluateCalculation from '/imports/api/creature/computation/engine/evaluateCalculation.js';
+import ConstantNode from '/imports/parser/parseTree/ConstantNode.js';
+import { union } from 'lodash';
+
+export default function computeEndStepProperty(prop, memo){
+  switch (prop.type){
+    case 'action':
+    case 'spell':
+      computeAction(prop, memo);
+      break;
+    case 'adjustment':
+    case 'damage':
+      computePropertyField(prop, memo, 'amount', 'compile');
+      break;
+    case 'attack':
+      computeAction(prop, memo);
+      computePropertyField(prop, memo, 'rollBonus');
+      break;
+    case 'savingThrow':
+      computePropertyField(prop, memo, 'dc');
+      break;
+    case 'spellList':
+      computePropertyField(prop, memo, 'maxPrepared');
+      computePropertyField(prop, memo, 'attackRollBonus');
+      computePropertyField(prop, memo, 'dc');
+      break;
+    case 'propertySlot':
+      computePropertyField(prop, memo, 'quantityExpected');
+      computePropertyField(prop, memo, 'slotCondition');
+      break;
+    case 'roll':
+      computePropertyField(prop, memo, 'roll', 'compile');
+      break;
+  }
+}
+
+function computeAction(prop, memo){
+  // Uses
+  let {
+    result,
+    context,
+    dependencies,
+  } = evaluateCalculation({ string: prop.uses, prop, memo});
+  prop.usesResult = result.value;
+  prop.dependencies = union(prop.dependencies, dependencies);
+  if (context.errors.length){
+    prop.usesErrors = context.errors;
+  } else {
+    delete prop.usesErrors;
+  }
+  prop.insufficientResources = undefined;
+  if (prop.usesUsed >= prop.usesResult){
+    prop.insufficientResources = true;
+  }
+  if (!prop.resources) return;
+  // Attributes consumed
+  prop.resources.attributesConsumed.forEach((attConsumed, i) => {
+    if (attConsumed.variableName){
+      let stat = memo.statsByVariableName[attConsumed.variableName];
+      prop.resources.attributesConsumed[i].statId = stat && stat._id;
+      prop.resources.attributesConsumed[i].statName = stat && stat.name;
+      let available = stat && stat.currentValue || 0;
+      prop.resources.attributesConsumed[i].available = available;
+      if (available < attConsumed.quantity){
+        prop.insufficientResources = true;
+      }
+      if (stat){
+        prop.dependencies = union(
+          prop.dependencies,
+          [stat._id],
+          stat.dependencies
+        );
+      }
+    }
+  });
+  // Items consumed
+  prop.resources.itemsConsumed.forEach((itemConsumed, i) => {
+    let item = itemConsumed.itemId && memo.equipmentById[itemConsumed.itemId];
+    prop.resources.itemsConsumed[i].itemId = item && item._id;
+    let available = item && item.quantity || 0;
+    prop.resources.itemsConsumed[i].available = available;
+    let name = item && item.name;
+    if (item && item.quantity !== 1 && item.plural){
+      name = item.plural;
+    }
+    prop.resources.itemsConsumed[i].itemName = name;
+    prop.resources.itemsConsumed[i].itemIcon = item && item.icon;
+    prop.resources.itemsConsumed[i].itemColor = item && item.color;
+    if (!item || available < itemConsumed.quantity){
+      prop.insufficientResources = true;
+    }
+    if (item){
+      prop.dependencies = union(
+        prop.dependencies,
+        [item._id],
+        item.dependencies
+      );
+    }
+  });
+}
+
+function computePropertyField(prop, memo, fieldName, fn){
+  let {
+    result,
+    context,
+    dependencies,
+  } = evaluateCalculation({string: prop[fieldName], prop, memo, fn});
+  if (result instanceof ConstantNode){
+    prop[`${fieldName}Result`] = result.value;
+  } else {
+    prop[`${fieldName}Result`] = result.toString();
+  }
+  prop.dependencies = union(prop.dependencies, dependencies);
+  if (context.errors.length){
+    prop[`${fieldName}Errors`] = context.errors;
+  } else {
+    delete prop[`${fieldName}Errors`];
+  }
+}

app/imports/api/creature/computation/engine/computeInlineCalculations.js

@@ -0,0 +1,40 @@
+import evaluateCalculation from '/imports/api/creature/computation/engine/evaluateCalculation.js';
+import INLINE_CALCULATION_REGEX from '/imports/constants/INLINE_CALCULTION_REGEX.js';
+import ErrorNode from '/imports/parser/parseTree/ErrorNode.js';
+import { union } from 'lodash';
+
+export default function computeInlineCalculations(prop, memo){
+  if (prop.summary){
+    computeInlineCalcsForField(prop, memo, 'summary');
+  }
+  if (prop.description){
+    computeInlineCalcsForField(prop, memo, 'description');
+  }
+}
+
+function computeInlineCalcsForField(prop, memo, field){
+  let string = prop[field];
+  let inlineComputations = [];
+  let matches = string.matchAll(INLINE_CALCULATION_REGEX);
+  for (let match of matches){
+    let calculation = match[1];
+    let {
+      result,
+      context,
+      dependencies,
+    } = evaluateCalculation({string: calculation, prop, memo, fn: 'compile'});
+    if (result instanceof ErrorNode){
+      result = '`Calculation Error`';
+    }
+    let computation = {
+      calculation,
+      result: result && result.toString(),
+    };
+    if (context.errors.length){
+      computation.errors = context.errors;
+    }
+    inlineComputations.push(computation);
+    prop.dependencies = union(prop.dependencies, dependencies);
+  }
+  prop[`${field}Calculations`] = inlineComputations;
+}

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

@@ -0,0 +1,63 @@
+import { forOwn, has, union } from 'lodash';
+
+export default function computeLevels(memo){
+  computeClassLevels(memo);
+  computeTotalLevel(memo);
+}
+
+function computeClassLevels(memo){
+  forOwn(memo.classLevelsById, classLevel => {
+    //  class levels are mutually dependent
+    classLevel.dependencies = union(
+      classLevel.dependencies,
+      Object.keys(memo.classLevelsById)
+    );
+    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,
+      dependencies: [],
+      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){
+    let cls = memo.classes[name];
+    level += cls.level || 0;
+    if (cls._id){
+      currentLevel.dependencies = union(
+        currentLevel.dependencies,
+        [cls._id]
+      )
+    }
+    if (cls.dependencies){
+      currentLevel.dependencies = union(
+        currentLevel.dependencies,
+        cls.dependencies,
+      )
+    }
+  }
+  currentLevel.value = level;
+}

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

@@ -0,0 +1,32 @@
+import { each, forOwn } from 'lodash';
+import computeLevels from '/imports/api/creature/computation/engine/computeLevels.js';
+import computeStat from '/imports/api/creature/computation/engine/computeStat.js';
+import computeEffect from '/imports/api/creature/computation/engine/computeEffect.js';
+import computeToggle from '/imports/api/creature/computation/engine/computeToggle.js';
+import computeEndStepProperty from '/imports/api/creature/computation/engine/computeEndStepProperty.js';
+import computeInlineCalculations from '/imports/api/creature/computation/engine/computeInlineCalculations.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);
+  });
+  // Compute toggles which didn't already get computed by dependencies
+  forOwn(memo.togglesById, toggle => {
+    computeToggle(toggle, memo);
+  });
+  // Compute end step properties
+  forOwn(memo.endStepPropsById, prop => {
+    computeEndStepProperty(prop, memo);
+  });
+  // Compute inline calculations
+  forOwn(memo.propsById, prop => {
+    computeInlineCalculations(prop, memo);
+  });
+}

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

@@ -0,0 +1,50 @@
+import combineStat from '/imports/api/creature/computation/engine/combineStat.js';
+import computeEffect from '/imports/api/creature/computation/engine/computeEffect.js';
+import EffectAggregator from '/imports/api/creature/computation/engine/EffectAggregator.js';
+import applyToggles from '/imports/api/creature/computation/engine/applyToggles.js';
+import { each, union } 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._id){
+        stat.dependencies = union(
+          stat.dependencies,
+          [effect._id]
+        );
+      }
+      stat.dependencies = union(
+        stat.dependencies,
+        effect.dependencies
+      )
+      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/engine/computeToggle.js

@@ -0,0 +1,46 @@
+import evaluateCalculation from '/imports/api/creature/computation/engine/evaluateCalculation.js';
+import { union } from 'lodash';
+
+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 {
+      result,
+      context,
+      dependencies,
+    } = evaluateCalculation({string: toggle.condition, prop: toggle, memo});
+    toggle.toggleResult = !!result.value;
+    toggle.dependencies = union(
+      toggle.dependencies,
+      dependencies,
+    );
+    if (context.errors.length){
+      toggle.errors = context.errors;
+    }
+  }
+  toggle.computationDetails.computed = true;
+  toggle.computationDetails.busyComputing = false;
+}

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

@@ -0,0 +1,137 @@
+import computeStat from '/imports/api/creature/computation/engine/computeStat.js';
+import { prettifyParseError, parse, CompilationContext } from '/imports/parser/parser.js';
+import SymbolNode from '/imports/parser/parseTree/SymbolNode.js';
+import AccessorNode from '/imports/parser/parseTree/AccessorNode.js';
+import ConstantNode from '/imports/parser/parseTree/ConstantNode.js';
+import ErrorNode from '/imports/parser/parseTree/ErrorNode.js';
+import findAncestorByType from '/imports/api/creature/computation/engine/findAncestorByType.js';
+import { union } from 'lodash';
+
+/* Convert a calculation into a constant output and errors*/
+export default function evaluateCalculation({
+  string,
+  prop,
+  memo,
+  fn = 'reduce',
+}){
+  let dependencies = [];
+  let context = new CompilationContext();
+  if (!string) return {
+    result: new ConstantNode({value: string, type: 'string'}),
+    context,
+    dependencies,
+  };
+  if (typeof string !== 'string'){
+    string = string.toString();
+  }
+  // Parse the string
+  let calc;
+  try {
+    calc = parse(string);
+  } catch (e) {
+    let error = prettifyParseError(e);
+    return {
+      result: new ErrorNode({context, error}),
+      context,
+      dependencies,
+    };
+  }
+
+  // Replace constants with their parsed constant
+  let replaceResults = replaceConstants({
+    calc, memo, prop, dependencies, context
+  });
+  dependencies = replaceResults.dependencies;
+  calc = replaceResults.calc;
+  if (replaceResults.failed){
+    return {
+      result: new ConstantNode({value: string, type: 'string'}),
+      context,
+      dependencies,
+    };
+  }
+
+  // Ensure all symbol nodes are defined and computed
+  dependencies = computeSymbols({calc, memo, prop, dependencies})
+
+  // Evaluate
+  let result = calc[fn](memo.statsByVariableName, context);
+  return {result, context, dependencies};
+}
+
+// Replace constants in the calc with the right ParseNodes
+function replaceConstants({calc, memo, prop, dependencies, context}){
+  let constFailed = [];
+  calc = calc.replaceNodes(node => {
+    if (!(node instanceof SymbolNode)) return;
+    let stat, constant;
+    if (node.name[0] !== '#'){
+      stat = memo.statsByVariableName[node.name]
+      constant = memo.constantsByVariableName[node.name];
+    } else if (node.name === '#constant'){
+      constant = findAncestorByType({type: 'constant', prop, memo});
+    }
+    // replace constants that aren't overridden by stats
+    if (constant && !stat){
+      dependencies = union(dependencies, [
+        constant._id,
+        ...constant.dependencies
+      ]);
+      // Fail if the constant has errors
+      if (constant.errors && constant.errors.length){
+        constFailed.push(node.name);
+        return;
+      }
+      let parsedConstantNode;
+      try {
+        parsedConstantNode = parse(constant.calculation);
+      } catch(e){
+        constFailed.push(node.name);
+        return;
+      }
+      if (!parsedConstantNode) constFailed.push(node.name);
+      return parsedConstantNode;
+    }
+  });
+  constFailed.forEach(name => {
+    context.storeError({
+      type: 'error',
+      message: `${name} is a constant property with parsing errors`
+    });
+  });
+  let failed = !!constFailed.length;
+  if (failed){
+    calc = new ErrorNode({error: 'Failed to replace constants'});
+  }
+  return { failed, dependencies, calc };
+}
+
+  // Ensure all symbol nodes are defined and computed
+function computeSymbols({calc, memo, prop, dependencies}){
+  calc.traverse(node => {
+    if (node instanceof SymbolNode || node instanceof AccessorNode){
+      let stat;
+      // References up the tree start with #
+      if (node.name[0] === '#'){
+        stat = findAncestorByType({type: node.name.slice(1), prop, memo});
+        memo.statsByVariableName[node.name] = stat;
+      } else {
+        stat = memo.statsByVariableName[node.name];
+      }
+      if (stat && stat.computationDetails && !stat.computationDetails.computed){
+        computeStat(stat, memo);
+      }
+      if (stat){
+        if (stat.dependencies){
+          dependencies = union(dependencies, [
+            stat._id || node.name,
+            ...stat.dependencies
+          ]);
+        } else {
+          dependencies = union(dependencies, [stat._id || node.name]);
+        }
+      }
+    }
+  });
+  return dependencies;
+}

app/imports/api/creature/computation/engine/findAncestorByType.js

@@ -0,0 +1,10 @@
+export default function findAncestorByType({type, prop, memo}){
+  if (!prop || !prop.ancestors) return;
+  let ancestor;
+  for (let i = prop.ancestors.length - 1; i >= 0; i--){
+    ancestor = memo.propsById[prop.ancestors[i].id];
+    if (ancestor && ancestor.type === type){
+      return ancestor;
+    }
+  }
+}

app/imports/api/creature/computation/engine/getComputationProperties.js

@@ -0,0 +1,35 @@
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+
+export default function getComputationProperties(creatureId){
+  // find ids of all toggles that have conditions, even if they are inactive
+  let toggleIds = CreatureProperties.find({
+    'ancestors.id': creatureId,
+    type: 'toggle',
+    removed: {$ne: true},
+    condition: { $exists: true },
+  }, {
+    fields: {_id: 1},
+  }).map(t => t._id);
+  // Find all the relevant properties
+  return CreatureProperties.find({
+    'ancestors.id': creatureId,
+    removed: {$ne: true},
+    $or: [
+      // All active properties
+      {inactive: {$ne: true}},
+      // All active and inactive toggles with conditions
+      // Same as {$in: toggleIds}, but should be slightly faster
+      {type: 'toggle', condition: { $exists: true }},
+      // All decendents of the above toggles
+      {'ancestors.id': {$in: toggleIds}},
+    ]
+  }, {
+    // Filter out fields never used by calculations
+    fields: {
+      icon: 0,
+    },
+    sort: {
+      order: 1,
+    }
+  }).fetch();
+}

app/imports/api/creature/computation/engine/getDependentProperties.js

@@ -0,0 +1,51 @@
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+import { union } from 'lodash';
+
+export default function getDependentProperties({
+  creatureId,
+  propertyIds,
+  propertiesDependedAponIds,
+ }){
+  // find ids of all dependant toggles that have conditions, even if inactive
+  let toggleIds = CreatureProperties.find({
+    'ancestors.id': creatureId,
+    type: 'toggle',
+    removed: {$ne: true},
+    condition: { $exists: true },
+    dependencies: {$in: propertyIds},
+  }, {
+    fields: {_id: 1},
+  }).map(t => t._id);
+  // Find all the dependant properties
+  let props = CreatureProperties.find({
+    'ancestors.id': creatureId,
+    removed: {$ne: true},
+    dependencies: {$in: propertyIds},
+    $or: [
+      // All active properties
+      {inactive: {$ne: true}},
+      // All active and inactive toggles with conditions
+      // Same as {$in: toggleIds}, but should be slightly faster
+      {type: 'toggle', condition: { $exists: true }},
+      // All decendents of the above toggles
+      {'ancestors.id': {$in: toggleIds}},
+    ]
+  }, { fields: {_id: 1, dependencies: 1} }).fetch();
+  // Add all the properties that changing props depend on, but haven't yet been
+  // included to make an array of every property we need
+  let allConnectedPropIds = [...propertyIds, ...propertiesDependedAponIds];
+  props.forEach(prop => {
+    allConnectedPropIds = union(
+      allConnectedPropIds,
+      prop.dependencies,
+      [prop._id]);
+  });
+  // Add on all the properties and the objects they depend apon
+  return CreatureProperties.find({
+    _id: {$in: allConnectedPropIds}
+  }, {
+    // Ignore fields not used in computations
+    fields: {icon: 0},
+    sort: {order: 1},
+  }).fetch();
+}

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

@@ -0,0 +1,115 @@
+import { Meteor } from 'meteor/meteor'
+import { isEqual, forOwn } from 'lodash';
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+import propertySchemasIndex from '/imports/api/properties/computedOnlyPropertySchemasIndex.js';
+
+export default function writeAlteredProperties(memo){
+  let bulkWriteOperations = [];
+  // Loop through all properties on the memo
+  forOwn(memo.propsById, changed => {
+    let schema = propertySchemasIndex[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];
+      let keys = ['dependencies', ...schema.objectKeys()];
+      op = addChangedKeysToOp(op, keys, original, changed);
+      if (op){
+        bulkWriteOperations.push(op);
+      }
+    });
+  });
+  writePropertiesSequentially(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};
+  }
+}
+
+// We use this instead of bulkWriteProperties because it functions with latency
+// compensation without needing to roll back changes, which causes multiple
+// expensive redraws of the character sheet
+function writePropertiesSequentially(bulkWriteOps){
+  bulkWriteOps.forEach(op => {
+    let updateOneOrMany = op.updateOne || op.updateMany;
+    CreatureProperties.update(updateOneOrMany.filter, updateOneOrMany.update, {
+      // The bulk code is bypassing validation, so do the same here
+      // selector: {type: op.type} // include this if bypass is off
+      bypassCollection2: true,
+    });
+  });
+}
+
+// This is more efficient on the database, but significantly less efficient
+// in the UI because of incompatibility with latency compensation. If the
+// duplicate redraws can be fixed, this is a strictly better way of processing
+// writes
+function bulkWriteProperties(bulkWriteOps){
+  if (!bulkWriteOps.length) return;
+  // bulkWrite is only available on the server
+  if (Meteor.isServer){
+    CreatureProperties.rawCollection().bulkWrite(
+      bulkWriteOps,
+      {ordered : false},
+      function(e){
+        if (e) {
+          console.error('Bulk write failed: ');
+          console.error(e);
+        }
+      }
+    );
+  } else {
+    writePropertiesSequentially(bulkWriteOps);
+  }
+}

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

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

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

@@ -1,32 +0,0 @@
-import  replaceBareSymbolsWithValueAccessor from '/imports/api/creature/computation/utility/replaceBareSymbolsWithValueAccessor.js';
-import computeStat from '/imports/api/creature/computation/computeStat.js';
-import * as math from 'mathjs';
-
-export default function evaluateCalculation(string, memo){
-  if (!string) return string;
-  // Parse the string using mathjs
-  let calc;
-  try {
-    calc = math.parse(string);
-  } catch (e) {
-    console.error(e);
-    return 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);
-      }
-    }
-  });
-  // Ensure any bare symbols are value accessors instead
-  let substitutedCalc = calc.transform(replaceBareSymbolsWithValueAccessor);
-  // Evaluate the expression to a number or return with substitutions
-  try {
-    return substitutedCalc.evaluate(memo.statsByVariableName);
-  } catch (e){
-    return substitutedCalc.toString();
-  }
-}

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

@@ -1,42 +0,0 @@
-import Creatures from '/imports/api/creature/Creatures.js';
-import CreatureProperties from '/imports/api/creature/CreatureProperties.js';
-
-export default function getCalculationProperties(creatureId){
-  // First get ids of disabled properties and unequiped items
-  let disabledAncestorIds = CreatureProperties.find({
-    'ancestors.id': creatureId,
-    $or: [
-      {disabled: true},
-      {equipped: false},
-    ],
-  }, {
-    fields: {_id: 1},
-  }).map(prop => prop._id);
-
-  // Then get the ids of creatures that are children of this creature
-  // to isolate their decendent properties from this calculation
-  Creatures.find({
-    'ancestors.id': creatureId,
-  }, {
-    fields: {_id: 1},
-  }).forEach(prop => {
-    disabledAncestorIds.push(prop._id);
-  });
-
-  // Get all the properties that aren't from the excluded decendents
-  return CreatureProperties.find({
-    'ancestors.id': {
-      $eq: creatureId,
-      $nin: disabledAncestorIds,
-    },
-    removed: {$ne: true},
-    type: {$in: [
-      'attribute',
-      'skill',
-      'damageMultiplier',
-      'effect',
-      'proficiency',
-      'classLevel',
-    ]},
-  }).fetch();
-}

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

@@ -1,24 +1,37 @@
-import { Meteor } from 'meteor/meteor'
 import { ValidatedMethod } from 'meteor/mdg:validated-method';
+import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
 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 getCalculationProperties from '/imports/api/creature/computation/getCalculationProperties.js';
-import writeAlteredProperties from '/imports/api/creature/computation/writeAlteredProperties.js';
-import writeCreatureVariables from '/imports/api/creature/computation/writeCreatureVariables.js';
+import ComputationMemo from '/imports/api/creature/computation/engine/ComputationMemo.js';
+import getComputationProperties from '/imports/api/creature/computation/engine/getComputationProperties.js';
+import computeMemo from '/imports/api/creature/computation/engine/computeMemo.js';
+import writeAlteredProperties from '/imports/api/creature/computation/engine/writeAlteredProperties.js';
+import writeCreatureVariables from '/imports/api/creature/computation/engine/writeCreatureVariables.js';
+import { recomputeDamageMultipliersById } from '/imports/api/creature/denormalise/recomputeDamageMultipliers.js';
+import recomputeSlotFullness from '/imports/api/creature/denormalise/recomputeSlotFullness.js';
+import getRootCreatureAncestor from '/imports/api/creature/creatureProperties/getRootCreatureAncestor.js';
+import getDependentProperties from '/imports/api/creature/computation/engine/getDependentProperties.js';
+import Creatures from '/imports/api/creature/Creatures.js';
+import recomputeInactiveProperties from '/imports/api/creature/denormalise/recomputeInactiveProperties.js';
 
 export const recomputeCreature = new ValidatedMethod({
 
-  name: 'Creatures.methods.recomputeCreature',
+  name: 'creatures.recomputeCreature',
 
   validate: new SimpleSchema({
     charId: { type: String }
   }).validator(),
 
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 5,
+    timeInterval: 5000,
+  },
+
   run({charId}) {
+    let creature = Creatures.findOne(charId);
     // Permission
-    assertEditPermission(charId, this.userId);
+    assertEditPermission(creature, 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);
@@ -26,6 +39,11 @@ export const recomputeCreature = new ValidatedMethod({
 
 });
 
+export function recomputeCreatureById(creatureId){
+  let creature = Creatures.findOne(creatureId);
+  recomputeCreatureByDoc(creature);
+}
+
 /**
  * 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
@@ -62,12 +80,42 @@ export const recomputeCreature = new ValidatedMethod({
  *   - Mark the stat as computed
  * - Write the computed results back to the database
  */
-export function recomputeCreatureById(creatureId){
-  let props = getCalculationProperties(creatureId);
-  let computationMemo = new ComputationMemo(props);
+export function recomputeCreatureByDoc(creature){
+  const creatureId = creature._id;
+  let props = getComputationProperties(creatureId);
+  let computationMemo = new ComputationMemo(props, creature);
   computeMemo(computationMemo);
   writeAlteredProperties(computationMemo);
   writeCreatureVariables(computationMemo, creatureId);
-  // if(Meteor.isClient) console.log(computationMemo);
+  recomputeDamageMultipliersById(creatureId);
+  recomputeSlotFullness(creatureId);
+  recomputeInactiveProperties(creatureId);
+  return computationMemo;
+}
+
+export function recomputePropertyDependencies(property){
+  let creature = getRootCreatureAncestor(property);
+  recomputeCreatureByDependencies({
+    creature,
+    propertyIds: [property._id],
+    propertiesDependedAponIds: property.dependencies,
+  });
+}
+
+export function recomputeCreatureByDependencies({
+  creature,
+  propertyIds,
+  propertiesDependedAponIds
+}){
+  let props = getDependentProperties({
+    creatureId: creature._id,
+    propertyIds,
+    propertiesDependedAponIds,
+  });
+  let computationMemo = new ComputationMemo(props, creature);
+  computeMemo(computationMemo);
+  writeAlteredProperties(computationMemo);
+  writeCreatureVariables(computationMemo, creature._id, false)
+  recomputeInactiveProperties(creature._id);
   return computationMemo;
 }

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

@@ -1,22 +0,0 @@
-import * as math from 'mathjs';
-
-export default function replaceBareSymbolsWithValueAccessor(node, path) {
-  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
-  ) {
-    const object = new math.SymbolNode(node.name);
-    const address = new math.ConstantNode('value');
-    const index = new math.IndexNode([address]);
-    return new math.AccessorNode(object, index);
-  } else {
-    return node;
-  }
-}

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

@@ -1,101 +0,0 @@
-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 CreatureProperties from '/imports/api/creature/CreatureProperties.js';
-
-export default function writeAlteredProperties(memo){
-  let bulkWriteOperations = [];
-  // Loop through all properties on the memo
-  forOwn(memo.originalPropsById, (original, _id) => {
-    let changed = memo.propsById[_id];
-
-    let schema;
-    switch (changed.type){
-      case 'skill':
-        schema = ComputedOnlySkillSchema;
-        break;
-      case 'attribute':
-        schema = ComputedOnlyAttributeSchema;
-        break;
-      case 'effect':
-        schema = ComputedOnlyEffectSchema;
-        break;
-      default:
-        return;
-    }
-    let op = undefined;
-    // Loop through all keys that can be changed by computation
-    // and compile an operation that sets all those keys
-    for (let key of schema.objectKeys()){
-      if (!isEqual(original[key], changed[key])){
-        if (!op) op = newOperation(_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);
-        }
-      }
-    }
-    if (op){
-      bulkWriteOperations.push(op);
-    }
-  });
-  bulkWriteProperties(bulkWriteOperations);
-}
-
-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(e);
-      }
-    );
-  } else {
-    bulkWriteOps.forEach(op => {
-      CreatureProperties.update(op.updateOne.filter, op.updateOne.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

@@ -1,35 +0,0 @@
-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/creaturePermissions.js

@@ -1,3 +1,4 @@
+import Creatures from '/imports/api/creature/Creatures.js';
 import {
   assertEditPermission as editPermission,
   assertViewPermission as viewPermission,
@@ -23,6 +24,6 @@ export function assertEditPermission(creature, userId) {
 }
 
 export function assertViewPermission(creature, userId) {
-  creature = getCreature(creature, {owner: 1, writers: 1, public: 1});
+  creature = getCreature(creature, {owner: 1, readers:1, writers: 1, public: 1});
   viewPermission(creature, userId);
 }

app/imports/api/creature/creatureProperties/CreatureProperties.js

@@ -0,0 +1,84 @@
+import { Mongo } from 'meteor/mongo';
+import SimpleSchema from 'simpl-schema';
+import ColorSchema from '/imports/api/properties/subSchemas/ColorSchema.js';
+import ChildSchema from '/imports/api/parenting/ChildSchema.js';
+import SoftRemovableSchema from '/imports/api/parenting/SoftRemovableSchema.js';
+import propertySchemasIndex from '/imports/api/properties/computedPropertySchemasIndex.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,
+  },
+  // Denormalised flag if this property is inactive on the sheet for any reason
+  // Including being disabled, or a decendent of a disabled property
+  inactive: {
+    type: Boolean,
+    optional: true,
+    index: 1,
+  },
+  // Denormalised flag if this property was made inactive by an inactive
+  // ancestor. True if this property has an inactive ancestor even if this
+  // property is itself inactive
+  deactivatedByAncestor: {
+    type: Boolean,
+    optional: true,
+    index: 1,
+  },
+  // Denormalised flag if this property was made inactive because of its own
+  // state
+  deactivatedBySelf: {
+    type: Boolean,
+    optional: true,
+    index: 1,
+  },
+  // Denormalised list of all properties or creatures this property depends on
+  dependencies: {
+    type: Array,
+    defaultValue: [],
+    index: 1,
+  },
+  'dependencies.$': {
+    type: String,
+    regEx: SimpleSchema.RegEx.Id,
+  },
+});
+
+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}
+	});
+}
+
+import '/imports/api/creature/creatureProperties/methods/index.js';
+import '/imports/api/creature/actions/doAction.js';
+import '/imports/api/creature/actions/castSpellWithSlot.js';
+
+export default CreatureProperties;
+export {
+	CreaturePropertySchema,
+};

app/imports/api/creature/creatureProperties/getRootCreatureAncestor.js

@@ -0,0 +1,5 @@
+import Creatures from '/imports/api/creature/Creatures.js';
+
+export default function getRootCreatureAncestor(property){
+  return Creatures.findOne(property.ancestors[0].id);
+}

app/imports/api/creature/creatureProperties/methods/adjustQuantity.js

@@ -0,0 +1,69 @@
+import { ValidatedMethod } from 'meteor/mdg:validated-method';
+import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
+import SimpleSchema from 'simpl-schema';
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+import getRootCreatureAncestor from '/imports/api/creature/creatureProperties/getRootCreatureAncestor.js';
+import { assertEditPermission } from '/imports/api/sharing/sharingPermissions.js';
+import recomputeInventory from '/imports/api/creature/denormalise/recomputeInventory.js';
+import { recomputeCreatureByDoc } from '/imports/api/creature/computation/methods/recomputeCreature.js';
+
+const adjustQuantity = new ValidatedMethod({
+  name: 'creatureProperties.adjustQuantity',
+  validate: new SimpleSchema({
+    _id: SimpleSchema.RegEx.Id,
+    operation: {
+      type: String,
+      allowedValues: ['set', 'increment']
+    },
+    value: Number,
+  }).validator(),
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 5,
+    timeInterval: 5000,
+  },
+  run({_id, operation, value}) {
+    // Permissions
+		let property = CreatureProperties.findOne(_id);
+    let rootCreature = getRootCreatureAncestor(property);
+		assertEditPermission(rootCreature, this.userId);
+
+    // Do work
+    adjustQuantityWork({property, operation, value});
+
+    // Changing quantity does not change dependencies, but recomputing the
+    // inventory changes many deps at once, so recompute fully
+    recomputeCreatureByDoc(rootCreature);
+    recomputeInventory(rootCreature._id);
+  },
+});
+
+export function adjustQuantityWork({property, operation, value}){
+  // Check if property has quantity
+  let schema = CreatureProperties.simpleSchema(property);
+  if (!schema.allowsKey('quantity')){
+    throw new Meteor.Error(
+      'Adjust quantity failed',
+      `Property of type "${property.type}" doesn't have a quantity`
+    );
+  }
+  if (operation === 'set'){
+    CreatureProperties.update(property._id, {
+      $set: {quantity: value}
+    }, {
+      selector: property
+    });
+  } else if (operation === 'increment'){
+    // value here is 'damage'
+    value = -value;
+    let currentQuantity = property.quantity;
+    if (currentQuantity + value < 0) value = -currentQuantity;
+    CreatureProperties.update(property._id, {
+      $inc: {quantity: value}
+    }, {
+      selector: property
+    });
+  }
+}
+
+export default adjustQuantity;

app/imports/api/creature/creatureProperties/methods/damagePropertiesByName.js

@@ -0,0 +1,57 @@
+import { ValidatedMethod } from 'meteor/mdg:validated-method';
+import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
+import SimpleSchema from 'simpl-schema';
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+import Creatures from '/imports/api/creature/Creatures.js';
+import { assertEditPermission } from '/imports/api/sharing/sharingPermissions.js';
+import { damagePropertyWork } from '/imports/api/creature/creatureProperties/methods/damageProperty.js';
+import { recomputePropertyDependencies } from '/imports/api/creature/computation/methods/recomputeCreature.js';
+
+const damagePropertiesByName = new ValidatedMethod({
+  name: 'CreatureProperties.damagePropertiesByName',
+  validate: new SimpleSchema({
+    creatureId: SimpleSchema.RegEx.Id,
+    variableName: {
+      type: String,
+    },
+    operation: {
+      type: String,
+      allowedValues: ['set', 'increment']
+    },
+    value: Number,
+  }).validator(),
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 20,
+    timeInterval: 5000,
+  },
+  run({creatureId, variableName, operation, value}) {
+		// Check permissions
+    let creature = Creatures.findOne(creatureId, {
+      fields: {
+        damageMultipliers: 1,
+        owner: 1,
+        readers: 1,
+        writers: 1,
+      },
+    });
+    assertEditPermission(creature, this.userId);
+    let lastProperty;
+    CreatureProperties.find({
+      'ancestors.id': creatureId,
+      variableName,
+      removed: {$ne: false},
+      inactive: {$ne: true},
+    }).forEach(property => {
+      // Check if property can take damage
+      let schema = CreatureProperties.simpleSchema(property);
+      if (!schema.allowsKey('damage')) return;
+      // Damage the property
+      damagePropertyWork({property, operation, value});
+      lastProperty = property;
+    });
+    recomputePropertyDependencies(lastProperty);
+  }
+});
+
+export default damagePropertiesByName;

app/imports/api/creature/creatureProperties/methods/damageProperty.js

@@ -0,0 +1,76 @@
+import { ValidatedMethod } from 'meteor/mdg:validated-method';
+import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
+import SimpleSchema from 'simpl-schema';
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+import getRootCreatureAncestor from '/imports/api/creature/creatureProperties/getRootCreatureAncestor.js';
+import { assertEditPermission } from '/imports/api/sharing/sharingPermissions.js';
+import { recomputePropertyDependencies } from '/imports/api/creature/computation/methods/recomputeCreature.js';
+
+const damageProperty = new ValidatedMethod({
+  name: 'creatureProperties.damage',
+  validate: new SimpleSchema({
+    _id: SimpleSchema.RegEx.Id,
+    operation: {
+      type: String,
+      allowedValues: ['set', 'increment']
+    },
+    value: Number,
+  }).validator(),
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 20,
+    timeInterval: 5000,
+  },
+  run({_id, operation, value}) {
+    // Check permissions
+		let property = CreatureProperties.findOne(_id);
+    let rootCreature = getRootCreatureAncestor(property);
+    assertEditPermission(rootCreature, this.userId);
+		// Check if property can take damage
+		let schema = CreatureProperties.simpleSchema(property);
+		if (!schema.allowsKey('damage')){
+			throw new Meteor.Error(
+				'Damage property failed',
+				`Property of type "${property.type}" can't be damaged`
+			);
+		}
+		damagePropertyWork({property, operation, value});
+    // Dependencies can't be changed through damage, only recompute deps
+    recomputePropertyDependencies(property);
+  },
+});
+
+export function damagePropertyWork({property, operation, value}){
+  if (operation === 'set'){
+    let currentValue = property.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(property._id, {
+      $set: {damage}
+    }, {
+      selector: property
+    });
+    return currentValue - damage;
+  } else if (operation === 'increment'){
+    let currentValue = property.value - (property.damage || 0);
+    let currentDamage = property.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(property._id, {
+      $inc: {damage: increment}
+    }, {
+      selector: property
+    });
+    return increment;
+  }
+}
+
+export default damageProperty;

app/imports/api/creature/creatureProperties/methods/dealDamage.js

@@ -0,0 +1,73 @@
+import { ValidatedMethod } from 'meteor/mdg:validated-method';
+import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
+import SimpleSchema from 'simpl-schema';
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+import Creatures from '/imports/api/creature/Creatures.js';
+import { assertEditPermission } from '/imports/api/sharing/sharingPermissions.js';
+import { damagePropertyWork } from '/imports/api/creature/creatureProperties/methods/damageProperty.js';
+import { recomputeCreatureByDependencies } from '/imports/api/creature/computation/methods/recomputeCreature.js';
+
+const dealDamage = new ValidatedMethod({
+  name: 'creatureProperties.dealDamage',
+  validate: new SimpleSchema({
+    creatureId: SimpleSchema.RegEx.Id,
+    damageType: {
+      type: String,
+    },
+    amount: Number,
+  }).validator(),
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 20,
+    timeInterval: 5000,
+  },
+  run({creatureId, damageType, amount}) {
+    // permissions
+    let creature = Creatures.findOne(creatureId, {
+      fields: {
+        damageMultipliers: 1,
+        owner: 1,
+        readers: 1,
+        writers: 1,
+      },
+    });
+    assertEditPermission(creature, this.userId);
+
+    // Get all the health bars and do damage to them
+    let healthBars = CreatureProperties.find({
+      'ancestors.id': creatureId,
+      type: 'attribute',
+      attributeType:'healthBar',
+      removed: {$ne: true},
+      inactive: {$ne: true},
+    }, {
+      sort: {order: -1},
+    });
+    let multiplier = creature.damageMultipliers[damageType];
+    if (multiplier === undefined) multiplier = 1;
+    let totalDamage = Math.floor(amount * multiplier);
+    let damageLeft = totalDamage;
+    if (damageType === 'healing') damageLeft = -totalDamage;
+    let propertyIds = [];
+    let propertiesDependedAponIds = [];
+    healthBars.forEach(healthBar => {
+      if (damageLeft === 0) return;
+      let damageAdded = damagePropertyWork({
+        property: healthBar,
+        operation: 'increment',
+        value: damageLeft,
+      });
+      damageLeft -= damageAdded;
+      propertyIds.push(healthBar._id);
+      propertiesDependedAponIds.push(...healthBar.dependencies);
+    });
+    recomputeCreatureByDependencies({
+      creature,
+      propertyIds,
+      propertiesDependedAponIds,
+    });
+    return totalDamage;
+  },
+});
+
+export default dealDamage;

app/imports/api/creature/creatureProperties/methods/duplicateProperty.js

@@ -0,0 +1,33 @@
+import SimpleSchema from 'simpl-schema';
+import { ValidatedMethod } from 'meteor/mdg:validated-method';
+import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+import getRootCreatureAncestor from '/imports/api/creature/creatureProperties/getRootCreatureAncestor.js';
+import { assertEditPermission } from '/imports/api/sharing/sharingPermissions.js';
+import { insertPropertyWork } from '/imports/api/creature/creatureProperties/methods/insertProperty.js';
+
+const duplicateProperty = new ValidatedMethod({
+  name: 'creatureProperties.duplicate',
+  validate: new SimpleSchema({
+    _id: {
+      type: String,
+      regEx: SimpleSchema.RegEx.Id,
+    }
+  }).validator(),
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 5,
+    timeInterval: 5000,
+  },
+  run({_id}) {
+    let creatureProperty = CreatureProperties.findOne(_id);
+    let rootCreature = getRootCreatureAncestor(creatureProperty);
+    assertEditPermission(rootCreature, this.userId);
+    insertPropertyWork({
+      property: creatureProperty,
+      creature: rootCreature,
+    });
+  },
+});
+
+export default duplicateProperty;

app/imports/api/creature/creatureProperties/methods/equipItem.js

@@ -0,0 +1,70 @@
+import { ValidatedMethod } from 'meteor/mdg:validated-method';
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
+import { assertEditPermission } from '/imports/api/sharing/sharingPermissions.js';
+import { organizeDoc } from '/imports/api/parenting/organizeMethods.js';
+import getRootCreatureAncestor from '/imports/api/creature/creatureProperties/getRootCreatureAncestor.js';
+import { recomputeCreatureByDoc } from '/imports/api/creature/computation/methods/recomputeCreature.js';
+import recomputeInventory from '/imports/api/creature/denormalise/recomputeInventory.js';
+import INVENTORY_TAGS from '/imports/constants/INVENTORY_TAGS.js';
+
+export function getParentRefByTag(creatureId, tag){
+  let prop = CreatureProperties.findOne({
+    'ancestors.id': creatureId,
+    removed: {$ne: true},
+    inactive: {$ne: true},
+    tags: tag,
+  }, {
+    sort: {order: 1},
+  });
+  if (prop){
+    return {id: prop._id, collection: 'creatureProperties'};
+  } else {
+    return {id: creatureId, collection: 'creatures'};
+  }
+}
+
+// Equipping or unequipping an item will also change its parent
+const equipItem = new ValidatedMethod({
+  name: 'creatureProperties.equip',
+  validate({_id, equipped}){
+		if (!_id) throw new Meteor.Error('No _id', '_id is required');
+    if (equipped !== true && equipped !== false) {
+      throw new Meteor.Error('No equipped', 'equipped is required to be true or false');
+    }
+  },
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 5,
+    timeInterval: 5000,
+  },
+  run({_id, equipped}) {
+    let item = CreatureProperties.findOne(_id);
+    if (item.type !== 'item') throw new Meteor.Error('wrong type',
+    'Equip and unequip can only be performed on items');
+    let creature = getRootCreatureAncestor(item);
+    assertEditPermission(creature, this.userId);
+    CreatureProperties.update(_id, {
+      $set: {equipped},
+    }, {
+			selector: {type: 'item'},
+		});
+    let tag = equipped ? INVENTORY_TAGS.equipment : INVENTORY_TAGS.carried;
+    let parentRef = getParentRefByTag(creature._id, tag);
+
+    organizeDoc.call({
+      docRef: {
+        id: _id,
+        collection: 'creatureProperties',
+      },
+      parentRef,
+      order: Number.MAX_SAFE_INTEGER,
+      skipRecompute: true,
+    });
+
+    recomputeInventory(creature._id);
+    recomputeCreatureByDoc(creature);
+  },
+});
+
+export default equipItem;

app/imports/api/creature/creatureProperties/methods/index.js

@@ -0,0 +1,14 @@
+import '//imports/api/creature/creatureProperties/methods/adjustQuantity.js';
+import '/imports/api/creature/creatureProperties/methods/damagePropertiesByName.js';
+import '/imports/api/creature/creatureProperties/methods/damageProperty.js';
+import '/imports/api/creature/creatureProperties/methods/dealDamage.js';
+import '/imports/api/creature/creatureProperties/methods/duplicateProperty.js';
+import '/imports/api/creature/creatureProperties/methods/equipItem.js';
+import '/imports/api/creature/creatureProperties/methods/insertProperty.js';
+import '/imports/api/creature/creatureProperties/methods/insertPropertyFromLibraryNode.js';
+import '/imports/api/creature/creatureProperties/methods/pullFromProperty.js';
+import '/imports/api/creature/creatureProperties/methods/pushToProperty.js';
+import '/imports/api/creature/creatureProperties/methods/restoreProperty.js';
+import '/imports/api/creature/creatureProperties/methods/selectAmmoItem.js';
+import '/imports/api/creature/creatureProperties/methods/softRemoveProperty.js';
+import '/imports/api/creature/creatureProperties/methods/updateCreatureProperty.js';

app/imports/api/creature/creatureProperties/methods/insertProperty.js

@@ -0,0 +1,49 @@
+import { ValidatedMethod } from 'meteor/mdg:validated-method';
+import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+import getRootCreatureAncestor from '/imports/api/creature/creatureProperties/getRootCreatureAncestor.js';
+import { assertEditPermission } from '/imports/api/sharing/sharingPermissions.js';
+import { reorderDocs } from '/imports/api/parenting/order.js';
+import recomputeInactiveProperties from '/imports/api/creature/denormalise/recomputeInactiveProperties.js';
+import { recomputeCreatureByDoc } from '/imports/api/creature/computation/methods/recomputeCreature.js';
+import recomputeInventory from '/imports/api/creature/denormalise/recomputeInventory.js';
+
+const insertProperty = new ValidatedMethod({
+  name: 'creatureProperties.insert',
+	validate: null,
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 5,
+    timeInterval: 5000,
+  },
+  run({creatureProperty}) {
+    let rootCreature = getRootCreatureAncestor(creatureProperty);
+    assertEditPermission(rootCreature, this.userId);
+		return insertPropertyWork({
+      property: creatureProperty,
+      creature: rootCreature,
+    });
+  },
+});
+
+export function insertPropertyWork({property, creature}){
+  delete property._id;
+  let _id = CreatureProperties.insert(property);
+  // Tree structure changed by insert, reorder the tree
+  reorderDocs({
+    collection: CreatureProperties,
+    ancestorId: creature._id,
+  });
+  // Inserting the active status of the property needs to be denormalised
+  recomputeInactiveProperties(creature._id);
+
+  // Recompute the inventory if it has changed
+  if (property.type === 'item' || property.type === 'container'){
+    recomputeInventory(creature._id);
+  }
+  // Inserting a creature property invalidates dependencies: full recompute
+  recomputeCreatureByDoc(creature);
+  return _id;
+}
+
+export default insertProperty;

app/imports/api/creature/creatureProperties/methods/insertPropertyFromLibraryNode.js

@@ -0,0 +1,110 @@
+import SimpleSchema from 'simpl-schema';
+import { ValidatedMethod } from 'meteor/mdg:validated-method';
+import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+import LibraryNodes from '/imports/api/library/LibraryNodes.js';
+import { RefSchema } from '/imports/api/parenting/ChildSchema.js';
+import getRootCreatureAncestor from '/imports/api/creature/creatureProperties/getRootCreatureAncestor.js';
+import recomputeInactiveProperties from '/imports/api/creature/denormalise/recomputeInactiveProperties.js';
+import { recomputeCreatureByDoc } from '/imports/api/creature/computation/methods/recomputeCreature.js';
+import { assertEditPermission } from '/imports/api/sharing/sharingPermissions.js';
+import {
+	setLineageOfDocs,
+	getAncestry,
+	renewDocIds
+} from '/imports/api/parenting/parenting.js';
+import { reorderDocs } from '/imports/api/parenting/order.js';
+import { setDocToLastOrder } from '/imports/api/parenting/order.js';
+import recomputeInventory from '/imports/api/creature/denormalise/recomputeInventory.js';
+
+const insertPropertyFromLibraryNode = new ValidatedMethod({
+	name: 'creatureProperties.insertPropertyFromLibraryNode',
+	validate: new SimpleSchema({
+		nodeId: {
+			type: String,
+			regEx: SimpleSchema.RegEx.Id,
+		},
+		parentRef: {
+			type: RefSchema,
+		},
+	}).validator(),
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 5,
+    timeInterval: 5000,
+  },
+	run({nodeId, parentRef}) {
+		// get the new ancestry for the properties
+		let {parentDoc, ancestors} = getAncestry({parentRef});
+
+		// Check permission to edit
+    let rootCreature;
+		if (parentRef.collection === 'creatures'){
+      rootCreature = parentDoc;
+		} else if (parentRef.collection === 'creatureProperties'){
+      rootCreature = getRootCreatureAncestor(parentDoc);
+		} else {
+			throw `${parentRef.collection} is not a valid parent collection`
+		}
+    assertEditPermission(rootCreature, this.userId);
+
+		// 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 first in the array of nodes
+    // It must get the first generated ID to prevent flickering
+		nodes = [node, ...nodes];
+
+		// 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
+    CreatureProperties.batchInsert(nodes);
+
+    // get the root inserted doc
+    let rootId = node._id;
+
+    // Tree structure changed by inserts, reorder the tree
+    reorderDocs({
+      collection: CreatureProperties,
+      ancestorId: rootCreature._id,
+    });
+
+    // The library properties need to denormalise which of them are inactive
+    recomputeInactiveProperties(rootId);
+    // Some of the library properties may be items or containers
+    recomputeInventory(rootCreature._id);
+		// Inserting a creature property invalidates dependencies: full recompute
+    recomputeCreatureByDoc(rootCreature);
+		// Return the docId of the last property, the inserted root property
+		return rootId;
+	},
+});
+
+export default insertPropertyFromLibraryNode;

app/imports/api/creature/creatureProperties/methods/pullFromProperty.js

@@ -0,0 +1,36 @@
+import { ValidatedMethod } from 'meteor/mdg:validated-method';
+import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+import { assertEditPermission } from '/imports/api/sharing/sharingPermissions.js';
+import getRootCreatureAncestor from '/imports/api/creature/creatureProperties/getRootCreatureAncestor.js';
+import { recomputeCreatureByDoc } from '/imports/api/creature/computation/methods/recomputeCreature.js';
+
+const pullFromProperty = new ValidatedMethod({
+	name: 'creatureProperties.pull',
+	validate: null,
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 5,
+    timeInterval: 5000,
+  },
+	run({_id, path, itemId}){
+    // Permissions
+		let property = CreatureProperties.findOne(_id);
+    let rootCreature = getRootCreatureAncestor(property);
+    assertEditPermission(rootCreature, this.userId);
+
+    // Do work
+		CreatureProperties.update(_id, {
+			$pull: {[path.join('.')]: {_id: itemId}},
+		}, {
+			selector: {type: property.type},
+			getAutoValues: false,
+		});
+
+    // TODO figure out if this method can change deps or not
+    recomputeCreatureByDoc(rootCreature);
+    // recomputePropertyDependencies(property);
+	}
+});
+
+export default pullFromProperty;

app/imports/api/creature/creatureProperties/methods/pushToProperty.js

@@ -0,0 +1,35 @@
+import { ValidatedMethod } from 'meteor/mdg:validated-method';
+import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+import { assertEditPermission } from '/imports/api/sharing/sharingPermissions.js';
+import getRootCreatureAncestor from '/imports/api/creature/creatureProperties/getRootCreatureAncestor.js';
+import { recomputeCreatureByDoc } from '/imports/api/creature/computation/methods/recomputeCreature.js';
+
+const pushToProperty = new ValidatedMethod({
+	name: 'creatureProperties.push',
+	validate: null,
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 5,
+    timeInterval: 5000,
+  },
+	run({_id, path, value}){
+    // Permissions
+		let property = CreatureProperties.findOne(_id);
+    let rootCreature = getRootCreatureAncestor(property);
+    assertEditPermission(rootCreature, this.userId);
+
+    // Do work
+		CreatureProperties.update(_id, {
+			$push: {[path.join('.')]: value},
+		}, {
+			selector: {type: property.type},
+		});
+
+    // TODO figure out if this method can change deps or not
+    recomputeCreatureByDoc(rootCreature);
+    // recomputePropertyDependencies(property);
+	}
+});
+
+export default pushToProperty;

app/imports/api/creature/creatureProperties/methods/restoreProperty.js

@@ -0,0 +1,40 @@
+import { ValidatedMethod } from 'meteor/mdg:validated-method';
+import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
+import SimpleSchema from 'simpl-schema';
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+import { assertEditPermission } from '/imports/api/sharing/sharingPermissions.js';
+import { restore } from '/imports/api/parenting/softRemove.js';
+import getRootCreatureAncestor from '/imports/api/creature/creatureProperties/getRootCreatureAncestor.js';
+import recomputeInactiveProperties from '/imports/api/creature/denormalise/recomputeInactiveProperties.js';
+import { recomputeCreatureByDoc } from '/imports/api/creature/computation/methods/recomputeCreature.js';
+import recomputeInventory from '/imports/api/creature/denormalise/recomputeInventory.js';
+
+const restoreProperty = new ValidatedMethod({
+	name: 'creatureProperties.restore',
+	validate: new SimpleSchema({
+		_id: SimpleSchema.RegEx.Id
+	}).validator(),
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 5,
+    timeInterval: 5000,
+  },
+	run({_id}){
+    // Permissions
+		let property = CreatureProperties.findOne(_id);
+    let rootCreature = getRootCreatureAncestor(property);
+    assertEditPermission(rootCreature, this.userId);
+
+    // Do work
+    restore({_id, collection: CreatureProperties});
+
+    // Items and containers might be restored
+    recomputeInventory(rootCreature._id);
+    // Parents active status may have changed while it was deleted
+    recomputeInactiveProperties(rootCreature._id);
+    // Changes dependency tree by restoring children
+    recomputeCreatureByDoc(rootCreature);
+	}
+});
+
+export default restoreProperty;

app/imports/api/creature/creatureProperties/methods/selectAmmoItem.js

@@ -0,0 +1,52 @@
+import { ValidatedMethod } from 'meteor/mdg:validated-method';
+import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
+import SimpleSchema from 'simpl-schema';
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+import getRootCreatureAncestor from '/imports/api/creature/creatureProperties/getRootCreatureAncestor.js';
+import { assertEditPermission } from '/imports/api/sharing/sharingPermissions.js';
+import { recomputeCreatureByDoc } from '/imports/api/creature/computation/methods/recomputeCreature.js';
+
+const selectAmmoItem = new ValidatedMethod({
+  name: 'creatureProperties.selectAmmoItem',
+  validate: new SimpleSchema({
+    actionId: SimpleSchema.RegEx.Id,
+    itemId: SimpleSchema.RegEx.Id,
+    itemConsumedIndex: Number,
+  }).validator(),
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 5,
+    timeInterval: 5000,
+  },
+  run({actionId, itemId, itemConsumedIndex}) {
+    // Permissions
+		let action = CreatureProperties.findOne(actionId);
+    let rootCreature = getRootCreatureAncestor(action);
+		assertEditPermission(rootCreature, this.userId);
+
+    // Check that this index has a document to edit
+    let itemConsumed = action.resources.itemsConsumed[itemConsumedIndex];
+    if (!itemConsumed){
+      throw new Meteor.Error('Resouce not found',
+        'Could not set ammo, because the ammo document was not found');
+    }
+    let itemToLink = CreatureProperties.findOne(itemId);
+    if (!itemToLink){
+      throw new Meteor.Error('Item not found',
+        'Could not set ammo: the item was not found');
+    }
+    let path = `resources.itemsConsumed.${itemConsumedIndex}.itemId`;
+    CreatureProperties.update(actionId, {
+      $set: {[path]: itemId}
+    }, {
+      selector: action,
+    });
+
+    // Changing the linked item does change the dependency tree
+    // TODO: We can predict exactly which deps will be affected instead of
+    //       recomputing the entire creature
+    recomputeCreatureByDoc(rootCreature);
+  },
+});
+
+export default selectAmmoItem;

app/imports/api/creature/creatureProperties/methods/softRemoveProperty.js

@@ -0,0 +1,37 @@
+import { ValidatedMethod } from 'meteor/mdg:validated-method';
+import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
+import SimpleSchema from 'simpl-schema';
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+import { assertEditPermission } from '/imports/api/sharing/sharingPermissions.js';
+import { softRemove } from '/imports/api/parenting/softRemove.js';
+import getRootCreatureAncestor from '/imports/api/creature/creatureProperties/getRootCreatureAncestor.js';
+import { recomputeCreatureByDoc } from '/imports/api/creature/computation/methods/recomputeCreature.js';
+import recomputeInventory from '/imports/api/creature/denormalise/recomputeInventory.js';
+
+const softRemoveProperty = new ValidatedMethod({
+	name: 'creatureProperties.softRemove',
+	validate: new SimpleSchema({
+		_id: SimpleSchema.RegEx.Id
+	}).validator(),
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 5,
+    timeInterval: 5000,
+  },
+	run({_id}){
+    // Permissions
+		let property = CreatureProperties.findOne(_id);
+    let rootCreature = getRootCreatureAncestor(property);
+    assertEditPermission(rootCreature, this.userId);
+
+    // Do work
+		softRemove({_id, collection: CreatureProperties});
+
+    // Potentially changes items and containers
+    recomputeInventory(rootCreature._id);
+    // Changes dependency tree by removing children
+    recomputeCreatureByDoc(rootCreature);
+	}
+});
+
+export default softRemoveProperty;

app/imports/api/creature/creatureProperties/methods/updateCreatureProperty.js

@@ -0,0 +1,66 @@
+import { ValidatedMethod } from 'meteor/mdg:validated-method';
+import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+import { assertEditPermission } from '/imports/api/sharing/sharingPermissions.js';
+import getRootCreatureAncestor from '/imports/api/creature/creatureProperties/getRootCreatureAncestor.js';
+import { recomputeCreatureByDoc } from '/imports/api/creature/computation/methods/recomputeCreature.js';
+import recomputeInactiveProperties from '/imports/api/creature/denormalise/recomputeInactiveProperties.js';
+import recomputeInventory from '/imports/api/creature/denormalise/recomputeInventory.js';
+
+const updateCreatureProperty = new ValidatedMethod({
+  name: 'creatureProperties.update',
+  validate({_id, path}){
+		if (!_id) throw new Meteor.Error('No _id', '_id is required');
+		// 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');
+		}
+  },
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 5,
+    timeInterval: 5000,
+  },
+  run({_id, path, value}) {
+    // Permission
+    let property = CreatureProperties.findOne(_id, {
+      fields: {type: 1, ancestors: 1}
+    });
+    let rootCreature = getRootCreatureAncestor(property);
+    assertEditPermission(rootCreature, 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},
+		});
+
+    // Some updates might cause other properties to become inactive
+    if ([
+      'applied', 'equipped', 'prepared', 'alwaysPrepared', 'disabled'
+    ].includes(path[0])){
+      recomputeInactiveProperties(rootCreature._id);
+    }
+
+    if (property.type === 'item' || property.type === 'container'){
+      // Potentially changes items and containers
+      recomputeInventory(rootCreature._id);
+    }
+    // Updating a property is likely to change dependencies, do a full recompute
+    recomputeCreatureByDoc(rootCreature);
+  },
+});
+
+export default updateCreatureProperty;

app/imports/api/creature/creatureProperties/recomputeCreaturesByProperty.js

@@ -0,0 +1,12 @@
+import { recomputeCreatureById } from '/imports/api/creature/computation/methods/recomputeCreature.js';
+
+/**
+ * Recomputes all ancestor creatures of this property
+ */
+export default function recomputeCreaturesByProperty(property){
+	for (let ref of property.ancestors){
+		if (ref.collection === 'creatures') {
+			recomputeCreatureById.call(ref.id);
+		}
+	}
+}

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

@@ -0,0 +1,78 @@
+import { ValidatedMethod } from 'meteor/mdg:validated-method';
+import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
+import SimpleSchema from 'simpl-schema';
+import { assertEditPermission } from '/imports/api/creature/creaturePermissions.js';
+import Creatures from '/imports/api/creature/Creatures.js';
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+
+export const recomputeDamageMultipliers = new ValidatedMethod({
+
+  name: 'creatures.recomputeDamageMultipliers',
+
+  validate: new SimpleSchema({
+    creatureId: { type: String }
+  }).validator(),
+
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 5,
+    timeInterval: 5000,
+  },
+
+  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 = CreatureProperties.find({
+    'ancestors.id': creatureId,
+    type: 'damageMultiplier',
+    removed: {$ne: true},
+    inactive: {$ne: true},
+  }, {
+    sort: {order: 1}
+  });
+
+  // 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/denormalise/recomputeInactiveProperties.js

@@ -0,0 +1,72 @@
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+
+export default function recomputeInactiveProperties(ancestorId){
+  let disabledFilter = {
+    'ancestors.id': ancestorId,
+    $or: [
+      {disabled: true}, // Everything can be disabled
+      {type: 'buff', applied: false}, // Buffs can be applied
+      {type: 'item', equipped: {$ne: true}},
+      {type: 'toggle', toggleResult: false},
+      {type: 'spell', prepared: {$ne: true}, alwaysPrepared: {$ne: true}},
+    ],
+  };
+  let disabledIds = CreatureProperties.find(disabledFilter, {
+    fields: {_id: 1},
+  }).map(prop => prop._id);
+
+  // Deactivate relevant properties
+  // Inactive properties
+  CreatureProperties.update({
+    'ancestors.id': ancestorId,
+    '_id': {$in: disabledIds},
+    $or: [
+      {inactive: {$ne: true}},
+      {deactivatedBySelf: {$ne: true}},
+      {deactivatedByAncestor: true},
+    ],
+  }, {
+    $set: {
+      inactive: true,
+      deactivatedBySelf: true,
+    },
+    $unset: {deactivatedByAncestor: 1},
+  }, {
+    multi: true,
+    selector: {type: 'any'},
+  });
+  // Decendants of inactive properties
+  CreatureProperties.update({
+    'ancestors.id': {$eq: ancestorId, $in: disabledIds},
+    $or: [
+      {inactive: {$ne: true}},
+      {deactivatedByAncestor: {$ne: true}},
+    ],
+  }, {
+    $set: {
+      inactive: true,
+      deactivatedByAncestor: true,
+    },
+  }, {
+    multi: true,
+    selector: {type: 'any'},
+  });
+
+  // Remove inactive from all the properties that are inactive but shouldn't be
+  CreatureProperties.update({
+    'ancestors.id': {$eq: ancestorId, $nin: disabledIds},
+    '_id': {$nin: disabledIds},
+    $or: [
+      {inactive: true},
+      {deactivatedByAncestor: true},
+    ],
+  }, {
+    $unset: {
+      inactive: 1,
+      deactivatedByAncestor: 1,
+    },
+  }, {
+    multi: true,
+    selector: {type: 'any'},
+  });
+}

app/imports/api/creature/denormalise/recomputeInventory.js

@@ -0,0 +1,111 @@
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+import Creatures from '/imports/api/creature/Creatures.js';
+import { nodesToTree } from '/imports/api/parenting/parenting.js';
+
+export default function recomputeInventory(creatureId){
+  let inventoryForest = nodesToTree({
+    collection: CreatureProperties,
+    ancestorId: creatureId,
+    filter: {
+      type: {$in: ['container', 'item']},
+    },
+    deactivatedByAncestor: {$ne: true},
+  });
+  let containersToWrite = [];
+  let data =  getChildrenInventoryData(inventoryForest, containersToWrite);
+  containersToWrite.forEach(container => {
+    CreatureProperties.update(container._id, {$set: {
+      contentsWeight: container.contentsWeight,
+      contentsValue: container.contentsValue,
+    }}, {selector: {type: 'container'}});
+  });
+  Creatures.update(creatureId, {$set: {
+    'denormalizedStats.weightTotal': data.weightTotal,
+    'denormalizedStats.weightEquipment': data.weightEquipment,
+    'denormalizedStats.weightCarried': data.weightCarried,
+    'denormalizedStats.valueTotal': data.valueTotal,
+    'denormalizedStats.valueEquipment': data.valueEquipment,
+    'denormalizedStats.valueCarried': data.valueCarried,
+    'denormalizedStats.itemsAttuned': data.itemsAttuned,
+  }});
+  return data;
+}
+
+function getChildrenInventoryData(forest, containersToWrite){
+  let data = {
+    weightTotal: 0,
+    weightEquipment: 0,
+    weightCarried: 0,
+    valueTotal: 0,
+    valueEquipment: 0,
+    valueCarried: 0,
+    itemsAttuned: 0,
+  }
+  forest.forEach(tree => {
+    let treeData = getInventoryData(tree, containersToWrite);
+    for (let key in data){
+      data[key] += treeData[key] || 0;
+    }
+  });
+  return data;
+}
+
+function getInventoryData(tree, containersToWrite){
+  let data = {
+    weightTotal: 0,
+    weightEquipment: 0,
+    weightCarried: 0,
+    valueTotal: 0,
+    valueEquipment: 0,
+    valueCarried: 0,
+    itemsAttuned: 0,
+  }
+  let childData = getChildrenInventoryData(tree.children, containersToWrite);
+  let node = tree.node;
+  if (node.type === 'container'){
+    data.weightTotal += node.weight || 0;
+    data.valueTotal += node.value || 0;
+    data.weightCarried += node.weight || 0;
+    data.valueCarried += node.value || 0;
+    storeContentsData(node, childData, containersToWrite);
+  } else if (node.type === 'item'){
+    data.weightTotal += (node.weight * node.quantity) || 0;
+    data.valueTotal += (node.value * node.quantity) || 0;
+    data.weightCarried += (node.weight * node.quantity) || 0;
+    data.valueCarried += (node.value * node.quantity) || 0;
+    if (node.equipped){
+      data.weightEquipment += (node.weight * node.quantity) || 0;
+      data.valueEquipment += (node.value * node.quantity) || 0;
+    }
+    if (node.attuned){
+      data.itemsAttuned += 1;
+    }
+  }
+  for (let key in data){
+    data[key] += childData[key];
+  }
+  if (node.carried === false){
+    data.weightCarried = 0;
+    data.valueCarried = 0;
+  }
+  if (node.contentsWeightless){
+    data.weightCarried = node.weight;
+  }
+  return data
+}
+
+function storeContentsData(node, childData, containersToWrite){
+  let newContentsWeight = childData.weightCarried
+  if (node.contentsWeight !== newContentsWeight){
+    node.contentsWeight = newContentsWeight;
+    node.contentsWeightChanged = true;
+  }
+  let newContentsValue = childData.valueCarried;
+  if (node.contentsValue !== newContentsValue){
+    node.contentsValue = newContentsValue;
+    node.contentsValueChanged = true;
+  }
+  if (node.contentsWeightChanged || node.contentsValueChanged){
+    containersToWrite.push(node);
+  }
+}

app/imports/api/creature/denormalise/recomputeSlotFullness.js

@@ -0,0 +1,43 @@
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+// n + 1 database queries + n potential updates for n slots. Could be sped up.
+export default function recomputeSlotFullness(ancestorId){
+  CreatureProperties.find({
+    'ancestors.id': ancestorId,
+    type: 'propertySlot',
+  }).forEach(slot => {
+    let children = CreatureProperties.find({
+      'parent.id': slot._id,
+      removed: {$ne: true},
+    }, {
+      fields: {
+        slotQuantityFilled: 1,
+        type: 1
+      }
+    }).fetch();
+    let totalFilled = 0;
+    children.forEach(child => {
+      if (child.type === 'slotFiller'){
+        totalFilled += child.slotQuantityFilled;
+      } else {
+        totalFilled++;
+      }
+    });
+    let spaceLeft;
+    let expected = slot.quantityExpectedResult;
+    if (typeof expected !== 'number'){
+      expected = 1;
+    }
+    if (expected === 0){
+      spaceLeft = null;
+    } else {
+      spaceLeft = expected - totalFilled;
+    }
+    if (slot.totalFilled !== totalFilled || slot.spaceLeft !== spaceLeft){
+      CreatureProperties.update(slot._id, {
+        $set: {totalFilled, spaceLeft},
+      }, {
+        selector: {type: 'propertySlot'}
+      });
+    }
+  });
+}

app/imports/api/creature/experience/Experiences.js

@@ -0,0 +1,197 @@
+import SimpleSchema from 'simpl-schema';
+import { ValidatedMethod } from 'meteor/mdg:validated-method';
+import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
+import { getUserTier } from '/imports/api/users/patreon/tiers.js';
+import { assertEditPermission } from '/imports/api/creature/creaturePermissions.js';
+import Creatures from '/imports/api/creature/Creatures.js';
+import { recomputeCreatureById } from '/imports/api/creature/computation/methods/recomputeCreature.js';
+
+let Experiences = new Mongo.Collection('experiences');
+
+let ExperienceSchema = new SimpleSchema({
+	name: {
+		type: String,
+		optional: true,
+	},
+	// The amount of XP this experience gives
+	xp: {
+		type: SimpleSchema.Integer,
+		optional: true,
+    min: 0,
+	},
+  // Setting levels instead of value grants whole levels
+  levels: {
+    type: SimpleSchema.Integer,
+    optional: true,
+    min: 0,
+    index: 1,
+  },
+	// The real-world date that it occured, usually sorted by date
+	date: {
+		type: Date,
+		autoValue: function() {
+			// If the date isn't set, set it to now
+			if (!this.isSet) {
+				return new Date();
+			}
+		},
+    index: 1,
+	},
+  creatureId: {
+    type: String,
+    regEx: SimpleSchema.RegEx.Id,
+    index: 1,
+  },
+});
+
+Experiences.attachSchema(ExperienceSchema);
+
+const insertExperienceForCreature = function({experience, creatureId, userId}){
+  assertEditPermission(creatureId, userId);
+  if (experience.xp){
+    Creatures.update(creatureId, {$inc: {
+      'denormalizedStats.xp': experience.xp
+    }});
+  }
+  if (experience.levels) {
+    Creatures.update(creatureId, {$inc: {
+      'denormalizedStats.milestoneLevels': experience.levels
+    }});
+  }
+  experience.creatureId = creatureId;
+  let id = Experiences.insert(experience);
+  recomputeCreatureById(creatureId);
+  return id;
+};
+
+const insertExperience = new ValidatedMethod({
+  name: 'experiences.insert',
+  validate: new SimpleSchema({
+    experience: {
+      type: ExperienceSchema.omit('creatureId'),
+    },
+    creatureIds: {
+      type: Array,
+      max: 12,
+    },
+    'creatureIds.$': {
+      type: String,
+      regEx: SimpleSchema.RegEx.Id,
+    },
+  }).validator(),
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 5,
+    timeInterval: 5000,
+  },
+  run({experience, creatureIds}) {
+    let userId = this.userId;
+    if (!userId) {
+      throw new Meteor.Error('Experiences.methods.insert.denied',
+      'You need to be logged in to insert an experience');
+    }
+    let tier = getUserTier(this.userId);
+    if (!tier.paidBenefits){
+      throw new Meteor.Error('Experiences.methods.insert.denied',
+      `The ${tier.name} tier does not allow you to grant experience`);
+    }
+    let insertedIds = [];
+    creatureIds.forEach(creatureId => {
+      let id = insertExperienceForCreature({experience, creatureId, userId});
+      insertedIds.push(id);
+    });
+    return insertedIds;
+  },
+});
+
+const removeExperience = new ValidatedMethod({
+  name: 'experiences.remove',
+  validate: new SimpleSchema({
+    experienceId: {
+      type: String,
+      regEx: SimpleSchema.RegEx.Id,
+    },
+  }).validator(),
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 5,
+    timeInterval: 5000,
+  },
+  run({experienceId}) {
+    let userId = this.userId;
+    if (!userId) {
+      throw new Meteor.Error('Experiences.methods.remove.denied',
+      'You need to be logged in to remove an experience');
+    }
+    let tier = getUserTier(this.userId);
+    if (!tier.paidBenefits){
+      throw new Meteor.Error('Experiences.methods.remove.denied',
+      `The ${tier.name} tier does not allow you to remove  an experience`);
+    }
+    let experience = Experiences.findOne(experienceId);
+    if (!experience) return;
+    let creatureId = experience.creatureId
+    assertEditPermission(creatureId, userId);
+    if (experience.xp){
+      Creatures.update(creatureId, {$inc: {
+        'denormalizedStats.xp': -experience.xp
+      }});
+    }
+    if (experience.levels) {
+      Creatures.update(creatureId, {$inc: {
+        'denormalizedStats.milestoneLevels': -experience.levels
+      }});
+    }
+    experience.creatureId = creatureId;
+    let numRemoved = Experiences.remove(experienceId);
+    recomputeCreatureById(creatureId);
+    return numRemoved;
+  },
+});
+
+const recomputeExperiences = new ValidatedMethod({
+  name: 'experiences.recompute',
+  validate: new SimpleSchema({
+    creatureId: {
+      type: String,
+      regEx: SimpleSchema.RegEx.Id,
+    },
+  }).validator(),
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 5,
+    timeInterval: 5000,
+  },
+  run({creatureId}) {
+    let userId = this.userId;
+    if (!userId) {
+      throw new Meteor.Error('Experiences.methods.recompute.denied',
+      'You need to be logged in to recompute a creature\'s experiences');
+    }
+    let tier = getUserTier(this.userId);
+    if (!tier.paidBenefits){
+      throw new Meteor.Error('Experiences.methods.recompute.denied',
+      `The ${tier.name} tier does not allow you to recompute a creature's experiences`);
+    }
+    assertEditPermission(creatureId, userId);
+
+    let xp = 0;
+    let milestoneLevels = 0;
+    Experiences.find({
+      creatureId
+    }, {
+      fields: {xp: 1, levels: 1}
+    }).forEach(experience => {
+      xp += experience.xp || 0;
+      milestoneLevels += experience.levels || 0;
+    });
+    Creatures.update(creatureId, {$set: {
+      'denormalizedStats.xp': xp,
+      'denormalizedStats.milestoneLevels': milestoneLevels
+    }});
+    recomputeCreatureById(creatureId);
+  },
+});
+
+export default Experiences;
+export { ExperienceSchema, insertExperience, removeExperience, recomputeExperiences };

app/imports/api/creature/getDefaultCharacterDocs.js

@@ -1,181 +0,0 @@
-import DEFAULT_CHARACTER_DOCS from '/imports/api/creature/DEFAULT_CHARACTER_DOCS.js';
-import { Random } from 'meteor/random';
-
-const setParent = function(charId){
-	let parent = {
-		collection: "Creatures",
-		id: charId,
-		group: "default",
-	};
-	return doc => {
-		doc.parent = doc.parent || parent;
-		doc.charId = charId;
-	};
-};
-
-const getRacialBonusEffect = function(charId, attribute, bonus){
-	return {
-		name: "Race Bonus",
-		stat: attribute,
-		operation: "add",
-		calculation: bonus.toString(),
-		enabled: true,
-		parent: {
-			collection: "Creatures",
-			id: charId,
-			group: "race",
-		},
-		charId: charId,
-	};
-};
-
-const giveDocsOrderAndIds = function(docArray){
-	for (i in docArray){
-		docArray[i].order = +i;
-		if (!docArray[i]._id){
-			docArray[i]._id = Random.id();
-		}
-	}
-};
-
-const getDefaultCharacterDocs = function(charId, {
-	// Character form data
-	baseStrength = 10,
-	baseDexterity = 10,
-	baseConstitution = 10,
-	baseIntelligence = 10,
-	baseWisdom = 10,
-	baseCharisma = 10,
-	strengthBonus = 0,
-	dexterityBonus = 0,
-	constitutionBonus = 0,
-	intelligenceBonus = 0,
-	wisdomBonus = 0,
-	charismaBonus = 0,
-	hitDice = "d8",
-	cls = "Class",
-  level = 1,
-}){
-	let docs = DEFAULT_CHARACTER_DOCS();
-
-	// Setup the base ability scores
-	docs.attributes[0].baseValue = baseStrength;
-	docs.attributes[1].baseValue = baseDexterity;
-	docs.attributes[2].baseValue = baseConstitution;
-	docs.attributes[3].baseValue = baseIntelligence;
-	docs.attributes[4].baseValue = baseWisdom;
-	docs.attributes[5].baseValue = baseCharisma;
-
-	// Set up racial bonuses
-	if (strengthBonus) {
-		docs.effects.push(
-			getRacialBonusEffect(charId, 'strength', strengthBonus)
-		);
-	}
-	if (dexterityBonus) {
-		docs.effects.push(
-			getRacialBonusEffect(charId, 'dexterity', dexterityBonus)
-		);
-	}
-	if (constitutionBonus) {
-		docs.effects.push(
-			getRacialBonusEffect(charId, 'constitution', constitutionBonus)
-		);
-	}
-	if (intelligenceBonus) {
-		docs.effects.push(
-			getRacialBonusEffect(charId, 'intelligence', intelligenceBonus)
-		);
-	}
-	if (wisdomBonus) {
-		docs.effects.push(
-			getRacialBonusEffect(charId, 'wisdom', wisdomBonus)
-		);
-	}
-	if (charismaBonus) {
-		docs.effects.push(
-			getRacialBonusEffect(charId, 'charisma', charismaBonus)
-		);
-	}
-
-	// Set up Class
-  const strippedCls = cls.replace(/\s+/g, '')
-  const classId = Random.id();
-	docs.classes = [{
-		_id: classId,
-		charId,
-    level,
-		name: cls,
-	}];
-
-  // Setup hit dice
-  docs.effects.push({
-		name: cls,
-		stat: `${hitDice}HitDice`,
-		operation: "add",
-		calculation: `${strippedCls}Level`,
-		enabled: true,
-		parent: {
-			collection: "Classes",
-			id: classId,
-		},
-		charId: charId,
-	});
-
-  // Setup health for all class levels
-  let healthPerLevel = 4;
-  if (hitDice == "d6"){
-    healthPerLevel = 4;
-  } else if (hitDice == "d8"){
-    healthPerLevel = 5;
-  } else if (hitDice == "d10"){
-    healthPerLevel = 6;
-  } else if (hitDice == "d12"){
-    healthPerLevel = 7;
-  }
-	docs.effects.push({
-		name: cls,
-		stat: `hitPoints`,
-		operation: "add",
-		calculation: `${healthPerLevel - 2} + ${healthPerLevel} * ${strippedCls}Level`,
-		enabled: true,
-		parent: {
-			collection: "Classes",
-			id: classId,
-		},
-		charId: charId,
-	});
-
-	// Set the parents for base items
-	docs.attributes.forEach(setParent(charId));
-	docs.skills.forEach(setParent(charId));
-	docs.damageMultipliers.forEach(setParent(charId));
-	docs.effects.forEach(setParent(charId));
-	docs.containers.forEach(setParent(charId));
-
-	// Set up parenting on items and move them to the top level items object
-	docs.items = [];
-	docs.containers.forEach(container => {
-		container._id = Random.id();
-		const parent = {
-			collection: "Containers",
-			id: container._id,
-		};
-		container.items.forEach(item => {
-			item.parent = parent;
-			item.charId = charId;
-		});
-		// Move the items to the top level array
-		docs.items.push(...container.items);
-		delete container.items;
-	});
-
-	// Order the docs
-	for (collection in docs){
-		giveDocsOrderAndIds(docs[collection]);
-	}
-
-	return docs
-};
-
-export default getDefaultCharacterDocs;

app/imports/api/creature/journal/JournalEntry.js

@@ -1,7 +1,7 @@
 import SimpleSchema from 'simpl-schema';
 
 let ExperienceSchema = new SimpleSchema({
-	name: {
+	title: {
 		type: String,
 		optional: true,
 	},
@@ -10,11 +10,6 @@ let ExperienceSchema = new SimpleSchema({
 		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,
@@ -30,6 +25,20 @@ let ExperienceSchema = new SimpleSchema({
 		type: String,
 		optional: true,
 	},
+  // Tags to better find this entry later
+  tags: {
+    type: Array,
+    defaultValue: [],
+  },
+  'tags.$': {
+    type: String,
+  },
+  // ID of the journal this entry belongs to
+  journalId: {
+    type: String,
+    regEx: SimpleSchema.RegEx.Id,
+    index: 1,
+  }
 });
 
 export { ExperienceSchema };

app/imports/api/creature/log/CreatureLogs.js

@@ -0,0 +1,231 @@
+import SimpleSchema from 'simpl-schema';
+import Creatures from '/imports/api/creature/Creatures.js';
+import LogContentSchema from '/imports/api/creature/log/LogContentSchema.js';
+import { ValidatedMethod } from 'meteor/mdg:validated-method';
+import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
+import {assertEditPermission} from '/imports/api/creature/creaturePermissions.js';
+import {
+  parse,
+  CompilationContext,
+  prettifyParseError
+} from '/imports/parser/parser.js';
+const PER_CREATURE_LOG_LIMIT = 100;
+
+if (Meteor.isServer){
+  var sendWebhookAsCreature = require('/imports/server/discord/sendWebhook.js').sendWebhookAsCreature;
+}
+
+let CreatureLogs = new Mongo.Collection('creatureLogs');
+
+let CreatureLogSchema = new SimpleSchema({
+  content: {
+    type: Array,
+    defaultValue: [],
+    maxCount: 25,
+  },
+  'content.$': {
+    type: LogContentSchema,
+  },
+	// The real-world date that it occured, usually sorted by date
+	date: {
+		type: Date,
+		autoValue: function() {
+			// If the date isn't set, set it to now
+			if (!this.isSet) {
+				return new Date();
+			}
+		},
+    index: 1,
+	},
+  creatureId: {
+    type: String,
+    regEx: SimpleSchema.RegEx.Id,
+    index: 1,
+  },
+  creatureName: {
+    type: String,
+    optional: true,
+  },
+});
+
+CreatureLogs.attachSchema(CreatureLogSchema);
+
+function removeOldLogs(creatureId){
+  // Find the first log that is over the limit
+  let firstExpiredLog = CreatureLogs.find({
+    creatureId
+  }, {
+    sort: {date: -1},
+    skip: PER_CREATURE_LOG_LIMIT,
+  });
+  // Remove all logs older than the one over the limit
+  CreatureLogs.remove({
+    creatureId,
+    date: {$lte: firstExpiredLog.date},
+  });
+}
+
+function logToMessageData(log){
+  let embed = {
+    fields: [],
+  };
+  log.content.forEach(c => {
+    let field = {};
+    let descriptionField = {};
+    if (c.name) field.name = c.name;
+    let valueArray = [];
+    if (c.error) valueArray.push(`*${c.error}*`);
+    if (c.resultPrefix) valueArray.push(`${c.resultPrefix}`);
+    if (c.result) valueArray.push(`\`${c.result}\``);
+    if (c.details) valueArray.push(c.details);
+    if (valueArray.length) field.value = valueArray.join(' ');
+    if (c.description){
+      if (!field.value){
+        field.value = c.description;
+      } else {
+        descriptionField.value = c.description;
+      }
+    }
+    if (field.name || field.value){
+      if (!field.name) field.name = '\u200b';
+      if (!field.value) field.value = '\u200b';
+      embed.fields.push(field);
+    }
+    if (descriptionField.value){
+      descriptionField.name = '\u200b';
+      embed.fields.push(descriptionField);
+    }
+  });
+  return { embeds: [embed] };
+}
+
+function logWebhook({log, creature}){
+  if (Meteor.isServer){
+    sendWebhookAsCreature({
+      creature,
+      data: logToMessageData(log),
+    });
+  }
+}
+
+const insertCreatureLog = new ValidatedMethod({
+  name: 'creatureLogs.methods.insertCreatureLog',
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 5,
+    timeInterval: 5000,
+  },
+	validate: new SimpleSchema({
+		log: CreatureLogSchema.omit('date'),
+	}).validator(),
+  run({log}){
+    const creatureId = log.creatureId;
+    const creature = Creatures.findOne(creatureId, {fields: {
+      readers: 1,
+      writers: 1,
+      owner: 1,
+      'settings.discordWebhook': 1,
+      name: 1,
+      avatarPicture: 1,
+    }});
+    assertEditPermission(creature, this.userId);
+    // Build the new log
+    let id = insertCreatureLogWork({log, creature, method: this})
+    return id;
+  },
+});
+
+export function insertCreatureLogWork({log, creature, method}){
+  // Build the new log
+  if (typeof log === 'string'){
+    log = {text: log};
+  }
+  log.date = new Date();
+  // Insert it
+  let id = CreatureLogs.insert(log);
+  if (Meteor.isServer){
+    method.unblock();
+    removeOldLogs(creature._id);
+    logWebhook({log, creature});
+  }
+  return id;
+}
+
+
+function equalIgnoringWhitespace(a, b){
+  if (typeof a !== 'string' || typeof b !== 'string') return a === b;
+  return a.replace(/\s/g,'') === b.replace(/\s/g, '');
+}
+
+const logRoll = new ValidatedMethod({
+  name: 'creatureLogs.methods.logForCreature',
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 5,
+    timeInterval: 5000,
+  },
+	validate: new SimpleSchema({
+		roll: {
+			type: String,
+		},
+		creatureId: {
+			type: String,
+			regEx: SimpleSchema.RegEx.Id,
+		},
+	}).validator(),
+  run({roll, creatureId}){
+    const creature = Creatures.findOne(creatureId, {fields: {
+      variables: 1,
+      readers: 1,
+      writers: 1,
+      owner: 1,
+      'settings.discordWebhook': 1,
+      name: 1,
+      avatarPicture: 1,
+    }});
+    assertEditPermission(creature, this.userId);
+    let logContent = []
+    let parsedResult = undefined;
+    try {
+      parsedResult = parse(roll);
+    } catch (e){
+      let error = prettifyParseError(e);
+      logContent.push({error});
+    }
+    if (parsedResult) try {
+      let rollContext = new CompilationContext();
+      let compiled = parsedResult.compile(creature.variables, rollContext);
+      let compiledString = compiled.toString();
+      if (!equalIgnoringWhitespace(compiledString, roll)) logContent.push({
+        details: roll
+      });
+      logContent.push({
+        details: compiledString
+      });
+      let rolled = compiled.roll(creature.variables, rollContext);
+      let rolledString = rolled.toString();
+      if (rolledString !== compiledString) logContent.push({
+        result: rolled.toString()
+      });
+      let result = rolled.reduce(creature.variables, rollContext);
+      let resultString = result.toString();
+      if (resultString !== rolledString) logContent.push({
+        result: resultString
+      });
+    } catch (e){
+      logContent = [{error: 'Calculation error'}];
+    }
+    const log = {
+      content: logContent,
+      creatureId,
+      date: new Date(),
+    };
+
+    let id = insertCreatureLogWork({log, creature, method: this});
+
+    return id;
+  },
+});
+
+export default CreatureLogs;
+export { CreatureLogSchema, insertCreatureLog, logRoll};

app/imports/api/creature/log/LogContentSchema.js

@@ -0,0 +1,58 @@
+import SimpleSchema from 'simpl-schema';
+import ErrorSchema from '/imports/api/properties/subSchemas/ErrorSchema.js';
+import RollDetailsSchema from '/imports/api/properties/subSchemas/RollDetailsSchema.js';
+
+let LogContentSchema = new SimpleSchema({
+  name: {
+    type: String,
+    optional: true,
+  },
+  error: {
+    type: String,
+    optional: true,
+  },
+  resultPrefix: {
+    type: String,
+    optional: true,
+  },
+  result: {
+    type: String,
+    optional: true,
+  },
+  expandedResult: {
+    type: String,
+    optional: true,
+  },
+  details: {
+    type: String,
+    optional: true,
+  },
+  description: {
+    type: String,
+    optional: true,
+  },
+  context: {
+    type: Object,
+    optional: true,
+  },
+  'context.errors':{
+    type: Array,
+    defaultValue: [],
+  },
+  'context.errors.$': {
+    type: ErrorSchema,
+  },
+  'context.rolls': {
+    type: Array,
+    defaultValue: [],
+  },
+  'context.rolls.$': {
+    type: RollDetailsSchema,
+  },
+  'context.doubleRolls': {
+    type: Boolean,
+    optional: true,
+  },
+});
+
+export default LogContentSchema;

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

@@ -1,4 +1,4 @@
-import { recomputeCreatureById } from '/imports/api/creature/computation/recomputeCreature.js';
+import { recomputeCreatureById } from '/imports/api/creature/computation/methods/recomputeCreature.js';
 
 export default function recomputeCreatureMixin(methodOptions){
   let runFunc = methodOptions.run;

app/imports/api/creature/removeCreature.js

@@ -1,26 +1,41 @@
 import SimpleSchema from 'simpl-schema';
-import Creatures from '/imports/api/creature/Creatures.js';
-import CreatureProperties from '/imports/api/creature/CreatureProperties.js'
+import { ValidatedMethod } from 'meteor/mdg:validated-method';
+import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
 import { assertOwnership } from '/imports/api/creature/creaturePermissions.js';
+import Creatures from '/imports/api/creature/Creatures.js';
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+import CreatureLogs from '/imports/api/creature/log/CreatureLogs.js';
+import Experiences from '/imports/api/creature/experience/Experiences.js';
 
-function removeRelatedDocuments(charId){
-  CreatureProperties.remove({'ancestors.id': charId});
-};
+function removeRelatedDocuments(creatureId){
+  CreatureProperties.remove({'ancestors.id': creatureId});
+  CreatureLogs.remove({creatureId});
+  Experiences.remove({creatureId});
+}
 
 const removeCreature = new ValidatedMethod({
-  name: "Creatures.methods.removeCreature", // DDP method name
+  name: 'Creatures.methods.removeCreature', // DDP method name
   validate: new SimpleSchema({
     charId: {
       type: String,
       regEx: SimpleSchema.RegEx.Id,
     },
   }).validator(),
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 5,
+    timeInterval: 5000,
+  },
   run({charId}) {
     assertOwnership(charId, this.userId)
-    Creatures.remove(charId);
-		this.unblock();
-		removeRelatedDocuments(charId);
+    this.unblock();
+    removeCreatureWork(charId)
   },
 });
 
+export function removeCreatureWork(creatureId){
+  Creatures.remove(creatureId);
+  removeRelatedDocuments(creatureId);
+}
+
 export default removeCreature;

app/imports/api/creature/restCreature.js

@@ -0,0 +1,116 @@
+import SimpleSchema from 'simpl-schema';
+import { ValidatedMethod } from 'meteor/mdg:validated-method';
+import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
+import Creatures from '/imports/api/creature/Creatures.js';
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+import { assertEditPermission } from '/imports/api/creature/creaturePermissions.js';
+import { recomputeCreatureById } from '/imports/api/creature/computation/methods/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(),
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 5,
+    timeInterval: 5000,
+  },
+  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 = {
+      'ancestors.id': creatureId,
+      reset: resetFilter,
+      removed: {$ne: true},
+      inactive: {$ne: 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 = CreatureProperties.find({
+        'ancestors.id': creatureId,
+        type: 'attribute',
+        attributeType: 'hitDice',
+        removed: {$ne: true},
+        inactive: {$ne: true},
+      }, {
+        fields: {
+          hitDiceSize: 1,
+          damage: 1,
+          value: 1,
+        }
+      }).fetch();
+      // 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/icons/Icons.js

@@ -1,8 +1,11 @@
 import SimpleSchema from 'simpl-schema';
+import { ValidatedMethod } from 'meteor/mdg:validated-method';
+import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
+import { assertAdmin } from '/imports/api/sharing/sharingPermissions.js';
 
 let Icons = new Mongo.Collection('icons');
 
-iconsSchema = new SimpleSchema({
+let iconsSchema = new SimpleSchema({
 	name: {
 		type: String,
     unique: true,
@@ -33,21 +36,62 @@ if (Meteor.isServer) {
   });
 }
 
+const storedIconsSchema = new SimpleSchema({
+  name: {
+    type: String,
+  },
+  shape: {
+    type: String,
+  },
+});
+
 Icons.attachSchema(iconsSchema);
 
-/*
-console.warn("Write Icons is not secure, disable before deployment")
+// This method does not validate icons against the schema, use wisely;
 const writeIcons = new ValidatedMethod({
-	name: 'writeIcons',
+	name: 'icons.write',
 	validate: null,
 	run(icons){
+    assertAdmin(this.userId);
     if (Meteor.isServer){
       this.unblock();
       Icons.rawCollection().insert(icons, {ordered: false});
     }
 	}
 });
-*/
 
-export { writeIcons };
+const findIcons = new ValidatedMethod({
+  name: 'icons.find',
+  validate: new SimpleSchema({
+    search: {
+      type: String,
+      max: 30,
+      optional: true,
+    },
+  }).validator(),
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 20,
+    timeInterval: 10000,
+  },
+  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

@@ -1,8 +1,11 @@
+import { ValidatedMethod } from 'meteor/mdg:validated-method';
+import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
 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
@@ -32,19 +35,28 @@ Libraries.attachSchema(LibrarySchema);
 export default Libraries;
 
 const insertLibrary = new ValidatedMethod({
-  name: 'Libraries.methods.insert',
+  name: 'libraries.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',
+	name: 'libraries.updateName',
 	validate: new SimpleSchema({
 		_id: {
 			type: String,
@@ -54,6 +66,11 @@ const updateLibraryName = new ValidatedMethod({
 			type: String,
 		},
 	}).validator(),
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 5,
+    timeInterval: 5000,
+  },
 	run({_id, name}){
 		let library = Libraries.findOne(_id);
 		assertEditPermission(library, this.userId);
@@ -62,7 +79,7 @@ const updateLibraryName = new ValidatedMethod({
 });
 
 const setLibraryDefault = new ValidatedMethod({
-  name: 'Libraries.methods.makeLibraryDefault',
+  name: 'libraries.makeLibraryDefault',
 	validate: new SimpleSchema({
 		_id: {
 			type: String,
@@ -72,6 +89,11 @@ const setLibraryDefault = new ValidatedMethod({
 			type: Boolean,
 		},
 	}).validator(),
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 5,
+    timeInterval: 5000,
+  },
   run({_id, isDefault}) {
 		if (!Meteor.users.isAdmin()){
 			throw new Meteor.Error('Permission denied', 'User must be admin to set libraries as default');
@@ -81,20 +103,29 @@ const setLibraryDefault = new ValidatedMethod({
 });
 
 const removeLibrary = new ValidatedMethod({
-	name: 'Libraries.methods.remove',
+	name: 'libraries.remove',
 	validate: new SimpleSchema({
 		_id: {
 			type: String,
 			regEx: SimpleSchema.RegEx.id
 		},
 	}).validator(),
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 5,
+    timeInterval: 5000,
+  },
 	run({_id}){
 		let library = Libraries.findOne(_id);
 		assertOwnership(library, this.userId);
-		Libraries.remove(_id);
-		this.unblock();
-		LibraryNodes.remove({'ancestors.id': _id});
+    this.unblock();
+    removeLibaryWork(_id)
 	}
-})
+});
+
+export function removeLibaryWork(libraryId){
+  Libraries.remove(libraryId);
+  LibraryNodes.remove({'ancestors.id': libraryId});
+}
 
 export { LibrarySchema, insertLibrary, setLibraryDefault, updateLibraryName, removeLibrary };

app/imports/api/library/LibraryNodes.js

@@ -1,13 +1,16 @@
 import { Meteor } from 'meteor/meteor';
 import { Mongo } from 'meteor/mongo';
 import { ValidatedMethod } from 'meteor/mdg:validated-method';
+import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
 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');
 
@@ -23,11 +26,24 @@ let LibraryNodeSchema = new SimpleSchema({
 	'tags.$': {
 		type: String,
 	},
+  icon: {
+    type: storedIconsSchema,
+    optional: true,
+  }
 });
 
+// Set up server side search index
+if (Meteor.isServer) {
+  LibraryNodes._ensureIndex({
+    'name': 'text',
+		'tags': 'text',
+  });
+}
+
 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);
@@ -49,16 +65,43 @@ function assertNodeEditPermission(node, userId){
 }
 
 const insertNode = new ValidatedMethod({
-  name: 'LibraryNodes.methods.insert',
+  name: 'libraryNodes.insert',
 	validate: null,
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 5,
+    timeInterval: 5000,
+  },
   run(libraryNode) {
+    delete libraryNode._id;
     assertNodeEditPermission(libraryNode, this.userId);
 		return LibraryNodes.insert(libraryNode);
   },
 });
 
+const duplicateNode = new ValidatedMethod({
+  name: 'libraryNodes.duplicate',
+	validate: new SimpleSchema({
+    _id: {
+      type: String,
+      regEx: SimpleSchema.RegEx.Id,
+    }
+  }).validator(),
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 5,
+    timeInterval: 5000,
+  },
+  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',
+  name: 'libraryNodes.update',
   validate({_id, path}){
 		if (!_id) return false;
 		// We cannot change these fields with a simple update
@@ -70,6 +113,11 @@ const updateLibraryNode = new ValidatedMethod({
 				return false;
 		}
   },
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 5,
+    timeInterval: 5000,
+  },
   run({_id, path, value}) {
     let node = LibraryNodes.findOne(_id);
     assertNodeEditPermission(node, this.userId);
@@ -88,8 +136,13 @@ const updateLibraryNode = new ValidatedMethod({
 });
 
 const pushToLibraryNode = new ValidatedMethod({
-	name: 'LibraryNodes.methods.push',
+	name: 'libraryNodes.push',
 	validate: null,
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 5,
+    timeInterval: 5000,
+  },
 	run({_id, path, value}){
 		let node = LibraryNodes.findOne(_id);
     assertNodeEditPermission(node, this.userId);
@@ -102,8 +155,13 @@ const pushToLibraryNode = new ValidatedMethod({
 });
 
 const pullFromLibraryNode = new ValidatedMethod({
-	name: 'LibraryNodes.methods.pull',
+	name: 'libraryNodes.pull',
 	validate: null,
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 5,
+    timeInterval: 5000,
+  },
 	run({_id, path, itemId}){
 		let node = LibraryNodes.findOne(_id);
     assertNodeEditPermission(node, this.userId);
@@ -117,10 +175,15 @@ const pullFromLibraryNode = new ValidatedMethod({
 });
 
 const softRemoveLibraryNode = new ValidatedMethod({
-	name: 'LibraryNodes.methods.softRemove',
+	name: 'libraryNodes.softRemove',
 	validate: new SimpleSchema({
 		_id: SimpleSchema.RegEx.Id
 	}).validator(),
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 5,
+    timeInterval: 5000,
+  },
 	run({_id}){
 		let node = LibraryNodes.findOne(_id);
     assertNodeEditPermission(node, this.userId);
@@ -132,6 +195,7 @@ export default LibraryNodes;
 export {
 	LibraryNodeSchema,
 	insertNode,
+  duplicateNode,
 	updateLibraryNode,
 	pullFromLibraryNode,
 	pushToLibraryNode,

app/imports/api/parenting/ChildSchema.js

@@ -14,7 +14,6 @@ const RefSchema = new SimpleSchema({
 let ChildSchema = new SimpleSchema({
   order: {
     type: Number,
-    min: 0,
   },
 	parent: {
     type: RefSchema,
@@ -23,6 +22,7 @@ let ChildSchema = new SimpleSchema({
   ancestors: {
     type: Array,
     defaultValue: [],
+    max: 100,
   },
   'ancestors.$': {
     type: RefSchema,

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

@@ -1,53 +1,24 @@
 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 order amongst their siblings and keep a copy of the
-// order of their ancestors. Order is first compared between oldest non-shared
-// ancestors, then by ancestors before children, then between order of siblings.
+// 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
 
-  // Documents are equal order to themselves
-  if (docA._id && docB._id && docA._id === docB._id){
-    return 0;
-  }
-
-  // If they are siblings, just compare order
-  if (docA.parent.id === docB.parent.id){
-    return docA.order - docB.order;
-  }
-
   // 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;
   }
-
-  // Go through their ancestors after the root, and find the first order
-  // difference
-  // TODO ancestors don't store order yet
-  let i, difference;
-  const length = Math.min(docA.ancestors.length, docB.ancestors.length);
-  for (i = 1; i < length; i++){
-    difference = docA.ancestors[i].order - docB.ancestors[i].order;
-    if (difference){
-      return difference;
-    } else if (docA.ancestors[i].id !== docB.ancestors[i].id) {
-      throw new Meteor.Error('Sibling order clash',
-        'Sibling docs share the same order, sort failed');
-    }
-  }
-
-  // We haven't returned yet, all ancestors up to this point are shared and one
-  // doc has no more ancestors implying one is an ancestor of the other,
-  // return the difference in their ancestor list lengths, shorter comes first
-  return docA.ancestors.length - docB.ancestors.length
 }
 
-export function getHighestOrder({collection, parentId}){
+export function getHighestOrder({collection, ancestorId}){
   const highestOrderedDoc = collection.findOne({
-    'parent.id': parentId,
+    'ancestors.id': ancestorId,
   }, {
     fields: {order: 1},
     sort: {order: -1},
@@ -58,13 +29,13 @@ export function getHighestOrder({collection, parentId}){
 export function setDocToLastOrder({collection, doc}){
   doc.order = getHighestOrder({
     collection,
-    parentId: doc.parent.id,
+    ancestorId: doc.ancestors[0].id,
   }) + 1;
 }
 
-// update the order of a doc, and shift the siblings around to suit the new
+// update the order of a doc, and shift the related docs around to suit the new
 // order
-export function updateDocOrder({docRef, order}){
+function cheapUpdateDocOrder({docRef, order}){
   let doc = fetchDocByRef(docRef, {fields: {
     order: 1,
     parent: 1,
@@ -92,7 +63,7 @@ export function updateDocOrder({docRef, order}){
       increment = 1;
     }
     collection.update({
-      'parent.id': doc.parent.id,
+      'ancestors.id': doc.ancestors[0].id,
       order: inBetweenSelector,
     }, {
       $inc: {order: increment},
@@ -105,10 +76,10 @@ export function updateDocOrder({docRef, order}){
   }
 }
 
-export function removedDocAtOrder({collection, doc}){
+export function cheapRemovedDocAtOrder({collection, doc}){
   // Decrement the order of all docs after the removed doc
   collection.update({
-    'parent.id': doc.parent.id,
+    'ancestors.id': doc.ancestors[0].id,
     order: {$gt: doc.order},
   }, {
     $inc: {order: -1},
@@ -118,10 +89,10 @@ export function removedDocAtOrder({collection, doc}){
   });
 }
 
-export function insertedDocAtOrder({collection, parentId, order}){
+export function cheapInsertedDocAtOrder({collection, ancestorId, order}){
   // Increment the order of all docs after the inserted doc
   collection.update({
-    'parent.id': parentId,
+    'ancestors.id': ancestorId,
     order: {$gte: order},
   }, {
     $inc: {order: 1},
@@ -131,54 +102,28 @@ export function insertedDocAtOrder({collection, parentId, order}){
   });
 }
 
-// Update the order a single doc and re-order the entire sibling list
+// 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);
-  let movedDoc = fetchDocByRef(docRef, {fields: {
-    parent: 1, name: 1
-  }});
-  let parentId = movedDoc.parent.id;
-  let bulkWrite = [];
-  let docs = collection.find({
-    'parent.id': parentId,
-    '_id': {$ne: movedDoc._id},
+  // 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}
   }, {
-    fields: {order: 1, name: 1},
-    sort: {order: 1}
-  }).fetch();
-  docs.splice(order, 0, movedDoc);
-  docs.forEach((doc, index) => {
-    if (doc.order !== index){
-      bulkWrite.push({
-        updateOne: {
-          filter: {_id: doc._id},
-          update: {$set: {order: index}},
-        },
-      });
-    }
+    selector: {type: 'any'}
   });
-  if (Meteor.isServer){
-    collection.rawCollection().bulkWrite(bulkWrite);
-  } else {
-    bulkWrite.forEach(op => {
-      collection.update(
-        op.updateOne.filter,
-        op.updateOne.update,
-        {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, parentId}){
+export function reorderDocs({collection, ancestorId}){
+  let orderedDocs = getDescendantsInDepthFirstOrder({collection, ancestorId});
   let bulkWrite = [];
-  collection.find({
-    'parent.id': parentId,
-  }, {
-    fields: {order: 1},
-    sort: {order: 1}
-  }).forEach((doc, index) => {
+  orderedDocs.forEach((doc, index) => {
     if (doc.order !== index){
       bulkWrite.push({
         updateOne : {
@@ -188,11 +133,24 @@ export function reorderDocs({collection, parentId}){
       });
     }
   });
-  if (Meteor.isServer){
-    collection.rawCollection().bulkWrite(bulkWrite);
+  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);
+      collection.update(
+        op.updateOne.filter,
+        op.updateOne.update,
+        {selector: {type: 'any'}}
+      );
     });
   }
 }

app/imports/api/parenting/organizeMethods.js

@@ -1,22 +1,36 @@
 import SimpleSchema from 'simpl-schema';
+import { union } from 'lodash';
+import { ValidatedMethod } from 'meteor/mdg:validated-method';
+import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
 import { updateParent } from '/imports/api/parenting/parenting.js';
-import { insertedDocAtOrder, removedDocAtOrder, safeUpdateDocOrder } from '/imports/api/parenting/order.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/methods/recomputeCreature.js';
+import recomputeInactiveProperties from '/imports/api/creature/denormalise/recomputeInactiveProperties.js';
+import recomputeInventory from '/imports/api/creature/denormalise/recomputeInventory.js';
 const organizeDoc = new ValidatedMethod({
-  name: 'organize.methods.organizeDoc',
+  name: 'organize.organizeDoc',
   validate: new SimpleSchema({
     docRef: RefSchema,
     parentRef: RefSchema,
     order: {
       type: Number,
-      min: 0,
+      // Should end in 0.5 to place it reliably between two existing documents
+    },
+    skipRecompute: {
+      type: Boolean,
+      optional: true,
     },
   }).validator(),
-  run({docRef, parentRef, order}) {
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 5,
+    timeInterval: 5000,
+  },
+  run({docRef, parentRef, order, skipRecompute}) {
     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
@@ -25,31 +39,86 @@ const organizeDoc = new ValidatedMethod({
     let parent = fetchDocByRef(parentRef);
     assertDocEditPermission(parent, this.userId);
 
-    // Reorder the documents in the doc's old parent
-    removedDocAtOrder({collection, doc});
-    // Reorder the docs in the destination parent
-    insertedDocAtOrder({collection, parentId: parentRef.id, order});
     // Change the doc's parent
     updateParent({docRef, parentRef});
-    // Change the doc's order
+    // 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);
+    if (!skipRecompute){
+      let creaturesToRecompute = union(docCreatures, parentCreatures);
+      // Recompute the creatures
+      creaturesToRecompute.forEach(id => {
+        // The active status of some properties might change due to a change in
+        // ancestry
+        recomputeInactiveProperties(id);
+        if (doc.type === 'container' || doc.type === 'item'){
+          recomputeInventory(id);
+        }
+        // Some Dependencies depend on ancestry, so a full recompute is needed
+        recomputeCreatureById(id);
+      });
+    }
   },
 });
 
 const reorderDoc = new ValidatedMethod({
-  name: 'organize.methods.reorderDoc',
+  name: 'organize.reorderDoc',
   validate: new SimpleSchema({
     docRef: RefSchema,
     order: {
       type: Number,
-      min: 0,
+      // Should end in 0.5 to place it reliably between two existing documents
     },
   }).validator(),
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 5,
+    timeInterval: 5000,
+  },
   run({docRef, order}) {
     let doc = fetchDocByRef(docRef);
     assertDocEditPermission(doc, this.userId);
-    safeUpdateDocOrder({docRef, order})
+    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

@@ -48,38 +48,38 @@ export function fetchParent({id, collection}){
 }
 
 export function fetchChildren({ collection, parentId, filter = {}, options = {sort: {order: 1}} }){
-  filter["parent.id"] = parentId;
+  filter['parent.id'] = parentId;
   let children = [];
   children.push(
     ...collection.find({
-      "parent.id": parentId
+      'parent.id': parentId
     }, options).fetch()
   );
   return children;
 }
 
 export function updateChildren({collection, parentId, filter = {}, modifier, options={}}){
-  filter["parent.id"] = parentId;
+  filter['parent.id'] = parentId;
   options.multi = true;
   collection.update(filter, modifier, options);
 }
 
 export function fetchDescendants({ collection, ancestorId, filter = {}, options}){
-  filter["ancestors.id"] = ancestorId;
+  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;
+  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;
+  filter['ancestors.id'] = ancestorId;
   collection.find(filter, options).forEach(callback);
 }
 
@@ -120,17 +120,23 @@ export function setLineageOfDocs({docArray, oldParent, newAncestry}){
 export function renewDocIds({docArray, collectionMap}){
   // map of {oldId: newId}
   let idMap = {};
-  // Give new ids and map the changes
+
+  // Get a random generator that's consistent on client and server
+  let randomSrc = DDP.randomStream('renewDocIds');
+
+  // Give new ids and map the changes as {oldId: newId}
   docArray.forEach(doc => {
     let oldId = doc._id;
-    let newId = Random.id();
+    let newId = randomSrc.id();
     doc._id = newId;
     idMap[oldId] = newId;
   });
+
+  // Remap all references using the new IDs
   const remapReference = ref => {
     if (idMap[ref.id]){
       ref.id = idMap[ref.id];
-      ref.collection = collectionMap[ref.collection] || ref.collection;
+      ref.collection = collectionMap && collectionMap[ref.collection] || ref.collection;
     }
   }
   docArray.forEach(doc => {
@@ -154,6 +160,14 @@ export function updateParent({docRef, parentRef}){
   // Get the parent and its ancestry
   let {parentDoc, parent, ancestors} = getAncestry({parentRef});
 
+  // Check that the doc isn't its own ancestor
+  ancestors.forEach(ancestor => {
+    if (docRef.id === ancestor.id){
+      throw new Meteor.Error('invalid parenting',
+        'A doc can\'t be its own ancestor')
+    }
+  });
+
   // If the doc and its parent are in the same collection, apply the allowed
   // parent rules based on type
   if (docRef.collection === parentRef.collection){
@@ -200,21 +214,15 @@ export function getName(doc){
   if (doc.name) return name;
   var i = doc.ancestors.length;
   while(i--) {
-    if (ancestors[i].name) return ancestors[i].name;
+    if (doc.ancestors[i].name) return doc.ancestors[i].name;
   }
 }
 
-export function nodesToTree({collection, ancestorId, filter}){
-  // Store a dict of all the nodes
+export function nodeArrayToTree(nodes){
+  // Store a dict and list of all the nodes
   let nodeIndex = {};
   let nodeList = [];
-  collection.find({
-    'ancestors.id': ancestorId,
-		removed: {$ne: true},
-    ...filter,
-  }, {
-    sort: {order: 1}
-  }).forEach( node => {
+  nodes.forEach( node => {
     let treeNode = {
       node: node,
       children: [],
@@ -238,3 +246,12 @@ export function nodesToTree({collection, ancestorId, filter}){
   });
   return forest;
 }
+
+export function nodesToTree({collection, ancestorId, filter = {}, options = {}}){
+  if (!('ancestors.id' in filter)) filter['ancestors.id'] = ancestorId;
+  if (!('removed' in filter)) filter['removed'] = {$ne: true};
+  if (!options.sort) options.sort = {order: 1};
+  if (!('order' in options.sort)) options.sort.order = 1;
+  let nodes = collection.find(filter, options);
+  return nodeArrayToTree(nodes);
+}

app/imports/api/parenting/softRemove.js

@@ -41,16 +41,21 @@ const restoreError = function(){
 };
 
 export function restore({_id, collection}){
-  collection = getCollectionByName(collection);
+  if (typeof collection === 'string') {
+    collection = getCollectionByName(collection);
+  }
   let numUpdated = collection.update({
     _id,
     removedWith: {$exists: false}
   }, { $unset: {
     removed: 1,
     removedAt: 1,
-  }});
+  }}, {
+    selector: {type: 'any'},
+  },);
   if (numUpdated === 0) restoreError();
   updateDescendants({
+    collection,
     ancestorId: _id,
     filter: {
       removedWith: _id,

app/imports/api/properties/Actions.js

@@ -1,7 +1,7 @@
 import SimpleSchema from 'simpl-schema';
-import ResourcesSchema from '/imports/api/properties/subSchemas/ResourcesSchema.js'
-import ResultsSchema from '/imports/api/properties/subSchemas/ResultsSchema.js';
-
+import ErrorSchema from '/imports/api/properties/subSchemas/ErrorSchema.js';
+import InlineComputationSchema from '/imports/api/properties/subSchemas/InlineComputationSchema.js';
+import { storedIconsSchema } from '/imports/api/icons/Icons.js'
 /*
  * Actions are things a character can do
  * Any rolls that are children of actions will be rolled when taking the action
@@ -13,6 +13,10 @@ let ActionSchema = new SimpleSchema({
 		type: String,
 		optional: true,
 	},
+	summary: {
+		type: String,
+		optional: true,
+	},
 	description: {
 		type: String,
 		optional: true,
@@ -41,17 +45,60 @@ let ActionSchema = new SimpleSchema({
   'tags.$': {
     type: String,
   },
-	results: {
-		type: ResultsSchema,
-		defaultValue: {},
-	},
+  // Duplicate the ResourceSchema here so we can extend it elegantly.
   resources: {
-    type: ResourcesSchema,
+    type: Object,
     defaultValue: {},
+  },
+  'resources.itemsConsumed': {
+    type: Array,
+    defaultValue: [],
+  },
+  'resources.itemsConsumed.$': {
+    type: Object,
+  },
+  'resources.itemsConsumed.$._id': {
+    type: String,
+    regEx: SimpleSchema.RegEx.Id,
+    autoValue(){
+      if (!this.isSet) return Random.id();
+    }
+  },
+  'resources.itemsConsumed.$.tag': {
+    type: String,
+    optional: true,
+  },
+  'resources.itemsConsumed.$.quantity': {
+    type: Number,
+    defaultValue: 1,
+  },
+  'resources.itemsConsumed.$.itemId': {
+    type: String,
+    optional: true,
+  },
+  'resources.attributesConsumed': {
+    type: Array,
+    defaultValue: [],
+  },
+  'resources.attributesConsumed.$': {
+    type: Object,
+  },
+  'resources.attributesConsumed.$._id': {
+    type: String,
+    regEx: SimpleSchema.RegEx.Id,
+    autoValue(){
+      if (!this.isSet) return Random.id();
+    }
+  },
+  'resources.attributesConsumed.$.variableName': {
+    type: String,
+    optional: true,
+  },
+  'resources.attributesConsumed.$.quantity': {
+    type: Number,
+    defaultValue: 1,
   },
 	// 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,
@@ -69,4 +116,83 @@ let ActionSchema = new SimpleSchema({
 	},
 });
 
-export { ActionSchema };
+const ComputedOnlyActionSchema = new SimpleSchema({
+  summaryCalculations: {
+    type: Array,
+    defaultValue: [],
+    maxCount: 32,
+  },
+  'summaryCalculations.$': InlineComputationSchema,
+
+  descriptionCalculations: {
+    type: Array,
+    defaultValue: [],
+    maxCount: 32,
+  },
+  'descriptionCalculations.$': InlineComputationSchema,
+
+  usesResult: {
+    type: SimpleSchema.Integer,
+    optional: true,
+  },
+  usesErrors: {
+    type: Array,
+    optional: true,
+  },
+  'usesErrors.$':{
+    type: ErrorSchema,
+  },
+  resources: Object,
+  'resources.itemsConsumed': Array,
+  'resources.itemsConsumed.$': Object,
+  'resources.itemsConsumed.$.available': {
+    type: Number,
+    optional: true,
+  },
+  // This appears both in the computed and uncomputed schema because it can be
+  // set by both a computation or a form
+  'resources.itemsConsumed.$.itemId': {
+    type: String,
+    regEx: SimpleSchema.RegEx.Id,
+    optional: true,
+  },
+  'resources.itemsConsumed.$.itemName': {
+    type: String,
+    optional: true,
+  },
+  'resources.itemsConsumed.$.itemIcon': {
+    type: storedIconsSchema,
+    optional: true,
+  },
+  'resources.itemsConsumed.$.itemColor': {
+    type: String,
+    optional: true,
+  },
+  'resources.attributesConsumed': Array,
+  'resources.attributesConsumed.$': Object,
+  'resources.attributesConsumed.$.available': {
+    type: Number,
+    optional: true,
+  },
+  'resources.attributesConsumed.$.statId': {
+    type: String,
+    regEx: SimpleSchema.RegEx.Id,
+    optional: true,
+  },
+  'resources.attributesConsumed.$.statName': {
+    type: String,
+    optional: true,
+  },
+  // True if the uses left is zero, or any item or attribute consumed is
+  // insufficient
+  insufficientResources: {
+    type: Boolean,
+    optional: true,
+  },
+});
+
+const ComputedActionSchema = new SimpleSchema()
+  .extend(ActionSchema)
+  .extend(ComputedOnlyActionSchema);
+
+export { ActionSchema, ComputedOnlyActionSchema, ComputedActionSchema};

app/imports/api/properties/Adjustments.js

@@ -0,0 +1,52 @@
+import SimpleSchema from 'simpl-schema';
+import ErrorSchema from '/imports/api/properties/subSchemas/ErrorSchema.js';
+
+const AdjustmentSchema = new SimpleSchema({
+	// The roll that determines how much to change the attribute
+  // This can be simplified, but should only compute when activated
+  amount: {
+    type: String,
+    optional: true,
+    defaultValue: '1',
+  },
+	// Who this adjustment applies to
+	target: {
+		type: String,
+    defaultValue: 'every',
+		allowedValues: [
+      'self',   // the character who took the Adjustment
+      '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,
+	},
+  operation: {
+    type: String,
+    allowedValues: ['set', 'increment'],
+    defaultValue: 'increment',
+  },
+});
+
+const ComputedOnlyAdjustmentSchema = new SimpleSchema({
+  amountResult: {
+    type: SimpleSchema.Integer,
+    optional: true,
+  },
+  amountErrors: {
+    type: Array,
+    optional: true,
+  },
+  'amountErrors.$':{
+    type: ErrorSchema,
+  },
+});
+
+const ComputedAdjustmentSchema = new SimpleSchema()
+  .extend(AdjustmentSchema)
+  .extend(ComputedOnlyAdjustmentSchema);
+
+export { AdjustmentSchema, ComputedAdjustmentSchema, ComputedOnlyAdjustmentSchema };

app/imports/api/properties/Attacks.js

@@ -1,5 +1,6 @@
 import SimpleSchema from 'simpl-schema';
-import { ActionSchema } from '/imports/api/properties/Actions.js';
+import { ActionSchema, ComputedOnlyActionSchema } from '/imports/api/properties/Actions.js';
+import ErrorSchema from '/imports/api/properties/subSchemas/ErrorSchema.js';
 
 // Attacks are special instances of actions
 let AttackSchema = new SimpleSchema()
@@ -25,4 +26,24 @@ let AttackSchema = new SimpleSchema()
     },
   });
 
-export { AttackSchema };
+const ComputedOnlyAttackSchema = new SimpleSchema()
+  .extend(ComputedOnlyActionSchema)
+  .extend({
+    rollBonusResult: {
+      type: Number,
+      optional: true,
+    },
+    rollBonusErrors: {
+      type: Array,
+      optional: true,
+    },
+    'rollBonusErrors.$':{
+      type: ErrorSchema,
+    },
+  });
+
+const ComputedAttackSchema = new SimpleSchema()
+  .extend(AttackSchema)
+  .extend(ComputedOnlyAttackSchema);
+
+export { AttackSchema, ComputedOnlyAttackSchema, ComputedAttackSchema };

app/imports/api/properties/Attributes.js

@@ -1,5 +1,7 @@
 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';
+import InlineComputationSchema from '/imports/api/properties/subSchemas/InlineComputationSchema.js';
 
 /*
  * Attributes are numbered stats of a character
@@ -13,7 +15,7 @@ let AttributeSchema = new SimpleSchema({
   variableName: {
     type: String,
 		regEx: VARIABLE_NAME_REGEX,
-    min: 3,
+    min: 2,
     defaultValue: 'newAttribute',
   },
 	// How it is displayed and computed is determined by type
@@ -38,6 +40,11 @@ let AttributeSchema = new SimpleSchema({
     type: String,
     allowedValues: ['d4', 'd6', 'd8', 'd10', 'd12', 'd20'],
     optional: true,
+  },
+  // For type spellSlot, the level needs to be stored separately
+  spellSlotLevelCalculation: {
+    type: String,
+		optional: true,
   },
 	// The starting value, before effects
 	baseValueCalculation: {
@@ -69,22 +76,63 @@ let AttributeSchema = new SimpleSchema({
 });
 
 let ComputedOnlyAttributeSchema = new SimpleSchema({
+  descriptionCalculations: {
+    type: Array,
+    defaultValue: [],
+    maxCount: 32,
+  },
+  'descriptionCalculations.$': InlineComputationSchema,
   // The result of baseValueCalculation
   baseValue: {
     type: SimpleSchema.oneOf(Number, String, Boolean),
     optional: true,
+  },
+  baseValueErrors: {
+    type: Array,
+    optional: true,
+  },
+  'baseValueErrors.$': {
+    type: ErrorSchema,
+  },
+  // The result of spellSlotLevelCalculation
+  spellSlotLevelValue: {
+    type: SimpleSchema.oneOf(Number, String, Boolean),
+    optional: true,
+  },
+  spellSlotLevelErrors: {
+    type: Array,
+    optional: true,
+  },
+  'spellSlotLevelErrors.$': {
+    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,
 	},
+  // The computed creature constitution modifier
+  constitutionMod: {
+    type: Number,
+		optional: true,
+  },
+  // Should this attribute hide
+  hide: {
+    type: Boolean,
+    optional: true,
+  },
 });
 
 const ComputedAttributeSchema = new SimpleSchema()

app/imports/api/properties/Buffs.js

@@ -1,6 +1,5 @@
 import SimpleSchema from 'simpl-schema';
-import { Random } from 'meteor/random';
-import { StoredEffectSchema } from '/imports/api/properties/Effects.js';
+import InlineComputationSchema from '/imports/api/properties/subSchemas/InlineComputationSchema.js';
 
 let BuffSchema = new SimpleSchema({
 	name: {
@@ -15,20 +14,12 @@ let BuffSchema = new SimpleSchema({
 		type: String,
 		optional: true,
 	},
-});
-
-// The effects in the stored buff need to be resolved to a number before being
-// placed on other characters, if they are applied to self, they can remain as
-// calculations, provided they don't contain any rolls
-let StoredBuffSchema = new SimpleSchema({
-	effects: {
-		type: Array,
-		defaultValue: [],
-	},
-	'effects.$': {
-		type: StoredEffectSchema,
-	},
-	target: {
+  applied: {
+    type: Boolean,
+    defaultValue: false,
+    index: 1,
+  },
+  target: {
 		type: String,
 		allowedValues: [
       'self',  // the character who took the buff
@@ -37,21 +28,15 @@ let StoredBuffSchema = new SimpleSchema({
     ],
 		defaultValue: 'every',
 	},
-}).extend(BuffSchema);
+});
 
-let StoredBuffWithIdSchema = new SimpleSchema({
-	_id: {
-    type: String,
-    regEx: SimpleSchema.RegEx.Id,
-    autoValue(){
-      if (!this.isSet){
-        return Random.id();
-      }
-    },
+let ComputedOnlyBuffSchema = new SimpleSchema({
+  descriptionCalculations: {
+    type: Array,
+    defaultValue: [],
+    maxCount: 32,
   },
-}).extend(StoredBuffSchema);
-
-let AppliedBuffSchema = new SimpleSchema({
+  'descriptionCalculations.$': InlineComputationSchema,
 	durationSpent: {
 		type: Number,
 		optional: true,
@@ -71,6 +56,10 @@ let AppliedBuffSchema = new SimpleSchema({
 	'appliedBy.collection': {
 		type: String,
 	},
-}).extend(BuffSchema);
+})
 
-export { AppliedBuffSchema, StoredBuffSchema, StoredBuffWithIdSchema };
+const ComputedBuffSchema = new SimpleSchema()
+  .extend(BuffSchema)
+  .extend(ComputedOnlyBuffSchema);
+
+export { BuffSchema, ComputedOnlyBuffSchema, ComputedBuffSchema };