Merge branch 'develop' into feature-tabletop

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

@@ -18,23 +18,31 @@ export default function getSlotFillFilter({ slot, libraryIds }) {
       }]
     });
   } else if (slot.type === 'class') {
-    filter.$and.push({
-      $or: [{
-        type: 'classLevel',
-      }, {
-        slotFillerType: 'classLevel',
-      }]
-    });
+    const classLevelFilter = {
+      type: 'classLevel',
+    };
+    const slotFillerFilter = {
+      slotFillerType: 'classLevel',
+    };
+
+    // Match variable name or tags
     if (slot.variableName) {
-      filter.variableName = slot.variableName;
+      classLevelFilter.variableName = slot.variableName;
+      slotFillerFilter.libraryTags = slot.variableName;
     }
 
     // Only search for levels the class needs
     if (slot.missingLevels && slot.missingLevels.length) {
-      filter.level = { $in: slot.missingLevels };
+      classLevelFilter.level = { $in: slot.missingLevels };
+      slotFillerFilter['cache.node.level'] = { $in: slot.missingLevels };
     } else {
-      filter.level = { $gt: slot.level || 0 };
+      classLevelFilter.level = { $gt: slot.level || 0 };
+      slotFillerFilter['cache.node.level'] = { $gt: slot.level || 0 };
     }
+
+    filter.$and.push({
+      $or: [classLevelFilter, slotFillerFilter]
+    });
   }
   let tagsOr = [];
   let tagsNin = [];

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

@@ -105,6 +105,8 @@ function insertPropertyFromNode(nodeId, ancestors, order) {
 
   // Convert all references into actual nodes
   nodes = reifyNodeReferences(nodes);
+  // Refetch the root node, it might have been reified
+  node = nodes[0] || node;
 
   // set libraryNodeIds
   storeLibraryNodeReferences(nodes);

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

@@ -179,11 +179,6 @@ let CreatureSchema = new SimpleSchema({
     blackbox: true,
     defaultValue: {}
   },
-  variables: {
-    type: Object,
-    blackbox: true,
-    defaultValue: {}
-  },
   computeErrors: {
     type: Array,
     optional: true,