Bumped version

Made rest buttons optional

app/.meteor/packages

@@ -11,14 +11,14 @@ accounts-google@1.4.0
 email@2.2.1
 meteor-base@1.5.1
 mobile-experience@1.1.0
-mongo@1.15.0
+mongo@1.16.0
 session@1.2.0
 tracker@1.2.0
 logging@1.3.1
 reload@1.3.1
 ejson@1.1.2
 check@1.3.1
-standard-minifier-js@2.8.0
+standard-minifier-js@2.8.1
 shell-server@0.5.0
 ecmascript@0.16.2
 es5-shim@4.8.0
@@ -48,3 +48,4 @@ simple:rest-bearer-token-parser
 simple:rest-json-error-handler
 littledata:synced-cron
 mdg:meteor-apm-agent
+typescript@4.5.4

app/.meteor/release

@@ -1 +1 @@
-METEOR@2.7.3
+METEOR@2.8.0

app/.meteor/versions

@@ -1,4 +1,4 @@
-accounts-base@2.2.3
+accounts-base@2.2.4
 accounts-google@1.4.0
 accounts-oauth@1.4.1
 accounts-password@2.3.1
@@ -12,7 +12,7 @@ aldeed:collection2@3.5.0
 aldeed:schema-index@3.0.0
 allow-deny@1.1.1
 autoupdate@1.8.0
-babel-compiler@7.9.0
+babel-compiler@7.9.2
 babel-runtime@1.5.1
 base64@1.0.12
 binary-heap@1.0.11
@@ -27,10 +27,10 @@ coffeescript@2.4.1
 coffeescript-compiler@2.4.1
 dburles:mongo-collection-instances@0.3.6
 ddp@1.4.0
-ddp-client@2.5.0
+ddp-client@2.6.0
 ddp-common@1.4.0
 ddp-rate-limiter@1.1.0
-ddp-server@2.5.0
+ddp-server@2.6.0
 diff-sequence@1.1.1
 dynamic-import@0.7.2
 ecmascript@0.16.2
@@ -55,33 +55,33 @@ littledata:synced-cron@1.5.1
 livedata@1.0.18
 localstorage@1.2.0
 logging@1.3.1
-mdg:meteor-apm-agent@3.5.0
+mdg:meteor-apm-agent@3.5.1
 mdg:validated-method@1.2.0
-meteor@1.10.0
+meteor@1.10.1
 meteor-base@1.5.1
 meteortesting:browser-tests@1.3.5
 meteortesting:mocha@2.0.3
 meteortesting:mocha-core@8.1.2
 mikowals:batch-insert@1.3.0
-minifier-css@1.6.0
+minifier-css@1.6.1
-minifier-js@2.7.4
+minifier-js@2.7.5
-minimongo@1.8.0
+minimongo@1.9.0
 mobile-experience@1.1.0
 mobile-status-bar@1.1.0
 modern-browsers@0.1.8
-modules@0.18.0
+modules@0.19.0
 modules-runtime@0.13.0
-mongo@1.15.0
+mongo@1.16.0
 mongo-decimal@0.1.3
 mongo-dev-server@1.1.0
 mongo-id@1.0.8
 mongo-livedata@1.0.12
-npm-mongo@4.3.1
+npm-mongo@4.9.0
 oauth@2.1.2
 oauth2@1.3.1
 ordered-dict@1.1.0
 ostrio:cookies@2.7.2
-ostrio:files@2.0.1
+ostrio:files@2.3.0
 patreon-oauth@0.1.0
 peerlibrary:assert@0.3.0
 peerlibrary:check-extension@0.7.0
@@ -116,7 +116,7 @@ simple:rest-json-error-handler@1.1.1
 simple:rest-method-mixin@1.1.0
 socket-stream-client@0.5.0
 spacebars-compiler@1.3.1
-standard-minifier-js@2.8.0
+standard-minifier-js@2.8.1
 static-html@1.3.2
 templating-tools@1.2.2
 tmeasday:check-npm-versions@1.0.2

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

@@ -93,7 +93,7 @@ const DenormalisedOnlyCreaturePropertySchema = new SimpleSchema({
 
 CreaturePropertySchema.extend(DenormalisedOnlyCreaturePropertySchema);
 
-for (let key in propertySchemasIndex){
+for (let key in propertySchemasIndex) {
   let schema = new SimpleSchema({});
   schema.extend(propertySchemasIndex[key]);
   schema.extend(CreaturePropertySchema);
@@ -101,7 +101,7 @@ for (let key in propertySchemasIndex){
   schema.extend(ChildSchema);
   schema.extend(SoftRemovableSchema);
   CreatureProperties.attachSchema(schema, {
-		selector: {type: key}
+    selector: { type: key }
   });
 }
 

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

@@ -20,33 +20,33 @@ const adjustQuantity = new ValidatedMethod({
     numRequests: 5,
     timeInterval: 5000,
   },
-  run({_id, operation, value}) {
+  run({ _id, operation, value }) {
     // Permissions
     let property = CreatureProperties.findOne(_id);
     let rootCreature = getRootCreatureAncestor(property);
     assertEditPermission(rootCreature, this.userId);
 
     // Do work
-    adjustQuantityWork({property, operation, value});
+    adjustQuantityWork({ property, operation, value });
   },
 });
 
-export function adjustQuantityWork({property, operation, value}){
+export function adjustQuantityWork({ property, operation, value }) {
   // Check if property has quantity
   let schema = CreatureProperties.simpleSchema(property);
-  if (!schema.allowsKey('quantity')){
+  if (!schema.allowsKey('quantity')) {
     throw new Meteor.Error(
       'Adjust quantity failed',
       `Property of type "${property.type}" doesn't have a quantity`
     );
   }
-  if (operation === 'set'){
+  if (operation === 'set') {
     CreatureProperties.update(property._id, {
-      $set: {quantity: value, dirty: true}
+      $set: { quantity: value, dirty: true }
     }, {
       selector: property
     });
-  } else if (operation === 'increment'){
+  } else if (operation === 'increment') {
     // value here is 'damage'
     value = -value;
     let currentQuantity = property.quantity;

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

@@ -36,7 +36,7 @@ const damageProperty = new ValidatedMethod({
 
     // Check if property can take damage
     let schema = CreatureProperties.simpleSchema(prop);
-		if (!schema.allowsKey('damage')){
+    if (!schema.allowsKey('damage')) {
       throw new Meteor.Error(
         'Damage property failed',
         `Property of type "${prop.type}" can't be damaged`
@@ -86,7 +86,7 @@ export function damagePropertyWork({ prop, operation, value, actionContext }) {
   }
 
   let damage, newValue, increment;
-  if (operation === 'set'){
+  if (operation === 'set') {
     const total = prop.total || 0;
     // Set represents what we want the value to be after damage
     // So we need the actual damage to get to that value
@@ -105,7 +105,7 @@ export function damagePropertyWork({ prop, operation, value, actionContext }) {
     // Also write it straight to the prop so that it is updated in the actionContext
     prop.damage = damage;
     prop.value = newValue;
-  } else if (operation === 'increment'){
+  } else if (operation === 'increment') {
     let currentValue = prop.value || 0;
     let currentDamage = prop.damage || 0;
     increment = value;

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

@@ -10,7 +10,7 @@ import {
 } from '/imports/api/parenting/parenting.js';
 import { reorderDocs } from '/imports/api/parenting/order.js';
 var snackbar;
-if (Meteor.isClient){
+if (Meteor.isClient) {
   snackbar = require(
     '/imports/ui/components/snackbars/SnackbarQueue.js'
   ).snackbar
@@ -31,7 +31,7 @@ const duplicateProperty = new ValidatedMethod({
     numRequests: 5,
     timeInterval: 5000,
   },
-  run({_id}) {
+  run({ _id }) {
     let property = CreatureProperties.findOne(_id);
     let creature = getRootCreatureAncestor(property);
 
@@ -45,16 +45,16 @@ const duplicateProperty = new ValidatedMethod({
     // Get all the descendants
     let nodes = CreatureProperties.find({
       'ancestors.id': _id,
-			removed: {$ne: true},
+      removed: { $ne: true },
     }, {
       limit: DUPLICATE_CHILDREN_LIMIT + 1,
-      sort: {order: 1},
+      sort: { order: 1 },
     }).fetch();
 
     // Alert the user if the limit was hit
-    if (nodes.length > DUPLICATE_CHILDREN_LIMIT){
+    if (nodes.length > DUPLICATE_CHILDREN_LIMIT) {
       nodes.pop();
-      if (Meteor.isClient){
+      if (Meteor.isClient) {
         snackbar({
           text: `Only the first ${DUPLICATE_CHILDREN_LIMIT} children were duplicated`,
         });
@@ -64,15 +64,15 @@ const duplicateProperty = new ValidatedMethod({
     // re-map all the ancestors
     setLineageOfDocs({
       docArray: nodes,
-			newAncestry : [
+      newAncestry: [
         ...property.ancestors,
-        {id: propertyId, collection: 'creatureProperties'}
+        { id: propertyId, collection: 'creatureProperties' }
       ],
-			oldParent : {id: _id, collection: 'creatureProperties'},
+      oldParent: { id: _id, collection: 'creatureProperties' },
     });
 
     // Give the docs new IDs without breaking internal references
-    renewDocIds({docArray: nodes});
+    renewDocIds({ docArray: nodes });
 
     // Order the root node
     property.order += 0.5;

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

@@ -10,7 +10,7 @@ import getParentRefByTag from '/imports/api/creature/creatureProperties/methods/
 // Equipping or unequipping an item will also change its parent
 const equipItem = new ValidatedMethod({
   name: 'creatureProperties.equip',
-  validate({_id, equipped}){
+  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');
@@ -21,7 +21,7 @@ const equipItem = new ValidatedMethod({
     numRequests: 5,
     timeInterval: 5000,
   },
-  run({_id, equipped}) {
+  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');
@@ -30,11 +30,11 @@ const equipItem = new ValidatedMethod({
     CreatureProperties.update(_id, {
       $set: { equipped, dirty: true },
     }, {
-			selector: {type: 'item'},
+      selector: { type: 'item' },
     });
     let tag = equipped ? BUILT_IN_TAGS.equipment : BUILT_IN_TAGS.carried;
     let parentRef = getParentRefByTag(creature._id, tag);
-    if (!parentRef) parentRef = {id: creature._id, collection: 'creatures'};
+    if (!parentRef) parentRef = { id: creature._id, collection: 'creatures' };
 
     organizeDoc.call({
       docRef: {

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

@@ -6,7 +6,7 @@ import getRootCreatureAncestor from '/imports/api/creature/creatureProperties/ge
 
 const flipToggle = new ValidatedMethod({
   name: 'creatureProperties.flipToggle',
-  validate({_id}){
+  validate({ _id }) {
     if (!_id) throw new Meteor.Error('No _id', '_id is required');
   },
   mixins: [RateLimiterMixin],
@@ -14,16 +14,16 @@ const flipToggle = new ValidatedMethod({
     numRequests: 5,
     timeInterval: 5000,
   },
-  run({_id}) {
+  run({ _id }) {
     // Permission
     let property = CreatureProperties.findOne(_id, {
-      fields: {type: 1, ancestors: 1, enabled: 1, disabled: 1}
+      fields: { type: 1, ancestors: 1, enabled: 1, disabled: 1 }
     });
-    if (property.type !== 'toggle'){
+    if (property.type !== 'toggle') {
       throw new Meteor.Error('wrong property',
         'This method can only be applied to toggles');
     }
-    if (!property.enabled && !property.disabled){
+    if (!property.enabled && !property.disabled) {
       throw new Meteor.Error('Computed toggle',
         'Can\'t flip a toggle that is computed')
     }
@@ -32,12 +32,14 @@ const flipToggle = new ValidatedMethod({
 
     // Invert the current value, disabled is the canonical store of value
     const currentValue = !property.disabled;
-		CreatureProperties.update(_id, {$set: {
+    CreatureProperties.update(_id, {
+      $set: {
         enabled: !currentValue,
         disabled: currentValue,
         dirty: true,
-    }}, {
+      }
-			selector: {type: 'toggle'},
+    }, {
+      selector: { type: 'toggle' },
     });
   },
 });

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

@@ -24,15 +24,15 @@ const insertProperty = new ValidatedMethod({
     numRequests: 5,
     timeInterval: 5000,
   },
-  run({creatureProperty, parentRef}) {
+  run({ creatureProperty, parentRef }) {
     // get the new ancestry for the properties
-		let {parentDoc, ancestors} = getAncestry({parentRef});
+    let { parentDoc, ancestors } = getAncestry({ parentRef });
 
     // Check permission to edit
     let rootCreature;
-		if (parentRef.collection === 'creatures'){
+    if (parentRef.collection === 'creatures') {
       rootCreature = parentDoc;
-		} else if (parentRef.collection === 'creatureProperties'){
+    } else if (parentRef.collection === 'creatureProperties') {
       rootCreature = getRootCreatureAncestor(parentDoc);
     } else {
       throw `${parentRef.collection} is not a valid parent collection`
@@ -75,23 +75,23 @@ const insertPropertyAsChildOfTag = new ValidatedMethod({
     numRequests: 5,
     timeInterval: 5000,
   },
-  run({creatureProperty, creatureId, tag, tagDefaultName}) {
+  run({ creatureProperty, creatureId, tag, tagDefaultName }) {
     let parentRef = getParentRefByTag(creatureId, tag);
 
-    if (!parentRef){
+    if (!parentRef) {
       // Use the creature as the parent and mark that we need to insert the folder first later
       var insertFolderFirst = true;
-      parentRef = {id: creatureId, collection: 'creatures'};
+      parentRef = { id: creatureId, collection: 'creatures' };
     }
 
     // get the new ancestry for the properties
-		let {parentDoc, ancestors} = getAncestry({parentRef});
+    let { parentDoc, ancestors } = getAncestry({ parentRef });
 
     // Check permission to edit
     let rootCreature;
-		if (parentRef.collection === 'creatures'){
+    if (parentRef.collection === 'creatures') {
       rootCreature = parentDoc;
-		} else if (parentRef.collection === 'creatureProperties'){
+    } else if (parentRef.collection === 'creatureProperties') {
       rootCreature = getRootCreatureAncestor(parentDoc);
     } else {
       throw `${parentRef.collection} is not a valid parent collection`
@@ -99,7 +99,7 @@ const insertPropertyAsChildOfTag = new ValidatedMethod({
     assertEditPermission(rootCreature, this.userId);
 
     // Add the folder first if we need to
-    if (insertFolderFirst){
+    if (insertFolderFirst) {
       let order = getHighestOrder({
         collection: CreatureProperties,
         ancestorId: parentRef.id,
@@ -113,7 +113,7 @@ const insertPropertyAsChildOfTag = new ValidatedMethod({
         order,
       });
       // Make the folder our new parent
-      let newParentRef = {id, collection: 'creatureProperties'};
+      let newParentRef = { id, collection: 'creatureProperties' };
       ancestors = [parentRef, newParentRef];
       parentRef = newParentRef;
       creatureProperty.order = order + 1;
@@ -129,7 +129,7 @@ const insertPropertyAsChildOfTag = new ValidatedMethod({
   },
 });
 
-export function insertPropertyWork({property, creature}){
+export function insertPropertyWork({ property, creature }) {
   delete property._id;
   property.dirty = true;
   let _id = CreatureProperties.insert(property);

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

@@ -39,15 +39,15 @@ const insertPropertyFromLibraryNode = new ValidatedMethod({
     numRequests: 5,
     timeInterval: 5000,
   },
-	run({nodeIds, parentRef, order}) {
+  run({ nodeIds, parentRef, order }) {
     // get the new ancestry for the properties
-		let {parentDoc, ancestors} = getAncestry({parentRef});
+    let { parentDoc, ancestors } = getAncestry({ parentRef });
 
     // Check permission to edit
     let rootCreature;
-		if (parentRef.collection === 'creatures'){
+    if (parentRef.collection === 'creatures') {
       rootCreature = parentDoc;
-		} else if (parentRef.collection === 'creatureProperties'){
+    } else if (parentRef.collection === 'creatureProperties') {
       rootCreature = getRootCreatureAncestor(parentDoc);
     } else {
       throw `${parentRef.collection} is not a valid parent collection`
@@ -75,13 +75,13 @@ const insertPropertyFromLibraryNode = new ValidatedMethod({
   },
 });
 
-function insertPropertyFromNode(nodeId, ancestors, order){
+function insertPropertyFromNode(nodeId, ancestors, order) {
   // Fetch the library node and its decendents, provided they have not been
   // removed
   // TODO: Check permission to read the library this node is in
   let node = LibraryNodes.findOne({
     _id: nodeId,
-    removed: {$ne: true},
+    removed: { $ne: true },
   });
   if (!node) {
     if (Meteor.isClient) return;
@@ -95,7 +95,7 @@ function insertPropertyFromNode(nodeId, ancestors, order){
   let oldParent = node.parent;
   let nodes = LibraryNodes.find({
     'ancestors.id': nodeId,
-    removed: {$ne: true},
+    removed: { $ne: true },
   }).fetch();
 
   // Convert all references into actual nodes
@@ -118,11 +118,11 @@ function insertPropertyFromNode(nodeId, ancestors, order){
   // Give the docs new IDs without breaking internal references
   renewDocIds({
     docArray: nodes,
-    collectionMap: {'libraryNodes': 'creatureProperties'}
+    collectionMap: { 'libraryNodes': 'creatureProperties' }
   });
 
   // Order the root node
-  if (order === undefined){
+  if (order === undefined) {
     setDocToLastOrder({
       collection: CreatureProperties,
       doc: node,
@@ -139,7 +139,7 @@ function insertPropertyFromNode(nodeId, ancestors, order){
   return node;
 }
 
-function storeLibraryNodeReferences(nodes){
+function storeLibraryNodeReferences(nodes) {
   nodes.forEach(node => {
     if (node.libraryNodeId) return;
     node.libraryNodeId = node._id;
@@ -154,7 +154,7 @@ function dirtyNodes(nodes) {
 
 // Covert node references into actual nodes
 // TODO: check permissions for each library a reference node references
-function reifyNodeReferences(nodes, visitedRefs = new Set(), depth = 0){
+function reifyNodeReferences(nodes, visitedRefs = new Set(), depth = 0) {
   depth += 1;
   // New nodes added this function
   let newNodes = [];
@@ -165,9 +165,9 @@ function reifyNodeReferences(nodes, visitedRefs = new Set(), depth = 0){
     if (node.type !== 'reference') return true;
 
     // We have gone too deep, keep the reference node as an error
-    if (depth >= 10){
+    if (depth >= 10) {
       if (Meteor.isClient) console.warn('Reference depth limit exceeded');
-      node.cache = {error: 'Reference depth limit exceeded'};
+      node.cache = { error: 'Reference depth limit exceeded' };
       return true;
     }
 
@@ -177,17 +177,17 @@ function reifyNodeReferences(nodes, visitedRefs = new Set(), depth = 0){
       referencedNode.order = node.order;
       // We are definitely replacing this node, so add it to the list
       visitedRefs.add(node._id);
-    } catch (e){
+    } catch (e) {
-      node.cache = {error: e.reason || e.message || e.toString()};
+      node.cache = { error: e.reason || e.message || e.toString() };
       return true;
     }
 
     // Get all the descendants of the referenced node
     let descendents = LibraryNodes.find({
       'ancestors.id': referencedNode._id,
-      removed: {$ne: true},
+      removed: { $ne: true },
     }, {
-      sort: {order: 1},
+      sort: { order: 1 },
     }).fetch();
 
     // We are adding the referenced node and its descendants
@@ -204,11 +204,11 @@ function reifyNodeReferences(nodes, visitedRefs = new Set(), depth = 0){
     // Filter all the looped references
     addedNodes = addedNodes.filter(addedNode => {
       // Add all non-reference nodes
-      if (addedNode.type !== 'reference'){
+      if (addedNode.type !== 'reference') {
         return true;
       }
       // If this exact reference has already been resolved before, filter it out
-      if (visitedRefs.has(addedNode._id)){
+      if (visitedRefs.has(addedNode._id)) {
         return false;
       } else {
         // Otherwise mark it as visited, and keep it

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

@@ -12,7 +12,7 @@ const pullFromProperty = new ValidatedMethod({
     numRequests: 5,
     timeInterval: 5000,
   },
-	run({_id, path, itemId}){
+  run({ _id, path, itemId }) {
     // Permissions
     let property = CreatureProperties.findOne(_id);
     let rootCreature = getRootCreatureAncestor(property);
@@ -23,7 +23,7 @@ const pullFromProperty = new ValidatedMethod({
       $pull: { [path.join('.')]: { _id: itemId } },
       $set: { dirty: true }
     }, {
-			selector: {type: property.type},
+      selector: { type: property.type },
       getAutoValues: false,
     });
   }

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

@@ -13,7 +13,7 @@ const pushToProperty = new ValidatedMethod({
     numRequests: 5,
     timeInterval: 5000,
   },
-	run({_id, path, value}){
+  run({ _id, path, value }) {
     // Permissions
     let property = CreatureProperties.findOne(_id);
     let rootCreature = getRootCreatureAncestor(property);
@@ -25,10 +25,10 @@ const pushToProperty = new ValidatedMethod({
     let schema = CreatureProperties.simpleSchema(property);
     let maxCount = schema.get(joinedPath, 'maxCount');
 
-    if (Number.isFinite(maxCount)){
+    if (Number.isFinite(maxCount)) {
       let array = get(property, path);
       let currentCount = array ? array.length : 0;
-      if (currentCount >= maxCount){
+      if (currentCount >= maxCount) {
         throw new Meteor.Error(
           'Array is full',
           `Cannot have more than ${maxCount} values`
@@ -41,7 +41,7 @@ const pushToProperty = new ValidatedMethod({
       $push: { [joinedPath]: value },
       $set: { dirty: true },
     }, {
-			selector: {type: property.type},
+      selector: { type: property.type },
     });
   }
 });

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

@@ -16,7 +16,7 @@ const restoreProperty = new ValidatedMethod({
     numRequests: 5,
     timeInterval: 5000,
   },
-	run({_id}){
+  run({ _id }) {
     // Permissions
     let property = CreatureProperties.findOne(_id);
     let rootCreature = getRootCreatureAncestor(property);

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

@@ -17,7 +17,7 @@ const selectAmmoItem = new ValidatedMethod({
     numRequests: 5,
     timeInterval: 5000,
   },
-  run({actionId, itemId, itemConsumedIndex}) {
+  run({ actionId, itemId, itemConsumedIndex }) {
     // Permissions
     let action = CreatureProperties.findOne(actionId);
     let rootCreature = getRootCreatureAncestor(action);
@@ -25,12 +25,12 @@ const selectAmmoItem = new ValidatedMethod({
 
     // Check that this index has a document to edit
     let itemConsumed = action.resources.itemsConsumed[itemConsumedIndex];
-    if (!itemConsumed){
+    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){
+    if (!itemToLink) {
       throw new Meteor.Error('Item not found',
         'Could not set ammo: the item was not found');
     }

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

@@ -16,14 +16,14 @@ const softRemoveProperty = new ValidatedMethod({
     numRequests: 5,
     timeInterval: 5000,
   },
-	run({_id}){
+  run({ _id }) {
     // Permissions
     let property = CreatureProperties.findOne(_id);
     let rootCreature = getRootCreatureAncestor(property);
     assertEditPermission(rootCreature, this.userId);
 
     // Do work
-		softRemove({_id, collection: CreatureProperties});
+    softRemove({ _id, collection: CreatureProperties });
   }
 });
 

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

@@ -6,10 +6,10 @@ import getRootCreatureAncestor from '/imports/api/creature/creatureProperties/ge
 
 const updateCreatureProperty = new ValidatedMethod({
   name: 'creatureProperties.update',
-  validate({_id, path}){
+  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]){
+    switch (path[0]) {
       case 'type':
       case 'order':
       case 'parent':
@@ -24,10 +24,10 @@ const updateCreatureProperty = new ValidatedMethod({
     numRequests: 5,
     timeInterval: 5000,
   },
-  run({_id, path, value}) {
+  run({ _id, path, value }) {
     // Permission
     let property = CreatureProperties.findOne(_id, {
-      fields: {type: 1, ancestors: 1}
+      fields: { type: 1, ancestors: 1 }
     });
     let rootCreature = getRootCreatureAncestor(property);
     assertEditPermission(rootCreature, this.userId);
@@ -35,13 +35,13 @@ const updateCreatureProperty = new ValidatedMethod({
     let pathString = path.join('.');
     let modifier;
     // unset empty values
-    if (value === null || value === undefined){
+    if (value === null || value === undefined) {
-      modifier = { $unset: {[pathString]: 1}, $set: { dirty: true } };
+      modifier = { $unset: { [pathString]: 1 }, $set: { dirty: true } };
     } else {
-      modifier = { $set: {[pathString]: value, dirty: true } };
+      modifier = { $set: { [pathString]: value, dirty: true } };
     }
     CreatureProperties.update(_id, modifier, {
-			selector: {type: property.type},
+      selector: { type: property.type },
     });
   },
 });

app/imports/api/creature/creatures/Creatures.js

@@ -18,6 +18,11 @@ let CreatureSettingsSchema = new SimpleSchema({
     type: Boolean,
     optional: true,
   },
+  //hide rest buttons
+  hideRestButtons: {
+    type: Boolean,
+    optional: true,
+  },
   // Swap around the modifier and stat
   swapStatAndModifier: {
     type: Boolean,
@@ -161,7 +166,7 @@ let CreatureSchema = new SimpleSchema({
   'computeErrors.$.type': {
     type: String,
   },
-  'computeErrors.$.details' : {
+  'computeErrors.$.details': {
     type: Object,
     blackbox: true,
     optional: true,

app/imports/api/creature/creatures/methods/changeAllowedLibraries.js

@@ -1,7 +1,7 @@
 import { ValidatedMethod } from 'meteor/mdg:validated-method';
 import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
-import {assertEditPermission} from '/imports/api/sharing/sharingPermissions.js';
+import { assertEditPermission } from '/imports/api/sharing/sharingPermissions.js';
 import SimpleSchema from 'simpl-schema';
 import simpleSchemaMixin from '/imports/api/creature/mixins/simpleSchemaMixin.js';
 
@@ -36,7 +36,7 @@ const changeAllowedLibraries = new ValidatedMethod({
     numRequests: 10,
     timeInterval: 5000,
   },
-  run({_id, allowedLibraries, allowedLibraryCollections}) {
+  run({ _id, allowedLibraries, allowedLibraryCollections }) {
     let creature = Creatures.findOne(_id);
     assertEditPermission(creature, this.userId);
     let $set;
@@ -48,7 +48,7 @@ const changeAllowedLibraries = new ValidatedMethod({
       $set.allowedLibraryCollections = allowedLibraryCollections;
     }
     if (!$set) return;
-    Creatures.update(_id, {$set});
+    Creatures.update(_id, { $set });
   },
 });
 
@@ -68,7 +68,7 @@ const toggleAllUserLibraries = new ValidatedMethod({
     numRequests: 10,
     timeInterval: 5000,
   },
-  run({_id, value}) {
+  run({ _id, value }) {
     if (value) {
       Creatures.update(_id, {
         $unset: {
@@ -87,4 +87,4 @@ const toggleAllUserLibraries = new ValidatedMethod({
   },
 });
 
-export {changeAllowedLibraries, toggleAllUserLibraries};
+export { changeAllowedLibraries, toggleAllUserLibraries };

app/imports/api/creature/creatures/methods/insertCreature.js

@@ -70,7 +70,7 @@ const insertCreature = new ValidatedMethod({
     let baseId, rulesetSlot;
     defaultCharacterProperties(creatureId).forEach(prop => {
       let id = CreatureProperties.insert(prop);
-      if (prop.name === 'Ruleset'){
+      if (prop.name === 'Ruleset') {
         baseId = id;
         rulesetSlot = prop;
       }
@@ -95,7 +95,7 @@ function insertDefaultRuleset(creatureId, baseId, userId, slot) {
     const ruleset = fillCursor.fetch()[0]
     insertPropertyFromLibraryNode.call({
       nodeIds: [ruleset._id],
-      parentRef: {id: baseId, collection: 'creatureProperties'},
+      parentRef: { id: baseId, collection: 'creatureProperties' },
       order: 0.5,
     });
   }

app/imports/api/creature/creatures/methods/restCreature.js

@@ -57,54 +57,87 @@ function doRestWork(restType, actionContext) {
   const creatureId = actionContext.creature._id;
   // Long rests reset short rest properties as well
   let resetFilter;
-  if (restType === 'shortRest'){
+  if (restType === 'shortRest') {
     resetFilter = 'shortRest'
   } else {
-    resetFilter = {$in: ['shortRest', 'longRest']}
+    resetFilter = { $in: ['shortRest', 'longRest'] }
   }
+  resetProperties(creatureId, resetFilter, actionContext);
+
+  // Reset half hit dice on a long rest, starting with the highest dice
+  if (restType === 'longRest') {
+    resetHitDice(creatureId, actionContext);
+  }
+}
+
+export function resetProperties(creatureId, resetFilter, actionContext) {
   // Only apply to active properties
-  let filter = {
+  const filter = {
     'ancestors.id': creatureId,
     reset: resetFilter,
     removed: { $ne: true },
     inactive: { $ne: true },
   };
   // update all attribute's damage
-  filter.type = 'attribute';
+  const attributeFilter = {
-  CreatureProperties.update(filter, {
+    ...filter,
+    type: 'attribute',
+    damage: { $ne: 0 },
+  }
+  CreatureProperties.find(attributeFilter, {
+    fields: { name: 1, damage: 1 }
+  }).forEach(prop => {
+    actionContext.addLog({
+      name: prop.name,
+      value: prop.damage >= 0 ? `Restored ${prop.damage}` : `Removed ${-prop.damage}`
+    });
+  });
+  CreatureProperties.update(attributeFilter, {
     $set: {
       damage: 0,
       dirty: true,
     }
   }, {
-    selector: {type: 'attribute'},
+    selector: { type: 'attribute' },
     multi: true,
   });
   // Update all action-like properties' usesUsed
-  filter.type = {$in: [
+  const actionFilter = {
-    'action',
+    ...filter,
-    'attack',
+    type: {
-    'spell'
+      $in: ['action', 'spell']
-  ]};
+    },
-  CreatureProperties.update(filter, {
+    usesUsed: { $ne: 0 },
+  };
+  CreatureProperties.find(actionFilter, {
+    fields: { name: 1, usesUsed: 1 }
+  }).forEach(prop => {
+    actionContext.addLog({
+      name: prop.name,
+      value: prop.usesUsed >= 0 ? `Restored ${prop.usesUsed} uses` : `Removed ${-prop.usesUsed} uses`
+    });
+  });
+  CreatureProperties.update(actionFilter, {
     $set: {
       usesUsed: 0,
       dirty: true,
     }
   }, {
-    selector: {type: 'action'},
+    selector: { type: 'action' },
     multi: true,
   });
-  // Reset half hit dice on a long rest, starting with the highest dice
+}
-  if (restType === 'longRest'){
+
+function resetHitDice(creatureId, actionContext) {
   let hitDice = CreatureProperties.find({
     'ancestors.id': creatureId,
     type: 'attribute',
     attributeType: 'hitDice',
-      removed: {$ne: true},
+    removed: { $ne: true },
-      inactive: {$ne: true},
+    inactive: { $ne: true },
   }, {
     fields: {
+      name: 1,
       hitDiceSize: 1,
       damage: 1,
       total: 1,
@@ -120,7 +153,7 @@ function doRestWork(restType, actionContext) {
   // Get the total number of hit dice that can be recovered this rest
   let totalHd = hitDice.reduce((sum, hd) => sum + (hd.total || 0), 0);
   let resetMultiplier = actionContext.creature.settings.hitDiceResetMultiplier || 0.5;
-    let recoverableHd = Math.max(Math.floor(totalHd*resetMultiplier), 1);
+  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 => {
@@ -129,16 +162,19 @@ function doRestWork(restType, actionContext) {
     if (!amountToRecover) return;
     recoverableHd -= amountToRecover;
     resultingDamage = hd.damage - amountToRecover;
+    actionContext.addLog({
+      name: hd.name,
+      value: amountToRecover >= 0 ? `Restored ${amountToRecover} hit dice` : `Removed ${-amountToRecover} hit dice`
+    });
     CreatureProperties.update(hd._id, {
       $set: {
         damage: resultingDamage,
         dirty: true,
       }
     }, {
-        selector: {type: 'attribute'},
+      selector: { type: 'attribute' },
     });
   });
-  }
 }
 
 export default restCreature;

app/imports/api/creature/creatures/methods/updateCreature.js

@@ -1,11 +1,11 @@
 import { ValidatedMethod } from 'meteor/mdg:validated-method';
 import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
-import {assertEditPermission} from '/imports/api/sharing/sharingPermissions.js';
+import { assertEditPermission } from '/imports/api/sharing/sharingPermissions.js';
 
 const updateCreature = new ValidatedMethod({
   name: 'creatures.update',
-  validate({_id, path}){
+  validate({ _id, path }) {
     if (!_id) return false;
     // Allowed fields
     let allowedFields = [
@@ -17,7 +17,7 @@ const updateCreature = new ValidatedMethod({
       'color',
       'settings',
     ];
-		if (!allowedFields.includes(path[0])){
+    if (!allowedFields.includes(path[0])) {
       throw new Meteor.Error('Creatures.methods.update.denied',
         'This field can\'t be updated using this method');
     }
@@ -27,16 +27,16 @@ const updateCreature = new ValidatedMethod({
     numRequests: 5,
     timeInterval: 5000,
   },
-  run({_id, path, value}) {
+  run({ _id, path, value }) {
     let creature = Creatures.findOne(_id);
     assertEditPermission(creature, this.userId);
-    if (value === undefined || value === null){
+    if (value === undefined || value === null) {
       Creatures.update(_id, {
-        $unset: {[path.join('.')]: 1},
+        $unset: { [path.join('.')]: 1 },
       });
     } else {
       Creatures.update(_id, {
-        $set: {[path.join('.')]: value},
+        $set: { [path.join('.')]: value },
       });
     }
   },

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

@@ -29,7 +29,7 @@ let ExperienceSchema = new SimpleSchema({
   // The real-world date that it occured, usually sorted by date
   date: {
     type: Date,
-		autoValue: function() {
+    autoValue: function () {
       // If the date isn't set, set it to now
       if (!this.isSet) {
         return new Date();
@@ -46,8 +46,8 @@ let ExperienceSchema = new SimpleSchema({
 
 Experiences.attachSchema(ExperienceSchema);
 
-const insertExperienceForCreature = function({experience, creatureId, userId}){
+const insertExperienceForCreature = function ({ experience, creatureId }) {
-  if (experience.xp){
+  if (experience.xp) {
     Creatures.update(creatureId, {
       $inc: { 'denormalizedStats.xp': experience.xp },
       $set: { dirty: true },
@@ -84,7 +84,7 @@ const insertExperience = new ValidatedMethod({
     numRequests: 5,
     timeInterval: 5000,
   },
-  run({experience, creatureIds}) {
+  run({ experience, creatureIds }) {
     let userId = this.userId;
     if (!userId) {
       throw new Meteor.Error('Experiences.methods.insert.denied',
@@ -93,7 +93,7 @@ const insertExperience = new ValidatedMethod({
     let insertedIds = [];
     creatureIds.forEach(creatureId => {
       assertEditPermission(creatureId, userId);
-      let id = insertExperienceForCreature({experience, creatureId, userId});
+      let id = insertExperienceForCreature({ experience, creatureId, userId });
       insertedIds.push(id);
     });
     return insertedIds;
@@ -113,7 +113,7 @@ const removeExperience = new ValidatedMethod({
     numRequests: 5,
     timeInterval: 5000,
   },
-  run({experienceId}) {
+  run({ experienceId }) {
     let userId = this.userId;
     if (!userId) {
       throw new Meteor.Error('Experiences.methods.remove.denied',
@@ -123,7 +123,7 @@ const removeExperience = new ValidatedMethod({
     if (!experience) return;
     let creatureId = experience.creatureId
     assertEditPermission(creatureId, userId);
-    if (experience.xp){
+    if (experience.xp) {
       Creatures.update(creatureId, {
         $inc: { 'denormalizedStats.xp': -experience.xp },
         $set: { dirty: true },
@@ -154,7 +154,7 @@ const recomputeExperiences = new ValidatedMethod({
     numRequests: 5,
     timeInterval: 5000,
   },
-  run({creatureId}) {
+  run({ creatureId }) {
     let userId = this.userId;
     if (!userId) {
       throw new Meteor.Error('Experiences.methods.recompute.denied',
@@ -167,16 +167,18 @@ const recomputeExperiences = new ValidatedMethod({
     Experiences.find({
       creatureId
     }, {
-      fields: {xp: 1, levels: 1}
+      fields: { xp: 1, levels: 1 }
     }).forEach(experience => {
       xp += experience.xp || 0;
       milestoneLevels += experience.levels || 0;
     });
-    Creatures.update(creatureId, {$set: {
+    Creatures.update(creatureId, {
+      $set: {
         'denormalizedStats.xp': xp,
         'denormalizedStats.milestoneLevels': milestoneLevels,
         dirty: true,
-    }});
+      }
+    });
   },
 });
 

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

@@ -16,7 +16,7 @@ let ExperienceSchema = new SimpleSchema({
   // The real-world date that it occured
   date: {
     type: Date,
-		autoValue: function() {
+    autoValue: function () {
       // If the date isn't set, set it to now
       if (!this.isSet) {
         return new Date();

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

@@ -4,13 +4,13 @@ import CreatureVariables from '/imports/api/creature/creatures/CreatureVariables
 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/creatures/creaturePermissions.js';
+import { assertEditPermission } from '/imports/api/creature/creatures/creaturePermissions.js';
-import {parse, prettifyParseError} from '/imports/parser/parser.js';
+import { parse, prettifyParseError } from '/imports/parser/parser.js';
 import resolve, { toString } from '/imports/parser/resolve.js';
 const PER_CREATURE_LOG_LIMIT = 100;
 import STORAGE_LIMITS from '/imports/constants/STORAGE_LIMITS.js';
 
-if (Meteor.isServer){
+if (Meteor.isServer) {
   var sendWebhookAsCreature = require('/imports/server/discord/sendWebhook.js').sendWebhookAsCreature;
 }
 
@@ -28,7 +28,7 @@ let CreatureLogSchema = new SimpleSchema({
   // The real-world date that it occured, usually sorted by date
   date: {
     type: Date,
-		autoValue: function() {
+    autoValue: function () {
       // If the date isn't set, set it to now
       if (!this.isSet) {
         return new Date();
@@ -50,23 +50,23 @@ let CreatureLogSchema = new SimpleSchema({
 
 CreatureLogs.attachSchema(CreatureLogSchema);
 
-function removeOldLogs(creatureId){
+function removeOldLogs(creatureId) {
   // Find the first log that is over the limit
   let firstExpiredLog = CreatureLogs.find({
     creatureId
   }, {
-    sort: {date: -1},
+    sort: { date: -1 },
     skip: PER_CREATURE_LOG_LIMIT,
   });
   if (!firstExpiredLog) return;
   // Remove all logs older than the one over the limit
   CreatureLogs.remove({
     creatureId,
-    date: {$lte: firstExpiredLog.date},
+    date: { $lte: firstExpiredLog.date },
   });
 }
 
-function logToMessageData(log){
+function logToMessageData(log) {
   let embed = {
     fields: [],
   };
@@ -78,8 +78,8 @@ function logToMessageData(log){
   return { embeds: [embed] };
 }
 
-function logWebhook({log, creature}){
+function logWebhook({ log, creature }) {
-  if (Meteor.isServer){
+  if (Meteor.isServer) {
     sendWebhookAsCreature({
       creature,
       data: logToMessageData(log),
@@ -97,44 +97,46 @@ const insertCreatureLog = new ValidatedMethod({
   validate: new SimpleSchema({
     log: CreatureLogSchema.omit('date'),
   }).validator(),
-  run({log}){
+  run({ log }) {
     const creatureId = log.creatureId;
-    const creature = Creatures.findOne(creatureId, {fields: {
+    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})
+    let id = insertCreatureLogWork({ log, creature, method: this })
     return id;
   },
 });
 
-export function insertCreatureLogWork({log, creature, method}){
+export function insertCreatureLogWork({ log, creature, method }) {
   // Build the new log
-  if (typeof log === 'string'){
+  if (typeof log === 'string') {
-    log = {content: [{value: log}]};
+    log = { content: [{ value: log }] };
   }
   if (!log.content?.length) return;
   log.date = new Date();
   // Insert it
   let id = CreatureLogs.insert(log);
-  if (Meteor.isServer){
+  if (Meteor.isServer) {
     method?.unblock();
     removeOldLogs(creature._id);
-    logWebhook({log, creature});
+    logWebhook({ log, creature });
   }
   return id;
 }
 
 
-function equalIgnoringWhitespace(a, b){
+function equalIgnoringWhitespace(a, b) {
   if (typeof a !== 'string' || typeof b !== 'string') return a === b;
-  return a.replace(/\s/g,'') === b.replace(/\s/g, '');
+  return a.replace(/\s/g, '') === b.replace(/\s/g, '');
 }
 
 const logRoll = new ValidatedMethod({
@@ -153,24 +155,26 @@ const logRoll = new ValidatedMethod({
       regEx: SimpleSchema.RegEx.Id,
     },
   }).validator(),
-  run({roll, creatureId}){
+  run({ roll, creatureId }) {
-    const creature = Creatures.findOne(creatureId, {fields: {
+    const creature = Creatures.findOne(creatureId, {
+      fields: {
         readers: 1,
         writers: 1,
         owner: 1,
         'settings.discordWebhook': 1,
         name: 1,
         avatarPicture: 1,
-    }});
+      }
+    });
     assertEditPermission(creature, this.userId);
     const variables = CreatureVariables.findOne({ _creatureId: creatureId });
     let logContent = []
     let parsedResult = undefined;
     try {
       parsedResult = parse(roll);
-    } catch (e){
+    } catch (e) {
       let error = prettifyParseError(e);
-      logContent.push({name: 'Parse Error', value: error});
+      logContent.push({ name: 'Parse Error', value: error });
     }
     if (parsedResult) try {
       let {
@@ -184,19 +188,19 @@ const logRoll = new ValidatedMethod({
       logContent.push({
         value: compiledString
       });
-      let {result: rolled} = resolve('roll', compiled, variables, context);
+      let { result: rolled } = resolve('roll', compiled, variables, context);
       let rolledString = toString(rolled);
       if (rolledString !== compiledString) logContent.push({
         value: rolledString
       });
-      let {result} = resolve('reduce', rolled, variables, context);
+      let { result } = resolve('reduce', rolled, variables, context);
       let resultString = toString(result);
       if (resultString !== rolledString) logContent.push({
         value: resultString
       });
-    } catch (e){
+    } catch (e) {
       console.error(e);
-      logContent = [{name: 'Calculation error'}];
+      logContent = [{ name: 'Calculation error' }];
     }
     const log = {
       content: logContent,
@@ -204,11 +208,11 @@ const logRoll = new ValidatedMethod({
       date: new Date(),
     };
 
-    let id = insertCreatureLogWork({log, creature, method: this});
+    let id = insertCreatureLogWork({ log, creature, method: this });
 
     return id;
   },
 });
 
 export default CreatureLogs;
-export { CreatureLogSchema, insertCreatureLog, logRoll, PER_CREATURE_LOG_LIMIT};
+export { CreatureLogSchema, insertCreatureLog, logRoll, PER_CREATURE_LOG_LIMIT };

app/imports/api/docs/Docs.js

@@ -0,0 +1,3 @@
+if (Meteor.isServer) throw 'Client side only collection, don\'t import on server';
+const Docs = new Mongo.Collection('docs');
+export default Docs;

app/imports/api/engine/actions/applyProperty.js

@@ -4,6 +4,7 @@ import branch from './applyPropertyByType/applyBranch.js';
 import buff from './applyPropertyByType/applyBuff.js';
 import buffRemover from './applyPropertyByType/applyBuffRemover.js';
 import damage from './applyPropertyByType/applyDamage.js';
+import folder from './applyPropertyByType/applyFolder.js';
 import note from './applyPropertyByType/applyNote.js';
 import roll from './applyPropertyByType/applyRoll.js';
 import savingThrow from './applyPropertyByType/applySavingThrow.js';
@@ -16,6 +17,7 @@ const applyPropertyByType = {
   buff,
   buffRemover,
   damage,
+  folder,
   note,
   roll,
   savingThrow,

app/imports/api/engine/actions/applyPropertyByType/applyAction.js

@@ -7,6 +7,7 @@ import { adjustQuantityWork } from '/imports/api/creature/creatureProperties/met
 import { damagePropertyWork } from '/imports/api/creature/creatureProperties/methods/damageProperty.js';
 import numberToSignedString from '/imports/ui/utility/numberToSignedString.js';
 import { applyNodeTriggers } from '/imports/api/engine/actions/applyTriggers.js';
+import { resetProperties } from '/imports/api/creature/creatures/methods/restCreature.js';
 
 export default function applyAction(node, actionContext) {
   applyNodeTriggers(node, 'before', actionContext);
@@ -16,7 +17,7 @@ export default function applyAction(node, actionContext) {
 
   // Log the name and summary
   let content = { name: prop.name };
-  if (prop.summary?.text){
+  if (prop.summary?.text) {
     recalculateInlineCalculations(prop.summary, actionContext);
     content.value = prop.summary.value;
   }
@@ -29,24 +30,27 @@ export default function applyAction(node, actionContext) {
   const attack = prop.attackRoll || prop.attackRollBonus;
 
   // Attack if there is an attack roll
-  if (attack && attack.calculation){
+  if (attack && attack.calculation) {
-    if (targets.length){
+    if (targets.length) {
       targets.forEach(target => {
-        applyAttackToTarget({attack, target, actionContext});
+        applyAttackToTarget({ attack, target, actionContext });
         // Apply the children, but only to the current target
         actionContext.targets = [target];
         applyChildren(node, actionContext);
       });
     } else {
-      applyAttackWithoutTarget({attack, actionContext});
+      applyAttackWithoutTarget({ attack, actionContext });
       applyChildren(node, actionContext);
     }
   } else {
     applyChildren(node, actionContext);
   }
+  if (prop.actionType === 'event' && prop.variableName) {
+    resetProperties(actionContext.creature._id, prop.variableName, actionContext);
+  }
 }
 
-function applyAttackWithoutTarget({attack, actionContext}){
+function applyAttackWithoutTarget({ attack, actionContext }) {
   delete actionContext.scope['$attackHit'];
   delete actionContext.scope['$attackMiss'];
   delete actionContext.scope['$criticalHit'];
@@ -62,16 +66,16 @@ function applyAttackWithoutTarget({attack, actionContext}){
     criticalMiss,
   } = rollAttack(attack, scope);
   let name = criticalHit ? 'Critical Hit!' : criticalMiss ? 'Critical Miss!' : 'To Hit';
-  if (scope['$attackAdvantage'] === 1){
+  if (scope['$attackAdvantage'] === 1) {
     name += ' (Advantage)';
-  } else if(scope['$attackAdvantage'] === -1){
+  } else if (scope['$attackAdvantage'] === -1) {
     name += ' (Disadvantage)';
   }
-  if (!criticalMiss){
+  if (!criticalMiss) {
-    scope['$attackHit'] = {value: true}
+    scope['$attackHit'] = { value: true }
   }
-  if (!criticalHit){
+  if (!criticalHit) {
-    scope['$attackMiss'] = {value: true};
+    scope['$attackMiss'] = { value: true };
   }
 
   actionContext.addLog({
@@ -81,7 +85,7 @@ function applyAttackWithoutTarget({attack, actionContext}){
   });
 }
 
-function applyAttackToTarget({attack, target, actionContext}){
+function applyAttackToTarget({ attack, target, actionContext }) {
   const scope = actionContext.scope;
   delete scope['$attackHit'];
   delete scope['$attackMiss'];
@@ -99,15 +103,15 @@ function applyAttackToTarget({attack, target, actionContext}){
     criticalMiss,
   } = rollAttack(attack, scope);
 
-  if (target.variables.armor){
+  if (target.variables.armor) {
     const armor = target.variables.armor.value;
 
     let name = criticalHit ? 'Critical Hit!' :
       criticalMiss ? 'Critical Miss!' :
         result > armor ? 'Hit!' : 'Miss!';
-    if (scope['$attackAdvantage'] === 1){
+    if (scope['$attackAdvantage'] === 1) {
       name += ' (Advantage)';
-    } else if(scope['$attackAdvantage'] === -1){
+    } else if (scope['$attackAdvantage'] === -1) {
       name += ' (Disadvantage)';
     }
 
@@ -116,15 +120,15 @@ function applyAttackToTarget({attack, target, actionContext}){
       value: `${resultPrefix}\n**${result}**`,
       inline: true,
     });
-    if (criticalMiss || result < armor){
+    if (criticalMiss || result < armor) {
-      scope['$attackMiss'] = {value: true};
+      scope['$attackMiss'] = { value: true };
     } else {
-      scope['$attackHit'] = {value: true};
+      scope['$attackHit'] = { value: true };
     }
   } else {
     actionContext.addLog({
       name: 'Error',
-      value:'Target has no `armor`',
+      value: 'Target has no `armor`',
     });
     actionContext.addLog({
       name: criticalHit ? 'Critical Hit!' : criticalMiss ? 'Critical Miss!' : 'To Hit',
@@ -134,10 +138,10 @@ function applyAttackToTarget({attack, target, actionContext}){
   }
 }
 
-function rollAttack(attack, scope){
+function rollAttack(attack, scope) {
   const rollModifierText = numberToSignedString(attack.value, true);
   let value, resultPrefix;
-  if (scope['$attackAdvantage'] === 1){
+  if (scope['$attackAdvantage'] === 1) {
     const [a, b] = rollDice(2, 20);
     if (a >= b) {
       value = a;
@@ -146,7 +150,7 @@ function rollAttack(attack, scope){
       value = b;
       resultPrefix = `1d20 [ ~~${a}~~, ${b} ] ${rollModifierText}`;
     }
-  } else if (scope['$attackAdvantage'] === -1){
+  } else if (scope['$attackAdvantage'] === -1) {
     const [a, b] = rollDice(2, 20);
     if (a <= b) {
       value = a;
@@ -159,25 +163,25 @@ function rollAttack(attack, scope){
     value = rollDice(1, 20)[0];
     resultPrefix = `1d20 [${value}] ${rollModifierText}`
   }
-  scope['$attackRoll'] = {value};
+  scope['$attackRoll'] = { value };
   const result = value + attack.value;
-  const {criticalHit, criticalMiss} = applyCrits(value, scope);
+  const { criticalHit, criticalMiss } = applyCrits(value, scope);
-  return {resultPrefix, result, value, criticalHit, criticalMiss};
+  return { resultPrefix, result, value, criticalHit, criticalMiss };
 }
 
-function applyCrits(value, scope){
+function applyCrits(value, scope) {
   let criticalHitTarget = scope.criticalHitTarget?.value || 20;
   let criticalHit = value >= criticalHitTarget;
   let criticalMiss;
-  if (criticalHit){
+  if (criticalHit) {
-    scope['$criticalHit'] = {value: true};
+    scope['$criticalHit'] = { value: true };
   } else {
     criticalMiss = value === 1;
-    if (criticalMiss){
+    if (criticalMiss) {
-      scope['$criticalMiss'] = {value: true};
+      scope['$criticalMiss'] = { value: true };
     }
   }
-  return {criticalHit, criticalMiss};
+  return { criticalHit, criticalMiss };
 }
 
 function applyChildren(node, actionContext) {
@@ -185,9 +189,9 @@ function applyChildren(node, actionContext) {
   node.children.forEach(child => applyProperty(child, actionContext));
 }
 
-function spendResources(prop, actionContext){
+function spendResources(prop, actionContext) {
   // Check Uses
-  if (prop.usesLeft <= 0){
+  if (prop.usesLeft <= 0) {
     if (!prop.silent) actionContext.addLog({
       name: 'Error',
       value: `${prop.name || 'action'} does not have enough uses left`,
@@ -195,7 +199,7 @@ function spendResources(prop, actionContext){
     return true;
   }
   // Resources
-  if (prop.insufficientResources){
+  if (prop.insufficientResources) {
     if (!prop.silent) actionContext.addLog({
       name: 'Error',
       value: 'This creature doesn\'t have sufficient resources to perform this action',
@@ -209,14 +213,14 @@ function spendResources(prop, actionContext){
   try {
     prop.resources.itemsConsumed.forEach(itemConsumed => {
       recalculateCalculation(itemConsumed.quantity, actionContext);
-      if (!itemConsumed.itemId){
+      if (!itemConsumed.itemId) {
         throw 'No ammo was selected for this prop';
       }
       let item = CreatureProperties.findOne(itemConsumed.itemId);
-      if (!item || item.ancestors[0].id !== prop.ancestors[0].id){
+      if (!item || item.ancestors[0].id !== prop.ancestors[0].id) {
         throw 'The prop\'s ammo was not found on the creature';
       }
-      if (!item.equipped){
+      if (!item.equipped) {
         throw 'The selected ammo is not equipped';
       }
       if (
@@ -229,16 +233,16 @@ function spendResources(prop, actionContext){
         value: itemConsumed.quantity.value,
       });
       let logName = item.name;
-      if (itemConsumed.quantity.value > 1 || itemConsumed.quantity.value < -1){
+      if (itemConsumed.quantity.value > 1 || itemConsumed.quantity.value < -1) {
         logName = item.plural || logName;
       }
-      if (itemConsumed.quantity.value > 0){
+      if (itemConsumed.quantity.value > 0) {
         spendLog.push(logName + ': ' + itemConsumed.quantity.value);
-      } else if (itemConsumed.quantity.value < 0){
+      } else if (itemConsumed.quantity.value < 0) {
         gainLog.push(logName + ': ' + -itemConsumed.quantity.value);
       }
     });
-  } catch (e){
+  } catch (e) {
     actionContext.addLog({
       name: 'Error',
       value: e,
@@ -251,9 +255,9 @@ function spendResources(prop, actionContext){
   itemQuantityAdjustments.forEach(adjustQuantityWork);
 
   // Use uses
-  if (prop.usesLeft){
+  if (prop.usesLeft) {
     CreatureProperties.update(prop._id, {
-      $inc: {usesUsed: 1}
+      $inc: { usesUsed: 1 }
     }, {
       selector: prop
     });
@@ -270,7 +274,7 @@ function spendResources(prop, actionContext){
 
     if (!attConsumed.quantity?.value) return;
     let stat = actionContext.scope[attConsumed.variableName];
-    if (!stat){
+    if (!stat) {
       spendLog.push(stat.name + ': ' + ' not found');
       return;
     }
@@ -280,9 +284,9 @@ function spendResources(prop, actionContext){
       value: attConsumed.quantity.value,
       actionContext,
     });
-    if (attConsumed.quantity.value > 0){
+    if (attConsumed.quantity.value > 0) {
       spendLog.push(stat.name + ': ' + attConsumed.quantity.value);
-    } else if (attConsumed.quantity.value < 0){
+    } else if (attConsumed.quantity.value < 0) {
       gainLog.push(stat.name + ': ' + -attConsumed.quantity.value);
     }
   });

app/imports/api/engine/actions/applyPropertyByType/applyBuff.js

@@ -2,7 +2,7 @@ import {
   setLineageOfDocs,
   renewDocIds
 } from '/imports/api/parenting/parenting.js';
-import {setDocToLastOrder} from '/imports/api/parenting/order.js';
+import { setDocToLastOrder } from '/imports/api/parenting/order.js';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import computedSchemas from '/imports/api/properties/computedPropertySchemasIndex.js';
 import applyFnToKey from '/imports/api/engine/computation/utility/applyFnToKey.js';
@@ -15,14 +15,14 @@ import cyrb53 from '/imports/api/engine/computation/utility/cyrb53.js';
 import { applyNodeTriggers } from '/imports/api/engine/actions/applyTriggers.js';
 import INLINE_CALCULATION_REGEX from '/imports/constants/INLINE_CALCULTION_REGEX.js';
 
-export default function applyBuff(node, actionContext){
+export default function applyBuff(node, actionContext) {
   applyNodeTriggers(node, 'before', actionContext);
   const prop = node.node;
   let buffTargets = prop.target === 'self' ? [actionContext.creature] : actionContext.targets;
 
   // Then copy the decendants of the buff to the targets
   let propList = [prop];
-  function addChildrenToPropList(children, { skipCrystalize } = {}){
+  function addChildrenToPropList(children, { skipCrystalize } = {}) {
     children.forEach(child => {
       if (skipCrystalize) child.node._skipCrystalize = true;
       propList.push(child.node);
@@ -34,7 +34,7 @@ export default function applyBuff(node, actionContext){
   }
   addChildrenToPropList(node.children);
   if (!prop.skipCrystalization) {
-    crystalizeVariables({propList, actionContext});
+    crystalizeVariables({ propList, actionContext });
   }
 
   let oldParent = {
@@ -46,8 +46,8 @@ export default function applyBuff(node, actionContext){
     copyNodeListToTarget(propList, target, oldParent);
 
     //Log the buff
-    if ((prop.name || prop.description?.value) && !prop.silent){
+    if ((prop.name || prop.description?.value) && !prop.silent) {
-      if (target._id === actionContext.creature._id){
+      if (target._id === actionContext.creature._id) {
         // Targeting self
         actionContext.addLog({
           name: prop.name,
@@ -72,8 +72,8 @@ export default function applyBuff(node, actionContext){
   // Don't apply the children of the buff, they get copied to the target instead
 }
 
-function copyNodeListToTarget(propList, target, oldParent){
+function copyNodeListToTarget(propList, target, oldParent) {
-  let ancestry = [{collection: 'creatures', id: target._id}];
+  let ancestry = [{ collection: 'creatures', id: target._id }];
   setLineageOfDocs({
     docArray: propList,
     newAncestry: ancestry,
@@ -93,14 +93,14 @@ function copyNodeListToTarget(propList, target, oldParent){
  * Replaces all variables with their resolved values
  * except variables of the form `$target.thing.total` become `thing.total`
  */
-function crystalizeVariables({propList, actionContext}){
+function crystalizeVariables({ propList, actionContext }) {
   propList.forEach(prop => {
     if (prop._skipCrystalize) {
       delete prop._skipCrystalize;
       return;
     }
     // Iterate through all the calculations and crystalize them
-    computedSchemas[prop.type].computedFields().forEach( calcKey => {
+    computedSchemas[prop.type].computedFields().forEach(calcKey => {
       applyFnToKey(prop, calcKey, (prop, key) => {
         const calcObj = get(prop, key);
         if (!calcObj?.parseNode) return;
@@ -110,12 +110,12 @@ function crystalizeVariables({propList, actionContext}){
             node.parseType !== 'accessor' && node.parseType !== 'symbol'
           ) return node;
           // Handle variables
-          if (node.name === '$target'){
+          if (node.name === '$target') {
             // strip $target
-            if (node.parseType === 'accessor'){
+            if (node.parseType === 'accessor') {
               node.name = node.path.shift();
-              if (!node.path.length){
+              if (!node.path.length) {
-                return symbol.create({name: node.name})
+                return symbol.create({ name: node.name })
               }
             } else {
               // Can't strip symbols
@@ -127,7 +127,7 @@ function crystalizeVariables({propList, actionContext}){
             return node;
           } else {
             // Resolve all other variables
-            const {result, context} = resolve('reduce', node, actionContext.scope);
+            const { result, context } = resolve('reduce', node, actionContext.scope);
             logErrors(context.errors, actionContext);
             return result;
           }
@@ -137,14 +137,14 @@ function crystalizeVariables({propList, actionContext}){
       });
     });
     // For each key in the schema
-    computedSchemas[prop.type].inlineCalculationFields().forEach( calcKey => {
+    computedSchemas[prop.type].inlineCalculationFields().forEach(calcKey => {
       // That ends in .inlineCalculations
       applyFnToKey(prop, calcKey, (prop, key) => {
         const inlineCalcObj = get(prop, key);
         if (!inlineCalcObj) return;
 
         // If there is no text, skip
-        if (!inlineCalcObj.text){
+        if (!inlineCalcObj.text) {
           return;
         }
 

app/imports/api/engine/actions/applyPropertyByType/applyDamage.js

@@ -1,6 +1,6 @@
-import { some, intersection, difference, remove } from 'lodash';
+import { some, intersection, difference, remove, includes } from 'lodash';
 import applyProperty from '../applyProperty.js';
-import {insertCreatureLog} from '/imports/api/creature/log/CreatureLogs.js';
+import { insertCreatureLog } from '/imports/api/creature/log/CreatureLogs.js';
 import resolve, { Context, toString } from '/imports/parser/resolve.js';
 import logErrors from './shared/logErrors.js';
 import applyEffectsToCalculationParseNode from '/imports/api/engine/actions/applyPropertyByType/shared/applyEffectsToCalculationParseNode.js';
@@ -10,9 +10,9 @@ import {
 } from '/imports/api/engine/loadCreatures.js';
 import { applyNodeTriggers } from '/imports/api/engine/actions/applyTriggers.js';
 
-export default function applyDamage(node, actionContext){
+export default function applyDamage(node, actionContext) {
   applyNodeTriggers(node, 'before', actionContext);
-  const applyChildren = function(){
+  const applyChildren = function () {
     applyNodeTriggers(node, 'after', actionContext);
     node.children.forEach(child => applyProperty(child, actionContext));
   };
@@ -31,7 +31,7 @@ export default function applyDamage(node, actionContext){
     ;
   // Double the damage rolls if the hit is critical
   let context = new Context({
-    options: {doubleRolls: criticalHit},
+    options: { doubleRolls: criticalHit },
   });
 
   // Gather all the lines we need to log into an array
@@ -40,8 +40,8 @@ export default function applyDamage(node, actionContext){
 
   // roll the dice only and store that string
   applyEffectsToCalculationParseNode(prop.amount, actionContext.log);
-  const {result: rolled} = resolve('roll', prop.amount.parseNode, scope, context);
+  const { result: rolled } = resolve('roll', prop.amount.parseNode, scope, context);
-  if (rolled.parseType !== 'constant'){
+  if (rolled.parseType !== 'constant') {
     logValue.push(toString(rolled));
   }
   logErrors(context.errors, actionContext);
@@ -50,13 +50,13 @@ export default function applyDamage(node, actionContext){
   context.errors = [];
 
   // Resolve the roll to a final value
-  const {result: reduced} = resolve('reduce', rolled, scope, context);
+  const { result: reduced } = resolve('reduce', rolled, scope, context);
   logErrors(context.errors, actionContext);
 
   // Store the result
-  if (reduced.parseType === 'constant'){
+  if (reduced.parseType === 'constant') {
     prop.amount.value = reduced.value;
-  } else if (reduced.parseType === 'error'){
+  } else if (reduced.parseType === 'error') {
     prop.amount.value = null;
   } else {
     prop.amount.value = toString(reduced);
@@ -64,7 +64,7 @@ export default function applyDamage(node, actionContext){
   let damage = +reduced.value;
 
   // If we didn't end up with a constant of finite amount, give up
-  if (reduced?.parseType !== 'constant' || !isFinite(reduced.value)){
+  if (reduced?.parseType !== 'constant' || !isFinite(reduced.value)) {
     return applyChildren();
   }
 
@@ -83,7 +83,7 @@ export default function applyDamage(node, actionContext){
   // Memoise the damage suffix for the log
   let suffix = (criticalHit ? ' critical ' : ' ') +
     prop.damageType +
-    (prop.damageType !== 'healing' ? ' damage ': '');
+    (prop.damageType !== 'healing' ? ' damage ' : '');
 
   if (damageTargets && damageTargets.length) {
     // Iterate through all the targets
@@ -107,7 +107,7 @@ export default function applyDamage(node, actionContext){
       });
 
       // Log the damage done
-      if (target._id === actionContext.creature._id){
+      if (target._id === actionContext.creature._id) {
         // Target is same as self, log damage as such
         logValue.push(`**${damageDealt}** ${suffix}  to self`);
       } else {
@@ -136,33 +136,33 @@ export default function applyDamage(node, actionContext){
   return applyChildren();
 }
 
-function applyDamageMultipliers({target, damage, damageProp, logValue}){
+function applyDamageMultipliers({ target, damage, damageProp, logValue }) {
   const damageType = damageProp?.damageType;
   if (!damageType) return damage;
 
   const multiplier = target?.variables?.[damageType];
   if (!multiplier) return damage;
 
-  const damageTypeText = damageType == 'healing' ? 'healing': `${damageType} damage`;
+  const damageTypeText = damageType == 'healing' ? 'healing' : `${damageType} damage`;
 
   if (
     multiplier.immunity &&
-    some(multiplier.immunities, multiplierAppliesTo(damageProp))
+    some(multiplier.immunities, multiplierAppliesTo(damageProp, 'immunity'))
-  ){
+  ) {
     logValue.push(`Immune to ${damageTypeText}`);
     return 0;
   } else {
     if (
       multiplier.resistance &&
-      some(multiplier.resistances, multiplierAppliesTo(damageProp))
+      some(multiplier.resistances, multiplierAppliesTo(damageProp, 'resistance'))
-    ){
+    ) {
       logValue.push(`Resistant to ${damageTypeText}`);
       damage = Math.floor(damage / 2);
     }
     if (
       multiplier.vulnerability &&
-      some(multiplier.vulnerabilities, multiplierAppliesTo(damageProp))
+      some(multiplier.vulnerabilities, multiplierAppliesTo(damageProp, 'vulnerability'))
-    ){
+    ) {
       logValue.push(`Vulnerable to ${damageTypeText}`);
       damage = Math.floor(damage * 2);
     }
@@ -170,8 +170,11 @@ function applyDamageMultipliers({target, damage, damageProp, logValue}){
   return damage;
 }
 
-function multiplierAppliesTo(damageProp){
+function multiplierAppliesTo(damageProp, multiplierType) {
   return multiplier => {
+    // Apply the default 'ignore x' tags
+    if (includes(damageProp.tags, `ignore ${multiplierType}`)) return false;
+
     const hasRequiredTags = difference(
       multiplier.includeTags, damageProp.tags
     ).length === 0;
@@ -184,7 +187,7 @@ function multiplierAppliesTo(damageProp){
   }
 }
 
-function dealDamage({target, damageType, amount, actionContext}){
+function dealDamage({ target, damageType, amount, actionContext }) {
   // Get all the health bars and do damage to them
   let healthBars = getPropertiesOfType(target._id, 'attribute');
 
@@ -236,6 +239,14 @@ function dealDamage({target, damageType, amount, actionContext}){
       actionContext
     });
     damageLeft -= damageAdded;
+    // Prevent overflow
+    if (
+      damageType === 'healing' ?
+        healthBar.healthBarNoHealingOverflow :
+        healthBar.healthBarNoDamageOverflow
+    ) {
+      damageLeft = 0;
+    }
   });
   return totalDamage;
 }

app/imports/api/engine/actions/applyPropertyByType/applyFolder.js

@@ -0,0 +1,11 @@
+import recalculateInlineCalculations from './shared/recalculateInlineCalculations.js';
+import applyProperty from '../applyProperty.js';
+import { applyNodeTriggers } from '/imports/api/engine/actions/applyTriggers.js';
+
+export default function applyFolder(node, actionContext) {
+  // Apply triggers
+  applyNodeTriggers(node, 'before', actionContext);
+  applyNodeTriggers(node, 'after', actionContext);
+  // Apply children
+  node.children.forEach(child => applyProperty(child, actionContext));
+}

app/imports/api/engine/actions/applyPropertyByType/shared/recalculateCalculation.js

@@ -5,7 +5,7 @@ import logErrors from './logErrors.js';
 export default function recalculateCalculation(calc, actionContext, context){
   if (!calc?.parseNode) return;
   calc._parseLevel = 'reduce';
-  applyEffectsToCalculationParseNode(calc, actionContext.log);
+  applyEffectsToCalculationParseNode(calc, actionContext);
   evaluateCalculation(calc, actionContext.scope, context);
-  logErrors(calc.errors, actionContext.log);
+  logErrors(calc.errors, actionContext);
 }

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

@@ -56,13 +56,13 @@ const doAction = new ValidatedMethod({
     properties.sort((a, b) => a.order - b.order);
 
     // Do the action
-    doActionWork({properties, ancestors, actionContext, methodScope: scope});
+    doActionWork({ properties, ancestors, actionContext, methodScope: scope });
 
     // Recompute all involved creatures
     Creatures.update({
       _id: { $in: [creatureId, ...targetIds] }
     }, {
-      $set: {dirty: true},
+      $set: { dirty: true },
     });
   },
 });
@@ -71,11 +71,11 @@ export default doAction;
 
 export function doActionWork({
   properties, ancestors, actionContext, methodScope = {},
-}){
+}) {
   // get the docs
   const ancestorScope = getAncestorScope(ancestors);
   const propertyForest = nodeArrayToTree(properties);
-  if (propertyForest.length !== 1){
+  if (propertyForest.length !== 1) {
     throw new Meteor.Error(`The action has ${propertyForest.length} top level properties, expected 1`);
   }
 
@@ -91,7 +91,7 @@ export function doActionWork({
 }
 
 // Assumes ancestors are in tree order already
-function getAncestorScope(ancestors){
+function getAncestorScope(ancestors) {
   let scope = {};
   ancestors.forEach(prop => {
     scope[`#${prop.type}`] = prop;

app/imports/api/engine/actions/doCastSpell.js

@@ -20,6 +20,10 @@ const doAction = new ValidatedMethod({
       regEx: SimpleSchema.RegEx.Id,
       optional: true,
     },
+    ritual: {
+      type: Boolean,
+      optional: true,
+    },
     targetIds: {
       type: Array,
       defaultValue: [],
@@ -41,7 +45,7 @@ const doAction = new ValidatedMethod({
     numRequests: 10,
     timeInterval: 5000,
   },
-  run({ spellId, slotId, targetIds = [], scope = {} }) {
+  run({ spellId, slotId, ritual, targetIds = [], scope = {} }) {
     // Get action context
     let spell = CreatureProperties.findOne(spellId);
     const creatureId = spell.ancestors[0].id;
@@ -64,25 +68,26 @@ const doAction = new ValidatedMethod({
     let slotLevel = spell.level || 0;
     let slot;
 
-    if (slotId && !spell.castWithoutSpellSlots){
+    // If a spell requires a slot, make sure a slot is spent
+    if (spell.level && !spell.castWithoutSpellSlots && !(ritual && spell.ritual)) {
       slot = CreatureProperties.findOne(slotId);
-      if (!slot){
+      if (!slot) {
         throw new Meteor.Error('No slot',
           'Slot not found to cast spell');
       }
-      if (!slot.value){
+      if (!slot.value) {
         throw new Meteor.Error('No slot',
           'Slot depleted');
       }
-      if (slot.attributeType !== 'spellSlot'){
+      if (slot.attributeType !== 'spellSlot') {
         throw new Meteor.Error('Not a slot',
           'The given property is not a valid spell slot');
       }
-      if (!slot.spellSlotLevel?.value){
+      if (!slot.spellSlotLevel?.value) {
         throw new Meteor.Error('No slot level',
           'Slot does not have a spell slot level');
       }
-      if (slot.spellSlotLevel.value < spell.level){
+      if (slot.spellSlotLevel.value < spell.level) {
         throw new Meteor.Error('Slot too small',
           'Slot is not large enough to cast spell');
       }
@@ -96,15 +101,21 @@ const doAction = new ValidatedMethod({
     }
 
     // Post the slot level spent to the log
-    if (slot?.spellSlotLevel?.value){
+    if (slot?.spellSlotLevel?.value) {
       actionContext.addLog({
         name: `Casting using a level ${slotLevel} spell slot`
       });
     } else if (slotLevel) {
+      if (ritual) {
+        actionContext.addLog({
+          name: `Ritual casting at level ${slotLevel}`
+        });
+      } else {
         actionContext.addLog({
           name: `Casting at level ${slotLevel}`
         });
       }
+    }
 
     actionContext.scope['slotLevel'] = slotLevel;
 

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

@@ -7,6 +7,7 @@ import rollDice from '/imports/parser/rollDice.js';
 import numberToSignedString from '/imports/ui/utility/numberToSignedString.js';
 import { applyTriggers } from '/imports/api/engine/actions/applyTriggers.js';
 import ActionContext from '/imports/api/engine/actions/ActionContext.js';
+import evaluateCalculation from '/imports/api/engine/computation/utility/evaluateCalculation.js';
 
 const doCheck = new ValidatedMethod({
   name: 'creatureProperties.doCheck',
@@ -22,7 +23,7 @@ const doCheck = new ValidatedMethod({
     numRequests: 10,
     timeInterval: 5000,
   },
-  run({propId, scope}) {
+  run({ propId, scope }) {
     const prop = CreatureProperties.findOne(propId);
     const creatureId = prop.ancestors[0].id;
     const actionContext = new ActionContext(creatureId, [creatureId], this);
@@ -32,13 +33,13 @@ const doCheck = new ValidatedMethod({
     assertEditPermission(actionContext.creature, this.userId);
 
     // Do the check
-    doCheckWork({prop, actionContext});
+    doCheckWork({ prop, actionContext });
   },
 });
 
 export default doCheck;
 
-export function doCheckWork({prop, actionContext}){
+export function doCheckWork({ prop, actionContext }) {
 
   applyTriggers(actionContext.triggers.check?.before, prop, actionContext);
   rollCheck(prop, actionContext);
@@ -53,17 +54,17 @@ function rollCheck(prop, actionContext) {
   // get the modifier for the roll
   let rollModifier;
   let logName = `${prop.name} check`;
-  if (prop.type === 'skill'){
+  if (prop.type === 'skill') {
     rollModifier = prop.value;
-    if (prop.skillType === 'save'){
+    if (prop.skillType === 'save') {
-      if (prop.name.match(/save/i)){
+      if (prop.name.match(/save/i)) {
         logName = prop.name;
       } else {
         logName = prop.name ? `${prop.name} save` : 'Saving Throw';
       }
     }
-  } else if (prop.type === 'attribute'){
+  } else if (prop.type === 'attribute') {
-    if (prop.attributeType === 'ability'){
+    if (prop.attributeType === 'ability') {
       rollModifier = prop.modifier;
     } else {
       rollModifier = prop.value;
@@ -72,10 +73,14 @@ function rollCheck(prop, actionContext) {
     throw (`${prop.type} not supported for checks`);
   }
 
-  const rollModifierText = numberToSignedString(rollModifier, true);
+  let rollModifierText = numberToSignedString(rollModifier, true);
+
+  const { effectBonus, effectString } = applyUnresolvedEffects(prop, scope)
+  rollModifierText += effectString;
+  rollModifier += effectBonus;
 
   let value, values, resultPrefix;
-  if (scope['$checkAdvantage'] === 1){
+  if (scope['$checkAdvantage'] === 1) {
     logName += ' (Advantage)';
     const [a, b] = rollDice(2, 20);
     if (a >= b) {
@@ -85,7 +90,7 @@ function rollCheck(prop, actionContext) {
       value = b;
       resultPrefix = `1d20 [ ~~${a}~~, ${b} ] ${rollModifierText} = `;
     }
-  } else if (scope['$checkAdvantage'] === -1){
+  } else if (scope['$checkAdvantage'] === -1) {
     logName += ' (Disadvantage)';
     const [a, b] = rollDice(2, 20);
     if (a <= b) {
@@ -101,8 +106,29 @@ function rollCheck(prop, actionContext) {
     resultPrefix = `1d20 [ ${value} ] ${rollModifierText} = `
   }
   const result = (value + rollModifier) || 0;
+  scope['$checkDiceRoll'] = value;
+  scope['$checkRoll'] = result;
+  scope['$checkModifier'] = rollModifier;
   actionContext.addLog({
     name: logName,
     value: `${resultPrefix} **${result}**`,
   });
 }
+
+function applyUnresolvedEffects(prop, scope) {
+  let effectBonus = 0;
+  let effectString = '';
+  if (!prop.effects) {
+    return { effectBonus, effectString };
+  }
+  prop.effects.forEach(effect => {
+    if (!effect.amount?.parseNode) return;
+    if (effect.operation !== 'add') return;
+    effect.amount._parseLevel = 'reduce';
+    evaluateCalculation(effect.amount, scope);
+    if (typeof effect.amount?.value !== 'number') return;
+    effectBonus += effect.amount.value;
+    effectString += ` ${effect.amount.value < 0 ? '-' : '+'} [${effect.amount.calculation}] ${Math.abs(effect.amount.value)}`
+  });
+  return { effectBonus, effectString };
+}

app/imports/api/engine/computation/CreatureComputation.ts

@@ -1,9 +1,24 @@
 import { EJSON } from 'meteor/ejson';
-import createGraph from 'ngraph.graph';
+import createGraph, { Graph } from 'ngraph.graph';
 import getEffectivePropTags from '/imports/api/engine/computation/utility/getEffectivePropTags.js';
 
+interface CreatureProperty {
+  _id: string;
+  type: string;
+}
+
 export default class CreatureComputation {
-  constructor(properties, creature, variables){
+  originalPropsById: object;
+  propsById: object;
+  propsWithTag: object;
+  scope: object;
+  props: Array<CreatureProperty>;
+  dependencyGraph: Graph;
+  errors: Array<object>;
+  creature: object;
+  variables: object;
+
+  constructor(properties: Array<CreatureProperty>, creature: object, variables: object) {
     // Set up fields
     this.originalPropsById = {};
     this.propsById = {};

app/imports/api/engine/computation/buildComputation/computeInactiveStatus.js

@@ -29,8 +29,8 @@ function childrenActive(prop){
   // Children of disabled properties are always inactive
   if (prop.disabled) return false;
   switch (prop.type){
-    // Only equipped items have active children
+    // Only equipped items with non-zero quantity have active children
-    case 'item': return !!prop.equipped;
+    case 'item': return !!prop.equipped && prop.quantity !== 0;
     // The children of actions, spells, and triggers are always inactive
     case 'action': return false;
     case 'spell': return false;

app/imports/api/engine/computation/buildComputation/computeToggleDependencies.js

@@ -10,8 +10,6 @@ export default function computeToggleDependencies(node, dependencyGraph){
     prop.enabled
   ) return;
   walkDown(node.children, child => {
-    // Only for children that aren't inactive
-    if (child.node.inactive) return;
     // The child nodes depend on the toggle condition compuation
     child.node._computationDetails.toggleAncestors.push(prop);
     dependencyGraph.addLink(child.node._id, prop._id, 'toggle');

app/imports/api/engine/computation/buildCreatureComputation.js

@@ -12,7 +12,7 @@ import computeToggleDependencies from './buildComputation/computeToggleDependenc
 import linkCalculationDependencies from './buildComputation/linkCalculationDependencies.js';
 import linkTypeDependencies from './buildComputation/linkTypeDependencies.js';
 import computeSlotQuantityFilled from './buildComputation/computeSlotQuantityFilled.js';
-import CreatureComputation from './CreatureComputation.js';
+import CreatureComputation from './CreatureComputation.ts';
 import removeSchemaFields from './buildComputation/removeSchemaFields.js';
 
 /**

app/imports/api/engine/computation/computeComputation/computeByType.js

@@ -5,6 +5,7 @@ import skill from './computeByType/computeSkill.js';
 import pointBuy from './computeByType/computePointBuy.js';
 import propertySlot from './computeByType/computeSlot.js';
 import container from './computeByType/computeContainer.js';
+import spellList from './computeByType/computeSpellList.js';
 import _calculation from './computeByType/computeCalculation.js';
 
 export default Object.freeze({
@@ -17,4 +18,5 @@ export default Object.freeze({
   pointBuy,
   propertySlot,
   spell: action,
+  spellList,
 });

app/imports/api/engine/computation/computeComputation/computeByType/computeSpellList.js

@@ -0,0 +1,6 @@
+export default function computeSpelllist(computation, node) {
+  const prop = node.data;
+
+  const ability = computation.scope[prop.ability];
+  prop.abilityMod = ability?.modifier || 0;
+}

app/imports/api/engine/computation/computeComputation/computeByType/computeVariable/aggregate/aggregateEffect.js

@@ -1,4 +1,6 @@
-export default function aggregateEffect({node, linkedNode, link}){
+import { pick } from 'lodash';
+
+export default function aggregateEffect({ node, linkedNode, link }) {
   if (link.data !== 'effect') return;
   // store the effect aggregator, its presence indicates that the variable is
   // targeted by effects
@@ -19,12 +21,24 @@ export default function aggregateEffect({node, linkedNode, link}){
 
   // Store a summary of the effect itself
   node.data.effects = node.data.effects || [];
+  // Store either just 
+  let effectAmount;
+  if (!linkedNode.data.amount) {
+    effectAmount = undefined;
+  } else if (typeof linkedNode.data.amount.value === 'string') {
+    effectAmount = pick(linkedNode.data.amount, [
+      'calculation', 'parseNode', 'parseError', 'value'
+    ]);
+  } else {
+    effectAmount = pick(linkedNode.data.amount, ['value']);
+  }
   node.data.effects.push({
     _id: linkedNode.data._id,
     name: linkedNode.data.name,
     operation: linkedNode.data.operation,
-    amount: linkedNode.data.amount && {value: linkedNode.data.amount.value},
+    amount: effectAmount,
     type: linkedNode.data.type,
+    text: linkedNode.data.text,
     // ancestors: linkedNode.data.ancestors,
   });
 
@@ -32,14 +46,13 @@ export default function aggregateEffect({node, linkedNode, link}){
   const aggregator = node.data.effectAggregator;
   // Get the result of the effect
   const result = linkedNode.data.amount?.value;
-  // Skip aggregating if the result is not resolved completely
+
-  if (typeof result === 'string') return;
   // Aggregate the effect based on its operation
-  switch(linkedNode.data.operation){
+  switch (linkedNode.data.operation) {
     case 'base':
       // Take the largest base value
-      if (Number.isFinite(result)){
+      if (Number.isFinite(result)) {
-        if(Number.isFinite(aggregator.base)){
+        if (Number.isFinite(aggregator.base)) {
           aggregator.base = Math.max(aggregator.base, result);
         } else {
           aggregator.base = result;

app/imports/api/engine/computation/computeComputation/computeToggles.js

@@ -4,7 +4,7 @@ export default function evaluateToggles(computation, node){
   let toggles = prop._computationDetails?.toggleAncestors;
   if (!toggles) return;
   toggles.forEach(toggle => {
-    if (prop.inactive || !toggle.condition) return;
+    if (!toggle.condition) return;
     if (!toggle.condition.value){
       prop.inactive = true;
       prop.deactivatedByToggle = true;

app/imports/api/engine/computation/utility/getEffectivePropTags.js

@@ -12,6 +12,7 @@ export default function getEffectivePropTags(prop) {
   if (prop.variableName) tags.push(prop.variableName);
   if (prop.damageType) tags.push(prop.damageType);
   if (prop.skillType) tags.push(prop.skillType);
+  if (prop.actionType) tags.push(prop.actionType);
   if (prop.attributeType) tags.push(prop.attributeType);
   if (prop.reset) tags.push(prop.reset);
   return tags;

app/imports/api/icons/Icons.js

@@ -57,11 +57,11 @@ Icons.attachSchema(iconsSchema);
 const writeIcons = new ValidatedMethod({
   name: 'icons.write',
   validate: null,
-	run(icons){
+  run(icons) {
     assertAdmin(this.userId);
-    if (Meteor.isServer){
+    if (Meteor.isServer) {
       this.unblock();
-      Icons.rawCollection().insert(icons, {ordered: false});
+      Icons.rawCollection().insert(icons, { ordered: false });
     }
   }
 });
@@ -80,11 +80,11 @@ const findIcons = new ValidatedMethod({
     numRequests: 20,
     timeInterval: 10000,
   },
-  run({search}){
+  run({ search }) {
     if (!search) return [];
     if (!Meteor.isServer) return;
     return Icons.find(
-      { $text: {$search: search} },
+      { $text: { $search: search } },
       {
         // relevant documents have a higher score.
         fields: {

app/imports/api/library/Libraries.js

@@ -49,7 +49,7 @@ const insertLibrary = new ValidatedMethod({
         'You need to be logged in to insert a library');
     }
     let tier = getUserTier(this.userId);
-    if (!tier.paidBenefits){
+    if (!tier.paidBenefits) {
       throw new Meteor.Error('Libraries.methods.insert.denied',
         `The ${tier.name} tier does not allow you to insert a library`);
     }
@@ -74,10 +74,10 @@ const updateLibraryName = new ValidatedMethod({
     numRequests: 5,
     timeInterval: 5000,
   },
-	run({_id, name}){
+  run({ _id, name }) {
     let library = Libraries.findOne(_id);
     assertEditPermission(library, this.userId);
-		Libraries.update(_id, {$set: {name}});
+    Libraries.update(_id, { $set: { name } });
   },
 });
 
@@ -97,10 +97,10 @@ const updateLibraryDescription = new ValidatedMethod({
     numRequests: 5,
     timeInterval: 5000,
   },
-	run({_id, description}){
+  run({ _id, description }) {
     let library = Libraries.findOne(_id);
     assertEditPermission(library, this.userId);
-		Libraries.update(_id, {$set: {description}});
+    Libraries.update(_id, { $set: { description } });
   },
 });
 
@@ -117,7 +117,7 @@ const removeLibrary = new ValidatedMethod({
     numRequests: 5,
     timeInterval: 5000,
   },
-	run({_id}){
+  run({ _id }) {
     let library = Libraries.findOne(_id);
     assertOwnership(library, this.userId);
     this.unblock();
@@ -125,9 +125,9 @@ const removeLibrary = new ValidatedMethod({
   }
 });
 
-export function removeLibaryWork(libraryId){
+export function removeLibaryWork(libraryId) {
   Libraries.remove(libraryId);
-  LibraryNodes.remove({'ancestors.id': libraryId});
+  LibraryNodes.remove({ 'ancestors.id': libraryId });
 }
 
 export { LibrarySchema, insertLibrary, updateLibraryName, updateLibraryDescription, removeLibrary };

app/imports/api/library/LibraryNodes.js

@@ -60,7 +60,7 @@ if (Meteor.isServer) {
   });
 }
 
-for (let key in propertySchemasIndex){
+for (let key in propertySchemasIndex) {
   let schema = new SimpleSchema({});
   schema.extend(LibraryNodeSchema);
   schema.extend(ColorSchema);
@@ -68,18 +68,18 @@ for (let key in propertySchemasIndex){
   schema.extend(ChildSchema);
   schema.extend(SoftRemovableSchema);
   LibraryNodes.attachSchema(schema, {
-		selector: {type: key}
+    selector: { type: key }
   });
 }
 
-function getLibrary(node){
+function getLibrary(node) {
   if (!node) throw new Meteor.Error('No node provided');
   let library = Libraries.findOne(node.ancestors[0].id);
   if (!library) throw new Meteor.Error('Library does not exist');
   return library;
 }
 
-function assertNodeEditPermission(node, userId){
+function assertNodeEditPermission(node, userId) {
   let lib = getLibrary(node);
   return assertEditPermission(lib, userId);
 }
@@ -96,7 +96,7 @@ const insertNode = new ValidatedMethod({
     delete libraryNode._id;
     assertNodeEditPermission(libraryNode, this.userId);
     let nodeId = LibraryNodes.insert(libraryNode);
-    if (libraryNode.type == 'reference'){
+    if (libraryNode.type == 'reference') {
       libraryNode._id = nodeId;
       updateReferenceNodeWork(libraryNode, this.userId);
     }
@@ -106,10 +106,10 @@ const insertNode = new ValidatedMethod({
 
 const updateLibraryNode = new ValidatedMethod({
   name: 'libraryNodes.update',
-  validate({_id, path}){
+  validate({ _id, path }) {
     if (!_id) return false;
     // We cannot change these fields with a simple update
-		switch (path[0]){
+    switch (path[0]) {
       case 'type':
       case 'order':
       case 'parent':
@@ -122,21 +122,21 @@ const updateLibraryNode = new ValidatedMethod({
     numRequests: 5,
     timeInterval: 5000,
   },
-  run({_id, path, value}) {
+  run({ _id, path, value }) {
     let node = LibraryNodes.findOne(_id);
     assertNodeEditPermission(node, this.userId);
     let pathString = path.join('.');
     let modifier;
     // unset empty values
-    if (value === null || value === undefined){
+    if (value === null || value === undefined) {
-      modifier = {$unset: {[pathString]: 1}};
+      modifier = { $unset: { [pathString]: 1 } };
     } else {
-      modifier = {$set: {[pathString]: value}};
+      modifier = { $set: { [pathString]: value } };
     }
     let numUpdated = LibraryNodes.update(_id, modifier, {
-			selector: {type: node.type},
+      selector: { type: node.type },
     });
-    if (node.type == 'reference'){
+    if (node.type == 'reference') {
       node = LibraryNodes.findOne(_id);
       updateReferenceNodeWork(node, this.userId);
     }
@@ -152,13 +152,13 @@ const pushToLibraryNode = new ValidatedMethod({
     numRequests: 5,
     timeInterval: 5000,
   },
-	run({_id, path, value}){
+  run({ _id, path, value }) {
     let node = LibraryNodes.findOne(_id);
     assertNodeEditPermission(node, this.userId);
     return LibraryNodes.update(_id, {
-			$push: {[path.join('.')]: value},
+      $push: { [path.join('.')]: value },
     }, {
-			selector: {type: node.type},
+      selector: { type: node.type },
     });
   }
 });
@@ -171,13 +171,13 @@ const pullFromLibraryNode = new ValidatedMethod({
     numRequests: 5,
     timeInterval: 5000,
   },
-	run({_id, path, itemId}){
+  run({ _id, path, itemId }) {
     let node = LibraryNodes.findOne(_id);
     assertNodeEditPermission(node, this.userId);
     return LibraryNodes.update(_id, {
-			$pull: {[path.join('.')]: {_id: itemId}},
+      $pull: { [path.join('.')]: { _id: itemId } },
     }, {
-			selector: {type: node.type},
+      selector: { type: node.type },
       getAutoValues: false,
     });
   }
@@ -193,10 +193,10 @@ const softRemoveLibraryNode = new ValidatedMethod({
     numRequests: 5,
     timeInterval: 5000,
   },
-	run({_id}){
+  run({ _id }) {
     let node = LibraryNodes.findOne(_id);
     assertNodeEditPermission(node, this.userId);
-		softRemove({_id, collection: LibraryNodes});
+    softRemove({ _id, collection: LibraryNodes });
   }
 });
 
@@ -210,12 +210,12 @@ const restoreLibraryNode = new ValidatedMethod({
     numRequests: 5,
     timeInterval: 5000,
   },
-	run({_id}){
+  run({ _id }) {
     // Permissions
     let node = LibraryNodes.findOne(_id);
     assertNodeEditPermission(node, this.userId);
     // Do work
-    restore({_id, collection: LibraryNodes});
+    restore({ _id, collection: LibraryNodes });
   }
 });
 

app/imports/api/library/methods/copyLibraryNodeTo.js

@@ -0,0 +1,97 @@
+import { ValidatedMethod } from 'meteor/mdg:validated-method';
+import SimpleSchema from 'simpl-schema';
+import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
+import { RefSchema } from '/imports/api/parenting/ChildSchema.js';
+import LibraryNodes from '/imports/api/library/LibraryNodes.js';
+import {
+  assertDocCopyPermission,
+  assertDocEditPermission
+} from '/imports/api/sharing/sharingPermissions.js';
+import {
+  setLineageOfDocs,
+  renewDocIds
+} from '/imports/api/parenting/parenting.js';
+import { reorderDocs } from '/imports/api/parenting/order.js';
+import fetchDocByRef from '/imports/api/parenting/fetchDocByRef.js';
+
+var snackbar;
+if (Meteor.isClient) {
+  snackbar = require(
+    '/imports/ui/components/snackbars/SnackbarQueue.js'
+  ).snackbar
+}
+
+const DUPLICATE_CHILDREN_LIMIT = 500;
+
+const copyLibraryNodeTo = new ValidatedMethod({
+  name: 'libraryNodes.copyTo',
+  validate: new SimpleSchema({
+    _id: {
+      type: String,
+      regEx: SimpleSchema.RegEx.Id,
+    },
+    parent: {
+      type: RefSchema,
+    },
+  }).validator(),
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 1,
+    timeInterval: 10000,
+  },
+  run({ _id, parent }) {
+    if (parent.collection !== 'libraryNodes' && parent.collection !== 'libraries') {
+      throw new Meteor.Error('Invalid destination',
+        'Library documents can only be copied to destinations inside other libraries'
+      );
+    }
+    const libraryNode = LibraryNodes.findOne(_id);
+    const parentDoc = fetchDocByRef(parent);
+    assertDocCopyPermission(libraryNode, this.userId);
+    assertDocEditPermission(parentDoc, this.userId);
+
+    let decendants = LibraryNodes.find({
+      'ancestors.id': _id,
+      removed: { $ne: true },
+    }, {
+      limit: DUPLICATE_CHILDREN_LIMIT + 1,
+      sort: { order: 1 },
+    }).fetch();
+
+    if (decendants.length > DUPLICATE_CHILDREN_LIMIT) {
+      decendants.pop();
+      if (Meteor.isClient) {
+        snackbar({
+          text: `Only the first ${DUPLICATE_CHILDREN_LIMIT} children were duplicated`,
+        });
+      }
+    }
+
+    const nodes = [libraryNode, ...decendants];
+
+    const newAncestry = parentDoc.ancestors || [];
+    newAncestry.push(parent);
+    // re-map all the ancestors
+    setLineageOfDocs({
+      docArray: nodes,
+      newAncestry,
+      oldParent: libraryNode.parent,
+    });
+
+    // Give the docs new IDs without breaking internal references
+    renewDocIds({ docArray: nodes });
+
+    // Order the root node
+    libraryNode.order = (parentDoc.order || 0) + 0.5;
+
+    LibraryNodes.batchInsert(nodes);
+
+    // Tree structure changed by inserts, reorder the tree
+    reorderDocs({
+      collection: LibraryNodes,
+      ancestorId: parent.collection === 'libraries' ? parent.id : parentDoc.ancestors[0].id,
+    });
+  },
+});
+
+export default copyLibraryNodeTo;

app/imports/api/library/methods/duplicateLibraryNode.js

@@ -10,13 +10,13 @@ import {
 import { reorderDocs } from '/imports/api/parenting/order.js';
 
 var snackbar;
-if (Meteor.isClient){
+if (Meteor.isClient) {
   snackbar = require(
     '/imports/ui/components/snackbars/SnackbarQueue.js'
   ).snackbar
 }
 
-const DUPLICATE_CHILDREN_LIMIT = 50;
+const DUPLICATE_CHILDREN_LIMIT = 500;
 
 const duplicateLibraryNode = new ValidatedMethod({
   name: 'libraryNodes.duplicate',
@@ -28,10 +28,10 @@ const duplicateLibraryNode = new ValidatedMethod({
   }).validator(),
   mixins: [RateLimiterMixin],
   rateLimit: {
-    numRequests: 5,
+    numRequests: 1,
     timeInterval: 5000,
   },
-  run({_id}) {
+  run({ _id }) {
     let libraryNode = LibraryNodes.findOne(_id);
     assertDocEditPermission(libraryNode, this.userId);
 
@@ -41,15 +41,15 @@ const duplicateLibraryNode = new ValidatedMethod({
 
     let nodes = LibraryNodes.find({
       'ancestors.id': _id,
-			removed: {$ne: true},
+      removed: { $ne: true },
     }, {
       limit: DUPLICATE_CHILDREN_LIMIT + 1,
-      sort: {order: 1},
+      sort: { order: 1 },
     }).fetch();
 
-    if (nodes.length > DUPLICATE_CHILDREN_LIMIT){
+    if (nodes.length > DUPLICATE_CHILDREN_LIMIT) {
       nodes.pop();
-      if (Meteor.isClient){
+      if (Meteor.isClient) {
         snackbar({
           text: `Only the first ${DUPLICATE_CHILDREN_LIMIT} children were duplicated`,
         });
@@ -59,15 +59,15 @@ const duplicateLibraryNode = new ValidatedMethod({
     // re-map all the ancestors
     setLineageOfDocs({
       docArray: nodes,
-			newAncestry : [
+      newAncestry: [
         ...libraryNode.ancestors,
-        {id: libraryNodeId, collection: 'libraryNodes'}
+        { id: libraryNodeId, collection: 'libraryNodes' }
       ],
-			oldParent : {id: _id, collection: 'libraryNodes'},
+      oldParent: { id: _id, collection: 'libraryNodes' },
     });
 
     // Give the docs new IDs without breaking internal references
-    renewDocIds({docArray: nodes});
+    renewDocIds({ docArray: nodes });
 
     // Order the root node
     libraryNode.order += 0.5;

app/imports/api/library/methods/index.js

@@ -1,2 +1,3 @@
+import '/imports/api/library/methods/copyLibraryNodeTo.js';
 import '/imports/api/library/methods/duplicateLibraryNode.js';
 import '/imports/api/library/methods/updateReferenceNode.js';

app/imports/api/parenting/SoftRemovableSchema.js

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

app/imports/api/properties/Actions.js

@@ -2,6 +2,7 @@ import SimpleSchema from 'simpl-schema';
 import createPropertySchema from '/imports/api/properties/subSchemas/createPropertySchema.js';
 import { storedIconsSchema } from '/imports/api/icons/Icons.js';
 import STORAGE_LIMITS from '/imports/constants/STORAGE_LIMITS.js';
+import VARIABLE_NAME_REGEX from '/imports/constants/VARIABLE_NAME_REGEX.js';
 
 /*
  * Actions are things a character can do
@@ -24,9 +25,17 @@ let ActionSchema = createPropertySchema({
   // long actions take longer than 1 round to cast
   actionType: {
     type: String,
-    allowedValues: ['action', 'bonus', 'attack', 'reaction', 'free', 'long'],
+    allowedValues: ['action', 'bonus', 'attack', 'reaction', 'free', 'long', 'event'],
     defaultValue: 'action',
   },
+  // If the action type is an event, what is the variable name of that event?
+  variableName: {
+    type: String,
+    optional: true,
+    regEx: VARIABLE_NAME_REGEX,
+    min: 2,
+    max: STORAGE_LIMITS.variableName,
+  },
   // Who is the action directed at
   target: {
     type: String,
@@ -56,8 +65,10 @@ let ActionSchema = createPropertySchema({
   // How this action's uses are reset automatically
   reset: {
     type: String,
-    allowedValues: ['longRest', 'shortRest'],
     optional: true,
+    regEx: VARIABLE_NAME_REGEX,
+    min: 2,
+    max: STORAGE_LIMITS.variableName,
   },
   // Resources
   resources: {
@@ -74,7 +85,7 @@ let ActionSchema = createPropertySchema({
   'resources.itemsConsumed.$._id': {
     type: String,
     regEx: SimpleSchema.RegEx.Id,
-    autoValue(){
+    autoValue() {
       if (!this.isSet) return Random.id();
     }
   },
@@ -101,7 +112,7 @@ let ActionSchema = createPropertySchema({
   'resources.attributesConsumed.$._id': {
     type: String,
     regEx: SimpleSchema.RegEx.Id,
-    autoValue(){
+    autoValue() {
       if (!this.isSet) return Random.id();
     }
   },
@@ -218,4 +229,4 @@ const ComputedActionSchema = new SimpleSchema()
   .extend(ActionSchema)
   .extend(ComputedOnlyActionSchema);
 
-export { ActionSchema, ComputedOnlyActionSchema, ComputedActionSchema};
+export { ActionSchema, ComputedOnlyActionSchema, ComputedActionSchema };

app/imports/api/properties/Attributes.js

@@ -28,8 +28,7 @@ let AttributeSchema = createPropertySchema({
       'stat', // Speed, Armor Class
       'modifier', // Proficiency Bonus, displayed as +x
       'hitDice', // d12 hit dice
-      'healthBar', // Hitpoints, Temporary Hitpoints, can take damage
+      'healthBar', // Hitpoints, Temporary Hitpoints
-			'bar', // Displayed as a health bar, can't take damage
       'resource', // Rages, sorcery points
       'spellSlot', // Level 1, 2, 3... spell slots
       'utility', // Aren't displayed, Jump height, Carry capacity
@@ -69,6 +68,16 @@ let AttributeSchema = createPropertySchema({
     type: Boolean,
     optional: true,
   },
+  // Control how the health bar handles overflow
+  healthBarNoDamageOverflow: {
+    type: Boolean,
+    optional: true,
+  },
+  healthBarNoHealingOverflow: {
+    type: Boolean,
+    optional: true,
+  },
+  // Control when the health bar takes damage or healing
   healthBarDamageOrder: {
     type: SimpleSchema.Integer,
     optional: true,
@@ -107,11 +116,21 @@ let AttributeSchema = createPropertySchema({
     type: Boolean,
     optional: true,
   },
+  hideWhenTotalZero: {
+    type: Boolean,
+    optional: true,
+  },
+  hideWhenValueZero: {
+    type: Boolean,
+    optional: true,
+  },
   // Automatically zero the adjustment on these conditions
   reset: {
     type: String,
     optional: true,
-    allowedValues: ['shortRest', 'longRest'],
+    regEx: VARIABLE_NAME_REGEX,
+    min: 2,
+    max: STORAGE_LIMITS.variableName,
   },
 });
 

app/imports/api/properties/BuffRemovers.js

@@ -50,7 +50,7 @@ let BuffRemoverSchema = createPropertySchema({
   'extraTags.$._id': {
     type: String,
     regEx: SimpleSchema.RegEx.Id,
-    autoValue(){
+    autoValue() {
       if (!this.isSet) return Random.id();
     }
   },

app/imports/api/properties/Constants.js

@@ -35,7 +35,7 @@ let ConstantSchema = new SimpleSchema({
   errors: {
     type: Array,
     maxCount: STORAGE_LIMITS.errorCount,
-    autoValue(){
+    autoValue() {
       let calc = this.field('calculation');
       if (!calc.isSet && this.isModifier) {
         this.unset()
@@ -44,27 +44,27 @@ let ConstantSchema = new SimpleSchema({
       let string = calc.value;
       if (!string) return [];
       // Evaluate the calculation with no scope
-      let {result, context} = parseString(string);
+      let { result, context } = parseString(string);
       // Any existing errors will result in an early failure
       if (context && context.errors.length) return context.errors;
       // Ban variables in constants if necessary
       result && traverse(result, node => {
-        if (node.parseType === 'symbol' || node.parseType === 'accessor'){
+        if (node.parseType === 'symbol' || node.parseType === 'accessor') {
           context.error('Variables can\'t be used to define a constant');
         }
       });
       return context && context.errors || [];
     }
   },
-  'errors.$':{
+  'errors.$': {
     type: ErrorSchema,
   },
 });
 
-function parseString(string, fn = 'compile'){
+function parseString(string, fn = 'compile') {
   let context = new Context();
-  if (!string){
+  if (!string) {
-    return {result: string, context};
+    return { result: string, context };
   }
 
   // Parse the string using mathjs
@@ -74,11 +74,11 @@ function parseString(string, fn = 'compile'){
   } catch (e) {
     let message = prettifyParseError(e);
     context.error(message);
-    return {context};
+    return { context };
   }
-  if (!node) return {context};
+  if (!node) return { context };
-  let {result} = resolve(fn, node, {/*empty scope*/}, context);
+  let { result } = resolve(fn, node, {/*empty scope*/ }, context);
-  return {result, context}
+  return { result, context }
 }
 
 const ComputedOnlyConstantSchema = new SimpleSchema({});

app/imports/api/properties/Containers.js

@@ -40,24 +40,24 @@ const ComputedOnlyContainerSchema = createPropertySchema({
     optional: true,
   },
   // Weight of all the contents, zero if `contentsWeightless` is true
-  contentsWeight:{
+  contentsWeight: {
     type: Number,
     optional: true,
     removeBeforeCompute: true,
   },
   // Weight of all the carried contents (some sub-containers might not be carried)
   // zero if `contentsWeightless` is true
-  carriedWeight:{
+  carriedWeight: {
     type: Number,
     optional: true,
     removeBeforeCompute: true,
   },
-  contentsValue:{
+  contentsValue: {
     type: Number,
     optional: true,
     removeBeforeCompute: true,
   },
-  carriedValue:{
+  carriedValue: {
     type: Number,
     optional: true,
     removeBeforeCompute: true,

app/imports/api/properties/Folders.js

@@ -7,6 +7,11 @@ let FolderSchema = new createPropertySchema({
   name: {
     type: String,
     max: STORAGE_LIMITS.name,
+    optional: true,
+  },
+  groupStats: {
+    type: Boolean,
+    optional: true,
   },
 });
 

app/imports/api/properties/SpellLists.js

@@ -17,6 +17,12 @@ let SpellListSchema = createPropertySchema({
     type: 'fieldToCompute',
     optional: true,
   },
+  // The variable name of the ability this spell relies on
+  ability: {
+    type: String,
+    optional: true,
+    max: STORAGE_LIMITS.variableName,
+  },
   // Calculation of The attack roll bonus used by spell attacks in this list
   attackRollBonus: {
     type: 'fieldToCompute',
@@ -38,6 +44,12 @@ const ComputedOnlySpellListSchema = createPropertySchema({
     type: 'computedOnlyField',
     optional: true,
   },
+  // Computed value determined by the ability
+  abilityMod: {
+    type: SimpleSchema.Integer,
+    optional: true,
+    removeBeforeCompute: true,
+  },
   attackRollBonus: {
     type: 'computedOnlyField',
     optional: true,

app/imports/api/properties/Spells.js

@@ -14,8 +14,8 @@ const magicSchools = [
 ];
 
 let SpellSchema = new SimpleSchema({})
-.extend(ActionSchema)
+  .extend(ActionSchema)
-.extend({
+  .extend({
     name: {
       type: String,
       optional: true,
@@ -89,7 +89,7 @@ let SpellSchema = new SimpleSchema({})
       defaultValue: 'abjuration',
       allowedValues: magicSchools,
     },
-});
+  });
 
 const ComputedOnlySpellSchema = new SimpleSchema()
   .extend(ComputedOnlyActionSchema);

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

@@ -5,7 +5,7 @@ const AdjustmentSchema = new SimpleSchema({
   _id: {
     type: String,
     regEx: SimpleSchema.RegEx.Id,
-    autoValue(){
+    autoValue() {
       if (!this.isSet) return Random.id();
     }
   },

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

@@ -1,11 +1,11 @@
 import SimpleSchema from 'simpl-schema';
 import ResultsSchema from '/imports/api/properties/subSchemas/ResultsSchema.js';
 
-let RollResultsSchema = new SimpleSchema ({
+let RollResultsSchema = new SimpleSchema({
   _id: {
     type: String,
     regEx: SimpleSchema.RegEx.Id,
-    autoValue(){
+    autoValue() {
       if (!this.isSet) return Random.id();
     }
   },
@@ -22,4 +22,4 @@ let RollResultsSchema = new SimpleSchema ({
   },
 });
 
-export default RollResultsSchema ;
+export default RollResultsSchema;

app/imports/api/sharing/SharingSchema.js

@@ -33,6 +33,10 @@ let SharingSchema = new SimpleSchema({
     defaultValue: false,
     index: 1,
   },
+  readersCanCopy: {
+    type: Boolean,
+    optional: true,
+  },
 });
 
 export default SharingSchema;

app/imports/api/sharing/sharing.js

@@ -18,11 +18,31 @@ const setPublic = new ValidatedMethod({
     numRequests: 5,
     timeInterval: 5000,
   },
-  run({docRef, isPublic}){
+  run({ docRef, isPublic }) {
     let doc = fetchDocByRef(docRef);
     assertOwnership(doc, this.userId);
     return getCollectionByName(docRef.collection).update(docRef.id, {
-      $set: {public: isPublic},
+      $set: { public: isPublic },
+    });
+  },
+});
+
+const setReadersCanCopy = new ValidatedMethod({
+  name: 'sharing.setReadersCanCopy',
+  validate: new SimpleSchema({
+    docRef: RefSchema,
+    readersCanCopy: { type: Boolean },
+  }).validator(),
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 5,
+    timeInterval: 5000,
+  },
+  run({ docRef, readersCanCopy }) {
+    let doc = fetchDocByRef(docRef);
+    assertOwnership(doc, this.userId);
+    return getCollectionByName(docRef.collection).update(docRef.id, {
+      $set: { readersCanCopy },
     });
   },
 });
@@ -45,28 +65,28 @@ const updateUserSharePermissions = new ValidatedMethod({
     numRequests: 5,
     timeInterval: 5000,
   },
-  run({docRef, userId, role}){
+  run({ docRef, userId, role }) {
     let doc = fetchDocByRef(docRef);
-    if (role === 'none'){
+    if (role === 'none') {
       // only assert ownership if you aren't removing yourself
-      if (this.userId !== userId){
+      if (this.userId !== userId) {
         assertOwnership(doc, this.userId);
       }
       return getCollectionByName(docRef.collection).update(docRef.id, {
         $pullAll: { readers: userId, writers: userId },
       });
     }
-    if (doc.owner === userId){
+    if (doc.owner === userId) {
       throw new Meteor.Error('Sharing update failed',
         'User is already the owner of this document');
     }
     assertOwnership(doc, this.userId);
-    if (role === 'reader'){
+    if (role === 'reader') {
       return getCollectionByName(docRef.collection).update(docRef.id, {
         $addToSet: { readers: userId },
         $pullAll: { writers: userId },
       });
-    } else if (role === 'writer'){
+    } else if (role === 'writer') {
       return getCollectionByName(docRef.collection).update(docRef.id, {
         $addToSet: { writers: userId },
         $pullAll: { readers: userId },
@@ -89,29 +109,29 @@ const transferOwnership = new ValidatedMethod({
     numRequests: 5,
     timeInterval: 5000,
   },
-  run({docRef, userId}){
+  run({ docRef, userId }) {
     let doc = fetchDocByRef(docRef);
     assertOwnership(doc, this.userId);
 
     let collection = getCollectionByName(docRef.collection);
 
     let tier = getUserTier(userId);
-    if (docRef.collection === 'creatures'){
+    if (docRef.collection === 'creatures') {
       let currentCharacterCount = collection.find({
         owner: userId,
       }, {
-        fields: {_id: 1},
+        fields: { _id: 1 },
       }).count();
 
       if (
         tier.characterSlots !== -1 &&
         currentCharacterCount >= tier.characterSlots
-      ){
+      ) {
         throw new Meteor.Error('Sharing.methods.transferOwnership.denied',
           'The new owner is already at their character limit')
       }
-    } else if (docRef.collection === 'libraries'){
+    } else if (docRef.collection === 'libraries') {
-      if (!tier.paidBenefits){
+      if (!tier.paidBenefits) {
         throw new Meteor.Error('Sharing.methods.transferOwnership.denied',
           'The new owner\'s Patreon tier does not have access to library ownership');
       }
@@ -123,10 +143,10 @@ const transferOwnership = new ValidatedMethod({
     });
     // Then make the user the owner and the current owner a writer
     return collection.update(docRef.id, {
-      $set: {owner: userId},
+      $set: { owner: userId },
       $addToSet: { writers: this.userId },
     });
   },
 });
 
-export { setPublic, updateUserSharePermissions, transferOwnership };
+export { setPublic, setReadersCanCopy, updateUserSharePermissions, transferOwnership };

app/imports/api/sharing/sharingPermissions.js

@@ -1,24 +1,25 @@
 import { _ } from 'meteor/underscore';
 import fetchDocByRef from '/imports/api/parenting/fetchDocByRef.js';
 
-function assertIdValid(userId){
+function assertIdValid(userId) {
-  if (!userId || typeof userId !== 'string'){
+  if (!userId || typeof userId !== 'string') {
     throw new Meteor.Error('Permission denied',
       'No user ID. Are you logged in?');
   }
 }
 
-function assertdocExists(doc){
+function assertdocExists(doc) {
-  if (!doc){
+  if (!doc) {
     throw new Meteor.Error('Permission denied',
       'Permission denied: No such document exists');
   }
 }
 
-export function assertOwnership(doc, userId){
+export function assertOwnership(doc, userId) {
   assertIdValid(userId);
   assertdocExists(doc);
-  if (doc.owner === userId ){
+
+  if (doc.owner === userId) {
     return true;
   } else {
     throw new Meteor.Error('Permission denied',
@@ -37,13 +38,12 @@ export function assertEditPermission(doc, userId) {
   assertdocExists(doc);
   const user = Meteor.users.findOne(userId, {
     fields: {
-      'services.patreon': 1,
       'roles': 1,
     }
   });
 
   // Admin override
-  if (user.roles && user.roles.includes('admin')){
+  if (user.roles && user.roles.includes('admin')) {
     return true;
   }
 
@@ -51,7 +51,7 @@ export function assertEditPermission(doc, userId) {
   if (
     doc.owner === userId ||
     _.contains(doc.writers, userId)
-  ){
+  ) {
     return true;
   } else {
     throw new Meteor.Error('Edit permission denied',
@@ -59,9 +59,46 @@ export function assertEditPermission(doc, userId) {
   }
 }
 
-function getRoot(doc){
+/**
+ * Assert that the user can edit the root document which manages its own sharing
+ * permissions.
+ *
+ * Warning: the doc and userId must be set by a trusted source
+ */
+export function assertCopyPermission(doc, userId) {
+  assertIdValid(userId);
   assertdocExists(doc);
-  if (doc.ancestors && doc.ancestors.length && doc.ancestors[0]){
+  const user = Meteor.users.findOne(userId, {
+    fields: {
+      'roles': 1,
+    }
+  });
+
+  // Admin override
+  if (user.roles && user.roles.includes('admin')) {
+    return true;
+  }
+
+  // Ensure the user is authorized for this specific document
+  if (
+    doc.owner === userId ||
+    _.contains(doc.writers, userId)
+  ) {
+    return true;
+  } else if (
+    (_.contains(doc.readers, userId) || doc.public) &&
+    doc.readersCanCopy
+  ) {
+    return true;
+  } else {
+    throw new Meteor.Error('Copy permission denied',
+      'You do not have permission to copy this document');
+  }
+}
+
+function getRoot(doc) {
+  assertdocExists(doc);
+  if (doc.ancestors && doc.ancestors.length && doc.ancestors[0]) {
     return fetchDocByRef(doc.ancestors[0]);
   } else {
     return doc;
@@ -74,11 +111,22 @@ function getRoot(doc){
  *
  * Warning: the doc and userId must be set by a trusted source
  */
-export function assertDocEditPermission(doc, userId){
+export function assertDocEditPermission(doc, userId) {
   let root = getRoot(doc);
   assertEditPermission(root, userId);
 }
 
+/**
+ * Assert that the user can copy a descendant document whose root ancestor
+ * implements sharing permissions.
+ *
+ * Warning: the doc and userId must be set by a trusted source
+ */
+export function assertDocCopyPermission(doc, userId) {
+  let root = getRoot(doc);
+  assertCopyPermission(root, userId);
+}
+
 export function assertViewPermission(doc, userId) {
   assertdocExists(doc);
   if (doc.public) return true;
@@ -88,7 +136,7 @@ export function assertViewPermission(doc, userId) {
     doc.owner === userId ||
     _.contains(doc.readers, userId) ||
     _.contains(doc.writers, userId)
-  ){
+  ) {
     return true;
   } else {
 
@@ -98,7 +146,7 @@ export function assertViewPermission(doc, userId) {
         'roles': 1,
       }
     });
-    if (user.roles && user.roles.includes('admin')){
+    if (user.roles && user.roles.includes('admin')) {
       return true;
     }
 
@@ -113,20 +161,20 @@ export function assertViewPermission(doc, userId) {
  *
  * Warning: the doc and userId must be set by a trusted source
  */
-export function assertDocViewPermission(doc, userId){
+export function assertDocViewPermission(doc, userId) {
   let root = getRoot(doc);
   assertViewPermission(root, userId);
 }
 
-export function assertAdmin(userId){
+export function assertAdmin(userId) {
   assertIdValid(userId);
-  let user = Meteor.users.findOne(userId, {fields: {roles: 1}});
+  let user = Meteor.users.findOne(userId, { fields: { roles: 1 } });
-  if (!user){
+  if (!user) {
     throw new Meteor.Error('Permission denied',
       'UserId does not match any existing user');
   }
   let isAdmin = user.roles && user.roles.includes('admin')
-  if (!isAdmin){
+  if (!isAdmin) {
     throw new Meteor.Error('Permission denied',
       'User does not have the admin role');
   }

app/imports/api/tabletop/Messages.js

@@ -51,7 +51,7 @@ const sendMessage = new ValidatedMethod({
     timeInterval: 5000,
   },
 
-  run({content, tabletopId}) {
+  run({ content, tabletopId }) {
     let user = Meteor.user();
     if (!user) {
       throw new Meteor.Error('messages.send.denied',
@@ -87,14 +87,14 @@ const removeMessages = new ValidatedMethod({
     timeInterval: 5000,
   },
 
-  run({messageId, tabletopId}) {
+  run({ messageId, tabletopId }) {
     if (!this.userId) {
       throw new Meteor.Error('messages.remove.denied',
         'You need to be logged in to remove a tabletop');
     }
     let message = Messages.findOne(messageId);
     let tabletop = Tabletops.findOne(message.tabletopId);
-    if (this.userId !== message.userId && this.userId !== tabletop.gameMaster){
+    if (this.userId !== message.userId && this.userId !== tabletop.gameMaster) {
       throw new Meteor.Error('messages.remove.denied',
         'You don\'t have permission to remove this message');
     }
@@ -104,7 +104,7 @@ const removeMessages = new ValidatedMethod({
     Creatures.update({
       tabletop: tabletopId,
     }, {
-      $unset: {tabletop: 1},
+      $unset: { tabletop: 1 },
     });
     return removed;
   },

app/imports/api/tabletop/methods/removeTabletop.js

@@ -24,7 +24,7 @@ const removeTabletop = new ValidatedMethod({
     timeInterval: 5000,
   },
 
-  run({tabletopId}) {
+  run({ tabletopId }) {
     if (!this.userId) {
       throw new Meteor.Error('tabletops.remove.denied',
         'You need to be logged in to remove a tabletop');
@@ -39,7 +39,7 @@ const removeTabletop = new ValidatedMethod({
     Creatures.update({
       tabletop: tabletopId,
     }, {
-      $unset: {tabletop: 1},
+      $unset: { tabletop: 1 },
     });
     return removed;
   },

app/imports/api/users/Users.js

@@ -129,13 +129,13 @@ Meteor.users.generateApiKey = new ValidatedMethod({
     numRequests: 5,
     timeInterval: 5000,
   },
-  run(){
+  run() {
-		if(Meteor.isClient) return;
+    if (Meteor.isClient) return;
     var user = Meteor.users.findOne(this.userId);
     if (!user) return;
     if (user && user.apiKey) return;
     var apiKey = Random.id(30);
-		Meteor.users.update(this.userId, {$set: {apiKey}});
+    Meteor.users.update(this.userId, { $set: { apiKey } });
   },
 });
 
@@ -149,16 +149,16 @@ Meteor.users.setDarkMode = new ValidatedMethod({
     numRequests: 5,
     timeInterval: 5000,
   },
-  run({darkMode}){
+  run({ darkMode }) {
     if (!this.userId) return;
-		Meteor.users.update(this.userId, {$set: {darkMode}});
+    Meteor.users.update(this.userId, { $set: { darkMode } });
   },
 });
 
 Meteor.users.sendVerificationEmail = new ValidatedMethod({
   name: 'users.sendVerificationEmail',
   validate: new SimpleSchema({
-		userId:{
+    userId: {
       type: String,
       optional: true,
     },
@@ -171,7 +171,7 @@ Meteor.users.sendVerificationEmail = new ValidatedMethod({
     numRequests: 5,
     timeInterval: 5000,
   },
-	run({userId, address}){
+  run({ userId, address }) {
     userId = this.userId || userId;
     let user = Meteor.users.findOne(userId);
     if (!user) {
@@ -194,11 +194,11 @@ Meteor.users.canPickUsername = new ValidatedMethod({
     numRequests: 5,
     timeInterval: 5000,
   },
-	run({username}){
+  run({ username }) {
     if (Meteor.isClient) return;
     let user = Accounts.findUserByUsername(username);
     // You can pick your own username
-    if (user && user._id === this.userId){
+    if (user && user._id === this.userId) {
       return false;
     }
     return !!user;
@@ -213,7 +213,7 @@ Meteor.users.setUsername = new ValidatedMethod({
     numRequests: 5,
     timeInterval: 5000,
   },
-	run({username}){
+  run({ username }) {
     if (!this.userId) throw 'Can only set your username if logged in';
     if (Meteor.isClient) return;
     return Accounts.setUsername(this.userId, username)
@@ -223,7 +223,7 @@ Meteor.users.setUsername = new ValidatedMethod({
 Meteor.users.setPreference = new ValidatedMethod({
   name: 'users.setPreference',
   validate: new SimpleSchema({
-    preference:{
+    preference: {
       type: String,
     },
     value: {
@@ -235,16 +235,16 @@ Meteor.users.setPreference = new ValidatedMethod({
     numRequests: 5,
     timeInterval: 5000,
   },
-	run({preference, value}){
+  run({ preference, value }) {
     if (!this.userId) throw 'You can only set preferences once logged in';
     let prefPath = `preferences.${preference}`
-    if (value == true){
+    if (value == true) {
       return Meteor.users.update(this.userId, {
-        $set: {[prefPath]: true},
+        $set: { [prefPath]: true },
       });
     } else {
       return Meteor.users.update(this.userId, {
-        $unset: {[prefPath]: 1},
+        $unset: { [prefPath]: 1 },
       });
     }
   },
@@ -253,7 +253,7 @@ Meteor.users.setPreference = new ValidatedMethod({
 Meteor.users.subscribeToLibrary = new ValidatedMethod({
   name: 'users.subscribeToLibrary',
   validate: new SimpleSchema({
-		libraryId:{
+    libraryId: {
       type: String,
       regEx: SimpleSchema.RegEx.Id,
     },
@@ -266,15 +266,15 @@ Meteor.users.subscribeToLibrary = new ValidatedMethod({
     numRequests: 5,
     timeInterval: 5000,
   },
-	run({libraryId, subscribe}){
+  run({ libraryId, subscribe }) {
     if (!this.userId) throw 'Can only subscribe if logged in';
-    if (subscribe){
+    if (subscribe) {
       return Meteor.users.update(this.userId, {
-        $addToSet: {subscribedLibraries: libraryId},
+        $addToSet: { subscribedLibraries: libraryId },
       });
     } else {
       return Meteor.users.update(this.userId, {
-        $pullAll: {subscribedLibraries: libraryId},
+        $pullAll: { subscribedLibraries: libraryId },
       });
     }
   }
@@ -283,7 +283,7 @@ Meteor.users.subscribeToLibrary = new ValidatedMethod({
 Meteor.users.subscribeToLibraryCollection = new ValidatedMethod({
   name: 'users.subscribeToLibraryCollection',
   validate: new SimpleSchema({
-		libraryCollectionId:{
+    libraryCollectionId: {
       type: String,
       regEx: SimpleSchema.RegEx.Id,
     },
@@ -296,15 +296,15 @@ Meteor.users.subscribeToLibraryCollection = new ValidatedMethod({
     numRequests: 5,
     timeInterval: 5000,
   },
-	run({libraryCollectionId, subscribe}){
+  run({ libraryCollectionId, subscribe }) {
     if (!this.userId) throw 'Can only subscribe if logged in';
-    if (subscribe){
+    if (subscribe) {
       return Meteor.users.update(this.userId, {
-        $addToSet: {subscribedLibraryCollections: libraryCollectionId},
+        $addToSet: { subscribedLibraryCollections: libraryCollectionId },
       });
     } else {
       return Meteor.users.update(this.userId, {
-        $pullAll: {subscribedLibraryCollections: libraryCollectionId},
+        $pullAll: { subscribedLibraryCollections: libraryCollectionId },
       });
     }
   }
@@ -313,7 +313,7 @@ Meteor.users.subscribeToLibraryCollection = new ValidatedMethod({
 Meteor.users.findUserByUsernameOrEmail = new ValidatedMethod({
   name: 'users.findUserByUsernameOrEmail',
   validate: new SimpleSchema({
-		usernameOrEmail:{
+    usernameOrEmail: {
       type: String,
     },
   }).validator(),
@@ -322,7 +322,7 @@ Meteor.users.findUserByUsernameOrEmail = new ValidatedMethod({
     numRequests: 5,
     timeInterval: 5000,
   },
-	run({usernameOrEmail}){
+  run({ usernameOrEmail }) {
     if (Meteor.isClient) return;
     let user = Accounts.findUserByUsername(usernameOrEmail) ||
       Accounts.findUserByEmail(usernameOrEmail);

app/imports/api/users/methods/addEmail.js

@@ -15,16 +15,16 @@ const addEmail = new ValidatedMethod({
     numRequests: 1,
     timeInterval: 5000,
   },
-	run({email}){
+  run({ email }) {
     const userId = Meteor.userId();
     const user = Meteor.users.findOne(userId);
     if (!user) throw new Meteor.Error('No user',
       'You must be logged in to add an email address');
-    if (user.emails && user.emails.length >= 2){
+    if (user.emails && user.emails.length >= 2) {
       throw new Meteor.Error('Emails full',
         'You may only have up to 2 email addresses per account');
     }
-    if (Meteor.isServer){
+    if (Meteor.isServer) {
       Accounts.addEmail(userId, email);
       Accounts.sendVerificationEmail(userId, email);
     }

app/imports/api/users/methods/deleteMyAccount.js

@@ -1,8 +1,8 @@
 import { ValidatedMethod } from 'meteor/mdg:validated-method';
 import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
-import Libraries, {removeLibaryWork} from '/imports/api/library/Libraries.js';
+import Libraries, { removeLibaryWork } from '/imports/api/library/Libraries.js';
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
-import {removeCreatureWork} from '/imports/api/creature/creatures/methods/removeCreature.js';
+import { removeCreatureWork } from '/imports/api/creature/creatures/methods/removeCreature.js';
 
 Meteor.users.deleteMyAccount = new ValidatedMethod({
   name: 'users.deleteMyAccount',
@@ -12,20 +12,20 @@ Meteor.users.deleteMyAccount = new ValidatedMethod({
     numRequests: 1,
     timeInterval: 5000,
   },
-	run(){
+  run() {
     let userId = Meteor.userId();
     if (!userId) throw new Meteor.Error('No user',
       'You must be logged in to delete your account');
 
     // Delete all creatures
-    let creatures = Creatures.find({owner: userId}, {fields: {_id: 1}}).fetch();
+    let creatures = Creatures.find({ owner: userId }, { fields: { _id: 1 } }).fetch();
     creatures.forEach(creature => removeCreatureWork(creature._id));
 
     // Remove permissions from all creatures
     Creatures.update({
       $or: [
-        {writers: userId},
+        { writers: userId },
-        {readers: userId},
+        { readers: userId },
       ],
     }, {
       $pull: {
@@ -37,14 +37,14 @@ Meteor.users.deleteMyAccount = new ValidatedMethod({
     });
 
     // Delete all libraries
-    let libraries = Libraries.find({owner: userId}, {fields: {_id: 1}}).fetch();
+    let libraries = Libraries.find({ owner: userId }, { fields: { _id: 1 } }).fetch();
     libraries.forEach(library => removeLibaryWork(library._id));
 
     // Remove permissions from all creatures
     Libraries.update({
       $or: [
-        {writers: userId},
+        { writers: userId },
-        {readers: userId},
+        { readers: userId },
       ],
     }, {
       $pull: {

app/imports/api/users/methods/removeEmail.js

@@ -15,20 +15,20 @@ const removeEmail = new ValidatedMethod({
     numRequests: 1,
     timeInterval: 5000,
   },
-	run({email}){
+  run({ email }) {
     const userId = Meteor.userId();
     const user = Meteor.users.findOne(userId);
     if (!user) throw new Meteor.Error('No user',
       'You must be logged in to remove an email address');
-    if (!user.emails){
+    if (!user.emails) {
       throw new Meteor.Error('No email to remove',
         'No email addresses are associated with this account');
     }
-    if (user.emails.length == 1){
+    if (user.emails.length == 1) {
       throw new Meteor.Error('Can\'t remove last email',
         'You may not remove the last email address from your account');
     }
-    if (Meteor.isServer){
+    if (Meteor.isServer) {
       Accounts.removeEmail(userId, email);
     }
   }

app/imports/constants/MAINTENANCE_MODE.js

@@ -1,14 +1,22 @@
 import { Migrations } from 'meteor/percolate:migrations';
 import SCHEMA_VERSION from '/imports/constants/SCHEMA_VERSION.js';
 
-if (Meteor.isServer){
+if (Meteor.isServer) {
-  Meteor.startup(()=>{
+  Meteor.startup(() => {
     const dbVersion = Migrations.getVersion();
+    // If there are no users, this is a new DB, set the version to latest
+    const aUser = Meteor.users.findOne({});
+    const latestVersion = Migrations._list[Migrations._list.length - 1].version
+    if (!aUser && dbVersion !== latestVersion) {
+      Migrations._collection.update({ _id: 'control' }, { version: latestVersion });
+      return;
+    }
+    // Otherwise put the app in maintenance mode if it's not the right version
     if (
       !Meteor.settings.public.maintenanceMode &&
       dbVersion !== undefined &&
       SCHEMA_VERSION !== dbVersion
-    ){
+    ) {
       Meteor.settings.public.maintenanceMode = {
         reason: 'App data needs to be migrated to the latest version'
       };

app/imports/constants/PROPERTIES.js

@@ -2,12 +2,14 @@ const PROPERTIES = Object.freeze({
   action: {
     icon: '$vuetify.icons.action',
     name: 'Action',
+    docsPath: 'property/action',
     helpText: 'Actions are things your character can do. When an action is taken, all the properties under it are activated.',
     suggestedParents: ['classLevel', 'feature', 'item'],
   },
   attribute: {
     icon: '$vuetify.icons.attribute',
     name: 'Attribute',
+    docsPath: 'property/attribute',
     helpText: 'Attributes are the numbered statistics of your character, excluding rolls you might add proficiency bonus to, those are skills.',
     examples: 'Ability scores, speed, hit points, ki',
     suggestedParents: ['classLevel', 'buff'],
@@ -15,48 +17,56 @@ const PROPERTIES = Object.freeze({
   adjustment: {
     icon: '$vuetify.icons.attribute_damage',
     name: 'Attribute damage',
+    docsPath: 'property/attribute-damage',
     helpText: 'Attribute damage reduces the current value of an attribute when it is applied by an action. A negative value causes the attribute to increase instead, up to its normal maximum.',
     suggestedParents: ['action', 'attack', 'savingThrow', 'spell', 'branch'],
   },
   buff: {
     icon: '$vuetify.icons.buff',
     name: 'Buff',
+    docsPath: 'property/buff',
     helpText: 'When a buff is activated as a child of an action, it will copy the properties under itself onto a target character.',
     suggestedParents: ['action', 'attack', 'savingThrow', 'spell', 'branch'],
   },
   buffRemover: {
     icon: '$vuetify.icons.buffRemover',
     name: 'Remove Buff',
+    docsPath: 'property/remove-buff',
     helpText: 'Removes a buff from the target character',
     suggestedParents: ['action', 'attack', 'savingThrow', 'spell', 'branch'],
   },
   branch: {
     icon: 'mdi-file-tree',
     name: 'Branch',
+    docsPath: 'property/branch',
     helpText: 'When a branch is activated as a child of an action, it can control which of its children get activated.',
     suggestedParents: ['action', 'attack', 'savingThrow', 'spell'],
   },
   class: {
     icon: 'mdi-card-account-details',
     name: 'Class',
+    docsPath: 'property/class',
     helpText: 'Your character should ideally have one starting class. Classes hold class levels',
     suggestedParents: [],
   },
   classLevel: {
     icon: '$vuetify.icons.class_level',
     name: 'Class level',
+    docsPath: 'property/class-level',
     helpText: 'Class levels represent a single level gained in a class',
     suggestedParents: ['class'],
   },
   constant: {
     icon: 'mdi-anchor',
     name: 'Constant',
+    docsPath: 'property/constant',
     helpText: 'A constant can define a static value that can be used in calculations elsewhere in the sheet',
     suggestedParents: [],
   },
   container: {
     icon: 'mdi-bag-personal-outline',
     name: 'Container',
+    docsPath: 'property/container',
     helpText: 'A container holds items in the inventory',
     examples: 'Coin pouch, backpack',
     suggestedParents: ['folder'],
@@ -64,18 +74,21 @@ const PROPERTIES = Object.freeze({
   damage: {
     icon: '$vuetify.icons.damage',
     name: 'Damage',
+    docsPath: 'property/damage',
     helpText: 'When damage is activated by an action it reduces the hit points of the target creature by the calculated amount.',
     suggestedParents: ['action', 'attack', 'savingThrow', 'spell', 'branch'],
   },
   damageMultiplier: {
     icon: '$vuetify.icons.damage_multiplier',
     name: 'Damage multiplier',
+    docsPath: 'property/damage-multiplier',
     helpText: 'Resistance, vulnerability, and immunity.',
     suggestedParents: ['classLevel', 'feature', 'item'],
   },
   effect: {
     icon: '$vuetify.icons.effect',
     name: 'Effect',
+    docsPath: 'property/effect',
     helpText: 'Effects change the value or state of attributes and skills.',
     examples: '+2 Strength, Advantage on dexterity saving throws',
     suggestedParents: ['buff', 'classLevel', 'feature', 'folder', 'item'],
@@ -83,42 +96,49 @@ const PROPERTIES = Object.freeze({
   feature: {
     icon: 'mdi-text-subject',
     name: 'Feature',
+    docsPath: 'property/feature',
     helpText: 'Descriptive or narrative features your character has access to',
     suggestedParents: ['classLevel', 'folder'],
   },
   folder: {
     icon: 'mdi-folder-outline',
     name: 'Folder',
+    docsPath: 'property/feature',
     helpText: 'A way to organise other properties on the character',
-    suggestedParents: ['folder'],
+    suggestedParents: ['action', 'folder'],
   },
   item: {
     icon: 'mdi-cube-outline',
     name: 'Item',
+    docsPath: 'property/item',
     helpText: 'Objects and equipment your charcter finds on their adventures',
     suggestedParents: ['container'],
   },
   note: {
     icon: 'mdi-note-outline',
     name: 'Note',
+    docsPath: 'property/note',
     helpText: 'Notes about your character and their adventures',
     suggestedParents: ['note', 'folder'],
   },
   pointBuy: {
     icon: 'mdi-table',
     name: 'Point Buy',
+    docsPath: 'property/point-buy',
     helpText: 'A point buy table that allows the user to select an array of values that match a given cost',
     suggestedParents: [],
   },
   proficiency: {
     icon: 'mdi-brightness-1',
     name: 'Proficiency',
+    docsPath: 'property/proficiency',
     helpText: 'Proficiencies apply your proficiency bonus to skills already on your character sheet.',
     suggestedParents: ['buff', 'classLevel', 'feature', 'folder'],
   },
   roll: {
     icon: '$vuetify.icons.roll',
     name: 'Roll',
+    docsPath: 'property/roll',
     helpText: 'When activated by an action, rolls perform a calculation and temporarily store the result for other properties under the same action to use',
     suggestedParents: ['action', 'attack', 'savingThrow', 'spell', 'branch'],
   },
@@ -132,48 +152,56 @@ const PROPERTIES = Object.freeze({
   savingThrow: {
     icon: '$vuetify.icons.saving_throw',
     name: 'Saving throw',
+    docsPath: 'property/saving-throw',
     helpText: 'When a saving throw is activated by an action, it causes the target to make a saving throw, if the saving throw fails, the children properties of the saving throw are activated.',
     suggestedParents: ['action', 'attack', 'spell'],
   },
   skill: {
     icon: '$vuetify.icons.skill',
     name: 'Skill',
+    docsPath: 'property/skill',
     helpText: 'Skills, saves, languages, and weapon and tool proficiencies are all skills. Skills can have a default proficiency set. Proficiencies and effects can change the value and state of skills.',
     suggestedParents: ['classLevel', 'folder'],
   },
   propertySlot: {
     icon: 'mdi-power-socket-eu',
     name: 'Slot',
+    docsPath: 'property/slot',
     helpText: 'A slot in the character sheet is used to specify that a property needs to be selected from a library to fill the slot. The slot can determine what tags it is looking for, and any subscribed library property with matching tags can fill the slot',
     suggestedParents: [],
   },
   slotFiller: {
     icon: 'mdi-power-plug-outline',
     name: 'Slot filler',
+    docsPath: 'property/slot-filler',
     helpText: 'A slot filler allows for more advanced logic when it attempts to fill a slot. It can masquarade as any property type, and calculate whether it should fill a slot or not.',
     suggestedParents: ['propertySlot'],
   },
   spellList: {
     icon: '$vuetify.icons.spell_list',
     name: 'Spell list',
+    docsPath: 'property/spell-list',
     helpText: 'A list of spells on your character sheet. It can provide a DC and spell attack bonus to the spells within',
     suggestedParents: [],
   },
   spell: {
     icon: '$vuetify.icons.spell',
     name: 'Spell',
+    docsPath: 'property/spell',
     helpText: 'A spell your character can potentially cast',
     suggestedParents: ['spellList'],
   },
   toggle: {
     icon: '$vuetify.icons.toggle',
     name: 'Toggle',
+    docsPath: 'property/toggle',
     helpText: 'Togggles allow parts of the character sheet to be turned on and off, either manually or as the result of a calculation.',
     suggestedParents: [],
   },
   trigger: {
     icon: 'mdi-electric-switch',
     name: 'Trigger',
+    docsPath: 'property/trigger',
     helpText: 'Triggers apply their children in response to events on the character sheet, such as taking an action or receiving damage',
     suggestedParents: [],
   },
@@ -188,3 +216,17 @@ export function getPropertyName(type){
 export function getPropertyIcon(type){
   return type && PROPERTIES[type] && PROPERTIES[type].icon;
 }
+
+const propsByDocsPath = new Map();
+
+for (const key in PROPERTIES) {
+  const prop = PROPERTIES[key];
+  if (prop.docsPath) {
+    propsByDocsPath.set(prop.docsPath, {
+      ...prop,
+      type: key,
+    });
+  }
+}
+
+export { propsByDocsPath };

app/imports/migrations/methods/migrateTo.js

@@ -19,7 +19,7 @@ const migrateTo = new ValidatedMethod({
     numRequests: 1,
     timeInterval: 10000,
   },
-  run({version}) {
+  run({ version }) {
     if (Meteor.isClient) return;
     assertAdmin(this.userId);
     Migrations.migrateTo(version);

app/imports/migrations/methods/validateDatabase.js

@@ -23,8 +23,8 @@ const validateDatabase = new ValidatedMethod({
         const schema = collection.instance.simpleSchema(doc);
         let cleanDoc = schema.clean(doc);
         try {
-          schema.validate(cleanDoc, {modifier: false});
+          schema.validate(cleanDoc, { modifier: false });
-        } catch (e){
+        } catch (e) {
           console.log(collection.name, doc._id, e.message || e.reason || e.toString());
         }
       });

app/imports/parser/functions.js

@@ -112,10 +112,10 @@ export default {
     }
   },
   'resolve': {
-    comment: 'Forces the given calcultion to resolve into a number',
+    comment: 'Forces the given calcultion to resolve into a number, even in calculations where it would usually keep the unknown values as is',
     examples: [
       {input: 'resolve(someUndefinedVariable + 3 + 4)', result: '7'},
-      {input: 'resolve(3d6)', result: '2'},
+      {input: 'resolve(1d6)', result: '4'},
     ],
     arguments: ['parseNode'],
     fn: function resolveFn(node){

app/imports/parser/parseTree/index.js

@@ -2,23 +2,23 @@ import resolve, { traverse, toString, map } from '../resolve';
 import error from './error';
 
 const indexNode = {
-  create({array, index}) {
+  create({ array, index }) {
     return {
       parseType: 'index',
       array,
       index,
     }
   },
-  resolve(fn, node, scope, context){
+  resolve(fn, node, scope, context) {
-    let {result: index} = resolve(fn, node.index, scope, context);
+    let { result: index } = resolve(fn, node.index, scope, context);
-    let {result: array} = resolve(fn, node.array, scope, context);
+    let { result: array } = resolve(fn, node.array, scope, context);
 
     if (
       index.valueType === 'number' &&
       Number.isInteger(index.value) &&
       array.parseType === 'array'
-    ){
+    ) {
-      if (index.value < 1 || index.value > array.values.length){
+      if (index.value < 1 || index.value > array.values.length) {
         context.error({
           type: 'warning',
           message: `Index of ${index.value} is out of range for an array` +
@@ -26,11 +26,11 @@ const indexNode = {
         });
       }
       let selection = array.values[index.value - 1];
-      if (selection){
+      if (selection) {
         return resolve(fn, selection, scope, context);
       }
-    } else if (fn === 'reduce'){
+    } else if (fn === 'reduce') {
-      if (array.parseType !== 'array'){
+      if (array.parseType !== 'array') {
         const message = `Can not get the index of a non-array node: ${toString(node.array)} = ${toString(array)}`
         context.error(message);
         return {
@@ -40,7 +40,7 @@ const indexNode = {
           }),
           context,
         };
-      } else if (!index.isInteger){
+      } else if (!index.isInteger) {
         const message = `${toString(array)} is not an integer index of the array`
         context.error(message);
         return {
@@ -60,17 +60,17 @@ const indexNode = {
       context,
     };
   },
-  toString(node){
+  toString(node) {
     return `${toString(node.array)}[${toString(node.index)}]`;
   },
-  traverse(node, fn){
+  traverse(node, fn) {
     fn(node);
     traverse(node.array, fn);
     traverse(node.index, fn);
   },
-  map(node, fn){
+  map(node, fn) {
     const resultingNode = fn(node);
-    if (resultingNode === node){
+    if (resultingNode === node) {
       node.array = map(node.array, fn);
       node.index = map(node.index, fn);
     }

app/imports/parser/parseTree/rollArray.js

@@ -1,7 +1,7 @@
 import constant from './constant.js';
 
 const rollArray = {
-  create({values, diceSize, diceNum}) {
+  create({ values, diceSize, diceNum }) {
     return {
       parseType: 'rollArray',
       values,
@@ -9,16 +9,16 @@ const rollArray = {
       diceNum,
     };
   },
-  compile(node, scope, context){
+  compile(node, scope, context) {
     return {
       result: node,
       context
     };
   },
-  toString(node){
+  toString(node) {
     return `${node.diceNum || ''}d${node.diceSize} [ ${node.values.join(', ')} ]`;
   },
-  reduce(node, scope, context){
+  reduce(node, scope, context) {
     const total = node.values.reduce((a, b) => a + b, 0);
     return {
       result: constant.create({

app/imports/server/cron/deleteSoftRemovedDocuments.js

@@ -14,15 +14,15 @@ Meteor.startup(() => {
    * and were not restored
    * @return {Number} Number of documents removed
    */
-	const deleteOldSoftRemovedDocs = function(){
+  const deleteOldSoftRemovedDocs = function () {
     const now = new Date();
     const yesterday = new Date(now.getTime() - (24 * 60 * 60 * 1000));
     collections.forEach(collection => {
       collection.remove({
         removed: true,
-				removedAt: {$lt: yesterday} // dates *before* yesterday
+        removedAt: { $lt: yesterday } // dates *before* yesterday
-			}, function(error){
+      }, function (error) {
-				if (error){
+        if (error) {
           console.error(JSON.stringify(error, null, 2));
         }
       });
@@ -31,7 +31,7 @@ Meteor.startup(() => {
 
   SyncedCron.add({
     name: 'deleteSoftRemovedDocs',
-		schedule: function(parser) {
+    schedule: function (parser) {
       return parser.text('every 10 minutes');
     },
     job: deleteOldSoftRemovedDocs,

app/imports/server/publications/docs.js

@@ -0,0 +1,35 @@
+import { propsByDocsPath } from '/imports/constants/PROPERTIES.js';
+
+
+// Manual doc paths
+const docPaths = [
+  'computed-fields',
+  'inline-calculations',
+  'dependency-loops',
+  'docs',
+  'tags',
+  'walkthroughs/create-a-class',
+];
+const docs = new Map();
+docPaths.forEach(path => {
+  docs.set(path, Assets.getText(`docs/${path}.md`))
+});
+
+// Doc paths for properties
+propsByDocsPath.forEach(prop => {
+  docs.set(prop.docsPath, Assets.getText(`docs/${prop.docsPath}.md`));
+});
+
+Meteor.publish('docs', function (path) {
+  if (!path) {
+    docs.forEach((text, path) => {
+      this.added('docs', path, { text });
+    });
+  } else {
+    const text = docs.get(path);
+    if (text) {
+      this.added('docs', path, { text });
+    }
+  }
+  this.ready();
+});

app/imports/server/publications/icons.js

@@ -1,16 +1,16 @@
 import Icons from '/imports/api/icons/Icons.js';
 
-Meteor.publish('sampleIcons', function(){
+Meteor.publish('sampleIcons', function () {
-	return Icons.find({}, {limit: 50});
+  return Icons.find({}, { limit: 50 });
 });
 
-Meteor.publish('searchIcons', function(searchValue) {
+Meteor.publish('searchIcons', function (searchValue) {
   // Don't publish anything if there's no search value
   if (!searchValue) {
     return [];
   }
   return Icons.find(
-    { $text: {$search: searchValue} },
+    { $text: { $search: searchValue } },
     {
       // relevant documents have a higher score.
       fields: {

app/imports/server/publications/index.js

@@ -11,3 +11,4 @@ import '/imports/server/publications/ownedDocuments.js';
 import '/imports/server/publications/searchLibraryNodes.js';
 import '/imports/server/publications/archiveFiles.js';
 import '/imports/server/publications/userImages.js';
+import '/imports/server/publications/docs.js';

app/imports/server/publications/users.js

@@ -2,9 +2,10 @@ import SimpleSchema from 'simpl-schema';
 import '/imports/api/users/Users.js';
 import Invites from '/imports/api/users/Invites.js';
 
-Meteor.publish('user', function(){
+Meteor.publish('user', function () {
   return [
-    Meteor.users.find(this.userId, {fields: {
+    Meteor.users.find(this.userId, {
+      fields: {
         roles: 1,
         username: 1,
         apiKey: 1,
@@ -22,11 +23,12 @@ Meteor.publish('user', function(){
         'services.google.name': 1,
         'services.google.email': 1,
         'services.google.locale': 1,
-    }}),
+      }
+    }),
     Invites.find({
       $or: [
-        {inviter: this.userId},
+        { inviter: this.userId },
-        {invitee: this.userId}
+        { invitee: this.userId }
       ],
     }, {
       fields: {
@@ -41,19 +43,19 @@ let userIdsSchema = new SimpleSchema({
     type: Array,
     optional: true,
   },
-  'ids.$':{
+  'ids.$': {
     type: String,
     regEx: SimpleSchema.RegEx.Id,
   }
 })
 
-Meteor.publish('userPublicProfiles', function(ids){
+Meteor.publish('userPublicProfiles', function (ids) {
-  userIdsSchema.validate({ids});
+  userIdsSchema.validate({ ids });
   if (!this.userId || !ids) return this.ready();
   return Meteor.users.find({
-		_id: {$in: ids}
+    _id: { $in: ids }
-	},{
+  }, {
-		fields: {username: 1},
+    fields: { username: 1 },
-		sort: {username: 1},
+    sort: { username: 1 },
   });
 });

app/imports/ui/components/ColorPicker.vue

@@ -10,6 +10,7 @@
         :outlined="!!label"
         :icon="!label"
         :min-width="label && 108"
+        :disabled="context.editPermission === false"
         v-on="on"
       >
         {{ label }}
@@ -124,6 +125,9 @@
   }
 
   export default {
+    inject: {
+      context: { default: {} }
+    },
     props: {
      //hex string
       value: {

app/imports/ui/components/ColumnLayout.vue

@@ -19,34 +19,39 @@ export default {
 </script>
 
 <style lang="css">
-	.column-layout {
+.column-layout {
   column-count: 12;
   column-fill: balance;
   column-gap: 0;
   column-width: 240px;
   transform: translateZ(0);
   padding: 4px;
-	}
+}
-  .column-layout.wide-columns {
+
+.column-layout.wide-columns {
   column-count: 12;
   column-fill: balance;
   column-gap: 0;
   column-width: 320px;
   transform: translateZ(0);
   padding: 4px;
-	}
+}
-	.column-layout > div, .column-layout > span > div {
+
+.column-layout>div,
+.column-layout>span>div {
   /*
       Table and width set because firefox does not support break-inside: avoid
     */
   display: table;
   table-layout: fixed;
   width: 100%;
+  backface-visibility: hidden;
   -webkit-backface-visibility: hidden;
+  transform: translateX(0);
   -webkit-transform: translateX(0);
   -webkit-column-break-inside: avoid;
   page-break-inside: avoid;
   break-inside: avoid;
   padding: 4px;
-	}
+}
 </style>

app/imports/ui/components/IncrementMenu.vue

@@ -65,7 +65,7 @@
 </template>
 
 <script lang="js">
-	export default {
+export default {
   inject: {
     context: { default: {} }
   },
@@ -93,12 +93,12 @@
     },
   },
   methods: {
-      resetData(){
+    resetData() {
       this.editValue = this.value;
       this.operation = 'set';
       // this.$nextTick didn't work, using timeout instead did
       setTimeout(() => {
-          if (this.$refs.editInput){
+        if (this.$refs.editInput) {
           this.$refs.editInput.focus();
         }
       }, 100);
@@ -125,11 +125,11 @@
           return 'mdi-minus';
       }
     },
-			toggleAdd(){
+    toggleAdd() {
-				this.operation = (this.operation === 'add') ? 'set': 'add';
+      this.operation = (this.operation === 'add') ? 'set' : 'add';
     },
-			toggleSubtract(){
+    toggleSubtract() {
-				this.operation = (this.operation === 'subtract') ? 'set': 'subtract';
+      this.operation = (this.operation === 'subtract') ? 'set' : 'subtract';
     },
     keypress(event) {
       let digitsOnly = /[0-9]/;
@@ -142,25 +142,26 @@
         event.preventDefault();
       } else if (key === 'Enter') {
         this.commitEdit();
-				} else if (!digitsOnly.test(key)){
+      } else if (!digitsOnly.test(key)) {
         event.preventDefault();
       }
     },
-      input(value){
+    input(value) {
-        if (+value < 0){
+      if (+value < 0) {
         this.editValue = -value;
         this.operation = 'subtract';
       }
     }
   }
-	};
+};
 </script>
 
 <style scoped>
-	.filled.theme--light {
+.filled.theme--light {
   background: #fff !important;
-	}
+}
-	.filled.theme--dark {
+
+.filled.theme--dark {
   background: #424242 !important;
-	}
+}
 </style>

app/imports/ui/components/MarkdownText.vue

@@ -1,15 +1,16 @@
 <template lang="html">
-  <!-- eslint-disable-next-line vue/no-v-html -->
+  <!-- eslint-disable vue/no-v-html -->
   <div
     class="markdown"
+    @click="e => $emit('click', e)"
     v-html="compiledMarkdown"
   />
 </template>
 
 <script lang="js">
-	import { marked } from 'marked';
+import { marked } from 'marked';
 
-	export default {
+export default {
   props: {
     markdown: {
       type: String,
@@ -22,5 +23,5 @@
       return marked(this.markdown);
     },
   },
-	}
+}
 </script>

app/imports/ui/components/ResetSelector.vue

@@ -0,0 +1,46 @@
+<template>
+  <smart-select
+    label="Reset"
+    clearable
+    style="flex-basis: 300px;"
+    :hint="hint"
+    :items="resetOptions"
+    :value="value"
+    :error-messages="errorMessages"
+    :menu-props="{auto: true, lazy: true}"
+    @change="(value, ack) => $emit('change', value, ack)"
+  />
+</template>
+
+<script lang="js">
+import createListOfProperties from '/imports/ui/properties/forms/shared/lists/createListOfProperties.js';
+
+export default {
+  props: {
+    value: [String, Number, Date, Array, Object, Boolean],
+    errorMessages: [String, Array],
+    hint: {
+      type: String,
+      default: undefined,
+    }
+  },
+  meteor: {
+    resetOptions() {
+      const eventActions = createListOfProperties({
+        type: 'action',
+        actionType: 'event',
+      }, true);
+      const defaultEvents = [
+        {
+          text: 'Short rest',
+          value: 'shortRest',
+        }, {
+          text: 'Long rest',
+          value: 'longRest',
+        }
+      ];
+      return [...defaultEvents, ...eventActions];
+    },
+  },
+}
+</script>

app/imports/ui/components/ToolbarCard.vue

@@ -27,54 +27,58 @@
 </template>
 
 <script lang="js">
-	import isDarkColor from '/imports/ui/utility/isDarkColor.js';
+import isDarkColor from '/imports/ui/utility/isDarkColor.js';
-  import getThemeColor from '/imports/ui/utility/getThemeColor.js';
+import getThemeColor from '/imports/ui/utility/getThemeColor.js';
-  import CardHighlight from '/imports/ui/components/CardHighlight.vue';
+import CardHighlight from '/imports/ui/components/CardHighlight.vue';
 
-	export default {
+export default {
   components: {
     CardHighlight,
   },
   props: {
     color: {
       type: String,
-				default(){
+      default() {
         return getThemeColor('secondary');
       },
     },
     transparentToolbar: Boolean,
   },
-    data(){ return {
+  data() {
+    return {
       hovering: false,
-    }},
+    }
+  },
   computed: {
-			isDark(){
+    isDark() {
       return isDarkColor(this.color);
     },
-			hasClickListener(){
+    hasClickListener() {
       return this.$listeners && !!this.$listeners.click;
     },
-			hasToolbarClickListener(){
+    hasToolbarClickListener() {
       return this.$listeners && !!this.$listeners.toolbarclick;
     },
   },
   methods: {
-      hoverToolbar(val){
+    hoverToolbar(val) {
       this.hovering = this.$listeners &&
         !!this.$listeners.toolbarclick &&
         val;
     }
   }
-	};
+};
 </script>
 
 <style lang="css">
 .toolbar-card .v-toolbar__title {
   font-size: 15px;
 }
+
 .toolbar-card {
   transition: box-shadow .4s cubic-bezier(0.25, 0.8, 0.25, 1);
 }
+
 .toolbar-card.transparent-toolbar .theme--dark.v-toolbar.v-sheet {
   background-color: #303030;
 }

app/imports/ui/components/global/DatePicker.vue

@@ -35,16 +35,18 @@ import { format } from 'date-fns';
 
 export default {
   mixins: [SmartInput],
-	data(){return {
+  data() {
+    return {
       menu: false,
-	};},
+    };
+  },
   computed: {
-		formattedSafeValue(){
+    formattedSafeValue() {
       return format(this.safeValue, 'YYYY-MM-DD')
     },
   },
   methods: {
-		dateInput(e){
+    dateInput(e) {
       this.menu = false;
       this.input(e);
     },
@@ -53,4 +55,5 @@ export default {
 </script>
 
 <style lang="css" scoped>
+
 </style>

app/imports/ui/components/global/IconPicker.vue

@@ -97,16 +97,18 @@ export default {
       default: undefined,
     },
   },
-	data(){return {
+  data() {
+    return {
       menu: false,
       searchString: '',
       icons: [],
-	};},
+    };
+  },
   watch: {
-    menu(value){
+    menu(value) {
-      if (value){
+      if (value) {
         setTimeout(() => {
-          if (this.$refs.iconSearchField){
+          if (this.$refs.iconSearchField) {
             this.$refs.iconSearchField.$children[0].focus();
           }
         }, 100);
@@ -114,15 +116,15 @@ export default {
     },
   },
   methods: {
-    search(value, ack){
+    search(value, ack) {
       this.searchString = value;
       this.icons = [];
-      findIcons.call({search: value}, (error, result) => {
+      findIcons.call({ search: value }, (error, result) => {
         ack(error);
         this.icons = result;
       });
     },
-    select(icon){
+    select(icon) {
       this.menu = false;
       this.change(icon);
     },
@@ -131,4 +133,5 @@ export default {
 </script>
 
 <style lang="css" scoped>
+
 </style>

app/imports/ui/components/global/SmartCombobox.vue

@@ -21,23 +21,25 @@
 </template>
 
 <script lang="js">
-	import SmartInput from '/imports/ui/components/global/SmartInputMixin.js';
+import SmartInput from '/imports/ui/components/global/SmartInputMixin.js';
 
-	export default {
+export default {
   mixins: [SmartInput],
   props: {
     multiple: Boolean,
   },
-    data(){ return {
+  data() {
+    return {
       searchInput: '',
-    }},
+    }
+  },
   computed: {
     // Multiple combobox gets a long default debounce time while single
     // value gets a shorter one
     debounceTime() {
-        if (Number.isFinite(this.debounce)){
+      if (Number.isFinite(this.debounce)) {
         return this.debounce;
-        } else if (Number.isFinite(this.context.debounceTime)){
+      } else if (Number.isFinite(this.context.debounceTime)) {
         return this.context.debounceTime;
       } else {
         return this.multiple ? 1000 : 100;
@@ -45,10 +47,10 @@
     },
   },
   methods: {
-      customChange(val){
+    customChange(val) {
       this.input(val);
       this.searchInput = '';
     },
   }
-	};
+};
 </script>

app/imports/ui/components/global/SmartInputMixin.js

@@ -13,7 +13,8 @@ export default {
     context: { default: {} }
   },
   inheritAttrs: false,
-  data(){ return {
+  data() {
+    return {
       error: false,
       ackErrors: null,
       rulesErrors: null,
@@ -22,7 +23,8 @@ export default {
       dirty: false,
       safeValue: this.value,
       inputValue: this.value,
-  };},
+    };
+  },
   props: {
     value: [String, Number, Date, Array, Object, Boolean],
     errorMessages: [String, Array],
@@ -34,11 +36,11 @@ export default {
     rules: Array,
   },
   watch: {
-    focused(newFocus){
+    focused(newFocus) {
       // If the value updated while we were focused, show it now on defocus
       // but not if we are waiting for our own writes to get persisted
       // and not if there is an error in our input
-      if (!newFocus && !this.dirty && !this.error){
+      if (!newFocus && !this.dirty && !this.error) {
         this.forceSafeValueUpdate();
       }
       // Start the loading bar on defocus if the input is dirty
@@ -48,118 +50,118 @@ export default {
         !newFocus &&
         this.dirty &&
         !(this.rulesErrors && this.rulesErrors.length)
-      ){
+      ) {
         if (this.hasChangeListener) this.loading = true;
       }
     },
-    dirty(newDirty){
+    dirty(newDirty) {
       // Our changes were acknowledged, weren't in error, and we aren't focused,
       // make sure the internal value matches the database value
-      if (!newDirty && !this.focused && !this.error){
+      if (!newDirty && !this.focused && !this.error) {
         this.forceSafeValueUpdate();
       }
     },
-    value(newValue){
+    value(newValue) {
       if (
         !this.focused &&
         !(this.rulesErrors && this.rulesErrors.length)
-      ){
+      ) {
         this.safeValue = newValue;
       }
     },
-    safeValue(){
+    safeValue() {
       // The safe value only gets updated from the parent, so it must be valid
       this.error = false;
       this.ackErrors = null;
     },
   },
   methods: {
-    input(val){
+    input(val) {
       this.$emit('input', val);
       this.inputValue = val;
       this.dirty = true;
 
       // Apply the rules if there are any
       this.rulesErrors = null;
-      if (this.rules && this.rules.length){
+      if (this.rules && this.rules.length) {
         this.rules.forEach(rule => {
           const result = rule(val);
-          if (typeof result === 'string'){
+          if (typeof result === 'string') {
             if (!this.rulesErrors) this.rulesErrors = [];
             this.rulesErrors.push(result);
           }
         });
       }
-      if (this.rulesErrors){
+      if (this.rulesErrors) {
         return;
       }
 
       this.debouncedChange(val);
     },
-    acknowledgeChange(error){
+    acknowledgeChange(error) {
       this.loading = false;
       this.dirty = false;
       this.error = !!error;
-			if (!error){
+      if (!error) {
         this.ackErrors = null;
-			} else if (typeof error === 'string'){
+      } else if (typeof error === 'string') {
         this.ackErrors = error;
-			} else if (error.reason){
+      } else if (error.reason) {
         this.ackErrors = error.reason;
-      } else if (error.message){
+      } else if (error.message) {
         this.ackErrors = error.message;
       } else {
         this.ackErrors = 'Something went wrong'
         console.error(error);
       }
     },
-    change(val){
+    change(val) {
       this.dirty = true;
       if (this.hasChangeListener()) this.loading = true;
       this.$emit('change', val, this.acknowledgeChange);
     },
-    hasChangeListener(){
+    hasChangeListener() {
       return this.$listeners && this.$listeners.change;
     },
-    forceSafeValueUpdate(){
+    forceSafeValueUpdate() {
       // hack to force the value to update on the child component
       this.safeValue = null;
       this.$nextTick(() => this.safeValue = this.value);
     },
-    focus(){
+    focus() {
       this.$refs.input.focus();
     }
   },
   computed: {
-    errors(){
+    errors() {
       let errors = this.ackErrors ? [this.ackErrors] : [];
-      if (Array.isArray(this.rulesErrors)){
+      if (Array.isArray(this.rulesErrors)) {
         errors.push(...this.rulesErrors)
       }
-      if (Array.isArray(this.errorMessages)){
+      if (Array.isArray(this.errorMessages)) {
         errors.push(...this.errorMessages);
-      } else if (typeof this.errorMessages === 'string' && this.errorMessages){
+      } else if (typeof this.errorMessages === 'string' && this.errorMessages) {
         errors.push(this.errorMessages);
       }
       return errors;
     },
-    isDisabled(){
+    isDisabled() {
       return this.context.editPermission === false || this.disabled;
     },
     debounceTime() {
-      if (Number.isFinite(this.debounce)){
+      if (Number.isFinite(this.debounce)) {
         return this.debounce;
-      } else if (Number.isFinite(this.context.debounceTime)){
+      } else if (Number.isFinite(this.context.debounceTime)) {
         return this.context.debounceTime;
       } else {
         return 750;
       }
     },
   },
-  created(){
+  created() {
     this.debouncedChange = debounce(this.change, this.debounceTime);
   },
-  beforeDestroy(){
+  beforeDestroy() {
     this.debouncedChange.flush();
   },
 };

app/imports/ui/components/global/SmartSelect.vue

@@ -23,9 +23,9 @@
 </template>
 
 <script lang="js">
-	import SmartInput from '/imports/ui/components/global/SmartInputMixin.js';
+import SmartInput from '/imports/ui/components/global/SmartInputMixin.js';
 
-	export default {
+export default {
   mixins: [SmartInput],
-	};
+};
 </script>

app/imports/ui/components/global/TextArea.vue

@@ -14,9 +14,9 @@
 </template>
 
 <script lang="js">
-	import SmartInput from '/imports/ui/components/global/SmartInputMixin.js';
+import SmartInput from '/imports/ui/components/global/SmartInputMixin.js';
 
-	export default {
+export default {
   mixins: [SmartInput],
   props: {
     autoGrow: {
@@ -24,5 +24,5 @@
       default: false,
     },
   },
-	};
+};
 </script>

app/imports/ui/components/propertyToolbar.vue

@@ -54,8 +54,22 @@
             </v-btn>
           </template>
           <v-list>
+            <v-list-item
+              v-if="docsPath"
+              @click="helpDialog"
+            >
+              <v-list-item-content>
+                <v-list-item-title>
+                  Help
+                </v-list-item-title>
+              </v-list-item-content>
+              <v-list-item-action>
+                <v-icon>mdi-help</v-icon>
+              </v-list-item-action>
+            </v-list-item>
             <v-list-item
               v-if="$listeners && $listeners.duplicate"
+              :disabled="context.editPermission === false"
               @click="$emit('duplicate')"
             >
               <v-list-item-content>
@@ -67,8 +81,23 @@
                 <v-icon>mdi-content-copy</v-icon>
               </v-list-item-action>
             </v-list-item>
+            <v-list-item
+              v-if="$listeners && $listeners.copy"
+              :disabled="context.copyPermission === false"
+              @click="$emit('copy')"
+            >
+              <v-list-item-content>
+                <v-list-item-title>
+                  Copy To
+                </v-list-item-title>
+              </v-list-item-content>
+              <v-list-item-action>
+                <v-icon>mdi-content-duplicate</v-icon>
+              </v-list-item-action>
+            </v-list-item>
             <v-list-item
               v-if="$listeners && $listeners.move"
+              :disabled="context.editPermission === false"
               @click="$emit('move')"
             >
               <v-list-item-content>
@@ -82,6 +111,7 @@
             </v-list-item>
             <v-list-item
               v-if="$listeners && $listeners.remove"
+              :disabled="context.editPermission === false"
               @click="$emit('remove')"
             >
               <v-list-item-content>
@@ -137,12 +167,16 @@ import PropertyIcon from '/imports/ui/properties/shared/PropertyIcon.vue';
 import { getPropertyName } from '/imports/constants/PROPERTIES.js';
 import ColorPicker from '/imports/ui/components/ColorPicker.vue';
 import getThemeColor from '/imports/ui/utility/getThemeColor.js';
+import PROPERTIES from '/imports/constants/PROPERTIES.js';
 
 export default {
   components: {
     PropertyIcon,
     ColorPicker,
   },
+  inject: {
+    context: { default: {} }
+  },
   props: {
     model: {
       type: Object,
@@ -171,7 +205,11 @@ export default {
         }
       }
       return model.name || getPropertyName(model.type);
-    }
+    },
+    docsPath() {
+      const propDef = PROPERTIES[this.model.type];
+      return propDef && propDef.docsPath;
+    },
   },
   methods: {
     colorChanged(value){
@@ -180,6 +218,15 @@ export default {
     back(){
       this.$store.dispatch('popDialogStack');
     },
+    helpDialog() {
+      this.$store.commit('pushDialogStack', {
+        component: 'help-dialog',
+        elementId: 'property-toolbar-menu-button',
+        data: {
+          path: this.docsPath,
+        },
+      });
+    },
   }
 }
 </script>

app/imports/ui/components/tree/TreeNode.vue

@@ -77,18 +77,18 @@
 </template>
 
 <script lang="js">
-	/**
+/**
-	* TreeNode's are list item views of character properties. Every property which
+* TreeNode's are list item views of character properties. Every property which
-	* can belong to the character is shown in the tree view of the character
+* can belong to the character is shown in the tree view of the character
-	* the tree view shows off the full character structure, and where each part of
+* the tree view shows off the full character structure, and where each part of
-	* character comes from.
+* character comes from.
-	**/
+**/
-	import { canBeParent } from '/imports/api/parenting/parenting.js';
+import { canBeParent } from '/imports/api/parenting/parenting.js';
-	import { getPropertyIcon } from '/imports/constants/PROPERTIES.js';
+import { getPropertyIcon } from '/imports/constants/PROPERTIES.js';
-  import TreeNodeView from '/imports/ui/properties/treeNodeViews/TreeNodeView.vue';
+import TreeNodeView from '/imports/ui/properties/treeNodeViews/TreeNodeView.vue';
-  import { some } from 'lodash';
+import { some } from 'lodash';
 
-	export default {
+export default {
   name: 'TreeNode',
   components: {
     TreeNodeView,
@@ -100,7 +100,7 @@
     },
     group: {
       type: String,
-        required: true,
+      default: undefined,
     },
     organize: Boolean,
     children: {
@@ -118,38 +118,40 @@
     selected: Boolean,
     startExpanded: Boolean,
   },
-		data(){return {
+  data() {
+    return {
       expanded: this.startExpanded || this.node._ancestorOfMatchedDocument ||
         some(this.selectedNode?.ancestors, ref => ref.id === this.node._id) ||
         false,
-		}},
+    }
+  },
   computed: {
-			hasChildren(){
+    hasChildren() {
       return this.children && !!this.children.length || this.lazy && !this.expanded;
     },
-			showExpanded(){
+    showExpanded() {
       return this.expanded && (this.organize || this.hasChildren)
     },
-			computedChildren(){
+    computedChildren() {
       let children = [];
-				if (this.children){
+      if (this.children) {
         children.push(...this.children)
       }
-				if (this.getChildren){
+      if (this.getChildren) {
         children.push(...this.getChildren())
       }
       return children;
     },
-			canExpand(){
+    canExpand() {
       return canBeParent(this.node.type);
     },
   },
   watch: {
-      'node._ancestorOfMatchedDocument'(value){
+    'node._ancestorOfMatchedDocument'(value) {
       this.expanded = !!value ||
         some(this.selectedNode?.ancestors, ref => ref.id === this.node._id);
     },
-      'selectedNode.ancestors'(value){
+    'selectedNode.ancestors'(value) {
       this.expanded = !!some(value, ref => ref.id === this.node._id) || this.expanded;
     },
   },
@@ -157,54 +159,67 @@
     this.$options.components.TreeNodeList = require('./TreeNodeList.vue').default
   },
   methods: {
-			icon(type){
+    icon(type) {
       return getPropertyIcon(type);
     },
   }
-	};
+};
 </script>
 
 <style lang="css" scoped>
-	.rotate-90 {
+.rotate-90 {
   transform: rotate(90deg) translateZ(0);
-	}
+}
-	.drag-area {
+
+.drag-area {
   box-shadow: -2px 0px 0px 0px #808080;
   margin-left: 0;
   min-height: 32px;
-	}
+}
-	.handle {
+
+.handle {
   cursor: move;
-	}
+}
-	.empty .drag-area {
+
+.empty .drag-area {
   box-shadow: -2px 0px 0px 0px rgb(128, 128, 128, 0.4);
-	}
+}
-	.empty .v-btn {
+
+.empty .v-btn {
   opacity: 0.4;
-	}
+}
-  .found {
+
+.found {
   background: rgba(200, 0, 0, 0.1) !important;
-  }
+}
-	.ghost {
+
+.ghost {
   opacity: 0.5;
   background: rgba(251, 0, 0, 0.3);
-	}
+}
-	.v-icon.v-icon--disabled {
+
+.v-icon.v-icon--disabled {
   opacity: 0;
-	}
+}
-  .v-icon {
+
+.v-icon {
   transition: none !important;
-  }
+}
-	.theme--light .tree-node-title:hover {
+
-		background-color: rgba(0,0,0,.04);
+.theme--light .tree-node-title:hover {
-	}
+  background-color: rgba(0, 0, 0, .04);
-  .theme--dark .tree-node-title:hover {
+}
-		background-color: rgba(255,255,255,.04);
+
-	}
+.theme--dark .tree-node-title:hover {
-  .tree-node-title{
+  background-color: rgba(255, 255, 255, .04);
+}
+
+.tree-node-title {
   transition: background ease 0.3s, color ease 0.15s;
-  }
+}
-  .tree-node-title, .dummy-node {
+
+.tree-node-title,
+.dummy-node {
   height: 40px;
-  }
+}
 </style>

app/imports/ui/components/tree/TreeNodeList.vue

@@ -33,18 +33,24 @@
 </template>
 
 <script lang="js">
-	import draggable from 'vuedraggable';
+import draggable from 'vuedraggable';
-	import TreeNode from '/imports/ui/components/tree/TreeNode.vue';
+import TreeNode from '/imports/ui/components/tree/TreeNode.vue';
-	import { isParentAllowed } from '/imports/api/parenting/parenting.js';
+import { isParentAllowed } from '/imports/api/parenting/parenting.js';
 
-	export default {
+export default {
   components: {
     draggable,
     TreeNode,
   },
   props: {
-			node: Object,
+    node: {
-			group: String,
+      type: Object,
+      default: undefined,
+    },
+    group: {
+      type: String,
+      default: undefined,
+    },
     organize: Boolean,
     lazy: Boolean,
     children: {
@@ -61,39 +67,41 @@
     },
     startExpanded: Boolean,
   },
-		data(){ return {
+  data() {
+    return {
       expanded: this.startExpanded || false,
       displayedChildren: [],
-		}},
+    }
+  },
   computed: {
-			hasChildren(){
+    hasChildren() {
       return this.children && this.children.length;
     },
-			showExpanded(){
+    showExpanded() {
       return this.expanded && (this.organize || this.hasChildren)
     },
   },
   watch: {
-      children(value){
+    children(value) {
       this.displayedChildren = value;
     }
   },
-    mounted(){
+  mounted() {
     this.displayedChildren = this.children;
   },
   methods: {
-			change({added, moved}){
+    change({ added, moved }) {
       let event = moved || added;
-				if (event){
+      if (event) {
         let doc = event.element.node;
         let newIndex;
-					if (event.newIndex === 0){
+        if (event.newIndex === 0) {
           newIndex = -0.5;
         } else {
-            if (event.newIndex < this.children.length){
+          if (event.newIndex < this.children.length) {
             let childAtNewIndex = this.children[event.newIndex];
             let indexOrder = childAtNewIndex.node.order;
-              if (event.newIndex > event.oldIndex){
+            if (event.newIndex > event.oldIndex) {
               newIndex = indexOrder + 0.5;
             } else {
               newIndex = indexOrder - 0.5;
@@ -103,32 +111,34 @@
             newIndex = childBeforeNewIndex.node.order + 0.5;
           }
         }
-					if (moved){
+        if (moved) {
-						this.$emit('reordered', {doc, newIndex});
+          this.$emit('reordered', { doc, newIndex });
-					} else if (added){
+        } else if (added) {
-						this.$emit('reorganized', {doc, parent: this.node, newIndex});
+          this.$emit('reorganized', { doc, parent: this.node, newIndex });
         }
       }
     },
-			move(evt){
+    move(evt) {
       let parentNode = evt.relatedContext.component.$parent.node
       let parentType = parentNode && parentNode.type || 'root';
       let childType = evt.draggedContext.element.node.type;
-				let allowed = isParentAllowed({parentType, childType});
+      let allowed = isParentAllowed({ parentType, childType });
       return allowed;
     },
   },
-	};
+};
 </script>
 
 <style lang="css" scoped>
-  .flip-list-leave-active {
+.flip-list-leave-active {
   display: none;
-  }
+}
-  .flip-list-move {
+
+.flip-list-move {
   transition: transform 0.5s;
-  }
+}
-  .no-move {
+
+.no-move {
   transition: transform 0s;
-  }
+}
 </style>

app/imports/ui/creature/CreatureForm.vue

@@ -39,6 +39,11 @@
           :input-value="model.settings.hideUnusedStats"
           @change="value => $emit('change', {path: ['settings','hideUnusedStats'], value: !!value})"
         />
+        <v-switch
+          label="Hide rest buttons"
+          :input-value="model.settings.hideRestButtons"
+          @change="value => $emit('change', {path: ['settings','hideRestButtons'], value: !!value})"
+        />
         <v-switch
           label="Show spells tab"
           :input-value="!model.settings.hideSpellsTab"
@@ -121,10 +126,10 @@
 
 <script lang="js">
 import { union, without, debounce } from 'lodash';
-import FormSection, {FormSections} from '/imports/ui/properties/forms/shared/FormSection.vue';
+import FormSection, { FormSections } from '/imports/ui/properties/forms/shared/FormSection.vue';
 import LibraryList from '/imports/ui/library/LibraryList.vue';
 import LibraryCollections from '/imports/api/library/LibraryCollections.js';
-import {changeAllowedLibraries, toggleAllUserLibraries} from '/imports/api/creature/creatures/methods/changeAllowedLibraries.js';
+import { changeAllowedLibraries, toggleAllUserLibraries } from '/imports/api/creature/creatures/methods/changeAllowedLibraries.js';
 
 export default {
   components: {
@@ -149,7 +154,8 @@ export default {
     },
     disabled: Boolean,
   },
-  data() { return {
+  data() {
+    return {
       libraryCollections: this.model.allowedLibraryCollections,
       libraries: this.model.allowedLibraries,
       libraryWriteLoading: false,
@@ -211,29 +217,29 @@ export default {
     },
   },
   methods: {
-    changeShowTreeTab(value){
+    changeShowTreeTab(value) {
       this.$emit('change', {
-        path: ['settings','showTreeTab'],
+        path: ['settings', 'showTreeTab'],
         value: !!value
       });
       let currentTab = this.$store.getters.tabById(this.model._id);
-      if (!value && currentTab === 5){
+      if (!value && currentTab === 5) {
         this.$store.commit(
           'setTabForCharacterSheet',
-          {id: this.model._id, tab: 4}
+          { id: this.model._id, tab: 4 }
         );
       }
     },
-    changeHideSpellsTab(value){
+    changeHideSpellsTab(value) {
       this.$emit('change', {
-        path: ['settings','hideSpellsTab'],
+        path: ['settings', 'hideSpellsTab'],
         value: !value
       });
       let currentTab = this.$store.getters.tabById(this.model._id);
-      if (!value && currentTab === 3){
+      if (!value && currentTab === 3) {
         this.$store.commit(
           'setTabForCharacterSheet',
-          {id: this.model._id, tab: 4}
+          { id: this.model._id, tab: 4 }
         );
       }
     },
@@ -266,4 +272,5 @@ export default {
 </script>
 
 <style lang="css" scoped>
+
 </style>

app/imports/ui/creature/CreatureFormDialog.vue

@@ -1,5 +1,8 @@
 <template lang="html">
-  <dialog-base v-if="model" :color="model.color">
+  <dialog-base
+    v-if="model"
+    :color="model.color"
+  >
     <template slot="toolbar">
       <v-toolbar-title>
         Character Details
@@ -50,10 +53,10 @@ export default {
     startInEditTab: Boolean,
   },
   meteor: {
-		model(){
+    model() {
       return Creatures.findOne(this._id);
     },
-    editPermission(){
+    editPermission() {
       try {
         assertEditPermission(this.model, Meteor.userId());
         return true;
@@ -63,10 +66,10 @@ export default {
     },
   },
   methods: {
-		change({path, value, ack}){
+    change({ path, value, ack }) {
-			updateCreature.call({_id: this._id, path, value}, (error) =>{
+      updateCreature.call({ _id: this._id, path, value }, (error) => {
-        if (error){
+        if (error) {
-          if(ack){
+          if (ack) {
             ack(error && error.reason || error)
           } else {
             console.error(error)
@@ -81,4 +84,5 @@ export default {
 </script>
 
 <style lang="css" scoped>
+
 </style>